+/* -*- 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"
#include "screen.h"
#include "prop.h"
#include "config.h"
static ObDock *dock;
-Strut dock_strut;
+StrutPartial dock_strut;
-void dock_startup()
+void dock_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
- STRUT_SET(dock_strut, 0, 0, 0, 0);
+ if (reconfig) {
+ 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);
dock = g_new0(ObDock, 1);
dock->obwin.type = Window_Dock;
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);
g_hash_table_insert(window_map, &app->icon_win, app);
- g_message("Managed Dock App: 0x%lx (%s)", app->icon_win, app->class);
+ ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
}
void dock_remove_all()
dock->dock_apps = g_list_remove(dock->dock_apps, app);
dock_configure();
- g_message("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class);
+ ob_debug("Unmanaged Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
g_free(app->name);
g_free(app->class);
}
if (!config_dock_floating && config_dock_hide) {
- strw = strh = ob_rr_theme->bwidth;
+ strw = ob_rr_theme->bwidth;
+ strh = ob_rr_theme->bwidth;
} else {
strw = dock->w;
- strh = dock->h;
+ strh = dock->h;
}
/* set the strut */
- if (config_dock_floating) {
- STRUT_SET(dock_strut, 0, 0, 0, 0);
+ 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 {
switch (config_dock_pos) {
case OB_DIRECTION_NORTHWEST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- STRUT_SET(dock_strut, 0, strh, 0, 0);
+ STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+ 0, 0, dock->x, dock->x + dock->w - 1,
+ 0, 0, 0, 0);
break;
case OB_ORIENTATION_VERT:
- STRUT_SET(dock_strut, strw, 0, 0, 0);
+ STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+ dock->y, dock->y + dock->h - 1,
+ 0, 0, 0, 0, 0, 0);
break;
}
break;
case OB_DIRECTION_NORTH:
- STRUT_SET(dock_strut, 0, strh, 0, 0);
+ STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+ dock->x, dock->x + dock->w - 1,
+ 0, 0, 0, 0, 0, 0);
break;
case OB_DIRECTION_NORTHEAST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- STRUT_SET(dock_strut, 0, strh, 0, 0);
+ STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+ 0, 0, dock->x, dock->x + dock->w -1,
+ 0, 0, 0, 0);
break;
case OB_ORIENTATION_VERT:
- STRUT_SET(dock_strut, 0, 0, strw, 0);
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+ 0, 0, 0, 0,
+ dock->y, dock->y + dock->h - 1, 0, 0);
break;
}
break;
case OB_DIRECTION_WEST:
- STRUT_SET(dock_strut, strw, 0, 0, 0);
+ STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+ dock->y, dock->y + dock->h - 1,
+ 0, 0, 0, 0, 0, 0);
break;
case OB_DIRECTION_EAST:
- STRUT_SET(dock_strut, 0, 0, strw, 0);
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+ 0, 0, 0, 0,
+ dock->y, dock->y + dock->h - 1, 0, 0);
break;
case OB_DIRECTION_SOUTHWEST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- STRUT_SET(dock_strut, 0, 0, 0, strh);
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+ 0, 0, 0, 0, 0, 0,
+ dock->x, dock->x + dock->w - 1);
break;
case OB_ORIENTATION_VERT:
- STRUT_SET(dock_strut, strw, 0, 0, 0);
+ STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+ dock->y, dock->y + dock->h - 1,
+ 0, 0, 0, 0, 0, 0);
break;
}
break;
case OB_DIRECTION_SOUTH:
- STRUT_SET(dock_strut, 0, 0, 0, strh);
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+ 0, 0, 0, 0, 0, 0,
+ dock->x, dock->x + dock->w - 1);
break;
case OB_DIRECTION_SOUTHEAST:
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
- STRUT_SET(dock_strut, 0, 0, 0, strh);
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+ 0, 0, 0, 0, 0, 0,
+ dock->x, dock->x + dock->w - 1);
break;
case OB_ORIENTATION_VERT:
- STRUT_SET(dock_strut, 0, 0, strw, 0);
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+ 0, 0, 0, 0,
+ dock->y, dock->y + dock->h - 1, 0, 0);
break;
}
break;
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);
dock_configure();
}
-static void hide_timeout(void *n)
+static gboolean hide_timeout(gpointer data)
{
- /* dont repeat */
- timer_stop(dock->hide_timer);
- dock->hide_timer = NULL;
-
/* hide */
dock->hidden = TRUE;
dock_configure();
+
+ return FALSE; /* don't repeat */
}
void dock_hide(gboolean hide)
{
- if (dock->hidden == hide || !config_dock_hide)
- return;
if (!hide) {
/* show */
dock->hidden = FALSE;
dock_configure();
/* if was hiding, stop it */
- if (dock->hide_timer) {
- timer_stop(dock->hide_timer);
- dock->hide_timer = NULL;
- }
- } else {
- g_assert(!dock->hide_timer);
- dock->hide_timer = timer_start(config_dock_hide_timeout * 1000,
- (ObTimeoutHandler)hide_timeout,
- NULL);
+ ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
+ } else if (!dock->hidden && config_dock_hide) {
+ ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout,
+ hide_timeout, NULL, NULL);
}
}
projects / chaz / openbox / blobdiff