grab the server during composite rendering

diff --git a/loco/paint.c b/loco/paint.c
index dc87f08f78bc8428e56813718281fa131ddb0ce2..aca112d2fca9922168b9ec3b61503b3d8571f0ee 100644 (file)
--- a/loco/paint.c
+++ b/loco/paint.c
@@ -59,6 +59,9 @@ void paint_everything(LocoScreen *sc)
     int ret;
     LocoList *it;
 
+    XGrabServer(obt_display);
+    XSync(obt_display, FALSE);
+
     /* XXX if (full_redraw_required) */
         glClear(GL_COLOR_BUFFER_BIT);
 
@@ -98,5 +101,7 @@ void paint_everything(LocoScreen *sc)
     }
     glXSwapBuffers(obt_display, sc->overlay);
 
+    XUngrabServer(obt_display);
+
     loco_screen_redraw_done(sc);
 }

diff --git a/loco/window.c b/loco/window.c
index 7f0722565af1234dad71738bc34780e875d9826c..9585ba5c0de11038d2d280cdbb0e04fceecec34a 100644 (file)
--- a/loco/window.c
+++ b/loco/window.c
@@ -184,12 +184,8 @@ static void pixmap_create(LocoWindow *lw)
     if (lw->pixmap) return;
 
     /* make sure the window exists */
-    XGrabServer(obt_display);
-    XSync(obt_display, FALSE);
-
     if (!XCheckIfEvent(obt_display, &ce, look_for_destroy, (XPointer)&lw->id))
         lw->pixmap = XCompositeNameWindowPixmap(obt_display, lw->id);
-    XUngrabServer(obt_display);
 }
 
 static void texture_create(LocoWindow *lw)
@@ -201,8 +197,7 @@ static void texture_create(LocoWindow *lw)
     };
 
     if (lw->glpixmap) return;
-
-    g_assert(lw->pixmap);
+    if (!lw->pixmap) return;
 
     if (!lw->screen->glxFBConfig[lw->depth]) {
         g_print("no glxFBConfig for depth %d for window 0x%lx\n",