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

make next/previouswindow and dirfocus actions show the focus_cycle_indicator even if they target the focused window, remove an unused variable from focus_cycle but not from focus_directional_cycle, there we use it to fix the aforementioned indicator.

Browse source
This commit is contained in:
Mikael Magnusson 2007-05-29 00:06:51 +00:00
parent 6fa15756c3
commit e215fc0110
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
openbox/focus_cycle.c
View file

@ -169,7 +169,6 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
gboolean linear, gboolean interactive, gboolean linear, gboolean interactive,
gboolean dialog, gboolean done, gboolean cancel) gboolean dialog, gboolean done, gboolean cancel)
{ {
static ObClient *first = NULL;
static ObClient *t = NULL; static ObClient *t = NULL;
static GList *order = NULL; static GList *order = NULL;
GList *it, *start, *list; GList *it, *start, *list;
@ -185,8 +184,6 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
if (!focus_order) if (!focus_order)
goto done_cycle; goto done_cycle;
if (!first) first = focus_client;
if (linear) list = client_list; if (linear) list = client_list;
else list = focus_order; else list = focus_order;
} else { } else {
@ -201,10 +198,10 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
focus_cycle_all_desktops = all_desktops; focus_cycle_all_desktops = all_desktops;
focus_cycle_dock_windows = dock_windows; focus_cycle_dock_windows = dock_windows;
focus_cycle_desktop_windows = desktop_windows; focus_cycle_desktop_windows = desktop_windows;
focus_cycle_target = focus_client; start = it = g_list_find(list, focus_client);
} } else
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);
if (!start) goto done_cycle; if (!start) goto done_cycle;
@ -250,7 +247,6 @@ done_cycle:
client_activate(focus_cycle_target, FALSE, TRUE); client_activate(focus_cycle_target, FALSE, TRUE);
t = NULL; t = NULL;
first = NULL;
focus_cycle_target = NULL; focus_cycle_target = NULL;
g_list_free(order); g_list_free(order);
order = NULL; order = NULL;
@ -283,7 +279,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
my_cy = c->frame->area.y + c->frame->area.height / 2; my_cy = c->frame->area.y + c->frame->area.height / 2;
best_score = -1; best_score = -1;
best_client = NULL; best_client = c;
for (it = g_list_first(client_list); it; it = g_list_next(it)) { for (it = g_list_first(client_list); it; it = g_list_next(it)) {
cur = it->data; cur = it->data;
@ -303,7 +299,8 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir,
+ cur->frame->area.height / 2; + cur->frame->area.height / 2;
if (dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST || if (dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST ||
dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) { dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST)
{
gint tx; gint tx;
/* Rotate the diagonals 45 degrees counterclockwise. /* Rotate the diagonals 45 degrees counterclockwise.
* To do this, multiply the matrix /+h +h\ with the * To do this, multiply the matrix /+h +h\ with the
@ -381,7 +378,6 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
focus_cycle_all_desktops = FALSE; focus_cycle_all_desktops = FALSE;
focus_cycle_dock_windows = dock_windows; focus_cycle_dock_windows = dock_windows;
focus_cycle_desktop_windows = desktop_windows; focus_cycle_desktop_windows = desktop_windows;
focus_cycle_target = focus_client;
} }
if (!first) first = focus_client; if (!first) first = focus_client;
@ -389,6 +385,8 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
if (focus_cycle_target) if (focus_cycle_target)
ft = focus_find_directional(focus_cycle_target, dir, dock_windows, ft = focus_find_directional(focus_cycle_target, dir, dock_windows,
desktop_windows); desktop_windows);
else if (first)
ft = focus_find_directional(first, dir, dock_windows, desktop_windows);
else { else {
GList *it; GList *it;