Make conky not crash when drawing on root window

[monky] / src / x11.c

diff --git a/src/x11.c b/src/x11.c
index a860bee..fff366d 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -53,6 +53,7 @@ int use_xdbe;
 
 #ifdef USE_ARGB
 int use_argb_visual;
+int own_window_argb_value;
 int have_argb_visual;
 #endif /* USE_ARGB */
 
@@ -176,11 +177,12 @@ static Window find_desktop_window(Window *p_root, Window *p_desktop)
        return win;
 }
 
+static int colour_set = -1;
 /* if no argb visual is configured sets background to ParentRelative for the Window and all parents,
    else real transparency is used */
-void set_transparent_background(Window win)
+void set_transparent_background(Window win, int alpha)
 {
-       static int colour_set = -1;
+       (void)alpha; /* disable warnings when unused */
 
 #ifdef USE_ARGB
        if (have_argb_visual) {
@@ -189,7 +191,7 @@ void set_transparent_background(Window win)
                        XSetWindowBackground(display, win, 0x00);
                } else if (colour_set != background_colour) {
                        XSetWindowBackground(display, win,
-                               background_colour | (0xff << 24));
+                               background_colour | (alpha << 24));
                        colour_set = background_colour;
                }
        } else {
@@ -235,10 +237,14 @@ static int get_argb_visual(Visual** visual, int *depth) {
                          visual_list[i].blue_mask  == 0x0000ff)) {
                        *visual = visual_list[i].visual;
                        *depth = visual_list[i].depth;
+                       DBGP("Found ARGB Visual");
+                       XFree(visual_list);
                        return 1;
                }
        }
        // no argb visual available
+       DBGP("No ARGB Visual found");
+       XFree(visual_list);
        return 0;
 }
 #endif /* USE_ARGB */
@@ -254,6 +260,7 @@ void destroy_window(void)
                XFreeGC(display, window.gc);
        }
        memset(&window, 0, sizeof(struct conky_window));
+       colour_set = -1;
 }
 
 void init_window(int own_window, int w, int h, int set_trans, int back_colour,
@@ -524,6 +531,8 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
                if (!window.window) {
                        window.window = find_desktop_window(&window.root, &window.desktop);
                }
+               window.visual = DefaultVisual(display, screen);
+               window.colourmap = DefaultColormap(display, screen);
 
                if (XGetWindowAttributes(display, window.window, &attrs)) {
                        window.width = attrs.width;