Add new option weechat.look.align_end_of_lines

5 files changed, 53 insertions, 10 deletions

diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index e1385fda5..9953f50e5 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -72,6 +72,7 @@ struct t_config_option *config_startup_display_version;
 
 /* config, look & feel section */
 
+struct t_config_option *config_look_align_end_of_lines;
 struct t_config_option *config_look_buffer_notify_default;
 struct t_config_option *config_look_buffer_time_format;
 struct t_config_option *config_look_color_nicks_number;
@@ -1233,6 +1234,13 @@ config_weechat_init_options ()
         return 0;
     }
     
+    config_look_align_end_of_lines = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "align_end_of_lines", "integer",
+        N_("alignment for end of lines (all lines after the first): they "
+           "are starting under this data (time, buffer, prefix, suffix, "
+           "message (default))"),
+        "time|buffer|prefix|suffix|message", 0, 0, "message", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
     config_look_buffer_notify_default = config_file_new_option (
         weechat_config_file, ptr_section,
         "buffer_notify_default", "integer",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index f265030b8..9e63a8a7d 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -35,6 +35,15 @@ enum t_config_look_nicklist
     CONFIG_LOOK_NICKLIST_BOTTOM,
 };
 
+enum t_config_look_align_end_of_lines
+{
+    CONFIG_LOOK_ALIGN_END_OF_LINES_TIME = 0,
+    CONFIG_LOOK_ALIGN_END_OF_LINES_BUFFER,
+    CONFIG_LOOK_ALIGN_END_OF_LINES_PREFIX,
+    CONFIG_LOOK_ALIGN_END_OF_LINES_SUFFIX,
+    CONFIG_LOOK_ALIGN_END_OF_LINES_MESSAGE,
+};
+
 enum t_config_look_prefix_align
 {
     CONFIG_LOOK_PREFIX_ALIGN_NONE = 0,
@@ -85,6 +94,7 @@ extern struct t_config_option *config_startup_command_before_plugins;
 extern struct t_config_option *config_startup_display_logo;
 extern struct t_config_option *config_startup_display_version;
 
+extern struct t_config_option *config_look_align_end_of_lines;
 extern struct t_config_option *config_look_buffer_notify_default;
 extern struct t_config_option *config_look_buffer_time_format;
 extern struct t_config_option *config_look_command_chars;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 013337f53..e6d5d9f4a 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -449,13 +449,13 @@ gui_chat_display_word (struct t_gui_window *window,
     
     while (data && data[0])
     {
-        /* insert spaces for align text under time/nick */
-        length_align = gui_line_get_align (window->buffer, line, 0);
-        if ((length_align > 0) &&
-            (window->win_chat_cursor_x == 0) &&
-            (*lines_displayed > 0) &&
+        /* insert spaces for aligning text under time/nick */
+        length_align = gui_line_get_align (window->buffer, line, 0, 0);
+        if ((length_align > 0)
+            && (window->win_chat_cursor_x == 0)
+            && (*lines_displayed > 0)
             /* TODO: modify arbitraty value for non aligning messages on time/nick? */
-            (length_align < (window->win_chat_width - 5)))
+            && (length_align < (window->win_chat_width - 5)))
         {
             if (!simulate)
             {
@@ -465,7 +465,8 @@ gui_chat_display_word (struct t_gui_window *window,
                 wclrtoeol (GUI_WINDOW_OBJECTS(window)->win_chat);
             }
             window->win_chat_cursor_x += length_align;
-            if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
+            if ((CONFIG_INTEGER(config_look_align_end_of_lines) == CONFIG_LOOK_ALIGN_END_OF_LINES_MESSAGE)
+                && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
                 && (CONFIG_STRING(config_look_prefix_suffix)
                     && CONFIG_STRING(config_look_prefix_suffix)[0]))
             {
@@ -869,7 +870,8 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
             if (word_length > 0)
             {
                 /* spaces + word too long for current line but ok for next line */
-                line_align = gui_line_get_align (window->buffer, line, 1);
+                line_align = gui_line_get_align (window->buffer, line, 1,
+                                                 (lines_displayed == 0) ? 1 : 0);
                 if ((window->win_chat_cursor_x + word_length_with_spaces > gui_chat_get_real_width (window))
                     && (word_length <= gui_chat_get_real_width (window) - line_align))
                 {
diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c
index 8f4e08951..d770926d3 100644
--- a/src/gui/gui-line.c
+++ b/src/gui/gui-line.c
@@ -85,10 +85,17 @@ gui_lines_free (struct t_gui_lines *lines)
 
 int
 gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line,
-                    int with_suffix)
+                    int with_suffix, int first_line)
 {
     int length_time, length_buffer, length_suffix;
     
+    /* return immediately if alignment for end of lines is "time" */
+    if (!first_line
+        && (CONFIG_INTEGER(config_look_align_end_of_lines) == CONFIG_LOOK_ALIGN_END_OF_LINES_TIME))
+    {
+        return 0;
+    }
+    
     /* length of time */
     if (buffer->time_for_each_line)
     {
@@ -97,6 +104,13 @@ gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line,
     else
         length_time = 0;
     
+    /* return immediately if alignment for end of lines is "buffer" */
+    if (!first_line
+        && (CONFIG_INTEGER(config_look_align_end_of_lines) == CONFIG_LOOK_ALIGN_END_OF_LINES_BUFFER))
+    {
+        return length_time;
+    }
+    
     /* length of buffer name (when many buffers are merged) */
     if (buffer->mixed_lines)
     {
@@ -116,9 +130,18 @@ gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line,
     else
         length_buffer = 0;
     
+    /* return immediately if alignment for end of lines is "prefix" */
+    if (!first_line
+        && (CONFIG_INTEGER(config_look_align_end_of_lines) == CONFIG_LOOK_ALIGN_END_OF_LINES_PREFIX))
+    {
+        return length_time + length_buffer;
+    }
+    
     if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_NONE)
+    {
         return length_time + length_buffer + line->data->prefix_length
             + ((line->data->prefix_length > 0) ? 1 : 0);
+    }
     
     length_suffix = 0;
     if (with_suffix)
diff --git a/src/gui/gui-line.h b/src/gui/gui-line.h
index e1f38c9da..5f9dc8acf 100644
--- a/src/gui/gui-line.h
+++ b/src/gui/gui-line.h
@@ -69,7 +69,7 @@ extern struct t_gui_lines *gui_lines_alloc ();
 extern void gui_lines_free (struct t_gui_lines *lines);
 extern int gui_line_get_align (struct t_gui_buffer *buffer,
                                struct t_gui_line *line,
-                               int with_suffix);
+                               int with_suffix, int first_line);
 extern int gui_line_is_displayed (struct t_gui_line *line);
 extern struct t_gui_line *gui_line_get_first_displayed (struct t_gui_buffer *buffer);
 extern struct t_gui_line *gui_line_get_last_displayed (struct t_gui_buffer *buffer);