3 files changed, 91 insertions, 7 deletions
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 9b2ea82bb..8c932c416 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -136,9 +136,11 @@ struct t_config_option *config_look_prefix_align;
 struct t_config_option *config_look_prefix_align_max;
 struct t_config_option *config_look_prefix_align_min;
 struct t_config_option *config_look_prefix_align_more;
+struct t_config_option *config_look_prefix_align_more_after;
 struct t_config_option *config_look_prefix_buffer_align;
 struct t_config_option *config_look_prefix_buffer_align_max;
 struct t_config_option *config_look_prefix_buffer_align_more;
+struct t_config_option *config_look_prefix_buffer_align_more_after;
 struct t_config_option *config_look_prefix_same_nick;
 struct t_config_option *config_look_prefix_suffix;
 struct t_config_option *config_look_read_marker;
@@ -2274,6 +2276,14 @@ config_weechat_init_options ()
            "on screen)"),
         NULL, 0, 0, "+", NULL, 0,
         &config_check_prefix_align_more, NULL, &config_change_buffers, NULL, NULL, NULL);
+    config_look_prefix_align_more_after = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "prefix_align_more_after", "boolean",
+        N_("display the truncature char (by default \"+\") after the text (by "
+           "replacing the space that should be displayed here); if disabled, "
+           "the truncature char replaces last char of text"),
+        NULL, 0, 0, "on", NULL, 0,
+        NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
     config_look_prefix_buffer_align = config_file_new_option (
         weechat_config_file, ptr_section,
         "prefix_buffer_align", "integer",
@@ -2293,6 +2303,14 @@ config_weechat_init_options ()
            "merged with same number) (must be exactly one char on screen)"),
         NULL, 0, 0, "+", NULL, 0,
         &config_check_prefix_buffer_align_more, NULL, &config_change_buffers, NULL, NULL, NULL);
+    config_look_prefix_buffer_align_more_after = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "prefix_buffer_align_more_after", "boolean",
+        N_("display the truncature char (by default \"+\") after the text (by "
+           "replacing the space that should be displayed here); if disabled, "
+           "the truncature char replaces last char of text"),
+        NULL, 0, 0, "on", NULL, 0,
+        NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
     config_look_prefix_same_nick = config_file_new_option (
         weechat_config_file, ptr_section,
         "prefix_same_nick", "string",
@@ -2575,7 +2593,7 @@ config_weechat_init_options ()
     config_color_chat_nick_suffix = config_file_new_option (
         weechat_config_file, ptr_section,
         "chat_nick_suffix", "color",
-        N_("color for nick suffix (string displayed after nick in suffix)"),
+        N_("color for nick suffix (string displayed after nick in prefix)"),
         NULL, GUI_COLOR_CHAT_NICK_SUFFIX, 0, "green", NULL, 0, NULL, NULL,
         &config_change_color, NULL, NULL, NULL);
     config_color_chat_nick_self = config_file_new_option (
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 966d9b356..df4c01fcb 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -160,9 +160,11 @@ extern struct t_config_option *config_look_prefix_align;
 extern struct t_config_option *config_look_prefix_align_max;
 extern struct t_config_option *config_look_prefix_align_min;
 extern struct t_config_option *config_look_prefix_align_more;
+extern struct t_config_option *config_look_prefix_align_more_after;
 extern struct t_config_option *config_look_prefix_buffer_align;
 extern struct t_config_option *config_look_prefix_buffer_align_max;
 extern struct t_config_option *config_look_prefix_buffer_align_more;
+extern struct t_config_option *config_look_prefix_buffer_align_more_after;
 extern struct t_config_option *config_look_prefix_same_nick;
 extern struct t_config_option *config_look_prefix_suffix;
 extern struct t_config_option *config_look_read_marker;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index b38cf0601..b75b5e3e1 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -607,6 +607,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
     const char *short_name, *str_color, *ptr_nick_prefix, *ptr_nick_suffix;
     int i, length, length_allowed, num_spaces, prefix_length, extra_spaces;
     int chars_displayed, nick_offline, prefix_is_nick, length_nick_prefix_suffix;
+    int chars_to_display;
     struct t_gui_lines *mixed_lines;
 
     if (!simulate)
@@ -703,11 +704,18 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
         if ((CONFIG_INTEGER(config_look_prefix_buffer_align) != CONFIG_LOOK_PREFIX_BUFFER_ALIGN_NONE)
             && (num_spaces < 0))
         {
+            chars_to_display = length_allowed;
+            /*
+             * if the "+" is not displayed in the space after text, remove one
+             * more char to display the "+" before the space
+             */
+            if (!CONFIG_BOOLEAN(config_look_prefix_buffer_align_more_after))
+                chars_to_display--;
             gui_chat_display_word (window, line,
                                    short_name,
                                    short_name +
                                    gui_chat_string_real_pos (short_name,
-                                                             length_allowed),
+                                                             chars_to_display),
                                    1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer),
@@ -739,6 +747,21 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer),
                                    0);
