+/* -*- 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;
+static void dock_app_grab_button(ObDockApp *app, gboolean grab)
+{
+ if (grab) {
+ grab_button_full(config_dock_app_move_button,
+ config_dock_app_move_modifiers, app->icon_win,
+ ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask,
+ GrabModeAsync, OB_CURSOR_MOVE);
+ } else {
+ ungrab_button(config_dock_app_move_button,
+ config_dock_app_move_modifiers, app->icon_win);
+ }
+}
+
void dock_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
if (reconfig) {
+ GList *it;
+
+ 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();
+ dock_hide(TRUE);
+
+ for (it = dock->dock_apps; it; it = g_list_next(it))
+ dock_app_grab_button(it->data, TRUE);
return;
}
g_hash_table_insert(window_map, &dock->frame, dock);
stacking_add(DOCK_AS_WINDOW(dock));
- stacking_raise(DOCK_AS_WINDOW(dock));
}
void dock_shutdown(gboolean reconfig)
{
- if (reconfig) return;
+ if (reconfig) {
+ GList *it;
+
+ stacking_remove(DOCK_AS_WINDOW(dock));
+
+ for (it = dock->dock_apps; it; it = g_list_next(it))
+ dock_app_grab_button(it->data, FALSE);
+ return;
+ }
XDestroyWindow(ob_display, dock->frame);
RrAppearanceFree(dock->a_frame);
if (PROP_GETSS(app->win, wm_class, locale, &data)) {
if (data[0]) {
- app->name = g_strdup(data[0]);
+ app->name = g_strdup(data[0]);
if (data[1])
app->class = g_strdup(data[1]);
}
handled and need to be ignored.
*/
if (ob_state() == OB_STATE_STARTING)
- app->ignore_unmaps += 2;
+ app->ignore_unmaps += 2;
if (app->win != app->icon_win) {
/* have to map it so that it can be re-managed on a restart */
XChangeSaveSet(ob_display, app->icon_win, SetModeInsert);
XSelectInput(ob_display, app->icon_win, DOCKAPP_EVENT_MASK);
- grab_button_full(2, 0, app->icon_win,
- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
- GrabModeAsync, OB_CURSOR_MOVE);
+ dock_app_grab_button(app, TRUE);
g_hash_table_insert(window_map, &app->icon_win, app);
void dock_remove(ObDockApp *app, gboolean reparent)
{
- ungrab_button(2, 0, app->icon_win);
+ dock_app_grab_button(app, FALSE);
XSelectInput(ob_display, app->icon_win, NoEventMask);
/* remove the window from our save set */
XChangeSaveSet(ob_display, app->icon_win, SetModeDelete);
g_hash_table_remove(window_map, &app->icon_win);
if (reparent)
- XReparentWindow(ob_display, app->icon_win,
+ XReparentWindow(ob_display, app->icon_win,
RootWindow(ob_display, ob_screen), app->x, app->y);
dock->dock_apps = g_list_remove(dock->dock_apps, app);
dock->w = dock->h = 0;
/* get the size */
- for (it = dock->dock_apps; it; it = it->next) {
+ for (it = dock->dock_apps; it; it = g_list_next(it)) {
ObDockApp *app = it->data;
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
spot = (config_dock_orient == OB_ORIENTATION_HORZ ? minw : minh) / 2;
/* position the apps */
- for (it = dock->dock_apps; it; it = it->next) {
+ for (it = dock->dock_apps; it; it = g_list_next(it)) {
ObDockApp *app = it->data;
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
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 || config_dock_nostrut) {
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);
/* which dock app are we on top of? */
stop = FALSE;
- for (it = dock->dock_apps; it; it = it->next) {
+ for (it = dock->dock_apps; it; it = g_list_next(it)) {
over = it->data;
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
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);
}
}
projects / chaz / openbox / blobdiff