remove a debug print, and make it wait 0 instead of 1 microsecond when it needs to...
[dana/dcompmgr.git] / dcompmgr.c
index 6b8417a..c20025a 100644 (file)
@@ -1,10 +1,14 @@
 #include "screen.h"
 #include "window.h"
+#include "list.h"
 #include "display.h"
 #include "gettext.h"
+#include "time.h"
+#include "render.h"
 
 #include <glib.h>
 #include <stdio.h>
+#include <sys/select.h>
 #include <stdlib.h>
 #include <string.h>
 #include <xcb/xcb.h>
@@ -13,61 +17,18 @@ typedef struct {
     int foo;
 } d_options_t;
 
-static
-void read_options(int argc, char **argv, d_options_t *opts)
+static void
+read_options(int argc, char **argv, d_options_t *opts)
 {
     opts->foo = argc && argv;
 }
 
-int
-main(int argc, char **argv)
+static void
+event(d_display_t *dpy)
 {
-    d_display_t         *dpy;
     xcb_generic_event_t *ev;
-    d_options_t          opts;
 
-    read_options(argc, argv, &opts);
-
-    dpy = display_open(NULL);
-    if (!dpy) {
-        printf(_("Unable to connect to display\n"));
-        return 1;
-    }
-
-    if (!dpy->composite.present) {
-        printf(_("no composite extension present on the display\n"));
-        display_unref(dpy);
-        return 1;
-    }
-    if (!dpy->xfixes.present) {
-        printf(_("no xfixes extension present on the display\n"));
-        display_unref(dpy);
-        return 1;
-    }
-    if (!dpy->damage.present) {
-        printf(_("no damage extension present on the display\n"));
-        display_unref(dpy);
-        return 1;
-    }
-    if (!dpy->render.present) {
-        printf(_("no render extension present on the display\n"));
-        display_unref(dpy);
-        return 1;
-    }
-    if (dpy->composite.major_version <= 0 && dpy->composite.minor_version < 3)
-    {
-        printf(_("composite extension does not support the overlay window"));
-        display_unref(dpy);
-        return 1;
-    }
-
-    if (!display_claim_screens(dpy)) {
-        printf(_("found no screens to run on\n"));
-        display_unref(dpy);
-        return 0;
-    }
-
-    while ((ev = xcb_wait_for_event(dpy->conn))) {
+    while ((ev = xcb_poll_for_event(dpy->conn))) {
         printf("event %d\n", ev->response_type);
 
         if (!ev->response_type) {
@@ -98,8 +59,10 @@ main(int argc, char **argv)
             sc = display_screen_from_root(dpy, dev->event);
             if (!sc) break;
             w = screen_find_window(sc, dev->window);
-            w->hide(w);
+            sc->window_hide(w);
             screen_remove_window(sc, w);
+            printf("** refresh needed **\n");
+            screen_refresh(sc);
             break;
         }
         case XCB_REPARENT_NOTIFY:
@@ -115,7 +78,7 @@ main(int argc, char **argv)
             if (rev->parent == sc->super.root)
                 screen_add_window(sc, rev->window);
             else {
-                w->hide(w);
+                sc->window_hide(w);
                 screen_remove_window(sc, w);
             }
             break;
@@ -130,7 +93,7 @@ main(int argc, char **argv)
             sc = display_screen_from_root(dpy, mev->event);
             if (!sc) break;
             w = screen_find_window(sc, mev->window);
-            w->show(w);
+            sc->window_show(w);
             break;
         }
         case XCB_UNMAP_NOTIFY:
@@ -143,7 +106,7 @@ main(int argc, char **argv)
             sc = display_screen_from_root(dpy, mev->event);
             if (!sc) break;
             w = screen_find_window(sc, mev->window);
-            w->hide(w);
+            sc->window_hide(w);
             break;
         }
         default:
@@ -151,6 +114,169 @@ main(int argc, char **argv)
         }
         free(ev);
     }
