aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi/xisetdevfocus.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-16 09:17:34 +0200
committermarha <marha@users.sourceforge.net>2012-04-16 09:17:34 +0200
commitd6d3999ccb2cb72d55820770260172eccbbb68d7 (patch)
tree568ce82dd1a8e2edbbe8cd4cb5ab5b14157f34f6 /xorg-server/Xi/xisetdevfocus.c
parentfffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (diff)
downloadvcxsrv-d6d3999ccb2cb72d55820770260172eccbbb68d7.tar.gz
vcxsrv-d6d3999ccb2cb72d55820770260172eccbbb68d7.tar.bz2
vcxsrv-d6d3999ccb2cb72d55820770260172eccbbb68d7.zip
libX11 xserver pixman mesa git update 16 Apr 2012
Diffstat (limited to 'xorg-server/Xi/xisetdevfocus.c')
-rw-r--r--xorg-server/Xi/xisetdevfocus.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/xorg-server/Xi/xisetdevfocus.c b/xorg-server/Xi/xisetdevfocus.c
index 294df7c32..b52c9cc99 100644
--- a/xorg-server/Xi/xisetdevfocus.c
+++ b/xorg-server/Xi/xisetdevfocus.c
@@ -32,12 +32,12 @@
#include <dix-config.h>
#endif
-#include "inputstr.h" /* DeviceIntPtr */
-#include "windowstr.h" /* window structure */
+#include "inputstr.h" /* DeviceIntPtr */
+#include "windowstr.h" /* window structure */
#include <X11/extensions/XI2.h>
#include <X11/extensions/XI2proto.h>
-#include "exglobals.h" /* BadDevice */
+#include "exglobals.h" /* BadDevice */
#include "xisetdevfocus.h"
int
@@ -73,12 +73,12 @@ ProcXISetFocus(ClientPtr client)
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetFocusAccess);
if (ret != Success)
- return ret;
+ return ret;
if (!dev->focus)
- return BadDevice;
+ return BadDevice;
return SetInputFocus(client, dev, stuff->focus, RevertToParent,
- stuff->time, TRUE);
+ stuff->time, TRUE);
}
int
@@ -93,9 +93,9 @@ ProcXIGetFocus(ClientPtr client)
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetFocusAccess);
if (ret != Success)
- return ret;
+ return ret;
if (!dev->focus)
- return BadDevice;
+ return BadDevice;
rep.repType = X_Reply;
rep.RepType = X_XIGetFocus;
@@ -103,23 +103,23 @@ ProcXIGetFocus(ClientPtr client)
rep.sequenceNumber = client->sequence;
if (dev->focus->win == NoneWin)
- rep.focus = None;
+ rep.focus = None;
else if (dev->focus->win == PointerRootWin)
- rep.focus = PointerRoot;
+ rep.focus = PointerRoot;
else if (dev->focus->win == FollowKeyboardWin)
- rep.focus = FollowKeyboard;
+ rep.focus = FollowKeyboard;
else
- rep.focus = dev->focus->win->drawable.id;
+ rep.focus = dev->focus->win->drawable.id;
WriteReplyToClient(client, sizeof(xXIGetFocusReply), &rep);
return Success;
}
void
-SRepXIGetFocus(ClientPtr client, int len, xXIGetFocusReply *rep)
+SRepXIGetFocus(ClientPtr client, int len, xXIGetFocusReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swapl(&rep->focus);
- WriteToClient(client, len, (char *)rep);
+ WriteToClient(client, len, (char *) rep);
}