From cfac96b809ce3ff8845f716759c971136c68ded0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 19 Dec 2025 15:09:52 +0100 Subject: [PATCH] drop compat with Xserver < 21.0 Signed-off-by: Enrico Weigelt, metux IT consult --- src/emuMB.c | 8 -------- src/emuThird.c | 8 -------- src/evdev.h | 4 ---- 3 files changed, 20 deletions(-) diff --git a/src/emuMB.c b/src/emuMB.c index 3bb03ae..8f2ecb7 100644 --- a/src/emuMB.c +++ b/src/emuMB.c @@ -185,11 +185,7 @@ EvdevMBEmuTimer(InputInfoPtr pInfo) int id; int mapped_id; -#if HAVE_THREADED_INPUT input_lock(); -#else - int sigstate = xf86BlockSIGIO(); -#endif pEvdev->emulateMB.pending = FALSE; if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) { @@ -205,11 +201,7 @@ EvdevMBEmuTimer(InputInfoPtr pInfo) pEvdev->emulateMB.state); } -#if HAVE_THREADED_INPUT input_unlock(); -#else - xf86UnblockSIGIO(sigstate); -#endif return 0; } diff --git a/src/emuThird.c b/src/emuThird.c index 03ad048..409a84a 100644 --- a/src/emuThird.c +++ b/src/emuThird.c @@ -87,18 +87,10 @@ Evdev3BEmuTimer(OsTimerPtr timer, CARD32 time, pointer arg) EvdevPtr pEvdev = pInfo->private; struct emulate3B *emu3B = &pEvdev->emulate3B; -#if HAVE_THREADED_INPUT input_lock(); -#else - int sigstate = xf86BlockSIGIO(); -#endif emu3B->state = EM3B_EMULATING; Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_PRESS); -#if HAVE_THREADED_INPUT input_unlock(); -#else - xf86UnblockSIGIO(sigstate); -#endif return 0; } diff --git a/src/evdev.h b/src/evdev.h index 1078b7e..b7d305e 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -68,10 +68,6 @@ #define LED_CNT (LED_MAX+1) #endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23 -#define HAVE_THREADED_INPUT 1 -#endif - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24 #define BLOCK_HANDLER_ARGS void *data, void *waitTime #define WAKEUP_HANDLER_ARGS void *data, int i