evdev 2.0.1

No need to finalize MB emulation after EvdevProbe anymore.
Follow-up to 76800bfa75. (cherry picked from commit 5a0ea39b79)
2026-04-14 11:44:16 +00:00 · 2008-06-22 17:52:58 +09:30 · 2008-06-22 16:26:10 +09:30 · 2008-06-22 16:25:48 +09:30 · 2008-06-22 16:24:57 +09:30 · 2008-06-17 14:01:49 +09:30
3 changed files with 6 additions and 3 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@

 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-        1.99.4,
+        2.0.1,
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
        xf86-input-evdev)

--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -34,6 +34,8 @@
 #include "config.h"
 #endif

+#include <xf86.h>
+
 #include "evdev.h"

 enum {
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -835,6 +835,8 @@ EvdevProc(DeviceIntPtr device, int what)
            xf86Msg(X_WARNING, "%s: Grab failed (%s)\n", pInfo->name,
                    strerror(errno));
        xf86AddEnabledDevice(pInfo);
+	if (pEvdev->flags & EVDEV_BUTTON_EVENTS)
+	    EvdevMBEmuPreInit(pInfo);
 	device->public.on = TRUE;
 	break;
 	    
@@ -1025,8 +1027,6 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     */
    pEvdev->tool = 1;

-    EvdevMBEmuPreInit(pInfo);
-
    device = xf86CheckStrOption(dev->commonOptions, "Path", NULL);
    if (!device)
 	device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
@@ -1052,6 +1052,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
    /* parse the XKB options during kbd setup */

    if (EvdevProbe(pInfo)) {
+	close(pInfo->fd);
 	xf86DeleteInput(pInfo, 0);
        return NULL;
    }
Author	SHA1	Message	Date
Peter Hutterer	b125b834f4	evdev 2.0.1	2008-06-22 17:52:58 +09:30
Peter Hutterer	05b20db8db	No need to finalize MB emulation after EvdevProbe anymore. Follow-up to `76800bfa75`. (cherry picked from commit `5a0ea39b79`)	2008-06-22 16:26:10 +09:30
Simon Munton	43768d59da	Close file descriptor if EvdevProbe fails. Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> (cherry picked from commit `373e13ae35`)	2008-06-22 16:25:48 +09:30
Keith Packard	9c524f6963	Enable middle button emulation at DEVICE_ON instead of DEVICE_INIT. This ensures that the middle button emulation is re-enabled after VT switch, otherwise the block handler that deals with the timeouts would not get re-registered. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit `76800bfa75`)	2008-06-22 16:24:57 +09:30
Peter Hutterer	04003a98a9	evdev 2.0.0	2008-06-17 14:01:49 +09:30
Peter Hutterer	0443fb430f	Shut up compiler warning "implicit declaration of function 'xf86Msg'"	2008-06-17 13:59:15 +09:30
Peter Hutterer	998f52010f	Finalize MB emulation if EvdevProbe fails. This avoids segfaults when HAL is restarted behind our backs. Also, only init MB emulation when the device actually has a button.	2008-06-12 11:24:04 +09:30