hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-26 01:59:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mpx

Browse source 
Conflicts:

	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c
This commit is contained in:
Peter Hutterer 2007-08-12 15:31:10 +09:30
commit f367285fd5
755 changed files with 16266 additions and 5261 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hw/xfree86/common/xf86Cursor.c
View file

@ -25,8 +25,6 @@
* authorization from the copyright holder(s) and author(s).
*/
/* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */
#define NEED_EVENTS
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
@ -408,18 +406,14 @@ xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
/*
* xf86CrossScreen --
* Switch to another screen
*
* Currently nothing special happens, but mi assumes the CrossScreen
* method exists.
*/
/* NEED TO CHECK THIS */
/* ARGSUSED */
static void
xf86CrossScreen (ScreenPtr pScreen, Bool entering)
{
#if 0
if (xf86Info.sharedMonitor)
(XF86SCRNINFO(pScreen)->EnterLeaveMonitor)(entering);
(XF86SCRNINFO(pScreen)->EnterLeaveCursor)(entering);
#endif
}