X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=c2190ee239cf0383c3584339cc4db99fc62830a5;hb=62f1473c651a564391e53548e0cb7daa5303776d;hp=5a9e02ec7be0364955661889242e9fdb06e4e0af;hpb=d206303a9f0742ff330aebe8129d6044ade30a94;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index 5a9e02ec..c2190ee2 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -1,3 +1,4 @@ +#include "debug.h" #include "dock.h" #include "screen.h" #include "prop.h" @@ -27,13 +28,15 @@ 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, + 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, &attrib); dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); - XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel); + XSetWindowBorder(ob_display, dock->frame, + RrColorPixel(ob_rr_theme->b_color)); XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth); g_hash_table_insert(window_map, &dock->frame, dock); @@ -91,7 +94,7 @@ void dock_add(Window win, XWMHints *wmhints) 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) { @@ -113,7 +116,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 (%s)", app->icon_win, app->class); + ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class); } void dock_remove_all() @@ -133,12 +136,13 @@ void dock_remove(ObDockApp *app, gboolean reparent) 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); @@ -161,28 +165,34 @@ void dock_configure() /* get the size */ for (it = dock->dock_apps; it; it = it->next) { ObDockApp *app = it->data; - if (config_dock_horz) { + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: dock->w += app->w; dock->h = MAX(dock->h, app->h); - } else { + break; + case OB_ORIENTATION_VERT: dock->w = MAX(dock->w, app->w); dock->h += app->h; + break; } } - spot = (config_dock_horz ? minw : minh) / 2; + spot = (config_dock_orient == OB_ORIENTATION_HORZ ? minw : minh) / 2; /* position the apps */ for (it = dock->dock_apps; it; it = it->next) { ObDockApp *app = it->data; - if (config_dock_horz) { + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: app->x = spot; app->y = (dock->h - app->h) / 2; spot += app->w; - } else { + break; + case OB_ORIENTATION_VERT: app->x = (dock->w - app->w) / 2; app->y = spot; spot += app->h; + break; } XMoveWindow(ob_display, app->icon_win, app->x, app->y); @@ -273,19 +283,27 @@ void dock_configure() if (!config_dock_floating) { switch (config_dock_pos) { case OB_DIRECTION_NORTHWEST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: dock->y -= dock->h - ob_rr_theme->bwidth; - else + break; + case OB_ORIENTATION_VERT: dock->x -= dock->w - ob_rr_theme->bwidth; + break; + } break; case OB_DIRECTION_NORTH: dock->y -= dock->h - ob_rr_theme->bwidth; break; case OB_DIRECTION_NORTHEAST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: dock->y -= dock->h - ob_rr_theme->bwidth; - else + break; + case OB_ORIENTATION_VERT: dock->x += dock->w - ob_rr_theme->bwidth; + break; + } break; case OB_DIRECTION_WEST: dock->x -= dock->w - ob_rr_theme->bwidth; @@ -294,19 +312,26 @@ void dock_configure() dock->x += dock->w - ob_rr_theme->bwidth; break; case OB_DIRECTION_SOUTHWEST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: dock->y += dock->h - ob_rr_theme->bwidth; - else + break; + case OB_ORIENTATION_VERT: dock->x -= dock->w - ob_rr_theme->bwidth; - break; + break; + } break; case OB_DIRECTION_SOUTH: dock->y += dock->h - ob_rr_theme->bwidth; break; case OB_DIRECTION_SOUTHEAST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: dock->y += dock->h - ob_rr_theme->bwidth; - else + break; + case OB_ORIENTATION_VERT: dock->x += dock->w - ob_rr_theme->bwidth; + break; + } break; } } @@ -325,19 +350,27 @@ void dock_configure() } else { switch (config_dock_pos) { case OB_DIRECTION_NORTHWEST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: STRUT_SET(dock_strut, 0, strh, 0, 0); - else + break; + case OB_ORIENTATION_VERT: STRUT_SET(dock_strut, strw, 0, 0, 0); + break; + } break; case OB_DIRECTION_NORTH: STRUT_SET(dock_strut, 0, strh, 0, 0); break; case OB_DIRECTION_NORTHEAST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: STRUT_SET(dock_strut, 0, strh, 0, 0); - else + break; + case OB_ORIENTATION_VERT: STRUT_SET(dock_strut, 0, 0, strw, 0); + break; + } break; case OB_DIRECTION_WEST: STRUT_SET(dock_strut, strw, 0, 0, 0); @@ -346,19 +379,27 @@ void dock_configure() STRUT_SET(dock_strut, 0, 0, strw, 0); break; case OB_DIRECTION_SOUTHWEST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: STRUT_SET(dock_strut, 0, 0, 0, strh); - else + break; + case OB_ORIENTATION_VERT: STRUT_SET(dock_strut, strw, 0, 0, 0); + break; + } break; case OB_DIRECTION_SOUTH: STRUT_SET(dock_strut, 0, 0, 0, strh); break; case OB_DIRECTION_SOUTHEAST: - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: STRUT_SET(dock_strut, 0, 0, 0, strh); - else + break; + case OB_ORIENTATION_VERT: STRUT_SET(dock_strut, 0, 0, strw, 0); + break; + } break; } } @@ -399,6 +440,7 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) GList *it; gint x, y; gboolean after; + gboolean stop; x = e->x_root; y = e->y_root; @@ -414,25 +456,35 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e) y -= dock->y; /* which dock app are we on top of? */ + stop = FALSE; for (it = dock->dock_apps; it; it = it->next) { over = it->data; - if (config_dock_horz) { + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: if (x >= over->x && x < over->x + over->w) - break; - } else { + stop = TRUE; + break; + case OB_ORIENTATION_VERT: if (y >= over->y && y < over->y + over->h) - break; + stop = TRUE; + break; } + /* dont go to it->next! */ + if (stop) break; } if (!it || app == over) return; x -= over->x; y -= over->y; - if (config_dock_horz) + switch (config_dock_orient) { + case OB_ORIENTATION_HORZ: after = (x > over->w / 2); - else + break; + case OB_ORIENTATION_VERT: after = (y > over->h / 2); + break; + } /* remove before doing the it->next! */ dock->dock_apps = g_list_remove(dock->dock_apps, app); @@ -471,7 +523,7 @@ void dock_hide(gboolean hide) } else { g_assert(!dock->hide_timer); dock->hide_timer = timer_start(config_dock_hide_timeout * 1000, - (TimeoutHandler)hide_timeout, + (ObTimeoutHandler)hide_timeout, NULL); } }