Author: Travis Watkins <amaranth@ubuntu.com>
Description: Call glXWaitX before we start drawing
 Call glXWaitX before we start drawing to make sure X is done
 handling rendering calls. Suggested by Michel Dänzer to ensure
 we don't have any rendering glitches.
Origin: vendor, ubuntu (1:0.8.3+git20090917-0ubuntu3)
--- a/src/display.c
+++ b/src/display.c
@@ -1537,6 +1537,8 @@ eventLoop (void)
 			    timeDiff = 0;
 
 			makeScreenCurrent (s);
+			/* make sure X is ready for us to draw */
+			glXWaitX ();
 
 			if (s->slowAnimations)
 			{