X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=9b8ff748f0fd96239e997125c4913ba2069ebe8e;hb=ad50533aef71e9697fe78bb636e64079f198f985;hp=e6d747f05fa277e66609b0720af94c4c04e5c78a;hpb=a674c17fb45a554e27981ea630e51b832a9b8d6f;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index e6d747f..9b8ff74 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -46,31 +46,46 @@ int mouse_tilt_right;
 int panel_mode;
 int wm_menu;
 int panel_dock=0;  // default not in the dock
+int panel_layer=BOTTOM_LAYER;  // default is bottom layer
 int panel_position;
 int panel_horizontal;
 int panel_refresh;
 
+int panel_autohide = 0;
+int panel_autohide_show_timeout = 0;
+int panel_autohide_hide_timeout = 0;
+int panel_autohide_height = 5;  // for vertical panels this is of course the width
+int panel_strut_policy = STRUT_MINIMUM;
+
 Task *task_active;
 Task *task_drag;
-Task *task_urgent;
-int  tick_urgent;
 int  max_tick_urgent;
 
 // panel's initial config
 Panel panel_config;
 // panels (one panel per monitor)
-Panel *panel1 = NULL;
+Panel *panel1 = 0;
 int  nb_panel = 0;
 
 Imlib_Image default_icon = NULL;
 
 
+void autohide_hide(void* p);
+void autohide_show(void* p);
+
 
 void init_panel()
 {
 	int i, old_nb_panel;
 	Panel *new_panel, *p;
 
+	init_tooltip();
+	init_systray();
+	init_clock();
+#ifdef ENABLE_BATTERY
+	init_battery();
+#endif
+
 	cleanup_taskbar();
 	for (i=0 ; i < nb_panel ; i++) {
 		free_area(&panel1[i].area);
@@ -80,36 +95,39 @@ void init_panel()
 		}
 	}
 
-	// alloc panels (one monitor or all monitors)
+	// number of panels
 	old_nb_panel = nb_panel;
 	if (panel_config.monitor >= 0)
 		nb_panel = 1;
 	else
 		nb_panel = server.nb_monitor;
 
-	if (nb_panel < old_nb_panel) {
-		// freed old panels
-		for (i=nb_panel ; i < old_nb_panel ; i++) {
-			if (panel1[i].main_win)
-				XDestroyWindow(server.dsp, panel1[i].main_win);
+	// freed old panels
+	for (i=nb_panel ; i < old_nb_panel ; i++) {
+		if (panel1[i].main_win) {
+			XDestroyWindow(server.dsp, panel1[i].main_win);
+			panel1[i].main_win = 0;
 		}
-		new_panel = realloc(panel1, nb_panel * sizeof(Panel));
 	}
-	else if (nb_panel > old_nb_panel) {
+
+	// alloc & init new panel
+	Window old_win;
+	if (nb_panel != old_nb_panel)
 		new_panel = realloc(panel1, nb_panel * sizeof(Panel));
-		// init new panel
-		for (i=old_nb_panel ; i < nb_panel ; i++) {
-			memcpy(&new_panel[i], &panel_config, sizeof(Panel));
-		}
-	}
 	else
 		new_panel = panel1;
+	for (i=0 ; i < nb_panel ; i++) {
+		old_win = new_panel[i].main_win;
+		memcpy(&new_panel[i], &panel_config, sizeof(Panel));
+		new_panel[i].main_win = old_win;
+	}
 
-	fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", nb_panel, server.nb_desktop);
+	fprintf(stderr, "tint2 : nb monitor %d, nb monitor used %d, nb desktop %d\n", server.nb_monitor, nb_panel, server.nb_desktop);
 	for (i=0 ; i < nb_panel ; i++) {
 		p = &new_panel[i];
 
-		p->monitor = i;
+		if (panel_config.monitor < 0)
+			p->monitor = i;
 		p->area.parent = p;
 		p->area.panel = p;
 		p->area.on_screen = 1;
@@ -121,12 +139,12 @@ void init_panel()
 		init_panel_size_and_position(p);
 
 		// add childs
-		if (p->clock.area.on_screen) {
+		if (clock_enabled) {
 			init_clock_panel(p);
 			p->area.list = g_slist_append(p->area.list, &p->clock);
 		}
 #ifdef ENABLE_BATTERY
-		if (p->battery.area.on_screen) {
+		if (battery_enabled) {
 			init_battery_panel(p);
 			p->area.list = g_slist_append(p->area.list, &p->battery);
 		}
@@ -135,44 +153,47 @@ void init_panel()
 		if (systray.area.on_screen && i == 0) {
 			init_systray_panel(p);
 			p->area.list = g_slist_append(p->area.list, &systray);
-		}
-
-		// full width mode
-		if (!p->initial_width) {
-			p->initial_width = 100;
-			p->pourcentx = 1;
+			refresh_systray = 1;
 		}
 
 		if (i >= old_nb_panel) {
-			// new panel
-			printf("new panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
-
-			// Catch some events
+			// new panel : catch some events
 			long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask;
 			if (g_tooltip.enabled)
 				event_mask |= PointerMotionMask|LeaveWindowMask;
-			XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, event_mask, NoEventMask, False, 0, 0 };
-			if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
-			p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att);
-
-			set_panel_properties(p);
-			set_panel_background(p);
-			XMapWindow (server.dsp, p->main_win);
+			if (panel_autohide)
+				event_mask |= LeaveWindowMask|EnterWindowMask;
+			XSetWindowAttributes att = { .event_mask=event_mask, .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);
 		}
 		else {
 			// old panel
-			printf("old panel %d : %d, %d, %d, %d\n", i, p->posx, p->posy, p->area.width, p->area.height);
 			XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height);
-			set_panel_background(p);
 		}
+
+		if (!server.gc) {
+			XGCValues  gcv;
+			server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv);
+		}
+		//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
+			XMapWindow (server.dsp, p->main_win);
+		}
+
+		if (panel_autohide)
+			add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
 	}
 
 	panel1 = new_panel;
 	panel_refresh = 1;
