Commit 4eda58ba6aacc5b2a86ab3e533c9c1938319d7b6
2016-12-02T21:01:13
Added SDL_HINT_MOUSE_NORMAL_SPEED_SCALE and SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE to scale the speed of the mouse. This currently doesn't affect absolute motion, which would need to be implemented on each windowing system so the cursor matches the reported mouse coordinates.
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 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133
diff --git a/include/SDL_hints.h b/include/SDL_hints.h
index c2ec237..6120b04 100644
--- a/include/SDL_hints.h
+++ b/include/SDL_hints.h
@@ -233,6 +233,16 @@ extern "C" {
#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD"
/**
+ * \brief A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode
+ */
+#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE "SDL_MOUSE_NORMAL_SPEED_SCALE"
+
+/**
+ * \brief A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode
+ */
+#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE "SDL_MOUSE_RELATIVE_SPEED_SCALE"
+
+/**
* \brief A variable controlling whether relative mouse mode is implemented using mouse warping
*
* This variable can be set to the following values:
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index fb4fae7..f3cc6fc 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -40,12 +40,34 @@ static int SDL_double_click_radius = 1;
static int
SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int x, int y);
+static void
+SDL_MouseNormalSpeedScaleChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
+{
+ SDL_Mouse *mouse = (SDL_Mouse *)userdata;
+
+ mouse->normal_speed_scale = SDL_atof(hint);
+}
+
+static void
+SDL_MouseRelativeSpeedScaleChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
+{
+ SDL_Mouse *mouse = (SDL_Mouse *)userdata;
+
+ mouse->relative_speed_scale = SDL_atof(hint);
+}
+
/* Public functions */
int
SDL_MouseInit(void)
{
SDL_Mouse *mouse = SDL_GetMouse();
+ SDL_AddHintCallback(SDL_HINT_MOUSE_NORMAL_SPEED_SCALE,
+ SDL_MouseNormalSpeedScaleChanged, mouse);
+
+ SDL_AddHintCallback(SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE,
+ SDL_MouseRelativeSpeedScaleChanged, mouse);
+
mouse->cursor_shown = SDL_TRUE;
return (0);
@@ -200,6 +222,21 @@ SDL_SendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int
}
static int
+GetScaledMouseDelta(float scale, int value, float *accum)
+{
+ if (scale != 1.0f) {
+ *accum += scale * value;
+ if (*accum >= 0.0f) {
+ value = (int)SDL_floor(*accum);
+ } else {
+ value = (int)SDL_ceil(*accum);
+ }
+ *accum -= value;
+ }
+ return value;
+}
+
+static int
SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int x, int y)
{
SDL_Mouse *mouse = SDL_GetMouse();
@@ -221,6 +258,13 @@ SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relativ
}
if (relative) {
+ if (mouse->relative_mode) {
+ x = GetScaledMouseDelta(mouse->relative_speed_scale, x, &mouse->scale_accum_x);
+ y = GetScaledMouseDelta(mouse->relative_speed_scale, y, &mouse->scale_accum_y);
+ } else {
+ x = GetScaledMouseDelta(mouse->normal_speed_scale, x, &mouse->scale_accum_x);
+ y = GetScaledMouseDelta(mouse->normal_speed_scale, y, &mouse->scale_accum_y);
+ }
xrel = x;
yrel = y;
x = (mouse->last_x + xrel);
@@ -475,6 +519,12 @@ SDL_MouseQuit(void)
}
SDL_zerop(mouse);
+
+ SDL_DelHintCallback(SDL_HINT_MOUSE_NORMAL_SPEED_SCALE,
+ SDL_MouseNormalSpeedScaleChanged, mouse);
+
+ SDL_DelHintCallback(SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE,
+ SDL_MouseRelativeSpeedScaleChanged, mouse);
}
Uint32
@@ -603,6 +653,8 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
}
}
mouse->relative_mode = enabled;
+ mouse->scale_accum_x = 0.0f;
+ mouse->scale_accum_y = 0.0f;
if (mouse->focus) {
SDL_UpdateWindowGrab(mouse->focus);
diff --git a/src/events/SDL_mouse_c.h b/src/events/SDL_mouse_c.h
index 2bc0782..cddb7e1 100644
--- a/src/events/SDL_mouse_c.h
+++ b/src/events/SDL_mouse_c.h
@@ -83,6 +83,10 @@ typedef struct
Uint32 buttonstate;
SDL_bool relative_mode;
SDL_bool relative_mode_warp;
+ float normal_speed_scale;
+ float relative_speed_scale;
+ float scale_accum_x;
+ float scale_accum_y;
/* Data for double-click tracking */
int num_clickstates;