Added notification setting for typing in current window

2 files changed, 15 insertions, 7 deletions

diff --git a/src/ui/console.c b/src/ui/console.c
index 1afd0a49..e7ca07a1 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -1181,6 +1181,11 @@ _cons_notify_setting(void)
     else
         cons_show("Composing (/notify typing)          : OFF");
 
+    if (prefs_get_boolean(PREF_NOTIFY_TYPING_CURRENT))
+        cons_show("Composing current (/notify typing)  : ON");
+    else
+        cons_show("Composing current (/notify typing)  : OFF");
+
     if (prefs_get_boolean(PREF_NOTIFY_INVITE))
         cons_show("Room invites (/notify invite)       : ON");
     else
diff --git a/src/ui/core.c b/src/ui/core.c
index 8f554f5b..7b3190ed 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -277,14 +277,17 @@ _ui_contact_typing(const char * const barejid)
     }
 
     if (prefs_get_boolean(PREF_NOTIFY_TYPING)) {
-        PContact contact = roster_get_contact(barejid);
-        char const *display_usr = NULL;
-        if (p_contact_name(contact) != NULL) {
-            display_usr = p_contact_name(contact);
-        } else {
-            display_usr = barejid;
+        gboolean is_current = wins_is_current(window);
+        if ( !is_current || (is_current && prefs_get_boolean(PREF_NOTIFY_TYPING_CURRENT)) ) {
+            PContact contact = roster_get_contact(barejid);
+            char const *display_usr = NULL;
+            if (p_contact_name(contact) != NULL) {
+                display_usr = p_contact_name(contact);
+            } else {
+                display_usr = barejid;
+            }
+            notify_typing(display_usr);
         }
-        notify_typing(display_usr);
     }
 }