aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-05-22 00:49:10 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-05-22 00:49:10 +0200
commit222a4a22214608b7f89691eee1c57873c2631705 (patch)
tree0b4a1b5d3483d2ba14a21671d8e5f5c2b3e2245d /nx-X11/programs/Xserver/hw/nxagent/Cursor.c
parentc29053f82cbea5f2704d99c4d5e8afe0329e5cbe (diff)
downloadnx-libs-222a4a22214608b7f89691eee1c57873c2631705.tar.gz
nx-libs-222a4a22214608b7f89691eee1c57873c2631705.tar.bz2
nx-libs-222a4a22214608b7f89691eee1c57873c2631705.zip
Imported nxagent-3.5.0-9.tar.gznxagent
Summary: Imported nxagent-3.5.0-9.tar.gz Keywords: Imported nxagent-3.5.0-9.tar.gz into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Cursor.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Cursor.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
index e27415b91..9d48aa134 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
@@ -290,10 +290,25 @@ void nxagentRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor,
&fg_color, &bg_color);
}
+Bool (*nxagentSetCursorPositionW)(ScreenPtr pScreen, int x, int y,
+ Bool generateEvent);
+
Bool nxagentSetCursorPosition(ScreenPtr pScreen, int x, int y,
Bool generateEvent)
{
- return 1;
+ if (generateEvent != 0)
+ {
+ return (*nxagentSetCursorPositionW)(pScreen, x, y, generateEvent);
+ }
+ else
+ {
+ /*
+ * Calling miSetCursorPosition with generateEvent == 0
+ * causes a crash in miPoiterUpdate().
+ */
+
+ return 1;
+ }
}
void nxagentReconnectCursor(pointer p0, XID x1, pointer p2)