From ead209f5071e10611cbdf3c55828c96ecd1aea80 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Fri, 27 Nov 2020 06:31:05 -0700
Subject: [PATCH] sigh

---
 code/modules/client/client_defines.dm         |  2 +
 code/modules/client/client_procs.dm           |  2 +-
 code/modules/client/preferences.dm            | 26 +++++----
 code/modules/keybindings/keybind/_keybind.dm  |  4 ++
 .../keybindings/keybind/communication.dm      |  7 +++
 code/modules/keybindings/keybind/movement.dm  |  1 +
 code/modules/keybindings/setup.dm             | 56 ++++++++++---------
 7 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 53ab7f7abb..b71521121b 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -89,6 +89,8 @@
 
 	var/list/char_render_holders			//Should only be a key-value list of north/south/east/west = obj/screen.
 
+	/// Last time they used fix macros
+	var/last_macro_fix = 0
 	/// Keys currently held
 	var/list/keys_held = list()
 	/// These next two vars are to apply movement for keypresses and releases made while move delayed.
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index cd8aca134a..267ee3a5e1 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		prefs = new /datum/preferences(src)
 		GLOB.preferences_datums[ckey] = prefs
 
-	addtimer(CALLBACK(src, .proc/ensure_keys_set), 10)	//prevents possible race conditions
+	addtimer(CALLBACK(src, .proc/ensure_keys_set, prefs), 10)	//prevents possible race conditions
 
 	prefs.last_ip = address				//these are gonna be used for banning
 	prefs.last_id = computer_id			//these are gonna be used for banning
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 73486958d6..87adc31d8c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -218,7 +218,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	//we couldn't load character data so just randomize the character appearance + name
 	random_character()		//let's create a random character then - rather than a fat, bald and naked man.
 	key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys
-	C?.ensure_keys_set()
+	C?.ensure_keys_set(src)
 	real_name = pref_species.random_name(gender,1)
 	if(!loaded_preferences_successfully)
 		save_preferences()
@@ -951,7 +951,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/list/default_keys = hotkeys ? kb.hotkey_keys : kb.classic_keys
 						if(LAZYLEN(default_keys))
 							dat += "| Default: [default_keys.Join(", ")]"
-						dat += "</span><span class='independent'>Independent Binding: <a href='?_src_=prefs;preference=keybindings_capture;keybinding=[kb.name];old_key=[current_independent_binding];independent=1'>[current_independent_binding]</a></span>"
+						if(!kb.special && !kb.clientside)
+							dat += "</span><span class='independent'>Independent Binding: <a href='?_src_=prefs;preference=keybindings_capture;keybinding=[kb.name];old_key=[current_independent_binding];independent=1'>[current_independent_binding]</a></span>"
 						dat += "<br>"
 					else
 						var/bound_key = user_binds[kb.name][1]
@@ -964,7 +965,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/list/default_keys = hotkeys ? kb.classic_keys : kb.hotkey_keys
 						if(LAZYLEN(default_keys))
 							dat += "| Default: [default_keys.Join(", ")]"
-						dat += "</span><span class='independent'>Independent Binding: <a href='?_src_=prefs;preference=keybindings_capture;keybinding=[kb.name];old_key=[current_independent_binding];independent=1'>[current_independent_binding]</a></span>"
+						if(!kb.special && !kb.clientside)
+							dat += "</span><span class='independent'>Independent Binding: <a href='?_src_=prefs;preference=keybindings_capture;keybinding=[kb.name];old_key=[current_independent_binding];independent=1'>[current_independent_binding]</a></span>"
 						dat += "<br>"
 
 			dat += "<br><br>"
@@ -990,7 +992,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 #undef APPEARANCE_CATEGORY_COLUMN
 #undef MAX_MUTANT_ROWS
 
-/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key, independent = FALSE)
+/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key, independent = FALSE, special = FALSE)
 	var/HTML = {"
 	<div id='focus' style="outline: 0;" tabindex=0>Keybinding: [kb.full_name]<br>[kb.description]<br><br><b>Press any key to change<br>Press ESC to clear</b></div>
 	<script>
@@ -1002,7 +1004,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		var shift = e.shiftKey ? 1 : 0;
 		var numpad = (95 < e.keyCode && e.keyCode < 112) ? 1 : 0;
 		var escPressed = e.keyCode == 27 ? 1 : 0;
-		var url = 'byond://?_src_=prefs;preference=keybindings_set;keybinding=[kb.name];old_key=[old_key];[independent?"independent=1":""];clear_key='+escPressed+';key='+e.key+';alt='+alt+';ctrl='+ctrl+';shift='+shift+';numpad='+numpad+';key_code='+e.keyCode;
+		var url = 'byond://?_src_=prefs;preference=keybindings_set;keybinding=[kb.name];old_key=[old_key];[independent?"independent=1;":""][special?"special=1;":""]clear_key='+escPressed+';key='+e.key+';alt='+alt+';ctrl='+ctrl+';shift='+shift+';numpad='+numpad+';key_code='+e.keyCode;
 		window.location=url;
 		deedDone = true;
 	}
