givin up

Author: JohnFulpWillard

code/__DEFINES/text.dm

@@ -14,6 +14,12 @@
 /// Removes everything enclose in < and > inclusive of the bracket, and limits the length of the message.
 #define STRIP_HTML_FULL(text, limit) (GLOB.html_tags.Replace(copytext(text, 1, limit), ""))
 
+/**
+ * stuff like `copytext(input, length(input))` will trim the last character of the input,
+ * because DM does it so it copies until the char BEFORE the `end` arg, so we need to bump `end` by 1 in these cases.
+*/
+#define PREVENT_CHARACTER_TRIM_LOSS(integer) (integer + 1)
+
 /**
  * Pixel-perfect scaled fonts for use in the MAP element as defined in skin.dmf
  *

code/modules/tgui_input/alert.dm

@@ -10,16 +10,18 @@
  * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout.
  * * * autofocus - The bool that controls if this alert should grab window focus.
  */
-/proc/tgui_alert(mob/user, message = null, title = null, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE)
+/proc/tgui_alert(mob/user, message = null, title = null, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, ui_state = GLOB.always_state)
 	if (!user)
 		user = usr
 	if (!istype(user))
 		if (istype(user, /client))
 			var/client/client = user
 			user = client.mob
 		else
-			return
-	var/datum/tgui_modal/alert = new(user, message, title, buttons, timeout, autofocus)
+			return null
+	if(isnull(user.client))
+		return null
+	var/datum/tgui_modal/alert = new(user, message, title, buttons, timeout, autofocus, ui_state)
 	alert.ui_interact(user)
 	alert.wait()
 	if (alert)
@@ -74,21 +76,25 @@
 	var/autofocus
 	/// Boolean field describing if the tgui_modal was closed by the user.
 	var/closed
+	/// The TGUI UI state that will be returned in ui_state(). Default: always_state
+	var/datum/ui_state/state
 
-/datum/tgui_modal/New(mob/user, message, title, list/buttons, timeout, autofocus)
+/datum/tgui_modal/New(mob/user, message, title, list/buttons, timeout, autofocus, ui_state)
 	src.title = title
 	src.message = message
 	src.buttons = buttons.Copy()
 	src.autofocus = autofocus
+	src.state = ui_state
 	if (timeout)
 		src.timeout = timeout
 		start_time = world.time
 		QDEL_IN(src, timeout)
 
 /datum/tgui_modal/Destroy(force, ...)
 	SStgui.close_uis(src)
+	state = null
 	QDEL_NULL(buttons)
-	. = ..()
+	return ..()
 
 /**
  * Waits for a user's response to the tgui_modal's prompt before returning. Returns early if
@@ -109,7 +115,7 @@
 	closed = TRUE
 
 /datum/tgui_modal/ui_state(mob/user)
-	return GLOB.always_state
+	return state
 
 /datum/tgui_modal/ui_data(mob/user)
 	. = list(

code/modules/tgui_input/checkboxes.dm

@@ -10,20 +10,22 @@
  * max_checked - The maximum number of checkboxes that can be checked (optional)
  * timeout - The timeout for the input (optional)
  */
-/proc/tgui_input_checkboxes(mob/user, message, title = "Select", list/items, min_checked = 1, max_checked = 50, timeout = 0)
+/proc/tgui_input_checkboxes(mob/user, message, title = "Select", list/items, min_checked = 1, max_checked = 50, timeout = 0, ui_state = GLOB.always_state)
 	if (!user)
 		user = usr
 	if(!length(items))
-		return
+		return null
 	if (!istype(user))
 		if (istype(user, /client))
 			var/client/client = user
 			user = client.mob
 		else
-			return
+			return null
+	if(isnull(user.client))
+		return null
 	if(!user.client.prefs.read_preference(/datum/preference/toggle/tgui_input))
 		return input(user, message, title) as null|anything in items
-	var/datum/tgui_checkbox_input/input = new(user, message, title, items, min_checked, max_checked, timeout)
+	var/datum/tgui_checkbox_input/input = new(user, message, title, items, min_checked, max_checked, timeout, ui_state)
 	input.ui_interact(user)
 	input.wait()
 	if (input)
@@ -50,13 +52,16 @@
 	var/min_checked
 	/// Maximum number of checkboxes that can be checked
 	var/max_checked
+	/// The TGUI UI state that will be returned in ui_state(). Default: always_state
+	var/datum/ui_state/state
 
-/datum/tgui_checkbox_input/New(mob/user, message, title, list/items, min_checked, max_checked, timeout)
+/datum/tgui_checkbox_input/New(mob/user, message, title, list/items, min_checked, max_checked, timeout, ui_state)
 	src.title = title
 	src.message = message
 	src.items = items.Copy()
 	src.min_checked = min_checked
 	src.max_checked = max_checked
