diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/client.c | 26 | ||||
| -rw-r--r-- | openbox/frame.c | 9 | ||||
| -rw-r--r-- | openbox/frame.h | 3 |
3 files changed, 20 insertions, 18 deletions
diff --git a/openbox/client.c b/openbox/client.c index 4cba7f11..11982dcb 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -245,11 +245,6 @@ void client_manage(Window window, ObPrompt *prompt) that needs to be freed with g_free(). */ settings = client_get_settings_state(self); - /* now we have all of the window's information so we can set this up. - do this before creating the frame, so it can tell that we are still - mapping and doesn't go applying things right away */ - client_setup_decor_and_functions(self, FALSE); - /* specify that if we exit, the window should not be destroyed and should be reparented back to root automatically, unless we are managing an internal ObPrompt window */ @@ -520,11 +515,11 @@ ObClient *client_fake_manage(Window window) uses too. this returns a shallow copy that needs to be freed */ settings = client_get_settings_state(self); - client_setup_decor_and_functions(self, FALSE); - /* create the decoration frame for the client window and adjust its size */ self->frame = frame_new(self); - frame_adjust_area(self->frame, FALSE, TRUE, TRUE); + + client_apply_startup_state(self, self->area.x, self->area.y, + self->area.width, self->area.height); ob_debug("gave extents left %d right %d top %d bottom %d", self->frame->size.left, self->frame->size.right, @@ -1103,9 +1098,16 @@ static void client_get_all(ObClient *self, gboolean real) client_get_mwm_hints(self); /* this can change the mwmhints for special cases */ client_get_type_and_transientness(self); - client_get_state(self); client_update_normal_hints(self); + /* set up the decor/functions before getting the state. the states may + affect which functions are available, but we want to know the maximum + decor/functions are available to this window, so we can then apply them + in client_apply_startup_state() */ + client_setup_decor_and_functions(self, FALSE); + + client_get_state(self); + /* get the session related properties, these can change decorations from per-app settings */ client_get_session_ids(self); @@ -2734,8 +2736,6 @@ static void client_apply_startup_state(ObClient *self, if (iconic) client_iconify(self, TRUE, FALSE, TRUE); - if (fullscreen) - client_fullscreen(self, TRUE); if (undecorated) client_set_undecorated(self, TRUE); if (shaded) @@ -2750,6 +2750,10 @@ static void client_apply_startup_state(ObClient *self, else if (max_horz) client_maximize(self, TRUE, 1); + /* fullscreen removes the ability to apply other states */ + if (fullscreen) + client_fullscreen(self, TRUE); + /* if the window hasn't been configured yet, then do so now, in fact the x,y,w,h may _not_ be the same as the area rect, which can end up meaning that the client isn't properly moved/resized by the fullscreen diff --git a/openbox/frame.c b/openbox/frame.c index c6a47b08..1623a834 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -190,7 +190,7 @@ ObFrame *frame_new(ObClient *client) /* make sure the size will be different the first time, so the extent hints will be set */ - STRUT_SET(self->size, -1, -1, -1, -1); + STRUT_SET(self->oldsize, -1, -1, -1, -1); set_theme_statics(self); @@ -330,10 +330,6 @@ void frame_adjust_shape(ObFrame *self) void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized, gboolean fake) { - Strut oldsize; - - oldsize = self->size; - if (resized) { /* do this before changing the frame's status like max_horz max_vert */ frame_adjust_cursors(self); @@ -849,7 +845,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, frame_adjust_shape(self); } - if (!STRUT_EQUAL(self->size, oldsize)) { + if (!STRUT_EQUAL(self->size, self->oldsize)) { gulong vals[4]; vals[0] = self->size.left; vals[1] = self->size.right; @@ -859,6 +855,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved, CARDINAL, vals, 4); OBT_PROP_SETA32(self->client->window, KDE_NET_WM_FRAME_STRUT, CARDINAL, vals, 4); + self->oldsize = self->size; } /* if this occurs while we are focus cycling, the indicator needs to diff --git a/openbox/frame.h b/openbox/frame.h index b0d99690..0e28b9f1 100644 --- a/openbox/frame.h +++ b/openbox/frame.h @@ -84,7 +84,8 @@ struct _ObFrame Window window; - Strut size; + Strut size; /* the size of the frame */ + Strut oldsize; /* the size of the frame last told to the client */ Rect area; gboolean visible; |