frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: drop superfluous XineramaGetCursorScreen() 

It's only used for record extension, no external callers, thus doesn't
need to be exported. Since it's just for retrieving one struct value,
it's not needed at all - we can do this directly (just like we do in
many other places)

Note: the check on noPanoramixExtensions is superfluous, since the only
call site already does it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-29 14:35:48 +01:00 committed by Marge Bot
parent eb81769b58
commit 6c7c4fdc7e
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/events.c
View File

@ -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

6
include/cursor.h
View File

@ -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 */

3
record/record.c
View File

@ -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 +=