+}
+
+static void
+paint(d_display_t *dpy)
+{
+    d_list_it_t *it;
+    struct timeval now;
+
+    gettimeofday(&now, NULL);
+    
+    for (it = list_top(dpy->screens); it; it = it->next) {
+        d_screen_t *sc = it->data;
+
+        if (time_compare(&sc->next_repaint, &now) <= 0)
+            sc->screen_paint(sc);
+    }
+}
+
+static void
+run(d_display_t *dpy)
+{
+    gboolean quit;
+
+    paint(dpy);
+
+    quit = FALSE;
+    while (!quit) {
+        struct timeval next, now, *wait;
+        int            r, npaint;
+        d_list_it_t   *it;
+        fd_set         fds;
+
+        npaint = 0;
+        for (it = list_top(dpy->screens); it; it = it->next) {
+            d_screen_t *sc = it->data;
+            if (sc->need_repaint &&
+                (!npaint || time_compare(&sc->next_repaint, &next) < 0))
+            {
+                next = sc->next_repaint;
+                ++npaint;
+            }
+        }
+
+        gettimeofday(&now, 0);
+
+        if (!npaint)
+            /* wait forever, there is nothing that needs drawing */
+            wait = NULL;
+        else if (time_compare(&next, &now) > 0) {
+            /* wait until the next allowed redraw time */
+            time_difference(&next, &now, &next);
+            wait = &next;
+        }
+        else {
+            /* don't wait cuz a redraw is due now already */
+            next.tv_sec = 0;
+            next.tv_usec = 0;
+            wait = &next;
+        }
+
+        FD_ZERO(&fds);
+        FD_SET(dpy->fd, &fds);
+
+        r = select(dpy->fd+1, &fds, NULL, NULL, wait);
+        if (r < 0)
+            printf("select error\n");
+        else if (r == 0) {
+            printf("select timeout\n");
+            paint(dpy);
+        }
+        else {
+            printf("select data\n");
+            /*if (FD_ISSET(dpy->fd, &fds))*/ {
+                event(dpy);
+            }
+        }
+
+        if (xcb_connection_has_error(dpy->conn))
+            quit = TRUE;
+        else
+            xcb_flush(dpy->conn);
+    }
+}
+
+static void
+setup_functions(d_display_t *dpy)
+{
+    d_list_it_t *it;
+
+    for (it = list_top(dpy->screens); it; it = it->next) {
+        d_screen_t *sc = it->data;
+        screen_setup_default_functions(sc);
+
+        /* these can be plugins.. */
+        render_init(sc);
+    }
+}
+
+static void
+cleanup_functions(d_display_t *dpy)
+{
+    d_list_it_t *it;
+
+    for (it = list_top(dpy->screens); it; it = it->next) {
+        d_screen_t *sc = it->data;
+
+        /* these can be plugins.. */
+        render_free(sc);
+    }
+}
+
+int
+main(int argc, char **argv)
+{
+    d_display_t         *dpy;
+    d_options_t          opts;
+
+    read_options(argc, argv, &opts);
+
+    dpy = display_open(NULL);
+    if (!dpy) {
+        printf(_("Unable to connect to display\n"));
+        return 1;
+    }
+
+    if (!dpy->composite.present) {
+        printf(_("no composite extension present on the display\n"));
+        display_unref(dpy);
+        return 1;
+    }
+    if (!dpy->xfixes.present) {
+        printf(_("no xfixes extension present on the display\n"));
+        display_unref(dpy);
+        return 1;
+    }
+    if (!dpy->damage.present) {
+        printf(_("no damage extension present on the display\n"));
+        display_unref(dpy);
+        return 1;
+    }
+    if (!dpy->render.present) {
+        printf(_("no render extension present on the display\n"));
+        display_unref(dpy);
+        return 1;
+    }
+    if (dpy->composite.major_version <= 0 && dpy->composite.minor_version < 3)
+    {
+        printf(_("composite extension does not support the overlay window"));
+        display_unref(dpy);
+        return 1;
+    }
+
+    if (!display_claim_screens(dpy)) {
+        printf(_("found no screens to run on\n"));
+        display_unref(dpy);
+        return 0;
+    }
+
+    setup_functions(dpy);
+
+    run(dpy);
+
+    cleanup_functions(dpy);
 
     display_unref(dpy);
     return 0;