enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

ecore_x_xi2: remove useless define check XI_TouchXXX. 

Summary:
we can use XI_TouchXXX defines after xi2_2. So we don't need check XI_TouchXXX defines.
I think it is simple only using the ECORE_XI2_2 define instead of using XI_TouchXXX defines.

Reviewers: raster, cedric, devilhorns

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2637
This commit is contained in:
Ji-Youn Park 2015-06-08 14:53:01 -04:00 committed by Chris Michael
parent 172a0ccf0c
commit 105cf65c80
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/ecore_x/xlib/ecore_x_xi2.c
View File

@ -374,6 +374,8 @@ _ecore_x_input_mouse_handler(XEvent *xevent)
#endif /* ifdef ECORE_XI2 */ #endif /* ifdef ECORE_XI2 */
} }
//XI_TouchUpdate, XI_TouchBegin, XI_TouchEnd only available in XI2_2
//So it is better using ECORE_XI2_2 define than XI_TouchXXX defines.
void void
_ecore_x_input_multi_handler(XEvent *xevent) _ecore_x_input_multi_handler(XEvent *xevent)
{ {
@ -384,13 +386,11 @@ _ecore_x_input_multi_handler(XEvent *xevent)
switch (xevent->xcookie.evtype) switch (xevent->xcookie.evtype)
{ {
#ifdef XI_TouchUpdate #ifdef ECORE_XI2_2
case XI_TouchUpdate: case XI_TouchUpdate:
{ {
#ifdef ECORE_XI2_2
int i = _ecore_x_input_touch_index_get(devid, evd->detail, XI_TouchUpdate); int i = _ecore_x_input_touch_index_get(devid, evd->detail, XI_TouchUpdate);
if ((i == 0) && (evd->flags & XITouchEmulatingPointer)) return; if ((i == 0) && (evd->flags & XITouchEmulatingPointer)) return;
#endif /* #ifdef ECORE_XI2_2 */
INF("Handling XI_TouchUpdate"); INF("Handling XI_TouchUpdate");
_ecore_mouse_move(evd->time, _ecore_mouse_move(evd->time,
0, // state 0, // state
@ -400,26 +400,18 @@ _ecore_x_input_multi_handler(XEvent *xevent)
(evd->child ? evd->child : evd->event), (evd->child ? evd->child : evd->event),
evd->root, evd->root,
1, // same_screen 1, // same_screen
#ifdef ECORE_XI2_2
i, 1, 1, i, 1, 1,
#else
devid, 1, 1,
#endif /* #ifdef ECORE_XI2_2 */
1.0, // pressure 1.0, // pressure
0.0, // angle 0.0, // angle
evd->event_x, evd->event_y, evd->event_x, evd->event_y,
evd->root_x, evd->root_y); evd->root_x, evd->root_y);
#endif
} }
break; break;
#ifdef XI_TouchBegin
case XI_TouchBegin: case XI_TouchBegin:
{ {
#ifdef ECORE_XI2_2
int i = _ecore_x_input_touch_index_get(devid, evd->detail, XI_TouchBegin); int i = _ecore_x_input_touch_index_get(devid, evd->detail, XI_TouchBegin);
if ((i == 0) && (evd->flags & XITouchEmulatingPointer)) return; if ((i == 0) && (evd->flags & XITouchEmulatingPointer)) return;
#endif /* #ifdef ECORE_XI2_2 */
INF("Handling XI_TouchBegin"); INF("Handling XI_TouchBegin");
_ecore_mouse_button(ECORE_EVENT_MOUSE_BUTTON_DOWN, _ecore_mouse_button(ECORE_EVENT_MOUSE_BUTTON_DOWN,
evd->time, evd->time,
@ -431,30 +423,22 @@ _ecore_x_input_multi_handler(XEvent *xevent)
(evd->child ? evd->child : evd->event), (evd->child ? evd->child : evd->event),
evd->root, evd->root,
1, // same_screen 1, // same_screen
#ifdef ECORE_XI2_2
i, 1, 1, i, 1, 1,
#else
devid, 1, 1,
#endif /* #ifdef ECORE_XI2_2 */
1.0, // pressure 1.0, // pressure
0.0, // angle 0.0, // angle
evd->event_x, evd->event_y, evd->event_x, evd->event_y,
evd->root_x, evd->root_y); evd->root_x, evd->root_y);
#endif
} }
break; break;
#ifdef XI_TouchEnd
case XI_TouchEnd: case XI_TouchEnd:
{ {
#ifdef ECORE_XI2_2
int i = _ecore_x_input_touch_index_get(devid, evd->detail, XI_TouchEnd); int i = _ecore_x_input_touch_index_get(devid, evd->detail, XI_TouchEnd);
if ((i == 0) && (evd->flags & XITouchEmulatingPointer)) if ((i == 0) && (evd->flags & XITouchEmulatingPointer))
{ {
_ecore_x_input_touch_index_clear(devid, i); _ecore_x_input_touch_index_clear(devid, i);
return; return;
} }
#endif /* #ifdef ECORE_XI2_2 */
INF("Handling XI_TouchEnd"); INF("Handling XI_TouchEnd");
_ecore_mouse_button(ECORE_EVENT_MOUSE_BUTTON_UP, _ecore_mouse_button(ECORE_EVENT_MOUSE_BUTTON_UP,
evd->time, evd->time,
@ -466,21 +450,15 @@ _ecore_x_input_multi_handler(XEvent *xevent)
(evd->child ? evd->child : evd->event), (evd->child ? evd->child : evd->event),
evd->root, evd->root,
1, // same_screen 1, // same_screen
#ifdef ECORE_XI2_2
i, 1, 1, i, 1, 1,
#else
devid, 1, 1,
#endif /* #ifdef ECORE_XI2_2 */
1.0, // pressure 1.0, // pressure
0.0, // angle 0.0, // angle
evd->event_x, evd->event_y, evd->event_x, evd->event_y,
evd->root_x, evd->root_y); evd->root_x, evd->root_y);
#ifdef ECORE_XI2_2
_ecore_x_input_touch_index_clear(devid, i); _ecore_x_input_touch_index_clear(devid, i);
#endif /* #ifdef ECORE_XI2_2 */
#endif
} }
break; break;
#endif /* ifdef ECORE_XI2_2 */
default: default:
break; break;
} }