Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] x11: don't attempt to grab the pointer on window resize

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-25 09:25:01 +11:00
parent ef54e1be7f
commit 8caf951c41
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/displayservers/X11/x11.c
View File

@ -337,12 +337,14 @@ static bool x11EventFilter(SDL_Event * event)
return true; return true;
XIFocusOutEvent *xie = cookie->data; XIFocusOutEvent *xie = cookie->data;
if (xie->mode != NotifyNormal && xie->mode != XINotifyWhileGrabbed) if (xie->mode != XINotifyNormal &&
xie->mode != XINotifyWhileGrabbed &&
xie->mode != XINotifyUngrab)
return true; return true;
x11.focused = true;
app_updateCursorPos(xie->event_x, xie->event_y); app_updateCursorPos(xie->event_x, xie->event_y);
app_handleFocusEvent(true); app_handleFocusEvent(true);
x11.focused = true;
return true; return true;
} }
@ -352,7 +354,9 @@ static bool x11EventFilter(SDL_Event * event)
return true; return true;
XIFocusOutEvent *xie = cookie->data; XIFocusOutEvent *xie = cookie->data;
if (xie->mode != NotifyNormal && xie->mode != XINotifyWhileGrabbed) if (xie->mode != XINotifyNormal &&
xie->mode != XINotifyWhileGrabbed &&
xie->mode != XINotifyGrab)
return true; return true;
app_updateCursorPos(xie->event_x, xie->event_y); app_updateCursorPos(xie->event_x, xie->event_y);
@ -471,6 +475,9 @@ static bool x11EventFilter(SDL_Event * event)
{ {
XIDeviceEvent *device = cookie->data; XIDeviceEvent *device = cookie->data;
app_updateCursorPos(device->event_x, device->event_y); app_updateCursorPos(device->event_x, device->event_y);
if (!x11.pointerGrabbed)
app_handleMouseNormal(0.0, 0.0);
return true; return true;
} }
@ -614,9 +621,9 @@ static void x11GrabPointer(void)
x11.window, x11.window,
CurrentTime, CurrentTime,
None, None,
GrabModeAsync, XIGrabModeAsync,
GrabModeAsync, XIGrabModeAsync,
false, XINoOwnerEvents,
&mask); &mask);
if (ret != Success) if (ret != Success)
@ -625,8 +632,6 @@ static void x11GrabPointer(void)
return; return;
} }
XSync(x11.display, False);
x11.pointerGrabbed = true; x11.pointerGrabbed = true;
} }
@ -662,9 +667,9 @@ static void x11GrabKeyboard(void)
x11.window, x11.window,
CurrentTime, CurrentTime,
None, None,
GrabModeAsync, XIGrabModeAsync,
GrabModeAsync, XIGrabModeAsync,
false, XINoOwnerEvents,
&mask); &mask);
if (ret != Success) if (ret != Success)
@ -673,8 +678,6 @@ static void x11GrabKeyboard(void)
return; return;
} }
XSync(x11.display, False);
x11.keyboardGrabbed = true; x11.keyboardGrabbed = true;
} }