zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 04:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Highlighting cleanups. Added /HILIGHT -priority option.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1098 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-09 21:06:45 +00:00 • committed by cras
commit d256f71a00
14 changed files with 190 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fe-text/mainwindow-activity.c
View file

@ -26,9 +26,9 @@
static void sig_activity(WINDOW_REC *window)
{
GSList *tmp;
/*GSList *tmp;
if (!is_window_visible(window) || window->new_data == 0)
if (!is_window_visible(window) || window->data_level == 0)
return;
window->new_data = 0;
@ -39,7 +39,7 @@ static void sig_activity(WINDOW_REC *window)
item->new_data = 0;
item->last_color = 0;
}
signal_stop();
signal_stop();*/
}
void mainwindow_activity_init(void)

28
src/fe-text/statusbar-items.c
View file

@ -328,7 +328,7 @@ static void draw_activity(gchar *title, gboolean act, gboolean det)
{
window = tmp->data;
is_det = window->new_data >= NEWDATA_HILIGHT;
is_det = window->data_level >= DATA_LEVEL_HILIGHT;
if (is_det && !det) continue;
if (!is_det && !act) continue;
@ -341,17 +341,19 @@ static void draw_activity(gchar *title, gboolean act, gboolean det)
}
ltoa(str, window->refnum);
switch (window->new_data)
switch (window->data_level)
{
case NEWDATA_TEXT:
case DATA_LEVEL_NONE:
break;
case DATA_LEVEL_TEXT:
set_color(stdscr, sbar_color_dim);
break;
case NEWDATA_MSG:
case DATA_LEVEL_MSG:
set_color(stdscr, sbar_color_bold);
break;
case NEWDATA_HILIGHT:
if (window->last_color > 0)
set_color(stdscr, sbar_color_background | mirc_colors[window->last_color]);
default:
if (window->hilight_color > 0)
set_color(stdscr, sbar_color_background | mirc_colors[window->hilight_color%16]);
else
set_color(stdscr, sbar_color_act_highlight);
break;
@ -376,7 +378,7 @@ static void statusbar_activity(SBAR_ITEM_REC *item, int ypos)
size_needed += 1+ltoa(str, window->refnum);
if (!use_colors && window->new_data >= NEWDATA_HILIGHT)
if (!use_colors && window->data_level >= DATA_LEVEL_HILIGHT)
det = TRUE;
else
act = TRUE;
@ -418,7 +420,7 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel
/* Move the window to the first in the activity list */
if (g_list_find(activity_list, window) != NULL)
activity_list = g_list_remove(activity_list, window);
if (window->new_data != 0)
if (window->data_level != 0)
activity_list = g_list_prepend(activity_list, window);
statusbar_item_redraw(activity_item);
return;
@ -427,14 +429,14 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel
if (g_list_find(activity_list, window) != NULL)
{
/* already in activity list */
if (window->new_data == 0)
if (window->data_level == 0)
{
/* remove from activity list */
activity_list = g_list_remove(activity_list, window);
statusbar_item_redraw(activity_item);
}
else if (window->new_data != GPOINTER_TO_INT(oldlevel) ||
window->last_color != 0)
else if (window->data_level != GPOINTER_TO_INT(oldlevel) ||
window->hilight_color != 0)
{
/* different level as last time (or maybe different
hilight color?), just redraw it. */
@ -443,7 +445,7 @@ static void sig_statusbar_activity_hilight(WINDOW_REC *window, gpointer oldlevel
return;
}
if (window->new_data == 0)
if (window->data_level == 0)
return;
/* add window to activity list .. */