#include "dock.h"
#include "screen.h"
+#include "prop.h"
#include "config.h"
#include "grab.h"
#include "openbox.h"
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;
XSetWindowBorderWidth(ob_display, dock->frame, 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()
{
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;
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()
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);
}
}
}
+ /* 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;
/* but they are useful outside of this function! */
dock->w += theme_bwidth * 2;
dock->h += theme_bwidth * 2;
+
+ screen_update_struts();
}
void dock_app_configure(DockApp *app, int w, int h)