]> Dogcows Code - chaz/tint2/blobdiff - src/systray/systraybar.c
change systray code. fixed issue 91.
[chaz/tint2] / src / systray / systraybar.c
index 9fd70832a526eb5567404fbb9df107fadd5249ab..d382d8a72eaa5c5ce61e8b350f6ef8d8f0c63d67 100644 (file)
@@ -2,6 +2,7 @@
 * Tint2 : systraybar
 *
 * Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr)
+* based on 'docker-1.5' from Ben Jansens.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
 
 #include "systraybar.h"
 #include "server.h"
-#include "window.h"
 #include "panel.h"
 
+GSList *icons;
 
+/* defined in the systray spec */
+#define SYSTEM_TRAY_REQUEST_DOCK    0
+#define SYSTEM_TRAY_BEGIN_MESSAGE   1
+#define SYSTEM_TRAY_CANCEL_MESSAGE  2
 
-int resize_systray (Systraybar *sysbar)
+// selection window
+Window net_sel_win = None, hint_win = None;
+
+// freedesktop specification doesn't allow multi systray
+Systraybar systray;
+
+
+void init_systray()
 {
-   return 0;
+       Panel *panel = &panel1[0];
+
+       if (systray.area.on_screen)
+               systray.area.on_screen = init_net();
+
+       if (!systray.area.on_screen)
+               return;
+
+       systray.area.parent = panel;
+       systray.area.panel = panel;
+       systray.area._resize = resize_systray;
+
+       // configure systray
+       // draw only one systray (even with multi panel)
+       systray.area.posy = panel->area.pix.border.width + panel->area.paddingy;
+       systray.area.height = panel->area.height - (2 * systray.area.posy);
+       systray.area.width = 0;
+       systray.area.redraw = 1;
+
+       systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
+       if (panel->clock.area.on_screen)
+               systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+#ifdef ENABLE_BATTERY
+       if (panel->battery.area.on_screen)
+               systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
+#endif
 }
 
-/*
-// initialise taskbar posx and width
-void resize_taskbar()
+
+void cleanup_systray()
 {
-   int taskbar_width, modulo_width, taskbar_on_screen;
-
-   if (panel.mode == MULTI_DESKTOP) taskbar_on_screen = panel.nb_desktop;
-   else taskbar_on_screen = panel.nb_monitor;
-
-   taskbar_width = panel.area.width - (2 * panel.area.paddingx) - (2 * panel.area.pix.border.width);
-   if (panel.clock.time1_format)
-      taskbar_width -= (panel.clock.area.width + panel.area.paddingx);
-   taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel.area.paddingx)) / taskbar_on_screen;
-
-   if (taskbar_on_screen > 1)
-      modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel.area.paddingx)) % taskbar_on_screen;
-   else
-      modulo_width = 0;
-
-   int i, nb, modulo=0, posx=0;
-   nb = panel.nb_desktop * panel.nb_monitor;
-   for (i=0 ; i < nb ; i++) {
-      if ((i % taskbar_on_screen) == 0) {
-         posx = panel.area.pix.border.width + panel.area.paddingx;
-         modulo = modulo_width;
-      }
-      else posx += taskbar_width + panel.area.paddingx;
-
-      panel.taskbar[i].area.posx = posx;
-      panel.taskbar[i].area.width = taskbar_width;
-      if (modulo) {
-         panel.taskbar[i].area.width++;
-         modulo--;
-      }
-
-      resize_tasks(&panel.taskbar[i]);
+   if (systray.list_icons) {
+               GSList *it;
+
+               for (it = systray.list_icons; it; it = it->next)
+                       remove_icon((TrayWindow*)it->data);
+
+      g_slist_free(systray.list_icons);
+      systray.list_icons = 0;
    }
+
+       free_area(&systray.area);
+
+       cleanup_net();
+}
+
+
+void resize_systray(void *obj)
+{
+       Systraybar *sysbar = obj;
+       Panel *panel = sysbar->area.panel;
+       TrayWindow *traywin;
+       GSList *l;
+       int count, posx, posy;
+       int icon_size;
+
+       icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
+       count = g_slist_length(systray.list_icons);
+
+       if (!count) systray.area.width = 0;
+       else systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
+
+       systray.area.posx = panel->area.width - panel->area.pix.border.width - panel->area.paddingxlr - systray.area.width;
+       if (panel->clock.area.on_screen)
+               systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+#ifdef ENABLE_BATTERY
+       if (panel->battery.area.on_screen)
+               systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
+#endif
+
+       posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
+       posx = systray.area.posx + systray.area.pix.border.width + systray.area.paddingxlr;
+       for (l = systray.list_icons; l ; l = l->next) {
+               traywin = (TrayWindow*)l->data;
+
+               traywin->y = posy;
+               traywin->x = posx;
+               traywin->width = icon_size;
+               traywin->height = icon_size;
+               posx += (icon_size + systray.area.paddingx);
+
+               // position and size the icon window
+               XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
+       }
+       //printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
+}
+
+/*
+void create_hint_win()
+{
+   XWMHints hints;
+   XClassHint classhints;
+       Panel *panel = systray.area.panel;
+
+       hint_win = XCreateSimpleWindow(server.dsp, server.root_win, 0, 0, 1, 1, 0, 0, 0);
+
+       hints.flags = StateHint | WindowGroupHint | IconWindowHint;
+       hints.initial_state = WithdrawnState;
+       hints.window_group = hint_win;
+       hints.icon_window = panel->main_win;
+
+       classhints.res_name = "docker";
+       classhints.res_class = "Docker";
+
+       XSetWMProperties(server.dsp, hint_win, NULL, NULL, NULL, 0,
+                                                NULL, &hints, &classhints);
+
+       XMapWindow(server.dsp, hint_win);
 }
 */
 
