*add* more real_transparency things added... whole panel works now, but systray still...

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 3064a201f0057024e4b5839511def7dc3b6e8a40..ee3e27df6bb6042eca449152538c98cf102ce962 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -52,7 +52,6 @@ int panel_refresh;
 
 Task *task_active;
 Task *task_drag;
-GSList *urgent_list;
 int  max_tick_urgent;
 
 // panel's initial config
@@ -152,14 +151,22 @@ void init_panel()
                        long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask;
                        if (g_tooltip.enabled)
                                event_mask |= PointerMotionMask|LeaveWindowMask;
-                       XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, event_mask, NoEventMask, False, 0, 0 };
-                       p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att);
+                       XSetWindowAttributes att = { .event_mask=event_mask, .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
+                       unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel;
+                       p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
                }
                else {
                        // old panel
                        XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height);
                }
 
+               if (!server.gc) {
+                       XGCValues  gcv;
+                       if (real_transparency)
+                               server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv);
+                       else
+                               server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
+               }
                //printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
                set_panel_properties(p);
                set_panel_background(p);
@@ -239,11 +246,6 @@ void cleanup_panel()
 
        task_active = 0;
        task_drag = 0;
-       while (urgent_list) {
-               Task_urgent* t = urgent_list->data;
-               urgent_list = g_slist_remove(urgent_list, urgent_list->data);
-               free(t);
-       }
 
        cleanup_taskbar();
 
@@ -484,11 +486,23 @@ void set_panel_properties(Panel *p)
 
 void set_panel_background(Panel *p)
 {
-       get_root_pixmap();
-
        if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap);
        p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
 
+       if (real_transparency) {
+               cairo_surface_t *tmp = cairo_xlib_surface_create (server.dsp, p->area.pix.pmap, server.visual, p->area.width, p->area.height);
+               cairo_t *cr = cairo_create(tmp);
+               cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+               cairo_rectangle(cr, 0, 0, p->area.width, p->area.height);
+               cairo_set_source_rgba(cr, 1, 1, 1, 0);
+               cairo_paint (cr);
+               cairo_destroy (cr);
+               cairo_surface_destroy (tmp);
+               return;
+       }
+
+       get_root_pixmap();
+
        // copy background (server.root_pmap) in panel.area.pix.pmap
        Window dummy;
        int  x, y;