static void client_change_state(ObClient *self);
static void client_apply_startup_state(ObClient *self);
static void client_restore_session_state(ObClient *self);
+static void client_restore_session_stacking(ObClient *self);
void client_startup()
{
/* create the ObClient struct, and populate it from the hints on the
window */
- self = g_new(ObClient, 1);
+ self = g_new0(ObClient, 1);
self->obwin.type = Window_Client;
self->window = window;
focus_order_add_new(self);
stacking_add(CLIENT_AS_WINDOW(self));
+ client_restore_session_stacking(self);
/* focus the new window? */
if (ob_state() != OB_STATE_STARTING && config_focus_new &&
if (ob_state() == OB_STATE_RUNNING)
client_move_onscreen(self, TRUE);
- screen_update_areas();
-
client_showhide(self);
/* use client_focus instead of client_activate cuz client_activate does
client_list = g_list_append(client_list, self);
g_hash_table_insert(window_map, &self->window, self);
+ /* this has to happen after we're in the client_list */
+ screen_update_areas();
+
/* update the list hints */
client_set_list();
static void client_restore_session_state(ObClient *self)
{
- ObSessionState *s;
+ GList *it;
+
+ if (!(it = session_state_find(self)))
+ return;
- s = session_state_find(self);
- if (!(s)) return;
+ self->session = it->data;
- RECT_SET(self->area, s->x, s->y, s->w, s->h);
+ RECT_SET(self->area, self->session->x, self->session->y,
+ self->session->w, self->session->h);
self->positioned = TRUE;
- XResizeWindow(ob_display, self->window, s->w, s->h);
+ XResizeWindow(ob_display, self->window,
+ self->session->w, self->session->h);
- self->desktop = s->desktop == DESKTOP_ALL ? s->desktop :
- MIN(screen_num_desktops - 1, s->desktop);
+ self->desktop = (self->session->desktop == DESKTOP_ALL ?
+ self->session->desktop :
+ MIN(screen_num_desktops - 1, self->session->desktop));
PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop);
- self->shaded = s->shaded;
- self->iconic = s->iconic;
- self->skip_pager = s->skip_pager;
- self->skip_taskbar = s->skip_taskbar;
- self->fullscreen = s->fullscreen;
- self->above = s->above;
- self->below = s->below;
- self->max_horz = s->max_horz;
- self->max_vert = s->max_vert;
+ self->shaded = self->session->shaded;
+ self->iconic = self->session->iconic;
+ self->skip_pager = self->session->skip_pager;
+ self->skip_taskbar = self->session->skip_taskbar;
+ self->fullscreen = self->session->fullscreen;
+ self->above = self->session->above;
+ self->below = self->session->below;
+ self->max_horz = self->session->max_horz;
+ self->max_vert = self->session->max_vert;
+}
+
+static void client_restore_session_stacking(ObClient *self)
+{
+ GList *it;
+
+ if (!self->session) return;
- session_state_free(s);
+ it = g_list_find(session_saved_state, self->session);
+ for (it = g_list_previous(it); it; it = g_list_previous(it)) {
+ GList *cit;
+
+ for (cit = client_list; cit; cit = g_list_next(cit))
+ if (session_state_cmp(it->data, cit->data))
+ break;
+ if (cit) {
+ client_calc_layer(self);
+ stacking_below(CLIENT_AS_WINDOW(self),
+ CLIENT_AS_WINDOW(cit->data));
+ break;
+ }
+ }
}
void client_move_onscreen(ObClient *self, gboolean rude)
static void client_get_all(ObClient *self)
{
- /* update EVERYTHING!! */
-
- self->ignore_unmaps = 0;
-
- /* defaults */
- self->frame = NULL;
- self->title = self->icon_title = NULL;
+ /* non-zero defaults */
self->title_count = 1;
- self->name = self->class = self->role = NULL;
self->wmstate = NormalState;
- self->transient = FALSE;
- self->transients = NULL;
- self->transient_for = NULL;
self->layer = -1;
- self->urgent = FALSE;
- self->positioned = FALSE;
self->decorate = TRUE;
- self->group = NULL;
- self->nicons = 0;
client_get_area(self);
client_update_transient_for(self);
self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE;
}
+ /* kill the handle on fully maxed windows */
+ if (self->max_vert && self->max_horz)
+ self->decorations &= ~OB_FRAME_DECOR_HANDLE;
+
/* finally, the user can have requested no decorations, which overrides
everything */
if (!self->decorate)
guint num;
guint32 *data;
gboolean got = FALSE;
+ StrutPartial strut;
if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal,
&data, &num)) {
if (num == 12) {
got = TRUE;
- STRUT_PARTIAL_SET(self->strut,
+ STRUT_PARTIAL_SET(strut,
data[0], data[2], data[1], data[3],
data[4], data[5], data[8], data[9],
data[6], data[7], data[10], data[11]);
PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
if (num == 4) {
got = TRUE;
- STRUT_PARTIAL_SET(self->strut,
+ STRUT_PARTIAL_SET(strut,
data[0], data[2], data[1], data[3],
0, 0, 0, 0, 0, 0, 0, 0);
}
}
if (!got)
- STRUT_PARTIAL_SET(self->strut, 0, 0, 0, 0,
+ STRUT_PARTIAL_SET(strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
- /* updating here is pointless while we're being mapped cuz we're not in
- the client list yet */
- if (self->frame)
- screen_update_areas();
+ if (!STRUT_EQUAL(strut, self->strut)) {
+ self->strut = strut;
+
+ /* updating here is pointless while we're being mapped cuz we're not in
+ the client list yet */
+ if (self->frame)
+ screen_update_areas();
+ }
}
void client_update_icons(ObClient *self)
{
gboolean moved = FALSE, resized = FALSE;
guint fdecor = self->frame->decorations;
+ gboolean fhorz = self->frame->max_horz;
/* make the frame recalculate its dimentions n shit without changing
anything visible for real, this way the constraints below can work with
if (!(w == self->area.width && h == self->area.height)) {
int basew, baseh, minw, minh;
+ int mw, mh, aw, ah;
/* base size is substituted with min size if not specified */
if (self->base_size.width || self->base_size.height) {
minh = self->base_size.height;
}
- if (user) {
- /* for interactive resizing. have to move half an increment in each
- direction. */
-
- /* how far we are towards the next size inc */
- int mw = (w - basew) % self->size_inc.width;
- int mh = (h - baseh) % self->size_inc.height;
- /* amount to add */
- int aw = self->size_inc.width / 2;
- int ah = self->size_inc.height / 2;
- /* don't let us move into a new size increment */
- if (mw + aw >= self->size_inc.width)
- aw = self->size_inc.width - mw - 1;
- if (mh + ah >= self->size_inc.height)
- ah = self->size_inc.height - mh - 1;
- w += aw;
- h += ah;
+ /* for interactive resizing. have to move half an increment in each
+ direction. */
+
+ /* how far we are towards the next size inc */
+ mw = (w - basew) % self->size_inc.width;
+ mh = (h - baseh) % self->size_inc.height;
+ /* amount to add */
+ aw = self->size_inc.width / 2;
+ ah = self->size_inc.height / 2;
+ /* don't let us move into a new size increment */
+ if (mw + aw >= self->size_inc.width)
+ aw = self->size_inc.width - mw - 1;
+ if (mh + ah >= self->size_inc.height)
+ ah = self->size_inc.height - mh - 1;
+ w += aw;
+ h += ah;
- /* if this is a user-requested resize, then check against min/max
- sizes */
-
- /* smaller than min size or bigger than max size? */
- if (w > self->max_size.width) w = self->max_size.width;
- if (w < minw) w = minw;
- if (h > self->max_size.height) h = self->max_size.height;
- if (h < minh) h = minh;
- }
+ /* if this is a user-requested resize, then check against min/max
+ sizes */
+
+ /* smaller than min size or bigger than max size? */
+ if (w > self->max_size.width) w = self->max_size.width;
+ if (w < minw) w = minw;
+ if (h > self->max_size.height) h = self->max_size.height;
+ if (h < minh) h = minh;
w -= basew;
h -= baseh;
w += basew;
h += baseh;
- if (user) {
- /* adjust the height to match the width for the aspect ratios.
- for this, min size is not substituted for base size ever. */
- w -= self->base_size.width;
- h -= self->base_size.height;
+ /* adjust the height to match the width for the aspect ratios.
+ for this, min size is not substituted for base size ever. */
+ w -= self->base_size.width;
+ h -= self->base_size.height;
- if (self->min_ratio)
- if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
- if (self->max_ratio)
- if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
+ if (self->min_ratio)
+ if (h * self->min_ratio > w) h = (int)(w / self->min_ratio);
+ if (self->max_ratio)
+ if (h * self->max_ratio < w) h = (int)(w / self->max_ratio);
- w += self->base_size.width;
- h += self->base_size.height;
- }
+ w += self->base_size.width;
+ h += self->base_size.height;
}
switch (anchor) {
/* move/resize the frame to match the request */
if (self->frame) {
- if (self->decorations != fdecor)
+ if (self->decorations != fdecor || self->max_horz != fhorz)
moved = resized = TRUE;
if (moved || resized)
client_change_state(self); /* change the state hints on the client */
+ client_setup_decor_and_functions(self);
+
/* figure out where the client should be going */
frame_frame_gravity(self->frame, &x, &y);
client_configure(self, OB_CORNER_TOPLEFT, x, y, w, h, TRUE, TRUE);
focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
}
-void client_activate(ObClient *self)
+void client_activate(ObClient *self, gboolean here)
{
if (client_normal(self) && screen_showing_desktop)
screen_show_desktop(FALSE);
if (self->iconic)
client_iconify(self, FALSE, FALSE);
if (self->desktop != DESKTOP_ALL &&
- self->desktop != screen_desktop)
- screen_set_desktop(self->desktop);
- else if (!self->frame->visible)
+ self->desktop != screen_desktop) {
+ if (here)
+ client_set_desktop(self, screen_desktop, FALSE);
+ else
+ screen_set_desktop(self->desktop);
+ } else if (!self->frame->visible)
/* if its not visible for other reasons, then don't mess
with it */
return;