X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=0e8cad8adadf6614da927ea4f337df658d4ff8fa;hb=90eae1e7be4621a84a0253c3048790523f0c8375;hp=fd89b8c468a528467ec22347a4913fee61c19894;hpb=7a03bbf353324d6803aa84ca8fd41e6c6f4d099c;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index fd89b8c..0e8cad8 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -3,7 +3,7 @@
 * Tint2 panel
 *
 * Copyright (C) 2007 PÃ¥l Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -42,6 +42,7 @@
 #include "panel.h"
 #include "tooltip.h"
 #include "timer.h"
+#include "xsettings-client.h"
 
 
 void signal_handler(int sig)
@@ -135,7 +136,7 @@ void init_X11()
 	setlocale (LC_ALL, "");
 	// config file use '.' as decimal separator
 	setlocale(LC_NUMERIC, "POSIX");
-
+	
 	// load default icon
 	gchar *path;
 	const gchar * const *data_dirs;
@@ -156,7 +157,6 @@ void init_X11()
 
 void cleanup()
 {
-	cleanup_timeout();
 	cleanup_systray();
 	cleanup_tooltip();
 	cleanup_clock();
@@ -174,6 +174,7 @@ void cleanup()
 	imlib_context_disconnect_display();
 
 	cleanup_server();
+	cleanup_timeout();
 	if (server.dsp) XCloseDisplay(server.dsp);
 }
 
@@ -479,19 +480,29 @@ void event_property_notify (XEvent *e)
 	Window win = e->xproperty.window;
 	Atom at = e->xproperty.atom;
 
+	if (xsettings_client)
+		xsettings_client_process_event(xsettings_client, e);
 	if (win == server.root_win) {
 		if (!server.got_root_win) {
 			XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
 			server.got_root_win = 1;
 		}
 
+		// Change name of desktops
+		else if (at == server.atom._NET_DESKTOP_NAMES) {
+			printf("_NET_DESKTOP_NAMES\n");
+			panel_refresh = 1;
+		}
 		// Change number of desktops
 		else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
+			if (!taskbar_enabled) return;
 			server.nb_desktop = server_get_number_of_desktop ();
 			cleanup_taskbar();
 			init_taskbar();
-			visible_object();
 			for (i=0 ; i < nb_panel ; i++) {
+				init_taskbar_panel(&panel1[i]);
+				set_panel_items_order(&panel1[i]);
+				visible_taskbar(&panel1[i]);
 				panel1[i].area.resize = 1;
 			}
 			task_refresh_tasklist();
@@ -500,21 +511,13 @@ void event_property_notify (XEvent *e)
 		}
 		// Change desktop
 		else if (at == server.atom._NET_CURRENT_DESKTOP) {
+			if (!taskbar_enabled) return;
 			int old_desktop = server.desktop;
 			server.desktop = server_get_current_desktop ();
 			for (i=0 ; i < nb_panel ; i++) {
 				Panel *panel = &panel1[i];
-				if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
-					// redraw both taskbar
-					if (server.nb_desktop > old_desktop) {
-						// can happen if last desktop is deleted and we've been on the last desktop
-						panel->taskbar[old_desktop].area.bg = panel->g_taskbar.bg;
-						panel->taskbar[old_desktop].area.resize = 1;
-					}
-					panel->taskbar[server.desktop].area.bg = panel->g_taskbar.bg_active;
-					panel->taskbar[server.desktop].area.resize = 1;
-					panel_refresh = 1;
-				}
+				set_taskbar_state(&panel->taskbar[old_desktop], TASKBAR_NORMAL);
+				set_taskbar_state(&panel->taskbar[server.desktop], TASKBAR_ACTIVE);
 				// check ALLDESKTOP task => resize taskbar
 				Taskbar *tskbar;
 				Task *tsk;
@@ -539,9 +542,6 @@ void event_property_notify (XEvent *e)
 					}
 				}
 			}
-			if (panel_mode != MULTI_DESKTOP) {
-				visible_object();
-			}
 		}
 		// Window list
 		else if (at == server.atom._NET_CLIENT_LIST) {
@@ -585,12 +585,13 @@ void event_property_notify (XEvent *e)
 
 		// Window title changed
 		if (at == server.atom._NET_WM_VISIBLE_NAME || at == server.atom._NET_WM_NAME || at == server.atom.WM_NAME) {
-			get_title(tsk);
-			if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) {
-				tooltip_copy_text((Area*)tsk);
-				tooltip_update();
+			if (get_title(tsk)) {
+				if (g_tooltip.mapped && (g_tooltip.area == (Area*)tsk)) {
+					tooltip_copy_text((Area*)tsk);
+					tooltip_update();
+				}
+				panel_refresh = 1;
 			}
-			panel_refresh = 1;
 		}
 		// Demand attention
 		else if (at == server.atom._NET_WM_STATE) {
@@ -883,7 +884,7 @@ start:
 							signal_pending = SIGUSR1;
 							break;
 						}
-						if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
+						if (e.xany.window == g_tooltip.window || !systray_enabled)
 							break;
 						for (it = systray.list_icons; it; it = g_slist_next(it)) {
 							if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
@@ -903,7 +904,7 @@ start:
 								// Start real_transparency
 								signal_pending = SIGUSR1;
 						}
-						if (systray.area.on_screen && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+						if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
 							net_message(&e.xclient);
 						}
 						else if (e.xclient.message_type == server.atom.XdndPosition) {