Default SDL_HINT_ACCELEROMETER_AS_JOYSTICK to 0 on Linux

slouken · slouken · commit b2a95b2482cb · 2025-03-25T09:09:59.000-07:00
The Linux joystick driver supports associating sensor devices with the related controller device, so enable that by default. Fixes #12043 (cherry picked from commit 3e47181)
diff --git a/src/core/linux/SDL_udev.c b/src/core/linux/SDL_udev.c
@@ -424,9 +424,12 @@ static int device_class(struct udev_device *dev)
         }
 
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_ACCELEROMETER");
-        if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE) &&
-            val && SDL_strcmp(val, "1") == 0) {
-            devclass |= SDL_UDEV_DEVICE_JOYSTICK;
+        if (val && SDL_strcmp(val, "1") == 0) {
+            if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_FALSE)) {
+                devclass |= SDL_UDEV_DEVICE_JOYSTICK;
+            } else {
+                devclass |= SDL_UDEV_DEVICE_ACCELEROMETER;
+            }
         }
 
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_MOUSE");

Original file line number	Diff line number	Diff line change
`@@ -424,9 +424,12 @@ static int device_class(struct udev_device *dev)`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_ACCELEROMETER");`
`427`		`- if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE) &&`
`428`		`- val && SDL_strcmp(val, "1") == 0) {`
`429`		`- devclass \|= SDL_UDEV_DEVICE_JOYSTICK;`
	`427`	`+ if (val && SDL_strcmp(val, "1") == 0) {`
	`428`	`+ if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_FALSE)) {`
	`429`	`+ devclass \|= SDL_UDEV_DEVICE_JOYSTICK;`
	`430`	`+ } else {`
	`431`	`+ devclass \|= SDL_UDEV_DEVICE_ACCELEROMETER;`
	`432`	`+ }`
`430`	`433`	`}`
`431`	`434`
`432`	`435`	`val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_MOUSE");`