diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
| commit | 0f834b91a4768673833ab4917e87d86c237bb1a6 (patch) | |
| tree | 363489504ed4b2d360259b8de4c9e392918e5d02 /xorg-server/Xi/ungrdevk.c | |
| parent | fc72edebf875378459368c5383d9023730cbca54 (diff) | |
| download | vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.gz vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.bz2 vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.zip | |
libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update
23 Mar 2012
Diffstat (limited to 'xorg-server/Xi/ungrdevk.c')
| -rw-r--r-- | xorg-server/Xi/ungrdevk.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/xorg-server/Xi/ungrdevk.c b/xorg-server/Xi/ungrdevk.c index 8785989b0..3273878d3 100644 --- a/xorg-server/Xi/ungrdevk.c +++ b/xorg-server/Xi/ungrdevk.c @@ -54,8 +54,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include "exglobals.h" @@ -106,32 +106,33 @@ ProcXUngrabDeviceKey(ClientPtr client) rc = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess); if (rc != Success) - return rc; + return rc; if (dev->key == NULL) - return BadMatch; + return BadMatch; if (stuff->modifier_device != UseXKeyboard) { - rc = dixLookupDevice(&mdev, stuff->modifier_device, client, - DixReadAccess); - if (rc != Success) - return BadDevice; - if (mdev->key == NULL) - return BadMatch; - } else - mdev = PickKeyboard(client); + rc = dixLookupDevice(&mdev, stuff->modifier_device, client, + DixReadAccess); + if (rc != Success) + return BadDevice; + if (mdev->key == NULL) + return BadMatch; + } + else + mdev = PickKeyboard(client); rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess); if (rc != Success) - return rc; + return rc; if (((stuff->key > dev->key->xkbInfo->desc->max_key_code) || - (stuff->key < dev->key->xkbInfo->desc->min_key_code)) - && (stuff->key != AnyKey)) - return BadValue; + (stuff->key < dev->key->xkbInfo->desc->min_key_code)) + && (stuff->key != AnyKey)) + return BadValue; if ((stuff->modifiers != AnyModifier) && - (stuff->modifiers & ~AllModifiersMask)) - return BadValue; + (stuff->modifiers & ~AllModifiersMask)) + return BadValue; temporaryGrab = AllocGrab(); if (!temporaryGrab) |