Merge branch 'master' into pending-release

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / keybinder.qc

diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index 5a0f9f487f0b5f9b58686f0fcc40f77458d04efa..a53f4a8862a718e157abd6ae3089b836552c5f03 100644 (file)
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -29,6 +29,9 @@ void KeyBinds_BuildList()
        #define KEYBIND_EMPTY_LINE() KEYBIND_DEF("", "")
        #define KEYBIND_HEADER(str) KEYBIND_DEF("", str)
 
+       // Special keybinds can't be edited or selected
+       // If a special keybind description matches the previous one
+       // then it's considered as an alternative keybind of the previous one
        #define KEYBIND_IS_SPECIAL(func) (substring(func, 0 ,1) == "*")
        #define KEYBIND_SPECIAL_DEF(key, desc) KEYBIND_DEF(strcat("*", key), desc)
 
@@ -105,7 +108,7 @@ void KeyBinds_BuildList()
        // non-English keyboard layouts, unlike default keys (` and ~)
        KEYBIND_DEF("toggleconsole"                         , _("enter console"));
                string console_shortcut = strcat(translate_key("SHIFT"), "+", translate_key("ESCAPE"));
-               KEYBIND_SPECIAL_DEF(console_shortcut, _("enter console"));
+               KEYBIND_SPECIAL_DEF(console_shortcut            , _("enter console"));
        KEYBIND_DEF("menu_showquitdialog"                   , _("quit"));
        KEYBIND_EMPTY_LINE();
 
@@ -119,6 +122,8 @@ void KeyBinds_BuildList()
        KEYBIND_DEF("+use"                                  , _("drop key/flag, exit vehicle"));
        KEYBIND_DEF("kill"                                  , _("suicide / respawn"));
        KEYBIND_DEF("quickmenu"                             , _("quick menu"));
+       string scoreboard_ui_shortcut = strcat(translate_key("TAB"), "+", translate_key("ESCAPE"));
+       KEYBIND_SPECIAL_DEF(scoreboard_ui_shortcut          , _("scoreboard user interface"));
        KEYBIND_EMPTY_LINE();
 
        KEYBIND_HEADER(_("User defined"));
@@ -208,6 +213,7 @@ void KeyBinder_Bind_Change(entity btn, entity me)
        if(func == "" || KEYBIND_IS_SPECIAL(func))
                return;
 
+       me.setSelected(me, me.selectedItem); // make it visible if it's hidden
        me.keyGrabButton.forcePressed = 1;
        me.clearButton.disabled = 1;
        keyGrabber = me;
@@ -302,6 +308,8 @@ void KeyBinder_Bind_Edit(entity btn, entity me)
        string descr = KeyBinds_Descriptions[me.selectedItem];
        if(substring(descr, 0, 1) != "$")
                return;
+
+       me.setSelected(me, me.selectedItem); // make it visible if it's hidden
        descr = substring(descr, 1, strlen(descr) - 1);
 
        // Hooray! It IS a user bind!
@@ -317,6 +325,8 @@ void KeyBinder_Bind_Clear(entity btn, entity me)
        if(func == "" || KEYBIND_IS_SPECIAL(func))
                return;
 
+       me.setSelected(me, me.selectedItem); // make it visible if it's hidden
+
        n = tokenize(findkeysforcommand(func, 0)); // uses '...' strings
        for(j = 0; j < n; ++j)
        {
@@ -349,7 +359,8 @@ void XonoticKeyBinder_setSelected(entity me, int i)
        i = floor(0.5 + bound(0, i, me.nItems - 1));
        if (KEYBIND_IS_SPECIAL(KeyBinds_Functions[i]))
        {
-               SUPER(XonoticKeyBinder).setSelected(me, i - 1);
+               if (i > 0 && KeyBinds_Descriptions[i] == KeyBinds_Descriptions[i - 1])
+                       SUPER(XonoticKeyBinder).setSelected(me, i - 1);
                return;
        }
        if(me.pressed == 0 || me.pressed == 1) // keyboard or scrolling - skip unselectable items