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

try to fix focus switching with mouse actions up a bit

Browse source
This commit is contained in:
Mikael Magnusson 2004-06-23 13:50:26 +00:00
parent 8ba619d5f1
commit 0993012776
3 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openbox/action.c
View file

@ -1411,7 +1411,7 @@ void action_cycle_windows(union ActionData *data)
on us */ on us */
event_halt_focus_delay(); event_halt_focus_delay();
focus_cycle(data->cycle.forward, data->cycle.linear, focus_cycle(data->cycle.forward, data->cycle.linear, data->any.interactive,
data->cycle.dialog, data->cycle.dialog,
data->cycle.inter.final, data->cycle.inter.cancel); data->cycle.inter.final, data->cycle.inter.cancel);
} }
@ -1423,6 +1423,7 @@ void action_directional_focus(union ActionData *data)
event_halt_focus_delay(); event_halt_focus_delay();
focus_directional_cycle(data->interdiraction.direction, focus_directional_cycle(data->interdiraction.direction,
data->any.interactive,
data->interdiraction.dialog, data->interdiraction.dialog,
data->interdiraction.inter.final, data->interdiraction.inter.final,
data->interdiraction.inter.cancel); data->interdiraction.inter.cancel);

55
openbox/focus.c
View file

@ -538,7 +538,7 @@ static gboolean valid_focus_target(ObClient *ft)
return FALSE; return FALSE;
} }
void focus_cycle(gboolean forward, gboolean linear, void focus_cycle(gboolean forward, gboolean linear, gboolean interactive,
gboolean dialog, gboolean done, gboolean cancel) gboolean dialog, gboolean done, gboolean cancel)
{ {
static ObClient *first = NULL; static ObClient *first = NULL;
@ -547,21 +547,27 @@ void focus_cycle(gboolean forward, gboolean linear,
GList *it, *start, *list; GList *it, *start, *list;
ObClient *ft = NULL; ObClient *ft = NULL;
if (cancel) { if (interactive) {
focus_cycle_target = NULL; if (cancel) {
goto done_cycle; focus_cycle_target = NULL;
} else if (done) goto done_cycle;
goto done_cycle; } else if (done)
goto done_cycle;
if (!focus_order[screen_desktop]) if (!focus_order[screen_desktop])
goto done_cycle; goto done_cycle;
if (!first) first = focus_client; if (!first) first = focus_client;
if (linear) list = client_list;
else list = focus_order[screen_desktop];
} else {
if (!focus_order[screen_desktop])
goto done_cycle;
list = client_list;
}
if (!focus_cycle_target) focus_cycle_target = focus_client; if (!focus_cycle_target) focus_cycle_target = focus_client;
if (linear) list = client_list;
else list = focus_order[screen_desktop];
start = it = g_list_find(list, focus_cycle_target); start = it = g_list_find(list, focus_cycle_target);
if (!start) /* switched desktops or something? */ if (!start) /* switched desktops or something? */
start = it = forward ? g_list_last(list) : g_list_first(list); start = it = forward ? g_list_last(list) : g_list_first(list);
@ -577,12 +583,18 @@ void focus_cycle(gboolean forward, gboolean linear,
} }
ft = it->data; ft = it->data;
if (valid_focus_target(ft)) { if (valid_focus_target(ft)) {
if (ft != focus_cycle_target) { /* prevents flicker */ if (interactive) {
if (ft != focus_cycle_target) { /* prevents flicker */
focus_cycle_target = ft;
focus_cycle_draw_indicator();
}
popup_cycle(ft, dialog);
return;
} else if (ft != focus_cycle_target) {
focus_cycle_target = ft; focus_cycle_target = ft;
focus_cycle_draw_indicator(); done = TRUE;
break;
} }
popup_cycle(ft, dialog);
return;
} }
} while (it != start); } while (it != start);
@ -596,18 +608,23 @@ done_cycle:
g_list_free(order); g_list_free(order);
order = NULL; order = NULL;
focus_cycle_draw_indicator(); if (interactive) {
popup_cycle(ft, FALSE); focus_cycle_draw_indicator();
popup_cycle(ft, FALSE);
}
return; return;
} }
void focus_directional_cycle(ObDirection dir, void focus_directional_cycle(ObDirection dir, gboolean interactive,
gboolean dialog, gboolean done, gboolean cancel) gboolean dialog, gboolean done, gboolean cancel)
{ {
static ObClient *first = NULL; static ObClient *first = NULL;
ObClient *ft = NULL; ObClient *ft = NULL;
if (!interactive)
return;
if (cancel) { if (cancel) {
focus_cycle_target = NULL; focus_cycle_target = NULL;
goto done_cycle; goto done_cycle;

4
openbox/focus.h
View file

@ -57,9 +57,9 @@ struct _ObClient* focus_fallback_target(ObFocusFallbackType type);
void focus_fallback(ObFocusFallbackType type); void focus_fallback(ObFocusFallbackType type);
/*! Cycle focus amongst windows. */ /*! Cycle focus amongst windows. */
void focus_cycle(gboolean forward, gboolean linear, void focus_cycle(gboolean forward, gboolean linear, gboolean interactive,
gboolean dialog, gboolean done, gboolean cancel); gboolean dialog, gboolean done, gboolean cancel);
void focus_directional_cycle(ObDirection dir, void focus_directional_cycle(ObDirection dir, gboolean interactive,
gboolean dialog, gboolean done, gboolean cancel); gboolean dialog, gboolean done, gboolean cancel);
void focus_cycle_draw_indicator(); void focus_cycle_draw_indicator();