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/allowev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/allowev.c') diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index a814e3c3d..e178bb3a1 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.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 "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "allowev.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/allowev.c | 62 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/allowev.c') diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index e178bb3a1..77e9994ba 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.c @@ -77,13 +77,13 @@ SOFTWARE. int SProcXAllowDeviceEvents(client) register ClientPtr client; - { +{ REQUEST(xAllowDeviceEventsReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xAllowDeviceEventsReq); swapl(&stuff->time); - return(ProcXAllowDeviceEvents(client)); - } + return (ProcXAllowDeviceEvents(client)); +} /*********************************************************************** * @@ -94,46 +94,46 @@ SProcXAllowDeviceEvents(client) int ProcXAllowDeviceEvents(client) register ClientPtr client; - { - TimeStamp time; - DeviceIntPtr thisdev; +{ + TimeStamp time; + DeviceIntPtr thisdev; REQUEST(xAllowDeviceEventsReq); REQUEST_SIZE_MATCH(xAllowDeviceEventsReq); - thisdev = LookupDeviceIntRec (stuff->deviceid); + thisdev = LookupDeviceIntRec(stuff->deviceid); if (thisdev == NULL) { SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadDevice); return Success; - } + } time = ClientTimeToServerTime(stuff->time); switch (stuff->mode) { - case ReplayThisDevice: - AllowSome(client, time, thisdev, NOT_GRABBED); - break; - case SyncThisDevice: - AllowSome(client, time, thisdev, FREEZE_NEXT_EVENT); - break; - case AsyncThisDevice: - AllowSome(client, time, thisdev, THAWED); - break; - case AsyncOtherDevices: - AllowSome(client, time, thisdev, THAW_OTHERS); - break; - case SyncAll: - AllowSome(client, time, thisdev, FREEZE_BOTH_NEXT_EVENT); - break; - case AsyncAll: - AllowSome(client, time, thisdev, THAWED_BOTH); - break; - default: + case ReplayThisDevice: + AllowSome(client, time, thisdev, NOT_GRABBED); + break; + case SyncThisDevice: + AllowSome(client, time, thisdev, FREEZE_NEXT_EVENT); + break; + case AsyncThisDevice: + AllowSome(client, time, thisdev, THAWED); + break; + case AsyncOtherDevices: + AllowSome(client, time, thisdev, THAW_OTHERS); + break; + case SyncAll: + AllowSome(client, time, thisdev, FREEZE_BOTH_NEXT_EVENT); + break; + case AsyncAll: + AllowSome(client, time, thisdev, THAWED_BOTH); + break; + default: SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadValue); - client->errorValue = stuff->mode; - return Success; - } - return Success; + client->errorValue = stuff->mode; + 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/allowev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/allowev.c') diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index 77e9994ba..85e3ed979 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.c @@ -75,8 +75,7 @@ SOFTWARE. */ int -SProcXAllowDeviceEvents(client) - register ClientPtr client; +SProcXAllowDeviceEvents(register ClientPtr client) { REQUEST(xAllowDeviceEventsReq); swaps(&stuff->length); @@ -92,8 +91,7 @@ SProcXAllowDeviceEvents(client) */ int -ProcXAllowDeviceEvents(client) - register ClientPtr client; +ProcXAllowDeviceEvents(register ClientPtr client) { TimeStamp time; DeviceIntPtr thisdev; -- 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/allowev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/allowev.c') diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index 85e3ed979..8981f9142 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.c @@ -100,15 +100,13 @@ ProcXAllowDeviceEvents(register ClientPtr client) REQUEST_SIZE_MATCH(xAllowDeviceEventsReq); thisdev = LookupDeviceIntRec(stuff->deviceid); - if (thisdev == NULL) - { + if (thisdev == NULL) { SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadDevice); return Success; } time = ClientTimeToServerTime(stuff->time); - switch (stuff->mode) - { + switch (stuff->mode) { case ReplayThisDevice: AllowSome(client, time, thisdev, NOT_GRABBED); break; @@ -128,8 +126,7 @@ ProcXAllowDeviceEvents(register ClientPtr client) AllowSome(client, time, thisdev, THAWED_BOTH); break; default: - SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, - BadValue); + SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadValue); client->errorValue = stuff->mode; return Success; } -- cgit v1.2.3