X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=9592fdc9e58c2b416a37e2163e39e323f3d10b78;hb=ac96fe8050ff0f5c4d0cb4b794eeee875e1d4bfd;hp=bb3d9ed394f3643a08400fe5e6fb8a33dc24f7fc;hpb=f779570f7f83c10be6e278b1f3ec3795247260b6;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index bb3d9ed..9592fdc 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -48,12 +48,36 @@ Window net_sel_win = None;
 Systraybar systray;
 int refresh_systray;
 int systray_enabled;
-int systray_max_icon_size = 0;
+int systray_max_icon_size;
 
 // background pixmap if we render ourselves the icons
-static Pixmap render_background = 0;
+static Pixmap render_background;
 
 
+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;
+}
+
+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;
+	}
+}
+
 void init_systray()
 {
 	start_net();
@@ -66,8 +90,6 @@ void init_systray()
 		systray.alpha = 100;
 		systray.brightness = systray.saturation = 0;
 	}
-	systray.area._draw_foreground = draw_systray;
-	systray.area._resize = resize_systray;
 	systray.area.resize = 1;
 	systray.area.redraw = 1;
 	systray.area.on_screen = 1;
@@ -92,18 +114,9 @@ void init_systray_panel(void *p)
 }
 
 
-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)
 {
-	if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+	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);
@@ -113,7 +126,7 @@ void draw_systray(void *obj, cairo_t *c)
 }
 
 
-void resize_systray(void *obj)
+int resize_systray(void *obj)
 {
 	Systraybar *sysbar = obj;
 	Panel *panel = sysbar->area.panel;
@@ -215,8 +228,7 @@ void resize_systray(void *obj)
 		XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
 		XResizeWindow(server.dsp, traywin->tray_id, icon_size, icon_size);
 	}
-	// resize force the redraw
-	systray.area.redraw = 1;
+	return 1;
 }
 
 
@@ -265,7 +277,7 @@ void start_net()
 
 	// v0.3 trayer specification. tint2 always horizontal.
 	// Vertical panel will draw the systray horizontal.
-	int orient = 0;
+	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))
@@ -358,11 +370,14 @@ gboolean add_icon(Window id)
 
 	error = FALSE;
 	XWindowAttributes attr;
-	XGetWindowAttributes(server.dsp, id, &attr);
+	if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
 	unsigned long mask = 0;
 	XSetWindowAttributes set_attr;
-	printf("icon with depth: %d\n", attr.depth);
+	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;
@@ -373,7 +388,7 @@ gboolean add_icon(Window id)
 		mask = CWBackPixmap;
 	}
 	Window parent_window;
-	parent_window = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, attr.visual, mask, &set_attr);
+	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);
@@ -441,7 +456,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) {
+	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);
 	}
@@ -543,7 +558,11 @@ void systray_render_icon_now(void* t)
 		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_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);
@@ -558,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) {
@@ -582,7 +603,7 @@ void systray_render_icon_now(void* t)
 
 void systray_render_icon(TrayWindow* traywin)
 {
-	if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+	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);