Commit 8938c2b5db705d9c80a2d17b9dad83b2ec8a5ef7
2014-03-25T15:24:43
Ignore unused mir event functions, need headers in Ubuntu 14.04 to use them.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/src/video/mir/SDL_mirevents.c b/src/video/mir/SDL_mirevents.c
index f2d3ef3..940d5b7 100644
--- a/src/video/mir/SDL_mirevents.c
+++ b/src/video/mir/SDL_mirevents.c
@@ -117,21 +117,22 @@ HandleMouseButton(SDL_Window* sdl_window, Uint8 state, MirMotionButton button_st
}
static void
-HandleTouchPress(int device_id, int source_id, SDL_bool down, float x, float y, float pressure)
+HandleMouseMotion(SDL_Window* sdl_window, int x, int y)
{
- SDL_SendTouch(device_id, source_id, down, x, y, pressure);
+ SDL_SendMouseMotion(sdl_window, 0, 0, x, y);
}
+#if 0 /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
static void
-HandleTouchMotion(int device_id, int source_id, float x, float y, float pressure)
+HandleTouchPress(int device_id, int source_id, SDL_bool down, float x, float y, float pressure)
{
- SDL_SendTouchMotion(device_id, source_id, x, y, pressure);
+ SDL_SendTouch(device_id, source_id, down, x, y, pressure);
}
static void
-HandleMouseMotion(SDL_Window* sdl_window, int x, int y)
+HandleTouchMotion(int device_id, int source_id, float x, float y, float pressure)
{
- SDL_SendMouseMotion(sdl_window, 0, 0, x, y);
+ SDL_SendTouchMotion(device_id, source_id, x, y, pressure);
}
static void
@@ -181,6 +182,7 @@ HandleTouchEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_wi
break;
}
}
+#endif
static void
HandleMouseEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_window)