diff options
| -rw-r--r-- | dix/events.c | 13 | ||||
| -rw-r--r-- | include/cursor.h | 6 | ||||
| -rw-r--r-- | record/record.c | 3 |
3 files changed, 2 insertions, 20 deletions
diff --git a/dix/events.c b/dix/events.c index 1dd1fd40c..983ce739b 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1050,19 +1050,6 @@ GetSpritePosition(DeviceIntPtr pDev, int *px, int *py) *py = pSprite->hotPhys.y; } -#ifdef PANORAMIX -int -XineramaGetCursorScreen(DeviceIntPtr pDev) -{ - if (!noPanoramiXExtension) { - return pDev->spriteInfo->sprite->screen->myNum; - } - else { - return 0; - } -} -#endif /* PANORAMIX */ - #define TIMESLOP (5 * 60 * 1000) /* 5 minutes */ static void diff --git a/include/cursor.h b/include/cursor.h index 7167f4707..50796d047 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -57,8 +57,6 @@ SOFTWARE. /* Provide support for alpha composited cursors */ #define ARGB_CURSOR -struct _DeviceIntRec; - typedef struct _Cursor *CursorPtr; // FUN FACT: If you typedef a pointer type, like the `CursorPtr` above // then `const CursorPtr` or `CursorPtr const` actually means `struct _Cursor *const`, a constant pointer @@ -70,8 +68,4 @@ typedef struct _CursorMetric *CursorMetricPtr; extern _X_EXPORT int FreeCursor(void *pCurs, XID cid); -#ifdef PANORAMIX -extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev); -#endif /* PANORAMIX */ - #endif /* CURSOR_H */ diff --git a/record/record.c b/record/record.c index 284a58ba9..748088db8 100644 --- a/record/record.c +++ b/record/record.c @@ -36,6 +36,7 @@ and Jim Haggerty of Metheus. #include <dix-config.h> #endif +#include "dix/cursor_priv.h" #include "dix/eventconvert.h" #include "dixstruct.h" @@ -722,7 +723,7 @@ RecordSendProtocolEvents(RecordClientsAndProtocolPtr pRCAP, pev->u.u.type == ButtonPress || pev->u.u.type == ButtonRelease || pev->u.u.type == KeyPress || pev->u.u.type == KeyRelease)) { - int scr = XineramaGetCursorScreen(inputInfo.pointer); + int scr = inputInfo.pointer->spriteInfo->sprite->screen->myNum; memcpy(&shiftedEvent, pev, sizeof(xEvent)); shiftedEvent.u.keyButtonPointer.rootX += |