XLibre/xf86-video-sis
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-sis.git synced 2026-03-24 01:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop compat with ancient xinput abi major below 22

Browse Source 
We're relying on at least 1.18 now, so Xinput ABI major is at least 22.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/12>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-05-22 11:59:11 +02:00
committed by Marge Bot
parent 5f37a60ce5
commit 4f41d5a36a
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/sis_driver.c
View File

@@ -81,10 +81,7 @@
#include <X11/extensions/dpms.h>
#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
#include <inputstr.h> /* for inputInfo */
#endif
#ifdef SISDRI
#include "dri.h"
@@ -9212,9 +9209,6 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
int CRT1XOffs = 0, CRT1YOffs = 0, CRT2XOffs = 0, CRT2YOffs = 0;
int HVirt = pScrn1->virtualX;
int VVirt = pScrn1->virtualY;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20
int sigstate;
#endif
Bool doit = FALSE, HaveNonRect = FALSE, HaveOffsRegions = FALSE;
SiSScrn2Rel srel = ((SiSMergedDisplayModePtr)pSiS->CurrentLayout.mode->Private)->CRT2Position;
@@ -9277,25 +9271,6 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg, int x, int y)
}
}
if(doit) {
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 /* screw it */
sigstate = xf86BlockSIGIO();
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
{
double dx = x, dy = y;
miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
x = (int)dx;
y = (int)dy;
}
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y);
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
miPointerSetPosition(inputInfo.pointer, &x, &y);
#else
UpdateCurrentTime();
miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
#endif
xf86UnblockSIGIO(sigstate);
#endif
return;
}
}