+	src.state = ui_state
 
 	if (timeout)
 		src.timeout = timeout
@@ -65,6 +70,7 @@
 
 /datum/tgui_checkbox_input/Destroy(force, ...)
 	SStgui.close_uis(src)
+	state = null
 	QDEL_NULL(items)
 
 	return ..()
@@ -84,7 +90,7 @@
 	closed = TRUE
 
 /datum/tgui_checkbox_input/ui_state(mob/user)
-	return GLOB.always_state
+	return state
 
 /datum/tgui_checkbox_input/ui_data(mob/user)
 	var/list/data = list()

code/modules/tgui_input/list.dm

@@ -9,11 +9,11 @@
  * * buttons - The options that can be chosen by the user, each string is assigned a button on the UI.
  * * timeout - The timeout of the input box, after which the input box will close and qdel itself. Set to zero for no timeout.
  */
-/proc/tgui_input_list(mob/user, message, title = "Select", list/buttons, default, timeout = 0)
+/proc/tgui_input_list(mob/user, message, title = "Select", list/buttons, default, timeout = 0, ui_state = GLOB.always_state)
 	if (!user)
 		user = usr
 	if(!length(buttons))
-		return
+		return null
 	if (!istype(user))
 		if (istype(user, /client))
 			var/client/client = user
@@ -27,7 +27,7 @@
 	/// Client does NOT have tgui_input on: Returns regular input
 	if(!user.client.prefs.read_preference(/datum/preference/toggle/tgui_input))
 		return input(user, message, title, default) as null|anything in buttons
-	var/datum/tgui_list_input/input = new(user, message, title, buttons, default, timeout)
+	var/datum/tgui_list_input/input = new(user, message, title, buttons, default, timeout, ui_state)
 	if(input.invalid)
 		qdel(input)
 		return
@@ -88,15 +88,18 @@
 	var/timeout
 	/// Boolean field describing if the tgui_list_input was closed by the user.
 	var/closed
+	/// The TGUI UI state that will be returned in ui_state(). Default: always_state
+	var/datum/ui_state/state
 	/// Whether the tgui list input is invalid or not (i.e. due to all list entries being null)
 	var/invalid = FALSE
 
-/datum/tgui_list_input/New(mob/user, message, title, list/buttons, default, timeout)
+/datum/tgui_list_input/New(mob/user, message, title, list/buttons, default, timeout, ui_state)
 	src.title = title
 	src.message = message
 	src.buttons = list()
 	src.buttons_map = list()
 	src.default = default
+	src.state = ui_state
 
 	// Gets rid of illegal characters
 	var/static/regex/whitelistedWords = regex(@{"([^\u0020-\u8000]+)"})
@@ -118,6 +121,7 @@
 
 /datum/tgui_list_input/Destroy(force)
 	SStgui.close_uis(src)
+	state = null
 	QDEL_NULL(buttons)
 	return ..()
 
@@ -140,7 +144,7 @@
 	closed = TRUE
 
 /datum/tgui_list_input/ui_state(mob/user)
-	return GLOB.always_state
+	return state
 
 /datum/tgui_list_input/ui_static_data(mob/user)
 	var/list/data = list()

code/modules/tgui_input/number.dm

@@ -15,19 +15,21 @@
  * * timeout - The timeout of the number input, after which the modal will close and qdel itself. Set to zero for no timeout.
  * * round_value - whether the inputted number is rounded down into an integer.
  */
-/proc/tgui_input_number(mob/user, message = null, title = "Number Input", default = null, max_value = null, min_value = 0, timeout = 0)
+/proc/tgui_input_number(mob/user, message = null, title = "Number Input", default = null, max_value = null, min_value = 0, timeout = 0, ui_state = GLOB.always_state)
 	if (!user)
 		user = usr
 	if (!istype(user))
 		if (istype(user, /client))
 			var/client/client = user
 			user = client.mob
 		else
-			return
+			return null
+	if (isnull(user.client))
+		return null
 	/// Client does NOT have tgui_fancy on: Returns regular input
 	if(!user.client.prefs.read_preference(/datum/preference/toggle/tgui_input))
 		return input(user, message, title, default) as null | num
-	var/datum/tgui_input_number/numbox = new(user, message, title, default, max_value, min_value, timeout)
+	var/datum/tgui_input_number/numbox = new(user, message, title, default, max_value, min_value, timeout, ui_state)
 	numbox.ui_interact(user)
 	numbox.wait()
 	if (numbox)
@@ -86,22 +88,26 @@
 	var/timeout
 	/// The title of the TGUI window
 	var/title
+	/// The TGUI UI state that will be returned in ui_state(). Default: always_state
+	var/datum/ui_state/state
 
 
-/datum/tgui_input_number/New(mob/user, message, title, default, max_value, min_value, timeout)
+/datum/tgui_input_number/New(mob/user, message, title, default, max_value, min_value, timeout, ui_state)
 	src.default = default
 	src.max_value = max_value
 	src.message = message
 	src.min_value = min_value
 	src.title = title
