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

that line ended up in teh if somehow...

Browse source
This commit is contained in:
Dana Jansens 2003-08-02 05:31:23 +00:00
parent 62f1473c65
commit 4a2400c5c2
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
openbox/client.c
View file

@ -957,10 +957,7 @@ void client_update_normal_hints(ObClient *self)
/* get the hints from the window */ /* get the hints from the window */
if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) { if (XGetWMNormalHints(ob_display, self->window, &size, &ret)) {
/* don't let apps tell me where to put transient windows, but only if self->positioned = !!(size.flags & (PPosition|USPosition));
they have a valid parent */
self->positioned = !!(size.flags & (PPosition|USPosition)) &&
!self->transient_for;
if (size.flags & PWinGravity) { if (size.flags & PWinGravity) {
self->gravity = size.win_gravity; self->gravity = size.win_gravity;
@ -1245,9 +1242,6 @@ void client_update_wmhints(ObClient *self)
} }
} }
/* the WM_HINTS can contain an icon */
client_update_icons(self);
/* because the self->transient flag wont change from this call, /* because the self->transient flag wont change from this call,
we don't need to update the window's type and such, only its we don't need to update the window's type and such, only its
transient_for, and the transients lists of other windows in transient_for, and the transients lists of other windows in
@ -1255,6 +1249,9 @@ void client_update_wmhints(ObClient *self)
client_update_transient_for(self); client_update_transient_for(self);
} }
/* the WM_HINTS can contain an icon */
client_update_icons(self);
XFree(hints); XFree(hints);
} }
@ -1377,17 +1374,35 @@ void client_update_strut(ObClient *self)
{ {
guint num; guint num;
guint32 *data; guint32 *data;
gboolean got = FALSE;
if (!PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) { if (PROP_GETA32(self->window, net_wm_strut_partial, cardinal,
STRUT_SET(self->strut, 0, 0, 0, 0); &data, &num)) {
} else { if (num == 12) {
if (num == 4) got = TRUE;
STRUT_SET(self->strut, data[0], data[2], data[1], data[3]); STRUT_PARTIAL_SET(self->strut,
else data[0], data[2], data[1], data[3],
STRUT_SET(self->strut, 0, 0, 0, 0); data[4], data[5], data[8], data[9],
g_free(data); data[6], data[7], data[10], data[11]);
}
g_free(data);
} }
if (!got &&
PROP_GETA32(self->window, net_wm_strut, cardinal, &data, &num)) {
if (num == 4) {
got = TRUE;
STRUT_PARTIAL_SET(self->strut,
data[0], data[2], data[1], data[3],
0, 0, 0, 0, 0, 0, 0, 0);
}
g_free(data);
}
if (!got)
STRUT_PARTIAL_SET(self->strut, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0);
/* updating here is pointless while we're being mapped cuz we're not in /* updating here is pointless while we're being mapped cuz we're not in
the client list yet */ the client list yet */
if (self->frame) if (self->frame)