Index: src/ccat.c =================================================================== RCS file: /mnt/scsi/cvsroot/bbs100/src/ccat.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- src/ccat.c 16 Mar 2002 22:33:13 -0000 1.1.1.1 +++ src/ccat.c 28 Mar 2002 03:26:23 -0000 1.1.1.1.2.1 @@ -50,6 +50,7 @@ #define CYAN 6 #define WHITE 7 #define HOTKEY 8 +#define TEXT 2 typedef struct { char *name; @@ -67,7 +68,8 @@ { "Magenta", 35, '\015' }, { "Cyan", 36, '\003' }, { "White", 37, '\027' }, - { "Hotkeys", 33, '\013' } + { "Hotkeys", 33, '\013' }, + { "Text", 32, '\007' } }; int usr_color = 37; Index: src/state_config.c =================================================================== RCS file: /mnt/scsi/cvsroot/bbs100/src/state_config.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- src/state_config.c 16 Mar 2002 22:33:13 -0000 1.1.1.1 +++ src/state_config.c 28 Mar 2002 03:26:23 -0000 1.1.1.1.2.1 @@ -684,8 +684,8 @@ "\013Yellow \027[%c%-7s\027]\015 Bl\013ue \027[%c%-7s\027]\015\n" "\013Red \027[%c%-7s\027]\015 \013Magenta \027[%c%-7s\027]\015\n" "\013Green \027[%c%-7s\027]\015 H\013otkey \027[%c%-7s\027]\015\n" - "\n" - "\015Bac\013kground \027[%c%-7s\027]\015 Reset all colors to \013default\n", + "\015Bac\013kground \027[%c%-7s\027]\015 Te\013xt \027[%c%-7s\027]\015\n" + "Reset all colors to \013default\n", color_table[usr->colors[WHITE]].key, color_table[usr->colors[WHITE]].name, color_table[usr->colors[CYAN]].key, color_table[usr->colors[CYAN]].name, color_table[usr->colors[YELLOW]].key, color_table[usr->colors[YELLOW]].name, @@ -694,7 +694,8 @@ color_table[usr->colors[MAGENTA]].key, color_table[usr->colors[MAGENTA]].name, color_table[usr->colors[GREEN]].key, color_table[usr->colors[GREEN]].name, color_table[usr->colors[HOTKEY]].key, color_table[usr->colors[HOTKEY]].name, - color_table[usr->colors[BACKGROUND]].key, color_table[usr->colors[BACKGROUND]].name + color_table[usr->colors[BACKGROUND]].key, color_table[usr->colors[BACKGROUND]].name, + color_table[usr->colors[TEXT]].key, color_table[usr->colors[TEXT]].name ); break; @@ -845,6 +846,16 @@ } break; + case 'x': + case 'X': + if (usr->flags & USR_ANSI) { + usr->read_lines = TEXT; + Print(usr, "Customize text\n", color_table[usr->read_lines].name); + CALL(usr, STATE_CUSTOM_COLORS); + Return; + } + break; + case 'd': case 'D': if (usr->flags & USR_ANSI) { @@ -948,6 +959,14 @@ RET(usr); Return; + case 'x': + case 'X': + Put(usr, "\007Text\n\n"); + usr->colors[usr->read_lines] = TEXT; + usr->runtime_flags |= RTF_CONFIG_EDITED; + RET(usr); + Return; + case 'd': case 'D': Put(usr, "\027Default\n\n"); @@ -959,7 +978,7 @@ RET(usr); Return; } - if (c == BACKGROUND) + if (c == 'k' || c == 'K') Put(usr, "\n\003Change the background color to\027: "); else Print(usr, "\n\003Change the color for %c%s\003 to\027: ", Index: src/util.c =================================================================== RCS file: /mnt/scsi/cvsroot/bbs100/src/util.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.3 diff -u -r1.1.1.1 -r1.1.1.1.2.3 --- src/util.c 16 Mar 2002 22:33:13 -0000 1.1.1.1 +++ src/util.c 28 Mar 2002 03:26:23 -0000 1.1.1.1.2.3 @@ -40,6 +40,7 @@ #include #include #include +#include #define HACK_CHANCE ((rand() % 20) < 4) @@ -245,6 +246,7 @@ usr->colors[CYAN] = CYAN; usr->colors[WHITE] = WHITE; usr->colors[HOTKEY] = YELLOW; + usr->colors[TEXT] = GREEN; } int color_strlen(char *str) { @@ -254,7 +256,7 @@ return 0; while(*str) { - if (*str >= ' ' && *str <= '~') + if (isprint(*str)) len++; str++; } Index: src/include/User.h =================================================================== RCS file: /mnt/scsi/cvsroot/bbs100/src/include/User.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- src/include/User.h 16 Mar 2002 22:33:13 -0000 1.1.1.1 +++ src/include/User.h 28 Mar 2002 03:26:29 -0000 1.1.1.1.2.1 @@ -143,7 +143,7 @@ unsigned long logins, total_time; unsigned long xsent, xrecv, esent, erecv, fsent, frecv, posted, read; unsigned int flags, runtime_flags; - int colors[9], color, time_disp; + int colors[10], color, time_disp; char *quick[10]; Index: src/include/util.h =================================================================== RCS file: /mnt/scsi/cvsroot/bbs100/src/include/util.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- src/include/util.h 16 Mar 2002 22:33:13 -0000 1.1.1.1 +++ src/include/util.h 28 Mar 2002 03:26:29 -0000 1.1.1.1.2.1 @@ -67,6 +67,7 @@ #define CYAN 6 #define WHITE 7 #define HOTKEY 8 +#define TEXT 2 typedef struct { char *name;