diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-02-20 22:16:49 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-02-20 22:16:49 +0000 |
| commit | 6d7083bd69724586338d79784655328f1fcd2ae5 (patch) | |
| tree | 59f85a0e3892d181bffc5dba78e040e91b838a27 /Xi/setfocus.c | |
| parent | 5480c537cee79b324736eac3e438a4713dfa1036 (diff) | |
indent fixes (OMG SO UGLY), and nuke old RCS keywords.
Diffstat (limited to 'Xi/setfocus.c')
| -rw-r--r-- | Xi/setfocus.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/Xi/setfocus.c b/Xi/setfocus.c index 184dd7a7f..59fe0768c 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -1,5 +1,3 @@ -/* $Xorg: setfocus.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.2 2001/01/17 22:13:26 dawes Exp $ */ /*********************************************************************** * @@ -59,17 +56,17 @@ SOFTWARE. #include <dix-config.h> #endif -#include <X11/X.h> /* for inputstr.h */ -#include <X11/Xproto.h> /* Request macro */ -#include "windowstr.h" /* focus struct */ -#include "inputstr.h" /* DeviceIntPtr */ +#include <X11/X.h> /* for inputstr.h */ +#include <X11/Xproto.h> /* Request macro */ +#include "windowstr.h" /* focus struct */ +#include "inputstr.h" /* DeviceIntPtr */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include "dixevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setfocus.h" @@ -90,8 +87,8 @@ SProcXSetDeviceFocus(register ClientPtr client) REQUEST_SIZE_MATCH(xSetDeviceFocusReq); swapl(&stuff->focus, n); swapl(&stuff->time, n); - return(ProcXSetDeviceFocus(client)); - } + return (ProcXSetDeviceFocus(client)); +} /*********************************************************************** * @@ -102,23 +99,22 @@ SProcXSetDeviceFocus(register ClientPtr client) int ProcXSetDeviceFocus(register ClientPtr client) { - int ret; - register DeviceIntPtr dev; + int ret; + register DeviceIntPtr dev; REQUEST(xSetDeviceFocusReq); REQUEST_SIZE_MATCH(xSetDeviceFocusReq); - dev = LookupDeviceIntRec (stuff->device); - if (dev==NULL || !dev->focus) - { + dev = LookupDeviceIntRec(stuff->device); + if (dev == NULL || !dev->focus) { SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, BadDevice); return Success; - } + } - ret = SetInputFocus (client, dev, stuff->focus, stuff->revertTo, - stuff->time, TRUE); + ret = SetInputFocus(client, dev, stuff->focus, stuff->revertTo, + stuff->time, TRUE); if (ret != Success) SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, ret); return Success; - } +} |