Skip to content

N
nx-libs
Commit 6859815e authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Call pScreen->ConstrainCursorHarder from the position update path

Backported from X.org, maybe incomplete, inspired by: commit 810fbfa44626bff9f443ab17c0ad27ff7ae121d7 Author: Adam Jackson <ajax@redhat.com> Date: Wed Feb 9 17:32:16 2011 -0500 mi: Call pScreen->ConstrainCursorHarder from the position update path v2: Cover more paths, spotted by Daniel Stone. v3: pass down the mode field for movement mode. Reviewed-by: 's avatarDaniel Stone <daniel@fooishbar.org> Signed-off-by: 's avatarAdam Jackson <ajax@redhat.com> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent a60c22f4
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
nx-X11/programs/Xserver/mi/mipointer.c
View file @ 6859815e
...@@ -46,6 +46,7 @@ in this Software without prior written authorization from The Open Group. ...@@ -46,6 +46,7 @@ in this Software without prior written authorization from The Open Group.
# include "mipointrst.h" # include "mipointrst.h"
# include "cursorstr.h" # include "cursorstr.h"
# include "dixstruct.h" # include "dixstruct.h"
# include <nx-X11/extensions/XI.h>
int miPointerScreenIndex; int miPointerScreenIndex;
static unsigned long miPointerGeneration = 0; static unsigned long miPointerGeneration = 0;
...@@ -224,6 +225,10 @@ miPointerSetCursorPosition(pScreen, x, y, generateEvent) ...@@ -224,6 +225,10 @@ miPointerSetCursorPosition(pScreen, x, y, generateEvent)
SetupScreen (pScreen); SetupScreen (pScreen);
GenerateEvent = generateEvent; GenerateEvent = generateEvent;
if (pScreen->ConstrainCursorHarder)
pScreen->ConstrainCursorHarder(pScreen, Absolute, &x, &y);
/* device dependent - must pend signal and call miPointerWarpCursor */ /* device dependent - must pend signal and call miPointerWarpCursor */
(*pScreenPriv->screenFuncs->WarpCursor) (pScreen, x, y); (*pScreenPriv->screenFuncs->WarpCursor) (pScreen, x, y);
if (!generateEvent) if (!generateEvent)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment