about summary refs log tree commit diff stats
path: root/src/ui
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-11-21 21:03:53 +0000
committerJames Booth <boothj5@gmail.com>2015-11-21 21:03:53 +0000
commit4b022687fa4a47ecaca6a2002ff435c769007456 (patch)
tree3ee8edbda226978533659fab48cef1c4875fdb29 /src/ui
parent6935862195cc54f5fc8590fc2d6ced8837c5e8ac (diff)
downloadprofani-tty-4b022687fa4a47ecaca6a2002ff435c769007456.tar.gz
Added /roster indent contact
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/console.c161
-rw-r--r--src/ui/occupantswin.c12
-rw-r--r--src/ui/rosterwin.c25
-rw-r--r--src/ui/window.c6
-rw-r--r--src/ui/window.h2
5 files changed, 109 insertions, 97 deletions
diff --git a/src/ui/console.c b/src/ui/console.c
index ac63005e..0b9e18c4 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -960,9 +960,9 @@ cons_theme_setting(void)
 {
     char *theme = prefs_get_string(PREF_THEME);
     if (theme == NULL) {
-        cons_show("Theme (/theme)                : default");
+        cons_show("Theme (/theme)                  : default");
     } else {
-        cons_show("Theme (/theme)                : %s", theme);
+        cons_show("Theme (/theme)                  : %s", theme);
     }
     prefs_free_string(theme);
 }
@@ -971,58 +971,58 @@ void
 cons_privileges_setting(void)
 {
     if (prefs_get_boolean(PREF_MUC_PRIVILEGES))
-        cons_show("MUC privileges (/privileges)  : ON");
+        cons_show("MUC privileges (/privileges)    : ON");
     else
-        cons_show("MUC privileges (/privileges)  : OFF");
+        cons_show("MUC privileges (/privileges)    : OFF");
 }
 
 void
 cons_beep_setting(void)
 {
     if (prefs_get_boolean(PREF_BEEP))
-        cons_show("Terminal beep (/beep)         : ON");
+        cons_show("Terminal beep (/beep)           : ON");
     else
-        cons_show("Terminal beep (/beep)         : OFF");
+        cons_show("Terminal beep (/beep)           : OFF");
 }
 
 void
 cons_resource_setting(void)
 {
     if (prefs_get_boolean(PREF_RESOURCE_TITLE))
-        cons_show("Resource title (/resource)    : ON");
+        cons_show("Resource title (/resource)      : ON");
     else
-        cons_show("Resource title (/resource)    : OFF");
+        cons_show("Resource title (/resource)      : OFF");
     if (prefs_get_boolean(PREF_RESOURCE_MESSAGE))
-        cons_show("Resource message (/resource)  : ON");
+        cons_show("Resource message (/resource)    : ON");
     else
-        cons_show("Resource message (/resource)  : OFF");
+        cons_show("Resource message (/resource)    : OFF");
 }
 
 void
 cons_wrap_setting(void)
 {
     if (prefs_get_boolean(PREF_WRAP))
-        cons_show("Word wrap (/wrap)             : ON");
+        cons_show("Word wrap (/wrap)               : ON");
     else
-        cons_show("Word wrap (/wrap)             : OFF");
+        cons_show("Word wrap (/wrap)               : OFF");
 }
 
 void
 cons_winstidy_setting(void)
 {
     if (prefs_get_boolean(PREF_WINS_AUTO_TIDY))
-        cons_show("Window Auto Tidy (/wins)      : ON");
+        cons_show("Window Auto Tidy (/wins)        : ON");
     else
-        cons_show("Window Auto Tidy (/wins)      : OFF");
+        cons_show("Window Auto Tidy (/wins)        : OFF");
 }
 
 void
 cons_encwarn_setting(void)
 {
     if (prefs_get_boolean(PREF_ENC_WARN)) {
-        cons_show("Warn unencrypted (/encwarn)   : ON");
+        cons_show("Warn unencrypted (/encwarn)     : ON");
     } else {
-        cons_show("Warn unencrypted (/encwarn)   : OFF");
+        cons_show("Warn unencrypted (/encwarn)     : OFF");
     }
 }
 
@@ -1030,9 +1030,9 @@ void
 cons_tlsshow_setting(void)
 {
     if (prefs_get_boolean(PREF_TLS_SHOW)) {
-        cons_show("TLS show (/tls)               : ON");
+        cons_show("TLS show (/tls)                 : ON");
     } else {
-        cons_show("TLS show (/tls)               : OFF");
+        cons_show("TLS show (/tls)                 : OFF");
     }
 }
 
@@ -1040,44 +1040,44 @@ void
 cons_presence_setting(void)
 {
     if (prefs_get_boolean(PREF_PRESENCE))
-        cons_show("Contact presence (/presence)  : ON");
+        cons_show("Contact presence (/presence)    : ON");
     else
-        cons_show("Contact presence (/presence)  : OFF");
+        cons_show("Contact presence (/presence)    : OFF");
 }
 
 void
 cons_flash_setting(void)
 {
     if (prefs_get_boolean(PREF_FLASH))
-        cons_show("Terminal flash (/flash)       : ON");
+        cons_show("Terminal flash (/flash)         : ON");
     else
-        cons_show("Terminal flash (/flash)       : OFF");
+        cons_show("Terminal flash (/flash)         : OFF");
 }
 
 void
 cons_splash_setting(void)
 {
     if (prefs_get_boolean(PREF_SPLASH))
-        cons_show("Splash screen (/splash)       : ON");
+        cons_show("Splash screen (/splash)         : ON");
     else
-        cons_show("Splash screen (/splash)       : OFF");
+        cons_show("Splash screen (/splash)         : OFF");
 }
 
 void
 cons_occupants_setting(void)
 {
     if (prefs_get_boolean(PREF_OCCUPANTS))
-        cons_show("Occupants (/occupants)        : show");
+        cons_show("Occupants (/occupants)          : show");
     else
-        cons_show("Occupants (/occupants)        : hide");
+        cons_show("Occupants (/occupants)          : hide");
 
     if (prefs_get_boolean(PREF_OCCUPANTS_JID))
-        cons_show("Occupant jids (/occupants)    : show");
+        cons_show("Occupant jids (/occupants)      : show");
     else
-        cons_show("Occupant jids (/occupants)    : hide");
+        cons_show("Occupant jids (/occupants)      : hide");
 
     int size = prefs_get_occupants_size();
-    cons_show("Occupants size (/occupants)   : %d", size);
+    cons_show("Occupants size (/occupants)     : %d", size);
 }
 
 void
@@ -1097,55 +1097,55 @@ cons_time_setting(void)
 {
     char *pref_time_console = prefs_get_string(PREF_TIME_CONSOLE);
     if (g_strcmp0(pref_time_console, "off") == 0)
-        cons_show("Time console (/time)          : OFF");
+        cons_show("Time console (/time)            : OFF");
     else
-        cons_show("Time console (/time)          : %s", pref_time_console);
+        cons_show("Time console (/time)            : %s", pref_time_console);
     prefs_free_string(pref_time_console);
 
     char *pref_time_chat = prefs_get_string(PREF_TIME_CHAT);
     if (g_strcmp0(pref_time_chat, "off") == 0)
-        cons_show("Time chat (/time)             : OFF");
+        cons_show("Time chat (/time)               : OFF");
     else
-        cons_show("Time chat (/time)             : %s", pref_time_chat);
+        cons_show("Time chat (/time)               : %s", pref_time_chat);
     prefs_free_string(pref_time_chat);
 
     char *pref_time_muc = prefs_get_string(PREF_TIME_MUC);
     if (g_strcmp0(pref_time_muc, "off") == 0)
-        cons_show("Time MUC (/time)              : OFF");
+        cons_show("Time MUC (/time)                : OFF");
     else
-        cons_show("Time MUC (/time)              : %s", pref_time_muc);
+        cons_show("Time MUC (/time)                : %s", pref_time_muc);
     prefs_free_string(pref_time_muc);
 
     char *pref_time_mucconf = prefs_get_string(PREF_TIME_MUCCONFIG);
     if (g_strcmp0(pref_time_mucconf, "off") == 0)
-        cons_show("Time MUC config (/time)       : OFF");
+        cons_show("Time MUC config (/time)         : OFF");
     else
-        cons_show("Time MUC config (/time)       : %s", pref_time_mucconf);
+        cons_show("Time MUC config (/time)         : %s", pref_time_mucconf);
     prefs_free_string(pref_time_mucconf);
 
     char *pref_time_private = prefs_get_string(PREF_TIME_PRIVATE);
     if (g_strcmp0(pref_time_private, "off") == 0)
-        cons_show("Time private (/time)          : OFF");
+        cons_show("Time private (/time)            : OFF");
     else
-        cons_show("Time private (/time)          : %s", pref_time_private);
+        cons_show("Time private (/time)            : %s", pref_time_private);
     prefs_free_string(pref_time_private);
 
     char *pref_time_xml = prefs_get_string(PREF_TIME_XMLCONSOLE);
     if (g_strcmp0(pref_time_xml, "off") == 0)
-        cons_show("Time XML Console (/time)      : OFF");
+        cons_show("Time XML Console (/time)        : OFF");
     else
-        cons_show("Time XML Console (/time)      : %s", pref_time_xml);
+        cons_show("Time XML Console (/time)        : %s", pref_time_xml);
     prefs_free_string(pref_time_xml);
 
     char *pref_time_statusbar = prefs_get_string(PREF_TIME_STATUSBAR);
     if (g_strcmp0(pref_time_statusbar, "off") == 0)
-        cons_show("Time statusbar (/time)        : OFF");
+        cons_show("Time statusbar (/time)          : OFF");
     else
-        cons_show("Time statusbar (/time)        : %s", pref_time_statusbar);
+        cons_show("Time statusbar (/time)          : %s", pref_time_statusbar);
     prefs_free_string(pref_time_statusbar);
 
     char *pref_time_lastactivity = prefs_get_string(PREF_TIME_LASTACTIVITY);
-    cons_show("Time last activity (/time)    : %s", pref_time_lastactivity);
+    cons_show("Time last activity (/time)      : %s", pref_time_lastactivity);
     prefs_free_string(pref_time_lastactivity);
 }
 
@@ -1153,9 +1153,9 @@ void
 cons_vercheck_setting(void)
 {
     if (prefs_get_boolean(PREF_VERCHECK))
-        cons_show("Version checking (/vercheck)  : ON");
+        cons_show("Version checking (/vercheck)    : ON");
     else
-        cons_show("Version checking (/vercheck)  : OFF");
+        cons_show("Version checking (/vercheck)    : OFF");
 }
 
 void
@@ -1165,9 +1165,9 @@ cons_statuses_setting(void)
     char *chat = prefs_get_string(PREF_STATUSES_CHAT);
     char *muc = prefs_get_string(PREF_STATUSES_MUC);
 
-    cons_show("Console statuses (/statuses)  : %s", console);
-    cons_show("Chat statuses (/statuses)     : %s", chat);
-    cons_show("MUC statuses (/statuses)      : %s", muc);
+    cons_show("Console statuses (/statuses)    : %s", console);
+    cons_show("Chat statuses (/statuses)       : %s", chat);
+    cons_show("MUC statuses (/statuses)        : %s", muc);
 
     prefs_free_string(console);
     prefs_free_string(chat);
@@ -1178,14 +1178,14 @@ void
 cons_titlebar_setting(void)
 {
     if (prefs_get_boolean(PREF_TITLEBAR_SHOW)) {
-        cons_show("Titlebar show (/titlebar)     : ON");
+        cons_show("Titlebar show (/titlebar)       : ON");
     } else {
-        cons_show("Titlebar show (/titlebar)     : OFF");
+        cons_show("Titlebar show (/titlebar)       : OFF");
     }
     if (prefs_get_boolean(PREF_TITLEBAR_GOODBYE)) {
-        cons_show("Titlebar goodbye (/titlebar)  : ON");
+        cons_show("Titlebar goodbye (/titlebar)    : ON");
     } else {
-        cons_show("Titlebar goodbye (/titlebar)  : OFF");
+        cons_show("Titlebar goodbye (/titlebar)    : OFF");
     }
 }
 
