| [kb.full_name] | [pretty_keybinding_name(normal_name)] | "
for(var/bound_key_index in 2 to length(user_binds[kb.name]))
bound_key = user_binds[kb.name][bound_key_index]
- normal_name = _kbMap_reverse[bound_key] ? _kbMap_reverse[bound_key] : bound_key
+ normal_name = GLOB.keybindings_map_reverse[bound_key] ? GLOB.keybindings_map_reverse[bound_key] : bound_key
. += "[pretty_keybinding_name(normal_name)] | "
if(length(user_binds[kb.name]) < MAX_KEYS_PER_KEYBIND)
. += "None | "
@@ -86,61 +78,10 @@
return jointext(., null)
-
-/datum/category_item/player_setup_item/controls/keybindings/proc/pretty_keybinding_name(keybinding)
- var/list/keys = list()
- var/static/regex/modKeys = regex("Shift|Ctrl|Alt")
-
- while(modKeys.Find(keybinding))
- keys += modKeys.match
- keybinding = copytext(keybinding, length(modKeys.match)+1)
-
- if (keybinding)
- keys += keybinding
-
- return jointext(keys, "+")
-
-
-/datum/category_item/player_setup_item/controls/keybindings/proc/capture_keybinding(mob/user, datum/keybinding/kb, old_key)
- var/HTML = {"
-
- Keybinding: [kb.full_name]
[kb.description]
-
- Press any key to change
Press ESC to clear
-
-
- "}
- winshow(user, "capturekeypress", TRUE)
- var/datum/browser/popup = new(user, "capturekeypress", "Keybindings
", 350, 300)
- popup.set_content(HTML)
- popup.open(FALSE)
-
-
/datum/category_item/player_setup_item/controls/keybindings/OnTopic(href, list/href_list, mob/user)
switch(href_list["preference"])
if("keybindings_capture")
- var/datum/keybinding/kb = global.keybindings_by_name[href_list["keybinding"]]
+ var/datum/keybinding/kb = GLOB.keybindings_by_name[href_list["keybinding"]]
var/old_key = href_list["old_key"]
capture_keybinding(user, kb, old_key)
return TOPIC_REFRESH
@@ -174,8 +115,8 @@
close_browser(user, "window=capturekeypress")
return TOPIC_REFRESH
- if(global._kbMap[new_key])
- new_key = global._kbMap[new_key]
+ if(GLOB.keybindings_map[new_key])
+ new_key = GLOB.keybindings_map[new_key]
var/full_key
switch(new_key)
@@ -201,7 +142,7 @@
return TOPIC_REFRESH
if("keybindings_reset")
- pref.key_bindings = deepCopyList(global.hotkey_keybinding_list_by_key)
+ pref.key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key)
user.client.set_macros()
return TOPIC_REFRESH
@@ -216,7 +157,7 @@
if(!length(pref.key_bindings[old_key]))
pref.key_bindings -= old_key
- var/datum/keybinding/kb = global.keybindings_by_name[kb_name]
+ var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name]
for(var/key in kb.hotkey_keys)
pref.key_bindings[key] += list(kb_name)
pref.key_bindings[key] = sortTim(pref.key_bindings[key], GLOBAL_PROC_REF(cmp_text_asc))
@@ -224,18 +165,3 @@
return TOPIC_REFRESH
return ..()
-
-
-/proc/sanitize_keybindings(value)
- var/list/base_bindings = sanitize_islist(value,list())
- for(var/key in base_bindings)
- base_bindings[key] = base_bindings[key] & global.keybindings_by_name
- if(!length(base_bindings[key]))
- base_bindings -= key
- return base_bindings
-
-/proc/sanitize_islist(value, default)
- if(islist(value) && length(value))
- return value
- if(default)
- return default
diff --git a/code/modules/client/preference_setup/keybindings/keybindings_proc.dm b/code/modules/client/preference_setup/keybindings/keybindings_proc.dm
new file mode 100644
index 0000000000000..50d44f275c688
--- /dev/null
+++ b/code/modules/client/preference_setup/keybindings/keybindings_proc.dm
@@ -0,0 +1,61 @@
+/datum/category_item/player_setup_item/controls/keybindings/proc/pretty_keybinding_name(keybinding)
+ var/list/keys = list()
+ var/static/regex/modKeys = regex("Shift|Ctrl|Alt")
+
+ while(modKeys.Find(keybinding))
+ keys += modKeys.match
+ keybinding = copytext(keybinding, length(modKeys.match)+1)
+
+ if (keybinding)
+ keys += keybinding
+
+ return jointext(keys, "+")
+
+/datum/category_item/player_setup_item/controls/keybindings/proc/capture_keybinding(mob/user, datum/keybinding/kb, old_key)
+ var/HTML = {"
+
+ Keybinding: [kb.full_name]
[kb.description]
+
+ Press any key to change
Press ESC to clear
+
+
+ "}
+ winshow(user, "capturekeypress", TRUE)
+ var/datum/browser/popup = new(user, "capturekeypress", "Keybindings
", 350, 300)
+ popup.set_content(HTML)
+ popup.open(FALSE)
+
+/proc/sanitize_keybindings(value)
+ var/list/base_bindings = sanitize_islist(value,list())
+ for(var/key in base_bindings)
+ base_bindings[key] = base_bindings[key] & GLOB.keybindings_by_name
+ if(!length(base_bindings[key]))
+ base_bindings -= key
+ return base_bindings
+
+/proc/sanitize_islist(value, default)
+ if(islist(value) && length(value))
+ return value
+ if(default)
+ return default
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 4f215705beadf..8155ebf502f12 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -50,6 +50,7 @@
..()
/datum/preferences/proc/setup()
+ key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key)
if(!length(GLOB.skills))
GET_SINGLETON(/singleton/hierarchy/skill)
player_setup = new(src)
@@ -58,6 +59,7 @@
b_type = RANDOM_BLOOD_TYPE
if(client)
+ client.set_macros()
if(IsGuestKey(client.key))
is_guest = TRUE
else
@@ -490,3 +492,48 @@
priority = selected_branches_assoc(priority)
for (var/callback in callbacks)
. += for_each_selected_branch(callback, priority)
+
+/// checks through keybindings for outdated unbound keys and updates them
+/datum/preferences/proc/check_keybindings()
+ if(!client)
+ return
+
+ // When loading from savefile key_binding can be null
+ // This happens when player had savefile created before new kb system, but hotkeys was not saved
+ if(!length(key_bindings))
+ key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds too
+
+ var/list/user_binds = list()
+ for (var/key in key_bindings)
+ for(var/kb_name in key_bindings[key])
+ user_binds[kb_name] += list(key)
+ var/list/notadded = list()
+ for (var/name in GLOB.keybindings_by_name)
+ var/datum/keybinding/kb = GLOB.keybindings_by_name[name]
+ if(length(user_binds[kb.name]))
+ continue // key is unbound and or bound to something
+ var/addedbind = FALSE
+ if(hotkeys)
+ for(var/hotkeytobind in kb.hotkey_keys)
+ if(!length(key_bindings[hotkeytobind]) || hotkeytobind == "Unbound") //Only bind to the key if nothing else is bound expect for Unbound
+ LAZYADD(key_bindings[hotkeytobind], kb.name)
+ addedbind = TRUE
+ else
+ for(var/classickeytobind in kb.classic_keys)
+ if(!length(key_bindings[classickeytobind]) || classickeytobind == "Unbound") //Only bind to the key if nothing else is bound expect for Unbound
+ LAZYADD(key_bindings[classickeytobind], kb.name)
+ addedbind = TRUE
+ if(!addedbind)
+ notadded += kb
+
+ if(length(notadded))
+ addtimer(CALLBACK(src, PROC_REF(announce_conflict), notadded), 5 SECONDS)
+
+/datum/preferences/proc/announce_conflict(list/notadded)
+ to_chat(client, SPAN_DANGER("KEYBINDING CONFLICT.\n\
+ There are new keybindings that have defaults bound to keys you already set, They will default to Unbound. You can bind them in Setup Character or Game Preferences\n\
+ Or you can click here to go straight to the keybindings page."))
+ for(var/item in notadded)
+ var/datum/keybinding/conflicted = item
+ to_chat(client, SPAN_DANGER("[conflicted.category]: [conflicted.full_name] needs updating."))
+ LAZYADD(key_bindings["None"], conflicted.name) // set it to unbound to prevent this from opening up again in the future
diff --git a/mods/ssinput/code/general/bindings_client.dm b/code/modules/input/input.dm
similarity index 61%
rename from mods/ssinput/code/general/bindings_client.dm
rename to code/modules/input/input.dm
index 6b726890313a5..28a27c46732d6 100644
--- a/mods/ssinput/code/general/bindings_client.dm
+++ b/code/modules/input/input.dm
@@ -1,5 +1,23 @@
-// Clients aren't datums so we have to define these procs indpendently.
-// These verbs are called for all key press and release events
+/// Set a client's focus to an object and override these procs on that object to let it handle keypresses
+/// Called when a key is pressed down initially
+/datum/proc/key_down(key, client/user)
+ return
+
+/// Called when a key is released
+/datum/proc/key_up(key, client/user)
+ return
+
+/// Called once every frame
+/datum/proc/keyLoop(client/user)
+ return
+
+/// Called every game tick
+/client/keyLoop()
+ holder?.keyLoop(src)
+ mob.keyLoop(src)
+
+/// Clients aren't datums so we have to define these procs indpendently.
+/// These verbs are called for all key press and release events
/client/verb/keyDown(_key as text)
set hidden = TRUE
@@ -60,7 +78,7 @@
var/keycount = 0
for(var/kb_name in prefs.key_bindings[full_key])
keycount++
- var/datum/keybinding/kb = global.keybindings_by_name[kb_name]
+ var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name]
if(kb.can_use(src) && kb.down(src) && keycount >= MAX_COMMANDS_PER_KEY)
break
@@ -89,13 +107,59 @@
// 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
for (var/kb_name in prefs.key_bindings[_key])
- var/datum/keybinding/kb = global.keybindings_by_name[kb_name]
+ var/datum/keybinding/kb = GLOB.keybindings_by_name[kb_name]
if(kb.can_use(src) && kb.up(src))
break
holder?.key_up(_key, src)
mob.key_up(_key, src)
-// Called every game tick
-/client/keyLoop()
- holder?.keyLoop(src)
- mob.keyLoop(src)
+// removes all the existing macros
+/client/proc/erase_all_macros()
+ var/erase_output = ""
+ var/list/macro_set = params2list(winget(src, "default.*", "command")) // The third arg doesnt matter here as we're just removing them all
+ 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"
+ erase_output = "[erase_output];[macro_name].parent=null"
+ winset(src, null, erase_output)
+
+
+/client/proc/set_macros()
+ set waitfor = FALSE
+
+ //Reset the buffer
+ reset_held_keys()
+ erase_all_macros()
+
+ var/list/macro_set = SSinput.macro_set
+ for(var/k in 1 to length(macro_set))
+ var/key = macro_set[k]
+ var/command = macro_set[key]
+ winset(src, "default-\ref[key]", "parent=default;name=[key];command=[command]")
+
+ update_special_keybinds()
+
+/client/proc/reset_macros(skip_alert = FALSE)
+ var/answer
+ if(!skip_alert)
+ answer = tgui_alert(src, "Change your keyboard language to ENG", "Reset macros")
+
+ if(skip_alert || answer)
+ set_macros()
+ to_chat(src, SPAN_NOTICE("Keybindings were fixed.")) // not yet but set_macros works fast enough
+
+/**
+ * Manually clears any held keys, in case due to lag or other undefined behavior a key gets stuck.
+ *
+ * Hardcoded to the ESC key.
+ */
+/client/verb/reset_held_keys()
+ set name = "Reset Held Keys"
+ set hidden = TRUE
+
+ for(var/key in keys_held)
+ keyUp(key)
+
+ //In case one got stuck and the previous loop didn't clean it, somehow.
+ for(var/key in key_combos_held)
+ keyUp(key_combos_held[key])
diff --git a/mods/ssinput/code/general/bindings_atom.dm b/code/modules/input/movement.dm
similarity index 99%
rename from mods/ssinput/code/general/bindings_atom.dm
rename to code/modules/input/movement.dm
index bd024fb42e338..94f7827d44cc9 100644
--- a/mods/ssinput/code/general/bindings_atom.dm
+++ b/code/modules/input/movement.dm
@@ -3,7 +3,6 @@
// You might be wondering why this isn't client level. If focus is null, we don't want you to move.
// Only way to do that is to tie the behavior into the focus's keyLoop().
-
/atom/movable/keyLoop(client/user)
var/movement_dir = 0
for(var/_key in user.keys_held)
@@ -29,7 +28,6 @@
user.next_move_dir_add = 0
user.next_move_dir_sub = 0
-
/**
* A wrapper for setDir that should only be able to fail by living mobs.
*
diff --git a/mods/global_modpacks.dm b/mods/global_modpacks.dm
index 7cf815ad84446..94639e95b2db7 100644
--- a/mods/global_modpacks.dm
+++ b/mods/global_modpacks.dm
@@ -17,7 +17,6 @@
#include "music_player/_music_player.dme"
#include "ntnet/_ntnet.dme"
#include "nyc_posters/_nyc_posters.dme"
-#include "ssinput/_ssinput.dme"
#include "statusbar/_statusbar.dme"
#include "utf8/_utf8.dme"
#include "utility_items/_utility_items.dme"
diff --git a/mods/ssinput/README.md b/mods/ssinput/README.md
deleted file mode 100644
index be410f081c4f1..0000000000000
--- a/mods/ssinput/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#### Список PRов:
-
-- https://github.com/SierraBay/SierraBay12/pull/908
--https://github.com/SierraBay/SierraBay12/pull/1824
-
-
-
-## SSinput
-
-ID мода: SSINPUT
-
-
-### Описание мода
-
-Кейбинды, диагональное передвижение и русская раскладка - то, что делает этот мод.
-
-
-### Изменения *кор кода*
-
-- `code/__defines/subsystem-priority.dm`: `#define SS_PRIORITY_INPUT`
-- `code/__defines/subsystems.dm`: `#define SS_INIT_INPUT`
-- `code/_onclick/click.dm`: `/mob/proc/MiddleClickOn()`
-- `code/datums/movement/mob.dm`: `/datum/movement_handler/mob/movement/DoMove()`
-- `code/game/objects/buckling.dm`: `/obj/Move()`, `/obj/forceMove()`
-- `code/game/verbs/ooc.dm`: `/client/verb/ooc()`, `/client/verb/looc()`
-- `code/modules/admin/callproc/callproc.dm`: `/client/Click()`
-- `code/modules/client/client_procs.dm`: `/client/New()`, `/client/verb/toggle_fullscreen()`
-- `code/modules/goonchat/browserOutput.dm`: `/datum/chatOutput/Topic()`
-- `code/modules/mob/grab/grab_datum.dm`: `/datum/grab/proc/adjust_position()`
-- `code/modules/mob/living/silicon/robot/login.dm`: `/mob/living/silicon/robot/Login()`
-- `code/modules/mob/observer/ghost/ghost.dm`: `/mob/observer/ghost/appearance_flags`
-- `code/modules/mob/login.dm`: `/mob/Login()`
-- `code/modules/mob/mob_defines.dm`: `/mob/appearance_flags`
-- `code/modules/mob/mob_helpers.dm`: `/mob/verb/a_intent_change()`
-- `code/modules/mob/living/carbon/human/inventory.dm`: `/mob/living/carbon/human/verb/quick_equip()`
-- `code/modules/ventcrawl/ventcrawl_atmospherics.dm`: `/obj/machinery/atmospherics/relaymove()`
-
-
-
-### Оверрайды
-
-- `mods/ssinput/code/general/client.dm`: `/client/Topic()`
-- `mods/ssinput/code/general/preferences.dm`: `/datum/preferences/setup()`
-- `mods/ssinput/code/global_lists.dm`: `/hook/global_init/makeDatumRefLists()`
-
-
-### Дефайны
-
-- `code/__defines/subsystem-priority.dm`: `SS_PRIORITY_INPUT`
-- `code/__defines/subsystems.dm`: `SS_INIT_INPUT`
-
-
-### Используемые файлы, не содержащиеся в модпаке
-
-- Отсутствуют
-
-
-### Авторы:
-
-SuhEugene
-
diff --git a/mods/ssinput/_ssinput.dm b/mods/ssinput/_ssinput.dm
deleted file mode 100644
index 25fcc9f9c6bbb..0000000000000
--- a/mods/ssinput/_ssinput.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/singleton/modpack/ssinput
- name = "SSinput"
- desc = "Кейбинды, диагональное передвижение и русская раскладка - то, что делает этот мод."
- author = "SuhEugene"
diff --git a/mods/ssinput/_ssinput.dme b/mods/ssinput/_ssinput.dme
deleted file mode 100644
index 360cd045ce9c7..0000000000000
--- a/mods/ssinput/_ssinput.dme
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef MODPACK_SSINPUT
-#define MODPACK_SSINPUT
-
-// SIERRA TODO: УДАЛИТЬ МОД ЛИБО ПЕРЕДЕЛАТЬ ПО ГАЙДУ МОДУЛЯРИЗАЦИИ
-// SIERRA FIXME: УДАЛИТЬ МОД ЛИБО ПЕРЕДЕЛАТЬ ПО ГАЙДУ МОДУЛЯРИЗАЦИИ
-
-#include "_ssinput.dm"
-
-// Табы тут для удобства чтения
-// Синтаксически они ничего не значат
-
-#include "code/_defines.dm"
-
- #include "code/global_lists.dm"
- #include "code/global_maps.dm"
-
- #include "code/general/bindings_atom.dm"
- #include "code/general/bindings_client.dm"
- #include "code/general/bindings_setup.dm"
- #include "code/general/client.dm"
- #include "code/general/preference_setup.dm"
- #include "code/general/preferences.dm"
- #include "code/general/subsystem.dm"
-
- #include "code/keybindings/_defines.dm"
- #include "code/keybindings/_keybinding.dm"
- #include "code/keybindings/admin.dm"
- #include "code/keybindings/carbon.dm"
- #include "code/keybindings/client.dm"
- #include "code/keybindings/communication.dm"
- #include "code/keybindings/human.dm"
- #include "code/keybindings/living.dm"
- #include "code/keybindings/mob.dm"
- #include "code/keybindings/movement.dm"
- #include "code/keybindings/robot.dm"
- #include "code/keybindings/_undefines.dm"
-
-#include "code/_undefines.dm"
-
-#endif
diff --git a/mods/ssinput/code/README.md b/mods/ssinput/code/README.md
deleted file mode 100644
index 008135bba3404..0000000000000
--- a/mods/ssinput/code/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# In-code keypress handling system
-
-This whole system is heavily based off of forum_account's keyboard library.
-Thanks to forum_account for saving the day, the library can be found
-[here](https://secure.byond.com/developer/Forum_account/Keyboard)!
-
-.dmf macros have some very serious shortcomings. For example, they do not allow reusing parts
-of one macro in another, so giving cyborgs their own shortcuts to swap active module couldn't
-inherit the movement that all mobs should have anyways. The webclient only supports one macro,
-so having more than one was problematic. Additionally each keybind has to call an actual
-verb, which meant a lot of hidden verbs that just call one other proc. Also our existing
-macro was really bad and tied unrelated behavior into `Northeast()`, `Southeast()`, `Northwest()`,
-and `Southwest()`.
-
-The basic premise of this system is to not screw with .dmf macro setup at all and handle
-pressing those keys in the code instead. We have every key call `client.keyDown()`
-or `client.keyUp()` with the pressed key as an argument. Certain keys get processed
-directly by the client because they should be doable at any time, then we call
-`keyDown()` or `keyUp()` on the client's holder and the client's mob's focus.
-By default `mob.focus` is the mob itself, but you can set it to any datum to give control of a
-client's keypresses to another object. This would be a good way to handle a menu or driving
-a mech. You can also set it to null to disregard input from a certain user.
-
-Movement is handled by having each client call `client.keyLoop()` every game tick.
-As above, this calls holder and `focus.keyLoop()`. `atom/movable/keyLoop()` handles movement
-Try to keep the calculations in this proc light. It runs every tick for every client after all!
-
-You can also tell which keys are being held down now. Each client a list of keys pressed called
-`keys_held`. Each entry is a key as a text string associated with the world.time when it was
-pressed.
-
-Notes about certain keys:
-
-* `Tab` has client-sided behavior but acts normally
-* `T`, `O`, and `M` move focus to the input when pressed. This fires the keyUp macro right away.
-* `\` needs to be escaped in the dmf so any usage is `\\`
-
-You cannot `TICK_CHECK` or check `world.tick_usage` inside of procs called by key down and up
-events. They happen outside of a byond tick and have no meaning there. Key looping
-works correctly since it's part of a subsystem, not direct input.
diff --git a/mods/ssinput/code/_undefines.dm b/mods/ssinput/code/_undefines.dm
deleted file mode 100644
index a87ee6556ad41..0000000000000
--- a/mods/ssinput/code/_undefines.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-#undef MAX_KEYPRESS_COMMANDLENGTH
-#undef MAX_COMMANDS_PER_KEY
-#undef MAX_KEYS_PER_KEYBIND
-#undef HELD_KEY_BUFFER_LENGTH
-
-#undef INTENT_HOTKEY_LEFT
-#undef INTENT_HOTKEY_RIGHT
diff --git a/mods/ssinput/code/general/bindings_setup.dm b/mods/ssinput/code/general/bindings_setup.dm
deleted file mode 100644
index c162444a6cdf4..0000000000000
--- a/mods/ssinput/code/general/bindings_setup.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-// Set a client's focus to an object and override these procs on that object to let it handle keypresses
-
-/datum/proc/key_down(key, client/user) // Called when a key is pressed down initially
- return
-
-
-/datum/proc/key_up(key, client/user) // Called when a key is released
- return
-
-
-/datum/proc/keyLoop(client/user) // Called once every frame
- set waitfor = FALSE
- return
-
-
-// removes all the existing macros
-/client/proc/erase_all_macros()
- var/erase_output = ""
- var/list/macro_set = params2list(winget(src, "default.*", "command")) // The third arg doesnt matter here as we're just removing them all
- 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"
- erase_output = "[erase_output];[macro_name].parent=null"
- winset(src, null, erase_output)
-
-
-/client/proc/set_macros()
- set waitfor = FALSE
-
- //Reset the buffer
- reset_held_keys()
-
- erase_all_macros()
-
- var/list/macro_set = SSinput.macro_set
- for(var/k in 1 to length(macro_set))
- var/key = macro_set[k]
- var/command = macro_set[key]
- winset(src, "default-\ref[key]", "parent=default;name=[key];command=[command]")
-
- update_special_keybinds()
-
-
-// byond bug ID:2694120
-/client/verb/reset_macros_wrapper()
- set category = "OOC"
- set name = "Fix Keybindings"
-
- reset_macros()
-
-
-/client/proc/reset_macros(skip_alert = FALSE)
- var/ans
- if(!skip_alert)
- ans = alert(src, "Change your keyboard language to ENG", "Reset macros")
-
- if(skip_alert || ans)
- set_macros()
- to_chat(src, SPAN_NOTICE("Keybindings were fixed.")) // not yet but set_macros works fast enough
-
-
-/**
- * Manually clears any held keys, in case due to lag or other undefined behavior a key gets stuck.
- *
- * Hardcoded to the ESC key.
- */
-/client/verb/reset_held_keys()
- set name = "Reset Held Keys"
- set hidden = TRUE
-
- for(var/key in keys_held)
- keyUp(key)
-
- //In case one got stuck and the previous loop didn't clean it, somehow.
- for(var/key in key_combos_held)
- keyUp(key_combos_held[key])
diff --git a/mods/ssinput/code/general/client.dm b/mods/ssinput/code/general/client.dm
deleted file mode 100644
index 22652658ed59f..0000000000000
--- a/mods/ssinput/code/general/client.dm
+++ /dev/null
@@ -1,116 +0,0 @@
-/client
- /// Custom movement keys for this client
- var/list/movement_keys = list()
- /// Are we locking our movement input?
- var/movement_locked = FALSE
-
- /// A buffer of currently held keys.
- var/list/keys_held = list()
- /// A buffer for combinations such of modifiers + keys (ex: CtrlD, AltE, ShiftT). Format: `"key"` -> `"combo"` (ex: `"D"` -> `"CtrlD"`)
- var/list/key_combos_held = list()
- /*
- ** These next two vars are to apply movement for keypresses and releases made while move delayed.
- ** Because discarding that input makes the game less responsive.
- */
- /// On next move, add this dir to the move that would otherwise be done
- var/next_move_dir_add
- /// On next move, subtract this dir from the move that would otherwise be done
- var/next_move_dir_sub
- /// Movement dir of the most recently pressed movement key. Used in cardinal-only movement mode.
- var/last_move_dir_pressed
-
-
-/datum/preferences
- var/dark_theme = FALSE
-
-/client/Click(atom/A)
- if(!user_acted(src))
- return
-
- if(holder && holder.callproc && holder.callproc.waiting_for_click)
- if(alert("Do you want to select \the [A] as the [length(holder.callproc.arguments)+1]\th argument?",, "Yes", "No") == "Yes")
- holder.callproc.arguments += A
-
- holder.callproc.waiting_for_click = 0
- verbs -= /client/proc/cancel_callproc_select
- holder.callproc.do_args()
- return
-
- update_hotkey_mode()
-
- return ..()
-
-
-/**
- * Updates the keybinds for special keys
- *
- * Handles adding macros for the keys that need it
- * And adding movement keys to the clients movement_keys list
- * At the time of writing this, communication(OOC, Say, IC) require macros
- * Arguments:
- * * direct_prefs - the preference we're going to get keybinds from
- */
-/client/proc/update_special_keybinds(datum/preferences/direct_prefs)
- var/datum/preferences/D = prefs || direct_prefs
- if(!D?.key_bindings)
- return
- movement_keys = list()
- var/list/communication_hotkeys = list()
- for(var/key in D.key_bindings)
- for(var/kb_name in D.key_bindings[key])
- switch(kb_name)
- if("North")
- movement_keys[key] = NORTH
- if("East")
- movement_keys[key] = EAST
- if("West")
- movement_keys[key] = WEST
- if("South")
- movement_keys[key] = SOUTH
- if("Say")
- winset(src, "default-[REF(key)]", "parent=default;name=[key];command=say")
- communication_hotkeys += key
- if("OOC")
- winset(src, "default-[REF(key)]", "parent=default;name=[key];command=ooc")
- communication_hotkeys += key
- if("Me")
- winset(src, "default-[REF(key)]", "parent=default;name=[key];command=me")
- communication_hotkeys += key
-
- // winget() does not work for F1 and F2
- for(var/key in communication_hotkeys)
- if(!(key in list("F1","F2")) && !winget(src, "default-[REF(key)]", "command"))
- to_chat(src, "You probably entered the game with a different keyboard layout.\nPlease switch to the English layout and click here to fix the communication hotkeys.")
- break
-
-/client/verb/ToggleHotkeyMode()
- set hidden = TRUE
- prefs.hotkeys = !prefs.hotkeys
- update_hotkey_mode()
-
-/client/proc/update_hotkey_mode()
- if(prefs.hotkeys)
- // If hotkey mode is enabled, then clicking the map will automatically
- // unfocus the text bar. This removes the red color from the text bar
- // so that the visual focus indicator matches reality.
- winset(src, "mainwindow.mainwindow", "macro=default")
- winset(src, "mapwindow.map", "focus=true")
- winset(src, "outputwindow.hotkeytoggle", "is-checked=true")
- winset(src, "outputwindow.input", " border=line")
- else
- winset(src, "mainwindow.mainwindow", "macro=macro")
- winset(src, "outputwindow.hotkeytoggle", "is-checked=false")
- winset(src, "outputwindow.input", "focus=true; border=sunken")
-
-// Я срал, Глист, на читаемость и отладку
-// Это уже протестировано и мы просто ждём пока на оффбей зальют эти кейбинды вонючие
-// Ну а если не зальют - так уж и быть, в коркод суну
-
-// SIERRA TODO: ПЕРЕНЕСТИ В КОР КОД ЕСЛИ ОФФЫ НЕ ЗАЛЬЮТ
-/client/Topic(href, href_list, hsrc)
- //byond bug ID:2694120
- if(href_list["reset_macros"])
- reset_macros(skip_alert = TRUE)
- return
-
- . = ..()
diff --git a/mods/ssinput/code/general/preferences.dm b/mods/ssinput/code/general/preferences.dm
deleted file mode 100644
index 62b60e79f85e8..0000000000000
--- a/mods/ssinput/code/general/preferences.dm
+++ /dev/null
@@ -1,62 +0,0 @@
-// Я срал, Глист, на читаемость и отладку
-// Это уже протестировано и мы просто ждём пока на оффбей зальют эти кейбинды вонючие
-// Ну а если не зальют - так уж и быть, в коркод суну
-
-// SIERRA TODO: ПЕРЕНЕСТИ В КОР КОД ЕСЛИ ОФФЫ НЕ ЗАЛЬЮТ
-/datum/preferences/setup()
- // give them default keybinds too
- key_bindings = deepCopyList(global.hotkey_keybinding_list_by_key)
-
- . = ..()
-
- if(client)
- client.set_macros()
-
-
-
-/// checks through keybindings for outdated unbound keys and updates them
-/datum/preferences/proc/check_keybindings()
- if(!client)
- return
-
- // When loading from savefile key_binding can be null
- // This happens when player had savefile created before new kb system, but hotkeys was not saved
- if(!length(key_bindings))
- key_bindings = deepCopyList(global.hotkey_keybinding_list_by_key) // give them default keybinds too
-
- var/list/user_binds = list()
- for (var/key in key_bindings)
- for(var/kb_name in key_bindings[key])
- user_binds[kb_name] += list(key)
- var/list/notadded = list()
- for (var/name in global.keybindings_by_name)
- var/datum/keybinding/kb = global.keybindings_by_name[name]
- if(length(user_binds[kb.name]))
- continue // key is unbound and or bound to something
- var/addedbind = FALSE
- if(hotkeys)
- for(var/hotkeytobind in kb.hotkey_keys)
- if(!length(key_bindings[hotkeytobind]) || hotkeytobind == "Unbound") //Only bind to the key if nothing else is bound expect for Unbound
- LAZYADD(key_bindings[hotkeytobind], kb.name)
- addedbind = TRUE
- else
- for(var/classickeytobind in kb.classic_keys)
- if(!length(key_bindings[classickeytobind]) || classickeytobind == "Unbound") //Only bind to the key if nothing else is bound expect for Unbound
- LAZYADD(key_bindings[classickeytobind], kb.name)
- addedbind = TRUE
- if(!addedbind)
- notadded += kb
-
- if(length(notadded))
- addtimer(CALLBACK(src, PROC_REF(announce_conflict), notadded), 5 SECONDS)
-
-
-
-/datum/preferences/proc/announce_conflict(list/notadded)
- to_chat(client, SPAN_DANGER("KEYBINDING CONFLICT.\n\
- There are new keybindings that have defaults bound to keys you already set, They will default to Unbound. You can bind them in Setup Character or Game Preferences\n\
- Or you can click here to go straight to the keybindings page."))
- for(var/item in notadded)
- var/datum/keybinding/conflicted = item
- to_chat(client, SPAN_DANGER("[conflicted.category]: [conflicted.full_name] needs updating."))
- LAZYADD(key_bindings["None"], conflicted.name) // set it to unbound to prevent this from opening up again in the future
diff --git a/mods/ssinput/code/global_lists.dm b/mods/ssinput/code/global_lists.dm
deleted file mode 100644
index 9430143688242..0000000000000
--- a/mods/ssinput/code/global_lists.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-var/global/list/hotkey_keybinding_list_by_key = list()
-var/global/list/keybindings_by_name = list()
-
-/hook/global_init/makeDatumRefLists()
- . = ..()
- for(var/datum/keybinding/keybinding as anything in subtypesof(/datum/keybinding))
- if(!initial(keybinding.name))
- continue
- var/datum/keybinding/instance = new keybinding
- global.keybindings_by_name[instance.name] = instance
- if(length(instance.hotkey_keys))
- for(var/bound_key in instance.hotkey_keys)
- global.hotkey_keybinding_list_by_key[bound_key] += list(instance.name)
diff --git a/mods/ssinput/code/global_maps.dm b/mods/ssinput/code/global_maps.dm
deleted file mode 100644
index 82ed0b1b2d2ad..0000000000000
--- a/mods/ssinput/code/global_maps.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/// This is a mapping from JS keys to Byond - ref: https://keycode.info/
-var/global/list/_kbMap = list(
- "UP" = "North",
- "RIGHT" = "East",
- "DOWN" = "South",
- "LEFT" = "West",
- "INSERT" = "Insert",
- "HOME" = "Northwest",
- "PAGEUP" = "Northeast",
- "DEL" = "Delete",
- "END" = "Southwest",
- "PAGEDOWN" = "Southeast",
- "SPACEBAR" = "Space",
- "ALT" = "Alt",
- "SHIFT" = "Shift",
- "CONTROL" = "Ctrl"
-)
-
-/// Without alt, shift, ctrl and etc because its not necessary
-var/global/list/_kbMap_reverse = list(
- "North" = "Up",
- "East" = "Right",
- "South" = "Down",
- "West" = "Left",
- "Northwest" = "Home",
- "Northeast" = "PageUp",
- "Southwest" = "End",
- "Southeast" = "PageDown",
-)
diff --git a/mods/ssinput/code/keybindings/_defines.dm b/mods/ssinput/code/keybindings/_defines.dm
deleted file mode 100644
index 128e012ff3d7a..0000000000000
--- a/mods/ssinput/code/keybindings/_defines.dm
+++ /dev/null
@@ -1,9 +0,0 @@
-#define CATEGORY_CLIENT "CLIENT"
-#define CATEGORY_EMOTE "EMOTE"
-#define CATEGORY_ADMIN "ADMIN"
-#define CATEGORY_CARBON "CARBON"
-#define CATEGORY_HUMAN "HUMAN"
-#define CATEGORY_ROBOT "ROBOT"
-#define CATEGORY_MISC "MISC"
-#define CATEGORY_MOVEMENT "MOVEMENT"
-#define CATEGORY_COMMUNICATION "COMMUNICATION"
diff --git a/mods/ssinput/code/keybindings/_undefines.dm b/mods/ssinput/code/keybindings/_undefines.dm
deleted file mode 100644
index deeffbe4b75e1..0000000000000
--- a/mods/ssinput/code/keybindings/_undefines.dm
+++ /dev/null
@@ -1,9 +0,0 @@
-#undef CATEGORY_CLIENT
-#undef CATEGORY_EMOTE
-#undef CATEGORY_ADMIN
-#undef CATEGORY_CARBON
-#undef CATEGORY_HUMAN
-#undef CATEGORY_ROBOT
-#undef CATEGORY_MISC
-#undef CATEGORY_MOVEMENT
-#undef CATEGORY_COMMUNICATION
diff --git a/tgui/packages/tgui/hotkeys.ts b/tgui/packages/tgui/hotkeys.ts
index b55f3a7a9fc2d..7c34ea9043f1d 100644
--- a/tgui/packages/tgui/hotkeys.ts
+++ b/tgui/packages/tgui/hotkeys.ts
@@ -102,14 +102,14 @@ const handlePassthrough = (key: KeyEvent) => {
// Key_Down
if (key.isDown() && !keyState[byondKeyCode]) {
keyState[byondKeyCode] = true;
- const command = `Key_Down "${byondKeyCode}"`;
+ const command = `keyDown "${byondKeyCode}"`;
logger.debug(command);
return Byond.command(command);
}
// Key_Up
if (key.isUp() && keyState[byondKeyCode]) {
keyState[byondKeyCode] = false;
- const command = `Key_Up "${byondKeyCode}"`;
+ const command = `keyUp "${byondKeyCode}"`;
logger.debug(command);
return Byond.command(command);
}
@@ -138,7 +138,7 @@ export const releaseHeldKeys = () => {
if (keyState[byondKeyCode]) {
keyState[byondKeyCode] = false;
logger.log(`releasing key "${byondKeyCode}"`);
- Byond.command(`Key_Up "${byondKeyCode}"`);
+ Byond.command(`keyUp "${byondKeyCode}"`);
}
}
};