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

fully maximize windows all the time. size increments are preferred sizes not required ones.

Browse source 
-- http://tronche.com/gui/x/icccm/sec-4.html#s-4.1.2.3
This commit is contained in:
Dana Jansens 2007-03-30 04:37:53 +00:00
parent 00ddaf06bb
commit 0eaf2d15e7
1 changed files with 57 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
openbox/client.c
View file

@ -2163,58 +2163,7 @@ void client_try_configure(ObClient *self, ObCorner anchor,
the updated frame dimensions. */ the updated frame dimensions. */
frame_adjust_area(self->frame, TRUE, TRUE, TRUE); frame_adjust_area(self->frame, TRUE, TRUE, TRUE);
/* gets the frame's position */ /* work within the prefered sizes given by the window */
frame_client_gravity(self->frame, x, y);
/* these positions are frame positions, not client positions */
/* set the size and position if fullscreen */
if (self->fullscreen) {
Rect *a;
guint i;
i = screen_find_monitor(&desired_area);
a = screen_physical_area_monitor(i);
*x = a->x;
*y = a->y;
*w = a->width;
*h = a->height;
user = FALSE; /* ignore that increment etc shit when in fullscreen */
} else {
Rect *a;
guint i;
i = screen_find_monitor(&desired_area);
a = screen_area_monitor(self->desktop, i);
/* set the size and position if maximized */
if (self->max_horz) {
*x = a->x;
*w = a->width - self->frame->size.left - self->frame->size.right;
}
if (self->max_vert) {
*y = a->y;
*h = a->height - self->frame->size.top - self->frame->size.bottom;
}
}
/* gets the client's position */
frame_frame_gravity(self->frame, x, y);
/* these override the above states! if you cant move you can't move! */
if (user) {
if (!(self->functions & OB_CLIENT_FUNC_MOVE)) {
*x = self->area.x;
*y = self->area.y;
}
if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) {
*w = self->area.width;
*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;
@ -2297,6 +2246,62 @@ void client_try_configure(ObClient *self, ObCorner anchor,
*h += self->base_size.height; *h += self->base_size.height;
} }
/* gets the frame's position */
frame_client_gravity(self->frame, x, y);
/* these positions are frame positions, not client positions */
/* set the size and position if fullscreen */
if (self->fullscreen) {
Rect *a;
guint i;
i = screen_find_monitor(&desired_area);
a = screen_physical_area_monitor(i);
*x = a->x;
*y = a->y;
*w = a->width;
*h = a->height;
user = FALSE; /* ignore if the client can't be moved/resized when it
is entering fullscreen */
} else if (self->max_horz || self->max_vert) {
Rect *a;
guint i;
i = screen_find_monitor(&desired_area);
a = screen_area_monitor(self->desktop, i);
/* set the size and position if maximized */
if (self->max_horz) {
*x = a->x;
*w = a->width - self->frame->size.left - self->frame->size.right;
}
if (self->max_vert) {
*y = a->y;
*h = a->height - self->frame->size.top - self->frame->size.bottom;
}
/* maximizing is not allowed if the user can't move+resize the window
*/
}
/* gets the client's position */
frame_frame_gravity(self->frame, x, y);
/* these override the above states! if you cant move you can't move! */
if (user) {
if (!(self->functions & OB_CLIENT_FUNC_MOVE)) {
*x = self->area.x;
*y = self->area.y;
}
if (!(self->functions & OB_CLIENT_FUNC_RESIZE)) {
*w = self->area.width;
*h = self->area.height;
}
}
g_assert(*w > 0); g_assert(*w > 0);
g_assert(*h > 0); g_assert(*h > 0);