X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=3dda174dbee21e2aeb0feb9e8af97d2dfc433c8e;hb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;hp=b25c7e49b423313b7e923594f450600a983c78d3;hpb=a0691941e88ca8a8388fe17971be637e3aa3d835;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index b25c7e49..3dda174d 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -1,5 +1,6 @@ #include "dock.h" #include "screen.h" +#include "prop.h" #include "config.h" #include "grab.h" #include "openbox.h" @@ -11,10 +12,13 @@ static Dock *dock; +Strut dock_strut; + void dock_startup() { XSetWindowAttributes attrib; - int i; + + STRUT_SET(dock_strut, 0, 0, 0, 0); dock = g_new0(struct Dock, 1); dock->obwin.type = Window_Dock; @@ -24,22 +28,23 @@ void dock_startup() 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, + RrDepth(ob_rr_inst), InputOutput, + RrVisual(ob_rr_inst), CWOverrideRedirect | CWEventMask, &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->a_unfocused_title); + XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth); g_hash_table_insert(window_map, &dock->frame, dock); - stacking_add(DOCK_AS_WINDOW(&dock[i])); - stacking_raise(DOCK_AS_WINDOW(&dock[i])); + stacking_add(DOCK_AS_WINDOW(dock)); + stacking_raise(DOCK_AS_WINDOW(dock)); } void dock_shutdown() { XDestroyWindow(ob_display, dock->frame); - appearance_free(dock->a_frame); + RrAppearanceFree(dock->a_frame); g_hash_table_remove(window_map, &dock->frame); stacking_remove(dock); } @@ -48,12 +53,25 @@ void dock_add(Window win, XWMHints *wmhints) { DockApp *app; XWindowAttributes attrib; + char **data; app = g_new0(DockApp, 1); app->obwin.type = Window_DockApp; app->win = win; app->icon_win = (wmhints->flags & IconWindowHint) ? wmhints->icon_window : win; + + if (PROP_GETSS(app->win, wm_class, locale, &data)) { + if (data[0]) { + app->name = g_strdup(data[0]); + if (data[1]) + app->class = g_strdup(data[1]); + } + 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; @@ -95,7 +113,7 @@ void dock_add(Window win, XWMHints *wmhints) g_hash_table_insert(window_map, &app->icon_win, app); - g_message("Managed Dock App: 0x%lx", app->icon_win); + g_message("Managed Dock App: 0x%lx (%s)", app->icon_win, app->class); } void dock_remove_all() @@ -120,8 +138,10 @@ void dock_remove(DockApp *app, gboolean reparent) dock->dock_apps = g_list_remove(dock->dock_apps, app); dock_configure(); - g_message("Unmanaged Dock App: 0x%lx", app->icon_win); + g_message("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class); + g_free(app->name); + g_free(app->class); g_free(app); } @@ -133,19 +153,28 @@ void dock_configure() dock->w = dock->h = spot = 0; + /* get the size */ for (it = dock->dock_apps; it; it = it->next) { struct DockApp *app = it->data; if (config_dock_horz) { - app->x = spot; - app->y = 0; dock->w += app->w; dock->h = MAX(dock->h, app->h); - spot += app->w; } else { - app->x = 0; - app->y = spot; dock->w = MAX(dock->w, app->w); dock->h += app->h; + } + } + + /* position the apps */ + 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; + spot += app->w; + } else { + app->x = (dock->w - app->w) / 2; + app->y = spot; spot += app->h; } @@ -153,8 +182,8 @@ void dock_configure() } /* used for calculating offsets */ - dock->w += theme_bwidth * 2; - dock->h += theme_bwidth * 2; + dock->w += ob_rr_theme->bwidth * 2; + dock->h += ob_rr_theme->bwidth * 2; /* calculate position */ switch (config_dock_pos) { @@ -236,60 +265,104 @@ void dock_configure() break; case DockPos_TopLeft: if (config_dock_horz) - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; else - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Top: - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; break; case DockPos_TopRight: if (config_dock_horz) - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; else - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; case DockPos_Left: - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Right: - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; case DockPos_BottomLeft: if (config_dock_horz) - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; else - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Bottom: - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; break; case DockPos_BottomRight: if (config_dock_horz) - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; else - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; 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->w -= ob_rr_theme->bwidth * 2; + dock->h -= ob_rr_theme->bwidth * 2; 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); - paint(dock->frame, dock->a_frame); + RrPaint(dock->a_frame, dock->frame, dock->w, dock->h); XMapWindow(ob_display, dock->frame); } else XUnmapWindow(ob_display, dock->frame); /* but they are useful outside of this function! */ - dock->w += theme_bwidth * 2; - dock->h += theme_bwidth * 2; + dock->w += ob_rr_theme->bwidth * 2; + dock->h += ob_rr_theme->bwidth * 2; + + screen_update_struts(); } void dock_app_configure(DockApp *app, int w, int h)