X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=e9b6c509b040b5a058f9e4772e2ca2c7e3907484;hb=367bf8f76227dea6e7e10e974967ae1d60cfe38e;hp=dbe2c82e266ea493e565ae0b68c9cc5ec2cb4a38;hpb=cbb9b4d7de7e4a439dd586a8c8d4cd5f4e4622ba;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index dbe2c82..e9b6c50 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -48,6 +48,9 @@ int refresh_systray;
 int systray_enabled;
 int systray_max_icon_size = 0;
 
+// background pixmap if we render ourselves the icons
+static Pixmap render_background = 0;
+
 
 void init_systray()
 {
@@ -87,12 +90,19 @@ void cleanup_systray()
 	systray_enabled = 0;
 	systray.area.on_screen = 0;
 	free_area(&systray.area);
+	if (render_background) XFreePixmap(server.dsp, render_background);
 }
 
 
 void draw_systray(void *obj, cairo_t *c, int active)
 {
-	// tint2 don't draw systray icons. just the background.
+	if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+		if (render_background) XFreePixmap(server.dsp, render_background);
+		render_background = XCreatePixmap(server.dsp, server.root_win, systray.area.width, systray.area.height, server.depth);
+		XCopyArea(server.dsp, systray.area.pix.pmap, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
+	}
+
+		// tint2 don't draw systray icons. just the background.
 	refresh_systray = 1;
 }
 
@@ -413,7 +423,7 @@ gboolean add_icon(Window id)
 	// watch for the icon trying to resize itself!
 	XSelectInput(server.dsp, traywin->tray_id, StructureNotifyMask);
 	if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
-		traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles);
+		traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportNonEmpty);
 		XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
 	}
 
@@ -488,15 +498,20 @@ void net_message(XClientMessageEvent *e)
 	}
 }
 
-
-void systray_render_icons(TrayWindow* traywin)
+void systray_render_icon_now(void* t)
 {
+	TrayWindow* traywin = t;
+	traywin->render_timeout = 0;
+
 	// good systray icons support 32 bit depth, but some icons are still 24 bit.
 	// 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);
+	if (image == 0)
+		return;
+
 	imlib_context_set_image(image);
 	imlib_image_set_has_alpha(1);
 	DATA32* data = imlib_image_get_data();
@@ -506,17 +521,26 @@ void systray_render_icons(TrayWindow* traywin)
 	if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
 		adjust_asb(data, traywin->width, traywin->height, systray.alpha, (float)systray.saturation/100, (float)systray.brightness/100);
 	imlib_image_put_back_data(data);
+	XCopyArea(server.dsp, render_background, systray.area.pix.pmap, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x-systray.area.posx, traywin->y-systray.area.posy);
 	if ( !real_transparency ) {
-		imlib_context_set_drawable(panel->main_win);
-		imlib_render_image_on_drawable(traywin->x, traywin->y);
 		imlib_context_set_drawable(systray.area.pix.pmap);
 		imlib_render_image_on_drawable(traywin->x-systray.area.posx, traywin->y-systray.area.posy);
 	}
 	else {
-		render_image(panel->main_win, traywin->x, traywin->y, traywin->width, traywin->height);
 		render_image(systray.area.pix.pmap, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
 	}
-	imlib_free_image();
+	XCopyArea(server.dsp, systray.area.pix.pmap, 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();
+
+	XDamageSubtract(server.dsp, traywin->damage, None, None);
+	XFlush(server.dsp);
+}
+
+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);
 }
 
 
@@ -528,10 +552,8 @@ void refresh_systray_icon()
 		traywin = (TrayWindow*)l->data;
 		if (traywin->hide) continue;
 		if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
-			systray_render_icons(traywin);
+			systray_render_icon(traywin);
 		else
 			XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
 	}
-	if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
-		XFlush(server.dsp);
 }