]> Dogcows Code - chaz/tint2/blobdiff - src/systray/systraybar.c
*fix* clear tooltip window before redrawing
[chaz/tint2] / src / systray / systraybar.c
index 0fa8daeb56e42656b33f36d1a59c9de15f33f156..02ed1b4ed20440b212fe422550be4399a363b210 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
@@ -37,99 +38,196 @@ GSList *icons;
 #define SYSTEM_TRAY_CANCEL_MESSAGE  2
 
 // selection window
-Window net_sel_win = None;
+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()
 {
-   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 : another systray is running\n");
-                       run_systray = 0;
-               }
-       }
-
-       if (run_systray)
-               run_systray = net_init();
-
-       // configure sysbar on all panels
-       for (i=0 ; i < nb_panel ; i++) {
-          panel = &panel1[i];
-          sysbar = &panel->systray;
+       start_net();
 
-          if (!run_systray) {
-               sysbar->area.visible = 0;
-               continue;
-               }
-          if (!sysbar->area.visible)
-               continue;
+       if (!systray_enabled)
+               return;
 
-               sysbar->area.parent = panel;
-               sysbar->area.panel = panel;
+       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;
+}
 
-               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);
+void init_systray_panel(void *p)
+{
+       Panel *panel =(Panel*)p;
 
-               sysbar->area.redraw = 1;
+       if (panel_horizontal) {
+               systray.area.posy = panel->area.pix.border.width + panel->area.paddingy;
+               systray.area.height = panel->area.height - (2 * systray.area.posy);
        }
+       else {
+               systray.area.posx = panel->area.pix.border.width + panel->area.paddingy;
+               systray.area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
+       }
+       systray.area.parent = p;
+       systray.area.panel = p;
 }
 
 
 void cleanup_systray()
 {
-   Panel *panel;
-   int i;
+       systray_enabled = 0;
+       systray.area.on_screen = 0;
+       free_area(&systray.area);
+}
+
+
+void draw_systray(void *obj, cairo_t *c, int active)
+{
+       // tint2 don't draw systray icons. just the background.
+       refresh_systray = 1;
+}
 
-       for (i=0 ; i < nb_panel ; i++) {
-               panel = &panel1[i];
-          if (!panel->systray.area.visible) continue;
 
-               free_area(&panel->systray.area);
+void resize_systray(void *obj)
+{
+       Systraybar *sysbar = obj;
+       Panel *panel = sysbar->area.panel;
+       TrayWindow *traywin;
+       GSList *l;
+       int count, posx, posy;
+       int icon_size;
+
+       if (panel_horizontal)
+               icon_size = sysbar->area.height;
+       else
+               icon_size = sysbar->area.width;
+       icon_size = icon_size - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
+       count = 0;
+       for (l = systray.list_icons; l ; l = l->next) {
+               if (!((TrayWindow*)l->data)->hide)
+                       count++;
+       }
+       //printf("count %d\n", count);
+
+       if (panel_horizontal) {
+               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
+       }
+       else {
+               if (!count) systray.area.height = 0;
+               else systray.area.height = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
+
+               systray.area.posy = panel->area.pix.border.width + panel->area.paddingxlr;
+               if (panel->clock.area.on_screen)
+                       systray.area.posy += (panel->clock.area.height + panel->area.paddingx);
+#ifdef ENABLE_BATTERY
+               if (panel->battery.area.on_screen)
+                       systray.area.posy += (panel->battery.area.height + panel->area.paddingx);
+#endif
        }
 
-       if (net_sel_win != None) {
-               XDestroyWindow(server.dsp, net_sel_win);
-               net_sel_win = None;
+       if (panel_horizontal) {
+               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;
+       }
+       else {
+               posx = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
+               posy = systray.area.posy + systray.area.pix.border.width + systray.area.paddingxlr;
+       }
+       for (l = systray.list_icons; l ; l = l->next) {
+               traywin = (TrayWindow*)l->data;
+               if (traywin->hide) continue;
+
+               traywin->y = posy;
+               traywin->x = posx;
+               traywin->width = icon_size;
+               traywin->height = icon_size;
+               if (panel_horizontal)
+                       posx += (icon_size + systray.area.paddingx);
+               else
+                       posy += (icon_size + systray.area.paddingx);
+
+               // position and size the icon window
+               XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
        }
 }
 
 
-int net_init()
+// ***********************************************
+// systray protocol
+
+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
+       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);
+               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;
+       }
+
        // 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.
