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/getfocus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getfocus.c') diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index 6f30b011a..d139cf543 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -55,14 +55,14 @@ SOFTWARE. #include #endif -#include /* for inputstr.h */ -#include /* Request macro */ -#include "windowstr.h" /* focus struct */ -#include "inputstr.h" /* DeviceIntPtr */ +#include /* for inputstr.h */ +#include /* Request macro */ +#include "windowstr.h" /* focus struct */ +#include "inputstr.h" /* DeviceIntPtr */ #include #include #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "getfocus.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/getfocus.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getfocus.c') diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index d139cf543..769ef632c 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -76,11 +76,11 @@ SOFTWARE. int SProcXGetDeviceFocus(client) register ClientPtr client; - { +{ REQUEST(xGetDeviceFocusReq); swaps(&stuff->length); - return(ProcXGetDeviceFocus(client)); - } + return (ProcXGetDeviceFocus(client)); +} /*********************************************************************** * @@ -91,20 +91,20 @@ SProcXGetDeviceFocus(client) int ProcXGetDeviceFocus(client) ClientPtr client; - { - DeviceIntPtr dev; - FocusClassPtr focus; +{ + DeviceIntPtr dev; + FocusClassPtr focus; xGetDeviceFocusReply rep; REQUEST(xGetDeviceFocusReq); REQUEST_SIZE_MATCH(xGetDeviceFocusReq); - dev = LookupDeviceIntRec (stuff->deviceid); + dev = LookupDeviceIntRec(stuff->deviceid); if (dev == NULL || !dev->focus) { SendErrorToClient(client, IReqCode, X_GetDeviceFocus, 0, BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_GetDeviceFocus; @@ -119,14 +119,14 @@ ProcXGetDeviceFocus(client) rep.focus = PointerRoot; else if (focus->win == FollowKeyboardWin) rep.focus = FollowKeyboard; - else + else rep.focus = focus->win->drawable.id; rep.time = focus->time.milliseconds; rep.revertTo = focus->revert; - WriteReplyToClient (client, sizeof(xGetDeviceFocusReply), &rep); + WriteReplyToClient(client, sizeof(xGetDeviceFocusReply), &rep); return Success; - } +} /*********************************************************************** * @@ -140,10 +140,10 @@ SRepXGetDeviceFocus (client, size, rep) ClientPtr client; int size; xGetDeviceFocusReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swapl(&rep->focus); swapl(&rep->time); 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/getfocus.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getfocus.c') diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index 769ef632c..6642d5b42 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -74,8 +74,7 @@ SOFTWARE. */ int -SProcXGetDeviceFocus(client) - register ClientPtr client; +SProcXGetDeviceFocus(register ClientPtr client) { REQUEST(xGetDeviceFocusReq); swaps(&stuff->length); @@ -89,8 +88,7 @@ SProcXGetDeviceFocus(client) */ int -ProcXGetDeviceFocus(client) - ClientPtr client; +ProcXGetDeviceFocus(ClientPtr client) { DeviceIntPtr dev; FocusClassPtr focus; @@ -136,10 +134,7 @@ ProcXGetDeviceFocus(client) */ void -SRepXGetDeviceFocus (client, size, rep) - ClientPtr client; - int size; - xGetDeviceFocusReply *rep; +SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep) { swaps(&rep->sequenceNumber); swapl(&rep->length); -- 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/getfocus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/getfocus.c') diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index 6642d5b42..5111522f2 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -98,8 +98,7 @@ ProcXGetDeviceFocus(ClientPtr client) REQUEST_SIZE_MATCH(xGetDeviceFocusReq); dev = LookupDeviceIntRec(stuff->deviceid); - if (dev == NULL || !dev->focus) - { + if (dev == NULL || !dev->focus) { SendErrorToClient(client, IReqCode, X_GetDeviceFocus, 0, BadDevice); return Success; } -- cgit v1.2.3