From: Andreas Fink <andreas.fink85@googlemail.com>
Date: Sun, 3 Jan 2010 13:14:25 +0000 (+0000)
Subject: *fix* issue 175
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=2e63fd9929fd2c261ad47f4d995dc99722177954;p=chaz%2Ftint2

*fix* issue 175
*fix* a bug I introduced with one of my previous checkins...
---

diff --git a/sample/black_single_desktop.tint2rc b/sample/black_single_desktop.tint2rc
index 7b5208c..8eb245c 100644
--- a/sample/black_single_desktop.tint2rc
+++ b/sample/black_single_desktop.tint2rc
@@ -79,6 +79,7 @@ systray = 1
 systray_padding = 7 8 5
 systray_background_id = 1
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # TOOLTIP
diff --git a/sample/default.tint2rc b/sample/default.tint2rc
index 07f3f2a..3fbd73c 100644
--- a/sample/default.tint2rc
+++ b/sample/default.tint2rc
@@ -77,6 +77,7 @@ systray = 1
 systray_padding = 8 4 5
 systray_background_id = 1
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # BATTERY
diff --git a/sample/horizontal_icon_only.tint2rc b/sample/horizontal_icon_only.tint2rc
index 3a7a69c..a8ca313 100644
--- a/sample/horizontal_icon_only.tint2rc
+++ b/sample/horizontal_icon_only.tint2rc
@@ -75,6 +75,7 @@ systray = 1
 systray_padding = 8 6 5
 systray_background_id = 0
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # BATTERY
diff --git a/sample/rounded_multi_desktop.tint2rc b/sample/rounded_multi_desktop.tint2rc
index bc50885..50a78d0 100644
--- a/sample/rounded_multi_desktop.tint2rc
+++ b/sample/rounded_multi_desktop.tint2rc
@@ -72,6 +72,7 @@ systray = 1
 systray_padding = 6 5 5
 systray_background_id =2
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # BATTERY
diff --git a/sample/tint2rc b/sample/tint2rc
index 6a9e86f..124cca0 100644
--- a/sample/tint2rc
+++ b/sample/tint2rc
@@ -65,6 +65,7 @@ systray = 1
 systray_padding = 0 4 5
 systray_background_id = 0
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # CLOCK
diff --git a/sample/vertical_icon_only.tint2rc b/sample/vertical_icon_only.tint2rc
index 9ed5fd7..1c8342b 100644
--- a/sample/vertical_icon_only.tint2rc
+++ b/sample/vertical_icon_only.tint2rc
@@ -65,6 +65,7 @@ systray = 1
 systray_padding = 2 8 0
 systray_background_id = 1
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # CLOCK
diff --git a/sample/white_single_desktop.tint2rc b/sample/white_single_desktop.tint2rc
index 713bc0a..4d62cf9 100644
--- a/sample/white_single_desktop.tint2rc
+++ b/sample/white_single_desktop.tint2rc
@@ -74,6 +74,7 @@ systray = 1
 systray_padding = 4 2 3
 systray_background_id = 0
 systray_sort = left2right
+systray_icon_size = 0
 
 #---------------------------------------------
 # CLOCK
diff --git a/src/config.c b/src/config.c
index 41d3f3f..5f74d4e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -542,6 +542,9 @@ void add_entry (char *key, char *value)
 		else  if (strcmp(value, "right2left") == 0)
 			systray.sort = 3;
 	}
+	else if (strcmp(key, "systray_icon_size") == 0) {
+		systray_max_icon_size = atoi(value);
+	}
 
 	/* Tooltip */
 	else if (strcmp (key, "tooltip") == 0)
diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index 822441b..7e28239 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -47,6 +47,7 @@ Window net_sel_win = None, hint_win = None;
 Systraybar systray;
 int refresh_systray;
 int systray_enabled;
+int systray_max_icon_size = 0;
 
 
 void init_systray()
@@ -111,6 +112,8 @@ void resize_systray(void *obj)
 	else
 		icon_size = sysbar->area.width;
 	icon_size = icon_size - (2 * sysbar->area.pix.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)
@@ -120,7 +123,11 @@ void resize_systray(void *obj)
 
 	if (panel_horizontal) {
 		if (!count) systray.area.width = 0;
-		else systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
+		else {
+			int icons_per_column = (sysbar->area.height - 2*sysbar->area.pix.border.width - 2*sysbar->area.paddingy + sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+			int row_count = count / icons_per_column + (count%icons_per_column != 0);
+			systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * row_count) + ((row_count-1) * systray.area.paddingx);
+		}
 
 		systray.area.posx = panel->area.width - panel->area.pix.border.width - panel->area.paddingxlr - systray.area.width;
 		if (panel->clock.area.on_screen)
@@ -132,7 +139,11 @@ void resize_systray(void *obj)
 	}
 	else {
 		if (!count) systray.area.height = 0;
-		else systray.area.height = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
+		else {
+			int icons_per_row = (sysbar->area.width - 2*sysbar->area.pix.border.width - 2*sysbar->area.paddingy + sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+			int column_count = count / icons_per_row+ (count%icons_per_row != 0);
+			systray.area.height = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * column_count) + ((column_count-1) * systray.area.paddingx);
+		}
 
 		systray.area.posy = panel->area.pix.border.width + panel->area.paddingxlr;
 		if (panel->clock.area.on_screen)
@@ -143,14 +154,18 @@ void resize_systray(void *obj)
 #endif
 	}
 
