Lots of /HILIGHT changes. You can use color names with -color. Window

numbers are colored with the highlight color in activity statusbar
item.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@398 dbcabf3a-b0e7-0310-adc4-f8d773084564

3 files changed, 9 insertions, 7 deletions

diff --git a/src/fe-text/gui-printtext.c b/src/fe-text/gui-printtext.c
index e80afa19..07f63ee9 100644
--- a/src/fe-text/gui-printtext.c
+++ b/src/fe-text/gui-printtext.c
@@ -32,7 +32,7 @@
 
 #define TEXT_CHUNK_USABLE_SIZE (LINE_TEXT_CHUNK_SIZE-2-sizeof(char*))
 
-static int mirc_colors[] = { 15, 0, 1, 2, 4, 6, 5, 4, 14, 10, 3, 11, 9, 13, 8, 7, 15 };
+int mirc_colors[] = { 15, 0, 1, 2, 12, 6, 5, 4, 14, 10, 3, 11, 9, 13, 8, 7, 15 };
 static int scrollback_lines, scrollback_hours;
 
 #define mark_temp_eol(text) \
diff --git a/src/fe-text/gui-printtext.h b/src/fe-text/gui-printtext.h
index 6c6e24d9..aeeb5cce 100644
--- a/src/fe-text/gui-printtext.h
+++ b/src/fe-text/gui-printtext.h
@@ -22,6 +22,8 @@ enum
     NUM_COLORS
 };
 
+extern int mirc_colors[];
+
 void gui_printtext_init(void);
 void gui_printtext_deinit(void);
 
diff --git a/src/fe-text/statusbar-items.c b/src/fe-text/statusbar-items.c
index 12c8b75a..4705cc64 100644
--- a/src/fe-text/statusbar-items.c
+++ b/src/fe-text/statusbar-items.c
@@ -327,7 +327,7 @@ static void draw_activity(gchar *title, gboolean act, gboolean det)
     {
 	window = tmp->data;
 
-	is_det = window->new_data == NEWDATA_MSG_FORYOU;
+	is_det = window->new_data >= NEWDATA_HILIGHT;
 	if (is_det && !det) continue;
 	if (!is_det && !act) continue;
 
@@ -342,14 +342,14 @@ static void draw_activity(gchar *title, gboolean act, gboolean det)
 	ltoa(str, window->refnum);
 	switch (window->new_data)
 	{
-	    case NEWDATA_TEXT:
+	case NEWDATA_TEXT:
 		set_color((1 << 4)+3);
 		break;
-	    case NEWDATA_MSG:
+	case NEWDATA_MSG:
 		set_color((1 << 4)+15);
 		break;
-	    case NEWDATA_MSG_FORYOU:
-		set_color((1 << 4)+13);
+	case NEWDATA_HILIGHT:
+		set_color((1 << 4) + (window->last_color > 0 ? mirc_colors[window->last_color] : 13));
 		break;
 	}
 	addstr(str);
@@ -372,7 +372,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_MSG_FORYOU)
+	if (!use_colors && window->new_data >= NEWDATA_HILIGHT)
 	    det = TRUE;
 	else
 	    act = TRUE;