*add* real transparency is now supported... most systray applications work out of...

[chaz/tint2] / src / systray / systraybar.c

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 16dd079c57ce25060d414623bdd650e636a13900..273d9bb8e2d9879a05c7582ae48ad384d55f96e5 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -43,20 +43,21 @@ Window net_sel_win = None, hint_win = None;
 // freedesktop specification doesn't allow multi systray
 Systraybar systray;
 int refresh_systray;
+int systray_enabled;
 
 
 void init_systray()
 {
-       if (systray.area.on_screen)
-               systray.area.on_screen = init_net();
+       start_net();
 
-       if (!systray.area.on_screen)
+       if (!systray_enabled)
                return;
 
        systray.area._draw_foreground = draw_systray;
        systray.area._resize = resize_systray;
        systray.area.resize = 1;
        systray.area.redraw = 1;
+       systray.area.on_screen = 1;
        refresh_systray = 0;
 }
 
@@ -80,17 +81,9 @@ void init_systray_panel(void *p)
 
 void cleanup_systray()
 {
-       if (systray.list_icons) {
-               // remove_icon change systray.list_icons
-               while(systray.list_icons)
-                       remove_icon((TrayWindow*)systray.list_icons->data);
-
-               g_slist_free(systray.list_icons);
-               systray.list_icons = 0;
-       }
-
+       systray_enabled = 0;
+       systray.area.on_screen = 0;
        free_area(&systray.area);
-       cleanup_net();
 }
 
 
@@ -177,8 +170,18 @@ void resize_systray(void *obj)
 // ***********************************************
 // systray protocol
 
-int init_net()
+void start_net()
 {
+       if (net_sel_win) {
+               // protocol already started
+               if (!systray_enabled)
+                       stop_net();
+               return;
+       }
+       else
+               if (!systray_enabled)
+                       return;
+
        Window win = XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN);
 
        // freedesktop systray specification
@@ -201,7 +204,7 @@ int init_net()
                        fprintf(stderr, " pid=%d", pid);
                }
                fprintf(stderr, "\n");
-               return 0;
+               return;
        }
 
        // init systray protocol
@@ -211,13 +214,17 @@ int init_net()
        // Vertical panel will draw the systray horizontal.
        int orient = 0;
        XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
+       VisualID vid = XVisualIDFromVisual(server.visual);
+       XChangeProperty(server.dsp, net_sel_win, XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_VISUAL", False), XA_VISUALID, 32, PropModeReplace, (unsigned char*)&vid, 1);
 
        XSetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime);
        if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
+               stop_net();
                fprintf(stderr, "tint2 : can't get systray manager\n");
-               return 0;
+               return;
        }
 
+       //fprintf(stderr, "tint2 : systray started\n");
        XClientMessageEvent ev;
        ev.type = ClientMessage;
        ev.window = server.root_win;
@@ -229,12 +236,21 @@ int init_net()
        ev.data.l[3] = 0;
        ev.data.l[4] = 0;
        XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
-       return 1;
 }
 
 
-void cleanup_net()
+void stop_net()
 {
+       //fprintf(stderr, "tint2 : systray stopped\n");
+       if (systray.list_icons) {
+               // remove_icon change systray.list_icons
+               while(systray.list_icons)
+                       remove_icon((TrayWindow*)systray.list_icons->data);
+
+               g_slist_free(systray.list_icons);
+               systray.list_icons = 0;
+       }
+
        if (net_sel_win != None) {
                XDestroyWindow(server.dsp, net_sel_win);
                net_sel_win = None;
@@ -365,7 +381,6 @@ void remove_icon(TrayWindow *traywin)
 
        // remove from our list
        systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-       g_free(traywin);
        systray.area.resize = 1;
        systray.area.redraw = 1;
        //printf("remove_icon id %lx, %d\n", traywin->id);
@@ -380,6 +395,7 @@ void remove_icon(TrayWindow *traywin)
        XReparentWindow(server.dsp, traywin->id, server.root_win, 0, 0);
        XSync(server.dsp, False);
        XSetErrorHandler(old);
+       g_free(traywin);
 
        // changed in systray force resize on panel
        Panel *panel = systray.area.panel;