self->title_count = 1;
self->wmstate = NormalState;
self->layer = -1;
- self->decorate = TRUE;
self->desktop = screen_num_desktops; /* always an invalid value */
client_get_all(self);
/* focus the new window? */
if (ob_state() != OB_STATE_STARTING &&
- (config_focus_new || (self->transient_for &&
- self->transient_for != OB_TRAN_GROUP &&
- client_focused(self->transient_for))) &&
+ (config_focus_new || client_search_focus_parent(self)) &&
/* note the check against Type_Normal/Dialog, not client_normal(self),
which would also include other types. in this case we want more
strict rules for focus */
guint num;
if (PROP_GETA32(self->window, net_wm_state, atom, &state, &num)) {
- gulong i;
- for (i = 0; i < num; ++i) {
- if (state[i] == prop_atoms.net_wm_state_modal)
- self->modal = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_shaded)
- self->shaded = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_hidden)
- self->iconic = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_skip_taskbar)
- self->skip_taskbar = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_skip_pager)
- self->skip_pager = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_fullscreen)
- self->fullscreen = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_maximized_vert)
- self->max_vert = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_maximized_horz)
- self->max_horz = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_above)
- self->above = TRUE;
- else if (state[i] == prop_atoms.net_wm_state_below)
- self->below = TRUE;
- }
+ gulong i;
+ for (i = 0; i < num; ++i) {
+ if (state[i] == prop_atoms.net_wm_state_modal)
+ self->modal = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_shaded)
+ self->shaded = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_hidden)
+ self->iconic = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_skip_taskbar)
+ self->skip_taskbar = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_skip_pager)
+ self->skip_pager = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_fullscreen)
+ self->fullscreen = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_maximized_vert)
+ self->max_vert = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_maximized_horz)
+ self->max_horz = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_above)
+ self->above = TRUE;
+ else if (state[i] == prop_atoms.net_wm_state_below)
+ self->below = TRUE;
+ else if (state[i] == prop_atoms.ob_wm_state_undecorated)
+ self->undecorated = TRUE;
+ }
- g_free(state);
+ g_free(state);
}
}
/* finally, the user can have requested no decorations, which overrides
everything */
- if (!self->decorate)
+ if (self->undecorated)
self->decorations = OB_FRAME_DECOR_BORDER;
/* if we don't have a titlebar, then we cannot shade! */
/* the WM_HINTS can contain an icon */
client_update_icons(self);
- XFree(hints);
+ XFree(hints);
}
if (ur != self->urgent) {
- self->urgent = ur;
- ob_debug("Urgent Hint for 0x%lx: %s\n", self->window,
- ur ? "ON" : "OFF");
- /* fire the urgent callback if we're mapped, otherwise, wait until
- after we're mapped */
- if (self->frame)
+ self->urgent = ur;
+ /* fire the urgent callback if we're mapped, otherwise, wait until
+ after we're mapped */
+ if (self->frame)
client_urgent_notify(self);
}
}
static void client_change_state(ObClient *self)
{
guint32 state[2];
- guint32 netstate[10];
+ guint32 netstate[11];
guint num;
state[0] = self->wmstate;
num = 0;
if (self->modal)
- netstate[num++] = prop_atoms.net_wm_state_modal;
+ netstate[num++] = prop_atoms.net_wm_state_modal;
if (self->shaded)
- netstate[num++] = prop_atoms.net_wm_state_shaded;
+ netstate[num++] = prop_atoms.net_wm_state_shaded;
if (self->iconic)
- netstate[num++] = prop_atoms.net_wm_state_hidden;
+ netstate[num++] = prop_atoms.net_wm_state_hidden;
if (self->skip_taskbar)
- netstate[num++] = prop_atoms.net_wm_state_skip_taskbar;
+ netstate[num++] = prop_atoms.net_wm_state_skip_taskbar;
if (self->skip_pager)
- netstate[num++] = prop_atoms.net_wm_state_skip_pager;
+ netstate[num++] = prop_atoms.net_wm_state_skip_pager;
if (self->fullscreen)
- netstate[num++] = prop_atoms.net_wm_state_fullscreen;
+ netstate[num++] = prop_atoms.net_wm_state_fullscreen;
if (self->max_vert)
- netstate[num++] = prop_atoms.net_wm_state_maximized_vert;
+ netstate[num++] = prop_atoms.net_wm_state_maximized_vert;
if (self->max_horz)
- netstate[num++] = prop_atoms.net_wm_state_maximized_horz;
+ netstate[num++] = prop_atoms.net_wm_state_maximized_horz;
if (self->above)
- netstate[num++] = prop_atoms.net_wm_state_above;
+ netstate[num++] = prop_atoms.net_wm_state_above;
if (self->below)
- netstate[num++] = prop_atoms.net_wm_state_below;
+ netstate[num++] = prop_atoms.net_wm_state_below;
+ if (self->undecorated)
+ netstate[num++] = prop_atoms.ob_wm_state_undecorated;
PROP_SETA32(self->window, net_wm_state, atom, netstate, num);
client_calc_layer(self);
if (self->frame)
- frame_adjust_state(self->frame);
+ frame_adjust_state(self->frame);
}
ObClient *client_search_focus_tree(ObClient *self)
{
ObStackingLayer l;
- if (self->fullscreen) l = OB_STACKING_LAYER_FULLSCREEN;
+ if (self->fullscreen &&
+ (client_focused(self) || client_search_focus_tree(self)))
+ l = OB_STACKING_LAYER_FULLSCREEN;
else if (self->type == OB_CLIENT_TYPE_DESKTOP)
l = OB_STACKING_LAYER_DESKTOP;
else if (self->type == OB_CLIENT_TYPE_DOCK) {
/* these are in a carefully crafted order.. */
if (self->iconic) {
- self->iconic = FALSE;
- client_iconify(self, TRUE, FALSE);
+ self->iconic = FALSE;
+ client_iconify(self, TRUE, FALSE);
}
if (self->fullscreen) {
- self->fullscreen = FALSE;
- client_fullscreen(self, TRUE, FALSE);
+ self->fullscreen = FALSE;
+ client_fullscreen(self, TRUE, FALSE);
+ }
+ if (self->undecorated) {
+ self->undecorated = FALSE;
+ client_set_undecorated(self, TRUE);
}
if (self->shaded) {
- self->shaded = FALSE;
- client_shade(self, TRUE);
+ self->shaded = FALSE;
+ client_shade(self, TRUE);
}
if (self->urgent)
client_urgent_notify(self);
if (self->max_vert && self->max_horz) {
- self->max_vert = self->max_horz = FALSE;
- client_maximize(self, TRUE, 0, FALSE);
+ self->max_vert = self->max_horz = FALSE;
+ client_maximize(self, TRUE, 0, FALSE);
} else if (self->max_vert) {
- self->max_vert = FALSE;
- client_maximize(self, TRUE, 2, FALSE);
+ self->max_vert = FALSE;
+ client_maximize(self, TRUE, 2, FALSE);
} else if (self->max_horz) {
- self->max_horz = FALSE;
- client_maximize(self, TRUE, 1, FALSE);
+ self->max_horz = FALSE;
+ client_maximize(self, TRUE, 1, FALSE);
}
/* nothing to do for the other states:
}
}
if ((dir == 0 || dir == 2) && self->max_vert) { /* vert */
- if (self->pre_max_area.width > 0) {
+ if (self->pre_max_area.height > 0) {
y = self->pre_max_area.y;
h = self->pre_max_area.height;
{
gboolean shaded = self->shaded;
gboolean fullscreen = self->fullscreen;
+ gboolean undecorated = self->undecorated;
gboolean max_horz = self->max_horz;
gboolean max_vert = self->max_vert;
int i;
if (!(action == prop_atoms.net_wm_state_add ||
- action == prop_atoms.net_wm_state_remove ||
- action == prop_atoms.net_wm_state_toggle))
- /* an invalid action was passed to the client message, ignore it */
- return;
+ action == prop_atoms.net_wm_state_remove ||
+ action == prop_atoms.net_wm_state_toggle))
+ /* an invalid action was passed to the client message, ignore it */
+ return;
for (i = 0; i < 2; ++i) {
- Atom state = i == 0 ? data1 : data2;
+ Atom state = i == 0 ? data1 : data2;
- if (!state) continue;
-
- /* if toggling, then pick whether we're adding or removing */
- if (action == prop_atoms.net_wm_state_toggle) {
- if (state == prop_atoms.net_wm_state_modal)
- action = self->modal ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_maximized_vert)
- action = self->max_vert ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_maximized_horz)
- action = self->max_horz ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_shaded)
- action = self->shaded ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_skip_taskbar)
- action = self->skip_taskbar ?
- prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_skip_pager)
- action = self->skip_pager ?
- prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_fullscreen)
- action = self->fullscreen ?
- prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_above)
- action = self->above ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- else if (state == prop_atoms.net_wm_state_below)
- action = self->below ? prop_atoms.net_wm_state_remove :
- prop_atoms.net_wm_state_add;
- }
+ if (!state) continue;
+
+ /* if toggling, then pick whether we're adding or removing */
+ if (action == prop_atoms.net_wm_state_toggle) {
+ if (state == prop_atoms.net_wm_state_modal)
+ action = self->modal ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_maximized_vert)
+ action = self->max_vert ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_maximized_horz)
+ action = self->max_horz ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_shaded)
+ action = shaded ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_skip_taskbar)
+ action = self->skip_taskbar ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_skip_pager)
+ action = self->skip_pager ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_fullscreen)
+ action = fullscreen ?
+ prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_above)
+ action = self->above ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.net_wm_state_below)
+ action = self->below ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ else if (state == prop_atoms.ob_wm_state_undecorated)
+ action = undecorated ? prop_atoms.net_wm_state_remove :
+ prop_atoms.net_wm_state_add;
+ }
- if (action == prop_atoms.net_wm_state_add) {
- if (state == prop_atoms.net_wm_state_modal) {
- /* XXX raise here or something? */
- self->modal = TRUE;
- } else if (state == prop_atoms.net_wm_state_maximized_vert) {
- max_vert = TRUE;
- } else if (state == prop_atoms.net_wm_state_maximized_horz) {
- max_horz = TRUE;
- } else if (state == prop_atoms.net_wm_state_shaded) {
- shaded = TRUE;
- } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
- self->skip_taskbar = TRUE;
- } else if (state == prop_atoms.net_wm_state_skip_pager) {
- self->skip_pager = TRUE;
- } else if (state == prop_atoms.net_wm_state_fullscreen) {
- fullscreen = TRUE;
- } else if (state == prop_atoms.net_wm_state_above) {
- self->above = TRUE;
- } else if (state == prop_atoms.net_wm_state_below) {
- self->below = TRUE;
- }
+ if (action == prop_atoms.net_wm_state_add) {
+ if (state == prop_atoms.net_wm_state_modal) {
+ /* XXX raise here or something? */
+ self->modal = TRUE;
+ } else if (state == prop_atoms.net_wm_state_maximized_vert) {
+ max_vert = TRUE;
+ } else if (state == prop_atoms.net_wm_state_maximized_horz) {
+ max_horz = TRUE;
+ } else if (state == prop_atoms.net_wm_state_shaded) {
+ shaded = TRUE;
+ } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
+ self->skip_taskbar = TRUE;
+ } else if (state == prop_atoms.net_wm_state_skip_pager) {
+ self->skip_pager = TRUE;
+ } else if (state == prop_atoms.net_wm_state_fullscreen) {
+ fullscreen = TRUE;
+ } else if (state == prop_atoms.net_wm_state_above) {
+ self->above = TRUE;
+ } else if (state == prop_atoms.net_wm_state_below) {
+ self->below = TRUE;
+ } else if (state == prop_atoms.ob_wm_state_undecorated) {
+ undecorated = TRUE;
+ }
- } else { /* action == prop_atoms.net_wm_state_remove */
- if (state == prop_atoms.net_wm_state_modal) {
- self->modal = FALSE;
- } else if (state == prop_atoms.net_wm_state_maximized_vert) {
- max_vert = FALSE;
- } else if (state == prop_atoms.net_wm_state_maximized_horz) {
- max_horz = FALSE;
- } else if (state == prop_atoms.net_wm_state_shaded) {
- shaded = FALSE;
- } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
- self->skip_taskbar = FALSE;
- } else if (state == prop_atoms.net_wm_state_skip_pager) {
- self->skip_pager = FALSE;
- } else if (state == prop_atoms.net_wm_state_fullscreen) {
- fullscreen = FALSE;
- } else if (state == prop_atoms.net_wm_state_above) {
- self->above = FALSE;
- } else if (state == prop_atoms.net_wm_state_below) {
- self->below = FALSE;
- }
- }
+ } else { /* action == prop_atoms.net_wm_state_remove */
+ if (state == prop_atoms.net_wm_state_modal) {
+ self->modal = FALSE;
+ } else if (state == prop_atoms.net_wm_state_maximized_vert) {
+ max_vert = FALSE;
+ } else if (state == prop_atoms.net_wm_state_maximized_horz) {
+ max_horz = FALSE;
+ } else if (state == prop_atoms.net_wm_state_shaded) {
+ shaded = FALSE;
+ } else if (state == prop_atoms.net_wm_state_skip_taskbar) {
+ self->skip_taskbar = FALSE;
+ } else if (state == prop_atoms.net_wm_state_skip_pager) {
+ self->skip_pager = FALSE;
+ } else if (state == prop_atoms.net_wm_state_fullscreen) {
+ fullscreen = FALSE;
+ } else if (state == prop_atoms.net_wm_state_above) {
+ self->above = FALSE;
+ } else if (state == prop_atoms.net_wm_state_below) {
+ self->below = FALSE;
+ } else if (state == prop_atoms.ob_wm_state_undecorated) {
+ undecorated = FALSE;
+ }
+ }
}
if (max_horz != self->max_horz || max_vert != self->max_vert) {
- if (max_horz != self->max_horz && max_vert != self->max_vert) {
- /* toggling both */
- if (max_horz == max_vert) { /* both going the same way */
- client_maximize(self, max_horz, 0, TRUE);
- } else {
- client_maximize(self, max_horz, 1, TRUE);
- client_maximize(self, max_vert, 2, TRUE);
- }
- } else {
- /* toggling one */
- if (max_horz != self->max_horz)
- client_maximize(self, max_horz, 1, TRUE);
- else
- client_maximize(self, max_vert, 2, TRUE);
- }
+ if (max_horz != self->max_horz && max_vert != self->max_vert) {
+ /* toggling both */
+ if (max_horz == max_vert) { /* both going the same way */
+ client_maximize(self, max_horz, 0, TRUE);
+ } else {
+ client_maximize(self, max_horz, 1, TRUE);
+ client_maximize(self, max_vert, 2, TRUE);
+ }
+ } else {
+ /* toggling one */
+ if (max_horz != self->max_horz)
+ client_maximize(self, max_horz, 1, TRUE);
+ else
+ client_maximize(self, max_vert, 2, TRUE);
+ }
}
/* change fullscreen state before shading, as it will affect if the window
can shade or not */
if (fullscreen != self->fullscreen)
- client_fullscreen(self, fullscreen, TRUE);
+ client_fullscreen(self, fullscreen, TRUE);
if (shaded != self->shaded)
- client_shade(self, shaded);
+ client_shade(self, shaded);
+ if (undecorated != self->undecorated)
+ client_set_undecorated(self, undecorated);
client_calc_layer(self);
client_change_state(self); /* change the hint to reflect these changes */
}
return;
if (self->shaded)
client_shade(self, FALSE);
- client_focus(self);
- stacking_raise(CLIENT_AS_WINDOW(self));
+ action_run_string("Focus", self);
+ action_run_string("Raise", self);
}
gboolean client_focused(ObClient *self)
client_change_state(self); /* reflect this in the state hints */
}
+void client_set_undecorated(ObClient *self, gboolean undecorated)
+{
+ if (self->undecorated != undecorated) {
+ self->undecorated = undecorated;
+ client_setup_decor_and_functions(self);
+ client_change_state(self); /* reflect this in the state hints */
+ }
+}
+
guint client_monitor(ObClient *self)
{
guint i;
return self;
}
+ObClient *client_search_focus_parent(ObClient *self)
+{
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP) {
+ if (client_focused(self->transient_for))
+ return self->transient_for;
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next) {
+ ObClient *c = it->data;
+
+ /* checking transient_for prevents infinate loops! */
+ if (c != self && !c->transient_for)
+ if (client_focused(c))
+ return c;
+ }
+ }
+ }
+
+ return NULL;
+}
+
+ObClient *client_search_parent(ObClient *self, ObClient *search)
+{
+ if (self->transient_for) {
+ if (self->transient_for != OB_TRAN_GROUP) {
+ if (self->transient_for == search)
+ return search;
+ } else {
+ GSList *it;
+
+ for (it = self->group->members; it; it = it->next) {
+ ObClient *c = it->data;
+
+ /* checking transient_for prevents infinate loops! */
+ if (c != self && !c->transient_for)
+ if (c == search)
+ return search;
+ }
+ }
+ }
+
+ return NULL;
+}
+
ObClient *client_search_transient(ObClient *self, ObClient *search)
{
GSList *sit;
projects / chaz / openbox / blobdiff