Changeset 3098 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 12, 2007 2:38:12 PM (18 years ago)

Author:

vboxsync

Message:

fixed the mess with caps lock / num lock / scroll lock on SDL

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -682 +682 @@
         return 1;
     }
+
+#ifdef __LINUX
+    /*
+     * Lock keys on SDL behave different from normal keys: A KeyPress event is generated
+     * if the lock mode gets active and a keyRelease event is genereated if the lock mode
+     * gets inactive, that is KeyPress and KeyRelease are sent when pressing the lock key
+     * to change the mode. The current lock mode is reflected in SDL_GetModState().
+     *
+     * Debian patched libSDL to make the lock keys behave like normal keys generating a
+     * KeyPress/KeyRelease event if the lock key was pressed/released. But the lock status
+     * is not reflected in the mod status anymore. We disable the Debian-specific extension
+     * to ensure a defined environment and work around the missing KeyPress/KeyRelease
+     * events in ProcessKeys().
+     */
+    setenv("SDL_DISABLE_LOCK_KEYS", 1, 1);
+#endif
 
     /*
@@ -3132 +3148 @@
         case 0x3a: /* Caps Lock */
         {
-            /* SDL does not send the key up event, so we generate it.
-             * r=frank: This is not true for never SDL versions. */
-            if (ev->type == SDL_KEYDOWN)
+            /*
+             * SDL generates a KEYDOWN event if the lock key is active and a  KEYUP event
+             * if the lock key is inactive. See SDL_DISABLE_LOCK_KEYS.
+             */
+            if (ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP)
             {
                 gKeyboard->PutScancode(keycode);
@@ -3161 +3179 @@
             gKeyboard->PutScancode(0x45 | 0x80);
         }
-#if 0  /* For some reason SDL_GetModState() does not return KMOD_CAPS correctly */
         if (   gcGuestCapsLockAdaptions
             && (gfGuestCapsLockPressed ^ !!(SDL_GetModState() & KMOD_CAPS)))
@@ -3169 +3186 @@
             gKeyboard->PutScancode(0x3a | 0x80);
         }
-#endif
     }