X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=72908f23e46d0762ab4442975070dc5bd46c7269;hp=686fda3108e6d604b905d06176df3801d239807d;hb=HEAD;hpb=4ddaef74ff8f605a31c499d77fcaaffa7a3708c0

diff --git a/gui.c b/gui.c
index 686fda31..66fb7870 100644
--- a/gui.c
+++ b/gui.c
@@ -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(__a_unused 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;
@@ -892,7 +892,7 @@ 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();
 
@@ -931,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(__a_unused 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;
@@ -992,10 +992,10 @@ static int exec_post_select(__a_unused 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);
 }
@@ -1089,7 +1089,7 @@ static void handle_command(int 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;
@@ -1115,7 +1115,7 @@ static int input_post_select(__a_unused struct sched *s,
 	ret = wgetch(top.win);
 	if (ret == ERR)
 		return 0;
-	if (ret == KEY_RESIZE) /* already handled in signal_post_select() */
+	if (ret == KEY_RESIZE) /* already handled in signal_post_monitor() */
 		return 0;
 	if (exs == EXEC_IDLE)
 		handle_command(ret);
@@ -1166,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)
@@ -1267,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) {
@@ -1275,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)
@@ -1286,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)
@@ -1395,22 +1402,22 @@ static int setup_tasks_and_schedule(void)
 
 	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);
 
@@ -1422,8 +1429,8 @@ static int setup_tasks_and_schedule(void)
 	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);