diff options
| author | Lukas Mai <l.mai@web.de> | 2011-11-06 20:40:25 +0100 |
|---|---|---|
| committer | Ailin Nemui <ailin@esf51.localdomain> | 2014-07-07 00:32:07 +0200 |
| commit | 0e294d5c2e4d4dd686378f2050abc9a9f2fae199 (patch) | |
| tree | 5c39edb7d60860ec430953553c277da83d666373 /src/fe-text/terminfo-core.c | |
| parent | fc00b9e6f07379f09ea13fa42d9feed377d2d762 (diff) | |
| download | irssi-0e294d5c2e4d4dd686378f2050abc9a9f2fae199.zip | |
add italics support; don't use standout for reverse
Diffstat (limited to 'src/fe-text/terminfo-core.c')
| -rw-r--r-- | src/fe-text/terminfo-core.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/fe-text/terminfo-core.c b/src/fe-text/terminfo-core.c index ba9256b4..d16987fe 100644 --- a/src/fe-text/terminfo-core.c +++ b/src/fe-text/terminfo-core.c @@ -94,8 +94,11 @@ static TERMINFO_REC tcaps[] = { { "rmul", "ue", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_rmul) }, { "smso", "so", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_smso) }, { "rmso", "se", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_rmso) }, + { "sitm", "ZH", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_sitm) }, + { "ritm", "ZR", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_ritm) }, { "bold", "md", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_bold) }, { "blink", "mb", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_blink) }, + { "rev", "mr", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_rev) }, { "setaf", "AF", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_setaf) }, { "setab", "AB", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_setab) }, { "setf", "Sf", CAP_TYPE_STR, G_STRUCT_OFFSET(TERM_REC, TI_setf) }, @@ -313,6 +316,12 @@ static void _set_blink(TERM_REC *term) tput(tparm(term->TI_blink)); } +/* Reverse on */ +static void _set_reverse(TERM_REC *term) +{ + tput(tparm(term->TI_rev)); +} + /* Bold on */ static void _set_bold(TERM_REC *term) { @@ -331,6 +340,18 @@ static void _set_standout(TERM_REC *term, int set) tput(tparm(set ? term->TI_smso : term->TI_rmso)); } +/* Italic on/off */ +static void _set_italic(TERM_REC *term, int set) +{ + tput(tparm(set ? term->TI_sitm : term->TI_ritm)); +} + +/* Standout on (fallback for reverse) */ +static void _set_standout_on(TERM_REC *term) +{ + _set_standout(term, TRUE); +} + inline static int color256(const TERM_REC *term, const int color) { if (color < term->TI_colors) return color; @@ -609,13 +630,17 @@ static int term_setup(TERM_REC *term) else term->repeat = _repeat_manual; - /* Bold, underline, standout */ + /* Bold, underline, standout, reverse, italics */ term->set_blink = term->TI_blink ? _set_blink : _ignore; term->set_bold = term->TI_bold ? _set_bold : _ignore; + term->set_reverse = term->TI_rev ? _set_reverse : + term->TI_smso ? _set_standout_on : _ignore; term->set_uline = term->TI_smul && term->TI_rmul ? _set_uline : _ignore_parm; term->set_standout = term->TI_smso && term->TI_rmso ? _set_standout : _ignore_parm; + term->set_italic = term->TI_sitm && term->TI_ritm ? + _set_italic : _ignore_parm; /* Create a string to set all attributes off */ str = g_string_new(NULL); @@ -625,6 +650,8 @@ static int term_setup(TERM_REC *term) g_string_append(str, term->TI_rmul); if (term->TI_rmso && (term->TI_sgr0 == NULL || strcmp(term->TI_rmso, term->TI_sgr0) != 0)) g_string_append(str, term->TI_rmso); + if (term->TI_ritm && (term->TI_sgr0 == NULL || strcmp(term->TI_ritm, term->TI_sgr0) != 0)) + g_string_append(str, term->TI_ritm); term->TI_normal = str->str; g_string_free(str, FALSE); term->set_normal = _set_normal; |