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

set IconicState on windows that are not visible always. this means windows on other desktops too.

Browse source 
as well, this turned out to be a nice cleanup of the wmstate code.

regards to the random dude in #openbox complaining about the ICCCM to make me think to look this up and see if openbox was compliant.
This commit is contained in:
Dana Jansens 2007-03-13 04:04:13 +00:00
parent 7f58bd9eaa
commit 270a5b25df
3 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
openbox/client.c
View file

@ -71,9 +71,9 @@ static void client_get_layer(ObClient *self);
static void client_get_shaped(ObClient *self);
static void client_get_mwm_hints(ObClient *self);
static void client_get_gravity(ObClient *self);
static void client_showhide(ObClient *self);
static void client_change_allowed_actions(ObClient *self);
static void client_change_state(ObClient *self);
static void client_change_wm_state(ObClient *self);
static void client_apply_startup_state(ObClient *self, gint x, gint y);
static void client_restore_session_state(ObClient *self);
static void client_restore_session_stacking(ObClient *self);
@ -290,8 +290,6 @@ void client_manage(Window window)
it can end up in the list twice! */
focus_order_add_new(self);
client_change_state(self);
/* remove the client's border (and adjust re gravity) */
client_toggle_border(self, FALSE);
@ -304,6 +302,10 @@ void client_manage(Window window)
frame_grab_client(self->frame, self);
/* do this after we have a frame.. it uses the frame to help determine the
WM_STATE to apply. */
client_change_state(self);
grab_server(FALSE);
stacking_add_nonintrusive(CLIENT_AS_WINDOW(self));
@ -1927,15 +1929,34 @@ void client_update_user_time(ObClient *self, gboolean new_event)
}
}
static void client_change_state(ObClient *self)
static void client_change_wm_state(ObClient *self)
{
gulong state[2];
glong old;
old = self->wmstate;
if (self->shaded || self->iconic || !self->frame->visible)
self->wmstate = IconicState;
else
self->wmstate = NormalState;
if (old != self->wmstate) {
PROP_MSG(self->window, kde_wm_change_state,
self->wmstate, 1, 0, 0);
state[0] = self->wmstate;
state[1] = None;
PROP_SETA32(self->window, wm_state, wm_state, state, 2);
}
}
static void client_change_state(ObClient *self)
{
gulong netstate[11];
guint num;
state[0] = self->wmstate;
state[1] = None;
PROP_SETA32(self->window, wm_state, wm_state, state, 2);
client_change_wm_state(self);
num = 0;
if (self->modal)
@ -2093,13 +2114,21 @@ gboolean client_should_show(ObClient *self)
return FALSE;
}
static void client_showhide(ObClient *self)
void client_showhide(ObClient *self)
{
if (client_should_show(self))
frame_show(self->frame);
else
if (client_should_show(self)) {
if (!self->frame->visible)
frame_show(self->frame);
}
else if (self->frame->visible)
frame_hide(self->frame);
/* According to the ICCCM (sec 4.1.3.1) when a window is not visible, it
needs to be in IconicState. This includes when it is on another
desktop!
*/
client_change_wm_state(self);
}
gboolean client_normal(ObClient *self) {
@ -2471,14 +2500,6 @@ static void client_iconify_recursive(ObClient *self,
if (iconic) {
if (self->functions & OB_CLIENT_FUNC_ICONIFY) {
glong old;
old = self->wmstate;
self->wmstate = IconicState;
if (old != self->wmstate)
PROP_MSG(self->window, kde_wm_change_state,
self->wmstate, 1, 0, 0);
/* update the focus lists.. iconic windows go to the bottom of
the list, put the new iconic window at the 'top of the
bottom'. */
@ -2491,17 +2512,9 @@ static void client_iconify_recursive(ObClient *self,
changed = TRUE;
}
} else {
glong old;
if (curdesk)
client_set_desktop(self, screen_desktop, FALSE);
old = self->wmstate;
self->wmstate = self->shaded ? IconicState : NormalState;
if (old != self->wmstate)
PROP_MSG(self->window, kde_wm_change_state,
self->wmstate, 1, 0, 0);
/* this puts it after the current focused window */
focus_order_remove(self);
focus_order_add_new(self);
@ -2617,17 +2630,6 @@ void client_shade(ObClient *self, gboolean shade)
shade) || /* can't shade */
self->shaded == shade) return; /* already done */
/* when we're iconic, don't change the wmstate */
if (!self->iconic) {
glong old;
old = self->wmstate;
self->wmstate = shade ? IconicState : NormalState;
if (old != self->wmstate)
PROP_MSG(self->window, kde_wm_change_state,
self->wmstate, 1, 0, 0);
}
self->shaded = shade;
client_change_state(self);
/* resize the frame to just the titlebar */

5
openbox/client.h
View file

@ -436,6 +436,11 @@ void client_kill(ObClient *self);
desktop has been changed. Generally this should be FALSE. */
void client_set_desktop(ObClient *self, guint target, gboolean donthide);
/*! Show the client if it should be shown, and hide it if it should be
hidden. This is for example, when switching desktops.
*/
void client_showhide(ObClient *self);
/*! Validate client, by making sure no Destroy or Unmap events exist in
the event queue for the window.
@return true if the client is valid; false if the client has already

12
openbox/screen.c
View file

@ -449,8 +449,7 @@ void screen_set_desktop(guint num)
for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
if (client_should_show(c))
frame_show(c->frame);
client_showhide(c);
}
}
@ -458,8 +457,7 @@ void screen_set_desktop(guint num)
for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
if (c->frame->visible && !client_should_show(c))
frame_hide(c->frame);
client_showhide(c);
}
}
@ -875,8 +873,7 @@ void screen_show_desktop(gboolean show)
for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *client = it->data;
if (client->frame->visible && !client_should_show(client))
frame_hide(client->frame);
client_showhide(client);
}
}
} else {
@ -884,8 +881,7 @@ void screen_show_desktop(gboolean show)
for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *client = it->data;
if (!client->frame->visible && client_should_show(client))
frame_show(client->frame);
client_showhide(client);
}
}
}