gui.c: Increase numbers of color pairs not related to themes.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index e60e6f54e39daf44a3fec62653d995107d9cf7ba..f5e65c8bb900b65fc299d0a30842f192450f217a 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -23,7 +23,6 @@
 
 /** define the array of error lists needed by para_gui */
 INIT_GUI_ERRLISTS;
-extern const char *status_item_list[NUM_STAT_ITEMS];
 static char *stat_content[NUM_STAT_ITEMS];
 
 #define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)"
@@ -61,15 +60,15 @@ static struct gui_args_info conf;
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
 
-#define COLOR_STATUSBAR 32
-#define COLOR_COMMAND 33
-#define COLOR_OUTPUT 34
-#define COLOR_MSG 35
-#define COLOR_ERRMSG 36
-#define COLOR_WELCOME 37
-#define COLOR_SEPARATOR 38
-#define COLOR_TOP 39
-#define COLOR_BOT 40
+#define COLOR_STATUSBAR 52
+#define COLOR_COMMAND 53
+#define COLOR_OUTPUT 54
+#define COLOR_MSG 55
+#define COLOR_ERRMSG 56
+#define COLOR_WELCOME 57
+#define COLOR_SEPARATOR 58
+#define COLOR_TOP 59
+#define COLOR_BOT 60
 
 struct gui_command {
        const char *key;
@@ -665,14 +664,15 @@ static void print_all_items(void)
 
        if (!curses_active)
                return;
-       for (i = 0; i < NUM_STAT_ITEMS; i++)
+       FOR_EACH_STATUS_ITEM(i)
                print_stat_item(i);
 }
+
 static void clear_all_items(void)
 {
        int i;
 
-       for (i = 0; i < NUM_STAT_ITEMS; i++) {
+       FOR_EACH_STATUS_ITEM(i) {
                free(stat_content[i]);
                stat_content[i] = para_strdup("");
        }
@@ -684,7 +684,7 @@ static void init_colors(void)
        if (!has_colors())
                msg_n_exit(EXIT_FAILURE, "Error: No color term\n");
        start_color();
-       for (i = 0; i < NUM_STAT_ITEMS; i++)
+       FOR_EACH_STATUS_ITEM(i)
                if (theme.data[i].len)
                        init_pair(i + 1, theme.data[i].fg, theme.data[i].bg);
        init_pair(COLOR_STATUSBAR, theme.sb_fg, theme.sb_bg);
@@ -986,7 +986,7 @@ static int client_cmd_cmdline(char *cmd)
        if (ret < 0)
                return -1;
        command_pipe = fds[1];
-       mark_fd_nonblock(command_pipe);
+       mark_fd_nonblocking(command_pipe);
        return send_output();
 }
 
@@ -1002,7 +1002,7 @@ static int display_cmd(char *cmd)
        if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0)
                return -1;
        command_pipe = fds[1];
-       mark_fd_nonblock(command_pipe);
+       mark_fd_nonblocking(command_pipe);
        return send_output();
 }