Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting hrev45143:bold characters visual regression

Browse Source 
Terminal is GUI application and there are no need to emulate bold
in some kind of color adjustments, especially in case the proposed
emulation look is too far away from results observed on similar software
like xterm, Konsole and XFCE Terminal.
This commit is contained in:
Siarzhuk Zharski 2013-01-26 22:02:59 +01:00
parent fb8041a277
commit f9443b14d5
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/terminal/Shell.cpp
View File

@ -539,7 +539,7 @@ Shell::_Spawn(int row, int col, const ShellParameters& parameters)
/*
* setenv TERM and TTY.
*/
setenv("TERM", "xterm-color", true);
setenv("TERM", "xterm", true);
setenv("TTY", ttyName, true);
setenv("TTYPE", parameters.Encoding(), true);

23
src/apps/terminal/TermParse.cpp
View File

@ -833,30 +833,23 @@ TermParse::EscParse()
fAttr = FORECOLORED(7);
break;
case 1: /* Bright / Bold */
fAttr |= FORECOLORED(8);
fAttr |= FORESET;
case 1: /* Bold */
case 5:
fAttr |= BOLD;
break;
case 4: /* Underline */
fAttr |= UNDERLINE;
break;
case 5:
fAttr |= BOLD;
break;
case 7: /* Inverse */
fAttr |= INVERSE;
break;
case 2: /* Faint: decreased intensity */
case 21: /* Bright/Bold: off or Underline: Double */
case 22: /* Not Bold, not bright, not faint */
fAttr &= ~(FORECOLORED(8) | BOLD);
fAttr |= FORESET;
case 22: /* Not Bold */
fAttr &= ~BOLD;
break;
case 24: /* Not Underline */
fAttr &= ~UNDERLINE;
break;
@ -873,7 +866,7 @@ TermParse::EscParse()
case 35:
case 36:
case 37:
fAttr &= ~FORECOLORED(7);
fAttr &= ~FORECOLOR;
fAttr |= FORECOLORED(param[row] - 30);
fAttr |= FORESET;
break;
@ -882,7 +875,7 @@ TermParse::EscParse()
{
if (nparam != 3 || param[1] != 5)
break;
fAttr &= ~FORECOLORED(255 - 8);
fAttr &= ~FORECOLOR;
fAttr |= FORECOLORED(param[2]);
fAttr |= FORESET;

4
src/apps/terminal/TermView.cpp
View File

@ -79,14 +79,14 @@ static rgb_color kTermColorTable[256] = {
{ 6, 152, 154, 0}, // cyan
{245, 245, 245, 0}, // white
{ 64, 64, 64, 0}, // black
{128, 128, 128, 0}, // black
{255, 0, 0, 0}, // red
{ 0, 255, 0, 0}, // green
{255, 255, 0, 0}, // yellow
{ 0, 0, 255, 0}, // blue
{255, 0, 255, 0}, // magenta
{ 0, 255, 255, 0}, // cyan
{128, 128, 128, 0}, // white
{255, 255, 255, 0}, // white
{ 0, 0, 0, 0},
{ 0, 0, 51, 0},