*fix* issue 221

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

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index edf0706e1a18fca03d6b903b83ee6f72d0898c8e..f1a69c423d9dd2f02163b8055e382d39f76b48d1 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -27,6 +27,8 @@
 #include <Imlib2.h>
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xrender.h>
+
 
 #include "systraybar.h"
 #include "server.h"
@@ -350,7 +352,8 @@ gboolean add_icon(Window id)
        XGetWindowAttributes(server.dsp, id, &attr);
        unsigned long mask = 0;
        XSetWindowAttributes set_attr;
-       if (attr.depth != server.depth || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0 ) {
+//     printf("icon with depth: %d\n", attr.depth);
+       if (attr.depth != server.depth ) {
                set_attr.colormap = attr.colormap;
                set_attr.background_pixel = 0;
                set_attr.border_pixel = 0;
@@ -506,6 +509,7 @@ void net_message(XClientMessageEvent *e)
 
 void systray_render_icon_now(void* t)
 {
+       // we end up in this function only in real transparency mode or if systray_task_asb != 100 0 0
        TrayWindow* traywin = t;
        traywin->render_timeout = 0;
 
@@ -513,15 +517,36 @@ void systray_render_icon_now(void* t)
        // We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
        // mask out all pixel with the same rgb value
        Panel* panel = systray.area.panel;
-       imlib_context_set_drawable(traywin->id);
-       Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 0);
+
+       // Very ugly hack, but somehow imlib2 is not able to get the image from the traywindow itself,
+       // so we first render the tray window onto a pixmap, and then we tell imlib2 to use this pixmap as
+       // drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
+       Pixmap tmp_pmap = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
+       XRenderPictFormat* f;
+       if (traywin->depth == 24)
+               f = XRenderFindStandardFormat(server.dsp, PictStandardRGB24);
+       else if (traywin->depth == 32)
+               f = XRenderFindStandardFormat(server.dsp, PictStandardARGB32);
+       else {
+               printf("Strange tray icon found with depth: %d\n", traywin->depth);
+               return;
+       }
+       Picture pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
+       Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
+       XRenderComposite(server.dsp, PictOpSrc, pict_image, None, pict_drawable, 0, 0, 0, 0, 0, 0, traywin->width, traywin->height);
+       XRenderFreePicture(server.dsp, pict_image);
+       XRenderFreePicture(server.dsp, pict_drawable);
+       // end of the ugly hack and we can continue as before
+
+       imlib_context_set_drawable(tmp_pmap);
+       Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 1);
        if (image == 0)
                return;
 
        imlib_context_set_image(image);
        imlib_image_set_has_alpha(1);
        DATA32* data = imlib_image_get_data();
-       if (traywin->depth == 24) {
+       if (traywin->depth == 24 && server.depth != 24) {
                createHeuristicMask(data, traywin->width, traywin->height);
        }
        if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
@@ -537,6 +562,7 @@ void systray_render_icon_now(void* t)
        }
        XCopyArea(server.dsp, systray.area.pix, panel->main_win, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y);
        imlib_free_image_and_decache();
+       XFreePixmap(server.dsp, tmp_pmap);
 
        if (traywin->damage)
                XDamageSubtract(server.dsp, traywin->damage, None, None);