diff options
| -rw-r--r-- | README.menu | 22 | ||||
| -rw-r--r-- | com32/lib/sys/ansi.c | 2 | ||||
| -rw-r--r-- | com32/lib/sys/xserial_write.c | 2 | ||||
| -rw-r--r-- | com32/modules/menumain.c | 24 |
4 files changed, 27 insertions, 23 deletions
diff --git a/README.menu b/README.menu index 2209ba1b..5d7b0fc8 100644 --- a/README.menu +++ b/README.menu @@ -181,21 +181,21 @@ MENU COLOR element ansi foreground background The current defaults are: timeout_msg - screen 0;37;40 #80ffffff #00000000 - border 0;30;44 #40000000 #00000000 + screen 37;40 #80ffffff #00000000 + border 30;44 #40000000 #00000000 title 1;36;44 #c00090f0 #00000000 - unsel 0;37;44 #90ffffff #00000000 + unsel 37;44 #90ffffff #00000000 hotkey 1;37;44 #ffffffff #00000000 - sel 0;7;37;40 #cf101010 #20ff8000 + sel 7;37;40 #cf101010 #20ff8000 hotsel 1;7;37;40 #ff353535 #20ff8000 - scrollbar 0;30;44 #40000000 #00000000 - tabmsg 0;31;40 #90ffff00 #00000000 + scrollbar 30;44 #40000000 #00000000 + tabmsg 31;40 #90ffff00 #00000000 cmdmark 1;36;40 #c000ffff #00000000 - cmdline 0;37;40 #c0ffffff #00000000 - pwdborder 0;30;47 #80ffffff #20ffffff - pwdheader 0;31;47 #80ff8080 #20ffffff - pwdentry 0;30;47 #80ffffff #20ffffff - timeout_msg 0;37;40 #80ffffff #00000000 + cmdline 37;40 #c0ffffff #00000000 + pwdborder 30;47 #80ffffff #20ffffff + pwdheader 31;47 #80ff8080 #20ffffff + pwdentry 30;47 #80ffffff #20ffffff + timeout_msg 37;40 #80ffffff #00000000 timeout 1;37;40 #c0ffffff #00000000 diff --git a/com32/lib/sys/ansi.c b/com32/lib/sys/ansi.c index e47bf1e2..64e7f34f 100644 --- a/com32/lib/sys/ansi.c +++ b/com32/lib/sys/ansi.c @@ -408,6 +408,8 @@ void __ansi_putchar(const struct term_info *ti, uint8_t ch) p = console_color_table[st->parms[0]].ansi; st->state = st_esc; __ansi_putchar(ti, '['); + __ansi_putchar(ti, '0'); + __ansi_putchar(ti, ';'); while (*p) __ansi_putchar(ti, *p++); __ansi_putchar(ti, 'm'); diff --git a/com32/lib/sys/xserial_write.c b/com32/lib/sys/xserial_write.c index 6b3fbaf9..f119083a 100644 --- a/com32/lib/sys/xserial_write.c +++ b/com32/lib/sys/xserial_write.c @@ -98,6 +98,8 @@ ssize_t __xserial_write(struct file_info *fp, const void *buf, size_t count) if (ncolor < console_color_table_size) { emit('\033'); emit('['); + emit('0'); + emit(';'); for (p = console_color_table[ncolor].ansi; *p; p++) emit(*p); emit('m'); diff --git a/com32/modules/menumain.c b/com32/modules/menumain.c index 91ee5d4c..10da08ac 100644 --- a/com32/modules/menumain.c +++ b/com32/modules/menumain.c @@ -60,21 +60,21 @@ int (*draw_background)(const char *filename); */ static const struct color_table default_color_table[] = { - { "screen", "0;37;40", 0x80ffffff, 0x00000000 }, - { "border", "0;30;44", 0x40000000, 0x00000000 }, + { "screen", "37;40", 0x80ffffff, 0x00000000 }, + { "border", "30;44", 0x40000000, 0x00000000 }, { "title", "1;36;44", 0xc00090f0, 0x00000000 }, - { "unsel", "0;37;44", 0x90ffffff, 0x00000000 }, + { "unsel", "37;44", 0x90ffffff, 0x00000000 }, { "hotkey", "1;37;44", 0xffffffff, 0x00000000 }, - { "sel", "0;7;37;40", 0xcf101010, 0x20ff8000 }, - { "hotsel", "1;7;37;40", 0xff353535, 0x20ff8000 }, - { "scrollbar", "0;30;44", 0x40000000, 0x00000000 }, - { "tabmsg", "0;31;40", 0x90ffff00, 0x00000000 }, + { "sel", "7;37;40", 0xcf101010, 0x20ff8000 }, + { "hotsel", "7;37;40", 0xff353535, 0x20ff8000 }, + { "scrollbar", "30;44", 0x40000000, 0x00000000 }, + { "tabmsg", "31;40", 0x90ffff00, 0x00000000 }, { "cmdmark", "1;36;40", 0xc000ffff, 0x00000000 }, - { "cmdline", "0;37;40", 0xc0ffffff, 0x00000000 }, - { "pwdborder", "0;30;47", 0x80ffffff, 0x20ffffff }, - { "pwdheader", "0;31;47", 0x80ff8080, 0x20ffffff }, - { "pwdentry", "0;30;47", 0x80ffffff, 0x20ffffff }, - { "timeout_msg", "0;37;40", 0x80ffffff, 0x00000000 }, + { "cmdline", "37;40", 0xc0ffffff, 0x00000000 }, + { "pwdborder", "30;47", 0x80ffffff, 0x20ffffff }, + { "pwdheader", "31;47", 0x80ff8080, 0x20ffffff }, + { "pwdentry", "30;47", 0x80ffffff, 0x20ffffff }, + { "timeout_msg", "37;40", 0x80ffffff, 0x00000000 }, { "timeout", "1;37;40", 0xc0ffffff, 0x00000000 }, }; |