void setup_action_desktop(ObAction **a, ObUserAction uact)
{
- (*a)->data.desktop.inter.any.interactive = TRUE;
+ (*a)->data.desktop.inter.any.interactive = FALSE;
}
void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
}
};
+/* only key bindings can be interactive. thus saith the xor.
+ because of how the mouse is grabbed, mouse events dont even get
+ read during interactive events, so no dice! >:) */
+#define INTERACTIVE_LIMIT(a, uact) \
+ if (uact != OB_USER_ACTION_KEYBOARD_KEY) \
+ a->data.any.interactive = FALSE;
+
ObAction *action_from_string(const gchar *name, ObUserAction uact)
{
ObAction *a = NULL;
a = action_new(actionstrings[i].func);
if (actionstrings[i].setup)
actionstrings[i].setup(&a, uact);
- /* only key bindings can be interactive. thus saith the xor.
- because of how the mouse is grabbed, mouse events dont even get
- read during interactive events, so no dice! >:) */
- if (uact != OB_USER_ACTION_KEYBOARD_KEY)
- a->data.any.interactive = FALSE;
+ INTERACTIVE_LIMIT(a, uact);
break;
}
if (!exist)
if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
act->data.cycle.dialog = parse_bool(doc, n);
}
+ INTERACTIVE_LIMIT(act, uact);
}
g_free(actname);
}
a->data.inter.cancel = cancel;
a->data.inter.final = done;
if (!(cancel || done))
- keyboard_interactive_grab(state, a->data.any.c, a);
- }
+ if (!keyboard_interactive_grab(state, a->data.any.c, a))
+ continue;
- ob_main_loop_queue_action(ob_main_loop, a);
+ /* interactive actions are not queued */
+ a->func(&a->data);
+ } else
+ ob_main_loop_queue_action(ob_main_loop, a);
}
}
}
void action_focus(union ActionData *data)
{
+ /* if using focus_delay, stop the timer now so that focus doesn't go moving
+ on us */
+ event_halt_focus_delay();
+
client_focus(data->client.any.c);
}
client_action_start(data);
stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
client_action_end(data);
+
+ focus_order_to_bottom(data->client.any.c);
}
void action_close(union ActionData *data)
screen_set_desktop(first);
}
- if (data->inter.any.interactive && data->inter.final) {
+ if (!data->inter.any.interactive || data->inter.final) {
screen_desktop_popup(0, FALSE);
first = (unsigned) -1;
}
data->desktopdir.inter.final,
data->desktopdir.inter.cancel);
if (!data->sendtodir.inter.any.interactive ||
- !data->sendtodir.inter.final)
+ !data->sendtodir.inter.final ||
+ data->sendtodir.inter.cancel)
{
screen_set_desktop(d);
}
data->sendtodir.inter.final,
data->sendtodir.inter.cancel);
if (!data->sendtodir.inter.any.interactive ||
- !data->sendtodir.inter.final)
+ !data->sendtodir.inter.final ||
+ data->sendtodir.inter.cancel)
{
client_set_desktop(c, d, data->sendtodir.follow);
if (data->sendtodir.follow)
static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
{
- if (x - cx > cw / 2) {
- if (y - cy > ch / 2)
+ if ((cw / 3 < 1) || (x - cx > cw / 3 * 2)) {
+ if ((ch / 3 < 1) || (y - cy > ch / 3 * 2))
return prop_atoms.net_wm_moveresize_size_bottomright;
- else
+ else if (y - cy < ch / 3)
return prop_atoms.net_wm_moveresize_size_topright;
+ else
+ return prop_atoms.net_wm_moveresize_size_right;
+ } else if (x - cx < cw / 3) {
+ if (y - cy > ch / 3 * 2)
+ return prop_atoms.net_wm_moveresize_size_bottomleft;
+ else if (y - cy < ch / 3)
+ return prop_atoms.net_wm_moveresize_size_topleft;
+ else
+ return prop_atoms.net_wm_moveresize_size_left;
} else {
if (y - cy > ch / 2)
- return prop_atoms.net_wm_moveresize_size_bottomleft;
+ return prop_atoms.net_wm_moveresize_size_bottom;
else
- return prop_atoms.net_wm_moveresize_size_topleft;
+ return prop_atoms.net_wm_moveresize_size_top;
}
}
void action_cycle_windows(union ActionData *data)
{
+ /* if using focus_delay, stop the timer now so that focus doesn't go moving
+ on us */
+ event_halt_focus_delay();
+
focus_cycle(data->cycle.forward, data->cycle.linear,
data->cycle.dialog,
data->cycle.inter.final, data->cycle.inter.cancel);
void action_directional_focus(union ActionData *data)
{
+ /* if using focus_delay, stop the timer now so that focus doesn't go moving
+ on us */
+ event_halt_focus_delay();
+
focus_directional_cycle(data->interdiraction.direction,
data->interdiraction.dialog,
data->interdiraction.inter.final,