Disable some minor things that need newer Mir dev headers.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 02 Feb 2014 23:55:51 -0500
changeset 8156 d88db77c637e
parent 8155 cf0eda3f5e35
child 8157 f5d262613ed2
Disable some minor things that need newer Mir dev headers. These headers apparently aren't default in Ubuntu 13.10 yet.
src/video/mir/SDL_mirevents.c
--- a/src/video/mir/SDL_mirevents.c	Sun Feb 02 23:53:48 2014 -0500
+++ b/src/video/mir/SDL_mirevents.c	Sun Feb 02 23:55:51 2014 -0500
@@ -203,11 +203,13 @@
         case mir_motion_action_outside:
             SDL_SetMouseFocus(NULL);
             break;
+#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
         case mir_motion_action_scroll:
             HandleMouseScroll(sdl_window,
                               motion.pointer_coordinates[cord_index].hscroll,
                               motion.pointer_coordinates[cord_index].vscroll);
             break;
+#endif
         case mir_motion_action_cancel:
         case mir_motion_action_hover_enter:
         case mir_motion_action_hover_exit:
@@ -222,12 +224,16 @@
 {
     int cord_index;
     for (cord_index = 0; cord_index < motion.pointer_count; cord_index++) {
+#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
         if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_mouse) {
             HandleMouseEvent(motion, cord_index, sdl_window);
         }
         else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
             HandleTouchEvent(motion, cord_index, sdl_window);
         }
+#else
+        HandleMouseEvent(motion, cord_index, sdl_window);
+#endif
     }
 }