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 8156d88db77c637e
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
     1.1 --- a/src/video/mir/SDL_mirevents.c	Sun Feb 02 23:53:48 2014 -0500
     1.2 +++ b/src/video/mir/SDL_mirevents.c	Sun Feb 02 23:55:51 2014 -0500
     1.3 @@ -203,11 +203,13 @@
     1.4          case mir_motion_action_outside:
     1.5              SDL_SetMouseFocus(NULL);
     1.6              break;
     1.7 +#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
     1.8          case mir_motion_action_scroll:
     1.9              HandleMouseScroll(sdl_window,
    1.10                                motion.pointer_coordinates[cord_index].hscroll,
    1.11                                motion.pointer_coordinates[cord_index].vscroll);
    1.12              break;
    1.13 +#endif
    1.14          case mir_motion_action_cancel:
    1.15          case mir_motion_action_hover_enter:
    1.16          case mir_motion_action_hover_exit:
    1.17 @@ -222,12 +224,16 @@
    1.18  {
    1.19      int cord_index;
    1.20      for (cord_index = 0; cord_index < motion.pointer_count; cord_index++) {
    1.21 +#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
    1.22          if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_mouse) {
    1.23              HandleMouseEvent(motion, cord_index, sdl_window);
    1.24          }
    1.25          else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
    1.26              HandleTouchEvent(motion, cord_index, sdl_window);
    1.27          }
    1.28 +#else
    1.29 +        HandleMouseEvent(motion, cord_index, sdl_window);
    1.30 +#endif
    1.31      }
    1.32  }
    1.33