File p_bug96328.diff of Package xorg-x11-server

Overview Repositories Revisions Requests Users Attributes Meta

File p_bug96328.diff of Package xorg-x11-server (Revision d7549656e3950c3837f4c1b173f38374)

Currently displaying revision d7549656e3950c3837f4c1b173f38374 , Show latest

Index: hw/xfree86/common/xf86Configure.c
===================================================================
--- hw/xfree86/common/xf86Configure.c.orig
+++ hw/xfree86/common/xf86Configure.c
@@ -237,23 +237,36 @@ configureInputSection (void)
 
     /* Crude mechanism to auto-detect mouse (os dependent) */
     { 
-	int fd;
+	int fd = -1;
+
 #ifdef WSCONS_SUPPORT
-	fd = open("/dev/wsmouse", 0);
-	if (fd > 0) {
-	    DFLT_MOUSE_DEV = "/dev/wsmouse";
-	    DFLT_MOUSE_PROTO = "wsmouse";
-	    close(fd);
-	} else {
-	    ErrorF("cannot open /dev/wsmouse\n");
+        if (fd == -1) {
+            fd = open("/dev/wsmouse", 0);
+            if (fd != -1) {
+                DFLT_MOUSE_DEV = "/dev/wsmouse";
+                DFLT_MOUSE_PROTO = "wsmouse";
+                close(fd);
+            } else {
+                ErrorF("cannot open /dev/wsmouse\n");
+            }
 	}
 #endif
 
 #ifndef __SCO__
-	fd = open(DFLT_MOUSE_DEV, 0);
-	if (fd != -1) {
-	    foundMouse = TRUE;
-	    close(fd);
+        if (fd == -1) {
+            fd = open(DFLT_MOUSE_DEV, 0);
+# ifdef  linux
+            if (fd == -1) {
+                char *name = "/dev/input/mice";
+                fd = open(name, 0);
+                if (fd != -1)
+                    DFLT_MOUSE_DEV = name;
+            }
+# endif
+            if (fd != -1) {
+                foundMouse = TRUE;
+                close(fd);
+            }
 	}
 #else
 	foundMouse = TRUE;

Places

File p_bug96328.diff of Package xorg-x11-server (Revision d7549656e3950c3837f4c1b173f38374)

Places