typedef struct {
gboolean linear;
- gboolean dialog;
gboolean dock_windows;
gboolean desktop_windows;
gboolean all_desktops;
gboolean forward;
gboolean bar;
gboolean raise;
+ ObFocusCyclePopupMode dialog_mode;
GSList *actions;
} Options;
Options *o;
o = g_new0(Options, 1);
- o->dialog = TRUE;
o->bar = TRUE;
+ o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_LIST;
if ((n = obt_parse_find_node(node, "linear")))
o->linear = obt_parse_node_bool(n);
- if ((n = obt_parse_find_node(node, "dialog")))
- o->dialog = obt_parse_node_bool(n);
+ if ((n = obt_parse_find_node(node, "dialog"))) {
+ if (obt_parse_node_contains(n, "none"))
+ o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_NONE;
+ else if (obt_parse_node_contains(n, "icons"))
+ o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_ICONS;
+ }
if ((n = obt_parse_find_node(node, "bar")))
o->bar = obt_parse_node_bool(n);
if ((n = obt_parse_find_node(node, "raise")))
o->linear,
TRUE,
o->bar,
- o->dialog,
+ o->dialog_mode,
FALSE, FALSE);
cycling = TRUE;
stacking_restore();
- if (o->raise) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
+ if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
return TRUE;
}
o->linear,
TRUE,
o->bar,
- o->dialog,
+ o->dialog_mode,
TRUE, cancel);
cycling = FALSE;