xfree86: update GetMaster check for the VCP.
Same result, but now also triggers on slave keyboards that send pointer events. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
This commit is contained in:
parent
ce7f79efd5
commit
d270f12a3e
|
@ -317,8 +317,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
|
||||||
|
|
||||||
/* only update for VCP, otherwise we get cursor jumps when removing a
|
/* only update for VCP, otherwise we get cursor jumps when removing a
|
||||||
sprite. The second cursor is never HW rendered anyway. */
|
sprite. The second cursor is never HW rendered anyway. */
|
||||||
if (pDev == inputInfo.pointer ||
|
if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)
|
||||||
(!IsMaster(pDev) && pDev->u.master == inputInfo.pointer))
|
|
||||||
{
|
{
|
||||||
pCurs->refcnt++;
|
pCurs->refcnt++;
|
||||||
if (ScreenPriv->CurrentCursor)
|
if (ScreenPriv->CurrentCursor)
|
||||||
|
@ -386,8 +385,7 @@ xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
|
||||||
|
|
||||||
/* only update coordinate state for first sprite, otherwise we get jumps
|
/* only update coordinate state for first sprite, otherwise we get jumps
|
||||||
when removing a sprite. The second sprite is never HW rendered anyway */
|
when removing a sprite. The second sprite is never HW rendered anyway */
|
||||||
if (pDev == inputInfo.pointer ||
|
if (GetMaster(pDev, MASTER_POINTER) == inputInfo.pointer)
|
||||||
(!IsMaster(pDev) && pDev->u.master == inputInfo.pointer))
|
|
||||||
{
|
{
|
||||||
ScreenPriv->x = x;
|
ScreenPriv->x = x;
|
||||||
ScreenPriv->y = y;
|
ScreenPriv->y = y;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user