diff options
author | Jesse Luehrs <doy@tozt.net> | 2016-05-01 20:09:33 -0400 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2016-05-01 20:09:33 -0400 |
commit | 7ca8e65901c9fbf74f7fbe1c3514d41382ac7c02 (patch) | |
tree | 54970fd7c116eef7f4f914d4e6411845e76b4f69 /src | |
parent | 5905fb8d4477f7f1b6dbd070fb0c8fa9d2e0d244 (diff) | |
download | runes-7ca8e65901c9fbf74f7fbe1c3514d41382ac7c02.tar.gz runes-7ca8e65901c9fbf74f7fbe1c3514d41382ac7c02.zip |
simplify
Diffstat (limited to 'src')
-rw-r--r-- | src/window-xlib.c | 15 | ||||
-rw-r--r-- | src/window-xlib.h | 6 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/window-xlib.c b/src/window-xlib.c index ff3f865..c8b60cf 100644 --- a/src/window-xlib.c +++ b/src/window-xlib.c @@ -248,7 +248,7 @@ void runes_window_backend_init_loop(RunesTerm *t) xim_mask|common_mask|ButtonPressMask|ButtonReleaseMask|PointerMotionMask|ExposureMask); XSetICFocus(w->ic); - data = malloc(sizeof(RunesXlibLoopData)); + data = malloc(sizeof(RunesLoopData)); ((RunesLoopData *)data)->req.data = data; ((RunesLoopData *)data)->t = t; @@ -352,18 +352,19 @@ void runes_window_backend_cleanup(RunesTerm *t) static void runes_window_backend_get_next_event(uv_work_t *req) { - RunesXlibLoopData *data; + RunesLoopData *data = req->data; + RunesTerm *t = data->t; + RunesWindowBackend *w = &t->w; - data = (RunesXlibLoopData *)req->data; - XNextEvent(data->data.t->w.dpy, &data->e); + XNextEvent(w->dpy, &w->event); } static void runes_window_backend_process_event(uv_work_t *req, int status) { - RunesXlibLoopData *data = req->data; - XEvent *e = &data->e; - RunesTerm *t = data->data.t; + RunesLoopData *data = req->data; + RunesTerm *t = data->t; RunesWindowBackend *w = &t->w; + XEvent *e = &w->event; int should_close = 0; UNUSED(status); diff --git a/src/window-xlib.h b/src/window-xlib.h index 5431244..22130e3 100644 --- a/src/window-xlib.h +++ b/src/window-xlib.h @@ -24,6 +24,7 @@ struct runes_window { Window w; Window border_w; XIC ic; + XEvent event; cairo_t *backend_cr; @@ -32,11 +33,6 @@ struct runes_window { char visual_bell_is_ringing: 1; }; -typedef struct { - RunesLoopData data; - XEvent e; -} RunesXlibLoopData; - void runes_window_backend_create_window(RunesTerm *t, int argc, char *argv[]); void runes_window_backend_init_loop(RunesTerm *t); void runes_window_backend_request_flush(RunesTerm *t); |