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

(submit/cursor-api) 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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-29 14:35:48 +01:00
parent 24ceca23eb
commit bcf399370c
3 changed files with 7 additions and 24 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,16 +57,10 @@ SOFTWARE.
/* Provide support for alpha composited cursors */
#define ARGB_CURSOR
struct _DeviceIntRec;
typedef struct _Cursor *CursorPtr;
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 */

12
record/record.c
View File

@ -36,20 +36,22 @@ and Jim Haggerty of Metheus.
#include <dix-config.h>
#endif
#include <stdio.h>
#include <assert.h>
#include <X11/Xmd.h>
#include <X11/extensions/recordproto.h>
#include "dix/cursor_priv.h"
#include "dix/eventconvert.h"
#include "miext/extinit_priv.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include <X11/extensions/recordproto.h>
#include "set.h"
#include "swaprep.h"
#include "inputstr.h"
#include "scrnintstr.h"
#include <stdio.h>
#include <assert.h>
#ifdef PANORAMIX
#include "globals.h"
#include "panoramiX.h"
@ -722,7 +724,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 +=