X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fsystray%2Fsystraybar.c;h=c8c0b6b6ea3b33963e236be0b6a70cc0872528aa;hb=5c73d8e6fca08157fa70cdb30069dd09c3619afb;hp=cc1412294ffa75737704b680d5c817ffb125cdf5;hpb=e050df33d29de6f7890b7111f6ea871aa5247743;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index cc14122..c8c0b6b 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -56,7 +56,6 @@ static Pixmap render_background;
 
 void default_systray()
 {
-printf("*** default_systray()\n");
 	memset(&systray, 0, sizeof(Systraybar));
 	render_background = 0;
 	systray.alpha = 100;
@@ -67,7 +66,7 @@ printf("*** default_systray()\n");
 
 void cleanup_systray()
 {
-printf("*** cleanup_systray()\n");
+	stop_net();
 	systray_enabled = 0;
 	systray_max_icon_size = 0;
 	systray.area.on_screen = 0;
@@ -374,6 +373,7 @@ gboolean add_icon(Window id)
 	if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
 	unsigned long mask = 0;
 	XSetWindowAttributes set_attr;
+	//printf("icon with depth: %d, width %d, height %d\n", attr.depth, attr.width, attr.height);
 	printf("icon with depth: %d\n", attr.depth);
 	if (attr.depth != server.depth || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
 		set_attr.colormap = attr.colormap;
@@ -559,10 +559,10 @@ void systray_render_icon_now(void* t)
 		return;
 	}
 	Picture pict_image;
-	if (server.real_transparency)
-		pict_image = XRenderCreatePicture(server.dsp, traywin->id, f, 0, 0);
-	else
-		pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
+	//if (server.real_transparency)
+		//pict_image = XRenderCreatePicture(server.dsp, traywin->id, f, 0, 0);
+	// reverted Rev 407 because here it's breaking alls icon with systray + xcompmgr
+	pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
 	Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual32), 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);
@@ -577,6 +577,8 @@ void systray_render_icon_now(void* t)
 		return;
 
 	imlib_context_set_image(image);
+	//if (traywin->depth == 24)
+		//imlib_save_image("/home/thil77/test.jpg");
 	imlib_image_set_has_alpha(1);
 	DATA32* data = imlib_image_get_data();
 	if (traywin->depth == 24) {