Move colour macro defines into headers, fix WIN_FAT centering.

src/uifc/ciowrap.h

@@ -16,6 +16,25 @@
 #endif
 #endif
 
+enum {
+	 BLACK
+	,BLUE	
+	,GREEN	
+	,CYAN
+	,RED
+	,MAGENTA
+	,BROWN	
+	,LIGHTGRAY	
+	,DARKGRAY
+	,LIGHTBLUE	
+	,LIGHTGREEN	
+	,LIGHTCYAN
+	,LIGHTRED
+	,LIGHTMAGENTA
+	,YELLOW
+	,WHITE
+};
+
 enum
 {
 	_NOCURSOR,

src/uifc/curs_fix.h

 /* $Id$ */
 
-#include <curses.h>
+#include <ncurses.h>
 
 #ifndef	ACS_SBSD
 #define ACS_SBSD	ACS_SBSS

src/uifc/uifc32.c

@@ -61,27 +61,6 @@
 #define BL_GET      (1<<2)  /* Get key */
 #define BL_PUT      (1<<3)  /* Put key */
 
-#ifdef __unix__
-enum {
-	 BLACK
-	,BLUE	
-	,GREEN	
-	,CYAN
-	,RED
-	,MAGENTA
-	,BROWN	
-	,LIGHTGRAY	
-	,DARKGRAY
-	,LIGHTBLUE	
-	,LIGHTGREEN	
-	,LIGHTCYAN
-	,LIGHTRED
-	,LIGHTMAGENTA
-	,YELLOW
-	,WHITE
-};
-#endif
-
 #define BLINK	128
 
 static char  hclr,lclr,bclr,cclr,lbclr;
@@ -391,7 +370,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
 
 	if(mode&WIN_FAT) {
 		s_top=1;
-		s_left=0;
+		s_left=2;
 		s_right=api->scrn_width-3;  /* Leave space for the shadow */
 		s_bottom=api->scrn_len-1;   /* Leave one for the shadow */
 	}