-	refresh_systray = 1;
 	init_taskbar();
 	visible_object();
 	task_refresh_tasklist();
+	active_task();
 }
 
 
@@ -181,25 +202,22 @@ void init_panel_size_and_position(Panel *panel)
 	// detect panel size
 	if (panel_horizontal) {
 		if (panel->pourcentx)
-			panel->area.width = (float)server.monitor[panel->monitor].width * panel->initial_width / 100;
-		else
-			panel->area.width = panel->initial_width;
+			panel->area.width = (float)server.monitor[panel->monitor].width * panel->area.width / 100;
 		if (panel->pourcenty)
-			panel->area.height = (float)server.monitor[panel->monitor].height * panel->initial_height / 100;
-		else
-			panel->area.height = panel->initial_height;
+			panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100;
 		if (panel->area.pix.border.rounded > panel->area.height/2)
 			panel->area.pix.border.rounded = panel->area.height/2;
 	}
 	else {
+		int old_panel_height = panel->area.height;
 		if (panel->pourcentx)
-			panel->area.height = (float)server.monitor[panel->monitor].height * panel->initial_width / 100;
+			panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.width / 100;
 		else
-			panel->area.height = panel->initial_width;
+			panel->area.height = panel->area.width;
 		if (panel->pourcenty)
-			panel->area.width = (float)server.monitor[panel->monitor].width * panel->initial_height / 100;
+			panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100;
 		else
-			panel->area.width = panel->initial_height;
+			panel->area.width = old_panel_height;
 		if (panel->area.pix.border.rounded > panel->area.width/2)
 			panel->area.pix.border.rounded = panel->area.width/2;
 	}
@@ -230,6 +248,18 @@ void init_panel_size_and_position(Panel *panel)
 			panel->posy = server.monitor[panel->monitor].y + ((server.monitor[panel->monitor].height - panel->area.height) / 2);
 		}
 	}
+
+	if (panel_autohide) {
+		int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
+		if (panel_horizontal) {
+			panel->hidden_width = panel->area.width;
+			panel->hidden_height = panel->area.height - diff;
+		}
+		else {
+			panel->hidden_width = panel->area.width - diff;
+			panel->hidden_height = panel->area.height;
+		}
+	}
 	// printf("panel : posx %d, posy %d, width %d, height %d\n", panel->posx, panel->posy, panel->area.width, panel->area.height);
 }
 
@@ -240,14 +270,8 @@ void cleanup_panel()
 
 	task_active = 0;
 	task_drag = 0;
-	task_urgent = 0;
-	cleanup_taskbar();
 
-	// font allocated once
-	if (panel1[0].g_task.font_desc) {
-		pango_font_description_free(panel1[0].g_task.font_desc);
-		panel1[0].g_task.font_desc = 0;
-	}
+	cleanup_taskbar();
 
 	int i;
 	Panel *p;
