diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-03 17:04:54 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-03 17:04:54 +1030 |
| commit | 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d (patch) | |
| tree | 092efcfc39e3e293baaf04c4c84027ee453d3e13 /Xi/warpdevp.c | |
| parent | eace88989c3b65d5c20e9f37ea9b23c7c8e19335 (diff) | |
| parent | ae869fc7669764729e13fdd70149ed636753f2a3 (diff) | |
Merge branch 'master' into mpx
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
Diffstat (limited to 'Xi/warpdevp.c')
| -rw-r--r-- | Xi/warpdevp.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c index 85fa7a902..24661d099 100644 --- a/Xi/warpdevp.c +++ b/Xi/warpdevp.c @@ -46,7 +46,6 @@ from the author. #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" @@ -83,13 +82,10 @@ ProcXWarpDevicePointer(ClientPtr client) /* FIXME: panoramix stuff is missing, look at ProcWarpPointer */ - pDev = LookupDeviceIntRec(stuff->deviceid); - if (pDev == NULL) { - SendErrorToClient(client, IReqCode, X_WarpDevicePointer, - stuff->deviceid, - BadDevice); - return Success; - } + err = dixLookupDevice(&pDev, stuff->deviceid, client, DixWriteAccess); + + if (err != Success) + return err; if (stuff->dst_win != None) { |