Allow skip_taskbar windows to be focused on map when the user requests it in rc.xml. Fixes bug #4350
Dana Jansens danakj@orodu.net
5 files changed,
22 insertions(+),
13 deletions(-)
M
openbox/client.c
→
openbox/client.c
@@ -370,7 +370,8 @@ /* NET_WM_USER_TIME 0 when mapping means don't focus */
(user_time != 0) && /* this checks for focus=false for the window */ (!settings || settings->focus != 0) && - focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE)) + focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE, + settings->focus == 1)) { activate = TRUE; }
M
openbox/focus.c
→
openbox/focus.c
@@ -130,7 +130,7 @@ 2. it is a valid auto-focus target
3. it is not shaded */ if ((allow_omnipresent || c->desktop == screen_desktop) && - focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, FALSE) && + focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) && !c->shaded && (allow_refocus || client_focus_target(c) != old) && client_focus(c))@@ -150,7 +150,7 @@ 2. it is a normal type window, don't fall back onto a dock or
a splashscreen or a desktop window (save the desktop as a backup fallback though) */ - if (focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, TRUE) && + if (focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE) && (allow_refocus || client_focus_target(c) != old) && client_focus(c)) {@@ -281,7 +281,7 @@ ObClient *c = it->data;
/* check that it's not a helper window to avoid infinite recursion */ if (c != ft && c->type == OB_CLIENT_TYPE_NORMAL && focus_valid_target(c, TRUE, iconic_windows, all_desktops, - FALSE, FALSE)) + FALSE, FALSE, FALSE)) { return TRUE; }@@ -294,7 +294,8 @@ gboolean helper_windows,
gboolean iconic_windows, gboolean all_desktops, gboolean dock_windows, - gboolean desktop_windows) + gboolean desktop_windows, + gboolean user_request) { gboolean ok = FALSE;@@ -333,9 +334,11 @@ that can be focused instead */
!focus_target_has_siblings(ft, iconic_windows, all_desktops)))); /* it's not set to skip the taskbar (but this only applies to normal typed - windows, and is overridden if the window is modal) */ + windows, and is overridden if the window is modal or if the user asked + for this window to be focused) */ ok = ok && (ft->type != OB_CLIENT_TYPE_NORMAL || ft->modal || + user_request || !ft->skip_taskbar); /* it's not going to just send focus off somewhere else (modal window),@@ -348,7 +351,8 @@ TRUE,
iconic_windows, all_desktops, dock_windows, - desktop_windows)); + desktop_windows, + FALSE)); } return ok;
M
openbox/focus.h
→
openbox/focus.h
@@ -69,6 +69,7 @@ gboolean helper_windows,
gboolean iconic_windows, gboolean all_desktops, gboolean dock_windows, - gboolean desktop_windows); + gboolean desktop_windows, + gboolean user_request); #endif
M
openbox/focus_cycle.c
→
openbox/focus_cycle.c
@@ -60,7 +60,8 @@ focus_valid_target(ifclient, TRUE,
focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + focus_cycle_desktop_windows, + FALSE)) { focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);@@ -122,7 +123,8 @@ if (focus_valid_target(ft, TRUE,
focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + focus_cycle_desktop_windows, + FALSE)) { if (interactive) { if (ft != focus_cycle_target) { /* prevents flicker */@@ -189,7 +191,7 @@ /* the currently selected window isn't interesting */
if (cur == c) continue; if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows, - desktop_windows)) + desktop_windows, FALSE)) continue; /* find the centre coords of this window, from the@@ -297,7 +299,7 @@ if (focus_valid_target(it->data, TRUE,
focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + focus_cycle_desktop_windows, FALSE)) ft = it->data; }
M
openbox/focus_cycle_popup.c
→
openbox/focus_cycle_popup.c
@@ -185,7 +185,8 @@ if (focus_valid_target(ft, TRUE,
iconic_windows, all_desktops, dock_windows, - desktop_windows)) + desktop_windows, + FALSE)) { gchar *text = popup_get_name(ft);