@@ -260,14 +284,25 @@ void cleanup_panel()
 			XFreePixmap(server.dsp, p->temp_pmap);
 			p->temp_pmap = 0;
 		}
+		if (p->hidden_pixmap)
+			XFreePixmap(server.dsp, p->hidden_pixmap);
+		p->hidden_pixmap = 0;
 		if (p->main_win) {
 			XDestroyWindow(server.dsp, p->main_win);
 			p->main_win = 0;
 		}
 	}
 
-	if (panel1) free(panel1);
-	panel1 = 0;
+	if (panel1) {
+		free(panel1);
+		panel1 = 0;
+		nb_panel = 0;
+	}
+
+	if (panel_config.g_task.font_desc) {
+		pango_font_description_free(panel_config.g_task.font_desc);
+		panel_config.g_task.font_desc = 0;
+	}
 }
 
 
@@ -372,47 +407,44 @@ void visible_object()
 	panel_refresh = 1;
 }
 
-
-void set_panel_properties(Panel *p)
+void update_strut(Panel* p)
 {
-	XStoreName (server.dsp, p->main_win, "tint2");
-
-	gsize len;
-	gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL);
-	if (name != NULL) {
-		XChangeProperty(server.dsp, p->main_win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 8, PropModeReplace, (unsigned char *) name, (int) len);
-		g_free(name);
-	}
-
-	// Dock
-	long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
-	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
-
 	// Reserved space
+	unsigned int d1, screen_width, screen_height;
+	Window d2;
+	int d3;
+	XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
+	Monitor monitor = server.monitor[p->monitor];
 	long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (panel_horizontal) {
+		int height = p->area.height + p->marginy;
+		if (panel_autohide && (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) )
+			height = p->hidden_height;
 		if (panel_position & TOP) {
-			struts[2] = p->area.height + p->marginy;
+			struts[2] = height + monitor.y;
 			struts[8] = p->posx;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[9] = p->posx + p->area.width - 1;
 		}
 		else {
-			struts[3] = p->area.height + p->marginy;
+			struts[3] = height + screen_height - monitor.y - monitor.height;
 			struts[10] = p->posx;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[11] = p->posx + p->area.width - 1;
 		}
 	}
 	else {
+		int width = p->area.width + p->marginx;
+		if (panel_autohide && (panel_strut_policy == STRUT_MINIMUM || (panel_strut_policy == STRUT_FOLLOW_SIZE && p->is_hidden)) )
+			width = p->hidden_width;
 		if (panel_position & LEFT) {
-			struts[0] = p->area.width + p->marginx;
+			struts[0] = width + monitor.x;
 			struts[4] = p->posy;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[5] = p->posy + p->area.height - 1;
 		}
 		else {
-			struts[1] = p->area.width + p->marginx;
+			struts[1] = width + screen_width - monitor.x - monitor.width;
 			struts[6] = p->posy;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[7] = p->posy + p->area.height - 1;
@@ -421,28 +453,38 @@ void set_panel_properties(Panel *p)
 	// Old specification : fluxbox need _NET_WM_STRUT.
 	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 4);
 	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
+}
+
+
+void set_panel_properties(Panel *p)
+{
+	XStoreName (server.dsp, p->main_win, "tint2");
+
+	gsize len;
+	gchar *name = g_locale_to_utf8("tint2", -1, NULL, &len, NULL);
+	if (name != NULL) {
+		XChangeProperty(server.dsp, p->main_win, server.atom._NET_WM_NAME, server.atom.UTF8_STRING, 8, PropModeReplace, (unsigned char *) name, (int) len);
+		g_free(name);
+	}
+
+	// Dock
+	long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
+	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
 
 	// Sticky and below other window
-	val = 0xFFFFFFFF;
+	val = ALLDESKTOP;
 	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
 	Atom state[4];
 	state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;
 	state[1] = server.atom._NET_WM_STATE_SKIP_TASKBAR;
 	state[2] = server.atom._NET_WM_STATE_STICKY;
-	state[3] = server.atom._NET_WM_STATE_BELOW;
-	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, 4);
-
-	// Fixed position and non-resizable window
-	XSizeHints size_hints;
-	size_hints.flags = PPosition|PMinSize|PMaxSize;
-	size_hints.min_width = size_hints.max_width = p->area.width;
-	size_hints.min_height = size_hints.max_height = p->area.height;
-	XSetWMNormalHints(server.dsp, p->main_win, &size_hints);
+	state[3] = panel_layer == BOTTOM_LAYER ? server.atom._NET_WM_STATE_BELOW : server.atom._NET_WM_STATE_ABOVE;
+	int nb_atoms = panel_layer == NORMAL_LAYER ? 3 : 4;
+	XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STATE, XA_ATOM, 32, PropModeReplace, (unsigned char *) state, nb_atoms);
 
 	// Unfocusable
 	XWMHints wmhints;
 	if (panel_dock) {
-		// TODO: Xdnd feature cannot be used in withdrawn state at the moment (at least GTK apps fail, qt seems to work)
 		wmhints.icon_window = wmhints.window_group = p->main_win;
 		wmhints.flags = StateHint | IconWindowHint;
 		wmhints.initial_state = WithdrawnState;
@@ -460,34 +502,68 @@ void set_panel_properties(Panel *p)
 	// XdndAware - Register for Xdnd events
 	int version=5;
 	XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
+
+	update_strut(p);
+
+	// Fixed position and non-resizable window
+	// Allow panel move and resize when tint2 reload config file
+	int minwidth = panel_autohide ? p->hidden_width : p->area.width;
+	int minheight = panel_autohide ? p->hidden_height : p->area.height;
+	XSizeHints size_hints;
+	size_hints.flags = PPosition|PMinSize|PMaxSize;
+	size_hints.min_width = minwidth;
+	size_hints.max_width = p->area.width;
+	size_hints.min_height = minheight;
+	size_hints.max_height = p->area.height;
+	XSetWMNormalHints(server.dsp, p->main_win, &size_hints);
+
+	// Set WM_CLASS
+	XClassHint* classhint = XAllocClassHint();
+	classhint->res_name = "tint2";
+	classhint->res_class = "Tint2";
+	XSetClassHint(server.dsp, p->main_win, classhint);
+	XFree(classhint);
 }
 
 
 void set_panel_background(Panel *p)
 {
-	get_root_pixmap();
-
 	if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap);
 	p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
 
