orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

and now make my modifications to multittouch this morning also work 

again with mpx automatically. yay!



SVN revision: 64071
This commit is contained in:
Carsten Haitzler 2011-10-14 09:11:49 +00:00
parent ee158e76fc
commit d45161691a
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_xi2.c
View File

@ -70,7 +70,7 @@ _ecore_x_input_handler(XEvent *xevent)
XIDeviceEvent *evd = (XIDeviceEvent *)(xevent->xcookie.data); XIDeviceEvent *evd = (XIDeviceEvent *)(xevent->xcookie.data);
int devid = evd->deviceid; int devid = evd->deviceid;
int i; int i;
if (_ecore_x_xi2_devs) if (_ecore_x_xi2_devs)
{ {
for (i = 0; i < _ecore_x_xi2_num; i++) for (i = 0; i < _ecore_x_xi2_num; i++)
@ -237,26 +237,38 @@ ecore_x_input_multi_select(Ecore_X_Window win)
} }
else if (dev->use == XISlavePointer) else if (dev->use == XISlavePointer)
{ {
XIEventMask eventmask; XIDeviceInfo *atdev = NULL;
unsigned char mask[4] = { 0 }; int j;
eventmask.deviceid = dev->deviceid; for (j = 0; j < _ecore_x_xi2_num; j++)
eventmask.mask_len = sizeof(mask); {
eventmask.mask = mask; if (_ecore_x_xi2_devs[j].deviceid == dev->attachment)
XISetMask(mask, XI_ButtonPress); atdev = &(_ecore_x_xi2_devs[j]);
XISetMask(mask, XI_ButtonRelease); }
XISetMask(mask, XI_Motion); if (((atdev) && (atdev->use != XIMasterPointer)) ||
#ifdef XI_TouchUpdate (!atdev))
XISetMask(mask, XI_TouchUpdate); {
#endif XIEventMask eventmask;
#ifdef XI_TouchBegin unsigned char mask[4] = { 0 };
XISetMask(mask, XI_TouchBegin);
#endif eventmask.deviceid = dev->deviceid;
#ifdef XI_TouchEnd eventmask.mask_len = sizeof(mask);
XISetMask(mask, XI_TouchEnd); eventmask.mask = mask;
#endif XISetMask(mask, XI_ButtonPress);
XISelectEvents(_ecore_x_disp, win, &eventmask, 1); XISetMask(mask, XI_ButtonRelease);
find = EINA_TRUE; XISetMask(mask, XI_Motion);
# ifdef XI_TouchUpdate
XISetMask(mask, XI_TouchUpdate);
# endif
# ifdef XI_TouchBegin
XISetMask(mask, XI_TouchBegin);
# endif
# ifdef XI_TouchEnd
XISetMask(mask, XI_TouchEnd);
# endif
XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
find = EINA_TRUE;
}
} }
} }