summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2014-02-20 20:10:12 -0300
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2014-02-20 20:12:22 -0300
commit9804bba5037868a6819a7ac1d6b29e0d6ac1e99a (patch)
treeee5506335f10b88f326860ea6daa31f46cbf0810 /src
parent902307ccaf938ed016333a1050d4ceae80186a00 (diff)
ecore_evas_fb: allow to force tslib even if mouse was handled.
sometimes a device may have a mouse connected but the primary use is via touchscreen, then we force ecore_fb_ts_init() with ECORE_EVAS_FB_TS_ALWAYS=1
Diffstat (limited to 'src')
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 9d999e228c..aba3127ab5 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -184,7 +184,8 @@ _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
184 Eina_Iterator *ls; 184 Eina_Iterator *ls;
185 Ecore_Fb_Input_Device *device; 185 Ecore_Fb_Input_Device *device;
186 Ecore_Fb_Input_Device_Cap caps; 186 Ecore_Fb_Input_Device_Cap caps;
187 int mouse_handled = 0; 187 int mouse_handled = 0, always_ts;
188 const char *s;
188 189
189 _ecore_evas_init_count++; 190 _ecore_evas_init_count++;
190 if (_ecore_evas_init_count > 1) return _ecore_evas_init_count; 191 if (_ecore_evas_init_count > 1) return _ecore_evas_init_count;
@@ -233,7 +234,11 @@ _ecore_evas_fb_init(Ecore_Evas *ee, int w, int h)
233 } 234 }
234 eina_iterator_free(ls); 235 eina_iterator_free(ls);
235 236
236 if (!mouse_handled) 237 /* force to check for touchscreen via tslib even if mouse was detected */
238 s = getenv("ECORE_EVAS_FB_TS_ALWAYS");
239 always_ts = s ? atoi(s) : 0;
240
241 if ((!mouse_handled) || (always_ts))
237 { 242 {
238 if (ecore_fb_ts_init()) 243 if (ecore_fb_ts_init())
239 { 244 {