X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=8065774b5871b0296085ac298c82b4dd82c74dc8;hb=6f44852e0de01282bc6f347c1d28d1f3f6bdaf20;hp=2e34f3e63a5353d10035c76387bab190903a7250;hpb=baebbc7a9ab1ea0c08e579a109337f70a86570c5;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 2e34f3e..8065774 100644
--- 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"
@@ -513,8 +515,25 @@ 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 = XRenderFindVisualFormat(server.dsp, DefaultVisual(server.dsp, 0));
+	else
+		f = XRenderFindStandardFormat(server.dsp, PictStandardARGB32);
+	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;
 
@@ -537,6 +556,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);
@@ -546,9 +566,20 @@ void systray_render_icon_now(void* t)
 
 void systray_render_icon(TrayWindow* traywin)
 {
-	// wine tray icons update whenever mouse is over them, so we limit the updates to 50 ms
-	if (traywin->render_timeout == 0)
-		traywin->render_timeout = add_timeout(50, 0, systray_render_icon_now, traywin);
+	if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+		// wine tray icons update whenever mouse is over them, so we limit the updates to 50 ms
+		if (traywin->render_timeout == 0)
+			traywin->render_timeout = add_timeout(50, 0, systray_render_icon_now, traywin);
+	}
+	else {
+		// comment by andreas: I'm still not sure, what exactly we need to do here... Somehow trayicons which do not
+		// offer the same depth as tint2 does, need to draw a background pixmap, but this cannot be done with
+		// XCopyArea... So we actually need XRenderComposite???
+//			Pixmap pix = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
+//			XCopyArea(server.dsp, panel->temp_pmap, pix, server.gc, traywin->x, traywin->y, traywin->width, traywin->height, 0, 0);
+//			XSetWindowBackgroundPixmap(server.dsp, traywin->id, pix);
+		XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True);
+	}
 }
 
 
@@ -559,16 +590,6 @@ void refresh_systray_icon()
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
 		if (traywin->hide) continue;
-		if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
-			systray_render_icon(traywin);
-		else {
-			// comment by andreas: I'm still not sure, what exactly we need to do here... Somehow trayicons which do not
-			// offer the same depth as tint2 does, need to draw a background pixmap, but this cannot be done with
-			// XCopyArea... So we actually need XRenderComposite???
-//			Pixmap pix = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
-//			XCopyArea(server.dsp, panel->temp_pmap, pix, server.gc, traywin->x, traywin->y, traywin->width, traywin->height, 0, 0);
-//			XSetWindowBackgroundPixmap(server.dsp, traywin->id, pix);
-			XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True);
-		}
+		systray_render_icon(traywin);
 	}
 }