From 5bfafee5087bcbc37b7f8db246b20d7a4bba5731 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Feb 2018 23:44:10 +0100 Subject: Xi: Adapt include sections to match Xorg 7.1 --- nx-X11/programs/Xserver/Xi/grabdevk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/grabdevk.c') diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index cc7d2f034..5fe06a7b2 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -55,15 +55,15 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include #include #include "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "grabdev.h" -- cgit v1.2.3 From 41a0ba729fb67efdc5f7bd50f73f145cf5d8a153 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 11 Feb 2018 22:01:11 +0100 Subject: Xi: reformat code, ansify --- nx-X11/programs/Xserver/Xi/grabdevk.c | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/grabdevk.c') diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index 5fe06a7b2..376a6348d 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -78,7 +78,7 @@ SOFTWARE. int SProcXGrabDeviceKey(client) register ClientPtr client; - { +{ REQUEST(xGrabDeviceKeyReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq); @@ -87,8 +87,8 @@ SProcXGrabDeviceKey(client) swaps(&stuff->event_count); REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return(ProcXGrabDeviceKey(client)); - } + return (ProcXGrabDeviceKey(client)); +} /*********************************************************************** * @@ -99,64 +99,64 @@ SProcXGrabDeviceKey(client) int ProcXGrabDeviceKey(client) ClientPtr client; - { - int ret; - DeviceIntPtr dev; - DeviceIntPtr mdev; - XEventClass *class; - struct tmask tmp[EMASKSIZE]; +{ + int ret; + DeviceIntPtr dev; + DeviceIntPtr mdev; + XEventClass *class; + struct tmask tmp[EMASKSIZE]; REQUEST(xGrabDeviceKeyReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq); if (stuff->length !=(sizeof(xGrabDeviceKeyReq)>>2) + stuff->event_count) { - SendErrorToClient (client, IReqCode, X_GrabDeviceKey, 0, BadLength); + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadLength); return Success; - } + } - dev = LookupDeviceIntRec (stuff->grabbed_device); + dev = LookupDeviceIntRec(stuff->grabbed_device); if (dev == NULL) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadDevice); return Success; - } + } if (stuff->modifier_device != UseXKeyboard) { - mdev = LookupDeviceIntRec (stuff->modifier_device); + mdev = LookupDeviceIntRec(stuff->modifier_device); if (mdev == NULL) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadDevice); return Success; - } + } if (mdev->key == NULL) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadMatch); return Success; - } + } } else mdev = (DeviceIntPtr) LookupKeyboardDevice(); class = (XEventClass *) (&stuff[1]); /* first word of values */ - if ((ret = CreateMaskFromList (client, class, + if ((ret = CreateMaskFromList(client, class, stuff->event_count, tmp, dev, X_GrabDeviceKey)) != Success) - return Success; + return Success; - ret = GrabKey(client, dev, stuff->this_device_mode, + 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); if (ret != Success) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, ret); - return Success; - } + return Success; + } return Success; - } +} -- cgit v1.2.3 From 7aca428ffe10b2cffca8fe01962aef421a5a5645 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 15:14:14 +0100 Subject: Xi: ansify function prototypes --- nx-X11/programs/Xserver/Xi/grabdevk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/grabdevk.c') diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index 376a6348d..26469c4b7 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -76,8 +76,7 @@ SOFTWARE. */ int -SProcXGrabDeviceKey(client) - register ClientPtr client; +SProcXGrabDeviceKey(register ClientPtr client) { REQUEST(xGrabDeviceKeyReq); swaps(&stuff->length); @@ -97,8 +96,7 @@ SProcXGrabDeviceKey(client) */ int -ProcXGrabDeviceKey(client) - ClientPtr client; +ProcXGrabDeviceKey(ClientPtr client) { int ret; DeviceIntPtr dev; -- cgit v1.2.3 From b0abdf7bd8284b1edf39c13e1863ecc420fd68e4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:25:27 +0100 Subject: Xi: reformat --- nx-X11/programs/Xserver/Xi/grabdevk.c | 38 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/grabdevk.c') 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; } -- cgit v1.2.3 From 8e188629fde213f29cfaf62c4ea3abd0520a0f41 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Feb 2018 21:41:19 +0100 Subject: Xi: small formatting changes to match Xorg 7.1's Xi --- nx-X11/programs/Xserver/Xi/grabdevk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/Xi/grabdevk.c') diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index 29498b08a..aceeec170 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -135,7 +135,7 @@ ProcXGrabDeviceKey(ClientPtr client) if ((ret = CreateMaskFromList(client, class, stuff->event_count, tmp, dev, - X_GrabDeviceKey)) != Success) + X_GrabDeviceKey)) != Success) return Success; ret = GrabKey(client, dev, stuff->this_device_mode, -- cgit v1.2.3