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/setmmap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setmmap.c') diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index f50447952..03ad7b5a3 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -55,14 +55,14 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ #include #include #include "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setmmap.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/setmmap.c | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setmmap.c') diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index 03ad7b5a3..6a93c8c62 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -77,11 +77,11 @@ SOFTWARE. int SProcXSetDeviceModifierMapping(client) register ClientPtr client; - { +{ REQUEST(xSetDeviceModifierMappingReq); swaps(&stuff->length); - return(ProcXSetDeviceModifierMapping(client)); - } + return (ProcXSetDeviceModifierMapping(client)); +} /*********************************************************************** * @@ -92,22 +92,22 @@ SProcXSetDeviceModifierMapping(client) int ProcXSetDeviceModifierMapping(client) ClientPtr client; - { - int ret; - xSetDeviceModifierMappingReply rep; - DeviceIntPtr dev; - KeyClassPtr kp; - +{ + int ret; + xSetDeviceModifierMappingReply rep; + DeviceIntPtr dev; + KeyClassPtr kp; + REQUEST(xSetDeviceModifierMappingReq); REQUEST_AT_LEAST_SIZE(xSetDeviceModifierMappingReq); - dev = LookupDeviceIntRec (stuff->deviceid); + dev = LookupDeviceIntRec(stuff->deviceid); if (dev == NULL) { - SendErrorToClient (client, IReqCode, X_SetDeviceModifierMapping, 0, - BadDevice); + SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, + BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_SetDeviceModifierMapping; @@ -122,19 +122,19 @@ ProcXSetDeviceModifierMapping(client) { rep.success = ret; if (ret == MappingSuccess) - SendDeviceMappingNotify(MappingModifier, 0, 0, dev); + SendDeviceMappingNotify(MappingModifier, 0, 0, dev); WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply),&rep); } else { - if (ret==-1) - ret=BadValue; - SendErrorToClient (client, IReqCode, X_SetDeviceModifierMapping, 0,ret); - } + if (ret == -1) + ret = BadValue; + SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, ret); + } return Success; - } +} /*********************************************************************** * @@ -148,9 +148,9 @@ SRepXSetDeviceModifierMapping (client, size, rep) ClientPtr client; int size; xSetDeviceModifierMappingReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} -- 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/setmmap.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setmmap.c') diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index 6a93c8c62..3b51c2ecf 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -75,8 +75,7 @@ SOFTWARE. */ int -SProcXSetDeviceModifierMapping(client) - register ClientPtr client; +SProcXSetDeviceModifierMapping(register ClientPtr client) { REQUEST(xSetDeviceModifierMappingReq); swaps(&stuff->length); @@ -90,8 +89,7 @@ SProcXSetDeviceModifierMapping(client) */ int -ProcXSetDeviceModifierMapping(client) - ClientPtr client; +ProcXSetDeviceModifierMapping(ClientPtr client) { int ret; xSetDeviceModifierMappingReply rep; @@ -144,13 +142,10 @@ ProcXSetDeviceModifierMapping(client) */ void -SRepXSetDeviceModifierMapping (client, size, rep) - ClientPtr client; - int size; - xSetDeviceModifierMappingReply *rep; +SRepXSetDeviceModifierMapping(ClientPtr client, int size, + xSetDeviceModifierMappingReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); } - -- 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/setmmap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setmmap.c') diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index 3b51c2ecf..19630b521 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -100,8 +100,7 @@ ProcXSetDeviceModifierMapping(ClientPtr client) REQUEST_AT_LEAST_SIZE(xSetDeviceModifierMappingReq); dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL) - { + if (dev == NULL) { SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, BadDevice); return Success; @@ -113,18 +112,17 @@ ProcXSetDeviceModifierMapping(ClientPtr client) rep.sequenceNumber = client->sequence; ret = SetModifierMapping(client, dev, stuff->length, - (sizeof (xSetDeviceModifierMappingReq)>>2), stuff->numKeyPerModifier, - (BYTE *)&stuff[1], &kp); + (sizeof(xSetDeviceModifierMappingReq) >> 2), + stuff->numKeyPerModifier, (BYTE *) & stuff[1], + &kp); - if (ret==MappingSuccess || ret==MappingBusy || ret==MappingFailed) - { + if (ret == MappingSuccess || ret == MappingBusy || ret == MappingFailed) { rep.success = ret; if (ret == MappingSuccess) SendDeviceMappingNotify(MappingModifier, 0, 0, dev); - WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply),&rep); - } - else - { + WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply), + &rep); + } else { if (ret == -1) ret = BadValue; SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, ret); -- 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/setmmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/setmmap.c') diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index 19630b521..74e08210e 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -112,7 +112,7 @@ ProcXSetDeviceModifierMapping(ClientPtr client) rep.sequenceNumber = client->sequence; ret = SetModifierMapping(client, dev, stuff->length, - (sizeof(xSetDeviceModifierMappingReq) >> 2), + (sizeof(xSetDeviceModifierMappingReq) >> 2), stuff->numKeyPerModifier, (BYTE *) & stuff[1], &kp); @@ -128,7 +128,6 @@ ProcXSetDeviceModifierMapping(ClientPtr client) SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, ret); } - return Success; } -- cgit v1.2.3