@@ -2353,11 +2355,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				if("hotkeys")
 					hotkeys = !hotkeys
-					user.client.ensure_keys_set()
+					user.client.ensure_keys_set(src)
 
 				if("keybindings_capture")
 					var/datum/keybinding/kb = GLOB.keybindings_by_name[href_list["keybinding"]]
-					CaptureKeybinding(user, kb, href_list["old_key"], text2num(href_list["independent"]))
+					CaptureKeybinding(user, kb, href_list["old_key"], text2num(href_list["independent"]), kb.special || kb.clientside)
 					return
 
 				if("keybindings_set")
@@ -2381,7 +2383,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 								if(!length(key_bindings[old_key]))
 									key_bindings -= old_key
 						user << browse(null, "window=capturekeypress")
-						user.client.ensure_keys_set()
+						if(href_list["special"])		// special keys need a full reset
+							user.client.ensure_keys_set(src)
 						save_preferences()
 						ShowChoices(user)
 						return
@@ -2416,7 +2419,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 								key_bindings -= old_key
 						key_bindings[full_key] += list(kb_name)
 						key_bindings[full_key] = sortList(key_bindings[full_key])
-					user.client.ensure_keys_set()
+					if(href_list["special"])		// special keys need a full reset
+						user.client.ensure_keys_set(src)
 					user << browse(null, "window=capturekeypress")
 					save_preferences()
 
@@ -2428,7 +2432,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					hotkeys = (choice == "Hotkey")
 					key_bindings = (hotkeys) ? deepCopyList(GLOB.hotkey_keybinding_list_by_key) : deepCopyList(GLOB.classic_keybinding_list_by_key)
 					modless_key_bindings = list()
-					user.client.ensure_keys_set()
+					user.client.ensure_keys_set(src)
 
 				if("chat_on_map")
 					chat_on_map = !chat_on_map
@@ -2842,7 +2846,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	for(var/key in oldkeys)
 		if(!key_bindings[key])
 			key_bindings[key] = oldkeys[key]
-	parent.ensure_keys_set()
+	parent?.ensure_keys_set(src)
 
 /datum/preferences/proc/is_loadout_slot_available(slot)
 	var/list/L
diff --git a/code/modules/keybindings/keybind/_keybind.dm b/code/modules/keybindings/keybind/_keybind.dm
index 1d68e2d037..81f325da4c 100644
--- a/code/modules/keybindings/keybind/_keybind.dm
+++ b/code/modules/keybindings/keybind/_keybind.dm
@@ -7,6 +7,10 @@
 	var/category = CATEGORY_MISC
 	var/weight = WEIGHT_LOWEST
 	var/keybind_signal
+	/// Is this a clientside verb trigger? If so, this should be set to the name of the verb.
+	var/clientside
+	/// Special - Needs to update special keys on update. clientside implis special.
+	var/special = FALSE
 
 /datum/keybinding/New()
 
diff --git a/code/modules/keybindings/keybind/communication.dm b/code/modules/keybindings/keybind/communication.dm
index 4fdf0b53c4..eacf8ac505 100644
--- a/code/modules/keybindings/keybind/communication.dm
+++ b/code/modules/keybindings/keybind/communication.dm
@@ -5,16 +5,19 @@
 	hotkey_keys = list("CtrlT")
 	name = "Say"
 	full_name = "IC Say"
+	clientside = "say"
 
 /datum/keybinding/client/communication/ooc
 	hotkey_keys = list("O")
 	name = "OOC"
 	full_name = "Out Of Character Say (OOC)"
+	clientside = "ooc"
 
 /datum/keybinding/client/communication/me
 	hotkey_keys = list("CtrlM")
 	name = "Me"
 	full_name = "Me (emote)"
+	clientside = "me"
 
 //indicators
 /datum/keybinding/client/communication/say_with_indicator
@@ -44,21 +47,25 @@
 	classic_keys = list()
 	name = "Subtle"
 	full_name = "Subtle Emote"
+	clientside = "subtle"
 
 /datum/keybinding/client/communication/subtler
 	hotkey_keys = list("6")
 	classic_keys = list()
 	name = "Subtler"
 	full_name = "Subtler Anti-Ghost Emote"
+	clientside = "subtler-anti-ghost"
 
 /datum/keybinding/client/communication/whisper
 	hotkey_keys = list("Y")
 	classic_keys = list()
 	name = "Whisper"
 	full_name = "Whisper"
+	clientside = "whisper"
 
 /datum/keybinding/client/communication/looc
 	hotkey_keys = list("L")
 	classic_keys = list()
 	name = "LOOC"
 	full_name = "Local Out of Character chat"
+	clientside = "looc"
diff --git a/code/modules/keybindings/keybind/movement.dm b/code/modules/keybindings/keybind/movement.dm
index cc5798710c..d3a0e98def 100644
--- a/code/modules/keybindings/keybind/movement.dm
+++ b/code/modules/keybindings/keybind/movement.dm
@@ -1,6 +1,7 @@
 /datum/keybinding/movement
 	category = CATEGORY_MOVEMENT
 	weight = WEIGHT_HIGHEST
