From 5139df0e33ac840518c5cfd34d898e644de723e6 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 4 Sep 2013 02:41:24 +0000
Subject: Extend "emulation" of menu pause key behavior to caps/num/scroll lock
 keys, which cause the same behavior.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2632
---
 src/doom/m_menu.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/doom/m_menu.c')

diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
index 450f1f12..233fe641 100644
--- a/src/doom/m_menu.c
+++ b/src/doom/m_menu.c
@@ -1403,7 +1403,14 @@ M_WriteText
     }
 }
 
+// These keys evaluate to a "null" key in Vanilla Doom that allows weird
+// jumping in the menus. Preserve this behavior for accuracy.
 
+static boolean IsNullKey(int key)
+{
+    return key == KEY_PAUSE || key == KEY_CAPSLOCK
+        || key == KEY_SCRLCK || key == KEY_NUMLOCK;
+}
 
 //
 // CONTROL PANEL
@@ -1745,7 +1752,6 @@ boolean M_Responder (event_t* ev)
 	return false;
     }
 
-    
     // Keys usable within menu
 
     if (key == key_menu_down)
@@ -1846,9 +1852,9 @@ boolean M_Responder (event_t* ev)
 
     // Keyboard shortcut?
     // Vanilla Doom has a weird behavior where it jumps to the scroll bars
-    // when the pause key is pressed, so emulate this.
+    // when the certain keys are pressed, so emulate this.
 
-    else if (ch != 0 || key == KEY_PAUSE)
+    else if (ch != 0 || IsNullKey(key))
     {
 	for (i = itemOn+1;i < currentMenu->numitems;i++)
         {
-- 
cgit v1.2.3