* Fixed color support, now works when rc_ansi_color is on or auto

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 611e6eda6c959b1272673870deb8fc2270e757a2..9a52292773095c7e2b4db1455ddd59797520f0b3 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.76  2002/01/19 16:56:31  error
+ * Fixed color support, now works when rc_ansi_color is on or auto
+
  Revision 590.75  2002/01/19 15:10:25  error
  * Cosmetics for the client status line
 
@@ -3200,3 +3203,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/screen.c b/citadel/screen.c
index 153c14403af8e2c95b9a36646ea341c44cc6c941..3ef86483776078eac09607f91d3447735290e7ba 100644 (file)
--- a/citadel/screen.c
+++ b/citadel/screen.c
@@ -33,6 +33,7 @@ char arg_screen;
 
 extern int screenheight;
 extern int screenwidth;
+extern int rc_ansi_color;
 extern void check_screen_dims(void);
 #endif
 
@@ -81,18 +82,10 @@ void screen_new(void)
                nonl();
                intrflush(stdscr, FALSE);
                keypad(stdscr, TRUE);
-       } else
-#endif /* HAVE_CURSES_H */
-       {
-               send_ansi_detect();
-               look_for_ansi();
-               cls(0);
-               color(1+DIM_WHITE);
-       }
-#ifdef HAVE_CURSES_H
-       if (myscreen) {
                /* Setup all our colors */
                start_color();
+               if (rc_ansi_color)
+                       enable_color = 1;
                init_pair(1+DIM_BLACK, COLOR_BLACK, COLOR_BLACK);
                init_pair(1+DIM_RED, COLOR_RED, COLOR_BLACK);
                init_pair(1+DIM_GREEN, COLOR_GREEN, COLOR_BLACK);
@@ -102,8 +95,14 @@ void screen_new(void)
                init_pair(1+DIM_CYAN, COLOR_CYAN, COLOR_BLACK);
                init_pair(1+DIM_WHITE, COLOR_WHITE, COLOR_BLACK);
                init_pair(17, COLOR_WHITE, COLOR_BLUE);
-       }
+       } else
 #endif /* HAVE_CURSES_H */
+       {
+               send_ansi_detect();
+               look_for_ansi();
+               cls(0);
+               color(1+DIM_WHITE);
+       }
        screen_set();
        windows_new();
 }