+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ dock.c for the Openbox window manager
+ Copyright (c) 2006 Mikael Magnusson
+ Copyright (c) 2003-2007 Dana 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 "screen.h"
-#include "prop.h"
#include "config.h"
#include "grab.h"
#include "openbox.h"
-#include "render/theme.h"
+#include "obrender/theme.h"
+#include "obt/prop.h"
#define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
EnterWindowMask | LeaveWindowMask)
#define DOCKAPP_EVENT_MASK (StructureNotifyMask)
+#define DOCK_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \
+ ButtonMotionMask)
-static Dock *dock;
+static ObDock *dock;
+static guint show_timeout_id;
+static guint hide_timeout_id;
+
+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);
+ }
+}
-Strut dock_strut;
+static guint window_hash(Window *w) { return *w; }
+static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; }
-void dock_startup()
+void dock_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
- STRUT_SET(dock_strut, 0, 0, 0, 0);
+ if (reconfig) {
+ GList *it;
+
+ XSetWindowBorder(obt_display, dock->frame,
+ RrColorPixel(ob_rr_theme->osd_border_color));
+ XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
+
+ RrAppearanceFree(dock->a_frame);
+ dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_bg);
+
+ stacking_add(DOCK_AS_WINDOW(dock));
- dock = g_new0(struct Dock, 1);
- dock->obwin.type = 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;
+ }
+
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0);
+
+ dock = g_slice_new0(ObDock);
+ dock->obwin.type = OB_WINDOW_CLASS_DOCK;
dock->hidden = TRUE;
+ dock->dock_map = g_hash_table_new((GHashFunc)window_hash,
+ (GEqualFunc)window_comp);
+
attrib.event_mask = DOCK_EVENT_MASK;
attrib.override_redirect = True;
- dock->frame = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0,
- render_depth, InputOutput, render_visual,
- CWOverrideRedirect | CWEventMask,
+ attrib.do_not_propagate_mask = DOCK_NOPROPAGATEMASK;
+ dock->frame = XCreateWindow(obt_display, obt_root(ob_screen),
+ 0, 0, 1, 1, 0,
+ RrDepth(ob_rr_inst), InputOutput,
+ RrVisual(ob_rr_inst),
+ CWOverrideRedirect | CWEventMask |
+ CWDontPropagate,
&attrib);
- dock->a_frame = appearance_copy(theme_a_unfocused_title);
- XSetWindowBorder(ob_display, dock->frame, theme_b_color->pixel);
- XSetWindowBorderWidth(ob_display, dock->frame, theme_bwidth);
+ dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_bg);
+ XSetWindowBorder(obt_display, dock->frame,
+ RrColorPixel(ob_rr_theme->osd_border_color));
+ XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
- g_hash_table_insert(window_map, &dock->frame, dock);
+ /* Setting the window type so xcompmgr can tell what it is */
+ OBT_PROP_SET32(dock->frame, NET_WM_WINDOW_TYPE, ATOM,
+ OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK));
+
+ window_add(&dock->frame, DOCK_AS_WINDOW(dock));
stacking_add(DOCK_AS_WINDOW(dock));
- stacking_raise(DOCK_AS_WINDOW(dock));
}
-void dock_shutdown()
+void dock_shutdown(gboolean reconfig)
{
- XDestroyWindow(ob_display, dock->frame);
- appearance_free(dock->a_frame);
- g_hash_table_remove(window_map, &dock->frame);
+ 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;
+ }
+
+ g_hash_table_destroy(dock->dock_map);
+
+ XDestroyWindow(obt_display, dock->frame);
+ RrAppearanceFree(dock->a_frame);
+ window_remove(dock->frame);
stacking_remove(dock);
+ g_slice_free(ObDock, dock);
+ dock = NULL;
}
-void dock_add(Window win, XWMHints *wmhints)
+void dock_manage(Window icon_win, Window name_win)
{
- DockApp *app;
+ ObDockApp *app;
XWindowAttributes attrib;
- char **data;
+ gchar **data;
- app = g_new0(DockApp, 1);
- app->obwin.type = Window_DockApp;
- app->win = win;
- app->icon_win = (wmhints->flags & IconWindowHint) ?
- wmhints->icon_window : win;
+ app = g_slice_new0(ObDockApp);
+ app->name_win = name_win;
+ app->icon_win = icon_win;
- if (PROP_GETSS(app->win, wm_class, locale, &data)) {
+ if (OBT_PROP_GETSS_TYPE(app->name_win, WM_CLASS, STRING_NO_CC, &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]);
}
- g_strfreev(data);
+ g_strfreev(data);
}
if (app->name == NULL) app->name = g_strdup("");
if (app->class == NULL) app->class = g_strdup("");
-
- if (XGetWindowAttributes(ob_display, app->icon_win, &attrib)) {
+
+ if (XGetWindowAttributes(obt_display, app->icon_win, &attrib)) {
app->w = attrib.width;
app->h = attrib.height;
} else {
}
dock->dock_apps = g_list_append(dock->dock_apps, app);
+ g_hash_table_insert(dock->dock_map, &app->icon_win, app);
dock_configure();
- XReparentWindow(ob_display, app->icon_win, dock->frame, app->x, app->y);
+ XReparentWindow(obt_display, app->icon_win, dock->frame, app->x, app->y);
/*
This is the same case as in frame.c for client windows. When Openbox is
starting, the window is already mapped so we see unmap events occur for
member set the root window, and one set to the client, but both get
handled and need to be ignored.
*/
- if (ob_state == State_Starting)
- app->ignore_unmaps += 2;
-
- if (app->win != app->icon_win) {
- /* have to map it so that it can be re-managed on a restart */
- XMoveWindow(ob_display, app->win, -1000, -1000);
- XMapWindow(ob_display, app->win);
+ if (ob_state() == OB_STATE_STARTING)
+ app->ignore_unmaps += 2;
+ XChangeSaveSet(obt_display, app->icon_win, SetModeInsert);
+ XMapWindow(obt_display, app->icon_win);
+
+ if (app->name_win != app->icon_win) {
+ XReparentWindow(obt_display, app->name_win, dock->frame, -1000, -1000);
+ XChangeSaveSet(obt_display, app->name_win, SetModeInsert);
+ XMapWindow(obt_display, app->name_win);
}
- XMapWindow(ob_display, app->icon_win);
- XSync(ob_display, False);
- /* specify that if we exit, the window should not be destroyed and should
- be reparented back to root automatically */
- XChangeSaveSet(ob_display, app->icon_win, SetModeInsert);
- XSelectInput(ob_display, app->icon_win, DOCKAPP_EVENT_MASK);
+ XSync(obt_display, False);
- grab_button_full(2, 0, app->icon_win,
- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
- GrabModeAsync, ob_cursors.move);
+ XSelectInput(obt_display, app->icon_win, DOCKAPP_EVENT_MASK);
- g_hash_table_insert(window_map, &app->icon_win, app);
+ dock_app_grab_button(app, TRUE);
- g_message("Managed Dock App: 0x%lx (%s)", app->icon_win, app->class);
+ ob_debug("Managed Dock App: 0x%lx 0x%lx (%s)",
+ app->icon_win, app->name_win, app->class);
+
+ grab_server(FALSE);
}
-void dock_remove_all()
+void dock_unmanage_all(void)
{
while (dock->dock_apps)
- dock_remove(dock->dock_apps->data, TRUE);
+ dock_unmanage(dock->dock_apps->data, TRUE);
}
-void dock_remove(DockApp *app, gboolean reparent)
+void dock_unmanage(ObDockApp *app, gboolean reparent)
{
- ungrab_button(2, 0, app->icon_win);
- XSelectInput(ob_display, app->icon_win, NoEventMask);
+ dock_app_grab_button(app, FALSE);
+ XSelectInput(obt_display, app->icon_win, NoEventMask);
/* remove the window from our save set */
- XChangeSaveSet(ob_display, app->icon_win, SetModeDelete);
- XSync(ob_display, False);
-
- g_hash_table_remove(window_map, &app->icon_win);
-
- if (reparent)
- XReparentWindow(ob_display, app->icon_win, ob_root, app->x, app->y);
+ XChangeSaveSet(obt_display, app->icon_win, SetModeDelete);
+ XSync(obt_display, False);
+
+ if (reparent) {
+ XReparentWindow(obt_display, app->icon_win, obt_root(ob_screen), 0, 0);
+ if (app->name_win != app->icon_win)
+ XReparentWindow(obt_display, app->name_win,
+ obt_root(ob_screen), 0, 0);
+ }
dock->dock_apps = g_list_remove(dock->dock_apps, app);
+ g_hash_table_remove(dock->dock_map, &app->icon_win);
dock_configure();
- g_message("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class);
+ ob_debug("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class);
g_free(app->name);
g_free(app->class);
- g_free(app);
+ g_slice_free(ObDockApp, app);
}
-void dock_configure()
+void dock_configure(void)
{
GList *it;
- int spot;
- int gravity;
-
- dock->w = dock->h = spot = 0;
-
- for (it = dock->dock_apps; it; it = it->next) {
- struct DockApp *app = it->data;
- if (config_dock_horz) {
- app->x = spot;
- app->y = (dock->h - app->h) / 2;
- dock->w += app->w;
- dock->h = MAX(dock->h, app->h);
- spot += app->w;
- } else {
- app->x = (dock->w - app->w) / 2;
- app->y = spot;
- dock->w = MAX(dock->w, app->w);
- dock->h += app->h;
- spot += app->h;
+ gint hspot, vspot;
+ gint gravity;
+ gint l, r, t, b;
+ gint strw, strh;
+ const Rect *a;
+ gint hidesize;
+
+ RrMargins(dock->a_frame, &l, &t, &r, &b);
+ hidesize = MAX(1, ob_rr_theme->obwidth);
+
+ dock->area.width = dock->area.height = 0;
+
+ /* get the size */
+ for (it = dock->dock_apps; it; it = g_list_next(it)) {
+ ObDockApp *app = it->data;
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->area.width += app->w;
+ dock->area.height = MAX(dock->area.height, app->h);
+ break;
+ case OB_ORIENTATION_VERT:
+ dock->area.width = MAX(dock->area.width, app->w);
+ dock->area.height += app->h;
+ break;
+ }
+ }
+
+ if (dock->dock_apps) {
+ dock->area.width += l + r;
+ dock->area.height += t + b;
+ }
+
+ hspot = l;
+ vspot = t;
+
+ /* position the apps */
+ for (it = dock->dock_apps; it; it = g_list_next(it)) {
+ ObDockApp *app = it->data;
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ app->x = hspot;
+ app->y = (dock->area.height - app->h) / 2;
+ hspot += app->w;
+ break;
+ case OB_ORIENTATION_VERT:
+ app->x = (dock->area.width - app->w) / 2;
+ app->y = vspot;
+ vspot += app->h;
+ break;
}
- XMoveWindow(ob_display, app->icon_win, app->x, app->y);
+ XMoveWindow(obt_display, app->icon_win, app->x, app->y);
}
/* used for calculating offsets */
- dock->w += theme_bwidth * 2;
- dock->h += theme_bwidth * 2;
+ dock->area.width += ob_rr_theme->obwidth * 2;
+ dock->area.height += ob_rr_theme->obwidth * 2;
+
+ a = screen_physical_area_all_monitors();
/* calculate position */
- switch (config_dock_pos) {
- case DockPos_Floating:
- dock->x = config_dock_x;
- dock->y = config_dock_y;
- gravity = NorthWestGravity;
- break;
- case DockPos_TopLeft:
- dock->x = 0;
- dock->y = 0;
+ if (config_dock_floating) {
+ dock->area.x = config_dock_x;
+ dock->area.y = config_dock_y;
gravity = NorthWestGravity;
- break;
- case DockPos_Top:
- dock->x = screen_physical_size.width / 2;
- dock->y = 0;
- gravity = NorthGravity;
- break;
- case DockPos_TopRight:
- dock->x = screen_physical_size.width;
- dock->y = 0;
- gravity = NorthEastGravity;
- break;
- case DockPos_Left:
- dock->x = 0;
- dock->y = screen_physical_size.height / 2;
- gravity = WestGravity;
- break;
- case DockPos_Right:
- dock->x = screen_physical_size.width;
- dock->y = screen_physical_size.height / 2;
- gravity = EastGravity;
- break;
- case DockPos_BottomLeft:
- dock->x = 0;
- dock->y = screen_physical_size.height;
- gravity = SouthWestGravity;
- break;
- case DockPos_Bottom:
- dock->x = screen_physical_size.width / 2;
- dock->y = screen_physical_size.height;
- gravity = SouthGravity;
- break;
- case DockPos_BottomRight:
- dock->x = screen_physical_size.width;
- dock->y = screen_physical_size.height;
- gravity = SouthEastGravity;
- break;
+ } else {
+ switch (config_dock_pos) {
+ case OB_DIRECTION_NORTHWEST:
+ dock->area.x = 0;
+ dock->area.y = 0;
+ gravity = NorthWestGravity;
+ break;
+ case OB_DIRECTION_NORTH:
+ dock->area.x = a->width / 2;
+ dock->area.y = 0;
+ gravity = NorthGravity;
+ break;
+ case OB_DIRECTION_NORTHEAST:
+ dock->area.x = a->width;
+ dock->area.y = 0;
+ gravity = NorthEastGravity;
+ break;
+ case OB_DIRECTION_WEST:
+ dock->area.x = 0;
+ dock->area.y = a->height / 2;
+ gravity = WestGravity;
+ break;
+ case OB_DIRECTION_EAST:
+ dock->area.x = a->width;
+ dock->area.y = a->height / 2;
+ gravity = EastGravity;
+ break;
+ case OB_DIRECTION_SOUTHWEST:
+ dock->area.x = 0;
+ dock->area.y = a->height;
+ gravity = SouthWestGravity;
+ break;
+ case OB_DIRECTION_SOUTH:
+ dock->area.x = a->width / 2;
+ dock->area.y = a->height;
+ gravity = SouthGravity;
+ break;
+ case OB_DIRECTION_SOUTHEAST:
+ dock->area.x = a->width;
+ dock->area.y = a->height;
+ gravity = SouthEastGravity;
+ break;
+ default:
+ g_assert_not_reached();
+ }
}
switch(gravity) {
case NorthGravity:
case CenterGravity:
case SouthGravity:
- dock->x -= dock->w / 2;
+ dock->area.x -= dock->area.width / 2;
break;
case NorthEastGravity:
case EastGravity:
case SouthEastGravity:
- dock->x -= dock->w;
+ dock->area.x -= dock->area.width;
break;
}
switch(gravity) {
case WestGravity:
case CenterGravity:
case EastGravity:
- dock->y -= dock->h / 2;
+ dock->area.y -= dock->area.height / 2;
break;
case SouthWestGravity:
case SouthGravity:
case SouthEastGravity:
- dock->y -= dock->h;
+ dock->area.y -= dock->area.height;
break;
}
if (config_dock_hide && dock->hidden) {
+ if (!config_dock_floating) {
+ switch (config_dock_pos) {
+ case OB_DIRECTION_NORTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->area.y -= dock->area.height - hidesize;
+ break;
+ case OB_ORIENTATION_VERT:
+ dock->area.x -= dock->area.width - hidesize;
+ break;
+ }
+ break;
+ case OB_DIRECTION_NORTH:
+ dock->area.y -= dock->area.height - hidesize;
+ break;
+ case OB_DIRECTION_NORTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->area.y -= dock->area.height - hidesize;
+ break;
+ case OB_ORIENTATION_VERT:
+ dock->area.x += dock->area.width - hidesize;
+ break;
+ }
+ break;
+ case OB_DIRECTION_WEST:
+ dock->area.x -= dock->area.width - hidesize;
+ break;
+ case OB_DIRECTION_EAST:
+ dock->area.x += dock->area.width - hidesize;
+ break;
+ case OB_DIRECTION_SOUTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->area.y += dock->area.height - hidesize;
+ break;
+ case OB_ORIENTATION_VERT:
+ dock->area.x -= dock->area.width - hidesize;
+ break;
+ } break;
+ case OB_DIRECTION_SOUTH:
+ dock->area.y += dock->area.height - hidesize;
+ break;
+ case OB_DIRECTION_SOUTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ dock->area.y += dock->area.height - hidesize;
+ break;
+ case OB_ORIENTATION_VERT:
+ dock->area.x += dock->area.width - hidesize;
+ break;
+ }
+ break;
+ }
+ }
+ }
+
+ if (!config_dock_floating && config_dock_hide) {
+ strw = hidesize;
+ strh = hidesize;
+ } else {
+ strw = dock->area.width;
+ strh = dock->area.height;
+ }
+
+ /* set the strut */
+ 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 {
switch (config_dock_pos) {
- case DockPos_Floating:
- break;
- case DockPos_TopLeft:
- if (config_dock_horz)
- dock->y -= dock->h - theme_bwidth;
- else
- dock->x -= dock->w - theme_bwidth;
+ case OB_DIRECTION_NORTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+ 0, 0, dock->area.x, dock->area.x
+ + dock->area.width - 1, 0, 0, 0, 0);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+ dock->area.y, dock->area.y
+ + dock->area.height - 1, 0, 0, 0, 0, 0, 0);
+ break;
+ }
break;
- case DockPos_Top:
- dock->y -= dock->h - theme_bwidth;
+ case OB_DIRECTION_NORTH:
+ STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+ 0, 0, dock->area.x, dock->area.x
+ + dock->area.width - 1, 0, 0, 0, 0);
break;
- case DockPos_TopRight:
- if (config_dock_horz)
- dock->y -= dock->h - theme_bwidth;
- else
- dock->x += dock->w - theme_bwidth;
+ case OB_DIRECTION_NORTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
+ 0, 0, dock->area.x, dock->area.x
+ + dock->area.width -1, 0, 0, 0, 0);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+ 0, 0, 0, 0, dock->area.y, dock->area.y
+ + dock->area.height - 1, 0, 0);
+ break;
+ }
break;
- case DockPos_Left:
- dock->x -= dock->w - theme_bwidth;
+ case OB_DIRECTION_WEST:
+ STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+ dock->area.y, dock->area.y
+ + dock->area.height - 1, 0, 0, 0, 0, 0, 0);
break;
- case DockPos_Right:
- dock->x += dock->w - theme_bwidth;
+ case OB_DIRECTION_EAST:
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+ 0, 0, 0, 0, dock->area.y, dock->area.y
+ + dock->area.height - 1, 0, 0);
break;
- case DockPos_BottomLeft:
- if (config_dock_horz)
- dock->y += dock->h - theme_bwidth;
- else
- dock->x -= dock->w - theme_bwidth;
+ case OB_DIRECTION_SOUTHWEST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+ 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x
+ + dock->area.width - 1);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
+ dock->area.y, dock->area.y
+ + dock->area.height - 1, 0, 0, 0, 0, 0, 0);
+ break;
+ }
break;
- case DockPos_Bottom:
- dock->y += dock->h - theme_bwidth;
+ case OB_DIRECTION_SOUTH:
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+ 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x
+ + dock->area.width - 1);
break;
- case DockPos_BottomRight:
- if (config_dock_horz)
- dock->y += dock->h - theme_bwidth;
- else
- dock->x += dock->w - theme_bwidth;
+ case OB_DIRECTION_SOUTHEAST:
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
+ 0, 0, 0, 0, 0, 0, dock->area.x,
+ dock->area.x + dock->area.width - 1);
+ break;
+ case OB_ORIENTATION_VERT:
+ STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
+ 0, 0, 0, 0, dock->area.y, dock->area.y
+ + dock->area.height - 1, 0, 0);
+ break;
+ }
break;
- }
- }
-
- /* set the strut */
- switch (config_dock_pos) {
- case DockPos_Floating:
- STRUT_SET(dock_strut, 0, 0, 0, 0);
- break;
- case DockPos_TopLeft:
- if (config_dock_horz)
- STRUT_SET(dock_strut, 0, dock->h, 0, 0);
- else
- STRUT_SET(dock_strut, dock->w, 0, 0, 0);
- break;
- case DockPos_Top:
- STRUT_SET(dock_strut, 0, dock->h, 0, 0);
- break;
- case DockPos_TopRight:
- if (config_dock_horz)
- STRUT_SET(dock_strut, 0, dock->h, 0, 0);
- else
- STRUT_SET(dock_strut, 0, 0, dock->w, 0);
- break;
- case DockPos_Left:
- STRUT_SET(dock_strut, dock->w, 0, 0, 0);
- break;
- case DockPos_Right:
- STRUT_SET(dock_strut, 0, 0, dock->w, 0);
- break;
- case DockPos_BottomLeft:
- if (config_dock_horz)
- STRUT_SET(dock_strut, 0, 0, 0, dock->h);
- else
- STRUT_SET(dock_strut, dock->w, 0, 0, 0);
- break;
- case DockPos_Bottom:
- STRUT_SET(dock_strut, 0, 0, 0, dock->h);
- break;
- case DockPos_BottomRight:
- if (config_dock_horz)
- STRUT_SET(dock_strut, 0, 0, 0, dock->h);
- else
- STRUT_SET(dock_strut, 0, 0, dock->w, 0);
- break;
+ }
}
/* not used for actually sizing shit */
- dock->w -= theme_bwidth * 2;
- dock->h -= theme_bwidth * 2;
+ dock->area.width -= ob_rr_theme->obwidth * 2;
+ dock->area.height -= ob_rr_theme->obwidth * 2;
+
+ if (dock->dock_apps) {
+ g_assert(dock->area.width > 0);
+ g_assert(dock->area.height > 0);
- if (dock->w > 0 && dock->h > 0) {
- RECT_SET(dock->a_frame->area, 0, 0, dock->w, dock->h);
- XMoveResizeWindow(ob_display, dock->frame,
- dock->x, dock->y, dock->w, dock->h);
+ XMoveResizeWindow(obt_display, dock->frame, dock->area.x, dock->area.y,
+ dock->area.width, dock->area.height);
- paint(dock->frame, dock->a_frame);
- XMapWindow(ob_display, dock->frame);
+ RrPaint(dock->a_frame, dock->frame, dock->area.width,
+ dock->area.height);
+ XMapWindow(obt_display, dock->frame);
} else
- XUnmapWindow(ob_display, dock->frame);
+ XUnmapWindow(obt_display, dock->frame);
- /* but they are useful outside of this function! */
- dock->w += theme_bwidth * 2;
- dock->h += theme_bwidth * 2;
+ /* but they are useful outside of this function! but don't add it if the
+ dock is actually not visible */
+ if (dock->dock_apps) {
+ dock->area.width += ob_rr_theme->obwidth * 2;
+ dock->area.height += ob_rr_theme->obwidth * 2;
+ }
- screen_update_struts();
+ /* screen_resize() depends on this function to call screen_update_areas(),
+ so if this changes, also update screen_resize(). */
+ screen_update_areas();
}
-void dock_app_configure(DockApp *app, int w, int h)
+void dock_app_configure(ObDockApp *app, gint w, gint h)
{
app->w = w;
app->h = h;
dock_configure();
}
-void dock_app_drag(DockApp *app, XMotionEvent *e)
+void dock_app_drag(ObDockApp *app, XMotionEvent *e)
{
- DockApp *over = NULL;
+ ObDockApp *over = NULL;
GList *it;
- int x, y;
+ gint x, y;
gboolean after;
+ gboolean stop;
x = e->x_root;
y = e->y_root;
/* are we on top of the dock? */
- if (!(x >= dock->x &&
- y >= dock->y &&
- x < dock->x + dock->w &&
- y < dock->y + dock->h))
+ if (!(x >= dock->area.x &&
+ y >= dock->area.y &&
+ x < dock->area.x + dock->area.width &&
+ y < dock->area.y + dock->area.height))
return;
- x -= dock->x;
- y -= dock->y;
+ x -= dock->area.x;
+ y -= dock->area.y;
/* which dock app are we on top of? */
- for (it = dock->dock_apps; it; it = it->next) {
+ stop = FALSE;
+ for (it = dock->dock_apps; it; it = g_list_next(it)) {
over = it->data;
- if (config_dock_horz) {
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
if (x >= over->x && x < over->x + over->w)
- break;
- } else {
+ stop = TRUE;
+ break;
+ case OB_ORIENTATION_VERT:
if (y >= over->y && y < over->y + over->h)
- break;
+ stop = TRUE;
+ break;
}
+ /* dont go to it->next! */
+ if (stop) break;
}
if (!it || app == over) return;
x -= over->x;
y -= over->y;
- if (config_dock_horz)
+ switch (config_dock_orient) {
+ case OB_ORIENTATION_HORZ:
after = (x > over->w / 2);
- else
+ break;
+ case OB_ORIENTATION_VERT:
after = (y > over->h / 2);
+ break;
+ default:
+ g_assert_not_reached();
+ }
/* remove before doing the it->next! */
dock->dock_apps = g_list_remove(dock->dock_apps, app);
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();
+
+ hide_timeout_id = 0;
+
+ return FALSE; /* don't repeat */
+}
+
+static gboolean show_timeout(gpointer data)
+{
+ /* show */
+ dock->hidden = FALSE;
+ dock_configure();
+
+ show_timeout_id = 0;
+
+ 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;
+ if (dock->hidden && config_dock_hide) {
+ show_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT,
+ config_dock_show_delay,
+ show_timeout, NULL, NULL);
+ } else if (!dock->hidden && config_dock_hide && hide_timeout_id) {
+ if (hide_timeout_id) g_source_remove(hide_timeout_id);
+ hide_timeout_id = 0;
}
} else {
- g_assert(!dock->hide_timer);
- dock->hide_timer = timer_start(config_dock_hide_timeout * 1000,
- (TimeoutHandler)hide_timeout,
- NULL);
+ if (!dock->hidden && config_dock_hide) {
+ hide_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT,
+ config_dock_hide_delay,
+ hide_timeout, NULL, NULL);
+ } else if (dock->hidden && config_dock_hide && show_timeout_id) {
+ if (show_timeout_id) g_source_remove(show_timeout_id);
+ show_timeout_id = 0;
+ }
}
}
+
+void dock_get_area(Rect *a)
+{
+ RECT_SET(*a, dock->area.x, dock->area.y,
+ dock->area.width, dock->area.height);
+}
+
+void dock_raise_dock(void)
+{
+ stacking_raise(DOCK_AS_WINDOW(dock));
+}
+
+void dock_lower_dock(void)
+{
+ stacking_lower(DOCK_AS_WINDOW(dock));
+}
+
+ObDockApp* dock_find_dockapp(Window xwin)
+{
+ return g_hash_table_lookup(dock->dock_map, &xwin);
+}
projects / chaz / openbox / blobdiff