X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=72908f23e46d0762ab4442975070dc5bd46c7269;hp=0c8aceaefdf3924b3418bf0d3c6b18814de8806b;hb=HEAD;hpb=90023251721ca8540523f30499ddc5adbe39c19e

diff --git a/gui.c b/gui.c
index 0c8aceae..66fb7870 100644
--- a/gui.c
+++ b/gui.c
@@ -192,7 +192,7 @@ static bool curses_active(void)
 }
 
 /* taken from mutt */
-static char *km_keyname(int c)
+static const char *km_keyname(int c)
 {
 	static char buf[10];
 
@@ -431,7 +431,7 @@ static void rb_add_entry(int color, char *msg)
 
 	if (strwidth(msg, &len) < 0)
 		return;
-	new = para_malloc(sizeof(struct rb_entry));
+	new = alloc(sizeof(struct rb_entry));
 	new->color = color;
 	new->len = len;
 	new->msg = msg;
@@ -609,19 +609,19 @@ static void clear_all_items(void)
 	}
 }
 
-static void status_pre_select(struct sched *s, void *context)
+static void status_pre_monitor(struct sched *s, void *context)
 {
 	struct status_task *st = context;
 
 	if (st->fd >= 0)
-		para_fd_set(st->fd, &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(st->fd, s);
 	if (task_get_notification(st->task) < 0)
 		return sched_min_delay(s);
 	if (st->fd < 0)
 		sched_request_barrier_or_min_delay(&st->next_exec, s);
 }
 
-static int status_post_select(struct sched *s, void *context)
+static int status_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct status_task *st = context;
 	size_t sz;
@@ -667,7 +667,7 @@ static int status_post_select(struct sched *s, void *context)
 	}
 	assert(st->loaded < st->bufsize);
 	ret = read_nonblock(st->fd, st->buf + st->loaded,
-		st->bufsize - st->loaded, &s->rfds, &sz);
+		st->bufsize - st->loaded, &sz);
 	st->loaded += sz;
 	ret2 = for_each_stat_item(st->buf, st->loaded, update_item);
 	if (ret < 0 || ret2 < 0) {
@@ -892,15 +892,23 @@ static void reread_conf(void)
 }
 
 /* React to various signal-related events. */
