cleanup code

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

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 240614576138bbfe923aea7ee1f3ac75ffc455f4..26b9b8d1b99369ef1cf02db5b5f5bebab6d017be 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -36,35 +36,80 @@ GSList *icons;
 #define SYSTEM_TRAY_BEGIN_MESSAGE   1
 #define SYSTEM_TRAY_CANCEL_MESSAGE  2
 
-Window net_sel_win;
+Window net_sel_win = None;
 
 
-void init_systray(Systraybar *sysbar, Area *parent)
+void init_systray()
 {
-   Panel *panel = (Panel *)parent;
-
-       sysbar->area.parent = parent;
-       sysbar->area.panel = panel;
+   Panel *panel;
+   Systraybar *sysbar;
+   int i, run_systray;
+
+       cleanup_systray();
+
+       run_systray = 0;
+       for (i=0 ; i < nb_panel ; i++) {
+          if (panel1[i].systray.area.visible) {
+               run_systray = 1;
+               break;
+               }
+       }
+       if (run_systray) {
+               if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
+                       fprintf(stderr, "tint2 warning : another systray is running\n");
+                       run_systray = 0;
+               }
+       }
+
+       if (run_systray)
+               run_systray = net_init();
+
+       for (i=0 ; i < nb_panel ; i++) {
+          panel = &panel1[i];
+          sysbar = &panel->systray;
+
+          if (!run_systray) {
+               sysbar->area.visible = 0;
+               continue;
+               }
+          if (!sysbar->area.visible)
+               continue;
+
+               sysbar->area.parent = panel;
+               sysbar->area.panel = panel;
+
+               sysbar->area.posy = panel->area.pix.border.width + panel->area.paddingy;
+               sysbar->area.height = panel->area.height - (2 * sysbar->area.posy);
+               sysbar->area.width = 100;
+
+               sysbar->area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - sysbar->area.width;
+          if (panel->clock.area.visible)
+               sysbar->area.posx -= (panel->clock.area.width + panel->area.paddingx);
+
+               sysbar->area.redraw = 1;
+       }
+}
 
-   sysbar->area.posy = parent->pix.border.width + parent->paddingy;
-   sysbar->area.height = parent->height - (2 * sysbar->area.posy);
-   sysbar->area.width = 100;
 
-   sysbar->area.posx = panel->area.width - panel->clock.area.width - panel->area.paddingxlr - panel->area.pix.border.width - panel->area.paddingx - sysbar->area.width;
+void cleanup_systray()
+{
+   Panel *panel;
+   int i;
 
-   sysbar->area.redraw = 1;
+       for (i=0 ; i < nb_panel ; i++) {
+               panel = &panel1[i];
+          if (!panel->systray.area.visible) continue;
 
-//printf("init_systray");
+               free_area(&panel->systray.area);
+       }
 
-       net_init();
+       if (net_sel_win != None) {
+               XDestroyWindow(server.dsp, net_sel_win);
+               net_sel_win = None;
+       }
 }
 
 
-// net_sel_atom == server.atom._NET_SYSTEM_TRAY
-// net_opcode_atom == server.atom._NET_SYSTEM_TRAY_OPCODE
-// net_manager_atom == server.atom.MANAGER
-// net_message_data_atom == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA
-
 int resize_systray (Systraybar *sysbar)
 {
    return 0;
@@ -93,12 +138,6 @@ void fix_geometry()
 }
 
 
-static void net_create_selection_window()
-{
-  net_sel_win = XCreateSimpleWindow(server.dsp, root, -1, -1, 1, 1, 0, 0, 0);
-}
-
-
 gboolean error;
 int window_error_handler(Display *d, XErrorEvent *e)
 {
@@ -172,15 +211,15 @@ gboolean icon_add(Window id)
 }
 
 
-void net_init()
+int net_init()
 {
        // init systray protocol
    net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
 
-       XSetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY, net_sel_win, CurrentTime);
-       if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY) != net_sel_win) {
-               fprintf(stderr, "tint error : can't get trayer selection");
-               return;
+       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) {
+               fprintf(stderr, "tint2 warning : can't get systray manager\n");
+               return 0;
        }
 
        XEvent m;
@@ -188,11 +227,12 @@ void net_init()
        m.xclient.message_type = server.atom.MANAGER;
        m.xclient.format = 32;
        m.xclient.data.l[0] = CurrentTime;
-       m.xclient.data.l[1] = server.atom._NET_SYSTEM_TRAY;
+       m.xclient.data.l[1] = server.atom._NET_SYSTEM_TRAY_SCREEN;
        m.xclient.data.l[2] = net_sel_win;
        m.xclient.data.l[3] = 0;
        m.xclient.data.l[4] = 0;
        XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, &m);
+       return 1;
 }