redirect rendering and get the composite overlay window

[dana/dcompmgr.git] / screen.c

diff --git a/screen.c b/screen.c
index 873e96f..dfad6e4 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -1,5 +1,5 @@
 #include "screen.h"
-#include "error.h"
+#include "display.h"
 #include "window.h"
 #include "gettext.h"
 #include <string.h>
@@ -13,11 +13,11 @@
 #define SELECTION_MASK (XCB_EVENT_MASK_STRUCTURE_NOTIFY | \
                         XCB_EVENT_MASK_PROPERTY_CHANGE)
 
-static void screen_init(d_screen_t *sc);
+static gboolean screen_init(d_screen_t *sc);
 static xcb_timestamp_t screen_timestamp(d_screen_t *sc);
 
 gboolean
-screen_register(d_screen_t *sc)
+screen_register(struct d_display *dpy, int num, d_screen_t *sc)
 {
     char *name;
     xcb_window_t w;
@@ -28,19 +28,23 @@ screen_register(d_screen_t *sc)
     uint32_t event_mask;
     gboolean taken, ret;
 
-    w = xcb_generate_id(sc->conn);
+    sc->dpy = dpy;
+    sc->num = num;
+    w = xcb_generate_id(sc->dpy->conn);
     event_mask = SELECTION_MASK;
-    xcb_create_window(sc->conn, XCB_COPY_FROM_PARENT, w, sc->super.root,
+    xcb_create_window(sc->dpy->conn, XCB_COPY_FROM_PARENT, w, sc->super.root,
                       0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_ONLY,
                       sc->super.root_visual, XCB_CW_EVENT_MASK, &event_mask);
 
     name = g_strdup_printf("_NET_WM_CM_S%d", sc->num);
-    ack = xcb_intern_atom(sc->conn, FALSE, strlen(name), name);
-    arep = xcb_intern_atom_reply(sc->conn, ack, NULL);
+    ack = xcb_intern_atom(sc->dpy->conn, FALSE, strlen(name), name);
+    arep = xcb_intern_atom_reply(sc->dpy->conn, ack, NULL);
     g_free(name);
 
-    sck = xcb_get_selection_owner(sc->conn, arep->atom);
-    srep = xcb_get_selection_owner_reply(sc->conn, sck, NULL);
+    xcb_grab_server(sc->dpy->conn);
+
+    sck = xcb_get_selection_owner(sc->dpy->conn, arep->atom);
+    srep = xcb_get_selection_owner_reply(sc->dpy->conn, sck, NULL);
     taken = !!srep->owner;
     free(srep);
     if (taken) {
@@ -56,22 +60,20 @@ screen_register(d_screen_t *sc)
 
         time = screen_timestamp(sc);
 
-        xcb_grab_server(sc->conn);
-        xcb_set_selection_owner(sc->conn, w, arep->atom, time);
-        sck = xcb_get_selection_owner(sc->conn, arep->atom);
-        srep = xcb_get_selection_owner_reply(sc->conn, sck, NULL);
+        xcb_set_selection_owner(sc->dpy->conn, w, arep->atom, time);
+        sck = xcb_get_selection_owner(sc->dpy->conn, arep->atom);
+        srep = xcb_get_selection_owner_reply(sc->dpy->conn, sck, NULL);
         taken = srep->owner == w;
-        if (taken) {
-            screen_init(sc);
+        if (taken && screen_init(sc))
             ret = TRUE;
-        }
         else {
-            xcb_destroy_window(sc->conn, w);
+            xcb_destroy_window(sc->dpy->conn, w);
             ret = FALSE;
         }
-        xcb_ungrab_server(sc->conn);
-        xcb_flush(sc->conn);
     }
+
+    xcb_ungrab_server(sc->dpy->conn);
+    xcb_flush(sc->dpy->conn);
     return ret;
 }
 
@@ -81,23 +83,51 @@ window_hash(xcb_window_t *w) { return *w; }
 static gboolean
 window_compare(xcb_window_t *w1, xcb_window_t *w2) { return *w1 == *w2; }
 
-static void
+static gboolean
 screen_init(d_screen_t *sc)
 {
     uint32_t mask;
+    xcb_generic_error_t *err;
+    xcb_void_cookie_t redir_ck;
+    xcb_composite_get_overlay_window_cookie_t overlay_ck;
+    xcb_composite_get_overlay_window_reply_t *overlay_rep;
 
     sc->winhash = g_hash_table_new((GHashFunc)window_hash,
                                    (GCompareFunc)window_compare);
 
-//    xcb_composite_redirect_subwindows(sc->conn, sc->super.root,
-//                                      XCB_COMPOSITE_REDIRECT_MANUAL);
+    redir_ck =
+        xcb_composite_redirect_subwindows(sc->dpy->conn, sc->super.root,
+                                          XCB_COMPOSITE_REDIRECT_MANUAL);
+
+    overlay_ck = xcb_composite_get_overlay_window(sc->dpy->conn,
+                                                  sc->super.root);
+
+    /* check that the redirect worked */
+    err = xcb_request_check(sc->dpy->conn, redir_ck);
+    if (err) {
+        printf(_("unable to redirect rendering, another composite manager must be running"));
+        free(err);
+        return FALSE;
+    }
+
+    /* get the overlay window reply */
+    overlay_rep = xcb_composite_get_overlay_window_reply(sc->dpy->conn,
+                                                         overlay_ck,
+                                                         NULL);
+    if (!overlay_rep) {
+        printf(_("unable to get the composite overlay window\n"));
+        return FALSE;
+    }
+    sc->overlay = overlay_rep->overlay_win;
+    free(overlay_rep);
 
     mask = SELECTION_MASK;
-    xcb_change_window_attributes(sc->conn, sc->selwin,
+    xcb_change_window_attributes(sc->dpy->conn, sc->selwin,
                                  XCB_CW_EVENT_MASK, &mask);
     mask = ROOT_MASK;
-    xcb_change_window_attributes(sc->conn, sc->super.root,
+    xcb_change_window_attributes(sc->dpy->conn, sc->super.root,
                                  XCB_CW_EVENT_MASK, &mask);
+    return TRUE;
 }
 
 void
@@ -110,13 +140,13 @@ screen_add_window(d_screen_t *sc, xcb_window_t wid)
     w = window_new(wid, sc);
     g_hash_table_insert(sc->winhash, &w->id, w);
 
-    printf("added window 0x%x\n", w->id);
+    printf("screen added window 0x%x\n", w->id);
 }
 
 void
 screen_remove_window(d_screen_t *sc, struct d_window *w)
 {
-    printf("removed window 0x%x\n", w->id);
+    printf("screen removed window 0x%x\n", w->id);
 
     g_hash_table_remove(sc->winhash, &w->id);
     window_unref(w);
@@ -134,13 +164,13 @@ screen_timestamp(d_screen_t *sc)
     xcb_void_cookie_t ck;
     xcb_timestamp_t   time;
 
-    ck = xcb_change_property(sc->conn, XCB_PROP_MODE_REPLACE, sc->selwin,
+    ck = xcb_change_property(sc->dpy->conn, XCB_PROP_MODE_REPLACE, sc->selwin,
                              sc->selatom, sc->selatom, 32, 0, NULL);
-    xcb_flush(sc->conn);
+    xcb_flush(sc->dpy->conn);
     while (1) {
         xcb_generic_event_t *ev;
 
-        ev = xcb_wait_for_event(sc->conn);
+        ev = xcb_wait_for_event(sc->dpy->conn);
         if (!ev) {
             printf(_("IO error\n"));
             exit(0);
@@ -148,7 +178,7 @@ screen_timestamp(d_screen_t *sc)
 
         /* expect errors.. */
         if (!ev->response_type) {
-            error(sc->conn, (xcb_generic_error_t*)ev);
+            display_error(sc->dpy, (xcb_generic_error_t*)ev);
             free(ev);
             continue;
         }