diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-09-24 13:33:01 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-09-26 07:26:59 -0400 |
| commit | 31a7994ac7365562ef1d00e0a7b25f967a961a4e (patch) | |
| tree | a2054c0e371e9c62396f2e09df469142dca0a633 /Xi/setfocus.c | |
| parent | 56ffc381d32687242dd094395fcf2216339bab2a (diff) | |
Input: Return errors to the dispatcher instead of sending them ourself.
Also fixed two "unused variable: stuff" warnings.
Diffstat (limited to 'Xi/setfocus.c')
| -rw-r--r-- | Xi/setfocus.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Xi/setfocus.c b/Xi/setfocus.c index aaf88ce6f..74de17e97 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -56,8 +56,6 @@ 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/extensions/XI.h> @@ -65,7 +63,6 @@ SOFTWARE. #include "dixevents.h" -#include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" @@ -106,15 +103,11 @@ ProcXSetDeviceFocus(ClientPtr client) REQUEST_SIZE_MATCH(xSetDeviceFocusReq); dev = LookupDeviceIntRec(stuff->device); - if (dev == NULL || !dev->focus) { - SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, BadDevice); - return Success; - } + if (dev == NULL || !dev->focus) + return BadDevice; ret = SetInputFocus(client, dev, stuff->focus, stuff->revertTo, stuff->time, TRUE); - if (ret != Success) - SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, ret); - return Success; + return ret; } |