#include "openbox/focus_cycle.h"
#include "openbox/openbox.h"
#include "gettext.h"
+#include "obt/keyboard.h"
typedef struct {
gboolean linear;
gboolean dock_windows;
gboolean desktop_windows;
+ gboolean only_hilite_windows;
gboolean all_desktops;
gboolean forward;
gboolean bar;
gboolean raise;
+ gboolean interactive;
ObFocusCyclePopupMode dialog_mode;
GSList *actions;
static gboolean run_func(ObActionsData *data, gpointer options);
static gboolean i_input_func(guint initial_state,
XEvent *e,
+ ObtIC *ic,
gpointer options,
gboolean *used);
static void i_cancel_func(gpointer options);
xmlNodePtr n;
Options *o;
- o = g_new0(Options, 1);
+ o = g_slice_new0(Options);
o->bar = TRUE;
o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_LIST;
+ o->interactive = TRUE;
- if ((n = obt_parse_find_node(node, "linear")))
- o->linear = obt_parse_node_bool(n);
- if ((n = obt_parse_find_node(node, "dialog"))) {
- if (obt_parse_node_contains(n, "none"))
+ if ((n = obt_xml_find_node(node, "linear")))
+ o->linear = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "dialog"))) {
+ if (obt_xml_node_contains(n, "none"))
o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_NONE;
- else if (obt_parse_node_contains(n, "icons"))
+ else if (obt_xml_node_contains(n, "no"))
+ o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_NONE;
+ else if (obt_xml_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->raise = obt_parse_node_bool(n);
- if ((n = obt_parse_find_node(node, "panels")))
- o->dock_windows = obt_parse_node_bool(n);
- if ((n = obt_parse_find_node(node, "desktop")))
- o->desktop_windows = obt_parse_node_bool(n);
- if ((n = obt_parse_find_node(node, "allDesktops")))
- o->all_desktops = obt_parse_node_bool(n);
-
- if ((n = obt_parse_find_node(node, "finalactions"))) {
+ if ((n = obt_xml_find_node(node, "interactive")))
+ o->interactive = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "bar")))
+ o->bar = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "raise")))
+ o->raise = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "panels")))
+ o->dock_windows = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "hilite")))
+ o->only_hilite_windows = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "desktop")))
+ o->desktop_windows = obt_xml_node_bool(n);
+ if ((n = obt_xml_find_node(node, "allDesktops")))
+ o->all_desktops = obt_xml_node_bool(n);
+
+ if ((n = obt_xml_find_node(node, "finalactions"))) {
xmlNodePtr m;
- m = obt_parse_find_node(n->children, "action");
+ m = obt_xml_find_node(n->children, "action");
while (m) {
ObActionsAct *action = actions_parse(m);
if (action) o->actions = g_slist_append(o->actions, action);
- m = obt_parse_find_node(m->next, "action");
+ m = obt_xml_find_node(m->next, "action");
}
}
else {
o->actions = g_slist_delete_link(o->actions, o->actions);
}
- g_free(o);
+ g_slice_free(Options, o);
}
static gboolean run_func(ObActionsData *data, gpointer options)
Options *o = options;
struct _ObClient *ft;
- ft = focus_cycle(o->forward,
- o->all_desktops,
- o->dock_windows,
- o->desktop_windows,
- o->linear,
- TRUE,
- o->bar,
- o->dialog_mode,
- FALSE, FALSE);
+ gboolean done = FALSE;
+ gboolean cancel = FALSE;
+
+ ft = focus_cycle(
+ o->forward,
+ o->all_desktops,
+ !o->only_hilite_windows,
+ o->dock_windows,
+ o->desktop_windows,
+ o->linear,
+ (o->interactive ? o->bar : FALSE),
+ (o->interactive ? o->dialog_mode : OB_FOCUS_CYCLE_POPUP_MODE_NONE),
+ done, cancel);
stacking_restore();
if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
- return TRUE;
+ return o->interactive;
}
static gboolean i_input_func(guint initial_state,
XEvent *e,
+ ObtIC *ic,
gpointer options,
gboolean *used)
{
Options *o = options;
+ guint mods, initial_mods;
+
+ initial_mods = obt_keyboard_only_modmasks(initial_state);
+ mods = obt_keyboard_only_modmasks(e->xkey.state);
+ if (e->type == KeyRelease) {
+ /* remove from the state the mask of the modifier key being
+ released, if it is a modifier key being released that is */
+ mods &= ~obt_keyboard_keyevent_to_modmask(e);
+ }
if (e->type == KeyPress) {
+ KeySym sym = obt_keyboard_keypress_to_keysym(e);
+
/* Escape cancels no matter what */
- if (ob_keycode_match(e->xkey.keycode, OB_KEY_ESCAPE)) {
+ if (sym == XK_Escape) {
o->cancel = TRUE;
o->state = e->xkey.state;
return FALSE;
}
/* There were no modifiers and they pressed enter */
- else if (ob_keycode_match(e->xkey.keycode, OB_KEY_RETURN) &&
- !initial_state)
- {
+ else if ((sym == XK_Return || sym == XK_KP_Enter) && !initial_mods) {
o->cancel = FALSE;
o->state = e->xkey.state;
return FALSE;
}
}
/* They released the modifiers */
- else if (e->type == KeyRelease && initial_state &&
- (e->xkey.state & initial_state) == 0)
+ else if (e->type == KeyRelease && initial_mods && !(mods & initial_mods))
{
o->cancel = FALSE;
o->state = e->xkey.state;
Options *o = options;
struct _ObClient *ft;
+ gboolean done = TRUE;
+
ft = focus_cycle(o->forward,
o->all_desktops,
+ !o->only_hilite_windows,
o->dock_windows,
o->desktop_windows,
o->linear,
- TRUE,
o->bar,
o->dialog_mode,
- TRUE, o->cancel);
+ done, o->cancel);
if (ft)
actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
projects / dana / openbox.git / blobdiff