diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-05-22 00:50:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-05-22 00:50:51 +0200 |
| commit | fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794 (patch) | |
| tree | 316ac30721a364e72b4fddf9e3a21ceb81ef7547 /nx-X11/programs/Xserver/hw/nxagent/Cursor.c | |
| parent | fe72988fb668ad97fc4fcb2ee3862613324d9516 (diff) | |
| parent | 222a4a22214608b7f89691eee1c57873c2631705 (diff) | |
| download | nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.gz nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.tar.bz2 nx-libs-fdaa240434e4b5022f2bc6b6aa7f590c0dcdc794.zip | |
Merge branch 'nxagent'
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Cursor.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Cursor.c | 17 |
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) |