diff options
| author | Tiago Vignatti <vignatti@c3sl.ufpr.br> | 2008-06-01 18:31:52 -0300 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-02 10:27:12 +0930 |
| commit | 5ba07cb54803b8c63e25e8ca1f1787860f684612 (patch) | |
| tree | aff354e0ec6d689374b51c1e01bfe0e57958f642 | |
| parent | 5a3d06b8f42473cea3741dc722a775deaa2b73f6 (diff) | |
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>
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 8 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index d0fa99831..e5b16c95a 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -837,7 +837,7 @@ ephyrCrossScreen (ScreenPtr pScreen, Bool entering) int ephyrCurScreen; /*current event screen*/ static void -ephyrWarpCursor (ScreenPtr pScreen, int x, int y) +ephyrWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { ephyrBlockSigio (); ephyrCurScreen = pScreen->myNum; @@ -849,7 +849,9 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs = { ephyrCursorOffScreen, ephyrCrossScreen, - ephyrWarpCursor + ephyrWarpCursor, + NULL, + NULL }; #ifdef XF86DRI @@ -911,7 +913,7 @@ ephyrPoll(void) if (ev.data.mouse_motion.screen >= 0) { 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.y ); } diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index e00791c18..1ec98fc82 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -290,12 +290,18 @@ ephyrMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) ; } +static Bool +ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) +{ + return TRUE; +} + miPointerSpriteFuncRec EphyrPointerSpriteFuncs = { ephyrRealizeCursor, ephyrUnrealizeCursor, ephyrSetCursor, ephyrMoveCursor, - NULL, + ephyrDeviceCursorInitialize, NULL }; |