cli: fix boost input detection

until now, the boost key was hardcoded to 'o' even when the config
said otherwise, and not treated in case of a joypad at all.
when triggered with the o key, it even behaved differently than
the gtk ui - the boost wasn't released together with the key,
but only when pressed again, so it was more like a shortcut for
"disable fps limiter".

this change implements the desired outcome of the second part of PR #822,
but without introducing more hacks and relying on magic values.

closes #822

desmume/src/frontend/posix/cli/main.cpp

@@ -546,7 +546,6 @@ int main(int argc, char ** argv) {
   osd = new OSDCLASS(-1);
 #endif
 
-  ctrls_cfg.boost = 0;
   ctrls_cfg.sdl_quit = 0;
   ctrls_cfg.auto_pause = my_config.auto_pause;
   ctrls_cfg.focused = 1;
@@ -577,7 +576,7 @@ int main(int argc, char ** argv) {
 #ifdef DISPLAY_FPS
     now = SDL_GetTicks();
 #endif
-    if ( !my_config.disable_limiter && !ctrls_cfg.boost) {
+    if ( !my_config.disable_limiter && !(ctrls_cfg.keypad & KEYMASK_(KEY_BOOST - 1))) {
 #ifndef DISPLAY_FPS
       now = SDL_GetTicks();
 #endif

desmume/src/frontend/posix/shared/ctrlssdl.cpp

@@ -430,7 +430,6 @@ do_process_joystick_events( u16 *keypad, SDL_Event *event) {
       break;
 
       /* Joystick button pressed */
-      /* FIXME: Add support for BOOST */
     case SDL_JOYBUTTONDOWN:
       key_code = ((event->jbutton.which & 15) << 12) | JOY_BUTTON << 8 | (event->jbutton.button & 255);
       key = lookup_joy_key( key_code );
@@ -536,15 +535,6 @@ process_ctrls_event( SDL_Event& event,
                   driver->AddLine("Fake mic disabled");
                 break;
 #endif
-
-            case SDLK_o:
-                cfg->boost = !cfg->boost;
-                if (cfg->boost)
-                  driver->AddLine("Boost mode enabled");
-                else
-                  driver->AddLine("Boost mode disabled");
-                break;
-
             case SDLK_LSHIFT:
                 shift_pressed &= ~1;
                 break;

desmume/src/frontend/posix/shared/ctrlssdl.h

@@ -89,7 +89,6 @@ struct ctrls_event_config {
   int auto_pause;
   int focused;
   int sdl_quit;
-  int boost;
   int fake_mic;
   void *screen_texture;
   void (*resize_cb)(u16 width, u16 height, void *screen_texture);