+#include "debug.h"
#include "dock.h"
#include "screen.h"
#include "prop.h"
attrib.event_mask = DOCK_EVENT_MASK;
attrib.override_redirect = True;
- dock->frame = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0,
+ 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,
member set the root window, and one set to the client, but both get
handled and need to be ignored.
*/
- if (ob_state == OB_STATE_STARTING)
+ if (ob_state() == OB_STATE_STARTING)
app->ignore_unmaps += 2;
if (app->win != app->icon_win) {
g_hash_table_insert(window_map, &app->icon_win, app);
- g_message("Managed Dock App: 0x%lx (%s)", app->icon_win, app->class);
+ ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
}
void dock_remove_all()
g_hash_table_remove(window_map, &app->icon_win);
if (reparent)
- XReparentWindow(ob_display, app->icon_win, ob_root, app->x, app->y);
+ 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);
dock_configure();
- g_message("Unmanaged Dock App: 0x%lx (%s)", app->icon_win, app->class);
+ ob_debug("Unmanaged Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
g_free(app->name);
g_free(app->class);
/* which dock app are we on top of? */
stop = FALSE;
- for (it = dock->dock_apps; it && !stop; it = it->next) {
+ for (it = dock->dock_apps; it; it = it->next) {
over = it->data;
switch (config_dock_orient) {
case OB_ORIENTATION_HORZ:
stop = TRUE;
break;
}
+ /* dont go to it->next! */
+ if (stop) break;
}
if (!it || app == over) return;