Ticket #9153: bug_2978736.patch

backends/platform/sdl/events.cpp

@@ -340 +340 @@
                 event.kbd.flags |= Common::KBD_SCRL;
 
         if ((event.kbd.flags & (Common::KBD_CTRL|Common::KBD_ALT)) == (Common::KBD_CTRL|Common::KBD_ALT)) {
-                // Swallow these key up events
-                return false;
+                if (isScalerHotkey(ev.key))
+                        // Swallow these key up events
+                        return false;
         }
 
         return true;

backends/platform/sdl/graphics.cpp

@@ -2002 +2002 @@
                 return false;
         }
 }
+
+bool OSystem_SDL::isScalerHotkey(const SDL_KeyboardEvent &key) {
+        const bool isNormalNumber = (SDLK_1 <= key.keysym.sym && key.keysym.sym <= SDLK_9);
+        const bool isKeypadNumber = (SDLK_KP1 <= key.keysym.sym && key.keysym.sym <= SDLK_KP9);
+        const bool isScaleKey = (key.keysym.sym == SDLK_EQUALS || key.keysym.sym == SDLK_PLUS || key.keysym.sym == SDLK_MINUS ||
+                key.keysym.sym == SDLK_KP_PLUS || key.keysym.sym == SDLK_KP_MINUS);
+        if (isNormalNumber || isKeypadNumber) {
+                int keyValue = key.keysym.sym - (isNormalNumber ? SDLK_1 : SDLK_KP1);
+                if (keyValue >= ARRAYSIZE(s_gfxModeSwitchTable))
+                        return false;
+        }
+        return (isScaleKey || key.keysym.sym == 'a');
+}

backends/platform/sdl/sdl.h

@@ -490 +490 @@
         virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 
         bool handleScalerHotkeys(const SDL_KeyboardEvent &key);
+        bool isScalerHotkey(const SDL_KeyboardEvent &key);
 };
 
 #endif