diff options
| -rw-r--r-- | pttbbs/mbbsd/bbs.c | 8 | ||||
| -rw-r--r-- | pttbbs/mbbsd/board.c | 10 | ||||
| -rw-r--r-- | pttbbs/mbbsd/pfterm.c | 14 | ||||
| -rw-r--r-- | pttbbs/mbbsd/stuff.c | 2 |
4 files changed, 23 insertions, 11 deletions
diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c index c51098fe..4cd021ab 100644 --- a/pttbbs/mbbsd/bbs.c +++ b/pttbbs/mbbsd/bbs.c @@ -754,8 +754,12 @@ readdoent(int num, fileheader_t * ent) */ prints("%7d", num); - prints(" %s%c" ESC_STR "[0;1;3%4.4s" ANSI_RESET, - typeattr, type, recom); + if (HasUserFlag(UF_MENU_LIGHTBAR)) + prints(" %s%c" ESC_STR "[0;3%4.4s" ANSI_RESET, + typeattr, type, recom); + else + prints(" %s%c" ESC_STR "[0;1;3%4.4s" ANSI_RESET, + typeattr, type, recom); if(IS_LISTING_MONEY) { diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c index aa4318bb..fe452528 100644 --- a/pttbbs/mbbsd/board.c +++ b/pttbbs/mbbsd/board.c @@ -1233,14 +1233,14 @@ brdlist_foot(void) static inline const char * make_class_color(char *name) { - /* 34 is too dark */ + /* 0;34 is too dark */ + uint32_t index = (((uint32_t)name[0] + name[1] + name[2] + name[3]) & 0x07); const char *colorset[8] = {"", ANSI_COLOR(32), ANSI_COLOR(33), ANSI_COLOR(36), ANSI_COLOR(1;34), ANSI_COLOR(1), ANSI_COLOR(1;32), ANSI_COLOR(1;33)}; const char *colorset2[8] = {"", ANSI_COLOR(32), - ANSI_COLOR(33), ANSI_COLOR(36), ANSI_COLOR(1;34), + ANSI_COLOR(33), ANSI_COLOR(36), ANSI_COLOR(35), "", ANSI_COLOR(32), ANSI_COLOR(33)}; - uint32_t index = (((uint32_t)name[0] + name[1] + name[2] + name[3]) & 0x07); return HasUserFlag(UF_MENU_LIGHTBAR) ? colorset2[index] : colorset[index]; } @@ -1289,7 +1289,9 @@ show_brdlist(int head, int clsflag, int newflag) } if (brdnum > 0) { boardstat_t *ptr; - char *unread[2] = {ANSI_COLOR(37) " " ANSI_RESET, ANSI_COLOR(1;31) "£¾" ANSI_RESET}; + char *unread[2] = {ANSI_COLOR(37) " " ANSI_RESET, ANSI_COLOR(1;31) "£¾" ANSI_RESET}; + if (HasUserFlag(UF_MENU_LIGHTBAR)) + unread[1] = ANSI_COLOR(31) "£¾" ANSI_RESET; if (IS_LISTING_FAV() && brdnum == 1 && get_fav_type(&nbrd[0]) == 0) { diff --git a/pttbbs/mbbsd/pfterm.c b/pttbbs/mbbsd/pfterm.c index 80c6198a..2eb07c6a 100644 --- a/pttbbs/mbbsd/pfterm.c +++ b/pttbbs/mbbsd/pfterm.c @@ -2240,15 +2240,21 @@ grayout(int y, int end, int level) switch (level) { case GRAYOUT_COLORBOLD: for (; y < end; y++) { - for (x = 0; x < ft.cols-1; x++) - FTAMAP[y][x] |= FTATTR_BOLD; + for (x = 0; x < ft.cols-1; x++) { + grattr = ((FTAMAP[y][x] & FTATTR_BOLD) ? FTATTR_BLINK : + FTATTR_BOLD); + FTAMAP[y][x] |= grattr; + } } return; case GRAYOUT_COLORNORM: for (; y < end; y++) { - for (x = 0; x < ft.cols-1; x++) - FTAMAP[y][x] &= ~(FTATTR_BLINK | FTATTR_BOLD); + for (x = 0; x < ft.cols-1; x++) { + grattr = (FTAMAP[y][x] & FTATTR_BLINK) ? FTATTR_BOLD : 0; + FTAMAP[y][x] = (FTAMAP[y][x] & ~(FTATTR_BLINK | + FTATTR_BOLD)) | grattr; + } } return; } diff --git a/pttbbs/mbbsd/stuff.c b/pttbbs/mbbsd/stuff.c index 209fe386..095e31e1 100644 --- a/pttbbs/mbbsd/stuff.c +++ b/pttbbs/mbbsd/stuff.c @@ -268,7 +268,7 @@ cursor_show(int row, int column) grayout(row, row + 1, GRAYOUT_COLORBOLD); move(row, column); outs(STR_CURSOR2); - move(row, column + 1); + move(row, column); } else { move(row, column); outs(STR_CURSOR); |