string KeyBinds_Descriptions[MAX_KEYBINDS];
int KeyBinds_Count = -1;
-void KeyBinds_Read()
+void KeyBinds_BuildList()
{
KeyBinds_Count = 0;
} \
MACRO_END
- KEYBIND_DEF("" , _("Moving"));
+ #define KEYBIND_EMPTY_LINE() KEYBIND_DEF("", "")
+ #define KEYBIND_HEADER(str) KEYBIND_DEF("", str)
+
+ #define KEYBIND_IS_SPECIAL(func) (substring(func, 0 ,1) == "*")
+ #define KEYBIND_SPECIAL_DEF(key, desc) KEYBIND_DEF(strcat("*", key), desc)
+
+ KEYBIND_HEADER(_("Moving"));
KEYBIND_DEF("+forward" , _("forward"));
KEYBIND_DEF("+back" , _("backpedal"));
KEYBIND_DEF("+moveleft" , _("strafe left"));
KEYBIND_DEF("+crouch" , _("crouch / sink"));
KEYBIND_DEF("+hook" , _("off-hand hook"));
KEYBIND_DEF("+jetpack" , _("jetpack"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("Attacking"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Attacking"));
KEYBIND_DEF("+fire" , _("primary fire"));
KEYBIND_DEF("+fire2" , _("secondary fire"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("Weapons"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Weapons"));
KEYBIND_DEF("weapprev" , CTX(_("WEAPON^previous")));
KEYBIND_DEF("weapnext" , CTX(_("WEAPON^next")));
KEYBIND_DEF("weaplast" , CTX(_("WEAPON^previously used")));
KEYBIND_DEF("reload" , _("reload"));
KEYBIND_DEF("dropweapon" , _("drop weapon / throw nade"));
- int i;
-
#define ADD_TO_W_LIST(pred) \
FOREACH(Weapons, it != WEP_Null, { \
if (it.impulse != imp) continue; \
for(int imp = 1; imp <= 9; ++imp)
{
string w_list = "";
- ADD_TO_W_LIST(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN) && !(it.spawnflags & WEP_FLAG_SUPERWEAPON));
+ ADD_TO_W_LIST(!(it.spawnflags & (WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_SPECIALATTACK | WEP_FLAG_SUPERWEAPON)));
ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_SUPERWEAPON) && !(it.spawnflags & WEP_FLAG_HIDDEN));
- ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN));
+ ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & (WEP_FLAG_HIDDEN | WEP_FLAG_SPECIALATTACK)));
if(w_list)
KEYBIND_DEF(strcat("weapon_group_", itos(imp)), substring(w_list, 0, -4));
if(imp == 0)
}
#undef ADD_TO_W_LIST
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("View"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("View"));
KEYBIND_DEF("+zoom" , _("hold zoom"));
KEYBIND_DEF("togglezoom" , _("toggle zoom"));
KEYBIND_DEF("+showscores" , _("show scores"));
KEYBIND_DEF("+hud_panel_radar_maximized" , _("maximize radar"));
KEYBIND_DEF("toggle chase_active" , _("3rd person view"));
KEYBIND_DEF("spec" , _("enter spectator mode"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("Communicate"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Communication"));
KEYBIND_DEF("messagemode" , _("public chat"));
KEYBIND_DEF("messagemode2" , _("team chat"));
KEYBIND_DEF("+con_chat_maximize" , _("show chat history"));
KEYBIND_DEF("vyes" , _("vote YES"));
KEYBIND_DEF("vno" , _("vote NO"));
KEYBIND_DEF("ready" , _("ready"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("Client"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Client"));
KEYBIND_DEF("+show_info" , _("server info"));
+ // display the hardcoded shortcut to open the console as it works for all
+ // 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_DEF("disconnect" , _("disconnect"));
KEYBIND_DEF("menu_showquitdialog" , _("quit"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("Teamplay"));
- KEYBIND_DEF("messagemode2" , _("team chat"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Teamplay"));
KEYBIND_DEF("team_auto" , _("auto-join team"));
KEYBIND_DEF("menu_showteamselect" , _("team menu"));
- KEYBIND_DEF("+use" , _("drop key / drop flag"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("Misc"));
- KEYBIND_DEF("kill" , _("respawn"));
+ KEYBIND_DEF("spec" , _("spectate"));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Misc"));
+ KEYBIND_DEF("+use" , _("drop key/flag, exit vehicle"));
+ KEYBIND_DEF("kill" , _("suicide / respawn"));
KEYBIND_DEF("quickmenu" , _("quick menu"));
- KEYBIND_DEF("menu_showsandboxtools" , _("sandbox menu"));
- KEYBIND_DEF("+button8" , _("drag object"));
- KEYBIND_DEF("" , "");
- KEYBIND_DEF("" , _("User defined"));
+ KEYBIND_EMPTY_LINE();
- for(i = 1; i <= 32; ++i)
+ KEYBIND_HEADER(_("User defined"));
+
+ for(int i = 1; i <= 32; ++i)
KEYBIND_DEF(strcat("+userbind ", itos(i)), strcat("$userbind", itos(i)));
+ KEYBIND_EMPTY_LINE();
+
+ KEYBIND_HEADER(_("Development"));
+ KEYBIND_DEF("menu_showsandboxtools" , _("sandbox menu"));
+ KEYBIND_DEF("+button8" , _("drag object (sandbox)"));
+ KEYBIND_DEF("wpeditor_menu" , _("waypoint editor menu"));
+
#undef KEYBIND_DEF
}
bool force_initial_selection = false;
if(KeyBinds_Count < 0) // me.handle not loaded yet?
force_initial_selection = true;
- KeyBinds_Read();
+ KeyBinds_BuildList();
me.nItems = KeyBinds_Count;
if(force_initial_selection)
me.setSelected(me, 0);
void KeyBinder_Bind_Change(entity btn, entity me)
{
string func = KeyBinds_Functions[me.selectedItem];
- if(func == "")
+ if(func == "" || KEYBIND_IS_SPECIAL(func))
return;
me.keyGrabButton.forcePressed = 1;
}
string func = KeyBinds_Functions[me.selectedItem];
- if(func == "")
+ if(func == "" || KEYBIND_IS_SPECIAL(func))
return;
n = tokenize(findkeysforcommand(func, 0)); // uses '...' strings
{
k = stof(argv(j));
if(k != -1)
- //localcmd("\nunbind \"", keynumtostring(k), "\"\n");
+ {
+ // bind to empty cmd instead of using unbind so it gets saved in config and overrides any default binds
localcmd("\nbind \"", keynumtostring(k), "\" \"", KEY_NOT_BOUND_CMD, "\"\n");
+ }
}
}
m_play_click_sound(MENU_SOUND_SELECT);
return;
string func = KeyBinds_Functions[me.selectedItem];
- if(func == "")
+ if(func == "" || KEYBIND_IS_SPECIAL(func))
return;
string descr = KeyBinds_Descriptions[me.selectedItem];
return;
string func = KeyBinds_Functions[me.selectedItem];
- if(func == "")
+ if(func == "" || KEYBIND_IS_SPECIAL(func))
return;
string descr = KeyBinds_Descriptions[me.selectedItem];
float n, j, k;
string func = KeyBinds_Functions[me.selectedItem];
- if(func == "")
+ if(func == "" || KEYBIND_IS_SPECIAL(func))
return;
n = tokenize(findkeysforcommand(func, 0)); // uses '...' strings
{
k = stof(argv(j));
if(k != -1)
- //localcmd("\nunbind \"", keynumtostring(k), "\"\n");
+ {
+ // bind to empty cmd instead of using unbind so it gets saved in config and overrides any default binds
localcmd("\nbind \"", keynumtostring(k), "\" \"", KEY_NOT_BOUND_CMD, "\"\n");
+ }
}
m_play_click_sound(MENU_SOUND_CLEAR);
localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
{
// handling of "unselectable" items
i = floor(0.5 + bound(0, i, me.nItems - 1));
+ if (KEYBIND_IS_SPECIAL(KeyBinds_Functions[i]))
+ {
+ SUPER(XonoticKeyBinder).setSelected(me, i - 1);
+ return;
+ }
if(me.pressed == 0 || me.pressed == 1) // keyboard or scrolling - skip unselectable items
{
if(i > me.previouslySelected)
}
return r;
}
+
void XonoticKeyBinder_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
{
- string s;
- int j, n;
- float k;
vector theColor;
float theAlpha;
float extraMargin;
if(func == "")
{
- theAlpha = 1;
theColor = SKINCOLOR_KEYGRABBER_TITLES;
theAlpha = SKINALPHA_KEYGRABBER_TITLES;
extraMargin = 0;
if(substring(descr, 0, 1) == "$")
{
- s = substring(descr, 1, strlen(descr) - 1);
+ string s = substring(descr, 1, strlen(descr) - 1);
descr = cvar_string(strcat(s, "_description"));
if(descr == "")
descr = s;
theAlpha *= SKINALPHA_DISABLED;
}
- s = draw_TextShortenToWidth(descr, me.columnFunctionSize, 0, me.realFontSize);
+ string s = draw_TextShortenToWidth(descr, me.columnFunctionSize, 0, me.realFontSize);
draw_Text(me.realUpperMargin * eY + extraMargin * eX, s, me.realFontSize, theColor, theAlpha, 0);
- if(func != "")
+
+ if (func == "")
+ return;
+
+ s = "";
+ if (KEYBIND_IS_SPECIAL(func))
+ s = substring(func, 1, -1);
+ else
{
- n = tokenize(findkeysforcommand(func, 0)); // uses '...' strings
- s = "";
- for(j = 0; j < n; ++j)
+ bool joy_active = cvar("joy_active");
+ int n = tokenize(findkeysforcommand(func, 0)); // uses '...' strings
+ for(int j = 0; j < n; ++j)
{
- k = stof(argv(j));
+ float k = stof(argv(j));
if(k != -1)
{
+ string key = keynumtostring(k);
+ if (!joy_active && startsWith(key, "JOY"))
+ continue;
if(s != "")
s = strcat(s, ", ");
- s = strcat(s, keynumtostring(k));
+ s = strcat(s, translate_key(key));
}
}
- s = draw_TextShortenToWidth(s, me.columnKeysSize, 0, me.realFontSize);
- draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0);
}
+ s = draw_TextShortenToWidth(s, me.columnKeysSize, 0, me.realFontSize);
+ draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0);
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff