X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=203e818231b16d0e5d1b14c1aa38bb6b67639c03;hb=55eb2b64056f1fe6c15cabf1afc3e6d9aba56a11;hp=77dcb2dd5eac3db002dfca808503a06a2ba43f24;hpb=a9e9b9e07c73ab85381c088f5f6b2d2ee3ef637a;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 77dcb2d..203e818 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -27,6 +27,7 @@
 #include <pango/pangocairo.h>
 
 #include "server.h"
+#include "config.h"
 #include "window.h"
 #include "task.h"
 #include "panel.h"
@@ -50,6 +51,7 @@ int panel_layer=BOTTOM_LAYER;  // default is bottom layer
 int panel_position;
 int panel_horizontal;
 int panel_refresh;
+int task_dragged=0;
 
 int panel_autohide = 0;
 int panel_autohide_show_timeout = 0;
@@ -96,6 +98,7 @@ void init_panel()
 
 	cleanup_taskbar();
 	for (i=0 ; i < nb_panel ; i++) {
+		autohide_show(&panel1[i]);
 		free_area(&panel1[i].area);
 		if (panel1[i].temp_pmap) {
 			XFreePixmap(server.dsp, panel1[i].temp_pmap);
@@ -165,12 +168,7 @@ void init_panel()
 
 		if (i >= old_nb_panel) {
 			// new panel : catch some events
-			long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask;
-			if (g_tooltip.enabled)
-				event_mask |= PointerMotionMask|LeaveWindowMask;
-			if (panel_autohide)
-				event_mask |= LeaveWindowMask|EnterWindowMask;
-			XSetWindowAttributes att = { .event_mask=event_mask, .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
+			XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
 			unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel;
 			p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
 		}
@@ -179,6 +177,13 @@ void init_panel()
 			XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height);
 		}
 
+		long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
+		if (g_tooltip.enabled)
+			event_mask |= PointerMotionMask|LeaveWindowMask;
+		if (panel_autohide)
+			event_mask |= LeaveWindowMask|EnterWindowMask;
+		XChangeWindowAttributes(server.dsp, p->main_win, CWEventMask, &(XSetWindowAttributes){.event_mask=event_mask});
+
 		if (!server.gc) {
 			XGCValues  gcv;
 			server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv);
@@ -186,8 +191,8 @@ void init_panel()
 		//printf("panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
 		set_panel_properties(p);
 		set_panel_background(p);
-		if (i >= old_nb_panel) {
-			// map new panel
+		if (i >= old_nb_panel && snapshot_path == 0) {
+			// if we are not in 'snapshot' mode then map new panel
 			XMapWindow (server.dsp, p->main_win);
 		}
 
@@ -429,6 +434,12 @@ void visible_object()
 
 void update_strut(Panel* p)
 {
+	if (panel_strut_policy == STRUT_NONE) {
+		XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT);
+		XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL);
+		return;
+	}
+
 	// Reserved space
 	unsigned int d1, screen_width, screen_height;
 	Window d2;
@@ -570,7 +581,6 @@ void set_panel_background(Panel *p)
 			x -= xoff;
 			y -= yoff;
 		}
-		//printf("x %d, y %d\n", x, y);
 		XSetTSOrigin(server.dsp, server.gc, -x, -y);
 		XFillRectangle(server.dsp, p->area.pix, server.gc, 0, 0, p->area.width, p->area.height);
 	}
@@ -597,6 +607,15 @@ void set_panel_background(Panel *p)
 		a = l0->data;
 		set_redraw(a);
 	}
+	// reset task 'state_pix'
+	int i;
+	Taskbar *tskbar;
+	for (i=0 ; i < p->nb_desktop ; i++) {
+		tskbar = &p->taskbar[i];
+		for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+			set_task_redraw((Task *)l0->data);
+		}
+	}
 }
 
 
@@ -749,6 +768,7 @@ void autohide_show(void* p)
 		else
 			XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height);
 	}
+	refresh_systray = 1;   // ugly hack, because we actually only need to call XSetBackgroundPixmap
 	panel_refresh = 1;
 }