[Pinfo-devel] r82 - pinfo/branches/cxx/src

[Nathanael Nerode]

Author: neroden-guest
Date: 2005-08-30 08:56:11 +0000 (Tue, 30 Aug 2005)
New Revision: 82

Modified:
   pinfo/branches/cxx/src/colors.cxx
   pinfo/branches/cxx/src/colors.h
   pinfo/branches/cxx/src/parse_config.cxx
Log:
Eliminate a use of 'extern' in a CXX file, and move a struct to
a more appropriate CXX file.



Modified: pinfo/branches/cxx/src/colors.cxx
===================================================================
--- pinfo/branches/cxx/src/colors.cxx	2005-08-30 08:52:32 UTC (rev 81)
+++ pinfo/branches/cxx/src/colors.cxx	2005-08-30 08:56:11 UTC (rev 82)
@@ -24,7 +24,22 @@
 RCSID("$Id$")
 
 #ifndef NO_COLOR_CURSES
-extern struct colours cols;
+struct colours cols =
+{
+	COLOR_WHITE,	COLOR_BLACK,	NO_BOLD,	NO_BLINK,	/* normal */
+	COLOR_GREEN,	COLOR_WHITE,	BOLD,		NO_BLINK,	/* selected menu */
+	COLOR_GREEN,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* menu */
+	COLOR_BLUE,		COLOR_WHITE,	BOLD,		NO_BLINK,	/* selected note */
+	COLOR_BLUE,		COLOR_BLACK,	BOLD,		NO_BLINK,	/* note */
+	COLOR_GREEN,	COLOR_BLUE,		BOLD,		NO_BLINK,	/* top line */
+	COLOR_GREEN,	COLOR_BLUE,		BOLD,		NO_BLINK,	/* bottom line */
+	COLOR_YELLOW,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* manual bold */
+	COLOR_WHITE,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* manual italic */
+	COLOR_MAGENTA,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* url */
+	COLOR_MAGENTA,	COLOR_GREEN,	NO_BOLD,	NO_BLINK,	/* url selected */
+	COLOR_WHITE,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* info highlight(quoted text) */
+	COLOR_YELLOW,	COLOR_BLACK,	BOLD,		NO_BLINK	/* search highlight */
+};
 #endif /* NO_COLOR_CURSES */
 
 int normal;

Modified: pinfo/branches/cxx/src/colors.h
===================================================================
--- pinfo/branches/cxx/src/colors.h	2005-08-30 08:52:32 UTC (rev 81)
+++ pinfo/branches/cxx/src/colors.h	2005-08-30 08:56:11 UTC (rev 82)
@@ -54,6 +54,10 @@
 extern int infohighlight;
 extern int searchhighlight;
 
+#ifndef NO_COLOR_CURSES
+extern struct colours cols;
+#endif
+
 /*
  * initialize color values/attributes/etc.  Either for color and monochrome
  * mode.

Modified: pinfo/branches/cxx/src/parse_config.cxx
===================================================================
--- pinfo/branches/cxx/src/parse_config.cxx	2005-08-30 08:52:32 UTC (rev 81)
+++ pinfo/branches/cxx/src/parse_config.cxx	2005-08-30 08:56:11 UTC (rev 82)
@@ -21,6 +21,7 @@
 
 #include "common_includes.h"
 #include "datatypes.h"
+#include "colors.h"
 #include <string>
 using std::string;
 
@@ -70,25 +71,6 @@
 	'6',		0			/* scroll right */
 };
 
-#ifndef NO_COLOR_CURSES
-struct colours cols =
-{
-	COLOR_WHITE,	COLOR_BLACK,	NO_BOLD,	NO_BLINK,	/* normal */
-	COLOR_GREEN,	COLOR_WHITE,	BOLD,		NO_BLINK,	/* selected menu */
-	COLOR_GREEN,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* menu */
-	COLOR_BLUE,		COLOR_WHITE,	BOLD,		NO_BLINK,	/* selected note */
-	COLOR_BLUE,		COLOR_BLACK,	BOLD,		NO_BLINK,	/* note */
-	COLOR_GREEN,	COLOR_BLUE,		BOLD,		NO_BLINK,	/* top line */
-	COLOR_GREEN,	COLOR_BLUE,		BOLD,		NO_BLINK,	/* bottom line */
-	COLOR_YELLOW,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* manual bold */
-	COLOR_WHITE,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* manual italic */
-	COLOR_MAGENTA,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* url */
-	COLOR_MAGENTA,	COLOR_GREEN,	NO_BOLD,	NO_BLINK,	/* url selected */
-	COLOR_WHITE,	COLOR_BLACK,	BOLD,		NO_BLINK,	/* info highlight(quoted text) */
-	COLOR_YELLOW,	COLOR_BLACK,	BOLD,		NO_BLINK	/* search highlight */
-};
-#endif /* NO_COLOR_CURSES */
-
 /* Forward declarations */
 string remove_quotes(const string);