+	src.state = ui_state
 	if (timeout)
 		src.timeout = timeout
 		start_time = world.time
 		QDEL_IN(src, timeout)
 
 /datum/tgui_input_number/Destroy(force, ...)
 	SStgui.close_uis(src)
-	. = ..()
+	state = null
+	return ..()
 
 /**
  * Waits for a user's response to the tgui_input_number's prompt before returning. Returns early if
@@ -122,7 +128,7 @@
 	closed = TRUE
 
 /datum/tgui_input_number/ui_state(mob/user)
-	return GLOB.always_state
+	return state
 
 /datum/tgui_input_number/ui_static_data(mob/user)
 	. = list(
@@ -161,7 +167,7 @@
 			return TRUE
 
 /datum/tgui_input_number/proc/set_entry(entry)
-		src.entry = entry
+	src.entry = entry
 
 /**
  * # async tgui_input_number

code/modules/tgui_input/text.dm

@@ -14,25 +14,27 @@
  * * multiline -  Bool that determines if the input box is much larger. Good for large messages, laws, etc.
  * * timeout - The timeout of the textbox, after which the modal will close and qdel itself. Set to zero for no timeout.
  */
-/proc/tgui_input_text(mob/user, message = null, title = "Text Input", default = null, max_length = null, multiline = FALSE, timeout = 0)
+/proc/tgui_input_text(mob/user, message = null, title = "Text Input", default = null, max_length, multiline = FALSE, timeout = 0, ui_state = GLOB.always_state)
 	if (!user)
 		user = usr
 	if (!istype(user))
 		if (istype(user, /client))
 			var/client/client = user
 			user = client.mob
 		else
-			return
+			return null
+	if(isnull(user.client))
+		return null
 	/// Client does NOT have tgui_fancy on: Returns regular input
 	if(!user.client.prefs.read_preference(/datum/preference/toggle/tgui_input))
 		if(max_length)
 			if(multiline)
-				return stripped_multiline_input(user, message, title, default, max_length)
+				return stripped_multiline_input(user, message, title, default, PREVENT_CHARACTER_TRIM_LOSS(max_length))
 			else
-				return stripped_input(user, message, title, default, max_length)
+				return stripped_input(user, message, title, default, PREVENT_CHARACTER_TRIM_LOSS(max_length))
 		else
 			return input(user, message, title, default)
-	var/datum/tgui_input_text/textbox = new(user, message, title, default, max_length, multiline, timeout)
+	var/datum/tgui_input_text/textbox = new(user, message, title, default, max_length, multiline, timeout, ui_state)
 	textbox.ui_interact(user)
 	textbox.wait()
 	if (textbox)
@@ -90,22 +92,26 @@
 	var/timeout
 	/// The title of the TGUI window
 	var/title
+	/// The TGUI UI state that will be returned in ui_state(). Default: always_state
+	var/datum/ui_state/state
 
 
-/datum/tgui_input_text/New(mob/user, message, title, default, max_length, multiline, timeout)
+/datum/tgui_input_text/New(mob/user, message, title, default, max_length, multiline, timeout, ui_state)
 	src.default = default
 	src.max_length = max_length
 	src.message = message
 	src.multiline = multiline
 	src.title = title
+	src.state = ui_state
 	if (timeout)
 		src.timeout = timeout
 		start_time = world.time
 		QDEL_IN(src, timeout)
 
 /datum/tgui_input_text/Destroy(force, ...)
 	SStgui.close_uis(src)
-	. = ..()
+	state = null
+	return ..()
 
 /**
  * Waits for a user's response to the tgui_input_text's prompt before returning. Returns early if
@@ -126,7 +132,7 @@
 	closed = TRUE
 
 /datum/tgui_input_text/ui_state(mob/user)
-	return GLOB.always_state
+	return state
 
 /datum/tgui_input_text/ui_static_data(mob/user)
 	. = list(
@@ -163,7 +169,8 @@
 			return TRUE
 
 /datum/tgui_input_text/proc/set_entry(entry)
-		src.entry = entry
+	if(!isnull(entry))
+		src.entry = max_length ? trim(entry, PREVENT_CHARACTER_TRIM_LOSS(max_length)) : entry
 
 /**
  * # async tgui_input_text

tgui/global.d.ts

@@ -201,6 +201,9 @@ const Byond: ByondType;
 
 interface Window {
   Byond: ByondType;
+  __store__: Store<unknown, AnyAction>;
+  __augmentStack__: (store: Store) => StackAugmentor;
+
   // IE IndexedDB stuff.
   msIndexedDB: IDBFactory;
   msIDBTransaction: IDBTransaction;