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

stop using long deprecated xf86BlockSIGIO() and xf86UnblockSIGIO()

Browse Source 
These functions have been replaced by input_lock() and input_unlock()
about a decade ago and only exisiting as inlined wrappers.

v2: increase required server version to 1.18.99.2

No need to support almost 1.5 decades old and unmaintained Xserver version,
almost one decade is more than enough ;-)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-02-20 16:12:12 +01:00
committed by Alan Coopersmith
parent c8d19c805d
commit a5f72befe2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -48,7 +48,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
XORG_DRIVER_CHECK_EXT(XKB, kbproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.99.2] xproto $REQUIRED_MODULES)
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18.99.2] xproto $REQUIRED_MODULES)
DRIVER_NAME=joystick
AC_SUBST([DRIVER_NAME])

12
src/jstk_axis.c
View File

@@ -59,14 +59,14 @@ jstkAxisTimer(OsTimerPtr timer,
InputInfoPtr pInfo = device->public.devicePrivate;
JoystickDevPtr priv = pInfo->private;
int sigstate, i;
int i;
int nexttimer;
int movex,movey,movezx,movezy;
nexttimer = 0;
movex = movey = movezx = movezy = 0;
sigstate = xf86BlockSIGIO();
input_lock();
for (i=0; i<MAXAXES; i++) if ((priv->axis[i].value != 0) &&
(priv->axis[i].type != JSTK_TYPE_NONE)) {
@@ -306,7 +306,7 @@ jstkAxisTimer(OsTimerPtr timer,
DBG(2, ErrorF("Stopping Axis Timer\n"));
}
xf86UnblockSIGIO (sigstate);
input_unlock();
return nexttimer;
}
@@ -464,12 +464,12 @@ jstkPWMAxisTimer(OsTimerPtr timer,
InputInfoPtr pInfo = device->public.devicePrivate;
JoystickDevPtr priv = pInfo->private;
int sigstate, i;
int i;
int nexttimer;
nexttimer = 0;
sigstate = xf86BlockSIGIO();
input_lock();
for (i=0; i<MAXAXES; i++)
if (priv->axis[i].timer == timer) /* The timer handles only one axis! Find it. */
@@ -576,7 +576,7 @@ jstkPWMAxisTimer(OsTimerPtr timer,
break;
}
xf86UnblockSIGIO (sigstate);
input_unlock();
return nexttimer;
}