MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging r6181 through r6184 from trunk to ogl-es branch 

- Changes to touch-input handling on X11


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6185 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2021-01-06 14:52:49 +00:00 committed by MoNTE48
parent 1257ee6a4c
commit c3e1d5c86b
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/Irrlicht/CIrrDeviceLinux.cpp
View File

@ -2040,39 +2040,19 @@ void CIrrDeviceLinux::initXInput2()
return; return;
} }
int cnt = 0; // So far we only use XInput2 for touch events.
XIDeviceInfo *di = XIQueryDevice(XDisplay, XIAllDevices, &cnt); // So we enable those and disable all other events for now.
if ( di ) XIEventMask eventMask;
{ unsigned char mask[XIMaskLen(XI_TouchEnd)];
for (int i = 0; i < cnt; ++i) memset(mask, 0, sizeof(mask));
{ eventMask.deviceid = XIAllMasterDevices;
bool hasTouchClass = false; eventMask.mask_len = sizeof(mask);
XIDeviceInfo *dev = &di[i]; eventMask.mask = mask;
for (int j = 0; j < dev->num_classes; ++j) XISetMask(eventMask.mask, XI_TouchBegin);
{ XISetMask(eventMask.mask, XI_TouchUpdate);
if (dev->classes[j]->type == XITouchClass) XISetMask(eventMask.mask, XI_TouchEnd);
{
hasTouchClass = true;
break;
}
}
if ( hasTouchClass )
{
XIEventMask eventMask;
unsigned char mask[XIMaskLen(XI_TouchEnd)];
memset(mask, 0, sizeof(mask));
eventMask.deviceid = dev->deviceid;
eventMask.mask_len = sizeof(mask);
eventMask.mask = mask;
XISetMask(eventMask.mask, XI_TouchBegin);
XISetMask(eventMask.mask, XI_TouchUpdate);
XISetMask(eventMask.mask, XI_TouchEnd);
XISelectEvents(XDisplay, XWindow, &eventMask, 1); XISelectEvents(XDisplay, XWindow, &eventMask, 1);
}
}
XIFreeDeviceInfo(di);
}
#endif #endif
} }