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

a) fix resizerelative moving windows when they reach their minimum size do this by...

Browse source 
b) adding a function to let you see what size/position a window will be given when you actually try move/resize it to some given values. (client_try_configure)
This commit is contained in:
Dana Jansens 2007-03-14 03:45:56 +00:00
parent 4e19d8411d
commit e2521f5c64
3 changed files with 114 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
openbox/action.c
View file

@ -1345,14 +1345,21 @@ void action_move_relative(union ActionData *data)
void action_resize_relative(union ActionData *data) void action_resize_relative(union ActionData *data)
{ {
ObClient *c = data->relative.any.c; ObClient *c = data->relative.any.c;
gint x, y, ow, w, oh, h, lw, lh;
client_action_start(data); client_action_start(data);
client_move_resize(c,
c->area.x - data->relative.deltaxl * c->size_inc.width, x = c->area.x;
c->area.y - data->relative.deltayu * c->size_inc.height, y = c->area.y;
c->area.width + data->relative.deltax * c->size_inc.width ow = c->area.width;
+ data->relative.deltaxl * c->size_inc.width, w = ow + data->relative.deltax * c->size_inc.width
c->area.height + data->relative.deltay * c->size_inc.height + data->relative.deltaxl * c->size_inc.width;
+ data->relative.deltayu * c->size_inc.height); oh = c->area.height;
h = oh + data->relative.deltay * c->size_inc.height
+ data->relative.deltayu * c->size_inc.height;
client_try_configure(c, OB_CORNER_TOPLEFT, &x, &y, &w, &h, &lw, &lh, TRUE);
client_move_resize(c, x + (ow - w), y + (oh - h), w, h);
client_action_end(data); client_action_end(data);
} }

142
openbox/client.c
View file

