X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=c95c3171a2e823063a2db8c674029dc7aa722283;hb=462228f2e82c6e5f61baeb49b6358273728baa90;hp=005be632814999af7ca5f25995643211bc5527a5;hpb=9920c62290bd174979c2e42cbc72070155a2a4ac;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index 005be63..c95c317 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -31,6 +31,7 @@
 #include <Imlib2.h>
 #include <signal.h>
 
+#include "version.h"
 #include "server.h"
 #include "window.h"
 #include "config.h"
@@ -59,7 +60,7 @@ void init (int argc, char *argv[])
 			exit(0);
 		}
 		if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))	{
-			printf("tint2 version 0.8\n");
+			printf("tint2 version %s\n", VERSION_STRING);
 			exit(0);
 		}
 		if (!strcmp(argv[i], "-c")) {
@@ -157,7 +158,7 @@ void cleanup()
 	if (snapshot_path) g_free(snapshot_path);
 
 	cleanup_server();
-	XCloseDisplay(server.dsp);
+	if (server.dsp) XCloseDisplay(server.dsp);
 }
 
 
@@ -263,7 +264,7 @@ int tint2_handles_click(Panel* panel, XButtonEvent* e)
 	if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP)
 		return 1;
 	if (click_clock(panel, e->x, e->y)) {
-		if ( (e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_rclick_command) )
+		if ( (e->button == 1 && clock_lclick_command) || (e->button == 3 && clock_rclick_command) )
 			return 1;
 		else
 			return 0;
@@ -494,6 +495,10 @@ 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();
+			}
 			panel_refresh = 1;
 		}
 		// Demand attention
@@ -679,8 +684,10 @@ int main (int argc, char *argv[])
 			for (i=0 ; i < nb_panel ; i++) {
 				panel = &panel1[i];
 
-				if (panel->is_hidden)
+				if (panel->is_hidden) {
 					XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0);
+					XSetWindowBackgroundPixmap(server.dsp, panel->main_win, panel->hidden_pixmap);
+				}
 				else {
 					if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
 					panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
@@ -756,11 +763,6 @@ int main (int argc, char *argv[])
 						event_expose(&e);
 						break;
 
-					case MapNotify:
-						if (e.xany.window == g_tooltip.window)
-							tooltip_update();
-						break;
-
 					case PropertyNotify:
 						event_property_notify(&e);
 						break;
@@ -801,9 +803,11 @@ int main (int argc, char *argv[])
 
 					default:
 						if (e.type == XDamageNotify+damage_event) {
+							// union needed to avoid strict-aliasing warnings by gcc
+							union { XEvent e; XDamageNotifyEvent de; } event_union = {.e=e};
 							TrayWindow *traywin;
 							GSList *l;
-							XDamageNotifyEvent* de = (XDamageNotifyEvent*)&e;
+							XDamageNotifyEvent* de = &event_union.de;
 							for (l = systray.list_icons; l ; l = l->next) {
 								traywin = (TrayWindow*)l->data;
 								if ( traywin->id == de->drawable && !de->more ) {