# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1231093760 0
# Node ID dbff5769d742f4caf072a62ed99cc56bb5defaac
# Parent  f4d14219c2aa50bd8d314bb1875e56cfef95b549
The core pointer is comprised of merging the inputs of all mice.
If there are other mice, they should show up in the device list, and
we want to report events from those devices instead of the core events.
However, if XInput isn't supported or we can't find other mice in the
device list, we'll add the core pointer and interpret normal mouse events.

diff -r f4d14219c2aa -r dbff5769d742 src/video/x11/SDL_x11events.c
--- a/src/video/x11/SDL_x11events.c	Sun Jan 04 17:30:00 2009 +0000
+++ b/src/video/x11/SDL_x11events.c	Sun Jan 04 18:29:20 2009 +0000
@@ -280,21 +280,6 @@
         }
         break;
 
-    case MotionNotify:
-#ifdef DEBUG_MOTION
-        printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y);
-#endif
-        SDL_SendMouseMotion(0, 0, xevent.xmotion.x, xevent.xmotion.y, 0);
-        break;
-
-    case ButtonPress:
-        SDL_SendMouseButton(0, SDL_PRESSED, xevent.xbutton.button);
-        break;
-
-    case ButtonRelease:
-        SDL_SendMouseButton(0, SDL_RELEASED, xevent.xbutton.button);
-        break;
-
     default:{
 #if SDL_VIDEO_DRIVER_X11_XINPUT
             for (i = 0; i < SDL_GetNumMice(); ++i) {
@@ -304,6 +289,22 @@
                 mouse = SDL_GetMouse(i);
                 data = (X11_MouseData *) mouse->driverdata;
                 if (!data) {
+                    switch (xevent.type) {
+                    case MotionNotify:
+#ifdef DEBUG_MOTION
+                        printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y);
+#endif
+                        SDL_SendMouseMotion(0, 0, xevent.xmotion.x, xevent.xmotion.y, 0);
+                        break;
+
+                    case ButtonPress:
+                        SDL_SendMouseButton(0, SDL_PRESSED, xevent.xbutton.button);
+                        break;
+
+                    case ButtonRelease:
+                        SDL_SendMouseButton(0, SDL_RELEASED, xevent.xbutton.button);
+                        break;
+                    }
                     continue;
                 }
 
diff -r f4d14219c2aa -r dbff5769d742 src/video/x11/SDL_x11mouse.c
--- a/src/video/x11/SDL_x11mouse.c	Sun Jan 04 17:30:00 2009 +0000
+++ b/src/video/x11/SDL_x11mouse.c	Sun Jan 04 18:29:20 2009 +0000
@@ -50,19 +50,14 @@
     int event_code;
     XEventClass xEvent;
 #endif
-
-    SDL_zero(mouse);
-    SDL_AddMouse(&mouse, "CorePointer", 0, 0, 1);
+    int num_mice = 0;
 
 #if SDL_VIDEO_DRIVER_X11_XINPUT
-    if (!SDL_X11_HAVE_XINPUT) {
-        /* should have dynamically loaded, but wasn't available. */
-        return;
-    }
-
     /* we're getting the list of input devices */
     n = 0;
-    DevList = XListInputDevices(display, &n);
+    if (SDL_X11_HAVE_XINPUT) {
+        DevList = XListInputDevices(display, &n);
+    }
 
     /* we're aquiring valuators: mice, tablets, etc. */
     for (i = 0; i < n; ++i) {
@@ -127,6 +122,9 @@
                     } else {
                         SDL_AddMouse(&mouse, DevList[i].name, 0, 0, 1);
                     }
+                    if (DevList[i].use == IsXExtensionPointer) {
+                        ++num_mice;
+                    }
                     break;
                 }
                 /* if it's not class we're interested in, lets go further */
@@ -138,6 +136,11 @@
     }
     XFreeDeviceList(DevList);
 #endif
+
+    if (num_mice == 0) {
+        SDL_zero(mouse);
+        SDL_AddMouse(&mouse, "CorePointer", 0, 0, 1);
+    }
 }
 
 void