don't crash when a window adds itself to the focus order while cycling
Dana Jansens danakj@orodu.net
2 files changed,
21 insertions(+),
16 deletions(-)
M
openbox/focus.c
→
openbox/focus.c
@@ -193,9 +193,30 @@ XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
event_curtime); } +void focus_order_add_new(ObClient *c) +{ + if (c->iconic) + focus_order_to_top(c); + else { + g_assert(!g_list_find(focus_order, c)); + /* if there are any iconic windows, put this above them in the order, + but if there are not, then put it under the currently focused one */ + if (focus_order && ((ObClient*)focus_order->data)->iconic) + focus_order = g_list_insert(focus_order, c, 0); + else + focus_order = g_list_insert(focus_order, c, 1); + } + + /* in the middle of cycling..? kill it. */ + focus_cycle_stop(); +} + void focus_order_remove(ObClient *c) { focus_order = g_list_remove(focus_order, c); + + /* in the middle of cycling..? kill it. */ + focus_cycle_stop(); } void focus_order_to_top(ObClient *c)
M
openbox/focus_cycle.c
→
openbox/focus_cycle.c
@@ -396,19 +396,3 @@ focus_cycle_popup_single_hide();
return; } - -void focus_order_add_new(ObClient *c) -{ - if (c->iconic) - focus_order_to_top(c); - else { - g_assert(!g_list_find(focus_order, c)); - /* if there are any iconic windows, put this above them in the order, - but if there are not, then put it under the currently focused one */ - if (focus_order && ((ObClient*)focus_order->data)->iconic) - focus_order = g_list_insert(focus_order, c, 0); - else - focus_order = g_list_insert(focus_order, c, 1); - } -} -