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

[client] x11: Add event handling for ungrabed mouse press/release

Browse source 
The imgui overlay requires input even if the display is not captured and
operating in raw mode. XInput2 correctly only sends
XI_Press/ReleaseButton events if the device has not been captured, as
such it's safe to handle both raw and non raw buttons events at the same
time.
This commit is contained in:
Geoffrey McRae 2021-07-31 15:23:31 +10:00
parent 75e57baf6c
commit 7f6fd02d06
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -382,13 +382,15 @@ static bool x11Init(const LG_DSInitParams params)
eventmask.mask_len = sizeof(mask); eventmask.mask_len = sizeof(mask);
eventmask.mask = mask; eventmask.mask = mask;
XISetMask(mask, XI_FocusIn ); XISetMask(mask, XI_FocusIn );
XISetMask(mask, XI_FocusOut ); XISetMask(mask, XI_FocusOut );
XISetMask(mask, XI_Enter ); XISetMask(mask, XI_Enter );
XISetMask(mask, XI_Leave ); XISetMask(mask, XI_Leave );
XISetMask(mask, XI_Motion ); XISetMask(mask, XI_Motion );
XISetMask(mask, XI_KeyPress ); XISetMask(mask, XI_KeyPress );
XISetMask(mask, XI_KeyRelease); XISetMask(mask, XI_KeyRelease );
XISetMask(mask, XI_ButtonPress );
XISetMask(mask, XI_ButtonRelease);
if (XISelectEvents(x11.display, x11.window, &eventmask, 1) != Success) if (XISelectEvents(x11.display, x11.window, &eventmask, 1) != Success)
{ {
@ -802,6 +804,26 @@ static void x11GenericEvent(XGenericEventCookie *cookie)
return; return;
} }
case XI_ButtonPress:
{
if (!x11.focused || !x11.entered)
return;
XIDeviceEvent *device = cookie->data;
app_handleButtonPress(device->detail);
return;
}
case XI_ButtonRelease:
{
if (!x11.focused || !x11.entered)
return;
XIDeviceEvent *device = cookie->data;
app_handleButtonRelease(device->detail);
return;
}
case XI_RawButtonPress: case XI_RawButtonPress:
{ {
if (!x11.focused || !x11.entered) if (!x11.focused || !x11.entered)