X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=d8ca062d489a5cf92c0d4677a5fdacf5864410cb;hb=8c05970840ed3a7c7ecc4a63f8f226791b495326;hp=5f7585daa1ecc47c7147502774bd22eb1eb671d9;hpb=bddbe9432837edccc67b76f2d29d4dbc9b02203f;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index 5f7585da..d8ca062d 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -1,4 +1,25 @@ +/* -*- 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 "mainloop.h" #include "screen.h" #include "prop.h" #include "config.h" @@ -12,13 +33,48 @@ static ObDock *dock; -Strut dock_strut; +StrutPartial dock_strut; -void dock_startup() +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; - STRUT_SET(dock_strut, 0, 0, 0, 0); + if (reconfig) { + GList *it; + + XSetWindowBorder(ob_display, dock->frame, + RrColorPixel(ob_rr_theme->osd_border_color)); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth); + + RrAppearanceFree(dock->a_frame); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + + 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; + } + + 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; @@ -33,18 +89,31 @@ void dock_startup() RrVisual(ob_rr_inst), CWOverrideRedirect | CWEventMask, &attrib); - dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); XSetWindowBorder(ob_display, dock->frame, - RrColorPixel(ob_rr_theme->b_color)); - XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth); + RrColorPixel(ob_rr_theme->osd_border_color)); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->obwidth); + + /* Setting the window type so xcompmgr can tell what it is */ + PROP_SET32(dock->frame, net_wm_window_type, atom, + prop_atoms.net_wm_window_type_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) { + 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); g_hash_table_remove(window_map, &dock->frame); @@ -65,7 +134,7 @@ void dock_add(Window win, XWMHints *wmhints) 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]); } @@ -94,7 +163,7 @@ void dock_add(Window win, XWMHints *wmhints) 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 */ @@ -109,13 +178,11 @@ void dock_add(Window win, XWMHints *wmhints) 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); - 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() @@ -126,7 +193,7 @@ void dock_remove_all() 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); @@ -135,13 +202,13 @@ void dock_remove(ObDockApp *app, gboolean reparent) 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_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); @@ -151,18 +218,18 @@ void dock_remove(ObDockApp *app, gboolean reparent) void dock_configure() { GList *it; - gint spot; + gint hspot, vspot; gint gravity; - gint minw, minh; + gint l, r, t, b; gint strw, strh; Rect *a; - RrMinsize(dock->a_frame, &minw, &minh); + RrMargins(dock->a_frame, &l, &t, &r, &b); 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: @@ -176,21 +243,25 @@ void dock_configure() } } - spot = (config_dock_orient == OB_ORIENTATION_HORZ ? minw : minh) / 2; + dock->w += l + r; + dock->h += t + b; + + hspot = l; + vspot = t; /* 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: - app->x = spot; + app->x = hspot; app->y = (dock->h - app->h) / 2; - spot += app->w; + hspot += app->w; break; case OB_ORIENTATION_VERT: app->x = (dock->w - app->w) / 2; - app->y = spot; - spot += app->h; + app->y = vspot; + vspot += app->h; break; } @@ -198,8 +269,8 @@ void dock_configure() } /* used for calculating offsets */ - dock->w += ob_rr_theme->bwidth * 2; - dock->h += ob_rr_theme->bwidth * 2; + dock->w += ob_rr_theme->obwidth * 2; + dock->h += ob_rr_theme->obwidth * 2; a = screen_physical_area(); @@ -250,6 +321,8 @@ void dock_configure() dock->y = a->height; gravity = SouthEastGravity; break; + default: + g_assert_not_reached(); } } @@ -284,51 +357,51 @@ void dock_configure() case OB_DIRECTION_NORTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y -= dock->h - ob_rr_theme->bwidth; + dock->y -= dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x -= dock->w - ob_rr_theme->bwidth; + dock->x -= dock->w - ob_rr_theme->obwidth; break; } break; case OB_DIRECTION_NORTH: - dock->y -= dock->h - ob_rr_theme->bwidth; + dock->y -= dock->h - ob_rr_theme->obwidth; break; case OB_DIRECTION_NORTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y -= dock->h - ob_rr_theme->bwidth; + dock->y -= dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x += dock->w - ob_rr_theme->bwidth; + dock->x += dock->w - ob_rr_theme->obwidth; break; } break; case OB_DIRECTION_WEST: - dock->x -= dock->w - ob_rr_theme->bwidth; + dock->x -= dock->w - ob_rr_theme->obwidth; break; case OB_DIRECTION_EAST: - dock->x += dock->w - ob_rr_theme->bwidth; + dock->x += dock->w - ob_rr_theme->obwidth; break; case OB_DIRECTION_SOUTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y += dock->h - ob_rr_theme->bwidth; + dock->y += dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x -= dock->w - ob_rr_theme->bwidth; + dock->x -= dock->w - ob_rr_theme->obwidth; break; } break; case OB_DIRECTION_SOUTH: - dock->y += dock->h - ob_rr_theme->bwidth; + dock->y += dock->h - ob_rr_theme->obwidth; break; case OB_DIRECTION_SOUTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y += dock->h - ob_rr_theme->bwidth; + dock->y += dock->h - ob_rr_theme->obwidth; break; case OB_ORIENTATION_VERT: - dock->x += dock->w - ob_rr_theme->bwidth; + dock->x += dock->w - ob_rr_theme->obwidth; break; } break; @@ -337,80 +410,110 @@ void dock_configure() } if (!config_dock_floating && config_dock_hide) { - strw = strh = ob_rr_theme->bwidth; + strw = ob_rr_theme->obwidth; + strh = ob_rr_theme->obwidth; } 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 || 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 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, + 0, 0, dock->x, dock->x + dock->w - 1, + 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 += minw; - dock->h += minh; - /* not used for actually sizing shit */ - dock->w -= ob_rr_theme->bwidth * 2; - dock->h -= ob_rr_theme->bwidth * 2; + dock->w -= ob_rr_theme->obwidth * 2; + dock->h -= ob_rr_theme->obwidth * 2; + + if (dock->dock_apps) { + g_assert(dock->w > 0); + g_assert(dock->h > 0); - if (dock->w > 0 && dock->h > 0) { XMoveResizeWindow(ob_display, dock->frame, dock->x, dock->y, dock->w, dock->h); @@ -420,10 +523,12 @@ void dock_configure() XUnmapWindow(ob_display, dock->frame); /* but they are useful outside of this function! */ - dock->w += ob_rr_theme->bwidth * 2; - dock->h += ob_rr_theme->bwidth * 2; + dock->w += ob_rr_theme->obwidth * 2; + dock->h += ob_rr_theme->obwidth * 2; screen_update_areas(); + + g_free(a); } void dock_app_configure(ObDockApp *app, gint w, gint h) @@ -456,7 +561,7 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) /* which dock app are we on top of? */ stop = FALSE; - for (it = dock->dock_apps; it && !stop; 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: @@ -468,6 +573,8 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) stop = TRUE; break; } + /* dont go to it->next! */ + if (stop) break; } if (!it || app == over) return; @@ -481,6 +588,8 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) case OB_ORIENTATION_VERT: after = (y > over->h / 2); break; + default: + g_assert_not_reached(); } /* remove before doing the it->next! */ @@ -492,35 +601,39 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) 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 */ +} + +static gboolean show_timeout(gpointer data) +{ + /* hide */ + dock->hidden = FALSE; + 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; + if (dock->hidden && config_dock_hide) { + ob_main_loop_timeout_add(ob_main_loop, config_dock_show_delay, + show_timeout, NULL, g_direct_equal, NULL); + } else if (!dock->hidden && config_dock_hide) { + ob_main_loop_timeout_remove(ob_main_loop, hide_timeout); } } else { - g_assert(!dock->hide_timer); - dock->hide_timer = timer_start(config_dock_hide_timeout * 1000, - (ObTimeoutHandler)hide_timeout, - NULL); + if (!dock->hidden && config_dock_hide) { + ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay, + hide_timeout, NULL, g_direct_equal, NULL); + } else if (dock->hidden && config_dock_hide) { + ob_main_loop_timeout_remove(ob_main_loop, show_timeout); + } } }