X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=63e0090f03ca3641aa9f3675f438c8c02128e0d5;hp=54fc9db98bd91ad836eb79288d42927eadcb1fcf;hb=cbb35a07b0edb1db499d07894d4c01d220def2cf;hpb=01d37b0a87f936d2d673a0c689fda6e887619d97 diff --git a/gui.c b/gui.c index 54fc9db9..63e0090f 100644 --- a/gui.c +++ b/gui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2013 Andre Noll + * Copyright (C) 1998-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -30,11 +30,9 @@ INIT_GUI_ERRLISTS; static char *stat_content[NUM_STAT_ITEMS]; -#define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)" - static int signal_pipe; -static struct win_data { +static struct gui_window { WINDOW *win; size_t begx; size_t begy; @@ -53,25 +51,33 @@ static struct ringbuffer *bot_win_rb; static unsigned scroll_position; -static int curses_active; +static bool curses_active; static pid_t cmd_pid; -static int command_fds[2]; +static int command_fds[2] = {-1, -1}; static int stat_pipe = -1; static struct gui_args_info conf; enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE}; -#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 +/** + * Codes for various colors. + * + * Each status item has its own color pair. The ones defined here start at a + * higher number so that they do not overlap with these. + */ +enum gui_color_pair { + COLOR_STATUSBAR = NUM_STAT_ITEMS + 1, + COLOR_COMMAND, + COLOR_OUTPUT, + COLOR_MSG, + COLOR_ERRMSG, + COLOR_WELCOME, + COLOR_SEPARATOR, + COLOR_TOP, + COLOR_BOT, +}; struct gui_command { const char *key; @@ -80,18 +86,6 @@ struct gui_command { void (*handler)(void); }; -struct stat_item { - char name[MAXLINE]; - char prefix[MAXLINE]; - char postfix[MAXLINE]; - unsigned y; - unsigned x; - unsigned len; - int fg, bg; - int align; - char content[MAXLINE]; -}; - static struct gui_theme theme; static int _argc; @@ -361,30 +355,24 @@ __printf_2_3 static void print_in_bar(int color, const char *fmt,...) xvasprintf(&msg, fmt, ap); va_end(ap); wmove(in.win, 0, 0); - align_str(in.win, msg, sb.cols, LEFT); + align_str(in.win, msg, in.cols, LEFT); free(msg); wrefresh(in.win); } -/* - * update the status bar - */ static void print_status_bar(void) { char *tmp; - if (!curses_active) - return; - tmp = para_strdup(STANDARD_STATUS_BAR); + tmp = para_strdup("para_gui " PACKAGE_VERSION " (hit ? for help)"); wmove(sb.win, 0, 0); align_str(sb.win, tmp, sb.cols, CENTER); free(tmp); - wrefresh(sb.win); } /* * get the number of the oldest rbe that is (partially) visible. On return, - * lines contains the sum of the number of lines of all visable entries. If the + * lines contains the sum of the number of lines of all visible entries. If the * first one is only partially visible, lines is greater than bot.lines. */ static int first_visible_rbe(unsigned *lines) @@ -518,6 +506,7 @@ __printf_2_3 static void outputf(int color, const char* fmt,...) static int add_output_line(char *line, void *data) { int color = *(int *)data? COLOR_ERRMSG : COLOR_OUTPUT; + if (!curses_active) return 1; rb_add_entry(color, para_strdup(line)); @@ -560,7 +549,6 @@ static void setup_signal_handling(void) para_install_sighandler(SIGCHLD); para_install_sighandler(SIGWINCH); para_install_sighandler(SIGUSR1); - para_sigaction(SIGHUP, SIG_IGN); } /* kill every process in the process group and exit */ @@ -576,7 +564,7 @@ static void shutdown_curses(void) if (!curses_active) return; def_prog_mode(); - curses_active = 0; + curses_active = false; endwin(); } @@ -683,7 +671,6 @@ static void init_wins(int top_lines) keypad(bot.win, 1); keypad(sb.win, 1); keypad(in.win, 1); - print_status_bar(); } wmove(sep.win, 0, 0); for (i = 1; i <= COLS; i++) @@ -692,8 +679,8 @@ static void init_wins(int top_lines) //wclear(bot.win); wnoutrefresh(top.win); wnoutrefresh(bot.win); - //wnoutrefresh(sb.win); print_status_bar(); + wnoutrefresh(sb.win); wnoutrefresh(in.win); wnoutrefresh(sep.win); doupdate(); @@ -835,8 +822,8 @@ static void init_colors_or_die(void) /* (Re-)initialize the curses library. */ static void init_curses(void) { - curses_active = 1; - if (top.win && refresh() == ERR) /* refesh is really needed */ + curses_active = true; + if (top.win && refresh() == ERR) /* refresh is really needed */ msg_n_exit(EXIT_FAILURE, "refresh() failed\n"); if (LINES < theme.lines_min || COLS < theme.cols_min) msg_n_exit(EXIT_FAILURE, "Error: Terminal (%dx%d) too small" @@ -861,6 +848,7 @@ static void check_sigchld(void) { int ret; pid_t pid; + reap_next_child: ret = para_reap_child(&pid); if (ret <= 0) @@ -898,25 +886,25 @@ static int check_key_map_args(void) for (i = 0; i < conf.key_map_given; ++i) { s = conf.key_map_arg[i]; if (!(*s)) - goto err_out; + goto out; free(tmp); tmp = para_strdup(s); if (!split_key_map(tmp, &handler, &arg)) - goto err_out; + goto out; if (strlen(handler) != 1) - goto err_out; + goto out; if (*handler != 'x' && *handler != 'd' && *handler != 'i' && *handler != 'p') - goto err_out; + goto out; if (*handler != 'i') continue; if (find_cmd_byname(arg) < 0) - goto err_out; + goto out; } ret = 0; -err_out: +out: free(tmp); return ret; } @@ -939,13 +927,13 @@ static void handle_signal(int sig) } return; case SIGINT: - PARA_WARNING_LOG("caught SIGINT, reset"); + PARA_WARNING_LOG("caught SIGINT, reset\n"); /* Nothing to do. SIGINT killed our child which gets noticed * by do_select and resets everything. */ return; case SIGUSR1: - PARA_NOTICE_LOG("got SIGUSR1, rereading configuration"); + PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n"); com_reread_conf(); return; case SIGCHLD: @@ -1050,16 +1038,17 @@ repeat: flags[i] = 0; } if (ret < 0) { - PARA_NOTICE_LOG("closing command fd %d: %s", + PARA_NOTICE_LOG("closing command fd %d: %s\n", i, para_strerror(-ret)); close(command_fds[i]); command_fds[i] = -1; flags[i] = 0; + cbo[i] = 0; if (command_fds[!i] < 0) /* both fds closed */ return 0; } if (cbo[i] == COMMAND_BUF_SIZE - 1) { - PARA_NOTICE_LOG("discarding overlong line"); + PARA_NOTICE_LOG("discarding overlong line\n"); cbo[i] = 0; flags[i] = FELF_DISCARD_FIRST; } @@ -1081,14 +1070,6 @@ check_return: case COMMAND_MODE: ret = wgetch(top.win); if (ret != ERR && ret != KEY_RESIZE) { - if (command_fds[0] >= 0) { - close(command_fds[0]); - command_fds[0] = -1; - } - if (command_fds[1] >= 0) { - close(command_fds[1]); - command_fds[1] = -1; - } if (cmd_pid) kill(cmd_pid, SIGTERM); return -1; @@ -1106,23 +1087,27 @@ check_return: goto repeat; } -/* - * read from command pipe and print data to bot window - */ -static void send_output(void) +/* read from command pipe and print data to bot window */ +static void exec_and_display_cmd(const char *cmd) { - int ret; + int ret, fds[3] = {0, 1, 1}; - ret = mark_fd_nonblocking(command_fds[0]); + outputf(COLOR_COMMAND, "%s", cmd); + ret = para_exec_cmdline_pid(&cmd_pid, cmd, fds); + if (ret < 0) + return; + ret = mark_fd_nonblocking(fds[1]); if (ret < 0) goto fail; - ret = mark_fd_nonblocking(command_fds[1]); + ret = mark_fd_nonblocking(fds[2]); if (ret < 0) goto fail; + command_fds[0] = fds[1]; + command_fds[1] = fds[2]; if (do_select(COMMAND_MODE) >= 0) - PARA_INFO_LOG("command complete"); + PARA_INFO_LOG("command complete\n"); else - PARA_NOTICE_LOG("command aborted"); + PARA_NOTICE_LOG("command aborted\n"); print_in_bar(COLOR_MSG, " "); return; fail: @@ -1133,34 +1118,18 @@ fail: static void para_cmd(char *cmd) { - int ret, fds[3] = {0, 1, 1}; - char *c = make_message(BINDIR "/para_client -- %s", cmd); + char *c; - outputf(COLOR_COMMAND, "%s", c); print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n"); - ret = para_exec_cmdline_pid(&cmd_pid, c, fds); + c = make_message(BINDIR "/para_client -- %s", cmd); + exec_and_display_cmd(c); free(c); - if (ret < 0) - return; - command_fds[0] = fds[1]; - command_fds[1] = fds[2]; - send_output(); } -/* - * exec command and print output to bot win - */ static void display_cmd(char *cmd) { - int fds[3] = {0, 1, 1}; - print_in_bar(COLOR_MSG, "executing display command, hit any key to abort"); - outputf(COLOR_COMMAND, "%s", cmd); - if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0) - return; - command_fds[0] = fds[1]; - command_fds[1] = fds[2]; - send_output(); + exec_and_display_cmd(cmd); } /* @@ -1183,6 +1152,7 @@ static void print_scroll_msg(void) { unsigned lines_total, filled = ringbuffer_filled(bot_win_rb); int first_rbe = first_visible_rbe(&lines_total); + print_in_bar(COLOR_MSG, "scrolled view: %d-%d/%d\n", filled - first_rbe, filled - scroll_position, ringbuffer_filled(bot_win_rb)); } @@ -1226,6 +1196,7 @@ static void com_page_down(void) { unsigned lines = 0; int i = scroll_position; + while (lines < bot.lines && --i > 0) { struct rb_entry *rbe = ringbuffer_get(bot_win_rb, i); if (!rbe) @@ -1348,7 +1319,7 @@ static void com_ll_incr(void) */ static void com_reread_conf(void) { - char *cf =configfile_exists(); + char *cf = configfile_exists(); struct gui_cmdline_parser_params params = { .override = 1, .initialize = 1, @@ -1358,13 +1329,19 @@ static void com_reread_conf(void) }; if (!cf) { - PARA_WARNING_LOG("there is no configuration to read"); + PARA_WARNING_LOG("there is no configuration to read\n"); return; } - PARA_INFO_LOG("rereading command line options and config file"); + PARA_INFO_LOG("rereading command line options and config file\n"); gui_cmdline_parser_ext(_argc, _argv, &conf, ¶ms); + /* + * Despite .print_errors is set to 0, gengetopt will print to stderr + * anyway, and exit on errors. So we have to shutdown curses first. + */ + shutdown_curses(); gui_cmdline_parser_config_file(cf, &conf, ¶ms); - PARA_NOTICE_LOG("config file reloaded"); + init_curses(); + PARA_NOTICE_LOG("config file reloaded\n"); if (check_key_map_args() < 0) finish(EXIT_FAILURE); } @@ -1409,7 +1386,7 @@ static void com_help(void) static void com_shrink_top_win(void) { if (top.lines <= theme.top_lines_min) { - PARA_WARNING_LOG("can not decrease top window"); + PARA_WARNING_LOG("can not decrease top window\n"); return; } init_wins(top.lines - 1); @@ -1421,7 +1398,7 @@ static void com_shrink_top_win(void) static void com_enlarge_top_win(void) { if (bot.lines < 3) { - PARA_WARNING_LOG("can not increase top window"); + PARA_WARNING_LOG("can not increase top window\n"); return; } init_wins(top.lines + 1); @@ -1455,7 +1432,7 @@ static void change_theme(int next) /* This seems to be needed twice, why? */ com_refresh(); com_refresh(); - PARA_NOTICE_LOG("new theme: %s", theme.name); + PARA_NOTICE_LOG("new theme: %s\n", theme.name); } static void com_next_theme(void) @@ -1473,7 +1450,7 @@ static void handle_command(int c) { int i; - /* first check user's key bindings */ + /* first check user-defined key bindings */ for (i = 0; i < conf.key_map_given; ++i) { char *tmp, *handler, *arg; @@ -1555,7 +1532,6 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } init_theme_or_die(conf.theme_arg, &theme); - top.lines = theme.top_lines_default; setup_signal_handling(); bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE); setlocale(LC_CTYPE, "");