summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2004-06-14 12:26:35 +0000
committerMikael Magnusson <mikachu@comhem.se>2004-06-14 12:26:35 +0000
commit8ba619d5f15742d08850fe403e99e472ac5cf790 (patch)
treed31eadbbc44048ec0bfb0cd01d4ba838dc3d1d71
parent35c5a62ca1845e028dec727aede156765ee2ab2d (diff)
finding edges and switching directional focus was broken from omnipresent windows. changed c->desktop to screen_desktop seems to work fine so far.
-rw-r--r--openbox/client.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/openbox/client.c b/openbox/client.c
index a9a99cee..b7ed57b5 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2897,7 +2897,10 @@ ObClient *client_find_directional(ObClient *c, ObDirection dir)
continue;
if (!client_normal(cur))
continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ /* using c->desktop instead of screen_desktop doesn't work if the
+ * current window was omnipresent, hope this doesn't have any other
+ * side effects */
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
@@ -3144,7 +3147,7 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir)
continue;
if(!client_normal(cur))
continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
@@ -3185,7 +3188,7 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir)
continue;
if(!client_normal(cur))
continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
@@ -3227,7 +3230,7 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir)
continue;
if(!client_normal(cur))
continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;
@@ -3269,7 +3272,7 @@ gint client_directional_edge_search(ObClient *c, ObDirection dir)
continue;
if(!client_normal(cur))
continue;
- if(c->desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
+ if(screen_desktop != cur->desktop && cur->desktop != DESKTOP_ALL)
continue;
if(cur->iconic)
continue;