From 8ba619d5f15742d08850fe403e99e472ac5cf790 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Mon, 14 Jun 2004 12:26:35 +0000 Subject: [PATCH] finding edges and switching directional focus was broken from omnipresent windows. changed c->desktop to screen_desktop seems to work fine so far. --- openbox/client.c | 13 ++++++++----- 1 file 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; -- 2.39.2