X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=4c183e2c755f11793b94f5f1a3cbc38dcbc6a512;hb=be71b344fa740cfa061fea81426583ff44aeee9b;hp=592446a2ff22e193966dfb23bb3eecca0ff018e7;hpb=174de91c343dfbdfe866e566393bf4790ae22596;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index 592446a2..4c183e2c 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -1,7 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- dock.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + 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 @@ -29,6 +30,8 @@ #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \ EnterWindowMask | LeaveWindowMask) #define DOCKAPP_EVENT_MASK (StructureNotifyMask) +#define DOCK_NOPROPAGATEMASK (ButtonPressMask | ButtonReleaseMask | \ + ButtonMotionMask) static ObDock *dock; @@ -56,11 +59,11 @@ void dock_startup(gboolean reconfig) GList *it; 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); RrAppearanceFree(dock->a_frame); - dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); stacking_add(DOCK_AS_WINDOW(dock)); @@ -82,16 +85,22 @@ void dock_startup(gboolean reconfig) attrib.event_mask = DOCK_EVENT_MASK; attrib.override_redirect = True; + attrib.do_not_propagate_mask = DOCK_NOPROPAGATEMASK; dock->frame = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen), 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), - CWOverrideRedirect | CWEventMask, + CWOverrideRedirect | CWEventMask | + CWDontPropagate, &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)); @@ -129,16 +138,16 @@ 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]); } - 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)) { app->w = attrib.width; app->h = attrib.height; @@ -158,7 +167,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 */ @@ -180,7 +189,7 @@ void dock_add(Window win, XWMHints *wmhints) ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class); } -void dock_remove_all() +void dock_remove_all(void) { while (dock->dock_apps) dock_remove(dock->dock_apps->data, TRUE); @@ -197,7 +206,7 @@ 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); @@ -210,49 +219,57 @@ void dock_remove(ObDockApp *app, gboolean reparent) g_free(app); } -void dock_configure() +void dock_configure(void) { GList *it; - gint spot; + gint hspot, vspot; gint gravity; - gint minw, minh; + gint l, r, t, b; gint strw, strh; Rect *a; + gint hidesize; - RrMinsize(dock->a_frame, &minw, &minh); + RrMargins(dock->a_frame, &l, &t, &r, &b); + hidesize = MAX(1, ob_rr_theme->obwidth); - dock->w = dock->h = 0; + 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->w += app->w; - dock->h = MAX(dock->h, app->h); + dock->area.width += app->w; + dock->area.height = MAX(dock->area.height, app->h); break; case OB_ORIENTATION_VERT: - dock->w = MAX(dock->w, app->w); - dock->h += app->h; + dock->area.width = MAX(dock->area.width, app->w); + dock->area.height += app->h; break; } } - spot = (config_dock_orient == OB_ORIENTATION_HORZ ? minw : minh) / 2; + 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 = spot; - app->y = (dock->h - app->h) / 2; - spot += app->w; + app->x = hspot; + app->y = (dock->area.height - app->h) / 2; + hspot += app->w; break; case OB_ORIENTATION_VERT: - app->x = (dock->w - app->w) / 2; - app->y = spot; - spot += app->h; + app->x = (dock->area.width - app->w) / 2; + app->y = vspot; + vspot += app->h; break; } @@ -260,58 +277,60 @@ void dock_configure() } /* used for calculating offsets */ - dock->w += ob_rr_theme->bwidth * 2; - dock->h += ob_rr_theme->bwidth * 2; + dock->area.width += ob_rr_theme->obwidth * 2; + dock->area.height += ob_rr_theme->obwidth * 2; - a = screen_physical_area(); + a = screen_physical_area_all_monitors(); /* calculate position */ if (config_dock_floating) { - dock->x = config_dock_x; - dock->y = config_dock_y; + dock->area.x = config_dock_x; + dock->area.y = config_dock_y; gravity = NorthWestGravity; } else { switch (config_dock_pos) { case OB_DIRECTION_NORTHWEST: - dock->x = 0; - dock->y = 0; + dock->area.x = 0; + dock->area.y = 0; gravity = NorthWestGravity; break; case OB_DIRECTION_NORTH: - dock->x = a->width / 2; - dock->y = 0; + dock->area.x = a->width / 2; + dock->area.y = 0; gravity = NorthGravity; break; case OB_DIRECTION_NORTHEAST: - dock->x = a->width; - dock->y = 0; + dock->area.x = a->width; + dock->area.y = 0; gravity = NorthEastGravity; break; case OB_DIRECTION_WEST: - dock->x = 0; - dock->y = a->height / 2; + dock->area.x = 0; + dock->area.y = a->height / 2; gravity = WestGravity; break; case OB_DIRECTION_EAST: - dock->x = a->width; - dock->y = a->height / 2; + dock->area.x = a->width; + dock->area.y = a->height / 2; gravity = EastGravity; break; case OB_DIRECTION_SOUTHWEST: - dock->x = 0; - dock->y = a->height; + dock->area.x = 0; + dock->area.y = a->height; gravity = SouthWestGravity; break; case OB_DIRECTION_SOUTH: - dock->x = a->width / 2; - dock->y = a->height; + dock->area.x = a->width / 2; + dock->area.y = a->height; gravity = SouthGravity; break; case OB_DIRECTION_SOUTHEAST: - dock->x = a->width; - dock->y = a->height; + dock->area.x = a->width; + dock->area.y = a->height; gravity = SouthEastGravity; break; + default: + g_assert_not_reached(); } } @@ -319,24 +338,24 @@ void dock_configure() 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; } @@ -346,178 +365,183 @@ void dock_configure() case OB_DIRECTION_NORTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y -= dock->h - ob_rr_theme->bwidth; + dock->area.y -= dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->x -= dock->w - ob_rr_theme->bwidth; + dock->area.x -= dock->area.width - hidesize; break; } break; case OB_DIRECTION_NORTH: - dock->y -= dock->h - ob_rr_theme->bwidth; + dock->area.y -= dock->area.height - hidesize; break; case OB_DIRECTION_NORTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y -= dock->h - ob_rr_theme->bwidth; + dock->area.y -= dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->x += dock->w - ob_rr_theme->bwidth; + dock->area.x += dock->area.width - hidesize; break; } break; case OB_DIRECTION_WEST: - dock->x -= dock->w - ob_rr_theme->bwidth; + dock->area.x -= dock->area.width - hidesize; break; case OB_DIRECTION_EAST: - dock->x += dock->w - ob_rr_theme->bwidth; + dock->area.x += dock->area.width - hidesize; break; case OB_DIRECTION_SOUTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y += dock->h - ob_rr_theme->bwidth; + dock->area.y += dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->x -= dock->w - ob_rr_theme->bwidth; + dock->area.x -= dock->area.width - hidesize; break; } break; case OB_DIRECTION_SOUTH: - dock->y += dock->h - ob_rr_theme->bwidth; + dock->area.y += dock->area.height - hidesize; break; case OB_DIRECTION_SOUTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: - dock->y += dock->h - ob_rr_theme->bwidth; + dock->area.y += dock->area.height - hidesize; break; case OB_ORIENTATION_VERT: - dock->x += dock->w - ob_rr_theme->bwidth; + dock->area.x += dock->area.width - hidesize; break; } break; - } + } } } if (!config_dock_floating && config_dock_hide) { - strw = ob_rr_theme->bwidth; - strh = ob_rr_theme->bwidth; + strw = hidesize; + strh = hidesize; } else { - strw = dock->w; - strh = dock->h; + 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) { + } + 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 { + } + else { switch (config_dock_pos) { case OB_DIRECTION_NORTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, - 0, 0, dock->x, dock->x + dock->w - 1, - 0, 0, 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->y, dock->y + dock->h - 1, - 0, 0, 0, 0, 0, 0); + dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0, 0, 0, 0, 0); break; } break; case OB_DIRECTION_NORTH: STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, - dock->x, dock->x + dock->w - 1, - 0, 0, 0, 0, 0, 0); + 0, 0, dock->area.x, dock->area.x + + dock->area.width - 1, 0, 0, 0, 0); break; case OB_DIRECTION_NORTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, - 0, 0, dock->x, dock->x + dock->w -1, - 0, 0, 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->y, dock->y + dock->h - 1, 0, 0); + 0, 0, 0, 0, dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0); break; } break; case OB_DIRECTION_WEST: STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, - dock->y, dock->y + dock->h - 1, - 0, 0, 0, 0, 0, 0); + dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0, 0, 0, 0, 0); break; case OB_DIRECTION_EAST: STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, - 0, 0, 0, 0, - dock->y, dock->y + dock->h - 1, 0, 0); + 0, 0, 0, 0, dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0); break; 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->x, dock->x + dock->w - 1); + 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->y, dock->y + dock->h - 1, - 0, 0, 0, 0, 0, 0); + dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0, 0, 0, 0, 0); break; } break; case OB_DIRECTION_SOUTH: STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, - 0, 0, 0, 0, 0, 0, - dock->x, dock->x + dock->w - 1); + 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x + + dock->area.width - 1); break; 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->x, dock->x + dock->w - 1); + 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->y, dock->y + dock->h - 1, 0, 0); + 0, 0, 0, 0, dock->area.y, dock->area.y + + dock->area.height - 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->area.width -= ob_rr_theme->obwidth * 2; + dock->area.height -= ob_rr_theme->obwidth * 2; if (dock->dock_apps) { - g_assert(dock->w > 0); - g_assert(dock->h > 0); + g_assert(dock->area.width > 0); + g_assert(dock->area.height > 0); - XMoveResizeWindow(ob_display, dock->frame, - dock->x, dock->y, dock->w, dock->h); + XMoveResizeWindow(ob_display, dock->frame, dock->area.x, dock->area.y, + dock->area.width, dock->area.height); - RrPaint(dock->a_frame, dock->frame, dock->w, dock->h); + RrPaint(dock->a_frame, dock->frame, dock->area.width, + dock->area.height); XMapWindow(ob_display, dock->frame); } else 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; + /* 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_areas(); + + g_free(a); } void dock_app_configure(ObDockApp *app, gint w, gint h) @@ -539,14 +563,14 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) 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? */ stop = FALSE; @@ -577,6 +601,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! */ @@ -597,17 +623,38 @@ static gboolean hide_timeout(gpointer data) 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 (!hide) { - /* show */ - dock->hidden = FALSE; - dock_configure(); - - /* if was hiding, stop it */ - 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_delay, - hide_timeout, NULL, NULL); + if (dock->hidden && config_dock_hide) { + ob_main_loop_timeout_add(ob_main_loop, + config_dock_show_delay * 1000, + 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 { + if (!dock->hidden && config_dock_hide) { + ob_main_loop_timeout_add(ob_main_loop, + config_dock_hide_delay * 1000, + hide_timeout, NULL, g_direct_equal, NULL); + } else if (dock->hidden && config_dock_hide) { + ob_main_loop_timeout_remove(ob_main_loop, show_timeout); + } } } + +void dock_get_area(Rect *a) +{ + RECT_SET(*a, dock->area.x, dock->area.y, + dock->area.width, dock->area.height); +}