{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_NORTH;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_east(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_EAST;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_south(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_west(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_WEST;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_southeast(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact)
{
(*a)->data.interdiraction.inter.any.interactive = TRUE;
(*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
+ (*a)->data.interdiraction.dialog = TRUE;
}
void setup_action_send_to_desktop(ObAction **a, ObUserAction uact)
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)
(*a)->data.cycle.inter.any.interactive = TRUE;
(*a)->data.cycle.linear = FALSE;
(*a)->data.cycle.forward = TRUE;
+ (*a)->data.cycle.dialog = TRUE;
}
void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
(*a)->data.cycle.inter.any.interactive = TRUE;
(*a)->data.cycle.linear = FALSE;
(*a)->data.cycle.forward = FALSE;
+ (*a)->data.cycle.dialog = TRUE;
}
void setup_action_movetoedge_north(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;
gboolean exist = FALSE;
- int i;
+ gint i;
for (i = 0; actionstrings[i].name; i++)
if (!g_ascii_strcasecmp(name, actionstrings[i].name)) {
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)
ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
ObUserAction uact)
{
- char *actname;
+ gchar *actname;
ObAction *act = NULL;
xmlNodePtr n;
if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
act->data.desktop.desk = parse_int(doc, n);
if (act->data.desktop.desk > 0) act->data.desktop.desk--;
+ if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+ act->data.desktop.inter.any.interactive =
+ parse_bool(doc, n);
} else if (act->func == action_send_to_desktop) {
if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
act->data.sendto.desk = parse_int(doc, n);
} else if (act->func == action_desktop_dir) {
if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
act->data.desktopdir.wrap = parse_bool(doc, n);
+ if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+ act->data.desktopdir.inter.any.interactive =
+ parse_bool(doc, n);
} else if (act->func == action_send_to_desktop_dir) {
if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
act->data.sendtodir.wrap = parse_bool(doc, n);
if ((n = parse_find_node("follow", node->xmlChildrenNode)))
act->data.sendtodir.follow = parse_bool(doc, n);
+ if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+ act->data.sendtodir.inter.any.interactive =
+ parse_bool(doc, n);
} else if (act->func == action_activate) {
if ((n = parse_find_node("here", node->xmlChildrenNode)))
act->data.activate.here = parse_bool(doc, n);
} else if (act->func == action_cycle_windows) {
if ((n = parse_find_node("linear", node->xmlChildrenNode)))
act->data.cycle.linear = parse_bool(doc, n);
+ if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
+ act->data.cycle.dialog = parse_bool(doc, n);
+ } else if (act->func == action_directional_focus) {
+ 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_execute(union ActionData *data)
{
GError *e = NULL;
- char *cmd;
+ gchar *cmd;
if (data->execute.path) {
cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
if (cmd) {
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);
}
}
}
- if (raise) {
- client_action_start(data);
- stacking_raise(CLIENT_AS_WINDOW(c));
- client_action_end(data);
- } else {
- client_action_start(data);
- stacking_lower(CLIENT_AS_WINDOW(c));
- client_action_end(data);
- }
+ action_run_string((raise ? "Raise" : "Lower"), c);
}
void action_raise(union ActionData *data)
void action_unshaderaise(union ActionData *data)
{
- if (data->client.any.c->shaded) {
- client_action_start(data);
- client_shade(data->client.any.c, FALSE);
- client_action_end(data);
- } else {
- client_action_start(data);
- stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
- client_action_end(data);
- }
+ if (data->client.any.c->shaded)
+ action_run_string("Unshade", data->client.any.c);
+ else
+ action_run_string("Raise", data->client.any.c);
}
void action_shadelower(union ActionData *data)
{
if (data->client.any.c->shaded)
- stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
- else {
- client_action_start(data);
- client_shade(data->client.any.c, TRUE);
- client_action_end(data);
- }
+ action_run_string("Lower", data->client.any.c);
+ else
+ action_run_string("Shade", data->client.any.c);
}
void action_lower(union ActionData *data)
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;
}
d = screen_cycle_desktop(data->desktopdir.dir,
data->desktopdir.wrap,
- data->sendtodir.linear,
+ data->desktopdir.linear,
data->desktopdir.inter.any.interactive,
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)
client_action_end(data);
}
-static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
+static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint 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.inter.any.interactive,
+ 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.inter.any.interactive,
+ data->interdiraction.dialog,
data->interdiraction.inter.final,
data->interdiraction.inter.cancel);
}
void action_movetoedge(union ActionData *data)
{
- int x, y;
+ gint x, y;
ObClient *c = data->diraction.any.c;
x = c->frame->area.x;
void action_growtoedge(union ActionData *data)
{
- int x, y, width, height, dest;
+ gint x, y, width, height, dest;
ObClient *c = data->diraction.any.c;
Rect *a;
projects / chaz / openbox / blobdiff