* backed out the previous changes since they didn't look good on some

   xterms with a blue bold mode. just set the background color to black
   instead. this makes black-on-white terminals actually readable, if not
   particularly good looking.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 2f9c5cf4e1d7fafc04f4016ca7094a70c2aed545..7081740b4ea4d1e690aade62d5a098d476c24c24 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,10 @@
  $Log$
+ Revision 570.15  2000/04/08 03:58:12  nbryant
+  * backed out the previous changes since they didn't look good on some
+    xterms with a blue bold mode. just set the background color to black
+    instead. this makes black-on-white terminals actually readable, if not
+    particularly good looking.
+
  Revision 570.14  2000/04/08 01:36:30  nbryant
   * citadel.c, commands.c: comment out cls() as this wasn't called if
     ansi_color=user anyway, and we have no way of knowing whether the user's
@@ -1826,4 +1832,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 8a2976477a03730cd72c390ac86130cd75a2a2f3..6347293599451ea6e89928312fc695b86fee98af 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -860,7 +860,7 @@ int main(int argc, char **argv)
        get_serv_info();
 
        look_for_ansi();
-       /* cls(0); */
+       cls(0);
        color(7);
 
        printf("%-22s\n%s\n%s\n", serv_info.serv_software, serv_info.serv_humannode,

diff --git a/citadel/commands.c b/citadel/commands.c
index cb9fe080f6704cbace3b5777eb9e8d4435965a10..90725565da3e553bc6f41ccc6b9b59516fbead75 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -1105,14 +1105,14 @@ void color(int colornum)
 
        current_color = colornum;
        if (enable_color) {
-               /* Don't switch to black or white explicitly as this confuses
-                * black-on-white terminals. Instead, output the "original
-                * pair" sequence.
+               /* When switching to dim white, actually output an 'original
+                * pair' sequence -- this looks better on black-on-white
+                * terminals.
                 */
-               if ((colornum & 7) == DIM_WHITE || (colornum & 7) == DIM_BLACK)
+               if (colornum == DIM_WHITE)
                        printf("\033[39;49m");
                else
-                       printf("\033[3%dm", (colornum & 7));
+                       printf("\033[3%d;40m", (colornum & 7));
 
                if ((colornum >= 8) && (is_bold == 0)) {
                        printf("\033[1m");
@@ -1125,7 +1125,6 @@ void color(int colornum)
        }
 }
 
-#if 0
 void cls(int colornum)
 {
        if (enable_color) {
@@ -1133,7 +1132,6 @@ void cls(int colornum)
                fflush(stdout);
        }
 }
-#endif
 
 
 /*