X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=f1eb7c5273c4c9ebfa6fc9d1d877493238b81d5b;hp=6d72240271a57274965085576217d614856bd16a;hb=928fc258ac46f2cc098f714921c028351b07ec31;hpb=346e19cf9cc32f56221ae0e9dc25070cefedb5be

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 6d72240..f1eb7c5 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -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
@@ -24,6 +25,10 @@
 #include <string.h>
 #include <glib.h>
 #include <Imlib2.h>
+#include <X11/extensions/Xdamage.h>
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xrender.h>
+
 
 #include "systraybar.h"
 #include "server.h"
@@ -41,77 +46,247 @@ Window net_sel_win = None;
 
 // freedesktop specification doesn't allow multi systray
 Systraybar systray;
+int refresh_systray;
+int systray_enabled;
+int systray_max_icon_size;
 
+// background pixmap if we render ourselves the icons
+static Pixmap render_background;
 
-void init_systray()
-{
-	cleanup_systray();
 
-	Panel *panel = &panel1[0];
-	systray.area.parent = panel;
-	systray.area.panel = panel;
+void default_systray()
+{
+	memset(&systray, 0, sizeof(Systraybar));
+	render_background = 0;
+	systray.alpha = 100;
+	systray.sort = 3;
+	systray.area._draw_foreground = draw_systray;
+	systray.area.size_mode = SIZE_BY_CONTENT;
 	systray.area._resize = resize_systray;
+}
 
-	if (systray.area.visible) {
-		if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
-			fprintf(stderr, "tint2 : another systray is running\n");
-			systray.area.visible = 0;
-		}
+void cleanup_systray()
+{
+	stop_net();
+	systray_enabled = 0;
+	systray_max_icon_size = 0;
+	systray.area.on_screen = 0;
+	free_area(&systray.area);
+	if (render_background) {
+		XFreePixmap(server.dsp, render_background);
+		render_background = 0;
 	}
+}
 
-	if (systray.area.visible)
-		systray.area.visible = net_init();
+void init_systray()
+{
+	start_net();
 
-	if (!systray.area.visible)
+	if (!systray_enabled)
 		return;
 
-	// configure systray
-	// draw only one systray (even with multi panel)
-	systray.area.posy = panel->area.pix.border.width + panel->area.paddingy;
-	systray.area.height = panel->area.height - (2 * systray.area.posy);
-	systray.area.width = 0;
+	if (!server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)) {
+		printf("No 32 bit visual for your X implementation. 'systray_asb = 100 0 0' will be forced\n");
+		systray.alpha = 100;
+		systray.brightness = systray.saturation = 0;
+	}
+}
+
 
-	systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
-	if (panel->clock.area.visible)
-		systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
+void init_systray_panel(void *p)
+{
+	Panel *panel =(Panel*)p;
 
-	systray.area.redraw = 1;
+	if (panel_horizontal) {
+		systray.area.posy = panel->area.bg->border.width + panel->area.paddingy;
+		systray.area.height = panel->area.height - (2 * systray.area.posy);
+	}
+	else {
+		systray.area.posx = panel->area.bg->border.width + panel->area.paddingy;
+		systray.area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
+	}
+	systray.area.parent = p;
+	systray.area.panel = p;
+	
+	GSList *l;
+	int count = 0;
+	for (l = systray.list_icons; l ; l = l->next) {
+		if (!((TrayWindow*)l->data)->hide)
+			count++;
+	}
+	if (count == 0)
+		systray.area.on_screen = 0;
+	else 
+		systray.area.on_screen = 1;
+	refresh_systray = 0;
 }
 
 
