|
 |
637c9d |
From b8e4a6a4b78946e2155e0413ce396d587ab35a66 Mon Sep 17 00:00:00 2001
|
|
|
637c9d |
From: Adam Jackson <ajax@redhat.com>
|
|
|
637c9d |
Date: Fri, 9 Feb 2018 16:03:38 -0500
|
|
|
637c9d |
Subject: [PATCH xserver 6/6] animcur: Change which CursorPtr we save in
|
|
|
637c9d |
external state
|
|
|
637c9d |
|
|
|
637c9d |
Formerly spriteInfo->anim.pCursor would point to the animated cursor (or
|
|
|
637c9d |
NULL if not animated). That value would also be available in
|
|
|
637c9d |
spriteInfo->sprite->current, so instead lets use anim.pCursor to point
|
|
|
637c9d |
to the current animation element.
|
|
|
637c9d |
|
|
|
637c9d |
(Also: having done this, look that one up from the XFixes requests)
|
|
|
637c9d |
|
|
|
637c9d |
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
637c9d |
(cherry picked from commit e4edcaca33d3b23f612d5a91a93f52770d8fab3e)
|
|
|
637c9d |
---
|
|
|
637c9d |
render/animcur.c | 7 ++++---
|
|
|
637c9d |
xfixes/cursor.c | 5 ++++-
|
|
|
637c9d |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
637c9d |
|
|
|
637c9d |
diff --git a/render/animcur.c b/render/animcur.c
|
|
|
637c9d |
index e585a8f23..50e254d01 100644
|
|
|
637c9d |
--- a/render/animcur.c
|
|
|
637c9d |
+++ b/render/animcur.c
|
|
|
637c9d |
@@ -133,7 +133,7 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
|
|
|
637c9d |
ScreenPtr pScreen = dev->spriteInfo->anim.pScreen;
|
|
|
637c9d |
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
|
637c9d |
|
|
|
637c9d |
- AnimCurPtr ac = GetAnimCur(dev->spriteInfo->anim.pCursor);
|
|
|
637c9d |
+ AnimCurPtr ac = GetAnimCur(dev->spriteInfo->sprite->current);
|
|
|
637c9d |
int elt = (dev->spriteInfo->anim.elt + 1) % ac->nelt;
|
|
|
637c9d |
DisplayCursorProcPtr DisplayCursor = pScreen->DisplayCursor;
|
|
|
637c9d |
|
|
|
637c9d |
@@ -148,6 +148,7 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
|
|
|
637c9d |
|
|
|
637c9d |
dev->spriteInfo->anim.elt = elt;
|
|
|
637c9d |
dev->spriteInfo->anim.time = now + ac->elts[elt].delay;
|
|
|
637c9d |
+ dev->spriteInfo->anim.pCursor = ac->elts[elt].pCursor;
|
|
|
637c9d |
|
|
|
637c9d |
return ac->elts[elt].delay;
|
|
|
637c9d |
}
|
|
|
637c9d |
@@ -155,7 +156,7 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
|
|
|
637c9d |
static void
|
|
|
637c9d |
AnimCurCancelTimer(DeviceIntPtr pDev)
|
|
|
637c9d |
{
|
|
|
637c9d |
- CursorPtr cur = pDev->spriteInfo->anim.pCursor;
|
|
|
637c9d |
+ CursorPtr cur = pDev->spriteInfo->sprite->current;
|
|
|
637c9d |
|
|
|
637c9d |
if (IsAnimCur(cur))
|
|
|
637c9d |
TimerCancel(GetAnimCur(cur)->timer);
|
|
|
637c9d |
@@ -172,7 +173,7 @@ AnimCurDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
|
|
|
637c9d |
|
|
|
637c9d |
Unwrap(as, pScreen, DisplayCursor);
|
|
|
637c9d |
if (IsAnimCur(pCursor)) {
|
|
|
637c9d |
- if (pCursor != pDev->spriteInfo->anim.pCursor) {
|
|
|
637c9d |
+ if (pCursor != pDev->spriteInfo->sprite->current) {
|
|
|
637c9d |
AnimCurPtr ac = GetAnimCur(pCursor);
|
|
|
637c9d |
|
|
|
637c9d |
AnimCurCancelTimer(pDev);
|
|
|
637c9d |
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
|
|
|
637c9d |
index a150f450b..a1fbd562e 100644
|
|
|
637c9d |
--- a/xfixes/cursor.c
|
|
|
637c9d |
+++ b/xfixes/cursor.c
|
|
|
637c9d |
@@ -134,8 +134,11 @@ Bool EnableCursor = TRUE;
|
|
|
637c9d |
static CursorPtr
|
|
|
637c9d |
CursorForDevice(DeviceIntPtr pDev)
|
|
|
637c9d |
{
|
|
|
637c9d |
- if (pDev && pDev->spriteInfo && pDev->spriteInfo->sprite)
|
|
|
637c9d |
+ if (pDev && pDev->spriteInfo && pDev->spriteInfo->sprite) {
|
|
|
637c9d |
+ if (pDev->spriteInfo->anim.pCursor)
|
|
|
637c9d |
+ return pDev->spriteInfo->anim.pCursor;
|
|
|
637c9d |
return pDev->spriteInfo->sprite->current;
|
|
|
637c9d |
+ }
|
|
|
637c9d |
|
|
|
637c9d |
return NULL;
|
|
|
637c9d |
}
|
|
|
637c9d |
--
|
|
|
637c9d |
2.14.3
|