-	// copy background (server.root_pmap) in panel.area.pix.pmap
-	Window dummy;
-	int  x, y;
-	XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
-	XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
-	XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
+	if (real_transparency) {
+		clear_pixmap(p->area.pix.pmap, 0, 0, p->area.width, p->area.height);
+	}
+	else {
+		get_root_pixmap();
+		// copy background (server.root_pmap) in panel.area.pix.pmap
+		Window dummy;
+		int  x, y;
+		XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
+		XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
+		XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
+	}
 
 	// draw background panel
 	cairo_surface_t *cs;
 	cairo_t *c;
 	cs = cairo_xlib_surface_create (server.dsp, p->area.pix.pmap, server.visual, p->area.width, p->area.height);
 	c = cairo_create (cs);
-
 	draw_background(&p->area, c, 0);
-
 	cairo_destroy (c);
 	cairo_surface_destroy (cs);
 
+	if (panel_autohide) {
+		if (p->hidden_pixmap) XFreePixmap(server.dsp, p->hidden_pixmap);
+		p->hidden_pixmap = XCreatePixmap(server.dsp, server.root_win, p->hidden_width, p->hidden_height, server.depth);
+		int xoff=0, yoff=0;
+		if (panel_horizontal && panel_position & BOTTOM)
+			yoff = p->area.height-p->hidden_height;
+		else if (!panel_horizontal && panel_position & RIGHT)
+			xoff = p->area.width-p->hidden_width;
+		XCopyArea(server.dsp, p->area.pix.pmap, p->hidden_pixmap, server.gc, xoff, yoff, p->hidden_width, p->hidden_height, 0, 0);
+	}
+
 	// redraw panel's object
 	GSList *l0;
 	Area *a;
@@ -509,3 +585,198 @@ Panel *get_panel(Window win)
 	return 0;
 }
 
