when flags are not set assume bette defaults

This commit is contained in:
Dana Jansens 2003-04-16 16:56:26 +00:00
parent 79a352a40b
commit 1683b33fc1

View file

@ -1033,7 +1033,9 @@ void client_update_wmhints(Client *self)
if (hints->flags & XUrgencyHint) if (hints->flags & XUrgencyHint)
ur = TRUE; ur = TRUE;
if (hints->flags & WindowGroupHint) { if (!(hints->flags & WindowGroupHint))
hints->window_group = None;
/* did the group state change? */ /* did the group state change? */
if (hints->window_group != if (hints->window_group !=
(self->group ? self->group->leader : None)) { (self->group ? self->group->leader : None)) {
@ -1067,11 +1069,11 @@ void client_update_wmhints(Client *self)
the group may be affected */ the group may be affected */
client_update_transient_for(self); client_update_transient_for(self);
} }
}
if (hints->flags & IconPixmapHint) {
client_update_kwm_icon(self); client_update_kwm_icon(self);
/* try get the kwm icon first, this is a fallback only */ /* try get the kwm icon first, this is a fallback only */
if (self->pixmap_icon == None) {
if (hints->flags & IconPixmapHint) {
if (self->pixmap_icon == None) { if (self->pixmap_icon == None) {
self->pixmap_icon = hints->icon_pixmap; self->pixmap_icon = hints->icon_pixmap;
if (hints->flags & IconMaskHint) if (hints->flags & IconMaskHint)
@ -1079,10 +1081,11 @@ void client_update_wmhints(Client *self)
else else
self->pixmap_icon_mask = None; self->pixmap_icon_mask = None;
if (self->frame) if (self->pixmap_icons != None && self->frame)
frame_adjust_icon(self->frame); frame_adjust_icon(self->frame);
} }
} }
}
XFree(hints); XFree(hints);
} }