From 9c891a80c4dc3a15a2d41bfb247a200e645e5f67 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 7 May 2016 19:39:07 -0400 Subject: the event loop shouldn't care about terms at all --- src/loop.c | 22 +++++++++++----------- src/loop.h | 8 ++++---- src/pty-unix.c | 14 +++++++------- src/socket.c | 8 ++++---- src/window-xlib.c | 24 ++++++++++++------------ 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/loop.c b/src/loop.c index 2290680..0eeb0ea 100644 --- a/src/loop.c +++ b/src/loop.c @@ -6,14 +6,14 @@ struct runes_loop_data { uv_work_t req; RunesLoop *loop; - RunesTerm *t; - void (*work_cb)(RunesTerm*); - int (*after_work_cb)(RunesTerm*); + void *t; + void (*work_cb)(void*); + int (*after_work_cb)(void*); }; struct runes_loop_timer_data { - RunesTerm *t; - void (*cb)(RunesTerm*); + void *t; + void (*cb)(void*); }; static void runes_loop_do_work(uv_work_t *req); @@ -31,9 +31,9 @@ void runes_loop_run(RunesLoop *loop) uv_run(loop->loop, UV_RUN_DEFAULT); } -void runes_loop_start_work(RunesLoop *loop, RunesTerm *t, - void (*work_cb)(RunesTerm*), - int (*after_work_cb)(RunesTerm*)) +void runes_loop_start_work(RunesLoop *loop, void *t, + void (*work_cb)(void*), + int (*after_work_cb)(void*)) { struct runes_loop_data *data; @@ -49,7 +49,7 @@ void runes_loop_start_work(RunesLoop *loop, RunesTerm *t, } void runes_loop_timer_set(RunesLoop *loop, int timeout, int repeat, - RunesTerm *t, void (*cb)(RunesTerm*)) + void *t, void (*cb)(void*)) { uv_timer_t *timer_req; struct runes_loop_timer_data *timer_data; @@ -71,7 +71,7 @@ void runes_loop_cleanup(RunesLoop *loop) static void runes_loop_do_work(uv_work_t *req) { struct runes_loop_data *data = req->data; - RunesTerm *t = data->t; + void *t = data->t; data->work_cb(t); } @@ -80,7 +80,7 @@ static void runes_loop_do_after_work(uv_work_t *req, int status) { struct runes_loop_data *data = req->data; RunesLoop *loop = data->loop; - RunesTerm *t = data->t; + void *t = data->t; int should_loop = 0; UNUSED(status); diff --git a/src/loop.h b/src/loop.h index 3370da3..6151033 100644 --- a/src/loop.h +++ b/src/loop.h @@ -9,11 +9,11 @@ struct runes_loop { void runes_loop_init(RunesLoop *loop); void runes_loop_run(RunesLoop *loop); -void runes_loop_start_work(RunesLoop *loop, RunesTerm *t, - void (*work_cb)(RunesTerm*), - int (*after_work_cb)(RunesTerm*)); +void runes_loop_start_work(RunesLoop *loop, void *t, + void (*work_cb)(void*), + int (*after_work_cb)(void*)); void runes_loop_timer_set(RunesLoop *loop, int timeout, int repeat, - RunesTerm *t, void (*cb)(RunesTerm*)); + void *t, void (*cb)(void*)); void runes_loop_cleanup(RunesLoop *loop); #endif diff --git a/src/pty-unix.c b/src/pty-unix.c index 7ee5edf..7975964 100644 --- a/src/pty-unix.c +++ b/src/pty-unix.c @@ -16,8 +16,8 @@ #include "term.h" #include "window-xlib.h" -static void runes_pty_backend_read(RunesTerm *t); -static int runes_pty_backend_got_data(RunesTerm *t); +static void runes_pty_backend_read(void *t); +static int runes_pty_backend_got_data(void *t); void runes_pty_backend_init(RunesPtyBackend *pty) { @@ -131,9 +131,9 @@ void runes_pty_backend_cleanup(RunesPtyBackend *pty) close(pty->master); } -static void runes_pty_backend_read(RunesTerm *t) +static void runes_pty_backend_read(void *t) { - RunesPtyBackend *pty = t->pty; + RunesPtyBackend *pty = ((RunesTerm *)t)->pty; runes_window_backend_request_flush(t); pty->readlen = read( @@ -141,14 +141,14 @@ static void runes_pty_backend_read(RunesTerm *t) RUNES_READ_BUFFER_LENGTH - pty->remaininglen); } -static int runes_pty_backend_got_data(RunesTerm *t) +static int runes_pty_backend_got_data(void *t) { - RunesPtyBackend *pty = t->pty; + RunesPtyBackend *pty = ((RunesTerm *)t)->pty; if (pty->readlen > 0) { int to_process = pty->readlen + pty->remaininglen; int processed = vt100_screen_process_string( - t->scr, pty->readbuf, to_process); + ((RunesTerm *)t)->scr, pty->readbuf, to_process); pty->remaininglen = to_process - processed; memmove(pty->readbuf, pty->readbuf + processed, pty->remaininglen); diff --git a/src/socket.c b/src/socket.c index f66da5c..e2aef89 100644 --- a/src/socket.c +++ b/src/socket.c @@ -14,8 +14,8 @@ static int runes_socket_open(RunesSocket *sock); static void runes_socket_close(RunesSocket *sock); -static void runes_socket_accept(RunesTerm *t); -static int runes_socket_handle_request(RunesTerm *t); +static void runes_socket_accept(void *t); +static int runes_socket_handle_request(void *t); void runes_socket_init(RunesSocket *sock, RunesLoop *loop) { @@ -89,7 +89,7 @@ static void runes_socket_close(RunesSocket *sock) unlink(sock->name); } -static void runes_socket_accept(RunesTerm *t) +static void runes_socket_accept(void *t) { RunesSocket *sock = (RunesSocket *)t; struct sockaddr_un client; @@ -98,7 +98,7 @@ static void runes_socket_accept(RunesTerm *t) sock->client_sock = accept(sock->sock, (struct sockaddr*)(&client), &len); } -static int runes_socket_handle_request(RunesTerm *t) +static int runes_socket_handle_request(void *t) { RunesSocket *sock = (RunesSocket *)t; ssize_t bytes; diff --git a/src/window-xlib.c b/src/window-xlib.c index f3b924a..6507f42 100644 --- a/src/window-xlib.c +++ b/src/window-xlib.c @@ -84,8 +84,8 @@ static struct function_key application_cursor_keys[] = { }; #undef RUNES_KEY -static void runes_window_backend_get_next_event(RunesTerm *t); -static int runes_window_backend_process_event(RunesTerm *t); +static void runes_window_backend_get_next_event(void *t); +static int runes_window_backend_process_event(void *t); static Bool runes_window_backend_find_flush_events( Display *dpy, XEvent *e, XPointer arg); static void runes_window_backend_resize_window( @@ -94,10 +94,10 @@ static void runes_window_backend_flush(RunesTerm *t); static void runes_window_backend_write_to_pty( RunesTerm *t, char *buf, size_t len); static int runes_window_backend_check_recent(RunesTerm *t); -static void runes_window_backend_delay_cb(RunesTerm *t); +static void runes_window_backend_delay_cb(void *t); static void runes_window_backend_visible_scroll(RunesTerm *t, int count); static void runes_window_backend_visual_bell(RunesTerm *t); -static void runes_window_backend_reset_visual_bell(RunesTerm *t); +static void runes_window_backend_reset_visual_bell(void *t); static void runes_window_backend_audible_bell(RunesTerm *t); static void runes_window_backend_set_urgent(RunesTerm *t); static void runes_window_backend_clear_urgent(RunesTerm *t); @@ -356,16 +356,16 @@ void runes_window_backend_cleanup(RunesWindowBackend *w) XCloseDisplay(w->dpy); } -static void runes_window_backend_get_next_event(RunesTerm *t) +static void runes_window_backend_get_next_event(void *t) { - RunesWindowBackend *w = t->w; + RunesWindowBackend *w = ((RunesTerm *)t)->w; XNextEvent(w->dpy, &w->event); } -static int runes_window_backend_process_event(RunesTerm *t) +static int runes_window_backend_process_event(void *t) { - RunesWindowBackend *w = t->w; + RunesWindowBackend *w = ((RunesTerm *)t)->w; XEvent *e = &w->event; int should_close = 0; @@ -568,9 +568,9 @@ static int runes_window_backend_check_recent(RunesTerm *t) } -static void runes_window_backend_delay_cb(RunesTerm *t) +static void runes_window_backend_delay_cb(void *t) { - RunesWindowBackend *w = t->w; + RunesWindowBackend *w = ((RunesTerm *)t)->w; w->delaying = 0; runes_window_backend_request_flush(t); @@ -617,9 +617,9 @@ static void runes_window_backend_visual_bell(RunesTerm *t) } } -static void runes_window_backend_reset_visual_bell(RunesTerm *t) +static void runes_window_backend_reset_visual_bell(void *t) { - RunesWindowBackend *w = t->w; + RunesWindowBackend *w = ((RunesTerm *)t)->w; runes_window_backend_request_flush(t); w->visual_bell_is_ringing = 0; -- cgit v1.2.3-54-g00ecf