diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-03-17 02:32:32 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-03-17 02:32:32 +0000 |
| commit | d9008ae249d0d58563a293cd866d15e9d33496d1 (patch) | |
| tree | 2436a712f189ac50d41bbb7e64ef72fce935a7c6 /src/fe-common/core | |
| parent | c3da7fa8abe93ee39b8913959d6d66bf6b296ed8 (diff) | |
| download | irssi-d9008ae249d0d58563a293cd866d15e9d33496d1.zip | |
%F = blinking on/off. several fixes to make blinking work better. some
hilight fixes.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1403 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core')
| -rw-r--r-- | src/fe-common/core/formats.c | 7 | ||||
| -rw-r--r-- | src/fe-common/core/formats.h | 11 | ||||
| -rw-r--r-- | src/fe-common/core/themes.c | 11 |
3 files changed, 16 insertions, 13 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index eb554973..a8a2ac7f 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -93,7 +93,9 @@ int format_expand_styles(GString *out, char format) g_string_append_c(out, FORMAT_STYLE_INDENT); break; case 'F': - /* flashing - ignore */ + /* blink */ + g_string_append_c(out, 4); + g_string_append_c(out, FORMAT_STYLE_BLINK); break; case 'n': case 'N': @@ -845,6 +847,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) /* user specific colors */ flags &= ~PRINTFLAG_MIRC_COLOR; switch (*ptr) { + case FORMAT_STYLE_BLINK: + flags ^= PRINTFLAG_BLINK; + break; case FORMAT_STYLE_UNDERLINE: flags ^= PRINTFLAG_UNDERLINE; break; diff --git a/src/fe-common/core/formats.h b/src/fe-common/core/formats.h index fde5be01..86c53e69 100644 --- a/src/fe-common/core/formats.h +++ b/src/fe-common/core/formats.h @@ -101,11 +101,12 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text); #define FORMAT_COLOR_NOCHANGE ('0'-1) /* don't change this, at least hilighting depends this value */ #define FORMAT_STYLE_SPECIAL 0x60 -#define FORMAT_STYLE_UNDERLINE (0x01 + FORMAT_STYLE_SPECIAL) -#define FORMAT_STYLE_BOLD (0x02 + FORMAT_STYLE_SPECIAL) -#define FORMAT_STYLE_REVERSE (0x03 + FORMAT_STYLE_SPECIAL) -#define FORMAT_STYLE_INDENT (0x04 + FORMAT_STYLE_SPECIAL) -#define FORMAT_STYLE_DEFAULTS (0x05 + FORMAT_STYLE_SPECIAL) +#define FORMAT_STYLE_BLINK (0x01 + FORMAT_STYLE_SPECIAL) +#define FORMAT_STYLE_UNDERLINE (0x02 + FORMAT_STYLE_SPECIAL) +#define FORMAT_STYLE_BOLD (0x03 + FORMAT_STYLE_SPECIAL) +#define FORMAT_STYLE_REVERSE (0x04 + FORMAT_STYLE_SPECIAL) +#define FORMAT_STYLE_INDENT (0x05 + FORMAT_STYLE_SPECIAL) +#define FORMAT_STYLE_DEFAULTS (0x06 + FORMAT_STYLE_SPECIAL) int format_expand_styles(GString *out, char format); void formats_init(void); diff --git a/src/fe-common/core/themes.c b/src/fe-common/core/themes.c index 997395a3..ee053cd5 100644 --- a/src/fe-common/core/themes.c +++ b/src/fe-common/core/themes.c @@ -186,16 +186,13 @@ static void theme_format_append_next(THEME_REC *theme, GString *str, chr = **format; if (**format == 'n') { /* %n = change to default color */ - if (default_fg == 'n' || default_bg == 'n') { - if (*last_fg != 'n') - g_string_append(str, "%n"); - *last_bg = *last_fg = 'n'; - } - if (default_bg != *last_bg) { + g_string_append(str, "%n"); + + if (default_bg != 'n') { g_string_append_c(str, '%'); g_string_append_c(str, default_bg); } - if (default_fg != *last_fg) { + if (default_fg != 'n') { g_string_append_c(str, '%'); g_string_append_c(str, default_fg); } |