From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Sun, 18 Apr 2010 14:49:50 +0000 (+0000)
Subject: qutodetect composite manager and automaticaly switch real/fake transparency
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=43df01880e106d710ea57a2025db17f7d7db74fa;p=chaz%2Ftint2

qutodetect composite manager and automaticaly switch real/fake transparency
---

diff --git a/src/battery/battery.c b/src/battery/battery.c
index ff8e0a6..45180f9 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -94,7 +94,6 @@ void default_battery()
 
 void cleanup_battery()
 {
-	printf("*** cleanup_battery()\n");
 	if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
 	if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
 	if (path_energy_now) g_free(path_energy_now);
diff --git a/src/clock/clock.c b/src/clock/clock.c
index c7ac910..273fb81 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -71,7 +71,6 @@ void default_clock()
 
 void cleanup_clock()
 {
-printf("*** cleanup_clock()\n");
 	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);
diff --git a/src/panel.c b/src/panel.c
index db66fc3..ed17cb3 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -108,7 +108,6 @@ void cleanup_panel()
 {
 	if (!panel1) return;
 
-printf("*** cleanup_panel()\n");
 	cleanup_taskbar();
 
 	int i;
diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index cc14122..81eba8f 100644
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -67,7 +67,6 @@ printf("*** default_systray()\n");
 
 void cleanup_systray()
 {
-printf("*** cleanup_systray()\n");
 	systray_enabled = 0;
 	systray_max_icon_size = 0;
 	systray.area.on_screen = 0;
diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 10e0d13..34f49b0 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -184,7 +184,6 @@ void cleanup_taskbar()
 	Taskbar *tskbar;
 	int i, j;
 
-printf("*** cleanup_taskbar()\n");
 	if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
 	for (i=0 ; i < nb_panel ; i++) {
 		panel = &panel1[i];
diff --git a/src/tint.c b/src/tint.c
index f88b57f..9010066 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -839,8 +839,8 @@ start:
 					case UnmapNotify:
 					case DestroyNotify:
 						if (e.xany.window == server.composite_manager) {
-							// TODO: Stop real_transparency
-							//signal_pending = SIGUSR2;
+							// Stop real_transparency
+							signal_pending = SIGUSR1;
 							break;
 						}
 						if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
@@ -857,13 +857,11 @@ start:
 						ev = &e.xclient;
 						if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
 							if (ev->data.l[2] == None)
-								// TODO: Stop real_transparency
-								//signal_pending = SIGUSR2;
-								;
+								// Stop real_transparency
+								signal_pending = SIGUSR1;
 							else
-								// TODO: Start real_transparency
-								//signal_pending = SIGUSR2;
-								;
+								// Start real_transparency
+								signal_pending = SIGUSR1;
 						}
 						if (!systray.area.on_screen) break;
 						if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
@@ -900,7 +898,7 @@ start:
 			if (signal_pending == SIGUSR1) {
 				// restart tint2
 				// SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
-				FD_CLR (x11_fd, &fdset);
+				FD_CLR (x11_fd, &fdset); // not sure if needed
 				goto start;
 			}
 			else {
diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index 1c19504..a724473 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -50,7 +50,6 @@ void default_tooltip()
 
 void cleanup_tooltip()
 {
-printf("*** cleanup_tooltip()\n");
 	stop_tooltip_timeout();
 	tooltip_hide(0);
 	tooltip_copy_text(0);
diff --git a/src/util/timer.c b/src/util/timer.c
index 1dd2f11..b4db7f4 100644
--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -55,7 +55,6 @@ void default_timeout()
 
 void cleanup_timeout()
 {
-printf("*** cleanup_timeout()\n");
 	while (timeout_list) {
 		timeout* t = timeout_list->data;
 		if (t->multi_timeout)