@@ -1193,67 +1193,70 @@ void
 cons_roster_setting(void)
 {
     if (prefs_get_boolean(PREF_ROSTER))
-        cons_show("Roster (/roster)              : show");
+        cons_show("Roster (/roster)                : show");
     else
-        cons_show("Roster (/roster)              : hide");
+        cons_show("Roster (/roster)                : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_OFFLINE))
-        cons_show("Roster offline (/roster)      : show");
+        cons_show("Roster offline (/roster)        : show");
     else
-        cons_show("Roster offline (/roster)      : hide");
+        cons_show("Roster offline (/roster)        : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_RESOURCE))
-        cons_show("Roster resource (/roster)     : show");
+        cons_show("Roster resource (/roster)       : show");
     else
-        cons_show("Roster resource (/roster)     : hide");
+        cons_show("Roster resource (/roster)       : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_PRESENCE))
-        cons_show("Roster presence (/roster)     : show");
+        cons_show("Roster presence (/roster)       : show");
     else
-        cons_show("Roster presence (/roster)     : hide");
+        cons_show("Roster presence (/roster)       : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_STATUS))
-        cons_show("Roster status (/roster)       : show");
+        cons_show("Roster status (/roster)         : show");
     else
-        cons_show("Roster status (/roster)       : hide");
+        cons_show("Roster status (/roster)         : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_EMPTY))
-        cons_show("Roster empty (/roster)        : show");
+        cons_show("Roster empty (/roster)          : show");
     else
-        cons_show("Roster empty (/roster)        : hide");
+        cons_show("Roster empty (/roster)          : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_COUNT))
-        cons_show("Roster count (/roster)        : show");
+        cons_show("Roster count (/roster)          : show");
     else
-        cons_show("Roster count (/roster)        : hide");
+        cons_show("Roster count (/roster)          : hide");
 
     if (prefs_get_boolean(PREF_ROSTER_PRIORITY))
-        cons_show("Roster priority (/roster)     : show");
+        cons_show("Roster priority (/roster)       : show");
     else
-        cons_show("Roster priority (/roster)     : hide");
+        cons_show("Roster priority (/roster)       : hide");
 
     char *by = prefs_get_string(PREF_ROSTER_BY);
-    cons_show("Roster by (/roster)           : %s", by);
+    cons_show("Roster by (/roster)             : %s", by);
     prefs_free_string(by);
 
     char *order = prefs_get_string(PREF_ROSTER_ORDER);
-    cons_show("Roster order (/roster)        : %s", order);
+    cons_show("Roster order (/roster)          : %s", order);
     prefs_free_string(order);
 
     int size = prefs_get_roster_size();
-    cons_show("Roster size (/roster)         : %d", size);
+    cons_show("Roster size (/roster)           : %d", size);
 
     char header_ch = prefs_get_roster_header_char();
     if (header_ch)
-        cons_show("Roster header char (/roster)  : %c", header_ch);
+        cons_show("Roster header char (/roster)    : %c", header_ch);
     else
-        cons_show("Roster header char (/roster)  : none");
+        cons_show("Roster header char (/roster)    : none");
 
     char contact_ch = prefs_get_roster_contact_char();
     if (contact_ch)
-        cons_show("Roster contact char (/roster) : %c", contact_ch);
+        cons_show("Roster contact char (/roster)   : %c", contact_ch);
     else
-        cons_show("Roster contact char (/roster) : none");
+        cons_show("Roster contact char (/roster)   : none");
+
+    gint contact_indent = prefs_get_roster_contact_indent();
+    cons_show("Roster contact indent (/roster) : %d", contact_indent);
 }
 
 void
@@ -1457,11 +1460,11 @@ cons_show_chat_prefs(void)
 void
 cons_inpblock_setting(void)
 {
-    cons_show("Input timeout (/inpblock)     : %d milliseconds", prefs_get_inpblock());
+    cons_show("Input timeout (/inpblock)       : %d milliseconds", prefs_get_inpblock());
     if (prefs_get_boolean(PREF_INPBLOCK_DYNAMIC)) {
-        cons_show("Dynamic timeout (/inpblock)   : ON");
+        cons_show("Dynamic timeout (/inpblock)     : ON");
     } else {
-        cons_show("Dynamic timeout (/inpblock)   : OFF");
+        cons_show("Dynamic timeout (/inpblock)     : OFF");
     }
 }
 
diff --git a/src/ui/occupantswin.c b/src/ui/occupantswin.c
index 36447437..71474a80 100644
--- a/src/ui/occupantswin.c
+++ b/src/ui/occupantswin.c
@@ -48,13 +48,13 @@ _occuptantswin_occupant(ProfLayoutSplit *layout, Occupant *occupant, gboolean sh
 
     GString *msg = g_string_new("   ");
     g_string_append(msg, occupant->nick);
-    win_printline_nowrap(layout->subwin, msg->str);
+    win_print_nowrap(layout->subwin, msg->str, TRUE);
     g_string_free(msg, TRUE);
 
     if (showjid && occupant->jid) {
         GString *msg = g_string_new("     ");
         g_string_append(msg, occupant->jid);
-        win_printline_nowrap(layout->subwin, msg->str);
+        win_print_nowrap(layout->subwin, msg->str, TRUE);
         g_string_free(msg, TRUE);
     }
 
@@ -75,7 +75,7 @@ occupantswin_occupants(const char *const roomjid)
 
             if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) {
                 wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
-                win_printline_nowrap(layout->subwin, " -Moderators");
+                win_print_nowrap(layout->subwin, " -Moderators", TRUE);
                 wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
                 GList *roster_curr = occupants;
                 while (roster_curr) {
@@ -87,7 +87,7 @@ occupantswin_occupants(const char *const roomjid)
                 }
 
                 wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
-                win_printline_nowrap(layout->subwin, " -Participants");
+                win_print_nowrap(layout->subwin, " -Participants", TRUE);
                 wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
                 roster_curr = occupants;
                 while (roster_curr) {
@@ -99,7 +99,7 @@ occupantswin_occupants(const char *const roomjid)
                 }
 
                 wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
-                win_printline_nowrap(layout->subwin, " -Visitors");
+                win_print_nowrap(layout->subwin, " -Visitors", TRUE);
                 wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
                 roster_curr = occupants;
                 while (roster_curr) {
@@ -111,7 +111,7 @@ occupantswin_occupants(const char *const roomjid)
                 }
             } else {
                 wattron(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
-                win_printline_nowrap(layout->subwin, " -Occupants\n");
+                win_print_nowrap(layout->subwin, " -Occupants\n", TRUE);
                 wattroff(layout->subwin, theme_attrs(THEME_OCCUPANTS_HEADER));
                 GList *roster_curr = occupants;
                 while (roster_curr) {
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index f13f5dc5..0dc1baed 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -64,7 +64,7 @@ _rosterwin_presence(ProfLayoutSplit *layout, int indent, theme_item_t colour, co
                 indent--;
             }
             g_string_append_printf(msg, "\"%s\"", status);
-            win_printline_nowrap(layout->subwin, msg->str);
+            win_print_nowrap(layout->subwin, msg->str, TRUE);
             g_string_free(msg, TRUE);
             wattroff(layout->subwin, theme_attrs(colour));
         }
@@ -85,7 +85,7 @@ _rosterwin_presence(ProfLayoutSplit *layout, int indent, theme_item_t colour, co
         } else if (status && prefs_get_boolean(PREF_ROSTER_STATUS)) {
             g_string_append_printf(msg, "\"%s\"", status);
         }
-        win_printline_nowrap(layout->subwin, msg->str);
+        win_print_nowrap(layout->subwin, msg->str, TRUE);
         g_string_free(msg, TRUE);
         wattroff(layout->subwin, theme_attrs(colour));
     }
@@ -108,7 +108,7 @@ _rosterwin_resource(ProfLayoutSplit *layout, PContact contact)
             if (prefs_get_boolean(PREF_ROSTER_PRIORITY)) {
                 g_string_append_printf(msg, " [%d]", resource->priority);
             }
-            win_printline_nowrap(layout->subwin, msg->str);
+            win_print_nowrap(layout->subwin, msg->str, TRUE);
             g_string_free(msg, TRUE);
             wattroff(layout->subwin, theme_attrs(resource_presence_colour));
 
@@ -138,13 +138,20 @@ _rosterwin_contact(ProfLayoutSplit *layout, PContact contact)
     theme_item_t presence_colour = theme_main_presence_attrs(presence);
 
     wattron(layout->subwin, theme_attrs(presence_colour));
-    GString *msg = g_string_new("   ");
+    GString *msg = g_string_new(" ");
+    int indent = prefs_get_roster_contact_indent();
+    if (indent > 0) {
+        while (indent > 0) {
+            g_string_append(msg, " ");
+            indent--;
+        }
+    }
     char ch = prefs_get_roster_contact_char();
     if (ch) {
         g_string_append_printf(msg, "%c", ch);
     }
     g_string_append(msg, name);
-    win_printline_nowrap(layout->subwin, msg->str);
+    win_print_nowrap(layout->subwin, msg->str, TRUE);
     g_string_free(msg, TRUE);
     wattroff(layout->subwin, theme_attrs(presence_colour));
 
@@ -172,7 +179,7 @@ _rosterwin_contacts_by_presence(ProfLayoutSplit *layout, const char *const prese
         if (prefs_get_boolean(PREF_ROSTER_COUNT)) {
             g_string_append_printf(title_str, " (%d)", g_slist_length(contacts));
         }
-        win_printline_nowrap(layout->subwin, title_str->str);
+        win_print_nowrap(layout->subwin, title_str->str, TRUE);
         g_string_free(title_str, TRUE);
         wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
     }
@@ -212,7 +219,7 @@ _rosterwin_contacts_by_group(ProfLayoutSplit *layout, char *group)
         if (prefs_get_boolean(PREF_ROSTER_COUNT)) {
             g_string_append_printf(title, " (%d)", g_slist_length(contacts));
         }
-        win_printline_nowrap(layout->subwin, title->str);
+        win_print_nowrap(layout->subwin, title->str, TRUE);
         g_string_free(title, TRUE);
         wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
 
@@ -251,7 +258,7 @@ _rosterwin_contacts_by_no_group(ProfLayoutSplit *layout)
         if (prefs_get_boolean(PREF_ROSTER_COUNT)) {
             g_string_append_printf(title, " (%d)", g_slist_length(contacts));
         }
-        win_printline_nowrap(layout->subwin, title->str);
+        win_print_nowrap(layout->subwin, title->str, TRUE);
         g_string_free(title, TRUE);
         wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
 
@@ -317,7 +324,7 @@ rosterwin_roster(void)
             if (prefs_get_boolean(PREF_ROSTER_COUNT)) {
                 g_string_append_printf(title, " (%d)", g_slist_length(contacts));
             }
-            win_printline_nowrap(layout->subwin, title->str);
+            win_print_nowrap(layout->subwin, title->str, TRUE);
             g_string_free(title, TRUE);
             wattroff(layout->subwin, theme_attrs(THEME_ROSTER_HEADER));
 
diff --git a/src/ui/window.c b/src/ui/window.c
index 91e8b6c2..3ca9b927 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1266,12 +1266,14 @@ win_unread(ProfWin *window)
 }
 
 void
-win_printline_nowrap(WINDOW *win, char *msg)
+win_print_nowrap(WINDOW *win, char *msg, gboolean newline)
 {
     int maxx = getmaxx(win);
     int cury = getcury(win);
 
     waddnstr(win, msg, maxx);
 
-    wmove(win, cury+1, 0);
+    if (newline) {
+        wmove(win, cury+1, 0);
+    }
 }
diff --git a/src/ui/window.h b/src/ui/window.h
index 643cdf7b..24d71ad6 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -67,7 +67,7 @@ void win_newline(ProfWin *window);
 void win_redraw(ProfWin *window);
 int win_roster_cols(void);
 int win_occpuants_cols(void);
-void win_printline_nowrap(WINDOW *win, char *msg);
+void win_print_nowrap(WINDOW *win, char *msg, gboolean newline);
 void win_mark_received(ProfWin *window, const char *const id);
 
 gboolean win_has_active_subwin(ProfWin *window);