Ticket #4759: 5_-_osystem_add_support_for_scroll_lock_sci_remove_hack (SVN).patch

backends/platform/sdl/events.cpp

@@ -234 +234 @@
 
         SDLModToOSystemKeyFlags(SDL_GetModState(), event);
 
+        // Handle scroll lock as a key modifier
+        if (ev.key.keysym.sym == SDLK_SCROLLOCK)
+                _scrollLock = !_scrollLock;
+
+        if (_scrollLock)
+                event.kbd.flags |= Common::KBD_SCRL;
+
         // Alt-Return and Alt-Enter toggle full screen mode
         if (event.kbd.hasFlags(Common::KBD_ALT) && (ev.key.keysym.sym == SDLK_RETURN || ev.key.keysym.sym == SDLK_KP_ENTER)) {
                 beginGFXTransaction();
@@ -326 +333 @@
 
         // Ctrl-Alt-<key> will change the GFX mode
         SDLModToOSystemKeyFlags(SDL_GetModState(), event);
+
+        // Set the scroll lock sticky flag
+        if (_scrollLock)
+                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;

backends/platform/sdl/sdl.cpp

@@ -232 +232 @@
         _overlayscreen(0), _tmpscreen2(0),
         _samplesPerSec(0),
         _cdrom(0), _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _dirtyChecksums(0),
+        _scrollLock(false),
         _mouseVisible(false), _mouseNeedsRedraw(false), _mouseData(0), _mouseSurface(0),
         _mouseOrigSurface(0), _cursorTargetScale(1), _cursorPaletteDisabled(true),
         _joystick(0),

engines/sci/event.cpp

@@ -120 +120 @@
                 int modifiers = em->getModifierState();
 
                 // We add the modifier key status to buckybits
-                // SDL sends a keydown event if a modifier key is turned on and a keyup event if it's off
-                //
-                // FIXME: This code is semi-bogus. It only records the modifier key being *pressed*.
-                // It does not track correctly whether scrolllock. is active. To do that, we
-                // would have to record the fact that the modifier was pressed in global var,
-                // and also watch for Common::EVENT_KEYUP events.
-                // But this is still not quite good enough, because not all events might
-                // pass through here (e.g. the GUI might be running with its own event loop).
-                //
-                // The best solution likely would be to add code to the EventManager class
-                // for tracking which keys are pressed and which are not...
-                if (ev.type == Common::EVENT_KEYDOWN || ev.type == Common::EVENT_KEYUP) {
-                        switch (ev.kbd.keycode) {
-                        case Common::KEYCODE_SCROLLOCK:
-                                if (ev.type == Common::EVENT_KEYDOWN) {
-                                        _modifierStates |= SCI_KEYMOD_SCRLOCK;
-                                } else {
-                                        _modifierStates &= ~SCI_KEYMOD_SCRLOCK;
-                                }
-                                break;
-                        default:
-                                break;
-                        }
-                }
                 //TODO: SCI_EVM_INSERT
 
                 input.modifiers =
@@ -152 +128 @@
                     ((modifiers & Common::KBD_SHIFT) ? SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT : 0) |
                     ((ev.kbd.flags & Common::KBD_NUM) ? SCI_KEYMOD_NUMLOCK : 0) |
                     ((ev.kbd.flags & Common::KBD_CAPS) ? SCI_KEYMOD_CAPSLOCK : 0) |
+                        ((ev.kbd.flags & Common::KBD_SCRL) ? SCI_KEYMOD_SCRLOCK : 0) |
                         _modifierStates;
 
                 switch (ev.type) {