Toggle capslock when opening/closing console if bound to +alwaysrun

releasenotes.md

@@ -18,6 +18,7 @@
 * The `STTMINUS` lump used in the status bar and widescreen HUD when the `negativehealth` CVAR is `on` and the player is dead, will now be positioned correctly in instances where its vertical offset is missing.
 * A bug is fixed whereby a string CVAR couldn't be changed in the console to the same string but with a different case.
 * Blood splats now move with everything else on *BOOM*-compatible scrolling floors.
+* If the `+alwaysrun` action is bound to the <kbd>CAPSLOCK</kbd> key, and the `alwaysrun` CVAR is `on`, the <kbd>CAPSLOCK</kbd> key will now be toggled off when the console is opened, and then toggled back on when it closes.
 
 ![](https://github.com/bradharding/www.doomretro.com/raw/master/wiki/bigdivider.png)
 

src/c_console.c

@@ -851,7 +851,19 @@ void C_ShowConsole(bool reset)
         mousebuttons[i] = false;
 
     if (gamestate == GS_LEVEL)
+    {
+        if (keyboardalwaysrun == KEY_CAPSLOCK && alwaysrun && GetCapsLockState())
+#if defined(_WIN32)
+        {
+            ToggleCapsLockState();
+            nokeyevent = true;
+        }
+#elif defined(X11)
+            SetCapsLockState(false);
+#endif
+
         I_RestoreMousePointerPosition();
+    }
 
     S_StopSounds();
     S_LowerMusicVolume();
@@ -864,6 +876,16 @@ void C_HideConsole(void)
     if (!consoleactive)
         return;
 
+    if (keyboardalwaysrun == KEY_CAPSLOCK && alwaysrun && !GetCapsLockState() && gamestate == GS_LEVEL)
+#if defined(_WIN32)
+    {
+        ToggleCapsLockState();
+        nokeyevent = true;
+    }
+#elif defined(X11)
+        SetCapsLockState(true);
+#endif
+
     SDL_StopTextInput();
 
     consoledirection = -1;
@@ -880,6 +902,16 @@ void C_HideConsoleFast(void)
     if (!consoleactive)
         return;
 
+    if (keyboardalwaysrun == KEY_CAPSLOCK && alwaysrun && !GetCapsLockState() && gamestate == GS_LEVEL)
+#if defined(_WIN32)
+    {
+        ToggleCapsLockState();
+        nokeyevent = true;
+    }
+#elif defined(X11)
+        SetCapsLockState(true);
+#endif
+
     SDL_StopTextInput();
 
     consoledirection = -1;
@@ -2519,13 +2551,6 @@ bool C_Responder(event_t *ev)
                 C_HideConsole();
                 break;
 
-            case KEY_CAPSLOCK:
-                // toggle "always run"
-                if (keyboardalwaysrun == KEY_CAPSLOCK)
-                    G_ToggleAlwaysRun(ev_keydown);
-
-                break;
-
             case 'a':
                 // select all text
                 if (modstate & KMOD_CTRL)

src/g_game.c

@@ -723,7 +723,7 @@ void G_ToggleAlwaysRun(evtype_t type)
     const int   oldcaretpos = caretpos;
     const int   oldselectstart = selectstart;
     const int   oldselectend = selectend;
-
+    C_Output("yayayaya!");
 #if defined(_WIN32)
     alwaysrun = (keyboardalwaysrun == KEY_CAPSLOCK && type == ev_keydown ?
         (GetKeyState(VK_CAPITAL) & 0x0001) : !alwaysrun);

src/i_video.c

@@ -150,6 +150,7 @@ bool                windowfocused = true;
 
 int                 keydown = 0;
 int                 keydown2 = 0;
+bool                nokeyevent = false;
 
 static bool         keys[NUMKEYS];
 
@@ -239,13 +240,13 @@ bool keystate(const int key)
 }
 
 #if defined(_WIN32)
-static void ToggleCapsLockState(void)
+void ToggleCapsLockState(void)
 {
     keybd_event(VK_CAPITAL, 0x45, 0, (uintptr_t)0);
     keybd_event(VK_CAPITAL, 0x45, KEYEVENTF_KEYUP, (uintptr_t)0);
 }
 #elif defined(X11)
-static void SetCapsLockState(bool enabled)
+void SetCapsLockState(bool enabled)
 {
     Display *display = XOpenDisplay(0);
 
@@ -305,6 +306,12 @@ static void I_GetEvent(void)
             {
                 const SDL_Scancode  scancode = Event->key.keysym.scancode;
 
+                if (nokeyevent)
+                {
+                    nokeyevent = false;
+                    break;
+                }
+
                 if (scancode >= SDL_SCANCODE_KP_1 && scancode <= SDL_SCANCODE_KP_0
                     && !SDL_IsTextInputActive())
                     ev.data1 = translatekey[keypad[scancode - SDL_SCANCODE_KP_1]];

src/i_video.h

@@ -72,6 +72,12 @@ void I_InitKeyboard(void);
 void I_ShutdownKeyboard(void);
 bool GetCapsLockState(void);
 
+#if defined(_WIN32)
+void ToggleCapsLockState(void);
+#elif defined(X11)
+void SetCapsLockState(bool enabled);
+#endif
+
 // Called by D_DoomLoop,
 // called before processing each tic in a frame.
 // Quick synchronous operations are performed here.
@@ -138,6 +144,8 @@ extern bool         waspaused;
 extern int          keydown;
 extern int          keydown2;
 
+extern bool         nokeyevent;
+
 extern int          gammaindex;
 extern const float  gammalevels[GAMMALEVELS];
 extern float        brightness;