+       // v0.2 trayer specification. tint2 always horizontal.
+       // 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;
+       }
 
-   XClientMessageEvent ev;
+       //fprintf(stderr, "tint2 : systray started\n");
+       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;
@@ -137,237 +235,220 @@ int net_init()
        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, &ev);
-
-       return 1;
-}
-
-
-int resize_systray (Systraybar *sysbar)
-{
-   return 0;
+       XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
 }
 
 
-
-Window win, root;
-int width, height;
-int border;
-int icon_size;
-
-
-void fix_geometry()
+void stop_net()
 {
-  GSList *it;
-
-  // find the proper width and height
-  width = 0;
-  height = icon_size;
-  for (it = icons; it != NULL; it = g_slist_next(it)) {
-    width += icon_size;
-  }
+       //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;
+       }
 
-  XResizeWindow(server.dsp, win, width + border * 2, height + border * 2);
+       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;
-  if (e->error_code == BadWindow) {
-    error = TRUE;
-  } else {
-    //g_printerr("X ERROR NOT BAD WINDOW!\n");
-    abort();
-  }
-  return 0;
+       d=d;e=e;
+       error = TRUE;
+       if (e->error_code != BadWindow) {
+               printf("error_handler %d\n", e->error_code);
+       }
+       return 0;
 }
 
 
-gboolean icon_swallow(TrayWindow *traywin)
+static gint compare_traywindows(gconstpointer a, gconstpointer b)
 {
-  XErrorHandler old;
-
-  error = FALSE;
-  old = XSetErrorHandler(window_error_handler);
-  XReparentWindow(server.dsp, traywin->id, win, 0, 0);
-  XSync(server.dsp, False);
-  XSetErrorHandler(old);
+       const TrayWindow * traywin_a = (TrayWindow*)a;
+       const TrayWindow * traywin_b = (TrayWindow*)b;
+       XTextProperty name_a, name_b;
 
-  return !error;
+       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;
+       }
 }
 
 
-// The traywin must have its id and type set.
-gboolean icon_add(Window id)
+gboolean add_icon(Window id)
 {
        TrayWindow *traywin;
-
-       traywin = g_new0(TrayWindow, 1);
-       traywin->id = id;
-
-       if (!icon_swallow(traywin)) {
-               printf("not icon_swallow\n");
-               g_free(traywin);
+       XErrorHandler old;
+       Panel *panel = systray.area.panel;
+       int hide = 0;
+
+       error = FALSE;
+       old = XSetErrorHandler(window_error_handler);
+       XWindowAttributes attr;
+       XGetWindowAttributes(server.dsp, id, &attr);
+       if ( attr.depth != server.depth ) {
+               XSetWindowAttributes a;
+               a.background_pixmap = None;  // set to none, otherwise XReparentWindow fails...
+               a.background_pixel = 0;      // set background pixel to 0. Looks ugly, but at least the icon appears
+               // TODO: maybe the XShape extension can be used, to clip the icon
+               XChangeWindowAttributes(server.dsp, id, CWBackPixmap|CWBackPixel, &a);
+       }
+       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;
        }
 
-       // 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;
+       {
+               Atom acttype;
+               int actfmt;
+               unsigned long nbitem, bytes;
+               unsigned char *data = 0;
+               int ret;
+
+               ret = XGetWindowProperty(server.dsp, id, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data);
+               if (ret == Success) {
+                       if (data) {
+                               if (nbitem == 2) {
+                                       //hide = ((data[1] & XEMBED_MAPPED) == 0);
+                                       //printf("hide %d\n", hide);
+                               }
+                               XFree(data);
+                       }
+               }
+               else {
+                       fprintf(stderr, "tint2 : xembed error\n");
+                       return FALSE;
+               }
+       }
+       {
+               XEvent e;
+               e.xclient.type = ClientMessage;
+               e.xclient.serial = 0;
+               e.xclient.send_event = True;
+               e.xclient.message_type = server.atom._XEMBED;
+               e.xclient.window = id;
+               e.xclient.format = 32;
+               e.xclient.data.l[0] = CurrentTime;
+               e.xclient.data.l[1] = XEMBED_EMBEDDED_NOTIFY;
+               e.xclient.data.l[2] = 0;
+               e.xclient.data.l[3] = panel->main_win;
+               e.xclient.data.l[4] = 0;
+               XSendEvent(server.dsp, id, False, 0xFFFFFF, &e);
+       }
 
-       // add the new icon to the list
-       icons = g_slist_append(icons, traywin);
+       traywin = g_new0(TrayWindow, 1);
+       traywin->id = id;
+       traywin->hide = hide;
+
+       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));
 
        // 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, win);
