X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=987003cacd9a75ee0ae430dca78a9769d625dcbf;hb=be465e9a323ee71d7a6ab71040a117d3d64db813;hp=bb7586d6f4f72f69dc1a3ad3feb887688221f143;hpb=22a5d6049eff5cb32e100ccd1a9b24e43e82a2ab;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index bb7586d..987003c 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -101,17 +101,13 @@ void init (int argc, char *argv[])
 	server_init_atoms ();
 	server.screen = DefaultScreen (server.dsp);
 	server.root_win = RootWindow(server.dsp, server.screen);
-	server.depth = DefaultDepth (server.dsp, server.screen);
-	server.visual = DefaultVisual (server.dsp, server.screen);
 	server.desktop = server_get_current_desktop ();
-	XGCValues  gcv;
-	server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
-
+	server_init_visual();
 	XSetErrorHandler ((XErrorHandler) server_catch_error);
 
 	imlib_context_set_display (server.dsp);
 	imlib_context_set_visual (server.visual);
-	imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen));
+	imlib_context_set_colormap (server.colormap);
 
 	/* Catch events */
 	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
@@ -153,8 +149,7 @@ void cleanup()
 	if (config_path) g_free(config_path);
 	if (snapshot_path) g_free(snapshot_path);
 
-	if (server.monitor) free(server.monitor);
-	XFreeGC(server.dsp, server.gc);
+	cleanup_server();
 	XCloseDisplay(server.dsp);
 }
 
@@ -411,8 +406,11 @@ void event_property_notify (XEvent *e)
 				Panel *panel = &panel1[i];
 				if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
 					// redraw both taskbar
-					panel->taskbar[old_desktop].area.is_active = 0;
-					panel->taskbar[old_desktop].area.resize = 1;
+					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.is_active = 0;
+						panel->taskbar[old_desktop].area.resize = 1;
+					}
 					panel->taskbar[server.desktop].area.is_active = 1;
 					panel->taskbar[server.desktop].area.resize = 1;
 					panel_refresh = 1;
@@ -421,13 +419,15 @@ void event_property_notify (XEvent *e)
 				Taskbar *tskbar;
 				Task *tsk;
 				GSList *l;
-				tskbar = &panel->taskbar[old_desktop];
-				for (l = tskbar->area.list; l ; l = l->next) {
-					tsk = l->data;
-					if (tsk->desktop == ALLDESKTOP) {
-						tsk->area.on_screen = 0;
-						tskbar->area.resize = 1;
-						panel_refresh = 1;
+				if (server.nb_desktop > old_desktop) {
+					tskbar = &panel->taskbar[old_desktop];
+					for (l = tskbar->area.list; l ; l = l->next) {
+						tsk = l->data;
+						if (tsk->desktop == ALLDESKTOP) {
+							tsk->area.on_screen = 0;
+							tskbar->area.resize = 1;
+							panel_refresh = 1;
+						}
 					}
 				}
 				tskbar = &panel->taskbar[server.desktop];
@@ -710,6 +710,7 @@ int main (int argc, char *argv[])
 		if (panel_refresh) {
 			panel_refresh = 0;
 
+			// QUESTION: do we need this first refresh_systray, because we check refresh_systray once again later...
 			if (refresh_systray) {
 				panel = (Panel*)systray.area.panel;
 				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);