Răsfoiți Sursa

Disable some minor things that need newer Mir dev headers.

These headers apparently aren't default in Ubuntu 13.10 yet.
Ryan C. Gordon 12 ani în urmă
părinte
comite
435b80b9a3
1 a modificat fișierele cu 6 adăugiri și 0 ștergeri
  1. 6 0
      src/video/mir/SDL_mirevents.c

+ 6 - 0
src/video/mir/SDL_mirevents.c

@@ -203,11 +203,13 @@ HandleMouseEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_wi
         case mir_motion_action_outside:
         case mir_motion_action_outside:
             SDL_SetMouseFocus(NULL);
             SDL_SetMouseFocus(NULL);
             break;
             break;
+#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
         case mir_motion_action_scroll:
         case mir_motion_action_scroll:
             HandleMouseScroll(sdl_window,
             HandleMouseScroll(sdl_window,
                               motion.pointer_coordinates[cord_index].hscroll,
                               motion.pointer_coordinates[cord_index].hscroll,
                               motion.pointer_coordinates[cord_index].vscroll);
                               motion.pointer_coordinates[cord_index].vscroll);
             break;
             break;
+#endif
         case mir_motion_action_cancel:
         case mir_motion_action_cancel:
         case mir_motion_action_hover_enter:
         case mir_motion_action_hover_enter:
         case mir_motion_action_hover_exit:
         case mir_motion_action_hover_exit:
@@ -222,12 +224,16 @@ HandleMotionEvent(MirMotionEvent const motion, SDL_Window* sdl_window)
 {
 {
     int cord_index;
     int cord_index;
     for (cord_index = 0; cord_index < motion.pointer_count; 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) {
         if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_mouse) {
             HandleMouseEvent(motion, cord_index, sdl_window);
             HandleMouseEvent(motion, cord_index, sdl_window);
         }
         }
         else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
         else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
             HandleTouchEvent(motion, cord_index, sdl_window);
             HandleTouchEvent(motion, cord_index, sdl_window);
         }
         }
+#else
+        HandleMouseEvent(motion, cord_index, sdl_window);
+#endif
     }
     }
 }
 }