+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ dock.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "debug.h"
#include "dock.h"
#include "mainloop.h"
StrutPartial dock_strut;
-void dock_startup()
+void dock_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
+ if (reconfig) {
+ XSetWindowBorder(ob_display, dock->frame,
+ RrColorPixel(ob_rr_theme->b_color));
+ XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
+
+ RrAppearanceFree(dock->a_frame);
+ dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+
+ stacking_add(DOCK_AS_WINDOW(dock));
+
+ dock_configure();
+ return;
+ }
+
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
g_hash_table_insert(window_map, &dock->frame, dock);
stacking_add(DOCK_AS_WINDOW(dock));
- stacking_raise(DOCK_AS_WINDOW(dock));
}
-void dock_shutdown()
+void dock_shutdown(gboolean reconfig)
{
+ if (reconfig) {
+ stacking_remove(DOCK_AS_WINDOW(dock));
+ return;
+ }
+
XDestroyWindow(ob_display, dock->frame);
RrAppearanceFree(dock->a_frame);
g_hash_table_remove(window_map, &dock->frame);
strh = ob_rr_theme->bwidth;
} else {
strw = dock->w;
- strh = dock->h;
+ strh = dock->h;
}
/* set the strut */
- if (config_dock_floating) {
+ if (!dock->dock_apps) {
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0);
+ } else if (config_dock_floating) {
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
} else {
dock->w -= ob_rr_theme->bwidth * 2;
dock->h -= ob_rr_theme->bwidth * 2;
- if (dock->w > 0 && dock->h > 0) {
+ if (dock->dock_apps) {
+ g_assert(dock->w > 0);
+ g_assert(dock->h > 0);
+
XMoveResizeWindow(ob_display, dock->frame,
dock->x, dock->y, dock->w, dock->h);
void dock_hide(gboolean hide)
{
- if (dock->hidden == hide || !config_dock_hide)
- return;
if (!hide) {
/* show */
dock->hidden = FALSE;
/* if was hiding, stop it */
ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
- } else {
- ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout * 1000,
+ } else if (!dock->hidden && config_dock_hide) {
+ ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay,
hide_timeout, NULL, NULL);
}
}