mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-08-27 09:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: Add RGB LED support for joysticks.

Browse Source
This commit is contained in:
MAJigsaw77
2025-11-22 21:17:59 +02:00
committed by Sam Lantinga
parent 4fcb92e0df
commit cb04dcd6f8
5 changed files with 91 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/joystick/android/SDL_sysjoystick.c
View File

@@ -305,7 +305,7 @@ bool Android_OnHat(int device_id, int hat_id, int x, int y)
return false;
}
void Android_AddJoystick(int device_id, const char *name, const char *desc, int vendor_id, int product_id, int button_mask, int naxes, int axis_mask, int nhats, bool can_rumble)
void Android_AddJoystick(int device_id, const char *name, const char *desc, int vendor_id, int product_id, int button_mask, int naxes, int axis_mask, int nhats, bool can_rumble, bool has_rgb_led)
{
SDL_joylist_item *item;
SDL_GUID guid;
@@ -380,6 +380,7 @@ void Android_AddJoystick(int device_id, const char *name, const char *desc, int
item->naxes = naxes;
item->nhats = nhats;
item->can_rumble = can_rumble;
item->has_rgb_led = has_rgb_led;
item->device_instance = SDL_GetNextObjectID();
if (!SDL_joylist_tail) {
SDL_joylist = SDL_joylist_tail = item;
@@ -581,6 +582,10 @@ static bool ANDROID_JoystickOpen(SDL_Joystick *joystick, int device_index)
SDL_SetBooleanProperty(SDL_GetJoystickProperties(joystick), SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, true);
}
if (item->has_rgb_led) {
SDL_SetBooleanProperty(SDL_GetJoystickProperties(joystick), SDL_PROP_JOYSTICK_CAP_RGB_LED_BOOLEAN, true);
}
return true;
}
@@ -607,7 +612,15 @@ static bool ANDROID_JoystickRumbleTriggers(SDL_Joystick *joystick, Uint16 left_r
static bool ANDROID_JoystickSetLED(SDL_Joystick *joystick, Uint8 red, Uint8 green, Uint8 blue)
{
return SDL_Unsupported();
SDL_joylist_item *item = (SDL_joylist_item *)joystick->hwdata;
if (!item) {
return SDL_SetError("SetLED failed, device disconnected");
}
if (!item->has_rgb_led) {
return SDL_Unsupported();
}
Android_JNI_JoystickSetLED(item->device_id, red, green, blue);
return true;
}
static bool ANDROID_JoystickSendEffect(SDL_Joystick *joystick, const void *data, int size)

3
src/joystick/android/SDL_sysjoystick_c.h
View File

@@ -32,7 +32,7 @@ extern bool Android_OnPadDown(int device_id, int keycode);
extern bool Android_OnPadUp(int device_id, int keycode);
extern bool Android_OnJoy(int device_id, int axisnum, float value);
extern bool Android_OnHat(int device_id, int hat_id, int x, int y);
extern void Android_AddJoystick(int device_id, const char *name, const char *desc, int vendor_id, int product_id, int button_mask, int naxes, int axis_mask, int nhats, bool can_rumble);
extern void Android_AddJoystick(int device_id, const char *name, const char *desc, int vendor_id, int product_id, int button_mask, int naxes, int axis_mask, int nhats, bool can_rumble, bool has_rgb_led);
extern void Android_RemoveJoystick(int device_id);
// A linked list of available joysticks
@@ -46,6 +46,7 @@ typedef struct SDL_joylist_item
int nbuttons, naxes, nhats;
int dpad_state;
bool can_rumble;
bool has_rgb_led;
struct SDL_joylist_item *next;
} SDL_joylist_item;