+            if (!CONFIG_BOOLEAN(config_look_prefix_buffer_align_more_after))
+            {
+                if (!simulate)
+                {
+                    gui_chat_reset_style (window, line, 0, 1,
+                                          GUI_COLOR_CHAT_INACTIVE_WINDOW,
+                                          GUI_COLOR_CHAT_INACTIVE_BUFFER,
+                                          GUI_COLOR_CHAT);
+                }
+                gui_chat_display_word (window, line, str_space,
+                                       NULL, 1, num_lines, count, lines_displayed,
+                                       simulate,
+                                       CONFIG_BOOLEAN(config_look_color_inactive_prefix),
+                                       0);
+            }
         }
         else
         {
@@ -926,13 +949,20 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
         if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
             && (num_spaces < 0))
         {
+            chars_to_display = length_allowed - length_nick_prefix_suffix;
+            /*
+             * if the "+" is not displayed in the space after text, remove one
+             * more char to display the "+" before the space
+             */
+            if (!CONFIG_BOOLEAN(config_look_prefix_align_more_after))
+                chars_to_display--;
             chars_displayed = gui_chat_display_word (window, line,
                                                      (prefix_highlighted) ? prefix_highlighted : ptr_prefix,
                                                      (prefix_highlighted) ?
                                                      prefix_highlighted + gui_chat_string_real_pos (prefix_highlighted,
-                                                                                                    length_allowed - length_nick_prefix_suffix - 1) :
+                                                                                                    chars_to_display) :
                                                      ptr_prefix + gui_chat_string_real_pos (ptr_prefix,
-                                                                                            length_allowed - length_nick_prefix_suffix - 1),
+                                                                                            chars_to_display),
                                                      1, num_lines, count, lines_displayed,
                                                      simulate,
                                                      CONFIG_BOOLEAN(config_look_color_inactive_prefix),
@@ -972,7 +1002,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                    0);
         }
 
-        if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
+        if (!CONFIG_BOOLEAN(config_look_prefix_align_more_after)
+            && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
             && (num_spaces < 0))
         {
             if (!simulate)
@@ -1004,6 +1035,13 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
 
         if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_LEFT)
         {
+            if (!simulate)
+            {
+                gui_chat_reset_style (window, line, 0, 1,
+                                      GUI_COLOR_CHAT_INACTIVE_WINDOW,
+                                      GUI_COLOR_CHAT_INACTIVE_BUFFER,
+                                      GUI_COLOR_CHAT);
+            }
             for (i = 0; i < num_spaces; i++)
             {
                 gui_chat_display_word (window, line, str_space,
@@ -1014,14 +1052,40 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
             }
         }
 
-        if (window->buffer->lines->prefix_max_length > 0)
+        if (CONFIG_BOOLEAN(config_look_prefix_align_more_after)
+            && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
+            && (num_spaces < 0))
         {
-            gui_chat_display_word (window, line, str_space,
+            if (!simulate)
+            {
+                gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
+                                              GUI_COLOR_CHAT_PREFIX_MORE);
+            }
+            gui_chat_display_word (window, line,
+                                   CONFIG_STRING(config_look_prefix_align_more),
                                    NULL, 1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix),
                                    0);
         }
+        else
+        {
+            if (window->buffer->lines->prefix_max_length > 0)
+            {
+                if (!simulate)
+                {
+                    gui_chat_reset_style (window, line, 0, 1,
+                                          GUI_COLOR_CHAT_INACTIVE_WINDOW,
+                                          GUI_COLOR_CHAT_INACTIVE_BUFFER,
+                                          GUI_COLOR_CHAT);
+                }
+                gui_chat_display_word (window, line, str_space,
+                                       NULL, 1, num_lines, count, lines_displayed,
+                                       simulate,
+                                       CONFIG_BOOLEAN(config_look_color_inactive_prefix),
+                                       0);
+            }
+        }
 
         if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
             && CONFIG_STRING(config_look_prefix_suffix)