+int init_net()
+{
+       if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
+               fprintf(stderr, "tint2 : another systray is running\n");
+               return 0;
+       }
+
+       //create_hint_win();
+
+       // init systray protocol
+   net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
+
+       // v0.2 trayer specification. tint2 always orizontal.
+       int orient = 0;
+       XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 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) {
+               fprintf(stderr, "tint2 : can't get systray manager\n");
+               return 0;
+       }
+
+   XClientMessageEvent ev;
+       ev.type = ClientMessage;
+   ev.window = server.root_win;
+       ev.message_type = server.atom.MANAGER;
+       ev.format = 32;
+       ev.data.l[0] = CurrentTime;
+       ev.data.l[1] = server.atom._NET_SYSTEM_TRAY_SCREEN;
+       ev.data.l[2] = net_sel_win;
+       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()
+{
+       if (net_sel_win != None) {
+               XDestroyWindow(server.dsp, net_sel_win);
+               net_sel_win = None;
+       }
+}
+
+
+gboolean error;
+int window_error_handler(Display *d, XErrorEvent *e)
+{
+       d=d;e=e;
+       error = TRUE;
+       if (e->error_code != BadWindow) {
+               printf("error_handler %d\n", e->error_code);
+       }
+       return 0;
+}
+
+
+// The traywin must have its id and type set.
+gboolean add_icon(Window id)
+{
+       TrayWindow *traywin;
+       XErrorHandler old;
+       Panel *panel = systray.area.panel;
+
+       error = FALSE;
+       old = XSetErrorHandler(window_error_handler);
+       XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
+       XSync(server.dsp, False);
+       XSetErrorHandler(old);
+
+       if (error != FALSE) {
+               fprintf(stderr, "tint2 : not icon_swallow\n");
+               return FALSE;
+       }
+
+       traywin = g_new0(TrayWindow, 1);
+       traywin->id = id;
+
+       systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
+       //printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id);
+       systray.area.resize = 1;
+       systray.area.redraw = 1;
+
+       // watch for the icon trying to resize itself!
+       XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
+
+       // show the window
+       XMapRaised(server.dsp, traywin->id);
+
+       // changed in systray force resize on panel
+       panel->area.resize = 1;
+       panel_refresh = 1;
+       return TRUE;
+}
+
+
+void remove_icon(TrayWindow *traywin)
+{
+       XErrorHandler old;
+
+       XSelectInput(server.dsp, traywin->id, NoEventMask);
+
+       // reparent to root
+       error = FALSE;
+       old = XSetErrorHandler(window_error_handler);
+       XReparentWindow(server.dsp, traywin->id, server.root_win, 0, 0);
+       XSync(server.dsp, False);
+       XSetErrorHandler(old);
+
+       // remove from our list
+       systray.list_icons = g_slist_remove(systray.list_icons, traywin);
+       g_free(traywin);
+       //printf("suppression d'un icone %d\n", g_slist_length(systray.list_icons));
+       systray.area.resize = 1;
+       systray.area.redraw = 1;
+
+       // changed in systray force resize on panel
+       Panel *panel = systray.area.panel;
+       panel->area.resize = 1;
+       panel_refresh = 1;
+
+}
+
+
+void net_message(XClientMessageEvent *e)
+{
+       unsigned long opcode;
+       Window id;
+
+       opcode = e->data.l[1];
+       switch (opcode) {
+               case SYSTEM_TRAY_REQUEST_DOCK:
+                       id = e->data.l[2];
+                       if (id) add_icon(id);
+                       break;
+
+               case SYSTEM_TRAY_BEGIN_MESSAGE:
+               case SYSTEM_TRAY_CANCEL_MESSAGE:
+                       // we don't show baloons messages.
+                       break;
+
+               default:
+                       if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
+                               printf("message from dockapp: %s\n", e->data.b);
+                       }
+                       else
+                               printf("SYSTEM_TRAY : unknown message type\n");
+                       break;
+       }
+}
+
+
+void refresh_systray()
+{
+       TrayWindow *traywin;
+       GSList *l;
+       for (l = systray.list_icons; l ; l = l->next) {
+               traywin = (TrayWindow*)l->data;
+               XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
+       }
+}
+
 
This page took 0.028188 seconds and 4 git commands to generate.