-void cleanup_systray()
+void draw_systray(void *obj, cairo_t *c)
 {
-	free_area(&systray.area);
+	// TODO : position and size the icon window when position of systray is known
+	Systraybar *sysbar = obj;
+	Panel *panel = sysbar->area.panel;
+	int i, posx, posy, marging=3, icons_per_column=1, icons_per_row=1;
+	int icon_size = 24;
+	int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2;
+	if (panel_horizontal) {
+		posy = start;
+		posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
+	}
+	else {
+		posx = start;
+		posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
+	}
 
-	if (net_sel_win != None) {
-  		XDestroyWindow(server.dsp, net_sel_win);
-  		net_sel_win = None;
+	TrayWindow *traywin;
+	GSList *l;
+	for (i=1, l = systray.list_icons; l ; i++, 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) {
+			if (i % icons_per_column)
+				posy += icon_size + sysbar->area.paddingx;
+			else {
+				posy = start;
+				posx += (icon_size + systray.area.paddingx);
+			}
+		}
+		else {
+			if (i % icons_per_row)
+				posx += icon_size + systray.area.paddingx;
+			else {
+				posx = start;
+				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);
+		XResizeWindow(server.dsp, traywin->tray_id, icon_size, icon_size);
+	}
+
+	if (server.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, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
+	}
+
+	refresh_systray = 1;
+}
+
+
+int resize_systray(void *obj)
+{
+	Systraybar *sysbar = obj;
+	GSList *l;
+	int count, icon_size;
+	int icons_per_column=1, icons_per_row=1, marging=0;
+
+	if (panel_horizontal)
+		icon_size = sysbar->area.height;
+	else
+		icon_size = sysbar->area.width;
+	icon_size = icon_size - (2 * sysbar->area.bg->border.width) - (2 * sysbar->area.paddingy);
+	if (systray_max_icon_size > 0 && icon_size > systray_max_icon_size)
+		icon_size = systray_max_icon_size;
+	count = 0;
+	for (l = systray.list_icons; l ; l = l->next) {
+		if (!((TrayWindow*)l->data)->hide)
+			count++;
 	}
-   if (systray.list_icons) {
-      g_slist_free(systray.list_icons);
-      systray.list_icons = 0;
-   }
+	//printf("count %d\n", count);
+
+	if (panel_horizontal) {
+		int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
+		// here icons_per_column always higher than 0
+		icons_per_column = (height+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+		marging = height - (icons_per_column-1)*(icon_size+sysbar->area.paddingx) - icon_size;
+		icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
+		systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_row) + ((icons_per_row-1) * systray.area.paddingx);
+	}
+	else {
+		int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
+		// here icons_per_row always higher than 0
+		icons_per_row = (width+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+		marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size;
+		icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
+		systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * systray.area.paddingx);
+	}
+	return 1;
 }
 
 
-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.
-	int orient = 0;
+	// v0.3 trayer specification. tint2 always horizontal.
+	// Vertical panel will draw the systray horizontal.
+	long orient = 0;
 	XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
+	VisualID vid;
+	if (server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0))
+		vid = XVisualIDFromVisual(server.visual32);
+	else
+		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;
@@ -120,167 +295,219 @@ int net_init()
 	ev.data.l[3] = 0;
 	ev.data.l[4] = 0;
 	XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
-
-	return 1;
 }
 
 
-void resize_systray (void *obj)
+void stop_net()
 {
-	Systraybar *sysbar = obj;
-	Panel *panel = sysbar->area.panel;
-	int count = g_slist_length(systray.list_icons);
-
-	if (!count) systray.area.width = 0;
-	else systray.area.width = 30 * count;
-
-	systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
-	if (panel->clock.area.visible)
-		systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
-
-	systray.area.redraw = 1;
-
-	// resize other objects on panel
-	printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
-}
-
-
-
-Window win, root;
-int width, height;
-int border;
-int icon_size;
-
-
-void fix_geometry()
-{
-  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;
+	const TrayWindow * traywin_a = (TrayWindow*)a;
+	const TrayWindow * traywin_b = (TrayWindow*)b;
+	XTextProperty name_a, name_b;
 
-  error = FALSE;
-  old = XSetErrorHandler(window_error_handler);
-  XReparentWindow(server.dsp, traywin->id, win, 0, 0);
-  XSync(server.dsp, False);
-  XSetErrorHandler(old);
-
-  return !error;
+	if(XGetWMName(server.dsp, traywin_a->tray_id, &name_a) == 0) {
+		return -1;
+	}
+	else if(XGetWMName(server.dsp, traywin_b->tray_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;
-
-	systray.list_icons = g_slist_append(systray.list_icons, traywin);
-  	printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id);
-  	systray.area.resize = 1;
-
-	// changed in systray force resize on panel
+	XErrorHandler old;
 	Panel *panel = systray.area.panel;
-	panel->area.resize = 1;
-	panel_refresh = 1;
-	return TRUE;
+	int hide = 0;
 
-	if (!icon_swallow(traywin)) {
-		printf("not icon_swallow\n");
-		g_free(traywin);
+	error = FALSE;
+	XWindowAttributes attr;
+	if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
+	unsigned long mask = 0;
+	XSetWindowAttributes set_attr;
+	Visual* visual = server.visual;
+	//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) {
+		visual = attr.visual;
+		set_attr.colormap = attr.colormap;
+		set_attr.background_pixel = 0;
+		set_attr.border_pixel = 0;
+		mask = CWColormap|CWBackPixel|CWBorderPixel;
+	}
+	else {
+		set_attr.background_pixmap = ParentRelative;
+		mask = CWBackPixmap;
+	}
+	Window parent_window;
+	parent_window = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr);
+	old = XSetErrorHandler(window_error_handler);
+	XReparentWindow(server.dsp, id, parent_window, 0, 0);
+	XSync(server.dsp, False);
+	XSetErrorHandler(old);
+	if (error != FALSE) {
+		fprintf(stderr, "tint2 : not icon_swallow\n");
+		XDestroyWindow(server.dsp, parent_window);
 		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");
+			XDestroyWindow(server.dsp, parent_window);
+			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] = parent_window;
+		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 = parent_window;
+	traywin->tray_id = id;
+	traywin->hide = hide;
+	traywin->depth = attr.depth;
+	traywin->damage = 0;
+
+	if (systray.area.on_screen == 0)
+		systray.area.on_screen = 1;
+
+	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;
+	//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);
+	XSelectInput(server.dsp, traywin->tray_id, StructureNotifyMask);
+	if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+		traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles);
+		XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
+	}
 
 	// show the window