@ -2206,17 +2206,12 @@ static void client_apply_startup_state(ObClient *self, gint x, gint y)
*/ */
} }
void client_configure_full(ObClient *self, ObCorner anchor, void client_try_configure(ObClient *self, ObCorner anchor,
gint x, gint y, gint w, gint h, gint *x, gint *y, gint *w, gint *h,
gboolean user, gboolean final, gint *logicalw, gint *logicalh,
gboolean force_reply) gboolean user)
{ {
gint oldw, oldh; Rect desired_area = {*x, *y, *w, *h};
gboolean send_resize_client;
gboolean moved = FALSE, resized = FALSE;
guint fdecor = self->frame->decorations;
gboolean fhorz = self->frame->max_horz;
Rect desired_area = {x, y, w, h};
/* make the frame recalculate its dimentions n shit without changing /* make the frame recalculate its dimentions n shit without changing
anything visible for real, this way the constraints below can work with anything visible for real, this way the constraints below can work with
@ -2224,7 +2219,7 @@ void client_configure_full(ObClient *self, ObCorner anchor,
frame_adjust_area(self->frame, TRUE, TRUE, TRUE); frame_adjust_area(self->frame, TRUE, TRUE, TRUE);
/* gets the frame's position */ /* gets the frame's position */
frame_client_gravity(self->frame, &x, &y); frame_client_gravity(self->frame, x, y);
/* these positions are frame positions, not client positions */ /* these positions are frame positions, not client positions */
@ -2236,10 +2231,10 @@ void client_configure_full(ObClient *self, ObCorner anchor,
i = screen_find_monitor(&desired_area); i = screen_find_monitor(&desired_area);
a = screen_physical_area_monitor(i); a = screen_physical_area_monitor(i);
x = a->x; *x = a->x;
y = a->y; *y = a->y;
w = a->width; *w = a->width;
h = a->height; *h = a->height;
user = FALSE; /* ignore that increment etc shit when in fullscreen */ user = FALSE; /* ignore that increment etc shit when in fullscreen */
} else { } else {
@ -2251,31 +2246,31 @@ void client_configure_full(ObClient *self, ObCorner anchor,
/* set the size and position if maximized */ /* set the size and position if maximized */
if (self->max_horz) { if (self->max_horz) {
x = a->x; *x = a->x;
w = a->width - self->frame->size.left - self->frame->size.right; *w = a->width - self->frame->size.left - self->frame->size.right;
} }
if (self->max_vert) { if (self->max_vert) {
y = a->y; *y = a->y;
h = a->height - self->frame->size.top - self->frame->size.bottom; *h = a->height - self->frame->size.top - self->frame->size.bottom;
} }
} }
/* gets the client's position */ /* gets the client's position */
frame_frame_gravity(self->frame, &x, &y); frame_frame_gravity(self->frame, x, y);
/* these override the above states! if you cant move you can't move! */ /* these override the above states! if you cant move you can't move! */
if (user) { if (user) {
if (!(self->functions & OB_CLIENT_FUNC_MOVE)) { if (!(self->functions & OB_CLIENT_FUNC_MOVE)) {
x = self->area.x; *x = self->area.x;
y = self->area.y; *y = self->area.y;
} }
if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) { if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) {
w = self->area.width; *w = self->area.width;
h = self->area.height; *h = self->area.height;
} }
} }
if (!(w == self->area.width && h == self->area.height)) { if (!(*w == self->area.width && *h == self->area.height)) {
gint basew, baseh, minw, minh; gint basew, baseh, minw, minh;
/* base size is substituted with min size if not specified */ /* base size is substituted with min size if not specified */
@ -2299,83 +2294,104 @@ void client_configure_full(ObClient *self, ObCorner anchor,
sizes */ sizes */
/* smaller than min size or bigger than max size? */ /* smaller than min size or bigger than max size? */
if (w > self->max_size.width) w = self->max_size.width; if (*w > self->max_size.width) *w = self->max_size.width;
if (w < minw) w = minw; if (*w < minw) *w = minw;
if (h > self->max_size.height) h = self->max_size.height; if (*h > self->max_size.height) *h = self->max_size.height;
if (h < minh) h = minh; if (*h < minh) *h = minh;
w -= basew; *w -= basew;
h -= baseh; *h -= baseh;
/* keep to the increments */ /* keep to the increments */
w /= self->size_inc.width; *w /= self->size_inc.width;
h /= self->size_inc.height; *h /= self->size_inc.height;
/* you cannot resize to nothing */ /* you cannot resize to nothing */
if (basew + w < 1) w = 1 - basew; if (basew + *w < 1) *w = 1 - basew;
if (baseh + h < 1) h = 1 - baseh; if (baseh + *h < 1) *h = 1 - baseh;
/* store the logical size */ /* save the logical size */
SIZE_SET(self->logical_size, *logicalw = self->size_inc.width > 1 ? *w : *w + basew;
self->size_inc.width > 1 ? w : w + basew, *logicalh = self->size_inc.height > 1 ? *h : *h + baseh;
self->size_inc.height > 1 ? h : h + baseh);
w *= self->size_inc.width; *w *= self->size_inc.width;
h *= self->size_inc.height; *h *= self->size_inc.height;
w += basew; *w += basew;
h += baseh; *h += baseh;
/* adjust the height to match the width for the aspect ratios. /* adjust the height to match the width for the aspect ratios.
for this, min size is not substituted for base size ever. */ for this, min size is not substituted for base size ever. */
w -= self->base_size.width; *w -= self->base_size.width;
h -= self->base_size.height; *h -= self->base_size.height;
if (!self->fullscreen) { if (!self->fullscreen) {
if (self->min_ratio) if (self->min_ratio)
if (h * self->min_ratio > w) { if (*h * self->min_ratio > *w) {
h = (gint)(w / self->min_ratio); *h = (gint)(*w / self->min_ratio);
/* you cannot resize to nothing */ /* you cannot resize to nothing */
if (h < 1) { if (*h < 1) {
h = 1; *h = 1;
w = (gint)(h * self->min_ratio); *w = (gint)(*h * self->min_ratio);
} }
} }
if (self->max_ratio) if (self->max_ratio)
if (h * self->max_ratio < w) { if (*h * self->max_ratio < *w) {
h = (gint)(w / self->max_ratio); *h = (gint)(*w / self->max_ratio);
/* you cannot resize to nothing */ /* you cannot resize to nothing */
if (h < 1) { if (*h < 1) {
h = 1; *h = 1;
w = (gint)(h * self->min_ratio); *w = (gint)(*h * self->min_ratio);
} }
} }
} }
w += self->base_size.width; *w += self->base_size.width;
h += self->base_size.height; *h += self->base_size.height;
} }
g_assert(w > 0); g_assert(*w > 0);
g_assert(h > 0); g_assert(*h > 0);
switch (anchor) { switch (anchor) {
case OB_CORNER_TOPLEFT: case OB_CORNER_TOPLEFT:
break; break;
case OB_CORNER_TOPRIGHT: case OB_CORNER_TOPRIGHT:
x -= w - self->area.width; *x -= *w - self->area.width;
break; break;
case OB_CORNER_BOTTOMLEFT: case OB_CORNER_BOTTOMLEFT:
y -= h - self->area.height; *y -= *h - self->area.height;
break; break;
case OB_CORNER_BOTTOMRIGHT: case OB_CORNER_BOTTOMRIGHT:
x -= w - self->area.width; *x -= *w - self->area.width;
y -= h - self->area.height; *y -= *h - self->area.height;
break; break;
} }
}
void client_configure_full(ObClient *self, ObCorner anchor,
gint x, gint y, gint w, gint h,
gboolean user, gboolean final,
gboolean force_reply)
{
gint oldw, oldh;
gboolean send_resize_client;
gboolean moved = FALSE, resized = FALSE;
guint fdecor = self->frame->decorations;
gboolean fhorz = self->frame->max_horz;
gint logicalw, logicalh;
/* find the new x, y, width, and height (and logical size) */
client_try_configure(self, anchor, &x, &y, &w, &h,
&logicalw, &logicalh, user);
/* set the logical size */
SIZE_SET(self->logical_size, logicalw, logicalh);
/* figure out if we moved or resized or what */
moved = x != self->area.x || y != self->area.y; moved = x != self->area.x || y != self->area.y;
resized = w != self->area.width || h != self->area.height; resized = w != self->area.width || h != self->area.height;

21
openbox/client.h
View file

@ -347,6 +347,27 @@ gboolean client_focused(ObClient *self);
#define client_configure(self, anchor, x, y, w, h, user, final) \ #define client_configure(self, anchor, x, y, w, h, user, final) \
client_configure_full(self, anchor, x, y, w, h, user, final, FALSE) client_configure_full(self, anchor, x, y, w, h, user, final, FALSE)
/*! Figure out where a window will end up and what size it will be if you
told it to move/resize to these coordinates.
These values are what client_configure_full will give the window.
@param anchor The corner to keep in the same position when resizing.
@param x The x coordiante of the new position for the client.
@param y The y coordiante of the new position for the client.
@param w The width component of the new size for the client.
@param h The height component of the new size for the client.
@param logicalw Returns the width component of the new logical width.
@param logicalh Returns the height component of the new logical height.
@param user Specifies whether this is a user-requested change or a
program requested change. For program requested changes, the
constraints are not checked.
*/
void client_try_configure(ObClient *self, ObCorner anchor,
gint *x, gint *y, gint *w, gint *h,
gint *logicalw, gint *logicalh,
gboolean user);
/*! Move and/or resize the window. /*! Move and/or resize the window.
This also maintains things like the client's minsize, and size increments. This also maintains things like the client's minsize, and size increments.
@param anchor The corner to keep in the same position when resizing. @param anchor The corner to keep in the same position when resizing.