-
        // show the window
-       XMapRaised(server.dsp, traywin->id);
+       if (!traywin->hide)
+               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;
+
+       // remove from our list
+       systray.list_icons = g_slist_remove(systray.list_icons, traywin);
+       systray.area.resize = 1;
+       systray.area.redraw = 1;
+       //printf("remove_icon id %lx, %d\n", traywin->id);
+
+       XSelectInput(server.dsp, traywin->id, NoEventMask);
+
+       // reparent to root
+       error = FALSE;
+       old = XSetErrorHandler(window_error_handler);
+       if (!traywin->hide)
+               XUnmapWindow(server.dsp, traywin->id);
+       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;
+       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:
-               panel_refresh = 1;
-               id = e->data.l[2];
-               printf("add dockapp\n");
-               if (id && icon_add(id)) {
-                       XSelectInput(server.dsp, id, StructureNotifyMask);
-               }
-               break;
-
-       case SYSTEM_TRAY_BEGIN_MESSAGE:
-               //g_printerr("Message From Dockapp\n");
-               id = e->window;
-               break;
-
-       case SYSTEM_TRAY_CANCEL_MESSAGE:
-               //g_printerr("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;
+               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
+                               fprintf(stderr, "SYSTEM_TRAY : unknown message type\n");
+                       break;
        }
 }
 
 
-/*
-void event_loop()
+void refresh_systray_icon()
 {
-  XEvent e;
-  Window cover;
-  GSList *it;
-
-  while (!exit_app) {
-    while (XPending(server.dsp)) {
-      XNextEvent(display, &e);
-
-      switch (e.type)
-      {
-      case PropertyNotify:
-        // systray window list has changed?
-        if (e.xproperty.atom == kde_systray_prop) {
-          XSelectInput(display, win, NoEventMask);
-          kde_update_icons();
-          XSelectInput(display, win, StructureNotifyMask);
-
-          while (XCheckTypedEvent(display, PropertyNotify, &e));
-        }
-
-        break;
-
-      case ConfigureNotify:
-        if (e.xany.window != win) {
-          // find the icon it pertains to and beat it into submission
-          GSList *it;
-
-          for (it = icons; it != NULL; it = g_slist_next(it)) {
-            TrayWindow *traywin = it->data;
-            if (traywin->id == e.xany.window) {
-              XMoveResizeWindow(display, traywin->id, traywin->x, traywin->y,
-                                icon_size, icon_size);
-              break;
-            }
-          }
-          break;
-        }
-
-        // briefly cover the entire containing window, which causes it and
-        // all of the icons to refresh their windows. finally, they update
-        // themselves when the background of the main window's parent changes.
-
-        cover = XCreateSimpleWindow(display, win, 0, 0,
-                                    border * 2 + width, border * 2 + height,
-                                    0, 0, 0);
-        XMapWindow(display, cover);
-        XDestroyWindow(display, cover);
-
-        break;
-
-      case ReparentNotify:
-        if (e.xany.window == win) // reparented to us
-          break;
-      case UnmapNotify:
-      case DestroyNotify:
-        for (it = icons; it; it = g_slist_next(it)) {
-          if (((TrayWindow*)it->data)->id == e.xany.window) {
-            icon_remove(it);
-            break;
-          }
-        }
-        break;
-
-      case ClientMessage:
-        if (e.xclient.message_type == net_opcode_atom &&
-            e.xclient.format == 32 &&
-            e.xclient.window == net_sel_win)
-          net_message(&e.xclient);
-
-      default:
-        break;
-      }
-    }
-    usleep(500000);
-  }
-
-  // remove/unparent all the icons
-  while (icons) {
-    // do the remove here explicitly, cuz the event handler isn't going to
-    // happen anymore.
-    icon_remove(icons);
-  }
+       TrayWindow *traywin;
+       GSList *l;
+       for (l = systray.list_icons; l ; l = l->next) {
+               traywin = (TrayWindow*)l->data;
+               if (traywin->hide) continue;
+               XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
+       }
 }
-*/
+
 
This page took 0.033947 seconds and 4 git commands to generate.