devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Colour /me messages correctly

Browse Source 
fixes #457
This commit is contained in:
James Booth
2014-11-30 22:50:02 +00:00
parent 5875dcfd53
commit e70cbd1b61
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ui/window.c
View File

@@ -557,7 +557,7 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
// 3rd bit = 0/1 - eol/no eol // 3rd bit = 0/1 - eol/no eol
// 4th bit = 0/1 - color from/no color from // 4th bit = 0/1 - color from/no color from
// 5th bit = 0/1 - color date/no date // 5th bit = 0/1 - color date/no date
int unattr_me = 0; gboolean me_message = FALSE;
int offset = 0; int offset = 0;
int colour = theme_attrs(THEME_ME); int colour = theme_attrs(THEME_ME);
@@ -596,14 +596,16 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
if (strncmp(message, "/me ", 4) == 0) { if (strncmp(message, "/me ", 4) == 0) {
wprintw(window->win, "*%s ", from); wprintw(window->win, "*%s ", from);
offset = 4; offset = 4;
unattr_me = 1; me_message = TRUE;
} else { } else {
wprintw(window->win, "%s: ", from); wprintw(window->win, "%s: ", from);
wattroff(window->win, colour); wattroff(window->win, colour);
} }
} }
wattron(window->win, theme_attrs(theme_item)); if (!me_message) {
wattron(window->win, theme_attrs(theme_item));
}
if (prefs_get_boolean(PREF_WRAP)) { if (prefs_get_boolean(PREF_WRAP)) {
_win_print_wrapped(window->win, message+offset); _win_print_wrapped(window->win, message+offset);
@@ -615,10 +617,10 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
wprintw(window->win, "\n"); wprintw(window->win, "\n");
} }
wattroff(window->win, theme_attrs(theme_item)); if (me_message) {
if (unattr_me) {
wattroff(window->win, colour); wattroff(window->win, colour);
} else {
wattroff(window->win, theme_attrs(theme_item));
} }
} }