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

fix directional focus when nothing is focused

Browse source
This commit is contained in:
Dana Jansens 2003-09-15 07:21:10 +00:00
parent efb39b5a36
commit e14a4eeee9
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
openbox/focus.c
View file

@ -260,6 +260,18 @@ static void popup_cycle(ObClient *c, gboolean show)
} }
} }
static gboolean valid_focus_target(ObClient *ft)
{
/* we don't use client_can_focus here, because that doesn't let you
focus an iconic window, but we want to be able to, so we just check
if the focus flags on the window allow it, and its on the current
desktop */
return (ft->transients == NULL && client_normal(ft) &&
((ft->can_focus || ft->focus_notify) &&
!ft->skip_taskbar &&
(ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
}
void focus_cycle(gboolean forward, gboolean linear, void focus_cycle(gboolean forward, gboolean linear,
gboolean dialog, gboolean done, gboolean cancel) gboolean dialog, gboolean done, gboolean cancel)
{ {
@ -283,9 +295,8 @@ void focus_cycle(gboolean forward, gboolean linear,
if (!focus_order[screen_desktop]) if (!focus_order[screen_desktop])
goto done_cycle; goto done_cycle;
if (!first) first = focus_order[screen_desktop]->data; if (!first) first = focus_client;
if (!focus_cycle_target) focus_cycle_target = if (!focus_cycle_target) focus_cycle_target = focus_client;
focus_order[screen_desktop]->data;
if (linear) list = client_list; if (linear) list = client_list;
else list = focus_order[screen_desktop]; else list = focus_order[screen_desktop];
@ -305,14 +316,7 @@ void focus_cycle(gboolean forward, gboolean linear,
} }
/*ft = client_focus_target(it->data);*/ /*ft = client_focus_target(it->data);*/
ft = it->data; ft = it->data;
/* we don't use client_can_focus here, because that doesn't let you if (valid_focus_target(ft)) {
focus an iconic window, but we want to be able to, so we just check
if the focus flags on the window allow it, and its on the current
desktop */
if (ft->transients == NULL && client_normal(ft) &&
((ft->can_focus || ft->focus_notify) &&
!ft->skip_taskbar &&
(ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) {
if (ft != focus_cycle_target) { /* prevents flicker */ if (ft != focus_cycle_target) { /* prevents flicker */
if (focus_cycle_target) if (focus_cycle_target)
frame_adjust_focus(focus_cycle_target->frame, FALSE); frame_adjust_focus(focus_cycle_target->frame, FALSE);
@ -343,7 +347,7 @@ void focus_directional_cycle(ObDirection dir,
gboolean dialog, gboolean done, gboolean cancel) gboolean dialog, gboolean done, gboolean cancel)
{ {
static ObClient *first = NULL; static ObClient *first = NULL;
ObClient *ft; ObClient *ft = NULL;
if (cancel) { if (cancel) {
if (focus_cycle_target) if (focus_cycle_target)
@ -359,11 +363,20 @@ void focus_directional_cycle(ObDirection dir,
if (!focus_order[screen_desktop]) if (!focus_order[screen_desktop])
goto done_cycle; goto done_cycle;
if (!first) first = focus_order[screen_desktop]->data; if (!first) first = focus_client;
if (!focus_cycle_target) focus_cycle_target = if (!focus_cycle_target) focus_cycle_target = focus_client;
focus_order[screen_desktop]->data;
if ((ft = client_find_directional(focus_cycle_target, dir))) { if (focus_cycle_target)
ft = client_find_directional(focus_cycle_target, dir);
else {
GList *it;
for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
if (valid_focus_target(it->data))
ft = it->data;
}
if (ft) {
if (ft != focus_cycle_target) {/* prevents flicker */ if (ft != focus_cycle_target) {/* prevents flicker */
if (focus_cycle_target) if (focus_cycle_target)
frame_adjust_focus(focus_cycle_target->frame, FALSE); frame_adjust_focus(focus_cycle_target->frame, FALSE);
@ -371,9 +384,9 @@ void focus_directional_cycle(ObDirection dir,
frame_adjust_focus(focus_cycle_target->frame, TRUE); frame_adjust_focus(focus_cycle_target->frame, TRUE);
} }
popup_cycle(ft, dialog); popup_cycle(ft, dialog);
}
if (dialog) if (dialog)
return; return;
}
done_cycle: done_cycle:
if (done && focus_cycle_target) if (done && focus_cycle_target)