X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=gui.c;h=ebfab3564836e7b1708dc430e9375815b00d49b7;hb=501b83a39828c9d3db5498c7352a2e5b60175bba;hp=d779ff864ddebfc38a34ba1a0d166b5c04089556;hpb=d5e27e2a346da2f18188d317926a60687d082732;p=paraslash.git

diff --git a/gui.c b/gui.c
index d779ff86..ebfab356 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(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,9 +892,9 @@ 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;
@@ -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(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;
@@ -963,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],
@@ -992,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);
 }
@@ -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);
@@ -1391,26 +1391,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);
 
@@ -1422,8 +1422,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);