X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=9d460549cc50b8e6fe8b352d5cf41d6abd847ae5;hb=a72ae04bf96477f11d8bf24baea54596f6d3356b;hp=10344b7792a8c80fc19638094a4f9b5481ccefff;hpb=1680b7adc4db82b85a4b2c1b3a8e85397d88c052;p=chaz%2Ftint2

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 10344b7..9d46054 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -61,11 +61,13 @@ void default_systray()
 	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;
@@ -276,7 +278,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))
@@ -372,8 +374,11 @@ gboolean add_icon(Window id)
 	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;
@@ -384,7 +389,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);
@@ -434,7 +439,6 @@ gboolean add_icon(Window id)
 		XSendEvent(server.dsp, id, False, 0xFFFFFF, &e);
 	}
 
-	printf("Adding systray with window: %d\n", id);
 	traywin = g_new0(TrayWindow, 1);
 	traywin->id = parent_window;
 	traywin->tray_id = id;
@@ -475,7 +479,6 @@ void remove_icon(TrayWindow *traywin)
 {
 	XErrorHandler old;
 
-	printf("Removing systray with window: %d\n", traywin->tray_id);
 	// remove from our list
 	systray.list_icons = g_slist_remove(systray.list_icons, traywin);
 	systray.area.resize = 1;
@@ -575,6 +578,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) {