From: Dana Jansens <danakj@orodu.net>
Date: Sat, 9 Feb 2008 09:08:49 +0000 (-0500)
Subject: fix crashing
X-Git-Tag: compgl~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=cd0cbd2492ffa53a45f18ac65a05cc9332e8a995;p=dana%2Fopenbox.git

fix crashing
---

diff --git a/loco/loco.c b/loco/loco.c
index 152e0c0e..a39ba939 100644
--- a/loco/loco.c
+++ b/loco/loco.c
@@ -32,9 +32,7 @@
 
 static LocoScreen **screens = NULL;
 static ObtMainLoop *mainloop = NULL;
-static GList       *windows = NULL;
-
-/* XXX stop removing windows from the stacking until they have no more refs */
+static GList      **windows = NULL;
 
 void COMPOSTER_RAWR(const XEvent *e, gpointer data)
 {
@@ -47,7 +45,7 @@ void COMPOSTER_RAWR(const XEvent *e, gpointer data)
     case CreateNotify:
         if (e->xcreatewindow.parent == sc->root) {
             lw = loco_window_new(e->xcreatewindow.window, sc);
-            windows = g_list_prepend(windows, lw);
+            windows[sc->number] = g_list_prepend(windows[sc->number], lw);
         }
         break;
     case DestroyNotify:
@@ -55,42 +53,43 @@ void COMPOSTER_RAWR(const XEvent *e, gpointer data)
         if (lw) {
             loco_window_hide(lw, TRUE);
             loco_window_unref(lw);
-            windows = g_list_remove(windows, lw);
+            windows[sc->number] = g_list_remove(windows[sc->number], lw);
         }
-        else
+        /*else
             g_print("destroy notify for unknown window 0x%lx\n",
-                    e->xdestroywindow.window);
+                    e->xdestroywindow.window);*/
         break;
     case ReparentNotify:
         if (e->xreparent.parent == sc->root) {
             /* reparented to root */
             lw = loco_window_new(e->xreparent.window, sc);
-            windows = g_list_prepend(windows, lw);
+            windows[sc->number] = g_list_prepend(windows[sc->number], lw);
         }
         else {
             /* reparented away from root */
             lw = loco_screen_find_window(sc, e->xreparent.window);
             if (lw) {
-                g_print("window 0x%lx reparented from root\n", lw->id);
+                /*g_print("window 0x%lx reparented from root\n", lw->id);*/
                 loco_window_hide(lw, TRUE);
                 loco_window_unref(lw);
-                windows = g_list_remove(windows, lw);
+                windows[sc->number] = g_list_remove(windows[sc->number], lw);
             }
-            else
+            /*else
                 g_print("reparent notify away from root for unknown window "
-                        "0x%lx\n", e->xreparent.window);
+                        "0x%lx\n", e->xreparent.window);*/
         }
         break;
     case MapNotify:
         lw = loco_screen_find_window(sc, e->xmap.window);
         if (lw) loco_window_show(lw);
-        else g_print("map notify for unknown window 0x%lx\n", e->xmap.window);
+        /*else
+          g_print("map notify for unknown window 0x%lx\n", e->xmap.window);*/
         break;
     case UnmapNotify:
         lw = loco_screen_find_window(sc, e->xunmap.window);
         if (lw) loco_window_hide(lw, FALSE);
-        else g_print("unmap notify for unknown window 0x%lx\n",
-                     e->xunmap.window);
+        /*else g_print("unmap notify for unknown window 0x%lx\n",
+                       e->xunmap.window);*/
         break;
     case ConfigureNotify:
         lw = loco_screen_find_window(sc, e->xconfigure.window);
@@ -127,7 +126,7 @@ static void find_all_windows(LocoScreen *sc)
             LocoWindow *lw;
 
             lw = loco_window_new(children[i], sc);
-            windows = g_list_prepend(windows, lw);
+            windows[sc->number] = g_list_prepend(windows[sc->number], lw);
         }
 
     if (children) XFree(children);
@@ -147,15 +146,17 @@ void loco_startup(ObtMainLoop *loop)
 {
     mainloop = loop;
     screens = g_new0(LocoScreen*, ScreenCount(obt_display));
+    windows = g_new0(GList*, ScreenCount(obt_display));
 }
 
 void loco_shutdown()
 {
     int i;
     for (i = 0; i < ScreenCount(obt_display); ++i)
-        loco_screen_unref(screens[i]);
+        loco_stop_screen(i);
 
     g_free(screens);
+    g_free(windows);
     screens = NULL;
 }
 
