encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the HID usage for the button as the button number

This commit is contained in:
Sam Lantinga 2022-08-28 22:33:17 -07:00
parent a9d3935a84
commit 761b9d1e49
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/joystick/bsd/SDL_bsdjoystick.c
View File

@ -229,7 +229,7 @@ static void report_free(struct report *);
static int static int
usage_to_joyaxe(unsigned usage) usage_to_joyaxe(int usage)
{ {
int joyaxe; int joyaxe;
switch (usage) { switch (usage) {
@ -365,7 +365,7 @@ CreateHwData(const char *path)
switch (HID_PAGE(hitem.usage)) { switch (HID_PAGE(hitem.usage)) {
case HUP_GENERIC_DESKTOP: case HUP_GENERIC_DESKTOP:
{ {
unsigned usage = HID_USAGE(hitem.usage); int usage = HID_USAGE(hitem.usage);
int joyaxe = usage_to_joyaxe(usage); int joyaxe = usage_to_joyaxe(usage);
if (joyaxe >= 0) { if (joyaxe >= 0) {
hw->axis_map[joyaxe] = 1; hw->axis_map[joyaxe] = 1;
@ -379,7 +379,12 @@ CreateHwData(const char *path)
break; break;
} }
case HUP_BUTTON: case HUP_BUTTON:
hw->nbuttons++; {
int usage = HID_USAGE(hitem.usage);
if (usage > hw->nbuttons) {
hw->nbuttons = usage;
}
}
break; break;
default: default:
break; break;
@ -652,7 +657,6 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
Sint32 v; Sint32 v;
#ifdef __OpenBSD__ #ifdef __OpenBSD__
Sint32 dpad[4] = {0, 0, 0, 0}; Sint32 dpad[4] = {0, 0, 0, 0};
int actualbutton;
#endif #endif
#ifdef SUPPORT_JOY_GAMEPORT #ifdef SUPPORT_JOY_GAMEPORT
@ -715,13 +719,13 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
continue; continue;
} }
for (nbutton = 0; hid_get_item(hdata, &hitem) > 0;) { while (hid_get_item(hdata, &hitem) > 0) {
switch (hitem.kind) { switch (hitem.kind) {
case hid_input: case hid_input:
switch (HID_PAGE(hitem.usage)) { switch (HID_PAGE(hitem.usage)) {
case HUP_GENERIC_DESKTOP: case HUP_GENERIC_DESKTOP:
{ {
unsigned usage = HID_USAGE(hitem.usage); int usage = HID_USAGE(hitem.usage);
int joyaxe = usage_to_joyaxe(usage); int joyaxe = usage_to_joyaxe(usage);
if (joyaxe >= 0) { if (joyaxe >= 0) {
naxe = joy->hwdata->axis_map[joyaxe]; naxe = joy->hwdata->axis_map[joyaxe];
@ -773,13 +777,8 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
} }
case HUP_BUTTON: case HUP_BUTTON:
v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem); v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
#ifdef __OpenBSD__ nbutton = HID_USAGE(hitem.usage) - 1; /* SDL buttons are zero-based */
actualbutton = HID_USAGE(hitem.usage) - 1; /* sdl buttons are zero-based */
SDL_PrivateJoystickButton(joy, actualbutton, v);
#else
SDL_PrivateJoystickButton(joy, nbutton, v); SDL_PrivateJoystickButton(joy, nbutton, v);
#endif
nbutton++;
break; break;
default: default:
continue; continue;