-	XMapRaised(server.dsp, traywin->id);
+	if (!traywin->hide)
+		XMapWindow(server.dsp, traywin->tray_id);
+	if (!traywin->hide && !panel->is_hidden)
+		XMapRaised(server.dsp, traywin->id);
 
+	// changed in systray force resize on panel
+	panel->area.resize = 1;
+	panel_refresh = 1;
 	return TRUE;
 }
 
 
-void icon_remove(TrayWindow *traywin)
+void remove_icon(TrayWindow *traywin)
 {
 	XErrorHandler old;
-	Window win_id = traywin->id;
-
-	XSelectInput(server.dsp, traywin->id, NoEventMask);
 
-	// remove it from our list
+	// remove from our list
 	systray.list_icons = g_slist_remove(systray.list_icons, traywin);
-	g_free(traywin);
-	printf("suppression d'un icone %d\n", g_slist_length(systray.list_icons));
-  	systray.area.resize = 1;
+	systray.area.resize = 1;
+	//printf("remove_icon id %lx, %d\n", traywin->id);
 
-	// changed in systray force resize on panel
-	Panel *panel = systray.area.panel;
-	panel->area.resize = 1;
-	panel_refresh = 1;
-	return;
+	XSelectInput(server.dsp, traywin->tray_id, NoEventMask);
+	if (traywin->damage)
+		XDamageDestroy(server.dsp, traywin->damage);
 
-/*
-	// reparent it to root
+	// reparent to root
 	error = FALSE;
 	old = XSetErrorHandler(window_error_handler);
-	XReparentWindow(server.dsp, win_id, root, 0, 0);
+	if (!traywin->hide)
+		XUnmapWindow(server.dsp, traywin->tray_id);
+	XReparentWindow(server.dsp, traywin->tray_id, server.root_win, 0, 0);
+	XDestroyWindow(server.dsp, traywin->id);
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
+	if (traywin->render_timeout)
+		stop_timeout(traywin->render_timeout);
+	g_free(traywin);
 
-	reposition_icons();
-	fix_geometry();
-	*/
+	// check empty systray
+	int count = 0;
+	GSList *l;
+	for (l = systray.list_icons; l ; l = l->next) {
+		if (!((TrayWindow*)l->data)->hide)
+			count++;
+	}
+	if (count == 0) {
+		systray.area.on_screen = 0;
+		systray.area.width = 0;
+	}
+	// changed in systray force resize on panel
+	Panel *panel = systray.area.panel;
+	panel->area.resize = 1;
+	panel_refresh = 1;
 }
 
 
@@ -290,122 +517,120 @@ void net_message(XClientMessageEvent *e)
 	Window id;
 
 	opcode = e->data.l[1];
-
 	switch (opcode) {
-	case SYSTEM_TRAY_REQUEST_DOCK:
-		panel_refresh = 1;
-		id = e->data.l[2];
-		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 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
+	// we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here
+	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;
+
+	// 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, 32);
+	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;
+	//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);
+	XRenderFreePicture(server.dsp, pict_drawable);
+	// end of the ugly hack and we can continue as before
+
+	imlib_context_set_visual(server.visual32);
+	imlib_context_set_colormap(server.colormap32);
+	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);
+	//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) {
+		createHeuristicMask(data, traywin->width, traywin->height);
+	}
+	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, 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);
+	render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
+	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);
+	imlib_context_set_visual(server.visual);
+	imlib_context_set_colormap(server.colormap);
+
+	if (traywin->damage)
+		XDamageSubtract(server.dsp, traywin->damage, None, None);
+	XFlush(server.dsp);
+}
 
-/*
-void event_loop()
+
+void systray_render_icon(TrayWindow* traywin)
 {
-  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);
-  }
+	if (server.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);
+	}
 }
-*/
 
+
+void refresh_systray_icon()
+{
+	TrayWindow *traywin;
+	GSList *l;
+	for (l = systray.list_icons; l ; l = l->next) {
+		traywin = (TrayWindow*)l->data;
+		if (traywin->hide) continue;
+		systray_render_icon(traywin);
+	}
+}