frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive: changes ephyr API according mpx merge. 

This fix host-cursor in Xephyr server.

Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
This commit is contained in:
Tiago Vignatti 2008-06-01 18:31:52 -03:00 committed by Peter Hutterer
parent 5a3d06b8f4
commit 5ba07cb548
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/kdrive/ephyr/ephyr.c
View File

@ -837,7 +837,7 @@ ephyrCrossScreen (ScreenPtr pScreen, Bool entering)
int ephyrCurScreen; /*current event screen*/ int ephyrCurScreen; /*current event screen*/
static void static void
ephyrWarpCursor (ScreenPtr pScreen, int x, int y) ephyrWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
ephyrBlockSigio (); ephyrBlockSigio ();
ephyrCurScreen = pScreen->myNum; ephyrCurScreen = pScreen->myNum;
@ -849,7 +849,9 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs =
{ {
ephyrCursorOffScreen, ephyrCursorOffScreen,
ephyrCrossScreen, ephyrCrossScreen,
ephyrWarpCursor ephyrWarpCursor,
NULL,
NULL
}; };
#ifdef XF86DRI #ifdef XF86DRI
@ -911,7 +913,7 @@ ephyrPoll(void)
if (ev.data.mouse_motion.screen >= 0) if (ev.data.mouse_motion.screen >= 0)
{ {
ephyrWarpCursor ephyrWarpCursor
(screenInfo.screens[ev.data.mouse_motion.screen], (inputInfo.pointer, screenInfo.screens[ev.data.mouse_motion.screen],
ev.data.mouse_motion.x, ev.data.mouse_motion.x,
ev.data.mouse_motion.y ); ev.data.mouse_motion.y );
} }

8
hw/kdrive/ephyr/ephyrinit.c
View File

@ -290,12 +290,18 @@ ephyrMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
; ;
} }
static Bool
ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
{
return TRUE;
}
miPointerSpriteFuncRec EphyrPointerSpriteFuncs = { miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {
ephyrRealizeCursor, ephyrRealizeCursor,
ephyrUnrealizeCursor, ephyrUnrealizeCursor,
ephyrSetCursor, ephyrSetCursor,
ephyrMoveCursor, ephyrMoveCursor,
NULL, ephyrDeviceCursorInitialize,
NULL NULL
}; };