Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Game.Client/GarrysMod/HtmlPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ public override void OnKeyCodeTyped(ButtonCode code) {
return;

if (code >= ButtonCode.KeyF1 && code <= ButtonCode.KeyF12) {
// todo: run key binding
ReadOnlySpan<char> binding = gameuifuncs.GetBindingForButtonCode(code);
if (!binding.IsEmpty && binding[0] != '\0')
engine.ClientCmd_Unrestricted(binding);
return;
}

Expand Down
1 change: 1 addition & 0 deletions Game.Client/SourceDllMain.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public static void Link(IServiceCollection services) {
[Dependency] public static IViewRender view { get; private set; } = null!;
[Dependency] public static IRenderView render { get; private set; } = null!;
[Dependency] public static IEngineClient engine { get; private set; } = null!;
[Dependency] public static IGameUIFuncs gameuifuncs { get; private set; } = null!;
[Dependency] public static IMatSystemSurface surface { get; private set; } = null!;
[Dependency] public static IEngineVGui enginevgui { get; private set; } = null!;
[Dependency] public static ISpatialPartition partition { get; private set; } = null!;
Expand Down
4 changes: 2 additions & 2 deletions Game.Lua/LuaConVarsImpl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ public ConVar CreateConVar(ReadOnlySpan<char> name, ReadOnlySpan<char> defaultVa
}

public void DestroyManaged() {
SaveManaged();
SaveManagedConVars();

foreach (ManagedCommand managed in Managed)
cvar.UnregisterConCommand(managed.Command);

Managed.Clear();
}

void SaveManaged() {
public void SaveManagedConVars() {
foreach (ManagedCommand managed in Managed) {
if (!managed.IsConVar || !managed.Archive)
continue;
Expand Down
170 changes: 139 additions & 31 deletions Game.UI/OptionsSubKeyboard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ public void ParseActionDescriptions() {
Span<char> binding = stackalloc char[256];
Span<char> description = stackalloc char[256];

long size = g_pFileSystem.Size("scripts/kb_act.lst");
long size = g_pFileSystem.Size("scripts/kb_act.lst", "MOD");
if (size <= 0) return;

Span<byte> fileData = stackalloc byte[(int)size];
if (!g_pFileSystem.ReadFile("scripts/kb_act.lst", null, fileData.AsBytes(), 0))
if (!g_pFileSystem.ReadFile("scripts/kb_act.lst", "MOD", fileData.AsBytes(), 0))
return;

ReadOnlySpan<byte> data = fileData;
Expand All @@ -126,7 +126,7 @@ public void ParseActionDescriptions() {
strcpy(description, token);

if (description[0] != '=') {
if (streq(binding, "blank")) {
if (strieq(binding, "blank")) {
KeyBindList.AddSection(++sectionIndex, description);
KeyBindList.AddColumnToSection(sectionIndex, "Action", description, SectionedListPanel.ColumnBright, 286);
KeyBindList.AddColumnToSection(sectionIndex, "Key", "#GameUI_KeyButton", SectionedListPanel.ColumnBright, 128);
Expand All @@ -151,18 +151,18 @@ public void ParseActionDescriptions() {
KeyValues bindingItem = item.FindKey("Binding")!;
ReadOnlySpan<char> bindString = bindingItem.GetString();

if (strcmp(bindString, binding) == 0)
if (stricmp(bindString, binding) == 0)
return item;
}

return null;
}

public void AddBinding(KeyValues item, ReadOnlySpan<char> keyName) {
if (stricmp(item.GetString("key", ""), keyName) == 0)
if (stricmp(item.GetString("Key", ""), keyName) == 0)
return;

// RemoveKeyFromBindItems(item, keyName);
RemoveKeyFromBindItems(item, keyName);

ReadOnlySpan<char> binding = item.GetString("Binding", "");

Expand All @@ -175,7 +175,7 @@ public void AddBinding(KeyValues item, ReadOnlySpan<char> keyName) {

if (stricmp(curBinding, binding) == 0) {
curItem.SetString("Key", keyName);
KeyBindList.InvalidateLayout();
KeyBindList.InvalidateItem(i);
}
}
}
Expand All @@ -186,32 +186,54 @@ public void ClearBindItems() {
if (item == null)
continue;

item.SetString("key", "");
item.SetString("Key", "");

KeyBindList.InvalidateItem(i);
}

KeyBindList.InvalidateLayout();
}

public void RemoveKeyFromBindItems() {
public void RemoveKeyFromBindItems(KeyValues? orgItem, ReadOnlySpan<char> key) {
if (key.IsEmpty)
return;

string keyName = new(key);

for (int i = 0; i < KeyBindList.GetItemCount(); i++) {
KeyValues? item = KeyBindList.GetItemData(KeyBindList.GetItemIDFromRow(i));
if (item == null)
continue;

if (stricmp(keyName, item.GetString("Key", "")) == 0) {
bool clearEntry = true;

if (orgItem != null) {
ReadOnlySpan<char> orgBinding = orgItem.GetString("Binding", "");
ReadOnlySpan<char> binding = item.GetString("Binding", "");
if (stricmp(orgBinding, binding) == 0)
clearEntry = false;
}

if (clearEntry) {
item.SetString("Key", "");
KeyBindList.InvalidateItem(i);
}
}
}

KeyBindList.InvalidateLayout();
}

public void FillInCurrentBindings() {
KeysToUnbind.Clear();

ClearBindItems();

// bool Joystick = false;
// ConVarRef joy = new("joystick");
// if (joy.IsValid())
// Joystick = joy.GetBool();

// bool Falcon = false;
// ConVarRef falcon = new("hap_HasDevice");
// if (falcon.IsValid())
// Falcon = falcon.GetBool();
bool joystick = false;
ConVarRef joystickVar = new("joystick");
if (joystickVar.IsValid())
joystick = joystickVar.GetBool();

for (int i = 0; i < KeyBindings.Length; i++) {
ReadOnlySpan<char> binding = gameuifuncs.GetBindingForButtonCode((ButtonCode)i);
Expand All @@ -221,20 +243,27 @@ public void FillInCurrentBindings() {
KeyValues? item = GetItemForBinding(binding);
if (item != null) {
ReadOnlySpan<char> keyName = inputSystem.ButtonCodeToString((ButtonCode)i);
ReadOnlySpan<char> currentKey = item.GetString("key", "");

ReadOnlySpan<char> currentKey = item.GetString("Key", "");
if (!currentKey.IsEmpty) {
// ButtonCode currentBC = gameuifuncs.GetButtonCodeForBind(currentKey);
KeysToUnbind.Remove(currentKey.ToString());
ButtonCode currentBC = gameuifuncs.GetButtonCodeForBind(currentKey);

bool shouldOverride = joystick && IsJoystickOrNovintCode((ButtonCode)i) && !IsJoystickOrNovintCode(currentBC);
if (!shouldOverride)
continue;

KeysToUnbind.Remove(new(currentKey));
}

AddBinding(item, keyName);

KeysToUnbind.Add(keyName.ToString());
KeysToUnbind.Add(new(keyName));
}
}
}

static bool IsJoystickOrNovintCode(ButtonCode code) => code.IsJoystickCode() || code.IsNovintCode();

public void DeleteSavedBindings() {
for (int i = 0; i < KeyBindings.Length; i++) {
if (KeyBindings[i].Binding != null)
Expand All @@ -247,23 +276,43 @@ public void SaveCurrentBindings() {

for (int i = 0; i < (int)ButtonCode.Last; i++) {
ReadOnlySpan<char> binding = gameuifuncs.GetBindingForButtonCode((ButtonCode)i);
if (!binding.IsEmpty)
if (binding.IsEmpty)
continue;

KeyBindings[i].Binding = new(binding);
}
}

public void BindKey() {
public void BindKey(ReadOnlySpan<char> key, ReadOnlySpan<char> binding) => engine.ClientCmd_Unrestricted($"bind \"{key}\" \"{binding}\"\n");

}
public void UnbindKey(ReadOnlySpan<char> key) => engine.ClientCmd_Unrestricted($"unbind \"{key}\"\n");

public void UnbindKey() {
public void ApplyAllBindings() {
for (int i = 0; i < KeysToUnbind.Count; i++)
UnbindKey(KeysToUnbind[i]);
KeysToUnbind.Clear();

}
DeleteSavedBindings();

public void ApplyAllBindings() {
for (int i = 0; i < KeyBindList.GetItemCount(); i++) {
KeyValues? item = KeyBindList.GetItemData(KeyBindList.GetItemIDFromRow(i));
if (item == null)
continue;

ReadOnlySpan<char> binding = item.GetString("Binding", "");
if (binding.IsEmpty)
continue;

ReadOnlySpan<char> keyName = item.GetString("Key", "");
if (!keyName.IsEmpty) {
BindKey(keyName, binding);
ButtonCode code = inputSystem.StringToButtonCode(keyName);
if (code != ButtonCode.Invalid)
KeyBindings[(int)code].Binding = new(binding);
}
}

engine.ClientCmd_Unrestricted("exec userconfig.cfg\nhost_writeconfig\n");
}

public void FillInDefaultBindings() {
Expand All @@ -276,7 +325,40 @@ public void FillInDefaultBindings() {

ClearBindItems();

// todo
ReadOnlySpan<byte> data = fileData;
Span<char> cmd = stackalloc char[1024];
Span<char> keyName = stackalloc char[1024];
Span<char> binding = stackalloc char[1024];

while (true) {
data = engine.ParseFile(data, cmd);
if (strlen(cmd) == 0)
break;

if (stricmp(cmd, "bind") == 0) {
data = engine.ParseFile(data, keyName);
if (strlen(keyName) == 0)
break;

data = engine.ParseFile(data, binding);
if (strlen(keyName) == 0)
break;

KeyValues? item = GetItemForBinding(binding[..(int)strlen(binding)]);
if (item != null)
AddBinding(item, keyName[..(int)strlen(keyName)]);
}
}

PostActionSignal(KV_ApplyButtonEnable);

KeyValues? consoleItem = GetItemForBinding("toggleconsole");
if (consoleItem != null)
AddBinding(consoleItem, "`");

KeyValues? escapeItem = GetItemForBinding("cancelselect");
if (escapeItem != null)
AddBinding(escapeItem, "ESCAPE");
}

[UiMessage("ItemSelected")]
Expand All @@ -294,7 +376,7 @@ public void ItemSelected(int itemID) {
else
ClearBindingButton.SetEnabled(false);

if (kv.GetInt("Header") > 0)
if (kv.GetInt("Header") != 0)
SetBindingButton.SetEnabled(false);
}
}
Expand Down Expand Up @@ -333,8 +415,28 @@ public override void OnThink() {
}

public override void OnKeyCodePressed(ButtonCode code) {
base.OnKeyCodePressed(code);
if (!KeyBindList.IsCapturing()) {
int r = KeyBindList.GetItemOfInterest();

bool visible = KeyBindList.GetCellBounds(r, 1, out _, out _, out _, out _);
if (visible) {
if (code == ButtonCode.KeyDelete) {
KeyValues? kv = KeyBindList.GetItemData(r);

ReadOnlySpan<char> key = kv != null ? kv.GetString("Key", null) : null;
if (!key.IsEmpty)
RemoveKeyFromBindItems(null, key);

ClearBindingButton.SetEnabled(false);
KeyBindList.InvalidateItem(r);
PostActionSignal(KV_ApplyButtonEnable);

return;
}
}
}

base.OnKeyCodePressed(code);
}

[UiCommand("Advanced")]
Expand All @@ -355,6 +457,11 @@ public OptionsSubKeyboardAdvancedDlg(Panel? parent) : base(null, null) {
SetDeleteSelfOnClose(true);
}

#if GMOD_DLL
public override void Activate() => base.Activate();

public void OnApplyData() { }
#else
public override void Activate() {
base.Activate();

Expand All @@ -375,6 +482,7 @@ public void OnApplyData() {
ConVarRef hud_fastswitch = new("hud_fastswitch");
hud_fastswitch.SetValue(GetControlInt("FastSwitchCheck", 0));
}
#endif

[UiCommand("OK")]
private void OnOK() {
Expand Down
Loading
Loading