X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;h=990c8208406b7f2838051bb2ea01e8a4786fe663;hb=77baf26a7f2f64ddf1274035fd4991ab17345904;hp=8cb40fb6c7ca6614c65d95272bc284fada96fbd4;hpb=3234a7508326f0fd7b54b7cfe0bd443f8ba35260;p=chaz%2Fopenbox diff --git a/openbox/dock.c b/openbox/dock.c index 8cb40fb6..990c8208 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -138,12 +138,12 @@ void dock_add(Window win, XWMHints *wmhints) if (data[1]) app->class = g_strdup(data[1]); } - g_strfreev(data); + 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; app->h = attrib.height; @@ -405,7 +405,7 @@ void dock_configure() break; } break; - } + } } } @@ -431,75 +431,75 @@ void dock_configure() switch (config_dock_orient) { case OB_ORIENTATION_HORZ: STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, - 0, 0, dock->area.x, dock->area.x + dock->area.width - 1, - 0, 0, 0, 0); + 0, 0, dock->area.x, dock->area.x + + dock->area.width - 1, 0, 0, 0, 0); break; case OB_ORIENTATION_VERT: STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, - dock->area.y, dock->area.y + dock->area.height - 1, - 0, 0, 0, 0, 0, 0); + dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0, 0, 0, 0, 0); break; } break; case OB_DIRECTION_NORTH: STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, - 0, 0, dock->area.x, dock->area.x + dock->area.width - 1, - 0, 0, 0, 0); + 0, 0, dock->area.x, dock->area.x + + dock->area.width - 1, 0, 0, 0, 0); break; case OB_DIRECTION_NORTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, - 0, 0, dock->area.x, dock->area.x + dock->area.width -1, - 0, 0, 0, 0); + 0, 0, dock->area.x, dock->area.x + + dock->area.width -1, 0, 0, 0, 0); break; case OB_ORIENTATION_VERT: STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, - 0, 0, 0, 0, - dock->area.y, dock->area.y + dock->area.height - 1, 0, 0); + 0, 0, 0, 0, dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0); break; } break; case OB_DIRECTION_WEST: STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, - dock->area.y, dock->area.y + dock->area.height - 1, - 0, 0, 0, 0, 0, 0); + dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0, 0, 0, 0, 0); break; case OB_DIRECTION_EAST: STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, - 0, 0, 0, 0, - dock->area.y, dock->area.y + dock->area.height - 1, 0, 0); + 0, 0, 0, 0, dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0); break; case OB_DIRECTION_SOUTHWEST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, - 0, 0, 0, 0, 0, 0, - dock->area.x, dock->area.x + dock->area.width - 1); + 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x + + dock->area.width - 1); break; case OB_ORIENTATION_VERT: STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, - dock->area.y, dock->area.y + dock->area.height - 1, - 0, 0, 0, 0, 0, 0); + dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0, 0, 0, 0, 0); break; } break; case OB_DIRECTION_SOUTH: STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, - 0, 0, 0, 0, 0, 0, - dock->area.x, dock->area.x + dock->area.width - 1); + 0, 0, 0, 0, 0, 0, dock->area.x, dock->area.x + + dock->area.width - 1); break; case OB_DIRECTION_SOUTHEAST: switch (config_dock_orient) { case OB_ORIENTATION_HORZ: STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, - 0, 0, 0, 0, 0, 0, - dock->area.x, dock->area.x + dock->area.width - 1); + 0, 0, 0, 0, 0, 0, dock->area.x, + dock->area.x + dock->area.width - 1); break; case OB_ORIENTATION_VERT: STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, - 0, 0, 0, 0, - dock->area.y, dock->area.y + dock->area.height - 1, 0, 0); + 0, 0, 0, 0, dock->area.y, dock->area.y + + dock->area.height - 1, 0, 0); break; } break; @@ -514,10 +514,11 @@ void dock_configure() g_assert(dock->area.width > 0); g_assert(dock->area.height > 0); - XMoveResizeWindow(ob_display, dock->frame, - dock->area.x, dock->area.y, dock->area.width, dock->area.height); + XMoveResizeWindow(ob_display, dock->frame, dock->area.x, dock->area.y, + dock->area.width, dock->area.height); - RrPaint(dock->a_frame, dock->frame, dock->area.width, dock->area.height); + RrPaint(dock->a_frame, dock->frame, dock->area.width, + dock->area.height); XMapWindow(ob_display, dock->frame); } else XUnmapWindow(ob_display, dock->frame); @@ -640,5 +641,6 @@ void dock_hide(gboolean hide) void dock_get_area(Rect *a) { - RECT_SET(*a, dock->area.x, dock->area.y, dock->area.width, dock->area.height); + RECT_SET(*a, dock->area.x, dock->area.y, + dock->area.width, dock->area.height); }