X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=e3ad2bc63060ee6c19fdcd523d78c62085466a2a;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=dba74f684923d53ffb28ea04844f7bb18c6bcebc;hpb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index dba74f68..e3ad2bc6 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -23,7 +23,7 @@ #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 | \ @@ -50,6 +50,9 @@ static void dock_app_grab_button(ObDockApp *app, gboolean grab) } } +static guint window_hash(Window *w) { return *w; } +static gboolean window_comp(Window *w1, Window *w2) { return *w1 == *w2; } + void dock_startup(gboolean reconfig) { XSetWindowAttributes attrib; @@ -62,7 +65,7 @@ void dock_startup(gboolean reconfig) XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth); RrAppearanceFree(dock->a_frame); - dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->osd_bg); stacking_add(DOCK_AS_WINDOW(dock)); @@ -77,23 +80,25 @@ void dock_startup(gboolean reconfig) 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; + 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; attrib.do_not_propagate_mask = DOCK_NOPROPAGATEMASK; - dock->frame = XCreateWindow(obt_display, - RootWindow(obt_display, ob_screen), + 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 = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); + 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); @@ -102,7 +107,7 @@ void dock_startup(gboolean reconfig) OBT_PROP_SET32(dock->frame, NET_WM_WINDOW_TYPE, ATOM, OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK)); - g_hash_table_insert(window_map, &dock->frame, dock); + window_add(&dock->frame, DOCK_AS_WINDOW(dock)); stacking_add(DOCK_AS_WINDOW(dock)); } @@ -118,25 +123,27 @@ void dock_shutdown(gboolean reconfig) return; } + g_hash_table_destroy(dock->dock_map); + XDestroyWindow(obt_display, dock->frame); RrAppearanceFree(dock->a_frame); - g_hash_table_remove(window_map, &dock->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) { ObDockApp *app; XWindowAttributes attrib; gchar **data; - app = g_new0(ObDockApp, 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 (OBT_PROP_GETSS(app->win, WM_CLASS, locale, &data)) { + if (OBT_PROP_GETSS(app->name_win, WM_CLASS, locale, &data)) { if (data[0]) { app->name = g_strdup(data[0]); if (data[1]) @@ -156,6 +163,7 @@ void dock_add(Window win, XWMHints *wmhints) } dock->dock_apps = g_list_append(dock->dock_apps, app); + g_hash_table_insert(dock->dock_map, &app->icon_win, app); dock_configure(); XReparentWindow(obt_display, app->icon_win, dock->frame, app->x, app->y); @@ -168,34 +176,34 @@ void dock_add(Window win, XWMHints *wmhints) */ 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->win != app->icon_win) { - /* have to map it so that it can be re-managed on a restart */ - XMoveWindow(obt_display, app->win, -1000, -1000); - XMapWindow(obt_display, app->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(obt_display, app->icon_win); + XSync(obt_display, False); - /* specify that if we exit, the window should not be destroyed and should - be reparented back to root automatically */ - XChangeSaveSet(obt_display, app->icon_win, SetModeInsert); XSelectInput(obt_display, app->icon_win, DOCKAPP_EVENT_MASK); dock_app_grab_button(app, TRUE); - g_hash_table_insert(window_map, &app->icon_win, app); + ob_debug("Managed Dock App: 0x%lx 0x%lx (%s)", + app->icon_win, app->name_win, app->class); - ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class); + grab_server(FALSE); } -void dock_remove_all(void) +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(ObDockApp *app, gboolean reparent) +void dock_unmanage(ObDockApp *app, gboolean reparent) { dock_app_grab_button(app, FALSE); XSelectInput(obt_display, app->icon_win, NoEventMask); @@ -203,20 +211,22 @@ void dock_remove(ObDockApp *app, gboolean reparent) XChangeSaveSet(obt_display, app->icon_win, SetModeDelete); XSync(obt_display, False); - g_hash_table_remove(window_map, &app->icon_win); - - if (reparent) - XReparentWindow(obt_display, app->icon_win, - RootWindow(obt_display, ob_screen), app->x, app->y); + 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(); - ob_debug("Unmanaged Dock App: 0x%lx (%s)\n", 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) @@ -226,7 +236,7 @@ void dock_configure(void) gint gravity; gint l, r, t, b; gint strw, strh; - Rect *a; + Rect const *a; gint hidesize; RrMargins(dock->a_frame, &l, &t, &r, &b); @@ -249,8 +259,10 @@ void dock_configure(void) } } - dock->area.width += l + r; - dock->area.height += t + b; + if (dock->dock_apps) { + dock->area.width += l + r; + dock->area.height += t + b; + } hspot = l; vspot = t; @@ -427,11 +439,12 @@ void dock_configure(void) 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) - { + } + 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) { @@ -529,13 +542,14 @@ void dock_configure(void) } else XUnmapWindow(obt_display, dock->frame); - /* but they are useful outside of this function! */ - dock->area.width += ob_rr_theme->obwidth * 2; - dock->area.height += ob_rr_theme->obwidth * 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) @@ -654,3 +668,8 @@ void dock_get_area(Rect *a) RECT_SET(*a, dock->area.x, dock->area.y, dock->area.width, dock->area.height); } + +ObDockApp* dock_find_dockapp(Window xwin) +{ + return g_hash_table_lookup(dock->dock_map, &xwin); +}