diff --git a/desmume/src/frontend/interface/interface.cpp b/desmume/src/frontend/interface/interface.cpp index bb731db2c..7a1c003cf 100644 --- a/desmume/src/frontend/interface/interface.cpp +++ b/desmume/src/frontend/interface/interface.cpp @@ -546,7 +546,7 @@ EXPORTED void desmume_input_joy_uninit(void) EXPORTED u16 desmume_input_joy_number_connected(void) { - return nbr_joy; + return get_number_of_joysticks(); } EXPORTED u16 desmume_input_joy_get_key(int index) diff --git a/desmume/src/frontend/posix/gtk/main.cpp b/desmume/src/frontend/posix/gtk/main.cpp index 5c6fb0bff..59c39427b 100644 --- a/desmume/src/frontend/posix/gtk/main.cpp +++ b/desmume/src/frontend/posix/gtk/main.cpp @@ -2088,13 +2088,13 @@ static gboolean JoyKeyAcceptTimerFunc(gpointer data) switch(event.type) { case SDL_JOYBUTTONDOWN: - key = ((event.jbutton.which & 15) << 12) | JOY_BUTTON << 8 | (event.jbutton.button & 255); + key = ((get_joystick_number_by_id(event.jbutton.which) & 15) << 12) | JOY_BUTTON << 8 | (event.jbutton.button & 255); done = TRUE; break; case SDL_JOYAXISMOTION: if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) { - key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + key = ((get_joystick_number_by_id(event.jaxis.which) & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); if (event.jaxis.value > 0) key |= 1; done = TRUE; @@ -2102,7 +2102,7 @@ static gboolean JoyKeyAcceptTimerFunc(gpointer data) break; case SDL_JOYHATMOTION: if (event.jhat.value != SDL_HAT_CENTERED) { - key = ((event.jhat.which & 15) << 12) | JOY_HAT << 8 | ((event.jhat.hat & 63) << 2); + key = ((get_joystick_number_by_id(event.jhat.which) & 15) << 12) | JOY_HAT << 8 | ((event.jhat.hat & 63) << 2); if ((event.jhat.value & SDL_HAT_UP) != 0) key |= JOY_HAT_UP; else if ((event.jhat.value & SDL_HAT_RIGHT) != 0) @@ -2114,6 +2114,9 @@ static gboolean JoyKeyAcceptTimerFunc(gpointer data) done = TRUE; } break; + default: + do_process_joystick_device_events(&event); + break; } } @@ -3320,6 +3323,13 @@ static gboolean timeout_exit_cb(gpointer data) return FALSE; } +static gboolean OutOfLoopJoyDeviceCheckTimerFunc(gpointer data) +{ + if(!regMainLoop && !in_joy_config_mode) + process_joystick_device_events(); + return !regMainLoop; +} + static void common_gtk_main(GApplication *app, gpointer user_data) { @@ -4118,6 +4128,7 @@ common_gtk_main(GApplication *app, gpointer user_data) video->SetFilterParameteri(VF_PARAM_SCANLINE_D, _scanline_filter_d); RedrawScreen(); + g_timeout_add(200, OutOfLoopJoyDeviceCheckTimerFunc, 0); } static void Teardown() { diff --git a/desmume/src/frontend/posix/gtk2/main.cpp b/desmume/src/frontend/posix/gtk2/main.cpp index 2af4ad361..9ca1eda62 100644 --- a/desmume/src/frontend/posix/gtk2/main.cpp +++ b/desmume/src/frontend/posix/gtk2/main.cpp @@ -2277,13 +2277,13 @@ static gboolean JoyKeyAcceptTimerFunc(gpointer data) switch(event.type) { case SDL_JOYBUTTONDOWN: - key = ((event.jbutton.which & 15) << 12) | JOY_BUTTON << 8 | (event.jbutton.button & 255); + key = ((get_joystick_number_by_id(event.jbutton.which) & 15) << 12) | JOY_BUTTON << 8 | (event.jbutton.button & 255); done = TRUE; break; case SDL_JOYAXISMOTION: if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) { - key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + key = ((get_joystick_number_by_id(event.jaxis.which) & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); if (event.jaxis.value > 0) key |= 1; done = TRUE; @@ -2291,7 +2291,7 @@ static gboolean JoyKeyAcceptTimerFunc(gpointer data) break; case SDL_JOYHATMOTION: if (event.jhat.value != SDL_HAT_CENTERED) { - key = ((event.jhat.which & 15) << 12) | JOY_HAT << 8 | ((event.jhat.hat & 63) << 2); + key = ((get_joystick_number_by_id(event.jhat.which) & 15) << 12) | JOY_HAT << 8 | ((event.jhat.hat & 63) << 2); if ((event.jhat.value & SDL_HAT_UP) != 0) key |= JOY_HAT_UP; else if ((event.jhat.value & SDL_HAT_RIGHT) != 0) @@ -2303,6 +2303,9 @@ static gboolean JoyKeyAcceptTimerFunc(gpointer data) done = TRUE; } break; + default: + do_process_joystick_device_events(&event); + break; } } @@ -3446,6 +3449,13 @@ static gboolean timeout_exit_cb(gpointer data) return FALSE; } +static gboolean OutOfLoopJoyDeviceCheckTimerFunc(gpointer data) +{ + if(!regMainLoop && !in_joy_config_mode) + process_joystick_device_events(); + return !regMainLoop; +} + static int common_gtk_main( class configured_features *my_config) { @@ -4007,6 +4017,7 @@ common_gtk_main( class configured_features *my_config) video->SetFilterParameteri(VF_PARAM_SCANLINE_D, _scanline_filter_d); RedrawScreen(); + g_timeout_add(200, OutOfLoopJoyDeviceCheckTimerFunc, 0); /* Main loop */ gtk_main(); diff --git a/desmume/src/frontend/posix/shared/ctrlssdl.cpp b/desmume/src/frontend/posix/shared/ctrlssdl.cpp index 169dba6f6..e06d81a63 100644 --- a/desmume/src/frontend/posix/shared/ctrlssdl.cpp +++ b/desmume/src/frontend/posix/shared/ctrlssdl.cpp @@ -35,11 +35,11 @@ u32 joypad_cfg[NB_KEYS]; static_assert(sizeof(keyboard_cfg) == sizeof(joypad_cfg), ""); -u16 nbr_joy; mouse_status mouse; static int fullscreen; -static SDL_Joystick **open_joysticks = NULL; +//List of currently connected joysticks (key - instance id, value - SDL_Joystick structure, joystick number) +static std::pair open_joysticks[MAX_JOYSTICKS]; /* Keypad key names */ const char *key_names[NB_KEYS] = @@ -115,27 +115,29 @@ BOOL init_joy( void) { SDL_GetError()); return FALSE; } + + for(i=0; i 0) { printf("Found %d joysticks\n", nbr_joy); - open_joysticks = - (SDL_Joystick**)calloc( sizeof ( SDL_Joystick *), nbr_joy); - - if ( open_joysticks != NULL) { - for (i = 0; i < nbr_joy; i++) - { - SDL_Joystick * joy = SDL_JoystickOpen(i); - printf("Joystick %d %s\n", i, SDL_JoystickNameForIndex(i)); - printf("Axes: %d\n", SDL_JoystickNumAxes(joy)); - printf("Buttons: %d\n", SDL_JoystickNumButtons(joy)); - printf("Trackballs: %d\n", SDL_JoystickNumBalls(joy)); - printf("Hats: %d\n\n", SDL_JoystickNumHats(joy)); - } - } - else { - joy_init_good = FALSE; + + for (i = 0; i < nbr_joy; i++) { + SDL_Joystick * joy = SDL_JoystickOpen(i); + if(joy) { + printf("Joystick %d %s\n", i, SDL_JoystickNameForIndex(i)); + printf("Axes: %d\n", SDL_JoystickNumAxes(joy)); + printf("Buttons: %d\n", SDL_JoystickNumButtons(joy)); + printf("Trackballs: %d\n", SDL_JoystickNumBalls(joy)); + printf("Hats: %d\n\n", SDL_JoystickNumHats(joy)); + open_joysticks[i]=std::make_pair(joy, SDL_JoystickInstanceID(joy)); + } + else { + fprintf(stderr, "Failed to open joystick %d: %s\n", i, SDL_GetError()); + joy_init_good = FALSE; + } } } @@ -146,16 +148,13 @@ BOOL init_joy( void) { void uninit_joy( void) { int i; - - if ( open_joysticks != NULL) { - for (i = 0; i < SDL_NumJoysticks(); i++) { - SDL_JoystickClose( open_joysticks[i]); + for (i=0; i> 14) != 0 ) { - key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); + key = ((get_joystick_number_by_id(event.jaxis.which) & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); if (event.jaxis.value > 0) { printf( "Device: %d; Axis: %d (+)\n", event.jaxis.which, event.jaxis.axis ); key |= 1; @@ -224,7 +223,7 @@ u16 get_joy_key(int index) { /* Diagonal positions will be treated as two separate keys being activated, rather than a single diagonal key. */ /* JOY_HAT_* are sequential integers, rather than a bitmask */ if (event.jhat.value != SDL_HAT_CENTERED) { - key = ((event.jhat.which & 15) << 12) | JOY_HAT << 8 | ((event.jhat.hat & 63) << 2); + key = ((get_joystick_number_by_id(event.jhat.which) & 15) << 12) | JOY_HAT << 8 | ((event.jhat.hat & 63) << 2); /* Can't just use a switch here because SDL_HAT_* make up a bitmask. We only want one of these when assigning keys. */ if ((event.jhat.value & SDL_HAT_UP) != 0) { key |= JOY_HAT_UP; @@ -379,7 +378,7 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) { /* Joystick axis motion Note: button constants have a 1bit offset. */ case SDL_JOYAXISMOTION: - key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); + key_code = ((get_joystick_number_by_id(event->jaxis.which) & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) { if (event->jaxis.value > 0) @@ -406,7 +405,7 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) { case SDL_JOYHATMOTION: /* Diagonal positions will be treated as two separate keys being activated, rather than a single diagonal key. */ /* JOY_HAT_* are sequential integers, rather than a bitmask */ - key_code = ((event->jhat.which & 15) << 12) | JOY_HAT << 8 | ((event->jhat.hat & 63) << 2); + key_code = ((get_joystick_number_by_id(event->jhat.which) & 15) << 12) | JOY_HAT << 8 | ((event->jhat.hat & 63) << 2); key_u = lookup_joy_key( key_code | JOY_HAT_UP ); key_r = lookup_joy_key( key_code | JOY_HAT_RIGHT ); key_d = lookup_joy_key( key_code | JOY_HAT_DOWN ); @@ -431,7 +430,7 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) { /* Joystick button pressed */ case SDL_JOYBUTTONDOWN: - key_code = ((event->jbutton.which & 15) << 12) | JOY_BUTTON << 8 | (event->jbutton.button & 255); + key_code = ((get_joystick_number_by_id(event->jbutton.which) & 15) << 12) | JOY_BUTTON << 8 | (event->jbutton.button & 255); key = lookup_joy_key( key_code ); if (key != 0) ADD_KEY( *keypad, key ); @@ -439,7 +438,7 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) { /* Joystick button released */ case SDL_JOYBUTTONUP: - key_code = ((event->jbutton.which & 15) << 12) | JOY_BUTTON << 8 | (event->jbutton.button & 255); + key_code = ((get_joystick_number_by_id(event->jbutton.which) & 15) << 12) | JOY_BUTTON << 8 | (event->jbutton.button & 255); key = lookup_joy_key( key_code ); if (key != 0) RM_KEY( *keypad, key ); @@ -453,6 +452,54 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) { return processed; } +/* + * The real joystick connect/disconnect processing function + * Not static because we need it in some frontends during gamepad button configuration + */ +int +do_process_joystick_device_events(SDL_Event* event) { + int processed = 1, n; + switch(event->type) { + /* Joystick disconnected */ + case SDL_JOYDEVICEREMOVED: + n=get_joystick_number_by_id(event->jdevice.which); + if(n != -1) { + printf("Joystick %d disconnected\n", n); + SDL_JoystickClose(open_joysticks[n].first); + open_joysticks[n]=std::make_pair((SDL_Joystick*)NULL, 0); + } + break; + + /* Joystick connected */ + case SDL_JOYDEVICEADDED: + if(event->jdevice.whichjdevice.which].first) { + SDL_Joystick* joy = SDL_JoystickOpen(event->jdevice.which); + if(joy) { + printf("Joystick %d %s\n", event->jdevice.which, SDL_JoystickNameForIndex(event->jdevice.which)); + printf("Axes: %d\n", SDL_JoystickNumAxes(joy)); + printf("Buttons: %d\n", SDL_JoystickNumButtons(joy)); + printf("Trackballs: %d\n", SDL_JoystickNumBalls(joy)); + printf("Hats: %d\n\n", SDL_JoystickNumHats(joy)); + open_joysticks[event->jdevice.which]=std::make_pair(joy, SDL_JoystickInstanceID(joy)); + } + else + fprintf(stderr, "Failed to open joystick %d: %s\n", event->jdevice.which, SDL_GetError()); + } + } + else + printf("Joystick %d connected to the system, but maximum supported joystick index is %d, ignoring\n", + event->jdevice.which, MAX_JOYSTICKS-1); + break; + + default: + processed = 0; + break; + } + return processed; +} + /* * Process only the joystick events */ @@ -467,10 +514,45 @@ process_joystick_events( u16 *keypad) { /* There's an event waiting to be processed? */ while (SDL_PollEvent(&event)) { - do_process_joystick_events( keypad, &event); + if(!do_process_joystick_events( keypad, &event)) + do_process_joystick_device_events(&event); } } +/* + * Process only joystick connect/disconnect events + */ +void process_joystick_device_events() { + SDL_Event event; + + /* IMPORTANT: Reenable joystick events if needed. */ + if(SDL_JoystickEventState(SDL_QUERY) == SDL_IGNORE) + SDL_JoystickEventState(SDL_ENABLE); + + /* There's an event waiting to be processed? */ + while (SDL_PollEvent(&event)) + do_process_joystick_device_events(&event); +} + +int get_joystick_number_by_id(SDL_JoystickID id) +{ + int i; + for(i=0; i