gboolean linear;
gboolean dock_windows;
gboolean desktop_windows;
+ gboolean only_hilite_windows;
gboolean all_desktops;
gboolean forward;
gboolean bar;
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->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->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)
ft = focus_cycle(o->forward,
o->all_desktops,
+ !o->only_hilite_windows,
o->dock_windows,
o->desktop_windows,
o->linear,
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_keycode_to_modmask(e->xkey.keycode);
+ 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_state) {
o->cancel = FALSE;
o->state = e->xkey.state;
return FALSE;
ft = focus_cycle(o->forward,
o->all_desktops,
+ !o->only_hilite_windows,
o->dock_windows,
o->desktop_windows,
o->linear,