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

set the session stuff before trying to apply per-app settings.

Browse source 
set the decor/functions after restoring all the stuff from session/per-app too
This commit is contained in:
Dana Jansens 2007-05-10 05:21:05 +00:00
parent 933a689b41
commit 083a7565c7
2 changed files with 39 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
openbox/client.c
View file

@ -294,6 +294,8 @@ void client_manage(Window window)
/* the session should get the last say */ /* the session should get the last say */
client_restore_session_state(self); client_restore_session_state(self);
client_setup_decor_and_functions(self);
client_calc_layer(self); client_calc_layer(self);
{ {
@ -503,6 +505,10 @@ ObClient *client_fake_manage(Window window)
uses too */ uses too */
settings = client_get_settings_state(self); settings = client_get_settings_state(self);
client_setup_decor_and_functions(self);
/* adjust the decorations so we know the sizes */
frame_adjust_area(self->frame, FALSE, TRUE, TRUE);
/* create the decoration frame for the client window */ /* create the decoration frame for the client window */
self->frame = frame_new(self); self->frame = frame_new(self);
return self; return self;
@ -993,51 +999,50 @@ static void client_get_all(ObClient *self, gboolean real)
/* this can change the mwmhints for special cases */ /* this can change the mwmhints for special cases */
client_get_type_and_transientness(self); client_get_type_and_transientness(self);
client_get_state(self); client_get_state(self);
client_update_protocols(self);
client_update_normal_hints(self); client_update_normal_hints(self);
/* got the type, the mwmhints, the protocols, and the normal hints /* get the session related properties, these can change decorations
(min/max sizes), so we're ready to set up the decorations/functions */ from per-app settings */
client_setup_decor_and_functions(self); client_get_session_ids(self);
if (real) { if (!real)
client_update_wmhints(self); return;
/* this may have already been called from client_update_wmhints */
if (self->transient_for == NULL)
client_update_transient_for(self);
client_get_startup_id(self); client_update_protocols(self);
client_get_desktop(self);/* uses transient data/group/startup id if a
desktop is not specified */
client_get_shaped(self);
client_get_layer(self); /* if layer hasn't been specified, get it from client_update_wmhints(self);
other sources if possible */ /* this may have already been called from client_update_wmhints */
if (self->transient_for == NULL)
client_update_transient_for(self);
{ client_get_startup_id(self);
/* a couple type-based defaults for new windows */ client_get_desktop(self);/* uses transient data/group/startup id if a
desktop is not specified */
client_get_shaped(self);
/* this makes sure that these windows appear on all desktops */ client_get_layer(self); /* if layer hasn't been specified, get it from
if (self->type == OB_CLIENT_TYPE_DESKTOP) other sources if possible */
self->desktop = DESKTOP_ALL;
} {
/* a couple type-based defaults for new windows */
/* this makes sure that these windows appear on all desktops */
if (self->type == OB_CLIENT_TYPE_DESKTOP)
self->desktop = DESKTOP_ALL;
}
#ifdef SYNC #ifdef SYNC
client_update_sync_request_counter(self); client_update_sync_request_counter(self);
#endif #endif
/* get the session related properties */ client_get_colormap(self);
client_get_session_ids(self); client_update_title(self);
client_update_strut(self);
client_get_colormap(self); client_update_icons(self);
client_update_title(self); client_update_user_time_window(self);
client_update_strut(self); if (!self->user_time_window) /* check if this would have been called */
client_update_icons(self); client_update_user_time(self);
client_update_user_time_window(self); client_update_icon_geometry(self);
if (!self->user_time_window) /* check if this would have been called */
client_update_user_time(self);
client_update_icon_geometry(self);
}
} }
static void client_get_startup_id(ObClient *self) static void client_get_startup_id(ObClient *self)

3
openbox/event.c
View file

@ -577,9 +577,6 @@ static void event_process(const XEvent *ec, gpointer data)
ObClient *c = client_fake_manage(e->xclient.window); ObClient *c = client_fake_manage(e->xclient.window);
gulong vals[4]; gulong vals[4];
/* adjust the decorations so we know the sizes */
frame_adjust_area(c->frame, FALSE, TRUE, TRUE);
/* set the frame extents on the window */ /* set the frame extents on the window */
vals[0] = c->frame->size.left; vals[0] = c->frame->size.left;
vals[1] = c->frame->size.right; vals[1] = c->frame->size.right;