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

Use g_list_find instead of weird bouncing loops

Browse source
This commit is contained in:
Mikael Magnusson 2010-06-14 03:14:37 +02:00 committed by Dana Jansens
parent 3ff4162034
commit 6d0f44e1d1
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
openbox/stacking.c
View file

@ -571,17 +571,16 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling)
{ {
GList *it; GList *it;
gboolean occluded = FALSE; gboolean occluded = FALSE;
gboolean found = FALSE;
/* no need for any looping in this case */ /* no need for any looping in this case */
if (sibling && client->layer != sibling->layer) if (sibling && client->layer != sibling->layer)
return occluded; return occluded;
for (it = stacking_list; it; for (it = g_list_previous(g_list_find(stacking_list, client)); it;
it = (found ? g_list_previous(it) :g_list_next(it))) it = g_list_previous(it))
if (WINDOW_IS_CLIENT(it->data)) { if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data; ObClient *c = it->data;
if (found && !c->iconic && if (!c->iconic &&
(c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL ||
c->desktop == client->desktop) && c->desktop == client->desktop) &&
!client_search_transient(client, c)) !client_search_transient(client, c))
@ -602,8 +601,6 @@ static gboolean stacking_occluded(ObClient *client, ObClient *sibling)
break; /* we past its layer */ break; /* we past its layer */
} }
} }
else if (c == client)
found = TRUE;
} }
return occluded; return occluded;
} }
@ -615,16 +612,16 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
{ {
GList *it; GList *it;
gboolean occludes = FALSE; gboolean occludes = FALSE;
gboolean found = FALSE;
/* no need for any looping in this case */ /* no need for any looping in this case */
if (sibling && client->layer != sibling->layer) if (sibling && client->layer != sibling->layer)
return occludes; return occludes;
for (it = stacking_list; it; it = g_list_next(it)) for (it = g_list_next(g_list_find(stacking_list, client));
it; it = g_list_next(it))
if (WINDOW_IS_CLIENT(it->data)) { if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data; ObClient *c = it->data;
if (found && !c->iconic && if (!c->iconic &&
(c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL || (c->desktop == DESKTOP_ALL || client->desktop == DESKTOP_ALL ||
c->desktop == client->desktop) && c->desktop == client->desktop) &&
!client_search_transient(c, client)) !client_search_transient(c, client))
@ -645,8 +642,6 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
break; /* we past its layer */ break; /* we past its layer */
} }
} }
else if (c == client)
found = TRUE;
} }
return occludes; return occludes;
} }