+	special = TRUE
 
 /datum/keybinding/movement/north
 	hotkey_keys = list("W", "North")
diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
index 3ed411e693..797dbe34e5 100644
--- a/code/modules/keybindings/setup.dm
+++ b/code/modules/keybindings/setup.dm
@@ -7,12 +7,28 @@
 /datum/proc/keyLoop(client/user) // Called once every frame
 	//SHOULD_NOT_SLEEP(TRUE)
 
+/client/verb/fix_macros()
+	set name = "Fix Keybindings"
+	set desc = "Re-assert all your macros/keybindings."
+	set category = "OOC"
+	if(last_macro_fix > (world.time - 10 SECONDS))
+		to_chat(src, "<span class='warning'>It's been too long since the last reset. Wait a while.</span>")
+		return
+	if(!SSinput.initialized)
+		to_chat(src, "<span class='warning'>Input hasn't been initialized yet. Wait a while.</span>")
+		return
+	to_chat(src, "<span class='danger'>Force-reasserting all macros.</span>")
+	last_macro_fix = world.time
+	full_macro_assert()
+
 // removes all the existing macros
 /client/proc/erase_all_macros()
 	var/erase_output = ""
-	var/list/macro_set = list()
-	for(var/macroset in SSinput.all_macrosets)		// WE HAVE THREE AAAAAAAA
-		macro_set |= params2list(winget(src, "[macroset].*", "command")) // The third arg doesnt matter here as we're just removing them all
+	var/list/set_text = list()
+	for(var/macroset in SSinput.all_macrosets)
+		set_text += "[macroset].*"
+	set_text = set_text.Join(";")
+	var/list/macro_set = params2list(winget(src, "[set_text]", "command"))
 	for(var/k in 1 to length(macro_set))
 		var/list/split_name = splittext(macro_set[k], ".")
 		var/macro_name = "[split_name[1]].[split_name[2]]" // [3] is "command"
@@ -29,31 +45,30 @@
 		winset(src, "[name]-[REF(key)]", "parent=[name];name=[key];command=[command]")
 
 /client/proc/set_macros(datum/preferences/prefs_override = prefs)
-	set waitfor = FALSE
-
 	keys_held.Cut()
 
-	erase_all_macros()
-
 	apply_macro_set(SKIN_MACROSET_HOTKEYS, SSinput.macroset_hotkey)
 	apply_macro_set(SKIN_MACROSET_CLASSIC_HOTKEYS, SSinput.macroset_classic_hotkey)
 	apply_macro_set(SKIN_MACROSET_CLASSIC_INPUT, SSinput.macroset_classic_input)
 
-	set_hotkeys_preference(prefs_override)
-
 /client/proc/set_hotkeys_preference(datum/preferences/prefs_override = prefs)
 	if(prefs_override.hotkeys)
 		winset(src, null, "map.focus=true input.background-color=[COLOR_INPUT_DISABLED] mainwindow.macro=[SKIN_MACROSET_HOTKEYS]")
 	else
 		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=[SKIN_MACROSET_CLASSIC_INPUT]")
 
-/client/proc/ensure_keys_set()
+/client/proc/ensure_keys_set(datum/preferences/prefs_override = prefs)
 	if(SSinput.initialized)
-		full_macro_assert()
+		full_macro_assert(prefs_override)
 
 /client/proc/full_macro_assert(datum/preferences/prefs_override = prefs)
+	INVOKE_ASYNC(src, .proc/do_full_macro_assert, prefs_override)		// winget sleeps.
+
+/client/proc/do_full_macro_assert(datum/preferences/prefs_override = prefs)
+	erase_all_macros()
 	set_macros(prefs_override)
 	update_special_keybinds(prefs_override)
+	set_hotkeys_preference(prefs_override)
 
 /client/proc/do_special_keybind(key, command, datum/preferences/prefs_override = prefs)
 	var/alt = findtext(key, "Alt")
@@ -96,17 +111,8 @@
 					movement_keys[key] = WEST
 				if("South")
 					movement_keys[key] = SOUTH
-				if("Say")
-					do_special_keybind(key, "say", D)
-				if("OOC")
-					do_special_keybind(key, "ooc", D)
-				if("Me")
-					do_special_keybind(key, "me", D)
-				if("Subtle")
-					do_special_keybind(key, "subtle", D)
-				if("Subtler")
-					do_special_keybind(key, "subtler-anti-ghost", D)
-				if("Whisper")
-					do_special_keybind(key, "whisper", D)
-				if("LOOC")
-					do_special_keybind(key, "looc", D)
+				else
+					var/datum/keybinding/KB = GLOB.keybindings_by_name[kb_name]
+					if(!KB.clientside)
+						continue
+					do_special_keybind(key, KB.clientside, D)