diff options
| author | TingPing <tngpng@gmail.com> | 2013-05-16 10:50:43 -0700 |
|---|---|---|
| committer | TingPing <tngpng@gmail.com> | 2013-05-16 10:50:43 -0700 |
| commit | 096d0660e2cc707e13d7d55a9f3039418e21e883 (patch) | |
| tree | 94551f6aa9f4c474350f65bb7b60dc9614fa443a | |
| parent | b28734c4a8073b35a70707703c55c5266190cc1d (diff) | |
| parent | 7a242a8331499e2c4d53de77f0c86c955d889052 (diff) | |
Merge pull request #594 from Tux/master
Allow the special colors 32..41 in %Cfg,bg
| -rw-r--r-- | src/fe-gtk/xtext.c | 3 | ||||
| -rw-r--r-- | src/fe-gtk/xtext.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 94db4687..81805d99 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -3200,6 +3200,7 @@ gtk_xtext_render_str (GtkXText * xtext, int y, textentry * ent, if (col_num == 99) /* mIRC lameness */ col_num = XTEXT_FG; else + if (col_num > XTEXT_MAX_COLOR) col_num = col_num % XTEXT_MIRC_COLS; xtext->col_fore = col_num; if (!mark) @@ -3226,6 +3227,7 @@ gtk_xtext_render_str (GtkXText * xtext, int y, textentry * ent, if (col_num == 99) /* mIRC lameness */ col_num = XTEXT_BG; else + if (col_num > XTEXT_MAX_COLOR) col_num = col_num % XTEXT_MIRC_COLS; if (col_num == XTEXT_BG) xtext->backcolor = FALSE; @@ -3239,6 +3241,7 @@ gtk_xtext_render_str (GtkXText * xtext, int y, textentry * ent, if (col_num == 99) /* mIRC lameness */ col_num = XTEXT_FG; else + if (col_num > XTEXT_MAX_COLOR) col_num = col_num % XTEXT_MIRC_COLS; if (!mark) xtext_set_fg (xtext, gc, col_num); diff --git a/src/fe-gtk/xtext.h b/src/fe-gtk/xtext.h index 8a4b26cf..446708be 100644 --- a/src/fe-gtk/xtext.h +++ b/src/fe-gtk/xtext.h @@ -58,6 +58,7 @@ #define XTEXT_FG 34 #define XTEXT_BG 35 #define XTEXT_MARKER 36 /* for marker line */ +#define XTEXT_MAX_COLOR 41 typedef struct _GtkXText GtkXText; typedef struct _GtkXTextClass GtkXTextClass; |