From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/Xi/ungrdevb.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'xorg-server/Xi/ungrdevb.c') diff --git a/xorg-server/Xi/ungrdevb.c b/xorg-server/Xi/ungrdevb.c index 0ba395cf3..c4632fadc 100644 --- a/xorg-server/Xi/ungrdevb.c +++ b/xorg-server/Xi/ungrdevb.c @@ -54,8 +54,8 @@ SOFTWARE. #include #endif -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include #include #include "exglobals.h" @@ -104,27 +104,28 @@ ProcXUngrabDeviceButton(ClientPtr client) rc = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess); if (rc != Success) - return rc; + return rc; if (dev->button == 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->modifiers != AnyModifier) && - (stuff->modifiers & ~AllModifiersMask)) - return BadValue; + (stuff->modifiers & ~AllModifiersMask)) + return BadValue; temporaryGrab = AllocGrab(); if (!temporaryGrab) -- cgit v1.2.3