summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/curses/gui-curses-chat.c194
-rw-r--r--src/gui/curses/gui-curses-color.c3
-rw-r--r--src/gui/curses/gui-curses-window.c2
-rw-r--r--src/gui/gtk/gui-gtk-chat.c7
-rw-r--r--src/gui/gui-chat.c19
-rw-r--r--src/gui/gui-chat.h4
-rw-r--r--src/gui/gui-color.h3
-rw-r--r--src/gui/gui-window.c8
8 files changed, 162 insertions, 78 deletions
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 95afebe25..776343ec7 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -101,6 +101,42 @@ gui_chat_marker_for_line (struct t_gui_buffer *buffer, struct t_gui_line *line)
}
/*
+ * gui_chat_reset_style: reset style using color depending on window (active or
+ * not) and line (buffer selected in merged buffer or not)
+ */
+
+void
+gui_chat_reset_style (struct t_gui_window *window, struct t_gui_line *line)
+{
+ if (CONFIG_BOOLEAN(config_look_color_inactive_message))
+ {
+ if (window != gui_current_window)
+ {
+ gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
+ GUI_COLOR_CHAT_INACTIVE_WINDOW);
+ }
+ else
+ {
+ if (line && !(line->data->buffer->active))
+ {
+ gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
+ GUI_COLOR_CHAT_INACTIVE_LINE);
+ }
+ else
+ {
+ gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
+ GUI_COLOR_CHAT);
+ }
+ }
+ }
+ else
+ {
+ gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
+ GUI_COLOR_CHAT);
+ }
+}
+
+/*
* gui_chat_display_new_line: display a new line
*/
@@ -170,9 +206,17 @@ gui_chat_display_horizontal_line (struct t_gui_window *window, int simulate)
*/
char *
-gui_chat_string_next_char (struct t_gui_window *window,
- const unsigned char *string, int apply_style)
+gui_chat_string_next_char (struct t_gui_window *window, struct t_gui_line *line,
+ const unsigned char *string, int apply_style,
+ int apply_style_inactive)
{
+ if (apply_style && apply_style_inactive
+ && ((window != gui_current_window)
+ || (line && !(line->data->buffer->active))))
+ {
+ apply_style = 0;
+ }
+
while (string[0])
{
switch (string[0])
@@ -236,7 +280,7 @@ gui_chat_string_next_char (struct t_gui_window *window,
case GUI_COLOR_RESET_CHAR:
string++;
if (apply_style)
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT);
+ gui_chat_reset_style (window, line);
break;
default:
return (char *)string;
@@ -255,8 +299,10 @@ gui_chat_string_next_char (struct t_gui_window *window,
*/
int
-gui_chat_display_word_raw (struct t_gui_window *window, const char *string,
- int max_chars_on_screen, int display)
+gui_chat_display_word_raw (struct t_gui_window *window, struct t_gui_line *line,
+ const char *string,
+ int max_chars_on_screen, int display,
+ int apply_style_inactive)
{
char *next_char, *output, utf_char[16];
int x, chars_displayed, display_char, size_on_screen;
@@ -273,8 +319,9 @@ gui_chat_display_word_raw (struct t_gui_window *window, const char *string,
while (string && string[0])
{
- string = gui_chat_string_next_char (window,
- (unsigned char *)string, 1);
+ string = gui_chat_string_next_char (window, line,
+ (unsigned char *)string, 1,
+ apply_style_inactive);
if (!string)
return chars_displayed;
@@ -322,7 +369,8 @@ gui_chat_display_word (struct t_gui_window *window,
struct t_gui_line *line,
const char *word, const char *word_end,
int prefix, int num_lines, int count,
- int *lines_displayed, int simulate)
+ int *lines_displayed, int simulate,
+ int apply_style_inactive)
{
char *data, *ptr_data, *end_line, saved_char, str_space[] = " ";
int pos_saved_char, chars_to_display, num_displayed;
@@ -381,13 +429,16 @@ gui_chat_display_word (struct t_gui_window *window,
ptr_attrs, ptr_pair, NULL);
gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
GUI_COLOR_CHAT_PREFIX_SUFFIX);
- gui_chat_display_word_raw (window,
+ gui_chat_display_word_raw (window, line,
CONFIG_STRING(config_look_prefix_suffix),
- 0, 1);
+ 0, 1, apply_style_inactive);
}
window->win_chat_cursor_x += gui_chat_strlen_screen (CONFIG_STRING(config_look_prefix_suffix));
if (!simulate)
- gui_chat_display_word_raw (window, str_space, 0, 1);
+ {
+ gui_chat_display_word_raw (window, line, str_space, 0, 1,
+ apply_style_inactive);
+ }
window->win_chat_cursor_x += gui_chat_strlen_screen (str_space);
if (!simulate)
wattr_set (GUI_WINDOW_OBJECTS(window)->win_chat, attrs, pair, NULL);
@@ -408,9 +459,15 @@ gui_chat_display_word (struct t_gui_window *window,
saved_char = ptr_data[pos_saved_char];
ptr_data[pos_saved_char] = '\0';
if ((count == 0) || (*lines_displayed >= num_lines - count))
- gui_chat_display_word_raw (window, ptr_data, 0, 1);
+ {
+ gui_chat_display_word_raw (window, line, ptr_data, 0, 1,
+ apply_style_inactive);
+ }
else
- gui_chat_display_word_raw (window, ptr_data, 0, 0);
+ {
+ gui_chat_display_word_raw (window, line, ptr_data, 0, 0,
+ apply_style_inactive);
+ }
ptr_data[pos_saved_char] = saved_char;
}
ptr_data += pos_saved_char;
@@ -421,9 +478,15 @@ gui_chat_display_word (struct t_gui_window *window,
if (!simulate)
{
if ((count == 0) || (*lines_displayed >= num_lines - count))
- gui_chat_display_word_raw (window, ptr_data, 0, 1);
+ {
+ gui_chat_display_word_raw (window, line, ptr_data, 0, 1,
+ apply_style_inactive);
+ }
else
- gui_chat_display_word_raw (window, ptr_data, 0, 0);
+ {
+ gui_chat_display_word_raw (window, line, ptr_data, 0, 0,
+ apply_style_inactive);
+ }
}
ptr_data += strlen (ptr_data);
}
@@ -467,7 +530,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
{
if (window->win_chat_cursor_y < window->coords_size)
window->coords[window->win_chat_cursor_y].line = line;
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT);
+ gui_chat_reset_style (window, line);
}
/* display time */
@@ -478,15 +541,17 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
window->coords[window->win_chat_cursor_y].time_x1 = window->win_chat_cursor_x;
gui_chat_display_word (window, line, line->data->str_time,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_time));
if (window->win_chat_cursor_y < window->coords_size)
window->coords[window->win_chat_cursor_y].time_x2 = window->win_chat_cursor_x - 1;
if (!simulate)
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT);
+ gui_chat_reset_style (window, line);
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_time));
}
/* display buffer name (if many buffers are merged) */
@@ -510,22 +575,22 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
if (CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_RIGHT)
{
if (!simulate)
- {
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
- GUI_COLOR_CHAT);
- }
+ gui_chat_reset_style (window, line);
for (i = 0; i < num_spaces; i++)
{
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count,
- lines_displayed, simulate);
+ lines_displayed, simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
}
}
if (!simulate)
{
gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
- GUI_COLOR_CHAT_PREFIX_BUFFER);
+ ((gui_current_window == window) && (line->data->buffer->active)) ?
+ GUI_COLOR_CHAT_PREFIX_BUFFER :
+ GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE);
}
if (window->win_chat_cursor_y < window->coords_size)
@@ -541,13 +606,15 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
gui_chat_string_real_pos (short_name,
length_allowed),
1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
}
else
{
gui_chat_display_word (window, line,
short_name, NULL, 1, num_lines, count,
- lines_displayed, simulate);
+ lines_displayed, simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
}
if (window->win_chat_cursor_y < window->coords_size)
@@ -565,15 +632,13 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
(CONFIG_BOOLEAN(config_look_prefix_buffer_align_more)) ?
str_plus : str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
}
else
{
if (!simulate)
- {
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
- GUI_COLOR_CHAT);
- }
+ gui_chat_reset_style (window, line);
if ((CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_LEFT)
|| ((CONFIG_INTEGER(config_look_prefix_buffer_align) == CONFIG_LOOK_PREFIX_BUFFER_ALIGN_NONE)
&& (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)))
@@ -582,14 +647,16 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
{
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
}
}
if (mixed_lines->buffer_max_length > 0)
{
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
}
}
}
@@ -600,10 +667,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
|| (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)))
{
if (!simulate)
- {
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat,
- GUI_COLOR_CHAT);
- }
+ gui_chat_reset_style (window, line);
if (CONFIG_INTEGER(config_look_prefix_align_max) > 0)
{
@@ -622,7 +686,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
{
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count,
- lines_displayed, simulate);
+ lines_displayed, simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix));
}
}
@@ -652,14 +717,16 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
line->data->prefix + gui_chat_string_real_pos (line->data->prefix,
length_allowed),
1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix));
}
else
{
gui_chat_display_word (window, line,
(prefix_highlighted) ? prefix_highlighted : line->data->prefix,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix));
}
if (window->win_chat_cursor_y < window->coords_size)
@@ -669,7 +736,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
free (prefix_highlighted);
if (!simulate)
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT);
+ gui_chat_reset_style (window, line);
if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_LEFT)
{
@@ -677,7 +744,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
{
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix));
}
}
if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
@@ -692,7 +760,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
(CONFIG_BOOLEAN(config_look_prefix_align_more)) ?
str_plus : str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix));
}
else
{
@@ -700,7 +769,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
{
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count, lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix));
}
}
if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
@@ -715,10 +785,10 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
gui_chat_display_word (window, line,
CONFIG_STRING(config_look_prefix_suffix),
NULL, 1, num_lines, count,
- lines_displayed, simulate);
+ lines_displayed, simulate, 0);
gui_chat_display_word (window, line, str_space,
NULL, 1, num_lines, count,
- lines_displayed, simulate);
+ lines_displayed, simulate, 0);
}
}
}
@@ -790,7 +860,7 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
/* reset color & style for a new line */
if (!simulate)
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT);
+ gui_chat_reset_style (window, line);
if (!line->data->message || !line->data->message[0])
{
@@ -830,9 +900,10 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
while (ptr_style < ptr_data + word_start_offset)
{
/* loop until no style/char available */
- ptr_style = gui_chat_string_next_char (window,
+ ptr_style = gui_chat_string_next_char (window, line,
(unsigned char *)ptr_style,
- 1);
+ 1,
+ CONFIG_BOOLEAN(config_look_color_inactive_message));
if (!ptr_style)
break;
ptr_style = utf8_next_char (ptr_style);
@@ -846,7 +917,8 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
gui_chat_display_word (window, line, ptr_data,
ptr_end_offset + 1,
0, num_lines, count, &lines_displayed,
- simulate);
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_message));
if ((!simulate) && (window->win_chat_cursor_y >= window->win_chat_height))
ptr_data = NULL;
@@ -864,9 +936,10 @@ gui_chat_display_line (struct t_gui_window *window, struct t_gui_line *line,
next_char = utf8_next_char (ptr_data);
if (!next_char)
break;
- ptr_data = gui_chat_string_next_char (window,
+ ptr_data = gui_chat_string_next_char (window, line,
(unsigned char *)next_char,
- 1);
+ 1,
+ CONFIG_BOOLEAN(config_look_color_inactive_message));
}
}
}
@@ -938,7 +1011,7 @@ gui_chat_display_line_y (struct t_gui_window *window, struct t_gui_line *line,
int y)
{
/* reset color & style for a new line */
- gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, GUI_COLOR_CHAT);
+ gui_chat_reset_style (window, line);
window->win_chat_cursor_x = 0;
window->win_chat_cursor_y = y;
@@ -948,8 +1021,9 @@ gui_chat_display_line_y (struct t_gui_window *window, struct t_gui_line *line,
window->win_chat_cursor_x);
wclrtoeol (GUI_WINDOW_OBJECTS(window)->win_chat);
- if (gui_chat_display_word_raw (window, line->data->message,
- window->win_chat_width, 1) < window->win_chat_width)
+ if (gui_chat_display_word_raw (window, line, line->data->message,
+ window->win_chat_width, 1,
+ CONFIG_BOOLEAN(config_look_color_inactive_message)) < window->win_chat_width)
{
gui_window_clrtoeol (GUI_WINDOW_OBJECTS(window)->win_chat);
}
@@ -1077,11 +1151,10 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
{
gui_window_coords_alloc (ptr_win);
+ gui_chat_reset_style (ptr_win, NULL);
+
if (erase)
{
- gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(ptr_win)->win_chat,
- GUI_COLOR_CHAT);
-
snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
for (i = 0; i < ptr_win->win_chat_height; i++)
{
@@ -1090,9 +1163,6 @@ gui_chat_draw (struct t_gui_buffer *buffer, int erase)
}
}
- gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(ptr_win)->win_chat,
- GUI_COLOR_CHAT);
-
ptr_win->win_chat_cursor_x = 0;
ptr_win->win_chat_cursor_y = 0;
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index 4f6f1c8da..237501983 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -1382,6 +1382,9 @@ gui_color_init_weechat ()
gui_color_build (GUI_COLOR_CHAT_VALUE, CONFIG_COLOR(config_color_chat_value), CONFIG_COLOR(config_color_chat_bg));
gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER, CONFIG_COLOR(config_color_chat_prefix_buffer), CONFIG_COLOR(config_color_chat_bg));
gui_color_build (GUI_COLOR_CHAT_TAGS, CONFIG_COLOR(config_color_chat_tags), CONFIG_COLOR(config_color_chat_bg));
+ gui_color_build (GUI_COLOR_CHAT_INACTIVE_WINDOW, CONFIG_COLOR(config_color_chat_inactive_window), CONFIG_COLOR(config_color_chat_bg));
+ gui_color_build (GUI_COLOR_CHAT_INACTIVE_LINE, CONFIG_COLOR(config_color_chat_inactive_line), CONFIG_COLOR(config_color_chat_bg));
+ gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE, CONFIG_COLOR(config_color_chat_prefix_buffer_inactive_line), CONFIG_COLOR(config_color_chat_bg));
/*
* define old nick colors for compatibility on /upgrade with previous
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index 08dc8d8d2..b4a88bb89 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -1119,6 +1119,8 @@ gui_window_switch (struct t_gui_window *window)
gui_window_switch_to_buffer (gui_current_window,
gui_current_window->buffer, 1);
+ old_window->refresh_needed = 1;
+
gui_input_move_to_buffer (old_window->buffer, window->buffer);
}
diff --git a/src/gui/gtk/gui-gtk-chat.c b/src/gui/gtk/gui-gtk-chat.c
index ce677f18f..5f441b89b 100644
--- a/src/gui/gtk/gui-gtk-chat.c
+++ b/src/gui/gtk/gui-gtk-chat.c
@@ -174,12 +174,15 @@ gui_chat_set_weechat_color (struct t_gui_window *window, int weechat_color)
*/
char *
-gui_chat_string_next_char (struct t_gui_window *window,
- const unsigned char *string, int apply_style)
+gui_chat_string_next_char (struct t_gui_window *window, struct t_gui_line *line,
+ const unsigned char *string, int apply_style,
+ int apply_style_inactive)
{
/* TODO: write this function for Gtk */
(void) window;
+ (void) line;
(void) apply_style;
+ (void) apply_style_inactive;
return (char *)string;
}
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 2cfd45453..823b3fcc8 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -162,7 +162,8 @@ gui_chat_strlen_screen (const char *string)
length = 0;
while (string && string[0])
{
- string = gui_chat_string_next_char (NULL, (unsigned char *)string, 0);
+ string = gui_chat_string_next_char (NULL, NULL,
+ (unsigned char *)string, 0, 0);
if (string)
{
size_on_screen = (gui_chat_utf_char_valid (string)) ? utf8_char_size_screen (string) : 1;
@@ -184,9 +185,9 @@ gui_chat_string_add_offset (const char *string, int offset)
{
while (string && string[0] && (offset > 0))
{
- string = gui_chat_string_next_char (NULL,
+ string = gui_chat_string_next_char (NULL, NULL,
(unsigned char *)string,
- 0);
+ 0, 0);
if (string)
{
string = utf8_next_char (string);
@@ -209,9 +210,9 @@ gui_chat_string_add_offset_screen (const char *string, int offset_screen)
while (string && string[0] && (offset_screen > 0))
{
- string = gui_chat_string_next_char (NULL,
+ string = gui_chat_string_next_char (NULL, NULL,
(unsigned char *)string,
- 0);
+ 0, 0);
if (string)
{
size_on_screen = (gui_chat_utf_char_valid (string)) ? utf8_char_size_screen (string) : 1;
@@ -240,9 +241,9 @@ gui_chat_string_real_pos (const char *string, int pos)
ptr_string = string;
while (ptr_string && ptr_string[0] && (pos > 0))
{
- ptr_string = gui_chat_string_next_char (NULL,
+ ptr_string = gui_chat_string_next_char (NULL, NULL,
(unsigned char *)ptr_string,
- 0);
+ 0, 0);
if (ptr_string)
{
size_on_screen = (((unsigned char)ptr_string[0]) < 32) ? 1 : utf8_char_size_screen (ptr_string);
@@ -279,8 +280,8 @@ gui_chat_get_word_info (struct t_gui_window *window,
leading_spaces = 1;
while (data && data[0])
{
- next_char = gui_chat_string_next_char (window, (unsigned char *)data,
- 0);
+ next_char = gui_chat_string_next_char (window, NULL,
+ (unsigned char *)data, 0, 0);
if (next_char)
{
next_char2 = utf8_next_char (next_char);
diff --git a/src/gui/gui-chat.h b/src/gui/gui-chat.h
index f62ef808b..6bcffaf81 100644
--- a/src/gui/gui-chat.h
+++ b/src/gui/gui-chat.h
@@ -87,8 +87,10 @@ extern void gui_chat_end ();
/* chat functions (GUI dependent) */
extern char *gui_chat_string_next_char (struct t_gui_window *window,
+ struct t_gui_line *line,
const unsigned char *string,
- int apply_style);
+ int apply_style,
+ int apply_style_inactive);
extern void gui_chat_draw (struct t_gui_buffer *buffer, int erase);
extern void gui_chat_draw_line (struct t_gui_buffer *buffer,
struct t_gui_line *line);
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index b0f114cfe..90c2574a9 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -62,6 +62,9 @@ enum t_gui_color_enum
GUI_COLOR_CHAT_VALUE,
GUI_COLOR_CHAT_PREFIX_BUFFER,
GUI_COLOR_CHAT_TAGS,
+ GUI_COLOR_CHAT_INACTIVE_WINDOW,
+ GUI_COLOR_CHAT_INACTIVE_LINE,
+ GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_LINE,
/* number of colors */
GUI_COLOR_NUM_COLORS,
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 5d0c0eb14..c1283ad70 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -228,9 +228,9 @@ gui_window_get_context_at_xy (struct t_gui_window *window,
word_start = (*line)->data->message;
while (word_start && (word_start < ptr_data))
{
- word_start = (char *)gui_chat_string_next_char (NULL,
+ word_start = (char *)gui_chat_string_next_char (NULL, NULL,
(unsigned char *)word_start,
- 0);
+ 0, 0);
if (word_start)
{
if (word_start[0] == ' ')
@@ -242,9 +242,9 @@ gui_window_get_context_at_xy (struct t_gui_window *window,
word_end = ptr_data;
while (word_end && word_end[0])
{
- word_end = (char *)gui_chat_string_next_char (NULL,
+ word_end = (char *)gui_chat_string_next_char (NULL, NULL,
(unsigned char *)word_end,
- 0);
+ 0, 0);
if (word_end)
{
if (word_end[0] == ' ')
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 03:40:26 +0000