File u_03-Remove-compiler-warnings-on-newer-xorg.patch of Package xf86-input-evdev

Overview Repositories Revisions Requests Users Attributes Meta

File u_03-Remove-compiler-warnings-on-newer-xorg.patch of Package xf86-input-evdev (Revision 25a2ef3c8196a28c9e9147edd1fb951a)

Currently displaying revision 25a2ef3c8196a28c9e9147edd1fb951a , Show latest

From f1ca1c62cf7f20c1c30dce7f61789d79aa03d61e Mon Sep 17 00:00:00 2001
From: Tuukka Pasanen <tuukka.pasanen@ilmi.fi>
Date: Fri, 1 Oct 2021 09:40:48 +0300
Subject: [PATCH xf86-input-evdev 2/2] Remove compiler warnings on newer Xorg

There is several warnings that pollute compiling kioskTouch.c.
this patch fixes them.
---
 src/kioskTouch.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/kioskTouch.c b/src/kioskTouch.c
index f0dd3cb..34b531c 100644
--- a/src/kioskTouch.c
+++ b/src/kioskTouch.c
@@ -230,9 +230,7 @@ void EvdevKioskTouchMotionEvents(InputInfoPtr pInfo, ValuatorMask *vals)
 }
 
 static void
-EvdevKioskTouchWakeupHandler(pointer data,
-                             int i,
-                             pointer LastSelectMask)
+EvdevKioskTouchWakeupHandler(WAKEUP_HANDLER_ARGS)
 {
     InputInfoPtr pInfo = (InputInfoPtr)data;
     EvdevPtr     pEvdev = (EvdevPtr)pInfo->private;
@@ -241,9 +239,13 @@ EvdevKioskTouchWakeupHandler(pointer data,
     if (pEvdev->kioskTouch.state & KTOUCH_STATE_DELAY) {
         ms = pEvdev->kioskTouch.expires - GetTimeInMillis();
         if (ms <= 0) {
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 24
             int        sigstate;
+            sigstate = xf86BlockSIGIO();
+#else
+            input_lock();
+#endif
 
-            sigstate = xf86BlockSIGIO ();
             pEvdev->kioskTouch.state &= ~KTOUCH_STATE_DELAY;
             DEBUG((ErrorF("Delayed ButtonUP\n")));
             EvdevPostButtonEvent(pInfo, pEvdev->kioskTouch.button, BUTTON_RELEASE);
@@ -252,15 +254,17 @@ EvdevKioskTouchWakeupHandler(pointer data,
                 valuator_mask_zero(pEvdev->kioskTouch.vals);
                 pEvdev->kioskTouch.state &= ~KTOUCH_STATE_DELAY_MOTION;
             }
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 24
             xf86UnblockSIGIO (sigstate);
+#else
+            input_unlock();
+#endif
         }
     }
 }
 
 static void
-EvdevKioskTouchBlockHandler(pointer data,
-                            struct timeval **waitTime,
-                            pointer LastSelectMask)
+EvdevKioskTouchBlockHandler(BLOCK_HANDLER_ARGS)
 {
     InputInfoPtr pInfo = (InputInfoPtr)data;
     EvdevPtr     pEvdev = (EvdevPtr)pInfo->private;
-- 
2.33.0

Places

File u_03-Remove-compiler-warnings-on-newer-xorg.patch of Package xf86-input-evdev (Revision 25a2ef3c8196a28c9e9147edd1fb951a)

Places