From 12364f0cd2e7f589b569c370d40a4908638ae59f Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Fri, 29 Aug 2014 04:10:37 +0400
Subject: [PATCH] Adds typing indicator. It's toggleable as client preference.
 Displays dots(codersprite) near the mob when he starts typing a message.
 Detects chatline me and say via checking contents. Detects shortcut input me
 an say via hacky wrapper that's called now instead of direct say/me verbs.

---
 baystation12.dme                     |   1 +
 code/modules/mob/mob.dm              |   1 +
 code/modules/mob/mob_defines.dm      |   1 +
 code/modules/mob/say.dm              |   3 ++
 code/modules/mob/typing_indicator.dm |  57 +++++++++++++++++++++++++++
 code/setup.dm                        |   1 +
 icons/mob/talk.dmi                   | Bin 5948 -> 1771 bytes
 interface/skin.dmf                   |   8 ++--
 8 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 code/modules/mob/typing_indicator.dm

diff --git a/baystation12.dme b/baystation12.dme
index ff370aa446..f1505dde54 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -911,6 +911,7 @@
 #include "code\modules\mob\mob_transformation_simple.dm"
 #include "code\modules\mob\say.dm"
 #include "code\modules\mob\transform_procs.dm"
+#include "code\modules\mob\typing_indicator.dm"
 #include "code\modules\mob\update_icons.dm"
 #include "code\modules\mob\dead\death.dm"
 #include "code\modules\mob\dead\observer\logout.dm"
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 71aa42a05a..ba2c3e5437 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -73,6 +73,7 @@
 /mob/proc/Life()
 //	if(organStructure)
 //		organStructure.ProcessOrgans()
+	handle_typing_indicator()
 	return
 
 
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 777f684dcb..086cbe9fa9 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -220,3 +220,4 @@
 	var/turf/listed_turf = null  //the current turf being examined in the stat panel
 
 	var/list/active_genes=list()
+	var/hud_typing = 0 //set when typing in an input window instead of chatline
\ No newline at end of file
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index a9648bc95d..6d5e308c7a 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -12,6 +12,8 @@
 	if(say_disabled)	//This is here to try to identify lag problems
 		usr << "\red Speech is currently admin-disabled."
 		return
+
+	set_typing_indicator(0)
 	usr.say(message)
 
 /mob/verb/me_verb(message as text)
@@ -24,6 +26,7 @@
 
 	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 
+	set_typing_indicator(0)
 	if(use_me)
 		usr.emote("me",usr.emote_type,message)
 	else
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
new file mode 100644
index 0000000000..2e6f62943f
--- /dev/null
+++ b/code/modules/mob/typing_indicator.dm
@@ -0,0 +1,57 @@
+var/global/image/typing_indicator
+
+/mob/proc/set_typing_indicator(var/state)
+	if(client)
+		if(!(client.prefs.toggles & SHOW_TYPING))
+			if(!typing_indicator)
+				typing_indicator = image('icons/mob/talk.dmi',null,"typing")
+			if(state)
+				if(!(typing_indicator in overlays))
+					overlays += typing_indicator
+			else
+				overlays -= typing_indicator
+			return state
+
+/mob/verb/say_wrapper()
+	set name = ".Say"
+	set hidden = 1
+
+	set_typing_indicator(1)
+	hud_typing = 1
+	var/message = input("","say (text)") as text
+	hud_typing = 0
+	set_typing_indicator(0)
+	if(message)
+		say_verb(message)
+
+/mob/verb/me_wrapper()
+	set name = ".Me"
+	set hidden = 1
+
+	set_typing_indicator(1)
+	hud_typing = 1
+	var/message = input("","me (text)") as text
+	hud_typing = 0
+	set_typing_indicator(0)
+	if(message)
+		me_verb(message)
+
+/mob/proc/handle_typing_indicator()
+	if(client)
+		if(!(client.prefs.toggles & SHOW_TYPING) && !hud_typing)
+			var/temp = winget(client, "input", "text")
+			if(length(temp) > 5 && findtext(temp, "Say \"", 1, 7))
+				set_typing_indicator(1)
+			else if(length(temp) > 3 && findtext(temp, "Me ", 1, 5))
+				set_typing_indicator(1)
+			else
+				set_typing_indicator(0)
+
+/client/verb/typing_indicator()
+	set name = "Show/Hide Typing Indicator"
+	set category = "Preferences"
+	set desc = "Toggles showing an indicator when you are typing emote or say message."
+	prefs.toggles ^= SHOW_TYPING
+	prefs.save_preferences()
+	src << "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] display typing indicator."
+	feedback_add_details("admin_verb","TID") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/setup.dm b/code/setup.dm
index 361cfaa66c..9d695d565c 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -649,6 +649,7 @@ var/list/liftable_structures = list(\
 #define CHAT_DEBUGLOGS	2048
 #define CHAT_LOOC		4096
 #define CHAT_GHOSTRADIO 8192
+#define SHOW_TYPING 	16384
 
 
 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC)
diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi
index 9e451181e2e0ad938b23b11ce77d96e66e68de31..0a1d63335906b48e36866d28b09d19adba33fe33 100644
GIT binary patch
literal 1771
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
L@gi`YgVX;2wzol;

literal 5948
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

diff --git a/interface/skin.dmf b/interface/skin.dmf
index 0795bdd0bf..51d51e96cb 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -149,11 +149,11 @@ macro "macro"
 		is-disabled = false
 	elem 
 		name = "F3"
-		command = "say"
+		command = ".say"
 		is-disabled = false
 	elem 
 		name = "F4"
-		command = "me"
+		command = ".me"
 		is-disabled = false
 	elem 
 		name = "F5"
@@ -403,11 +403,11 @@ macro "hotkeymode"
 		is-disabled = false
 	elem 
 		name = "F3"
-		command = "say"
+		command = "say_wrapper"
 		is-disabled = false
 	elem 
 		name = "F4"
-		command = "me"
+		command = "me_wrapper"
 		is-disabled = false
 	elem 
 		name = "F5"