libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: console: Revise color setting codes in legacy console mode. 

- With this patch, foreground color and background color are allowed
  to be set simultaneously by 24 bit color escape sequence such as
  ESC[38;2;0;0;255;48;2;128;128;0m in legacy console mode.
This commit is contained in:
Takashi Yano 2020-02-01 13:28:39 +09:00 committed by Ken Brown
parent c67c9e11a0
commit d94a0fd92d
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/fhandler.h
View File

@ -1838,7 +1838,7 @@ enum ansi_intensity
#define gotrparen 9 #define gotrparen 9
#define eatpalette 10 #define eatpalette 10
#define endpalette 11 #define endpalette 11
#define MAXARGS 10 #define MAXARGS 16
enum cltype enum cltype
{ {

47
winsup/cygwin/fhandler_console.cc
View File

@ -1952,7 +1952,7 @@ fhandler_console::char_command (char c)
switch (c) switch (c)
{ {
case 'm': /* Set Graphics Rendition */ case 'm': /* Set Graphics Rendition */
for (int i = 0; i <= con.nargs; i++) for (int i = 0; i < con.nargs; i++)
switch (con.args[i]) switch (con.args[i])
{ {
case 0: /* normal color */ case 0: /* normal color */
@ -2020,38 +2020,39 @@ fhandler_console::char_command (char c)
con.fg = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; con.fg = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
break; break;
case 38: case 38:
if (con.nargs < 1) if (con.nargs < i + 2)
/* Sequence error (abort) */ /* Sequence error (abort) */
break; break;
switch (con.args[1]) switch (con.args[i + 1])
{ {
case 2: case 2:
if (con.nargs != 4) if (con.nargs < i + 5)
/* Sequence error (abort) */ /* Sequence error (abort) */
break; break;
r = con.args[2]; r = con.args[i + 2];
g = con.args[3]; g = con.args[i + 3];
b = con.args[4]; b = con.args[i + 4];
r = r < (95 + 1) / 2 ? 0 : r > 255 ? 5 : (r - 55 + 20) / 40; r = r < (95 + 1) / 2 ? 0 : r > 255 ? 5 : (r - 55 + 20) / 40;
g = g < (95 + 1) / 2 ? 0 : g > 255 ? 5 : (g - 55 + 20) / 40; g = g < (95 + 1) / 2 ? 0 : g > 255 ? 5 : (g - 55 + 20) / 40;
b = b < (95 + 1) / 2 ? 0 : b > 255 ? 5 : (b - 55 + 20) / 40; b = b < (95 + 1) / 2 ? 0 : b > 255 ? 5 : (b - 55 + 20) / 40;
con.fg = table256[16 + r*36 + g*6 + b]; con.fg = table256[16 + r*36 + g*6 + b];
i += 4;
break; break;
case 5: case 5:
if (con.nargs != 2) if (con.nargs < i + 3)
/* Sequence error (abort) */ /* Sequence error (abort) */
break; break;
{ {
int idx = con.args[2]; int idx = con.args[i + 2];
if (idx < 0) if (idx < 0)
idx = 0; idx = 0;
if (idx > 255) if (idx > 255)
idx = 255; idx = 255;
con.fg = table256[idx]; con.fg = table256[idx];
i += 2;
} }
break; break;
} }
i += con.nargs;
break; break;
case 39: case 39:
con.fg = con.default_color & FOREGROUND_ATTR_MASK; con.fg = con.default_color & FOREGROUND_ATTR_MASK;
@ -2081,38 +2082,39 @@ fhandler_console::char_command (char c)
con.bg = BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED; con.bg = BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
break; break;
case 48: case 48:
if (con.nargs < 1) if (con.nargs < i + 2)
/* Sequence error (abort) */ /* Sequence error (abort) */
break; break;
switch (con.args[1]) switch (con.args[i + 1])
{ {
case 2: case 2:
if (con.nargs != 4) if (con.nargs < i + 5)
/* Sequence error (abort) */ /* Sequence error (abort) */
break; break;
r = con.args[2]; r = con.args[i + 2];
g = con.args[3]; g = con.args[i + 3];
b = con.args[4]; b = con.args[i + 4];
r = r < (95 + 1) / 2 ? 0 : r > 255 ? 5 : (r - 55 + 20) / 40; r = r < (95 + 1) / 2 ? 0 : r > 255 ? 5 : (r - 55 + 20) / 40;
g = g < (95 + 1) / 2 ? 0 : g > 255 ? 5 : (g - 55 + 20) / 40; g = g < (95 + 1) / 2 ? 0 : g > 255 ? 5 : (g - 55 + 20) / 40;
b = b < (95 + 1) / 2 ? 0 : b > 255 ? 5 : (b - 55 + 20) / 40; b = b < (95 + 1) / 2 ? 0 : b > 255 ? 5 : (b - 55 + 20) / 40;
con.bg = table256[16 + r*36 + g*6 + b] << 4; con.bg = table256[16 + r*36 + g*6 + b] << 4;
i += 4;
break; break;
case 5: case 5:
if (con.nargs != 2) if (con.nargs < i + 3)
/* Sequence error (abort) */ /* Sequence error (abort) */
break; break;
{ {
int idx = con.args[2]; int idx = con.args[i + 2];
if (idx < 0) if (idx < 0)
idx = 0; idx = 0;
if (idx > 255) if (idx > 255)
idx = 255; idx = 255;
con.bg = table256[idx] << 4; con.bg = table256[idx] << 4;
i += 2;
} }
break; break;
} }
i += con.nargs;
break; break;
case 49: case 49:
con.bg = con.default_color & BACKGROUND_ATTR_MASK; con.bg = con.default_color & BACKGROUND_ATTR_MASK;
@ -2806,7 +2808,7 @@ fhandler_console::write (const void *vsrc, size_t len)
{ {
src++; src++;
con.nargs++; con.nargs++;
if (con.nargs >= MAXARGS) if (con.nargs > MAXARGS)
con.nargs--; con.nargs--;
} }
else if (*src == ' ') else if (*src == ' ')
@ -2819,6 +2821,9 @@ fhandler_console::write (const void *vsrc, size_t len)
con.state = gotcommand; con.state = gotcommand;
break; break;
case gotcommand: case gotcommand:
con.nargs ++;
if (con.nargs > MAXARGS)
con.nargs--;
char_command (*src++); char_command (*src++);
con.state = normal; con.state = normal;
break; break;
@ -2871,6 +2876,8 @@ fhandler_console::write (const void *vsrc, size_t len)
{ {
con.state = gotarg1; con.state = gotarg1;
con.nargs++; con.nargs++;
if (con.nargs > MAXARGS)
con.nargs--;
src++; src++;
} }
else if (isalpha (*src)) else if (isalpha (*src))