]> Dogcows Code - chaz/tint2/blobdiff - src/systray/systraybar.c
fixed segfault on tray application due to tint2
[chaz/tint2] / src / systray / systraybar.c
index a6b3767ca90e2fed3f4b90754e6f871bb63911fd..18c1f22e97ed3e4523316d85f75e6274704812da 100644 (file)
 
 #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;
+
+// freedesktop specification doesn't allow multi systray
+Systraybar systray;
+
+
+void init_systray()
+{
+       cleanup_systray();
+
+       Panel *panel = &panel1[0];
+       systray.area.parent = panel;
+       systray.area.panel = panel;
+       systray.area._draw_foreground = draw_systray;
+       systray.area._resize = resize_systray;
+
+       if (systray.area.on_screen) {
+               if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
+                       fprintf(stderr, "tint2 : another systray is running\n");
+                       systray.area.on_screen = 0;
+               }
+       }
+
+       if (systray.area.on_screen)
+               systray.area.on_screen = net_init();
+
+       if (!systray.area.on_screen)
+               return;
+
+       // 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.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);
+
+       systray.area.redraw = 1;
+}
+
+
+void cleanup_systray()
+{
+   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);
+
+       if (net_sel_win != None) {
+               XDestroyWindow(server.dsp, net_sel_win);
+               net_sel_win = None;
+       }
+}
+
+
+void draw_systray(void *obj, cairo_t *c, int active)
+{
+       Systraybar *sysbar = obj;
+       Panel *panel = sysbar->area.panel;
+       TrayWindow *traywin;
+       GSList *l;
+       int icon_size;
+
+       icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
+       for (l = systray.list_icons; l ; l = l->next) {
+               traywin = (TrayWindow*)l->data;
+
+               printf("draw_systray %d %d\n", systray.area.posx, systray.area.width);
+               // watch for the icon trying to resize itself!
+               XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
+
+               // position and size the icon window
+               XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
+
+               // resize our window so that the new window can fit in it
+               //fix_geometry();
+
+               // flush before clearing, otherwise the clear isn't effective.
+               XFlush(server.dsp);
+               // make sure the new child will get the right stuff in its background
+               // for ParentRelative.
+               XClearWindow(server.dsp, panel->main_win);
+
+               // show the window
+               XMapRaised(server.dsp, traywin->id);
+       }
+}
+
+
+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);
+
+       systray.area.redraw = 1;
+
+       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;
+               posx += (icon_size + systray.area.paddingx);
+       }
+
+       // resize other objects on panel
+       printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
+}
+
+
+int net_init()
+{
+       // 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;
+}
+
+
+//int width, height;
+
+/*
+void fix_geometry()
+{
+  GSList *it;
+  Panel *panel = systray.area.panel;
+
+  // find the proper width and height
+  width = 0;
+  height = icon_size;
+  for (it = icons; it != NULL; it = g_slist_next(it)) {
+    width += icon_size;
+  }
+
+  XResizeWindow(server.dsp, panel->main_win, width + border * 2, height + border * 2);
+}
+*/
+
+gboolean error;
+int window_error_handler(Display *d, XErrorEvent *e)
+{
+  d=d;e=e;
+  if (e->error_code == BadWindow) {
+    error = TRUE;
+  } else {
+    //g_printerr("X ERROR NOT BAD WINDOW!\n");
+    abort();
+  }
+  return 0;
+}
+
+
+gboolean icon_swallow(Window id)
+{
+  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);
+
+  return !error;
+}
+
+
+// The traywin must have its id and type set.
+gboolean add_icon(Window id)
+{
+       TrayWindow *traywin;
+
+       if (!icon_swallow(id)) {
+               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;
+
+       // changed in systray force resize on panel
+       Panel *panel = systray.area.panel;
+       panel->area.resize = 1;
+       panel_refresh = 1;
+
+// => calcul x, y, width, height dans resize
+/*
+       // find the positon for the systray app window
+       int count = g_slist_length(icons);
+       traywin->x = border + ((width % icon_size) / 2) +
+       (count % (width / icon_size)) * icon_size;
+       traywin->y = border + ((height % icon_size) / 2) +
+       (count / (height / icon_size)) * icon_size;
+
+       // add the new icon to the list
+       icons = g_slist_append(icons, traywin);
+*/
+
+       return TRUE;
+}
+
+
+void remove_icon(TrayWindow *traywin)
 {
-   return 0;
+       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;
+
+       // 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:
+                       printf("message from dockapp\n");
+                       id = e->window;
+                       break;
+
+               case SYSTEM_TRAY_CANCEL_MESSAGE:
+                       printf("message cancelled\n");
+                       id = e->window;
+                       break;
+
+               default:
+                       if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
+                               printf("message from dockapp:\n  %s\n", e->data.b);
+                               id = e->window;
+                       }
+                       // unknown message type. not in the spec
+                       break;
+       }
 }
 
 
This page took 0.027387 seconds and 4 git commands to generate.