diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/Xi/getfocus.c | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/Xi/getfocus.c')
| -rw-r--r-- | xorg-server/Xi/getfocus.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xorg-server/Xi/getfocus.c b/xorg-server/Xi/getfocus.c index 676850df1..ba36e37e3 100644 --- a/xorg-server/Xi/getfocus.c +++ b/xorg-server/Xi/getfocus.c @@ -54,8 +54,8 @@ SOFTWARE. #include <dix-config.h> #endif -#include "windowstr.h" /* focus struct */ -#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* focus struct */ +#include "inputstr.h" /* DeviceIntPtr */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include "exglobals.h" @@ -95,9 +95,9 @@ ProcXGetDeviceFocus(ClientPtr client) rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetFocusAccess); if (rc != Success) - return rc; + return rc; if (!dev->focus) - return BadDevice; + return BadDevice; rep.repType = X_Reply; rep.RepType = X_GetDeviceFocus; @@ -107,13 +107,13 @@ ProcXGetDeviceFocus(ClientPtr client) focus = dev->focus; if (focus->win == NoneWin) - rep.focus = None; + rep.focus = None; else if (focus->win == PointerRootWin) - rep.focus = PointerRoot; + rep.focus = PointerRoot; else if (focus->win == FollowKeyboardWin) - rep.focus = FollowKeyboard; + rep.focus = FollowKeyboard; else - rep.focus = focus->win->drawable.id; + rep.focus = focus->win->drawable.id; rep.time = focus->time.milliseconds; rep.revertTo = focus->revert; @@ -135,5 +135,5 @@ SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep) swapl(&rep->length); swapl(&rep->focus); swapl(&rep->time); - WriteToClient(client, size, (char *)rep); + WriteToClient(client, size, (char *) rep); } |