*fix* broke systray with last checkin for fake transparency

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 6da20c53e04e79d021a8e03710af1917f384cd46..e61fe19332eed4135805390f444b2ab9dcd73508 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -46,6 +46,7 @@ int mouse_tilt_right;
 int panel_mode;
 int wm_menu;
 int panel_dock=0;  // default not in the dock
+int panel_layer=BOTTOM_LAYER;  // default is bottom layer
 int panel_position;
 int panel_horizontal;
 int panel_refresh;
@@ -151,14 +152,19 @@ 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;
+                       server.gc = XCreateGC(server.dsp, p->main_win, 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);
@@ -389,19 +395,18 @@ void set_panel_properties(Panel *p)
        XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
 
        // Sticky and below other window
-       val = 0xFFFFFFFF;
+       val = ALLDESKTOP;
        XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
        Atom state[4];
        state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;
        state[1] = server.atom._NET_WM_STATE_SKIP_TASKBAR;
        state[2] = server.atom._NET_WM_STATE_STICKY;
-       state[3] = server.atom._NET_WM_STATE_BELOW;
-       XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4);
+       state[3] = panel_layer == BOTTOM_LAYER ? server.atom._NET_WM_STATE_BELOW : server.atom._NET_WM_STATE_ABOVE;
+       XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, panel_layer == NORMAL_LAYER ? 3 : 4);
 
        // Unfocusable
        XWMHints wmhints;
        if (panel_dock) {
-               // TODO: Xdnd feature cannot be used in withdrawn state at the moment (at least GTK apps fail, qt seems to work)
                wmhints.icon_window = wmhints.window_group = p->main_win;
                wmhints.flags = StateHint | IconWindowHint;
                wmhints.initial_state = WithdrawnState;
@@ -478,17 +483,21 @@ 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);
 
-       // copy background (server.root_pmap) in panel.area.pix.pmap
-       Window dummy;
-       int  x, y;
-       XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
-       XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
-       XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
+       if (real_transparency) {
+               clear_pixmap(p->area.pix.pmap, 0, 0, p->area.width, p->area.height);
+       }
+       else {
+               get_root_pixmap();
+               // copy background (server.root_pmap) in panel.area.pix.pmap
+               Window dummy;
+               int  x, y;
+               XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
+               XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
+               XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
+       }
 
        // draw background panel
        cairo_surface_t *cs;