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

[client] x11: add error checking around XIGrabDevice

Browse source
This commit is contained in:
Geoffrey McRae 2021-01-25 06:52:23 +11:00
parent 4c1893fe20
commit ef54e1be7f
1 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -572,6 +572,25 @@ static bool x11EventFilter(SDL_Event * event)
} }
} }
static void x11PrintGrabError(const char * type, int dev, Status ret)
{
const char * errStr;
switch(ret)
{
case AlreadyGrabbed : errStr = "AlreadyGrabbed" ; break;
case GrabNotViewable: errStr = "GrabNotViewable"; break;
case GrabFrozen : errStr = "GrabFrozen" ; break;
case GrabInvalidTime: errStr = "GrabInvalidTime"; break;
default:
errStr = "Unknown";
break;
}
DEBUG_ERROR("XIGrabDevice failed for %s dev %d with 0x%x (%s)",
type, dev, ret, errStr);
}
static void x11GrabPointer(void) static void x11GrabPointer(void)
{ {
if (x11.pointerGrabbed) if (x11.pointerGrabbed)
@ -589,7 +608,7 @@ static void x11GrabPointer(void)
XISetMask(mask.mask, XI_RawMotion ); XISetMask(mask.mask, XI_RawMotion );
XISetMask(mask.mask, XI_Motion ); XISetMask(mask.mask, XI_Motion );
XIGrabDevice( Status ret = XIGrabDevice(
x11.display, x11.display,
x11.pointerDev, x11.pointerDev,
x11.window, x11.window,
@ -600,6 +619,12 @@ static void x11GrabPointer(void)
false, false,
&mask); &mask);
if (ret != Success)
{
x11PrintGrabError("pointer", x11.pointerDev, ret);
return;
}
XSync(x11.display, False); XSync(x11.display, False);
x11.pointerGrabbed = true; x11.pointerGrabbed = true;
@ -631,7 +656,7 @@ static void x11GrabKeyboard(void)
XISetMask(mask.mask, XI_RawKeyPress ); XISetMask(mask.mask, XI_RawKeyPress );
XISetMask(mask.mask, XI_RawKeyRelease); XISetMask(mask.mask, XI_RawKeyRelease);
XIGrabDevice( Status ret = XIGrabDevice(
x11.display, x11.display,
x11.keyboardDev, x11.keyboardDev,
x11.window, x11.window,
@ -642,6 +667,12 @@ static void x11GrabKeyboard(void)
false, false,
&mask); &mask);
if (ret != Success)
{
x11PrintGrabError("keyboard", x11.keyboardDev, ret);
return;
}
XSync(x11.display, False); XSync(x11.display, False);
x11.keyboardGrabbed = true; x11.keyboardGrabbed = true;