X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=5403b9a607d2f8780017b2ca6306019c509ebcb7;hp=0babfa83baba464cb6ef09906c93e88ebd3dd8b7;hb=a8fd00dc4494bbcaecdf2302005c05a2d104b380;hpb=a8a78f935dcefa8a7fcda8dae80bca64fe39d632 diff --git a/gui.c b/gui.c index 0babfa83..5403b9a6 100644 --- a/gui.c +++ b/gui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2006 Andre Noll + * Copyright (C) 1998-2007 Andre Noll * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,18 +20,20 @@ #include "gui.cmdline.h" #include "para.h" +#include "gui.h" #include #include "ringbuffer.h" #include "string.h" #include "fd.h" #include "error.h" +#include "signal.h" /** 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 " VERSION " (hit ? for help)" +#define STANDARD_STATUS_BAR "para_gui " PACKAGE_VERSION " (hit ? for help)" static int signal_pipe; @@ -56,12 +58,12 @@ void *bot_win_rb; static unsigned scroll_position; -static int external_cmd_died, curses_active; -static pid_t external_cmd_pid; +static int cmd_died, curses_active; +static pid_t cmd_pid; static int command_pipe = -1; static int audiod_pipe = -1; -static struct gengetopt_args_info conf; +static struct gui_args_info conf; enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE}; @@ -339,7 +341,7 @@ static void print_status_bar(void) if (!curses_active) return; wmove(sb.win, 0, 0); - align_str(sb.win,STANDARD_STATUS_BAR, sb.cols, CENTER); + align_str(sb.win, STANDARD_STATUS_BAR, sb.cols, CENTER); wrefresh(sb.win); } @@ -540,7 +542,7 @@ static void print_welcome(void) int ll = conf.loglevel_arg; if (ll > NOTICE) return; - outputf(COLOR_WELCOME, "Welcome to para_gui " VERSION + outputf(COLOR_WELCOME, "Welcome to para_gui " PACKAGE_VERSION " \"" CODENAME "\". Theme: %s", theme.name); wclrtoeol(bot.win); } @@ -735,9 +737,9 @@ reap_next_child: pid = para_reap_child(); if (pid <= 0) return; - if (pid == external_cmd_pid) { - external_cmd_pid = 0; - external_cmd_died = 1; + if (pid == cmd_pid) { + cmd_pid = 0; + cmd_died = 1; } goto reap_next_child; } @@ -867,14 +869,14 @@ static int open_audiod_pipe(void) * * EXTERNAL_MODE: Check only signal pipe. Used when an external command * is running. During that thime curses is disabled. Returns when - * external_cmd_pid == 0. + * cmd_pid == 0. */ static int do_select(int mode) { fd_set rfds; int ret; int max_fileno, cp_numread = 1; - char command_buf[STRINGSIZE] = ""; + char command_buf[4096] = ""; int cbo = 0; /* command buf offset */ struct timeval tv; repeat: @@ -886,24 +888,14 @@ repeat: /* audiod pipe */ if (audiod_pipe < 0) audiod_pipe = open_audiod_pipe(); - /* FIXME: para_fd_set */ - if (audiod_pipe >= 0) { - FD_SET(audiod_pipe, &rfds); - max_fileno = PARA_MAX(max_fileno, audiod_pipe); - } - + if (audiod_pipe >= 0) + para_fd_set(audiod_pipe, &rfds, &max_fileno); /* signal pipe */ - FD_SET(signal_pipe, &rfds); - max_fileno = PARA_MAX(max_fileno, signal_pipe); + para_fd_set(signal_pipe, &rfds, &max_fileno); /* command pipe only for COMMAND_MODE */ - if (command_pipe >= 0 && mode == COMMAND_MODE) { - FD_SET(command_pipe, &rfds); - max_fileno = PARA_MAX(max_fileno, command_pipe); - } - if (curses_active) - FD_SET(STDIN_FILENO, &rfds); + if (command_pipe >= 0 && mode == COMMAND_MODE) + para_fd_set(command_pipe, &rfds, &max_fileno); ret = para_select(max_fileno + 1, &rfds, NULL, &tv); -// PARA_DEBUG_LOG("select returned %d\n", ret); if (ret <= 0) goto check_return; /* skip fd checks */ /* signals */ @@ -916,7 +908,7 @@ repeat: if (command_pipe >= 0 && mode == COMMAND_MODE && FD_ISSET(command_pipe, &rfds)) { cp_numread = read(command_pipe, command_buf + cbo, - STRINGSIZE - 1 - cbo); + sizeof(command_buf) - 1 - cbo); if (cp_numread >= 0) cbo += cp_numread; else { @@ -946,6 +938,16 @@ check_return: if (cp_numread <= 0) cbo = 0; wrefresh(bot.win); + ret = wgetch(top.win); + if (ret != ERR && ret != KEY_RESIZE) { + if (command_pipe) { + close(command_pipe); + command_pipe = -1; + } + if (cmd_pid) + kill(cmd_pid, SIGTERM); + return -1; + } break; case GETCH_MODE: ret = wgetch(top.win); @@ -953,8 +955,8 @@ check_return: return ret; break; case EXTERNAL_MODE: - if (external_cmd_died) { - external_cmd_died = 0; + if (cmd_died) { + cmd_died = 0; return 0; } } @@ -978,17 +980,17 @@ static int send_output(void) static int client_cmd_cmdline(char *cmd) { - pid_t pid; int ret, fds[3] = {0, 1, 0}; char *c = make_message(BINDIR "/para_client %s", cmd); outputf(COLOR_COMMAND, "%s", c); - print_in_bar(COLOR_MSG, "executing client command, hit q to abort\n"); - ret = para_exec_cmdline_pid(&pid, c, fds); + print_in_bar(COLOR_MSG, "executing client command, hit any key to abort\n"); + ret = para_exec_cmdline_pid(&cmd_pid, c, fds); free(c); if (ret < 0) return -1; command_pipe = fds[1]; + mark_fd_nonblock(command_pipe); return send_output(); } @@ -997,14 +999,14 @@ static int client_cmd_cmdline(char *cmd) */ static int display_cmd(char *cmd) { - pid_t pid; int fds[3] = {0, 1, 0}; - print_in_bar(COLOR_MSG, "executing display command, hit q to abort"); + print_in_bar(COLOR_MSG, "executing display command, hit any key to abort"); outputf(COLOR_COMMAND, "%s", cmd); - if (para_exec_cmdline_pid(&pid, cmd, fds) < 0) + if (para_exec_cmdline_pid(&cmd_pid, cmd, fds) < 0) return -1; command_pipe = fds[1]; + mark_fd_nonblock(command_pipe); return send_output(); } @@ -1015,10 +1017,11 @@ static int external_cmd(char *cmd) { int fds[3] = {-1, -1, -1}; - if (external_cmd_pid) + if (cmd_pid) return -1; shutdown_curses(); - para_exec_cmdline_pid(&external_cmd_pid, cmd, fds); + para_exec_cmdline_pid(&cmd_pid, cmd, fds); + cmd_died = 0; do_select(EXTERNAL_MODE); init_curses(); return 0; @@ -1093,22 +1096,22 @@ static void com_scroll_up(void) { struct rb_entry *rbe = NULL; unsigned lines; - int i, first_rbe, scroll; + int i, first_rbe, num_scroll; /* the entry that is going to vanish */ rbe = ringbuffer_get(bot_win_rb, scroll_position); if (!rbe) goto err_out; - scroll = NUM_LINES(rbe->len); + num_scroll = NUM_LINES(rbe->len); first_rbe = first_visible_rbe(&lines); if (first_rbe < 0 || (first_rbe == ringbuffer_filled(bot_win_rb) - 1)) goto err_out; scroll_position++; - wscrl(bot.win, -scroll); + wscrl(bot.win, -num_scroll); i = draw_top_rbe(&lines); if (i < 0) goto err_out; - while (i > 0 && lines < scroll) { + while (i > 0 && lines < num_scroll) { int rbe_lines; rbe = ringbuffer_get(bot_win_rb, --i); if (!rbe) @@ -1164,9 +1167,9 @@ static void com_reread_conf(void) return; } PARA_INFO_LOG("%s", "rereading command line options and config file"); - cmdline_parser(_argc, _argv, &conf); - cmdline_parser_configfile(cf, &conf, 1, 1, 0); - PARA_NOTICE_LOG("%s", "configuration read"); + gui_cmdline_parser(_argc, _argv, &conf); + gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0); + PARA_NOTICE_LOG("%s", "config file reloaded"); if (check_key_map_args() < 0) finish(EXIT_FAILURE); } @@ -1234,7 +1237,8 @@ static void com_enlarge_top_win(void) static void com_version(void) { - print_in_bar(COLOR_MSG, "para_gui " VERSION " \"" CODENAME "\""); + print_in_bar(COLOR_MSG, "para_gui " PACKAGE_VERSION " \"" + CODENAME "\""); } static void com_quit(void) @@ -1322,10 +1326,11 @@ int main(int argc, char *argv[]) _argc = argc; _argv = argv; - if (cmdline_parser(argc, argv, &conf)) { + if (gui_cmdline_parser(argc, argv, &conf)) { fprintf(stderr, "parse error while reading command line\n"); exit(EXIT_FAILURE); } + HANDLE_VERSION_FLAG("gui", conf); init_theme(0, &theme); top.lines = theme.top_lines_default; if (check_key_map_args() < 0) { @@ -1339,7 +1344,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } if (cf) - cmdline_parser_configfile(cf, &conf, 0, 0, 0); + gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0); if (check_key_map_args() < 0) { fprintf(stderr, "invalid key map in config file\n"); exit(EXIT_FAILURE);