From c29301d02a2d4860b4de01e37771564493e312d3 Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@rty.ca>
Date: Wed, 5 Aug 2009 15:41:29 -0600
Subject: [PATCH] Move xdbe swap stuff into x11.c.

---
 src/conky.c |   30 +++++++++---------------------
 src/x11.c   |   14 ++++++++++++++
 src/x11.h   |    4 ++++
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/conky.c b/src/conky.c
index fb9c0e6..9a66d45 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -7276,15 +7276,9 @@ static void draw_stuff(void)
 	draw_mode = FG;
 	draw_text();
 #ifdef X11
+	xdbe_swap_buffers();
 	if (output_methods & TO_X) {
 #ifdef HAVE_XDBE
-		if (use_xdbe) {
-			XdbeSwapInfo swap;
-
-			swap.swap_window = window.window;
-			swap.swap_action = XdbeBackground;
-			XdbeSwapBuffers(display, &swap, 1);
-		}
 #endif
 	}
 #endif /* X11 */
@@ -7443,15 +7437,9 @@ static void main_loop(void)
 						XResizeWindow(display, window.window, window.width,
 								window.height); /* resize window */
 						set_transparent_background(window.window);
-						/* swap buffers */
 #ifdef HAVE_XDBE
-						if (use_xdbe) {
-							XdbeSwapInfo swap;
-
-							swap.swap_window = window.window;
-							swap.swap_action = XdbeBackground;
-							XdbeSwapBuffers(display, &swap, 1);
-						}
+						/* swap buffers */
+						xdbe_swap_buffers();
 #endif
 
 						changed++;
@@ -7660,12 +7648,12 @@ static void main_loop(void)
 			XFixesSetRegion(display, x11_stuff.region2, 0, 0);
 #endif /* HAVE_XDAMAGE */
 
-			/* XDBE doesn't seem to provide a way to clear the back buffer without
-			 * interfering with the front buffer, other than passing XdbeBackground
-			 * to XdbeSwapBuffers. That means that if we're using XDBE, we need to
-			 * redraw the text even if it wasn't part of the exposed area. OTOH,
-			 * if we're not going to call draw_stuff at all, then no swap happens
-			 * and we can safely do nothing. */
+			/* XDBE doesn't seem to provide a way to clear the back buffer
+			 * without interfering with the front buffer, other than passing
+			 * XdbeBackground to XdbeSwapBuffers. That means that if we're
+			 * using XDBE, we need to redraw the text even if it wasn't part of
+			 * the exposed area. OTOH, if we're not going to call draw_stuff at
+			 * all, then no swap happens and we can safely do nothing. */
 
 			if (!XEmptyRegion(x11_stuff.region)) {
 #ifdef HAVE_XDBE
diff --git a/src/x11.c b/src/x11.c
index 28f5e8d..c25e818 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -775,3 +775,17 @@ void set_struts(int sidenum)
 	}
 }
 #endif /* OWN_WINDOW */
+
+#ifdef HAVE_XDBE
+void xdbe_swap_buffers(void)
+{
+	if (use_xdbe) {
+		XdbeSwapInfo swap;
+
+		swap.swap_window = window.window;
+		swap.swap_action = XdbeBackground;
+		XdbeSwapBuffers(display, &swap, 1);
+	}
+}
+#endif /* HAVE_XDBE */
+
diff --git a/src/x11.h b/src/x11.h
index 738fcb3..8c89f3b 100644
--- a/src/x11.h
+++ b/src/x11.h
@@ -94,5 +94,9 @@ long get_x11_color(const char *);
 void get_x11_desktop_info(Display *display, Atom atom);
 void set_struts(int);
 
+#ifdef HAVE_XDBE
+void xdbe_swap_buffers(void);
+#endif /* HAVE_XDBE */
+
 #endif /*X11_H_*/
 #endif /* X11 */
-- 
1.7.9.5