andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xf86Cursor: Take the input lock in xf86Set/MoveCursor

Browse Source 
Prevents the HW cursor from intermittently jumping around when the
cursor image is changed while the cursor is being moved. This is hardly
noticeable in normal operation but can be quite confusing when stepping
through these codepaths in a debugger.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Michel Dänzer 2016-10-05 18:28:45 +09:00 committed by Michel Dänzer
parent 011ce3297d
commit 9cf0bd4d45
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/xfree86/ramdac/xf86HWCurs.c
View File

@ -215,12 +215,15 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
(xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
xf86CursorScreenKey);
ScreenPtr pSlave;
Bool ret = FALSE;
input_lock();
x -= ScreenPriv->HotX;
y -= ScreenPriv->HotY;
if (!xf86ScreenSetCursor(pScreen, pCurs, x, y))
return FALSE;
goto out;
/* ask each slave driver to set the cursor. */
xorg_list_for_each_entry(pSlave, &pScreen->slave_list, slave_head) {
@ -233,10 +236,14 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
* otherwise both the hw and sw cursor will show.
*/
xf86SetCursor(pScreen, NullCursor, x, y);
return FALSE;
goto out;
}
}
return TRUE;
ret = TRUE;
out:
input_unlock();
return ret;
}
void
@ -283,6 +290,8 @@ xf86MoveCursor(ScreenPtr pScreen, int x, int y)
xf86CursorScreenKey);
ScreenPtr pSlave;
input_lock();
x -= ScreenPriv->HotX;
y -= ScreenPriv->HotY;
@ -295,6 +304,8 @@ xf86MoveCursor(ScreenPtr pScreen, int x, int y)
xf86ScreenMoveCursor(pSlave, x, y);
}
input_unlock();
}
void