diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-02-15 21:25:27 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 00:58:46 +0100 |
| commit | b0abdf7bd8284b1edf39c13e1863ecc420fd68e4 (patch) | |
| tree | 191171d5cfdee1851ad3b5246be6363f9d1f3445 /nx-X11/programs/Xserver/Xi/grabdevk.c | |
| parent | 7aca428ffe10b2cffca8fe01962aef421a5a5645 (diff) | |
| download | nx-libs-b0abdf7bd8284b1edf39c13e1863ecc420fd68e4.tar.gz nx-libs-b0abdf7bd8284b1edf39c13e1863ecc420fd68e4.tar.bz2 nx-libs-b0abdf7bd8284b1edf39c13e1863ecc420fd68e4.zip | |
Xi: reformat
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/grabdevk.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xi/grabdevk.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index 26469c4b7..29498b08a 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -107,51 +107,43 @@ ProcXGrabDeviceKey(ClientPtr client) REQUEST(xGrabDeviceKeyReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq); - if (stuff->length !=(sizeof(xGrabDeviceKeyReq)>>2) + stuff->event_count) - { + if (stuff->length != (sizeof(xGrabDeviceKeyReq) >> 2) + stuff->event_count) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadLength); return Success; } dev = LookupDeviceIntRec(stuff->grabbed_device); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, - BadDevice); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadDevice); return Success; } - if (stuff->modifier_device != UseXKeyboard) - { + if (stuff->modifier_device != UseXKeyboard) { mdev = LookupDeviceIntRec(stuff->modifier_device); - if (mdev == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, - BadDevice); + if (mdev == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadDevice); return Success; } - if (mdev->key == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, - BadMatch); + if (mdev->key == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadMatch); return Success; } - } - else + } else mdev = (DeviceIntPtr) LookupKeyboardDevice(); class = (XEventClass *) (&stuff[1]); /* first word of values */ if ((ret = CreateMaskFromList(client, class, - stuff->event_count, tmp, dev, X_GrabDeviceKey)) != Success) + stuff->event_count, tmp, dev, + X_GrabDeviceKey)) != Success) return Success; ret = GrabKey(client, dev, stuff->this_device_mode, - stuff->other_devices_mode, stuff->modifiers, mdev, stuff->key, - stuff->grabWindow, stuff->ownerEvents, tmp[stuff->grabbed_device].mask); + stuff->other_devices_mode, stuff->modifiers, mdev, + stuff->key, stuff->grabWindow, stuff->ownerEvents, + tmp[stuff->grabbed_device].mask); - if (ret != Success) - { + if (ret != Success) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, ret); return Success; } |