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

diff --git a/src/tint.c b/src/tint.c
index 529e3cd..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;
@@ -479,6 +480,8 @@ 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);
@@ -513,17 +516,8 @@ void event_property_notify (XEvent *e)
 			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.bg != panel->g_taskbar.bg_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;
@@ -547,8 +541,6 @@ void event_property_notify (XEvent *e)
 						tskbar->area.resize = 1;
 					}
 				}
-				if (panel_mode != MULTI_DESKTOP) 
-					visible_taskbar(panel);
 			}
 		}
 		// Window list
@@ -593,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) {