-static int signal_post_select(struct sched *s, __a_unused void *context)
+static int signal_post_monitor(struct sched *s, __a_unused void *context)
 {
-	int ret = para_next_signal(&s->rfds);
+	int ret = para_next_signal();
 
 	if (ret <= 0)
 		return 0;
 	switch (ret) {
 	case SIGTERM:
 		die(EXIT_FAILURE, "only the good die young (caught SIGTERM)\n");
+	case SIGWINCH:
+		PARA_NOTICE_LOG("got SIGWINCH\n");
+		if (curses_active()) {
+			shutdown_curses();
+			init_curses();
+			redraw_bot_win();
+		}
+		return 1;
 	case SIGINT:
 		return 1;
 	case SIGUSR1:
@@ -923,18 +931,18 @@ static enum exec_status exec_status(void)
 	return EXEC_IDLE;
 }
 
-static void exec_pre_select(struct sched *s, void *context)
+static void exec_pre_monitor(struct sched *s, void *context)
 {
 	struct exec_task *et = context;
 	if (exec_fds[0] >= 0)
-		para_fd_set(exec_fds[0], &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(exec_fds[0], s);
 	if (exec_fds[1] >= 0)
-		para_fd_set(exec_fds[1], &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(exec_fds[1], s);
 	if (task_get_notification(et->task) < 0)
 		sched_min_delay(s);
 }
 
-static int exec_post_select(struct sched *s, void *context)
+static int exec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct exec_task *ct = context;
 	int i, ret;
@@ -955,7 +963,7 @@ static int exec_post_select(struct sched *s, void *context)
 			continue;
 		ret = read_nonblock(exec_fds[i],
 			ct->command_buf[i] + ct->cbo[i],
-			COMMAND_BUF_SIZE - 1 - ct->cbo[i], &s->rfds, &sz);
+			COMMAND_BUF_SIZE - 1 - ct->cbo[i], &sz);
 		ct->cbo[i] += sz;
 		sz = ct->cbo[i];
 		ct->cbo[i] = for_each_line(ct->flags[i], ct->command_buf[i],
@@ -984,10 +992,10 @@ static int exec_post_select(struct sched *s, void *context)
 	return 0;
 }
 
-static void input_pre_select(struct sched *s, __a_unused void *context)
+static void input_pre_monitor(struct sched *s, __a_unused void *context)
 {
 	if (exec_status() != EXEC_XCMD)
-		para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(STDIN_FILENO, s);
 	if (window_update_needed())
 		sched_min_delay(s);
 }
@@ -1041,6 +1049,7 @@ static void handle_command(int c)
 {
 	int i;
 	const struct lls_opt_result *lor = OPT_RESULT(KEY_MAP);
+	const char *keyname = km_keyname(c);
 
 	/* first check user-defined key bindings */
 	FOR_EACH_KEY_MAP(i) {
@@ -1051,7 +1060,7 @@ static void handle_command(int c)
 			free(tmp);
 			return;
 		}
-		if (strcmp(tmp, km_keyname(c))) {
+		if (strcmp(tmp, keyname)) {
 			free(tmp);
 			continue;
 		}
@@ -1071,16 +1080,16 @@ static void handle_command(int c)
 	}
 	/* not found, check internal key bindings */
 	for (i = 0; command_list[i].handler; i++) {
-		if (!strcmp(km_keyname(c), command_list[i].key)) {
+		if (!strcmp(keyname, command_list[i].key)) {
 			command_list[i].handler();
 			return;
 		}
 	}
 	print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help",
-		km_keyname(c));
+		keyname);
 }
 
-static int input_post_select(__a_unused struct sched *s,
+static int input_post_monitor(__a_unused struct sched *s,
 		__a_unused void *context)
 {
 	int ret;
@@ -1106,14 +1115,8 @@ static int input_post_select(__a_unused struct sched *s,
 	ret = wgetch(top.win);
 	if (ret == ERR)
 		return 0;
-	if (ret == KEY_RESIZE) {
-		if (curses_active()) {
-			shutdown_curses();
-			init_curses();
-			redraw_bot_win();
-		}
+	if (ret == KEY_RESIZE) /* already handled in signal_post_monitor() */
 		return 0;
-	}
 	if (exs == EXEC_IDLE)
 		handle_command(ret);
 	else if (exec_pid > 0)
@@ -1163,6 +1166,7 @@ static void com_cancel_scroll(void)
 	}
 	scroll_position = 0;
 	redraw_bot_win();
+	print_in_bar(COLOR_MSG, " ");
 }
 
 static void com_page_down(void)
@@ -1264,6 +1268,12 @@ err_out:
 	print_in_bar(COLOR_ERRMSG, "top of buffer is shown\n");
 }
 
+static void print_ll_msg(void)
+{
+	const char *sev[] = {SEVERITIES};
+	print_in_bar(COLOR_MSG, "new loglevel: %s\n", sev[loglevel]);
+}
+
 static void com_ll_decr(void)
 {
 	if (loglevel <= LL_DEBUG) {
@@ -1272,7 +1282,7 @@ static void com_ll_decr(void)
 		return;
 	}
 	loglevel--;
-	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
+	print_ll_msg();
 }
 
 static void com_ll_incr(void)
@@ -1283,7 +1293,7 @@ static void com_ll_incr(void)
 		return;
 	}
 	loglevel++;
-	print_in_bar(COLOR_MSG, "loglevel set to %d\n", loglevel);
+	print_ll_msg();
 }
 
 static void com_reread_conf(void)
@@ -1388,26 +1398,26 @@ 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 = 1}};
+	struct sched sched = {.default_timeout = 1000};
 
 	exec_task.task = task_register(&(struct task_info) {
 		.name = "exec",
-		.pre_select = exec_pre_select,
-		.post_select = exec_post_select,
+		.pre_monitor = exec_pre_monitor,
+		.post_monitor = exec_post_monitor,
 		.context = &exec_task,
 	}, &sched);
 
 	status_task.task = task_register(&(struct task_info) {
 		.name = "status",
-		.pre_select = status_pre_select,
-		.post_select = status_post_select,
+		.pre_monitor = status_pre_monitor,
+		.post_monitor = status_post_monitor,
 		.context = &status_task,
 	}, &sched);
 
 	input_task.task = task_register(&(struct task_info) {
 		.name = "input",
-		.pre_select = input_pre_select,
-		.post_select = input_post_select,
+		.pre_monitor = input_pre_monitor,
+		.post_monitor = input_post_monitor,
 		.context = &input_task,
 	}, &sched);
 
@@ -1416,10 +1426,11 @@ static int setup_tasks_and_schedule(void)
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGUSR1);
+	para_install_sighandler(SIGWINCH);
 	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
-		.pre_select = signal_pre_select,
-		.post_select = signal_post_select,
+		.pre_monitor = signal_pre_monitor,
+		.post_monitor = signal_post_monitor,
 		.context = signal_task,
 	}, &sched);
 	ret = schedule(&sched);