diff options
Diffstat (limited to 'window.c')
| -rw-r--r-- | window.c | 122 |
1 files changed, 0 insertions, 122 deletions
@@ -26,123 +26,8 @@ struct Window { cairo_t *cr; int x, y; int width, height; - GSource *source; }; -typedef struct { - GSource source; - Window *win; - xcb_generic_event_t *event; -} XcbSource; - -static gboolean xcb_source_check(GSource *source) -{ - XcbSource *xsource = (XcbSource *)source; - g_assert_null(xsource->event); - xsource->event = xcb_poll_for_event(xsource->win->con->connection); - return xsource->event != NULL; -} - -static gboolean xcb_source_dispatch(GSource *source, GSourceFunc callback, gpointer data) -{ - XcbSource *xsource = (XcbSource *)source; - g_assert_nonnull(xsource->event); - g_assert_nonnull(callback); - g_assert_nonnull(data); - - Window *win = (Window *)data; - - do { - switch (xsource->event->response_type & ~0x80) { - case 0: { - xcb_generic_error_t *error = (xcb_generic_error_t *)xsource->event; - - const char *extension; - const char *name = xcb_errors_get_name_for_error(win->con->errors, error->error_code, &extension); - const char *major = xcb_errors_get_name_for_major_code(win->con->errors, error->major_code); - const char *minor = xcb_errors_get_name_for_minor_code(win->con->errors, error->major_code, error->minor_code); - - // TODO: Handle errors instead of aborting - log_error("Xcb error '%s' [extension=%s, major=%s, minor=%s, resource=%u, sequence=%u]", - name, - extension ? extension : "none", - major, - minor ? minor : "none", - (unsigned int)error->resource_id, - (unsigned int)error->sequence); - break; - } - - case XCB_EXPOSE: { - xcb_expose_event_t *expose = (xcb_expose_event_t *)xsource->event; - log_debug("Processing event 'Expose' [type=%d]", XCB_EXPOSE); - - // Redraw - callback(data); - break; - } - - case XCB_BUTTON_RELEASE: { - log_debug("Mouse event"); - break; - } - - case XCB_PROPERTY_NOTIFY: { - xcb_property_notify_event_t *property = (xcb_property_notify_event_t *)xsource->event; - log_debug("Processing event 'PropertyNotify' [type=%d]", XCB_PROPERTY_NOTIFY); - - if (property->atom == XCB_ATOM_RESOURCE_MANAGER) { - //window_update_scale(data); - - // Redraw - callback(data); - } - break; - } - - default: { - const char *extension; - const char *name = xcb_errors_get_name_for_xcb_event(win->con->errors, xsource->event, &extension); - - log_debug("Ignoring event '%s' [extension=%s, type=%d]", - name, - extension ? extension : "none", - xsource->event->response_type & 0x7f); - } - } - } while ((xsource->event = xcb_poll_for_event(xsource->win->con->connection)) != NULL); - - return G_SOURCE_CONTINUE; -} - -static void xcb_source_finalize(GSource *source) -{ - log_debug("Xcb event loop finalized"); -} - -static GSourceFuncs source_fns = { - NULL, - xcb_source_check, - xcb_source_dispatch, - xcb_source_finalize, -}; - -static void attach_source(Window *win) -{ - XcbSource *source = (XcbSource *)g_source_new(&source_fns, sizeof(XcbSource)); - source->win = win; - source->event = NULL; - - win->source = (GSource *)source; - g_source_set_static_name(win->source, "XcbSource"); - - // TODO: Draw should be decoupled from this file - g_source_set_callback(win->source, G_SOURCE_FUNC(draw), win, NULL); - - g_source_add_unix_fd(win->source, xcb_get_file_descriptor(win->con->connection), G_IO_IN | G_IO_HUP | G_IO_ERR); - g_source_attach(win->source, NULL); -} - static xcb_atom_t intern_atom(Window *win, const char *atom) { xcb_generic_error_t *error; @@ -299,10 +184,6 @@ Window *window_create(Connection *con) g_assert_cmpint(cairo_status(win->cr), ==, CAIRO_STATUS_SUCCESS); log_debug("Cairo context created"); - - attach_source(win); - log_debug("Xcb event loop attached"); - return win; } @@ -443,9 +324,6 @@ void window_paint_surface(Window *win, cairo_surface_t *surface, int width, int void window_destroy(Window *win) { - g_source_destroy(win->source); - g_source_unref(win->source); - cairo_destroy(win->cr); cairo_surface_destroy(win->surface); |