mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 22:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] x11: implement keyboard event handing via xinput

Browse source
This commit is contained in:
Geoffrey McRae 2021-01-19 05:01:19 +11:00
parent dfe327301d
commit 85ee6737d5
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/displayservers/X11/x11.c
View file

@ -108,6 +108,8 @@ static bool x11Init(SDL_SysWMinfo * info)
XISetMask(mask[i].mask, XI_ButtonPress ); XISetMask(mask[i].mask, XI_ButtonPress );
XISetMask(mask[i].mask, XI_ButtonRelease); XISetMask(mask[i].mask, XI_ButtonRelease);
XISetMask(mask[i].mask, XI_Motion ); XISetMask(mask[i].mask, XI_Motion );
XISetMask(mask[i].mask, XI_KeyPress );
XISetMask(mask[i].mask, XI_KeyRelease );
} }
XISelectEvents(x11.display, x11.window, mask, num_masks); XISelectEvents(x11.display, x11.window, mask, num_masks);
@ -208,6 +210,8 @@ static bool x11EventFilter(SDL_Event * event)
return false; return false;
#if SDL_VIDEO_DRIVER_X11_XINPUT2 #if SDL_VIDEO_DRIVER_X11_XINPUT2
case SDL_KEYDOWN:
case SDL_KEYUP:
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP: case SDL_MOUSEBUTTONUP:
@ -292,6 +296,20 @@ static bool x11EventFilter(SDL_Event * event)
switch(cookie->evtype) switch(cookie->evtype)
{ {
case XI_KeyPress:
{
XIDeviceEvent *device = cookie->data;
app_handleKeyPress(device->detail - 8);
return true;
}
case XI_KeyRelease:
{
XIDeviceEvent *device = cookie->data;
app_handleKeyRelease(device->detail - 8);
return true;
}
case XI_ButtonPress: case XI_ButtonPress:
{ {
XIDeviceEvent *device = cookie->data; XIDeviceEvent *device = cookie->data;