hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-21 20:26:45 +00:00
Code Issues Projects Releases Wiki Activity

input: update to inputproto 1.9.99.8 XI2 defines.

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-05-07 16:52:31 +10:00
commit bae070914f
11 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Xi/xipassivegrab.c
View file

@ -93,8 +93,8 @@ ProcXIPassiveGrabDevice(ClientPtr client)
if (ret != Success)
return ret;
if (stuff->grab_type != GrabtypeButton &&
stuff->grab_type != GrabtypeKeysym)
if (stuff->grab_type != XIGrabtypeButton &&
stuff->grab_type != XIGrabtypeKeysym)
{
client->errorValue = stuff->grab_type;
return BadValue;
@ -149,11 +149,11 @@ ProcXIPassiveGrabDevice(ClientPtr client)
param.modifiers = *modifiers;
switch(stuff->grab_type)
{
case GrabtypeButton:
case XIGrabtypeButton:
status = GrabButton(client, dev, mod_dev, stuff->detail,
&param, GRABTYPE_XI2, &mask);
break;
case GrabtypeKeysym:
case XIGrabtypeKeysym:
status = GrabKey(client, dev, mod_dev, stuff->detail,
&param, GRABTYPE_XI2, &mask);
break;
@ -231,8 +231,8 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
if (rc != Success)
return rc;
if (stuff->grab_type != GrabtypeButton &&
stuff->grab_type != GrabtypeKeysym)
if (stuff->grab_type != XIGrabtypeButton &&
stuff->grab_type != XIGrabtypeKeysym)
{
client->errorValue = stuff->grab_type;
return BadValue;
@ -250,7 +250,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
tempGrab.device = dev;
tempGrab.window = win;
tempGrab.type =
(stuff->grab_type == GrabtypeButton) ? XI_ButtonPress : XI_KeyPress;
(stuff->grab_type == XIGrabtypeButton) ? XI_ButtonPress : XI_KeyPress;
tempGrab.grabtype = GRABTYPE_XI2;
tempGrab.modifierDevice = mod_dev;
tempGrab.modifiersDetail.pMask = NULL;