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

simple code cleanup

Browse source
This commit is contained in:
Dana Jansens 2003-07-12 06:17:13 +00:00
parent 70a38951b3
commit 4c1641bfc7
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
openbox/client.c
View file

@ -710,24 +710,24 @@ static void client_get_shaped(ObClient *self)
void client_update_transient_for(ObClient *self) void client_update_transient_for(ObClient *self)
{ {
Window t = None; Window t = None;
ObClient *c = NULL; ObClient *target = NULL;
if (XGetTransientForHint(ob_display, self->window, &t)) { if (XGetTransientForHint(ob_display, self->window, &t)) {
self->transient = TRUE; self->transient = TRUE;
if (t != self->window) { /* cant be transient to itself! */ if (t != self->window) { /* cant be transient to itself! */
c = g_hash_table_lookup(window_map, &t); target = g_hash_table_lookup(window_map, &t);
/* if this happens then we need to check for it*/ /* if this happens then we need to check for it*/
g_assert(c != self); g_assert(target != self);
g_assert(!c || WINDOW_IS_CLIENT(c)); g_assert(!target || WINDOW_IS_CLIENT(target));
if (!c && self->group) { if (!target && self->group) {
/* not transient to a client, see if it is transient for a /* not transient to a client, see if it is transient for a
group */ group */
if (t == self->group->leader || if (t == self->group->leader ||
t == None || t == None ||
t == RootWindow(ob_display, ob_screen)) { t == RootWindow(ob_display, ob_screen)) {
/* window is a transient for its group! */ /* window is a transient for its group! */
c = OB_TRAN_GROUP; target = OB_TRAN_GROUP;
} }
} }
} }
@ -735,41 +735,41 @@ void client_update_transient_for(ObClient *self)
self->transient = FALSE; self->transient = FALSE;
/* if anything has changed... */ /* if anything has changed... */
if (c != self->transient_for) { if (target != self->transient_for) {
if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it; GSList *it;
/* remove from old parents */ /* remove from old parents */
for (it = self->group->members; it; it = it->next) for (it = self->group->members; it; it = g_slist_next(it)) {
if (it->data != self && ObClient *c = it->data;
!((ObClient*)it->data)->transient_for) if (c != self && !c->transient_for)
((ObClient*)it->data)->transients = c->transients = g_slist_remove(c->transients, self);
g_slist_remove(((ObClient*)it->data)->transients, self); }
} else if (self->transient_for != NULL) { /* transient of window */ } else if (self->transient_for != NULL) { /* transient of window */
/* remove from old parent */ /* remove from old parent */
self->transient_for->transients = self->transient_for->transients =
g_slist_remove(self->transient_for->transients, self); g_slist_remove(self->transient_for->transients, self);
} }
self->transient_for = c; self->transient_for = target;
if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */ if (self->transient_for == OB_TRAN_GROUP) { /* transient of group */
GSList *it; GSList *it;
/* add to new parents */ /* add to new parents */
for (it = self->group->members; it; it = it->next) for (it = self->group->members; it; it = g_slist_next(it)) {
if (it->data != self && ObClient *c = it->data;
!((ObClient*)it->data)->transient_for) if (c != self && !c->transient_for)
((ObClient*)it->data)->transients = c->transients = g_slist_append(c->transients, self);
g_slist_append(((ObClient*)it->data)->transients, self); }
/* remove all transients which are in the group, that causes /* remove all transients which are in the group, that causes
circlular pointer hell of doom */ circlular pointer hell of doom */
for (it = self->group->members; it; it = it->next) { for (it = self->group->members; it; it = g_slist_next(it)) {
GSList *sit, *next; GSList *sit, *next;
for (sit = self->transients; sit; sit = next) { for (sit = self->transients; sit; sit = next) {
next = sit->next; next = g_slist_next(sit);
if (sit->data == it->data) if (sit->data == it->data)
self->transients = g_slist_remove(self->transients, self->transients =
sit->data); g_slist_delete_link(self->transients, sit);
} }
} }
} else if (self->transient_for != NULL) { /* transient of window */ } else if (self->transient_for != NULL) { /* transient of window */
@ -1174,11 +1174,12 @@ void client_update_wmhints(ObClient *self)
if (!self->transient_for) { if (!self->transient_for) {
/* add other transients of the group that are already /* add other transients of the group that are already
set up */ set up */
for (it = self->group->members; it; it = it->next) for (it = self->group->members; it; it = it->next) {
if (it->data != self && ObClient *c = it->data;
((ObClient*)it->data)->transient_for == OB_TRAN_GROUP) if (c != self && c->transient_for == OB_TRAN_GROUP)
self->transients = g_slist_append(self->transients, self->transients =
it->data); g_slist_append(self->transients, c);
}
} }
} }