X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=3eebf88dfe2cb5bf3f670b8949abfcd7dc8479ea;hb=5b867835741534d8d28e8d158b8f7de53e55018a;hp=1b6c4e8988ecfb53d5227eaab397d630c8055ce6;hpb=1833c8e7e22505fcf47435fe9f28fa51313311b5;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index 1b6c4e8..3eebf88 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -103,13 +103,42 @@ void init (int argc, char *argv[])
 	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
 
 	setlocale (LC_ALL, "");
+
+	// load default icon
+	int i;
+	char *path;
+	const gchar * const *data_dirs;
+	data_dirs = g_get_system_data_dirs ();
+	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))
+			default_icon = imlib_load_image(path);
+		g_free(path);
+	}
+
+	// get monitor and desktop config
+	get_monitors();
+	get_desktops();
 }
 
 
 void cleanup()
 {
+	cleanup_systray();
 	cleanup_panel();
 
+	if (default_icon) {
+		imlib_context_set_image(default_icon);
+		imlib_free_image();
+	}
+	if (g_tooltip.window) {
+		XDestroyWindow(server.dsp, g_tooltip.window);
+		g_tooltip.window = 0;
+	}
+	if (g_tooltip.font_desc) {
+		pango_font_description_free(g_tooltip.font_desc);
+		g_tooltip.font_desc = 0;
+	}
 	if (time1_font_desc) pango_font_description_free(time1_font_desc);
 	if (time2_font_desc) pango_font_description_free(time2_font_desc);
 	if (time1_format) g_free(time1_format);
@@ -142,16 +171,14 @@ Taskbar *click_taskbar (Panel *panel, int x, int y)
 	if (panel_horizontal) {
 		for (i=0; i < panel->nb_desktop ; i++) {
 			tskbar = &panel->taskbar[i];
-			if (!tskbar->area.on_screen) continue;
-			if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+			if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
 				return tskbar;
 		}
 	}
 	else {
 		for (i=0; i < panel->nb_desktop ; i++) {
 			tskbar = &panel->taskbar[i];
-			if (!tskbar->area.on_screen) continue;
-			if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+			if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
 				return tskbar;
 		}
 	}
@@ -293,13 +320,6 @@ void event_button_release (XEvent *e)
 	Panel *panel = get_panel(e->xany.window);
 	if (!panel) return;
 
-	if (wm_menu && click_padding(panel, e->xbutton.x, e->xbutton.y)) {
-			// forward the click to the desktop window (thanks conky)
-			e->xbutton.window = server.root_win;
-			XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
-			return;
-	}
-
 	int action = TOGGLE_ICONIFY;
 	switch (e->xbutton.button) {
 		case 2:
@@ -526,6 +546,9 @@ void event_property_notify (XEvent *e)
 				panel_refresh = 1;
 			}
 		}
+// We do not check for the iconified state, since it only unsets our active window
+// but in openbox a shaded window is considered iconified. So we would loose the active window
+// property on unshading it again (commented 01.10.2009)
 //		else if (at == server.atom.WM_STATE) {
 //			// Iconic state
 //			// TODO : try to delete following code
@@ -615,7 +638,14 @@ void event_expose (XEvent *e)
 
 void event_configure_notify (Window win)
 {
-	// check 'win' move in systray
+	// change in root window (xrandr)
+	if (win == server.root_win) {
+		get_monitors();
+		init_panel();
+		return;
+	}
+
+	// 'win' is a trayer icon
 	TrayWindow *traywin;
 	GSList *l;
 	for (l = systray.list_icons; l ; l = l->next) {
@@ -628,9 +658,8 @@ void event_configure_notify (Window win)
 		}
 	}
 
-	// check 'win' move in another monitor
+	// 'win' move in another monitor
 	if (nb_panel == 1) return;
-	if (server.nb_monitor == 1) return;
 	Task *tsk = task_get_task (win);
 	if (!tsk) return;
 
@@ -726,7 +755,7 @@ int main (int argc, char *argv[])
 	GSList *it;
 
 	init (argc, argv);
-load_config:
+
 	i = 0;
 	init_config();
 	if (config_path)
@@ -796,12 +825,7 @@ load_config:
 						break;
 
 					case ConfigureNotify:
-						//XMoveWindow(dpy, fen, pos_x, pos_y);
-						//XResizeWindow(dpy, fen, largeur, hauteur);
-						if (e.xconfigure.window == server.root_win)
-							goto load_config;
-						else
-							event_configure_notify (e.xconfigure.window);
+						event_configure_notify (e.xconfigure.window);
 						break;
 
 					case ReparentNotify:
@@ -839,9 +863,13 @@ load_config:
 		event_timer();
 
 		switch (signal_pending) {
-			case SIGUSR1:
+			case SIGUSR1: // reload config file
 				signal_pending = 0;
-				goto load_config;
+				init_config();
+				config_read_file (config_path);
+				init_panel();
+				cleanup_config();
+				break;
 			case SIGINT:
 			case SIGTERM:
 			case SIGHUP: