nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change dock to use a Rect area instead of four ints

Browse source
This commit is contained in:
Mikael Magnusson 2007-07-13 14:21:39 +02:00
parent e60eb1befe
commit 3234a75083
2 changed files with 75 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
openbox/dock.c
View file

@ -226,25 +226,25 @@ void dock_configure()
RrMargins(dock->a_frame, &l, &t, &r, &b); RrMargins(dock->a_frame, &l, &t, &r, &b);
dock->w = dock->h = 0; dock->area.width = dock->area.height = 0;
/* get the size */ /* get the size */
for (it = dock->dock_apps; it; it = g_list_next(it)) { for (it = dock->dock_apps; it; it = g_list_next(it)) {
ObDockApp *app = it->data; ObDockApp *app = it->data;
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
dock->w += app->w; dock->area.width += app->w;
dock->h = MAX(dock->h, app->h); dock->area.height = MAX(dock->area.height, app->h);
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
dock->w = MAX(dock->w, app->w); dock->area.width = MAX(dock->area.width, app->w);
dock->h += app->h; dock->area.height += app->h;
break; break;
} }
} }
dock->w += l + r; dock->area.width += l + r;
dock->h += t + b; dock->area.height += t + b;
hspot = l; hspot = l;
vspot = t; vspot = t;
@ -255,11 +255,11 @@ void dock_configure()
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
app->x = hspot; app->x = hspot;
app->y = (dock->h - app->h) / 2; app->y = (dock->area.height - app->h) / 2;
hspot += app->w; hspot += app->w;
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
app->x = (dock->w - app->w) / 2; app->x = (dock->area.width - app->w) / 2;
app->y = vspot; app->y = vspot;
vspot += app->h; vspot += app->h;
break; break;
@ -269,56 +269,56 @@ void dock_configure()
} }
/* used for calculating offsets */ /* used for calculating offsets */
dock->w += ob_rr_theme->obwidth * 2; dock->area.width += ob_rr_theme->obwidth * 2;
dock->h += ob_rr_theme->obwidth * 2; dock->area.height += ob_rr_theme->obwidth * 2;
a = screen_physical_area_all_monitors(); a = screen_physical_area_all_monitors();
/* calculate position */ /* calculate position */
if (config_dock_floating) { if (config_dock_floating) {
dock->x = config_dock_x; dock->area.x = config_dock_x;
dock->y = config_dock_y; dock->area.y = config_dock_y;
gravity = NorthWestGravity; gravity = NorthWestGravity;
} else { } else {
switch (config_dock_pos) { switch (config_dock_pos) {
case OB_DIRECTION_NORTHWEST: case OB_DIRECTION_NORTHWEST:
dock->x = 0; dock->area.x = 0;
dock->y = 0; dock->area.y = 0;
gravity = NorthWestGravity; gravity = NorthWestGravity;
break; break;
case OB_DIRECTION_NORTH: case OB_DIRECTION_NORTH:
dock->x = a->width / 2; dock->area.x = a->width / 2;
dock->y = 0; dock->area.y = 0;
gravity = NorthGravity; gravity = NorthGravity;
break; break;
case OB_DIRECTION_NORTHEAST: case OB_DIRECTION_NORTHEAST:
dock->x = a->width; dock->area.x = a->width;
dock->y = 0; dock->area.y = 0;
gravity = NorthEastGravity; gravity = NorthEastGravity;
break; break;
case OB_DIRECTION_WEST: case OB_DIRECTION_WEST:
dock->x = 0; dock->area.x = 0;
dock->y = a->height / 2; dock->area.y = a->height / 2;
gravity = WestGravity; gravity = WestGravity;
break; break;
case OB_DIRECTION_EAST: case OB_DIRECTION_EAST:
dock->x = a->width; dock->area.x = a->width;
dock->y = a->height / 2; dock->area.y = a->height / 2;
gravity = EastGravity; gravity = EastGravity;
break; break;
case OB_DIRECTION_SOUTHWEST: case OB_DIRECTION_SOUTHWEST:
dock->x = 0; dock->area.x = 0;
dock->y = a->height; dock->area.y = a->height;
gravity = SouthWestGravity; gravity = SouthWestGravity;
break; break;
case OB_DIRECTION_SOUTH: case OB_DIRECTION_SOUTH:
dock->x = a->width / 2; dock->area.x = a->width / 2;
dock->y = a->height; dock->area.y = a->height;
gravity = SouthGravity; gravity = SouthGravity;
break; break;
case OB_DIRECTION_SOUTHEAST: case OB_DIRECTION_SOUTHEAST:
dock->x = a->width; dock->area.x = a->width;
dock->y = a->height; dock->area.y = a->height;
gravity = SouthEastGravity; gravity = SouthEastGravity;
break; break;
default: default:
@ -330,24 +330,24 @@ void dock_configure()
case NorthGravity: case NorthGravity:
case CenterGravity: case CenterGravity:
case SouthGravity: case SouthGravity:
dock->x -= dock->w / 2; dock->area.x -= dock->area.width / 2;
break; break;
case NorthEastGravity: case NorthEastGravity:
case EastGravity: case EastGravity:
case SouthEastGravity: case SouthEastGravity:
dock->x -= dock->w; dock->area.x -= dock->area.width;
break; break;
} }
switch(gravity) { switch(gravity) {
case WestGravity: case WestGravity:
case CenterGravity: case CenterGravity:
case EastGravity: case EastGravity:
dock->y -= dock->h / 2; dock->area.y -= dock->area.height / 2;
break; break;
case SouthWestGravity: case SouthWestGravity:
case SouthGravity: case SouthGravity:
case SouthEastGravity: case SouthEastGravity:
dock->y -= dock->h; dock->area.y -= dock->area.height;
break; break;
} }
@ -357,51 +357,51 @@ void dock_configure()
case OB_DIRECTION_NORTHWEST: case OB_DIRECTION_NORTHWEST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
dock->y -= dock->h - ob_rr_theme->obwidth; dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
dock->x -= dock->w - ob_rr_theme->obwidth; dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
break; break;
} }
break; break;
case OB_DIRECTION_NORTH: case OB_DIRECTION_NORTH:
dock->y -= dock->h - ob_rr_theme->obwidth; dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
break; break;
case OB_DIRECTION_NORTHEAST: case OB_DIRECTION_NORTHEAST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
dock->y -= dock->h - ob_rr_theme->obwidth; dock->area.y -= dock->area.height - ob_rr_theme->obwidth;
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
dock->x += dock->w - ob_rr_theme->obwidth; dock->area.x += dock->area.width - ob_rr_theme->obwidth;
break; break;
} }
break; break;
case OB_DIRECTION_WEST: case OB_DIRECTION_WEST:
dock->x -= dock->w - ob_rr_theme->obwidth; dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
break; break;
case OB_DIRECTION_EAST: case OB_DIRECTION_EAST:
dock->x += dock->w - ob_rr_theme->obwidth; dock->area.x += dock->area.width - ob_rr_theme->obwidth;
break; break;
case OB_DIRECTION_SOUTHWEST: case OB_DIRECTION_SOUTHWEST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
dock->y += dock->h - ob_rr_theme->obwidth; dock->area.y += dock->area.height - ob_rr_theme->obwidth;
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
dock->x -= dock->w - ob_rr_theme->obwidth; dock->area.x -= dock->area.width - ob_rr_theme->obwidth;
break; break;
} break; } break;
case OB_DIRECTION_SOUTH: case OB_DIRECTION_SOUTH:
dock->y += dock->h - ob_rr_theme->obwidth; dock->area.y += dock->area.height - ob_rr_theme->obwidth;
break; break;
case OB_DIRECTION_SOUTHEAST: case OB_DIRECTION_SOUTHEAST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
dock->y += dock->h - ob_rr_theme->obwidth; dock->area.y += dock->area.height - ob_rr_theme->obwidth;
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
dock->x += dock->w - ob_rr_theme->obwidth; dock->area.x += dock->area.width - ob_rr_theme->obwidth;
break; break;
} }
break; break;
@ -413,8 +413,8 @@ void dock_configure()
strw = ob_rr_theme->obwidth; strw = ob_rr_theme->obwidth;
strh = ob_rr_theme->obwidth; strh = ob_rr_theme->obwidth;
} else { } else {
strw = dock->w; strw = dock->area.width;
strh = dock->h; strh = dock->area.height;
} }
/* set the strut */ /* set the strut */
@ -431,55 +431,55 @@ void dock_configure()
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
0, 0, dock->x, dock->x + dock->w - 1, 0, 0, dock->area.x, dock->area.x + dock->area.width - 1,
0, 0, 0, 0); 0, 0, 0, 0);
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
dock->y, dock->y + dock->h - 1, dock->area.y, dock->area.y + dock->area.height - 1,
0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0);
break; break;
} }
break; break;
case OB_DIRECTION_NORTH: case OB_DIRECTION_NORTH:
STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
0, 0, dock->x, dock->x + dock->w - 1, 0, 0, dock->area.x, dock->area.x + dock->area.width - 1,
0, 0, 0, 0); 0, 0, 0, 0);
break; break;
case OB_DIRECTION_NORTHEAST: case OB_DIRECTION_NORTHEAST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0, STRUT_PARTIAL_SET(dock_strut, 0, strh, 0, 0,
0, 0, dock->x, dock->x + dock->w -1, 0, 0, dock->area.x, dock->area.x + dock->area.width -1,
0, 0, 0, 0); 0, 0, 0, 0);
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
0, 0, 0, 0, 0, 0, 0, 0,
dock->y, dock->y + dock->h - 1, 0, 0); dock->area.y, dock->area.y + dock->area.height - 1, 0, 0);
break; break;
} }
break; break;
case OB_DIRECTION_WEST: case OB_DIRECTION_WEST:
STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
dock->y, dock->y + dock->h - 1, dock->area.y, dock->area.y + dock->area.height - 1,
0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0);
break; break;
case OB_DIRECTION_EAST: case OB_DIRECTION_EAST:
STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
0, 0, 0, 0, 0, 0, 0, 0,
dock->y, dock->y + dock->h - 1, 0, 0); dock->area.y, dock->area.y + dock->area.height - 1, 0, 0);
break; break;
case OB_DIRECTION_SOUTHWEST: case OB_DIRECTION_SOUTHWEST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
dock->x, dock->x + dock->w - 1); dock->area.x, dock->area.x + dock->area.width - 1);
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0, STRUT_PARTIAL_SET(dock_strut, strw, 0, 0, 0,
dock->y, dock->y + dock->h - 1, dock->area.y, dock->area.y + dock->area.height - 1,
0, 0, 0, 0, 0, 0); 0, 0, 0, 0, 0, 0);
break; break;
} }
@ -487,19 +487,19 @@ void dock_configure()
case OB_DIRECTION_SOUTH: case OB_DIRECTION_SOUTH:
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
dock->x, dock->x + dock->w - 1); dock->area.x, dock->area.x + dock->area.width - 1);
break; break;
case OB_DIRECTION_SOUTHEAST: case OB_DIRECTION_SOUTHEAST:
switch (config_dock_orient) { switch (config_dock_orient) {
case OB_ORIENTATION_HORZ: case OB_ORIENTATION_HORZ:
STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh, STRUT_PARTIAL_SET(dock_strut, 0, 0, 0, strh,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
dock->x, dock->x + dock->w - 1); dock->area.x, dock->area.x + dock->area.width - 1);
break; break;
case OB_ORIENTATION_VERT: case OB_ORIENTATION_VERT:
STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0, STRUT_PARTIAL_SET(dock_strut, 0, 0, strw, 0,
0, 0, 0, 0, 0, 0, 0, 0,
dock->y, dock->y + dock->h - 1, 0, 0); dock->area.y, dock->area.y + dock->area.height - 1, 0, 0);
break; break;
} }
break; break;
@ -507,24 +507,24 @@ void dock_configure()
} }
/* not used for actually sizing shit */ /* not used for actually sizing shit */
dock->w -= ob_rr_theme->obwidth * 2; dock->area.width -= ob_rr_theme->obwidth * 2;
dock->h -= ob_rr_theme->obwidth * 2; dock->area.height -= ob_rr_theme->obwidth * 2;
if (dock->dock_apps) { if (dock->dock_apps) {
g_assert(dock->w > 0); g_assert(dock->area.width > 0);
g_assert(dock->h > 0); g_assert(dock->area.height > 0);
XMoveResizeWindow(ob_display, dock->frame, XMoveResizeWindow(ob_display, dock->frame,
dock->x, dock->y, dock->w, dock->h); dock->area.x, dock->area.y, dock->area.width, dock->area.height);
RrPaint(dock->a_frame, dock->frame, dock->w, dock->h); RrPaint(dock->a_frame, dock->frame, dock->area.width, dock->area.height);
XMapWindow(ob_display, dock->frame); XMapWindow(ob_display, dock->frame);
} else } else
XUnmapWindow(ob_display, dock->frame); XUnmapWindow(ob_display, dock->frame);
/* but they are useful outside of this function! */ /* but they are useful outside of this function! */
dock->w += ob_rr_theme->obwidth * 2; dock->area.width += ob_rr_theme->obwidth * 2;
dock->h += ob_rr_theme->obwidth * 2; dock->area.height += ob_rr_theme->obwidth * 2;
screen_update_areas(); screen_update_areas();
@ -550,14 +550,14 @@ void dock_app_drag(ObDockApp *app, XMotionEvent *e)
y = e->y_root; y = e->y_root;
/* are we on top of the dock? */ /* are we on top of the dock? */
if (!(x >= dock->x && if (!(x >= dock->area.x &&
y >= dock->y && y >= dock->area.y &&
x < dock->x + dock->w && x < dock->area.x + dock->area.width &&
y < dock->y + dock->h)) y < dock->area.y + dock->area.height))
return; return;
x -= dock->x; x -= dock->area.x;
y -= dock->y; y -= dock->area.y;
/* which dock app are we on top of? */ /* which dock app are we on top of? */
stop = FALSE; stop = FALSE;
@ -640,5 +640,5 @@ void dock_hide(gboolean hide)
void dock_get_area(Rect *a) void dock_get_area(Rect *a)
{ {
RECT_SET(*a, dock->x, dock->y, dock->w, dock->h); RECT_SET(*a, dock->area.x, dock->area.y, dock->area.width, dock->area.height);
} }

5
openbox/dock.h
View file

@ -39,10 +39,7 @@ struct _ObDock
RrAppearance *a_frame; RrAppearance *a_frame;
/* actual position (when not auto-hidden) */ /* actual position (when not auto-hidden) */
gint x; Rect area;
gint y;
gint w;
gint h;
gboolean hidden; gboolean hidden;