#include "dock.h"
#include "screen.h"
+#include "prop.h"
#include "config.h"
#include "grab.h"
#include "openbox.h"
void dock_startup()
{
XSetWindowAttributes attrib;
- int i;
STRUT_SET(dock_strut, 0, 0, 0, 0);
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);
}
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;
}