From 0a7b708a1f600bdb8d93c95e1ede7f74b429f99d Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 3 May 2013 19:15:57 +0200 Subject: core: add options weechat.look.prefix_align_more_after and weechat.look.prefix_buffer_align_more_after --- src/gui/curses/gui-curses-chat.c | 76 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) (limited to 'src/gui/curses/gui-curses-chat.c') 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) -- cgit v1.2.3