X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=6a601f81124a2a4adef0680ec8bcaff22a7de0b7;hb=aa7b5a65bed03d62285102cefd11d67804d492cf;hp=83337f86a9dc8b814d77afca9db63bc40da49897;hpb=2a4d61a8966e984eb9bea74a6c7a4a7cfd999e70;p=paraslash.git

diff --git a/gui.c b/gui.c
index 83337f86..6a601f81 100644
--- a/gui.c
+++ b/gui.c
@@ -26,8 +26,9 @@
 #include "ggo.h"
 #include "version.h"
 
-/** define the array of error lists needed by para_gui */
-INIT_GUI_ERRLISTS;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
+
 static char *stat_content[NUM_STAT_ITEMS];
 
 static struct gui_window {
@@ -146,7 +147,7 @@ struct exec_task {
 	unsigned flags[2]; /* passed to for_each_line() */
 };
 
-static int find_cmd_byname(char *name)
+static int find_cmd_byname(const char *name)
 {
 	int i;
 
@@ -935,12 +936,7 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 	switch (ret) {
 	case SIGTERM:
 		die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
-		return 1;
 	case SIGINT:
-		PARA_WARNING_LOG("caught SIGINT, reset\n");
-		/* Nothing to do. SIGINT killed our child which gets noticed
-		 * by do_select and resets everything.
-		 */
 		return 1;
 	case SIGUSR1:
 		PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n");
@@ -1165,7 +1161,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,
+	print_in_bar(COLOR_MSG, "scrolled view: %u-%u/%u\n", filled - first_rbe,
 		filled - scroll_position, ringbuffer_filled(bot_win_rb));
 }
 
@@ -1435,12 +1431,7 @@ static int setup_tasks_and_schedule(void)
 	struct status_task status_task = {.fd = -1};
 	struct input_task input_task = {.task = NULL};
 	struct signal_task *signal_task;
-	struct sched sched = {
-		.default_timeout = {
-			.tv_sec = conf.timeout_arg  / 1000,
-			.tv_usec = (conf.timeout_arg % 1000) * 1000,
-		},
-	};
+	struct sched sched = {.default_timeout = {.tv_sec = 1}};
 
 	exec_task.task = task_register(&(struct task_info) {
 		.name = "exec",
@@ -1496,9 +1487,9 @@ static int setup_tasks_and_schedule(void)
  * The exec task is responsible for printing the output of the currently
  * running executable to the bottom window.
  *
- * The signal task performs suitable actions according to any signals received.
- * For example it refreshes all windows on terminal size changes and resets the
- * terminal on \p SIGTERM.
+ * The signal task performs various actions according to signals received. For
+ * example, it reloads the configuration file on SIGUSR1, and it shuts down the
+ * curses system on SIGTERM to restore the terminal settings before exit.
  *
  * The input task reads single key strokes from stdin. For each key pressed, it
  * executes the command handler associated with this key.