added left2right and right2left value to systray_sort option

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

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 9842384443b7653b02e9c768a68374709f81b65a..af79d1f0adae30ab9ad5291e7df32e0ede1edaf2 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -78,15 +78,14 @@ void init_systray()
 
 void cleanup_systray()
 {
-   if (systray.list_icons) {
-               GSList *it;
+       if (systray.list_icons) {
+               // remove_icon change systray.list_icons
+               while(systray.list_icons)
+                       remove_icon((TrayWindow*)systray.list_icons->data);
 
-               for (it = systray.list_icons; it; it = it->next)
-                       remove_icon((TrayWindow*)it->data);
-
-      g_slist_free(systray.list_icons);
-      systray.list_icons = 0;
-   }
+               g_slist_free(systray.list_icons);
+               systray.list_icons = 0;
+       }
 
        free_area(&systray.area);
        cleanup_net();
@@ -172,14 +171,35 @@ void resize_systray(void *obj)
 
 int init_net()
 {
+       Window win = XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN);
+
        // freedesktop systray specification
-       if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
-               fprintf(stderr, "tint2 : another systray is running\n");
+       if (win != None) {
+               // search pid
+               Atom _NET_WM_PID, actual_type;
+               int actual_format;
+               unsigned long nitems;
+               unsigned long bytes_after;
+               unsigned char *prop = 0;
+               int pid;
+
+               _NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
+               //atom_name = XGetAtomName (dpy,atom);
+
+               int ret = XGetWindowProperty(server.dsp, win, _NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
+
+               fprintf(stderr, "tint2 : another systray is running");
+               if (ret == Success && prop) {
+                       pid = prop[1] * 256;
+                       pid += prop[0];
+                       fprintf(stderr, " pid=%d", pid);
+               }
+               fprintf(stderr, "\n");
                return 0;
        }
 
        // init systray protocol
-   net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
+       net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
 
        // v0.2 trayer specification. tint2 always orizontal.
        // TODO : vertical panel ??
@@ -190,11 +210,11 @@ int init_net()
        if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
                fprintf(stderr, "tint2 : can't get systray manager\n");
                return 0;
-       }
+       }
 
-   XClientMessageEvent ev;
+       XClientMessageEvent ev;
        ev.type = ClientMessage;
-   ev.window = server.root_win;
+       ev.window = server.root_win;
        ev.message_type = server.atom.MANAGER;
        ev.format = 32;
        ev.data.l[0] = CurrentTime;
@@ -210,8 +230,8 @@ int init_net()
 void cleanup_net()
 {
        if (net_sel_win != None) {
-               XDestroyWindow(server.dsp, net_sel_win);
-               net_sel_win = None;
+               XDestroyWindow(server.dsp, net_sel_win);
+               net_sel_win = None;
        }
 }
 
@@ -228,6 +248,28 @@ int window_error_handler(Display *d, XErrorEvent *e)
 }
 
 
+static gint compare_traywindows(gconstpointer a, gconstpointer b)
+{
+       const TrayWindow * traywin_a = (TrayWindow*)a;
+       const TrayWindow * traywin_b = (TrayWindow*)b;
+       XTextProperty name_a, name_b;
+
+       if(XGetWMName(server.dsp, traywin_a->id, &name_a) == 0) {
+               return -1;
+       }
+       else if(XGetWMName(server.dsp, traywin_b->id, &name_b) == 0) {
+               XFree(name_a.value);
+               return 1;
+       }
+       else {
+               gint retval = g_ascii_strncasecmp((char*)name_a.value, (char*)name_b.value, -1) * systray.sort;
+               XFree(name_a.value);
+               XFree(name_b.value);
+               return retval;
+       }
+}
+
+
 gboolean add_icon(Window id)
 {
        TrayWindow *traywin;
@@ -277,8 +319,13 @@ gboolean add_icon(Window id)
        traywin = g_new0(TrayWindow, 1);
        traywin->id = id;
 
-       systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
-       systray.area.resize = 1;
+       if (systray.sort == 3)
+               systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
+       else if (systray.sort == 2)
+               systray.list_icons = g_slist_append(systray.list_icons, traywin);
+       else
+               systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
+       systray.area.resize = 1;
        systray.area.redraw = 1;
        //printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
 
@@ -303,7 +350,7 @@ 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.resize = 1;
        systray.area.redraw = 1;
        //printf("remove_icon id %lx, %d\n", traywin->id);