+
+Taskbar *click_taskbar (Panel *panel, int x, int y)
+{
+	Taskbar *tskbar;
+	int i;
+
+	if (panel_horizontal) {
+		for (i=0; i < panel->nb_desktop ; i++) {
+			tskbar = &panel->taskbar[i];
+			if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+				return tskbar;
+		}
+	}
+	else {
+		for (i=0; i < panel->nb_desktop ; i++) {
+			tskbar = &panel->taskbar[i];
+			if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+				return tskbar;
+		}
+	}
+	return NULL;
+}
+
+
+Task *click_task (Panel *panel, int x, int y)
+{
+	GSList *l0;
+	Taskbar *tskbar;
+
+	if ( (tskbar = click_taskbar(panel, x, y)) ) {
+		if (panel_horizontal) {
+			Task *tsk;
+			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+				tsk = l0->data;
+				if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
+					return tsk;
+				}
+			}
+		}
+		else {
+			Task *tsk;
+			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+				tsk = l0->data;
+				if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
+					return tsk;
+				}
+			}
+		}
+	}
+	return NULL;
+}
+
+
+int click_padding(Panel *panel, int x, int y)
+{
+	if (panel_horizontal) {
+		if (x < panel->area.paddingxlr || x > panel->area.width-panel->area.paddingxlr)
+		return 1;
+	}
+	else {
+		if (y < panel->area.paddingxlr || y > panel->area.height-panel->area.paddingxlr)
+		return 1;
+	}
+	return 0;
+}
+
+
+int click_clock(Panel *panel, int x, int y)
+{
+	Clock clk = panel->clock;
+	if (panel_horizontal) {
+		if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+			return TRUE;
+	} else {
+		if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
+Area* click_area(Panel *panel, int x, int y)
+{
+	Area* result = &panel->area;
+	Area* new_result = result;
+	do {
+		result = new_result;
+		GSList* it = result->list;
+		while (it) {
+			Area* a = it->data;
+			if (panel_horizontal) {
+				if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)) {
+					new_result = a;
+					break;
+				}
+			} else {
+				if (a->on_screen && y >= a->posy && y <= (a->posy + a->height)) {
+					new_result = a;
+					break;
+				}
+			}
+			it = it->next;
+		}
+	} while (new_result != result);
+	return result;
+}
+
+
+void stop_autohide_timeout(Panel* p)
+{
+	if (p->autohide_timeout) {
+		stop_timeout(p->autohide_timeout);
+		p->autohide_timeout = 0;
+	}
+}
+
+
+void autohide_show(void* p)
+{
+	Panel* panel = p;
+	stop_autohide_timeout(panel);
+	panel->is_hidden = 0;
+	if (panel_strut_policy == STRUT_FOLLOW_SIZE)
+		update_strut(p);
+
+	XMapSubwindows(server.dsp, panel->main_win);
+	if (panel_horizontal) {
+		if (panel_position & TOP)
+			XResizeWindow(server.dsp, panel->main_win, panel->area.width, panel->area.height);
+		else
+			XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height);
+	}
+	else {
+		if (panel_position & LEFT)
+			XResizeWindow(server.dsp, panel->main_win, panel->area.width, panel->area.height);
+		else
+			XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height);
+	}
+	panel_refresh = 1;
+}
+
+
+void autohide_hide(void* p)
+{
+	Panel* panel = p;
+	stop_autohide_timeout(panel);
+	panel->is_hidden = 1;
+	if (panel_strut_policy == STRUT_FOLLOW_SIZE)
+		update_strut(p);
+
+	XUnmapSubwindows(server.dsp, panel->main_win);
+	int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
+	if (panel_horizontal) {
+		if (panel_position & TOP)
+			XResizeWindow(server.dsp, panel->main_win, panel->hidden_width, panel->hidden_height);
+		else
+			XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy+diff, panel->hidden_width, panel->hidden_height);
+	}
+	else {
+		if (panel_position & LEFT)
+			XResizeWindow(server.dsp, panel->main_win, panel->hidden_width, panel->hidden_height);
+		else
+			XMoveResizeWindow(server.dsp, panel->main_win, panel->posx+diff, panel->posy, panel->hidden_width, panel->hidden_height);
+	}
+	panel_refresh = 1;
+}
+
+
+void autohide_trigger_show(Panel* p)
+{
+	if (!p)
+		return;
+	if (p->autohide_timeout)
+		change_timeout(p->autohide_timeout, panel_autohide_show_timeout, 0, autohide_show, p);
+	else
+		p->autohide_timeout = add_timeout(panel_autohide_show_timeout, 0, autohide_show, p);
+}
+
+
+void autohide_trigger_hide(Panel* p)
+{
+	if (!p)
+		return;
+
+	Window root, child;
+	int xr, yr, xw, yw;
+	unsigned int mask;
+	if (XQueryPointer(server.dsp, p->main_win, &root, &child, &xr, &yr, &xw, &yw, &mask))
+		if (child) return;  // mouse over one of the system tray icons
+
+	if (p->autohide_timeout)
+		change_timeout(p->autohide_timeout, panel_autohide_hide_timeout, 0, autohide_hide, p);
+	else
+		p->autohide_timeout = add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
+}