Move event source from window to connection

The draw pipeline has been momentarily disconnected

1 files changed, 122 insertions, 13 deletions

diff --git a/connection.c b/connection.c
index 20c1e6d..5a869c4 100644
--- a/connection.c
+++ b/connection.c
@@ -8,18 +8,119 @@
 #include "log.h"
 #include "connection.h"
 
-struct Connection {
-    xcb_connection_t *connection;
-    xcb_screen_t *screen;
-    xcb_randr_screen_size_t *screen_size;
-    double screen_dpi;
-    xcb_visualtype_t *visual_type;
-    xcb_depth_t *depth;
-    xcb_xrm_database_t *database;
-    xcb_errors_context_t *errors;
-    xcb_ewmh_connection_t ewmh;
+typedef struct {
+    GSource source;
+    Connection *con;
+    gpointer fd_tag;
+    xcb_generic_event_t *event;
+} EventSource;
+
+static gboolean source_check(GSource *source)
+{
+    EventSource *xsource = (EventSource *)source;
+    xcb_flush(xsource->con->connection);
+    g_assert_null(xsource->event);
+
+    GIOCondition flags = g_source_query_unix_fd(source, xsource->fd_tag);
+    if (flags & G_IO_IN) {
+        g_assert_false(xcb_connection_has_error(xsource->con->connection));
+        xsource->event = xcb_poll_for_event(xsource->con->connection);
+    }
+
+    return xsource->event != NULL;
+}
+
+static gboolean source_dispatch(GSource *source, GSourceFunc callback, gpointer data)
+{
+    EventSource *xsource = (EventSource *)source;
+    g_assert_nonnull(xsource->event);
+
+    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(xsource->con->errors, error->error_code, &extension);
+                const char *major = xcb_errors_get_name_for_major_code(xsource->con->errors, error->major_code);
+                const char *minor = xcb_errors_get_name_for_minor_code(xsource->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(xsource->con->errors, xsource->event, &extension);
+
+                log_debug("Ignoring event '%s' [type=%d, extension=%s]",
+                          name,
+                          xsource->event->response_type & 0x7f,
+                          extension ? extension : "none");
+            }
+        }
+    } while ((xsource->event = xcb_poll_for_event(xsource->con->connection)) != NULL);
+
+    return G_SOURCE_CONTINUE;
+}
+
+static GSourceFuncs source_fns = {
+    NULL,
+    source_check,
+    source_dispatch,
+    NULL,
 };
 
+static void attach_source(Connection *con)
+{
+    EventSource *source = (EventSource *)g_source_new(&source_fns, sizeof(EventSource));
+    con->source = (GSource *)source;
+    g_source_set_static_name(con->source, "EventSource");
+
+    source->con = con;
+    source->event = NULL;
+    source->fd_tag = g_source_add_unix_fd(con->source, xcb_get_file_descriptor(con->connection), G_IO_IN | G_IO_HUP | G_IO_ERR);
+
+    // TODO: Draw should be decoupled from this file
+    //g_source_set_callback(con->source, G_SOURCE_FUNC(draw), win, NULL);
+
+    g_source_attach(con->source, NULL);
+}
+
 static bool query_xrm(Connection *con, const char *res, char **value)
 {
     if (xcb_xrm_resource_get_string(con->database, res, res, value) >= 0) {
@@ -46,7 +147,7 @@ static void update_scale(Connection *con)
 Connection *connection_create()
 {
     Connection *con = g_malloc0(sizeof(Connection));
-	g_assert_nonnull(con);
+    g_assert_nonnull(con);
 
     int preferred_screen = 0;
     con->connection = xcb_connect(NULL, &preferred_screen);
@@ -124,14 +225,22 @@ found_visual:
     xcb_flush(con->connection);
     log_debug("Xcb set up");
 
-	return con;
+    attach_source(con);
+    log_debug("Xcb event loop attached");
+
+    return con;
 }
 
 void connection_destroy(Connection *con)
 {
+    g_source_destroy(con->source);
+    g_source_unref(con->source);
+
     xcb_ewmh_connection_wipe(&con->ewmh);
     xcb_errors_context_free(con->errors);
     xcb_xrm_database_free(con->database);
     xcb_disconnect(con->connection);
-	g_free(con);
+    g_free(con);
 }
+
+// vim: ts=4 sw=4 et