@@ -180,19 +181,14 @@ void loco_start_screen(gint number)
 
 void loco_stop_screen(gint number)
 {
-    GList *it, *next;
-
     obt_main_loop_x_remove_data(mainloop, COMPOSTER_RAWR, screens[number]);
     obt_main_loop_timeout_remove_data(mainloop,
                                       compositor_timeout, screens[number],
                                       FALSE);
 
-    for (it = windows; it; it = next) {
-        next = g_list_next(it);
-        if (((LocoWindow*)it->data)->screen->number == number) {
-            loco_window_unref(it->data);
-            windows = g_list_delete_link(windows, it);
-        }
+    while (windows[number]) {
+        loco_window_unref(windows[number]->data);
+        windows[number] = g_list_delete_link(windows[number], windows[number]);
     }
 
     loco_screen_unref(screens[number]);
diff --git a/loco/screen.c b/loco/screen.c
index 14938aff..74a2154c 100644
--- a/loco/screen.c
+++ b/loco/screen.c
@@ -160,7 +160,7 @@ void loco_screen_add_window(LocoScreen *sc, LocoWindow *lw)
 {
     LocoList *it;
 
-    g_print("add window 0x%lx\n", lw->id);
+    /*g_print("add window 0x%lx\n", lw->id);*/
 
     /* new windows are at the top */
     it = loco_list_prepend(&sc->stacking_top, &sc->stacking_bottom, lw);
@@ -172,7 +172,7 @@ void loco_screen_add_window(LocoScreen *sc, LocoWindow *lw)
 
 void loco_screen_zombie_window(LocoScreen *sc, LocoWindow *lw)
 {
-    g_print("zombie window 0x%lx\n", lw->id);
+    /*g_print("zombie window 0x%lx\n", lw->id);*/
 
     /* the id will no longer be useful, so remove it from the hash */
     g_hash_table_remove(sc->stacking_map, &lw->id);
@@ -182,7 +182,7 @@ void loco_screen_remove_window(LocoScreen *sc, LocoWindow *lw)
 {
     LocoList *pos;
 
-    g_print("remove window 0x%lx\n", lw->id);
+    /*g_print("remove window 0x%lx\n", lw->id);*/
 
     pos = loco_screen_find_stacking_ptr(sc, lw);
     g_assert(pos);
diff --git a/loco/window.c b/loco/window.c
index 618c3738..7f072256 100644
--- a/loco/window.c
+++ b/loco/window.c
@@ -126,7 +126,7 @@ void loco_window_hide(LocoWindow *lw, gboolean gone)
 
     if (gone) {
         loco_screen_zombie_window(lw->screen, lw);
-        lw->id = 0;
+        lw->id = None;
     }
 }
 
@@ -140,7 +140,7 @@ void loco_window_configure(LocoWindow *lw, const XConfigureEvent *e)
     g_assert(pos != NULL && pos->window != NULL);
 
     if (e->above && !above)
-        g_error("missing windows from the stacking list!!\n");
+        g_print("missing windows from the stacking list!!\n");
 
     if ((lw->x != e->x) || (lw->y != e->y)) {
         lw->x = e->x;
@@ -273,6 +273,8 @@ static void pixmap_destroy(LocoWindow *lw)
 
 void loco_window_update_pixmap(LocoWindow *lw)
 {
+    if (loco_window_is_zombie(lw)) return;
+
     if (lw->stale || lw->glpixmap == None) {
         g_assert(lw->pixmap == None);
 
@@ -282,3 +284,8 @@ void loco_window_update_pixmap(LocoWindow *lw)
         lw->stale = FALSE;
     }
 }
+
+gboolean loco_window_is_zombie(LocoWindow *lw)
+{
+    return lw->id == None;
+}
diff --git a/loco/window.h b/loco/window.h
index 1953df5d..cce4f2ac 100644
--- a/loco/window.h
+++ b/loco/window.h
@@ -64,4 +64,6 @@ void loco_window_damage(LocoWindow *lw);
 
 void loco_window_update_pixmap(LocoWindow *lw);
 
+gboolean loco_window_is_zombie(LocoWindow *lw);
+
 #endif