#include "openbox/actions.h"
#include "openbox/event.h"
+#include "openbox/stacking.h"
+#include "openbox/window.h"
#include "openbox/focus_cycle.h"
#include "openbox/openbox.h"
#include "openbox/misc.h"
gboolean dock_windows;
gboolean desktop_windows;
ObDirection direction;
+ gboolean bar;
+ gboolean raise;
GSList *actions;
} Options;
static void end_cycle(gboolean cancel, guint state, Options *o);
-void action_directionalwindows_startup()
+void action_directionalwindows_startup(void)
{
actions_register("DirectionalCycleWindows", setup_cycle_func, free_func,
run_func, i_input_func, i_cancel_func);
o = g_new0(Options, 1);
o->dialog = TRUE;
+ o->bar = TRUE;
if ((n = parse_find_node("dialog", node)))
o->dialog = parse_bool(doc, n);
+ if ((n = parse_find_node("bar", node)))
+ o->bar = parse_bool(doc, n);
+ if ((n = parse_find_node("raise", node)))
+ o->raise = parse_bool(doc, n);
if ((n = parse_find_node("panels", node)))
o->dock_windows = parse_bool(doc, n);
if ((n = parse_find_node("desktop", node)))
m = parse_find_node("action", n->xmlChildrenNode);
while (m) {
ObActionsAct *action = actions_parse(i, doc, m);
- if (action) o->actions = g_slist_prepend(o->actions, action);
+ if (action) o->actions = g_slist_append(o->actions, action);
m = parse_find_node("action", m->next);
}
}
{
Options *o = options;
- if (o->interactive)
+ if (!o->interactive)
end_cycle(FALSE, data->state, o);
else {
- focus_directional_cycle(o->direction,
- o->dock_windows,
- o->desktop_windows,
- TRUE,
- o->dialog,
- FALSE, FALSE);
+ struct _ObClient *ft;
+
+ ft = focus_directional_cycle(o->direction,
+ o->dock_windows,
+ o->desktop_windows,
+ TRUE,
+ o->bar,
+ o->dialog,
+ FALSE, FALSE);
cycling = TRUE;
+
+ stacking_restore();
+ if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
}
return o->interactive;
{
if (e->type == KeyPress) {
/* Escape cancels no matter what */
- if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+ if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) {
end_cycle(TRUE, e->xkey.state, options);
return FALSE;
}
/* There were no modifiers and they pressed enter */
- else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) &&
+ else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) &&
!initial_state)
{
end_cycle(FALSE, e->xkey.state, options);
ft = focus_directional_cycle(o->direction,
o->dock_windows,
o->desktop_windows,
- TRUE,
+ o->interactive,
+ o->bar,
o->dialog,
TRUE, cancel);
cycling = FALSE;
- if (ft) {
+ if (ft)
actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
- }
+
+ stacking_restore();
}