diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | src/screen.c | 6 | ||||
-rw-r--r-- | src/term.c | 45 | ||||
-rw-r--r-- | themes/Escreen/theme.cfg.in | 22 |
4 files changed, 65 insertions, 19 deletions
@@ -5056,3 +5056,14 @@ Tue Jun 10 12:19:00 2003 Michael Jennings (mej) Patch from Matt Zimmerman <mdz@debian.org> to correct buffer overflow when $ETERMPATH is set too large. ---------------------------------------------------------------------- +Tue Jul 29 22:47:18 2003 Michael Jennings (mej) + +Patch from David Lloyd <dmlloyd@tds.net> to support ANSI sequences for +bright colors. I haven't tested this, so I hope it works. *grin* + +Also, commented out the F1-F10 bindings in the Escreen theme; they're +too intrusive. + +Added support for Ctrl-t to open a new Escreen "tab" (as with +Mozilla). +---------------------------------------------------------------------- diff --git a/src/screen.c b/src/screen.c index 9534061..cd06b79 100644 --- a/src/screen.c +++ b/src/screen.c @@ -486,12 +486,8 @@ scr_color(unsigned int color, unsigned int Intensity) } } else { #ifndef NO_BRIGHTCOLOR - if ((rstyle & Intensity) && color >= minColor && color <= maxColor) + if ((rstyle & Intensity) && color >= minColor && color <= maxColor) { color += (minBright - minColor); - else if (color >= minBright && color <= maxBright) { - if (rstyle & Intensity) - return; - color -= (minBright - minColor); } #endif } @@ -1621,8 +1621,9 @@ process_sgr_mode(unsigned int nargs, int arg[]) scr_rendition(0, RS_RVid); break; + /* set fg color */ case 30: - case 31: /* set fg color */ + case 31: case 32: case 33: case 34: @@ -1631,12 +1632,14 @@ process_sgr_mode(unsigned int nargs, int arg[]) case 37: scr_color(minColor + (arg[i] - 30), RS_Bold); break; - case 39: /* default fg */ + /* default fg */ + case 39: scr_color(restoreFG, RS_Bold); break; + /* set bg color */ case 40: - case 41: /* set bg color */ + case 41: case 42: case 43: case 44: @@ -1645,9 +1648,43 @@ process_sgr_mode(unsigned int nargs, int arg[]) case 47: scr_color(minColor + (arg[i] - 40), RS_Blink); break; - case 49: /* default bg */ + /* default bg */ + case 49: scr_color(restoreBG, RS_Blink); break; + + /* set fg color - bright */ + case 90: + case 91: + case 92: + case 93: + case 94: + case 95: + case 96: + case 97: + scr_color(minBright + (arg[i] - 90), RS_Bold); + break; + /* default fg */ + case 99: + scr_color(restoreFG, RS_Bold); + break; + + /* set bg color - bright */ + case 100: + case 101: + case 102: + case 103: + case 104: + case 105: + case 106: + case 107: + scr_color(minBright + (arg[i] - 100), RS_Blink); + break; + /* default bg */ + case 109: + scr_color(restoreBG, RS_Blink); + break; + } } diff --git a/themes/Escreen/theme.cfg.in b/themes/Escreen/theme.cfg.in index 1036b70..0c92564 100644 --- a/themes/Escreen/theme.cfg.in +++ b/themes/Escreen/theme.cfg.in @@ -84,6 +84,7 @@ begin actions bind alt Next to script "es_display(next)" bind alt space to script "es_display(toggle)" bind ctrl Tab to script "es_display(next)" + bind ctrl t to script "es_display(new, ask)" # alt-1..alt-0 -> display(0)..display(9) bind alt 0x31 to script "es_display(goto, 0)" @@ -97,17 +98,18 @@ begin actions bind alt 0x39 to script "es_display(goto, 8)" bind alt 0x30 to script "es_display(goto, 9)" + # Commented out; too intrusive -- mej # F1..F10 -> display(0)..display(9) - bind F1 to script "es_display(goto, 0)" - bind F2 to script "es_display(goto, 1)" - bind F3 to script "es_display(goto, 2)" - bind F4 to script "es_display(goto, 3)" - bind F5 to script "es_display(goto, 4)" - bind F6 to script "es_display(goto, 5)" - bind F7 to script "es_display(goto, 6)" - bind F8 to script "es_display(goto, 7)" - bind F9 to script "es_display(goto, 8)" - bind F10 to script "es_display(goto, 9)" + #bind F1 to script "es_display(goto, 0)" + #bind F2 to script "es_display(goto, 1)" + #bind F3 to script "es_display(goto, 2)" + #bind F4 to script "es_display(goto, 3)" + #bind F5 to script "es_display(goto, 4)" + #bind F6 to script "es_display(goto, 5)" + #bind F7 to script "es_display(goto, 6)" + #bind F8 to script "es_display(goto, 7)" + #bind F9 to script "es_display(goto, 8)" + #bind F10 to script "es_display(goto, 9)" bind alt n to script "es_display(new)" bind alt r to script "es_display(rename)" |