X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fkeybinder.qc;h=36b134478cf0a8317c5e928f3fa29ee8eef071cc;hb=05d2779856eda44ed6c8779ab55380fa006cfcb4;hp=9ce18c6b0a97357bc97e28b7fcefdb897d605ed5;hpb=7f5ad47610dc8b5580cc96ae961a57cca96e6975;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc index 9ce18c6b0..36b134478 100644 --- a/qcsrc/menu/xonotic/keybinder.qc +++ b/qcsrc/menu/xonotic/keybinder.qc @@ -1,42 +1,10 @@ -#ifndef KEYBINDER_H -#define KEYBINDER_H -#include "listbox.qc" -CLASS(XonoticKeyBinder, XonoticListBox) - METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity)); - ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1) - METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, int, vector, bool, bool)); - METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector)); - METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector)); - METHOD(XonoticKeyBinder, showNotify, void(entity)); - METHOD(XonoticKeyBinder, setSelected, void(entity, float)); - METHOD(XonoticKeyBinder, keyDown, float(entity, float, float, float)); - METHOD(XonoticKeyBinder, keyGrabbed, void(entity, float, float)); - METHOD(XonoticKeyBinder, destroy, void(entity)); - - ATTRIB(XonoticKeyBinder, realFontSize, vector, '0 0 0') - ATTRIB(XonoticKeyBinder, realUpperMargin, float, 0) - ATTRIB(XonoticKeyBinder, columnFunctionOrigin, float, 0) - ATTRIB(XonoticKeyBinder, columnFunctionSize, float, 0) - ATTRIB(XonoticKeyBinder, columnKeysOrigin, float, 0) - ATTRIB(XonoticKeyBinder, columnKeysSize, float, 0) - - METHOD(XonoticKeyBinder, loadKeyBinds, void(entity)); - ATTRIB(XonoticKeyBinder, previouslySelected, int, -1) - ATTRIB(XonoticKeyBinder, inMouseHandler, float, 0) - ATTRIB(XonoticKeyBinder, userbindEditButton, entity, NULL) - ATTRIB(XonoticKeyBinder, keyGrabButton, entity, NULL) - ATTRIB(XonoticKeyBinder, clearButton, entity, NULL) - ATTRIB(XonoticKeyBinder, userbindEditDialog, entity, NULL) - METHOD(XonoticKeyBinder, editUserbind, void(entity, string, string, string)); -ENDCLASS(XonoticKeyBinder) -entity makeXonoticKeyBinder(); -void KeyBinder_Bind_Change(entity btn, entity me); -void KeyBinder_Bind_Clear(entity btn, entity me); -void KeyBinder_Bind_Edit(entity btn, entity me); -void KeyBinder_Bind_Reset_All(entity btn, entity me); -#endif - -#ifdef IMPLEMENTATION +#include "keybinder.qh" + +#include +.int flags; + +#include "button.qh" +#include "dialog_settings_input_userbind.qh" const string KEY_NOT_BOUND_CMD = "// not bound"; @@ -72,28 +40,29 @@ void Xonotic_KeyBinds_Read() KEYBIND_DEF("+fire" , _("primary fire")); KEYBIND_DEF("+fire2" , _("secondary fire")); KEYBIND_DEF("" , ""); - KEYBIND_DEF("" , _("Weapon switching")); - KEYBIND_DEF("weapprev" , _("previous")); - KEYBIND_DEF("weapnext" , _("next")); - KEYBIND_DEF("weaplast" , _("previously used")); - KEYBIND_DEF("weapbest" , _("best")); + KEYBIND_DEF("" , _("Weapons")); + KEYBIND_DEF("weapprev" , CTX(_("WEAPON^previous"))); + KEYBIND_DEF("weapnext" , CTX(_("WEAPON^next"))); + KEYBIND_DEF("weaplast" , CTX(_("WEAPON^previously used"))); + KEYBIND_DEF("weapbest" , CTX(_("WEAPON^best"))); KEYBIND_DEF("reload" , _("reload")); + KEYBIND_DEF("dropweapon" , _("drop weapon / throw nade")); int i; #define ADD_TO_W_LIST(pred) \ - FOREACH(Weapons, it != WEP_Null, LAMBDA( \ + FOREACH(Weapons, it != WEP_Null, { \ if (it.impulse != imp) continue; \ if (!(pred)) continue; \ w_list = strcat(w_list, it.m_name, " / "); \ - )) + }) for(int imp = 1; imp <= 9; ++imp) { string w_list = ""; - ADD_TO_W_LIST(!(it.flags & WEP_FLAG_MUTATORBLOCKED) && !(it.flags & WEP_FLAG_SUPERWEAPON)); - ADD_TO_W_LIST(it.flags & WEP_FLAG_SUPERWEAPON); - ADD_TO_W_LIST(it.flags & WEP_FLAG_MUTATORBLOCKED); + 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_SUPERWEAPON) && !(it.spawnflags & WEP_FLAG_HIDDEN)); + ADD_TO_W_LIST((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN)); if(w_list) KEYBIND_DEF(strcat("weapon_group_", itos(imp)), substring(w_list, 0, -4)); if(imp == 0) @@ -110,6 +79,8 @@ void Xonotic_KeyBinds_Read() KEYBIND_DEF("+showscores" , _("show scores")); KEYBIND_DEF("screenshot" , _("screen shot")); 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_DEF("messagemode" , _("public chat")); @@ -129,12 +100,12 @@ void Xonotic_KeyBinds_Read() KEYBIND_DEF("messagemode2" , _("team chat")); KEYBIND_DEF("team_auto" , _("auto-join team")); KEYBIND_DEF("menu_showteamselect" , _("team menu")); - KEYBIND_DEF("menu_showsandboxtools" , _("sandbox menu")); - KEYBIND_DEF("spec" , _("enter spectator mode")); - KEYBIND_DEF("dropweapon" , _("drop weapon")); KEYBIND_DEF("+use" , _("drop key / drop flag")); + KEYBIND_DEF("" , ""); + KEYBIND_DEF("" , _("Misc")); + KEYBIND_DEF("quickmenu" , _("quick menu")); + KEYBIND_DEF("menu_showsandboxtools" , _("sandbox menu")); KEYBIND_DEF("+button8" , _("drag object")); - KEYBIND_DEF("toggle chase_active" , _("3rd person view")); KEYBIND_DEF("" , ""); KEYBIND_DEF("" , _("User defined")); @@ -275,12 +246,8 @@ void XonoticKeyBinder_destroy(entity me) for(int i = 0; i < MAX_KEYBINDS; ++i) { - if(Xonotic_KeyBinds_Functions[i]) - strunzone(Xonotic_KeyBinds_Functions[i]); - Xonotic_KeyBinds_Functions[i] = string_null; - if(Xonotic_KeyBinds_Descriptions[i]) - strunzone(Xonotic_KeyBinds_Descriptions[i]); - Xonotic_KeyBinds_Descriptions[i] = string_null; + strfree(Xonotic_KeyBinds_Functions[i]); + strfree(Xonotic_KeyBinds_Descriptions[i]); } Xonotic_KeyBinds_Count = 0; } @@ -406,6 +373,7 @@ float XonoticKeyBinder_keyDown(entity me, int key, bool ascii, float shift) } return r; } + void XonoticKeyBinder_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused) { string s; @@ -470,11 +438,10 @@ void XonoticKeyBinder_drawListBoxItem(entity me, int i, vector absSize, bool isS { if(s != "") s = strcat(s, ", "); - s = strcat(s, keynumtostring(k)); + s = strcat(s, translate_key(keynumtostring(k))); } } 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); } } -#endif