Update keyboard menus

config/menus_edit.cfg

@@ -745,7 +745,7 @@ menuitemeditkeyinput [1st meta key: ]             editmeta
 menuitemeditkeyinput [2nd meta key: ]             editkey_editmeta2
 menuitem "" -1
 menuitemeditkeyinput [Occlusion culling on/off: ] toggleocull
-menuitemeditkeyinput [Mip display on/off : ]      showmip
+menuitemeditkeyinput [Mip display on/off: ]       showmip
 menuitemeditkeyinput [Fullbright on/off: ]        editkey_fullbright
 menuitemeditkeyinput [Show cube details on/off: ] showfocuscubedetails
 menuitem "" -1
@@ -767,6 +767,19 @@ menuitemeditkeyinput [Show tag clip volume: ]     showtagclipfocus
 menuitemeditkeyinput [Remove tag clip: ]          editkey_tagclip_none
 menuitemeditkeyinput [Create tag 'playerclip': ]  editkey_tagclip_plclip
 menuitemeditkeyinput [Create tag 'clip': ]        editkey_tagclip_clip
+menuitem "" -1
+menuitemtextinput [Lookup a keyeditbind: ] [] [
+    if (strlen $arg1) [
+        echo (concatword "\f9Contents of keyeditbind " (addpunct $arg1) :)
+        if (strcmp (result (keyeditbind $arg1)) "") [
+            echo (addpunct $arg1) is not bound
+        ][
+            echo (keyeditbind $arg1)
+        ]
+     ]
+] [] 256
+menuitem [] -1
+menuitem [Alternate edit binds...] [ showmenu [Alternate edit binds] ]
 
 // deleted entities
 newmenu "deleted entities"

config/menus_settings.cfg

@@ -237,41 +237,78 @@ menuitem "\f2         [ Apply! ]        " [ if $resetyes [ resetcfg 1; quit ] [
 
 newmenu Keyboard
 
-menuitem [Select an action and press ENTER to bind a new key:] -1
-menuitem [] -1
-menuitemkeyinput [Forwards: ]        forward
-menuitemkeyinput [Left: ]            left
-menuitemkeyinput [Backwards: ]       backward
-menuitemkeyinput [Right: ]           right
-menuitemkeyinput [Attack: ]          attack
-menuitemkeyinput [Special action: ]  altaction
-menuitemkeyinput [Knife attack: ]    key_knifeattack
-menuitemkeyinput [Jump: ]            jump
-menuitemkeyinput [Crouch: ]          crouch
-menuitemkeyinput [Reload: ]          reload
-menuitemkeyinput [Weapon menu: ]     key_showmenuweapons
-menuitemkeyinput [Next weapon: ]     key_universaldelta_plus
-menuitemkeyinput [Previous weapon: ] key_universaldelta_minus
-menuitemkeyinput [Last weapon: ]     key_prevweapon
-menuitemkeyinput [Show scores: ]     key_showscores
-menuitemkeyinput [Chat: ]            saycommand
-menuitemkeyinput [Team chat: ]       key_teamchat
-menuitemkeyinput [Voice menu: ]      key_showmenuvoicecom
-menuitemkeyinput [Commandline: ]     key_commandline
-menuitemkeyinput [Console output: ]  key_toggleconsole
-menuitemkeyinput [Screenshot: ]      screenshot
-menuitemkeyinput [Map overview: ]    key_showmap
-menuitemkeyinput [Drop flag: ]       dropflag
-menuitemkeyinput [Fullscreen: ]      fullscreentoggle
-menuitemkeyinput [Enter edit mode: ] edittoggle
-menuitem [] -1
-menuitemtextinput [Lookup a keybind: ] [] [ echo []; echo (concatword "\f9Contents of keybind " $arg1 :); echo (keybind $arg1) ] [] 256
-menuitem [Alternate edit binds...] [ showmenu [Alternate edit binds] ]
+menuitem [General keys...]         [ showmenu [General keys] ]
 menuitem [Edit mode keys...]       [ showmenu [Editing keys] ]
 menuitem [Spectate mode keys...]   [ showmenu [Spectating keys] ]
 menuitem [] -1
 menuitem [Reset keybinds to default settings...] [ showmenu [Reset Binds] ]
 
+newmenu [General keys]
+
+menuitem [Select an action and press ENTER to bind a new key:] -1
+menuitem [] -1
+menuitem "\f2Movement:" -1
+menuitemkeyinput [Forwards: ]        forward
+menuitemkeyinput [Left: ]            left
+menuitemkeyinput [Backwards: ]       backward
+menuitemkeyinput [Right: ]           right
+menuitemkeyinput [Jump: ]            jump
+menuitemkeyinput [Crouch: ]          crouch
+menuitem "" -1
+menuitem "\f2Weapon:" -1
+menuitemkeyinput [Attack: ]              attack
+menuitemkeyinput [Special action: ]      altaction
+menuitemkeyinput [Knife attack: ]        key_knifeattack
+menuitemkeyinput [Quick grenade throw: ] quicknadethrow
+menuitemkeyinput [Reload: ]              reload
+menuitemkeyinput [Weapon menu: ]         key_showmenuweapons
+menuitemkeyinput [Primary weapon: ]      primary
+menuitemkeyinput [Secondary weapon: ]    secondary
+menuitemkeyinput [Grenades: ]            grenades
+menuitemkeyinput [Knife: ]               melee
+menuitemkeyinput [Next weapon: ]         key_universaldelta_plus
+menuitemkeyinput [Previous weapon: ]     key_universaldelta_minus
+menuitemkeyinput [Last weapon: ]         key_prevweapon
+menuitem "" -1
+menuitem "\f2Gameplay:" -1
+menuitemkeyinput [Show scores: ]     key_showscores
+menuitemkeyinput [Map overview: ]    key_showmap
+menuitemkeyinput [Drop flag: ]       dropflag
+menuitemkeyinput [Chat: ]            saycommand
+menuitemkeyinput [Team chat: ]       key_teamchat
+menuitemkeyinput [Quick answer to private message: ] quickanswer
+menuitemkeyinput [Voice menu: ]      key_showmenuvoicecom
+menuitem "" -1
+menuitem "\f2Console:" -1
+menuitemkeyinput [Toggle console: ]  key_toggleconsole
+menuitemkeyinput [Rewind console: ]  key_console_rewind
+menuitemkeyinput [Forward console: ] key_console_forward
+menuitemkeyinput [End of console: ]  key_console_end
+menuitem "" -1
+menuitem "\f2Mousewheel actions (need holding the key):" -1
+menuitemkeyinput [Scroll console: ]  key_console_scroll
+menuitemkeyinput [Adjust gamma: ]    key_domodifier_1
+menuitemkeyinput [Adjust FOV: ]      key_domodifier_2
+menuitem "" -1
+menuitem "\f2Misc keys:" -1
+menuitemkeyinput [Commandline: ]     key_commandline
+menuitemkeyinput [Screenshot: ]      screenshot
+menuitemkeyinput [Fullscreen: ]      fullscreentoggle
+menuitemkeyinput [Enter edit mode: ] edittoggle
+menuitemkeyinput [Pause game: ]      key_pause
+menuitem [] -1
+menuitemtextinput [Lookup a keybind: ] [] [
+    if (strlen $arg1) [
+        echo (concatword "\f9Contents of keybind " (addpunct $arg1) :)
+        if (strcmp (result (keybind $arg1)) "") [
+            echo (addpunct $arg1) is not bound
+        ][
+            echo (keybind $arg1)
+        ]
+     ]
+] [] 256
+menuitem [] -1
+
 newmenu [Spectating keys]
 
 menuitem "Select an action and press ENTER to bind a new key:" -1
@@ -284,6 +321,18 @@ menuitemspectkeyinput [Reset game speed: ]    speckey_demo_gamespeedreset
 menuitem "" -1
 menuitem "\f2Misc spectating keys:" -1
 menuitemspectkeyinput [Whois spectated player: ] speckey_whois_spectatecn
+menuitem [] -1
+menuitemtextinput [Lookup a keyspecbind: ] [] [
+    if (strlen $arg1) [
+        echo (concatword "\f9Contents of keyspecbind " (addpunct $arg1) :)
+        if (strcmp (result (keyspecbind $arg1)) "") [
+            echo (addpunct $arg1) is not bound
+        ][
+            echo (keyspecbind $arg1)
+        ]
+     ]
+] [] 256
+menuitem [] -1
 
 newmenu Mouse
 menuitemcheckbox  [Invert mouse:                          ] "$invmouse"       [ invmouse $arg1 ]
@@ -317,8 +366,8 @@ menuinit [
 ]
 
 newmenu [Alternate edit binds]
-menuitem [Back] [ closecurmenu ]
-menuitem [Click to use alternate edit binds] [ exec config/opt/alternateeditbinds.cfg; closecurmenu ] [ echo "\f3See config/opt/alternateeditbinds.cfg" ]
+menuitem "\f2Back" [ closecurmenu ]
+menuitem [Click to use alternate edit binds] [ exec config/opt/alternateeditbinds.cfg; closecurmenu ] [ echo "\f3See config/opt/alternateeditbinds.cfg first" ]
 
 newmenu [Reset Binds]
 menuitemcheckbox [Yes, reset all binds: ] [ resetbindsyes = 0 ] [ resetbindsyes = $arg1 ]

config/resetbinds.cfg

@@ -24,6 +24,7 @@ alias key_voteno [ if $votepending [ && (vote 2) (echo you voted no) ] ]
 alias key_teamchat [ saycommand % ]
 alias key_commandline [ saycommand / ]
 alias key_prevweapon [ weapon (prevweapon) ]
+alias key_pause [ paused (! $paused) ]
 
 alias editkey_editmeta2 [ editmeta2down = 1 ; onrelease [ editmeta2down = 0 ] ]
 alias editkey_delete_entity [if $editmeta2down [showmenu "deleted entities" ; menuselection "deleted entities" (- (unlistdeletedentity) 1)] [if $editmetakeydown undelent delent]]
@@ -82,7 +83,7 @@ editbind BACKSPACE editkey_delete_entity
 bind TAB key_showscores
 bind CLEAR []
 bind RETURN []
-bind PAUSE [ paused (! $paused) ]
+bind PAUSE key_pause
 bind ESCAPE key_escape
 bind SPACE jump
 bind EXCLAIM []