X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=f5e65c8bb900b65fc299d0a30842f192450f217a;hb=73414e9b5d2fcf5b3c65558fbd715148a1a38a2b;hp=126b40fe6861b8d61ff6524debcb40ebf7c234b3;hpb=84f3cda92d0fb3d072b1a2d9bf8c2156c18d6398;p=paraslash.git diff --git a/gui.c b/gui.c index 126b40fe..f5e65c8b 100644 --- a/gui.c +++ b/gui.c @@ -60,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; @@ -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(); }