all the niceness (#1152)

Author: Kapu1178

code/__DEFINES/keybinding.dm

@@ -4,6 +4,10 @@
 #define COMSIG_KB_ACTIVATED (1<<0)
 #define COMSIG_KB_EMOTE "keybinding_emote_down"
 
+//Rawkeys
+#define COMSIG_KB_RAW_CTRL "keybinding_raw_ctrl"
+#define COMSIG_KB_RAW_SHIFT "keybinding_raw_shift"
+
 //Admin
 #define COMSIG_KB_ADMIN_ASAY_DOWN "keybinding_admin_asay_down"
 #define COMSIG_KB_ADMIN_DSAY_DOWN "keybinding_admin_dsay_down"
@@ -50,7 +54,6 @@
 #define COMSIG_KB_LIVING_TOGGLE_COMBAT_DOWN "keybinding_living_toggle_combat_down"
 #define COMSIG_KB_LIVING_ENABLE_COMBAT_DOWN "keybinding_living_enable_combat_down"
 #define COMSIG_KB_LIVING_DISABLE_COMBAT_DOWN "keybinding_living_disable_combat_down"
-
 //Mob
 #define COMSIG_KB_MOB_FACENORTH_DOWN "keybinding_mob_facenorth_down"
 #define COMSIG_KB_MOB_FACEEAST_DOWN "keybinding_mob_faceeast_down"

code/_globalvars/lists/client.dm

@@ -1,2 +1,3 @@
 GLOBAL_LIST_EMPTY(default_hotkeys)
 GLOBAL_LIST_EMPTY(keybindings_by_name)
+GLOBAL_LIST_EMPTY(raw_keybindings_by_key)

code/_globalvars/lists/keybindings.dm

@@ -9,6 +9,11 @@
 
 /// Adds an instanced keybinding to the global tracker
 /proc/add_keybinding(datum/keybinding/instance)
+	if(istype(instance, /datum/keybinding/rawkey))
+		for(var/key in instance.hotkey_keys)
+			GLOB.raw_keybindings_by_key[key] = instance
+		return
+
 	GLOB.keybindings_by_name[instance.name] = instance
 
 	// Hotkey

code/_onclick/hud/screen_objects.dm

@@ -394,7 +394,7 @@
 /atom/movable/screen/combattoggle
 	name = "toggle combat mode"
 	icon = 'icons/hud/screen_midnight.dmi'
-	icon_state = "combat_off"
+	icon_state = "help"
 	screen_loc = ui_combat_toggle
 
 /atom/movable/screen/combattoggle/Initialize(mapload)
@@ -405,6 +405,7 @@
 	. = ..()
 	if(.)
 		return FALSE
+
 	if(isliving(usr))
 		var/mob/living/owner = usr
 		owner.set_combat_mode(!owner.combat_mode, FALSE)
@@ -414,7 +415,11 @@
 	var/mob/living/user = hud?.mymob
 	if(!istype(user) || !user.client)
 		return ..()
-	icon_state = user.combat_mode ? "combat" : "combat_off" //Treats the combat_mode
+
+	if(user.client.keys_held["Ctrl"])
+		icon_state = "grab"
+	else
+		icon_state = user.combat_mode ? "harm" : "help" //Treats the combat_mode
 	return ..()
 
 //Version of the combat toggle with the flashy overlay

code/controllers/subsystem/input.dm

@@ -42,7 +42,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input)
 // This is for when macro sets are eventualy datumized
 /datum/controller/subsystem/verb_manager/input/proc/setup_default_macro_sets()
 	macro_set = list(
-		// These could probably just be put in the skin. I actually don't understand WHY they aren't just in the skin. Besides the use of defines for Tab.
+		// These could probably just be put in the skin. I actually don't 	understand WHY they aren't just in the skin. Besides the use of defines for Tab.
 		"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"",
 		"Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
 		"Escape" = "Reset-Held-Keys",

code/datums/keybinding/rawkey.dm

@@ -0,0 +1,48 @@
+/*
+ * Rawkeys are magic keybindings that are bound directly to a key instead of having an associated action, like "move up"
+ * Rawkeys are NOT in GLOB.keybindings_by_name
+ * NOTE: Legacy mode users will NOT fire rawkeys for printable keys. Do remember this if you are for some reason making
+ * a rawkey associated with a printable key.
+ */
+/datum/keybinding/rawkey/ctrl
+	hotkey_keys = list("Ctrl")
+	name = "CTRL"
+	keybind_signal = COMSIG_KB_RAW_CTRL
+
+/datum/keybinding/rawkey/ctrl/up(client/user)
+	. = ..()
+	if(.)
+		return
+
+	if(isliving(user.mob))
+		var/mob/living/user_mob = user.mob
+		user_mob.hud_used?.action_intent?.update_appearance()
+
+/datum/keybinding/rawkey/ctrl/down(client/user)
+	. = ..()
+	if(.)
+		return
+
+	if(isliving(user.mob))
+		var/mob/living/user_mob = user.mob
+		user_mob.hud_used?.action_intent?.update_appearance()
+
+/datum/keybinding/rawkey/shift
+	hotkey_keys = list("Shift")
+	name = "Shift"
+	keybind_signal = COMSIG_KB_RAW_CTRL
+
+/datum/keybinding/rawkey/shift/up(client/user)
+	. = ..()
+	if(.)
+		return
+
+	user.mob.update_mouse_pointer()
+
+/datum/keybinding/rawkey/shift/down(client/user)
+	. = ..()
+	if(.)
+		return
+
+	user.mob.update_mouse_pointer()
+

code/modules/client/preferences/middleware/keybindings.dm

@@ -45,7 +45,8 @@
 /datum/preference_middleware/keybindings/proc/set_keybindings(list/params)
 	var/keybind_name = params["keybind_name"]
 
-	if (isnull(GLOB.keybindings_by_name[keybind_name]))
+	var/datum/keybinding/keybind_datum = GLOB.keybindings_by_name[keybind_name]
+	if (isnull(keybind_datum))
 		return FALSE
 
 	var/list/raw_hotkeys = params["hotkeys"]

code/modules/client/preferences_savefile.dm

@@ -181,16 +181,16 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		fcopy(S, bacpath) //byond helpfully lets you use a savefile for the first arg.
 		update_preferences(needs_update, S) //needs_update = savefile_version if we need an update (positive integer)
 
-	check_keybindings() // this apparently fails every time and overwrites any unloaded prefs with the default values, so don't load anything after this line or it won't actually save
-	key_bindings_by_key = get_key_bindings_by_key(key_bindings)
-
 	//Sanitize
 	lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
 	default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
 	toggles = sanitize_integer(toggles, 0, SHORT_REAL_LIMIT-1, initial(toggles))
 	key_bindings = sanitize_keybindings(key_bindings)
 	favorite_outfits = SANITIZE_LIST(favorite_outfits)
 
+	check_keybindings() // this apparently fails every time and overwrites any unloaded prefs with the default values, so don't load anything after this line or it won't actually save
+	key_bindings_by_key = get_key_bindings_by_key(key_bindings)
+
 	if(needs_update >= 0) //save the updated version
 		var/old_default_slot = default_slot
 		var/old_max_save_slots = max_save_slots

code/modules/keybindings/bindings_client.dm

@@ -50,6 +50,11 @@
 		if(!movement_locked && !(next_move_dir_sub & movement))
 			next_move_dir_add |= movement
 
+	// Raw keys are handled first
+	var/datum/keybinding/rawkey/raw_keybind = GLOB.raw_keybindings_by_key[_key]
+	if(raw_keybind)
+		raw_keybind.down(src)
+
 	// Client-level keybindings are ones anyone should be able to do at any time
 	// Things like taking screenshots, hitting tab, and adminhelps.
 	var/AltMod = keys_held["Alt"] ? "Alt" : ""
@@ -74,8 +79,6 @@
 
 	holder?.key_down(_key, src)
 	mob.focus?.key_down(_key, src)
-	if(ShiftMod)
-		mob.update_mouse_pointer()
 
 
 /client/verb/keyUp(_key as text)
@@ -90,27 +93,28 @@
 	if(!keys_held[_key])
 		return
 
-	var/update_pointer = FALSE
-	if(keys_held["Shift"])
-		update_pointer = TRUE
-
 	keys_held -= _key
 
-	if(update_pointer == TRUE)
-		mob.update_mouse_pointer()
-
 	var/movement = movement_keys[_key]
 	if(movement)
 		calculate_move_dir()
 		if(!movement_locked && !(next_move_dir_add & movement))
 			next_move_dir_sub |= movement
 
+	// Raw keys are handled first
+	var/datum/keybinding/rawkey/raw_keybind = GLOB.raw_keybindings_by_key[_key]
+	if(raw_keybind)
+		raw_keybind.up(src)
+
 	// We don't do full key for release, because for mod keys you
 	// can hold different keys and releasing any should be handled by the key binding specifically
+	var/keycount = 0
 	for (var/kb_name in prefs.key_bindings_by_key[_key])
+		keycount++
 		var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name]
-		if(kb.can_use(src) && kb.up(src))
+		if(kb.can_use(src) && kb.up(src) && keycount >= MAX_COMMANDS_PER_KEY)
 			break
+
 	holder?.key_up(_key, src)
 	mob.focus?.key_up(_key, src)
 

code/modules/mob/living/carbon/carbon.dm

@@ -131,12 +131,14 @@
 	throw_mode = THROW_MODE_DISABLED
 	if(hud_used)
 		hud_used.throw_icon.icon_state = "act_throw_off"
+	update_mouse_pointer()
 
 
 /mob/living/carbon/proc/throw_mode_on(mode = THROW_MODE_TOGGLE)
 	throw_mode = mode
 	if(hud_used)
 		hud_used.throw_icon.icon_state = "act_throw_on"
+	update_mouse_pointer()
 
 /mob/proc/throw_item(atom/target)
 	SEND_SIGNAL(src, COMSIG_MOB_THROW, target)