+	int max_line_pos;
 	if (panel_horizontal) {
+		max_line_pos = sysbar->area.posy+sysbar->area.height - sysbar->area.pix.border.width - sysbar->area.paddingy - icon_size;
 		posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
 		posx = systray.area.posx + systray.area.pix.border.width + systray.area.paddingxlr;
 	}
 	else {
+		max_line_pos = sysbar->area.posx+sysbar->area.width - sysbar->area.pix.border.width - sysbar->area.paddingy - icon_size;
 		posx = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
 		posy = systray.area.posy + systray.area.pix.border.width + systray.area.paddingxlr;
 	}
+
 	for (l = systray.list_icons; l ; l = l->next) {
 		traywin = (TrayWindow*)l->data;
 		if (traywin->hide) continue;
@@ -159,10 +174,22 @@ void resize_systray(void *obj)
 		traywin->x = posx;
 		traywin->width = icon_size;
 		traywin->height = icon_size;
-		if (panel_horizontal)
-			posx += (icon_size + systray.area.paddingx);
-		else
-			posy += (icon_size + systray.area.paddingx);
+		if (panel_horizontal) {
+			if (posy + icon_size + sysbar->area.paddingxlr < max_line_pos)
+				posy += icon_size + sysbar->area.paddingx;
+			else {
+				posx += (icon_size + systray.area.paddingx);
+				posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
+			}
+		}
+		else {
+			if (posx + icon_size + sysbar->area.paddingxlr < max_line_pos)
+				posx += icon_size + systray.area.paddingx;
+			else {
+				posy += (icon_size + systray.area.paddingx);
+				posx = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
+			}
+		}
 
 		// position and size the icon window
 		XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
@@ -305,7 +332,6 @@ gboolean add_icon(Window id)
 
 	error = FALSE;
 	int wrong_format = 0;
-	old = XSetErrorHandler(window_error_handler);
 	XWindowAttributes attr;
 	XGetWindowAttributes(server.dsp, id, &attr);
 	XSetWindowAttributes set_attr;
@@ -319,6 +345,7 @@ gboolean add_icon(Window id)
 		parent_window = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, attr.visual, mask, &set_attr);
 	else
 		parent_window = panel->main_win;
+	old = XSetErrorHandler(window_error_handler);
 	XReparentWindow(server.dsp, id, parent_window, 0, 0);
 	XSync(server.dsp, False);
 	XSetErrorHandler(old);
diff --git a/src/systray/systraybar.h b/src/systray/systraybar.h
index a2dbaba..842ec09 100644
--- a/src/systray/systraybar.h
+++ b/src/systray/systraybar.h
@@ -45,6 +45,7 @@ extern Window net_sel_win;
 extern Systraybar systray;
 extern int refresh_systray;
 extern int systray_enabled;
+extern int systray_max_icon_size;
 
 void init_systray();
 void init_systray_panel(void *p);
diff --git a/src/tint.c b/src/tint.c
index 433eb55..01db88c 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -73,7 +73,6 @@ void init (int argc, char *argv[])
 				snapshot_path = strdup(argv[i]);
 		}
 	}
-
 	// Set signal handler
 	struct sigaction sa = { .sa_handler = signal_handler };
 	sigaction(SIGUSR1, &sa, 0);
@@ -89,11 +88,13 @@ void init (int argc, char *argv[])
 	sigaddset(&block_mask, SIGUSR1);
 	sigprocmask(SIG_BLOCK, &block_mask, 0);
 
-
 	// set global data
 	memset(&server, 0, sizeof(Server_global));
-//	memset(&systray, 0, sizeof(Systraybar));
+	memset(&systray, 0, sizeof(Systraybar));
+}
 
+void init_X11()
+{
 	server.dsp = XOpenDisplay (NULL);
 	if (!server.dsp) {
 		fprintf(stderr, "tint2 exit : could not open display.\n");
@@ -119,6 +120,7 @@ void init (int argc, char *argv[])
 	gchar *path;
 	const gchar * const *data_dirs;
 	data_dirs = g_get_system_data_dirs ();
+	int i;
 	for (i = 0; data_dirs[i] != NULL; i++)	{
 		path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
 		if (g_file_test (path, G_FILE_TEST_EXISTS))
@@ -681,6 +683,7 @@ int main (int argc, char *argv[])
 	GSList *it;
 	const struct timespec* timeout;
 
+	init (argc, argv);
 	init_config();
 	i = 0;
 	if (config_path)
@@ -693,8 +696,7 @@ int main (int argc, char *argv[])
 		exit(1);
 	}
 
-	init (argc, argv);
-
+	init_X11();
 	init_panel();
 	cleanup_config();
 	if (snapshot_path) {