hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-29 21:46:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
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
This commit is contained in:
Peter Hutterer 2008-01-03 17:04:54 +10:30
commit 8da83836b6
718 changed files with 11577 additions and 33702 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Xi/warpdevp.c
View file

@ -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)
{