#include "keyboard.h"
#include "event.h"
#include "config.h"
+#include "mainloop.h"
#include <glib.h>
-#define ACT_START(d) \
- ((d->any.context != OB_FRAME_CONTEXT_CLIENT && config_focus_follow) ? \
- grab_pointer(TRUE, OB_CURSOR_NONE), 0 : 0)
+inline void client_action_start(union ActionData *data)
+{
+ if (config_focus_follow)
+ if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+}
+
+inline void client_action_end(union ActionData *data)
+{
+ if (config_focus_follow)
+ if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
+ if (!data->any.button) {
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ } else {
+ ObClient *c;
-#define ACT_END(d) \
- ((d->any.context != OB_FRAME_CONTEXT_CLIENT && config_focus_follow) ? \
- grab_pointer(FALSE, OB_CURSOR_NONE), \
- (d->any.button ? focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS), 1 : 0) : \
- 0)
+ /* usually this is sorta redundant, but with a press action
+ the enter event will come as a GrabNotify which is
+ ignored, so this will handle that case */
+ if ((c = client_under_pointer()))
+ event_enter_client(c);
+ }
+ }
+}
-typedef struct ActionString {
+typedef struct
+{
const gchar *name;
void (*func)(union ActionData *);
void (*setup)(ObAction **, ObUserAction uact);
} ActionString;
-static ObAction *action_new(void (*func)(union ActionData *data),
- ObUserAction uact)
+static ObAction *action_new(void (*func)(union ActionData *data))
{
ObAction *a = g_new0(ObAction, 1);
+ a->ref = 1;
a->func = func;
return a;
}
-void action_free(ObAction *a)
+void action_ref(ObAction *a)
+{
+ ++a->ref;
+}
+
+void action_unref(ObAction *a)
{
if (a == NULL) return;
+ if (--a->ref > 0) return;
+
/* deal with pointers */
if (a->func == action_execute || a->func == action_restart)
g_free(a->data.execute.path);
g_free(a);
}
+ObAction* action_copy(const ObAction *src)
+{
+ ObAction *a = action_new(src->func);
+
+ a->data = src->data;
+
+ /* deal with pointers */
+ if (a->func == action_execute || a->func == action_restart)
+ a->data.execute.path = g_strdup(a->data.execute.path);
+ else if (a->func == action_showmenu)
+ a->data.showmenu.name = g_strdup(a->data.showmenu.name);
+
+ return a;
+}
+
void setup_action_directional_focus_north(ObAction **a, ObUserAction uact)
-{
+{
(*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)
{
+ (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendto.follow = TRUE;
}
void setup_action_send_to_desktop_prev(ObAction **a, ObUserAction uact)
{
+ (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendtodir.inter.any.interactive = TRUE;
(*a)->data.sendtodir.dir = OB_DIRECTION_WEST;
(*a)->data.sendtodir.linear = TRUE;
void setup_action_send_to_desktop_next(ObAction **a, ObUserAction uact)
{
+ (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendtodir.inter.any.interactive = TRUE;
(*a)->data.sendtodir.dir = OB_DIRECTION_EAST;
(*a)->data.sendtodir.linear = TRUE;
void setup_action_send_to_desktop_left(ObAction **a, ObUserAction uact)
{
+ (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendtodir.inter.any.interactive = TRUE;
(*a)->data.sendtodir.dir = OB_DIRECTION_WEST;
(*a)->data.sendtodir.linear = FALSE;
void setup_action_send_to_desktop_right(ObAction **a, ObUserAction uact)
{
+ (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendtodir.inter.any.interactive = TRUE;
(*a)->data.sendtodir.dir = OB_DIRECTION_EAST;
(*a)->data.sendtodir.linear = FALSE;
void setup_action_send_to_desktop_up(ObAction **a, ObUserAction uact)
{
+ (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendtodir.inter.any.interactive = TRUE;
(*a)->data.sendtodir.dir = OB_DIRECTION_NORTH;
(*a)->data.sendtodir.linear = FALSE;
void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
{
+ (*a)->data.sendtodir.inter.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.sendtodir.inter.any.interactive = TRUE;
(*a)->data.sendtodir.dir = OB_DIRECTION_SOUTH;
(*a)->data.sendtodir.linear = FALSE;
(*a)->data.sendtodir.follow = TRUE;
}
+void setup_action_desktop(ObAction **a, ObUserAction uact)
+{
+ (*a)->data.desktop.inter.any.interactive = FALSE;
+}
+
void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
{
(*a)->data.desktopdir.inter.any.interactive = TRUE;
(*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)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_NORTH;
}
void setup_action_movetoedge_south(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
}
void setup_action_movetoedge_east(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_EAST;
}
void setup_action_movetoedge_west(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_WEST;
}
void setup_action_growtoedge_north(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_NORTH;
}
void setup_action_growtoedge_south(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
}
void setup_action_growtoedge_east(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_EAST;
}
void setup_action_growtoedge_west(ObAction **a, ObUserAction uact)
{
+ (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.diraction.direction = OB_DIRECTION_WEST;
}
void setup_action_top_layer(ObAction **a, ObUserAction uact)
{
+ (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.layer.layer = 1;
}
void setup_action_normal_layer(ObAction **a, ObUserAction uact)
{
+ (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.layer.layer = 0;
}
void setup_action_bottom_layer(ObAction **a, ObUserAction uact)
{
+ (*a)->data.layer.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.layer.layer = -1;
}
void setup_action_move(ObAction **a, ObUserAction uact)
{
+ (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.moveresize.move = TRUE;
(*a)->data.moveresize.keyboard =
- (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+ (uact == OB_USER_ACTION_NONE ||
+ uact == OB_USER_ACTION_KEYBOARD_KEY ||
uact == OB_USER_ACTION_MENU_SELECTION);
}
void setup_action_resize(ObAction **a, ObUserAction uact)
{
+ (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS;
(*a)->data.moveresize.move = FALSE;
(*a)->data.moveresize.keyboard =
- (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+ (uact == OB_USER_ACTION_NONE ||
+ uact == OB_USER_ACTION_KEYBOARD_KEY ||
uact == OB_USER_ACTION_MENU_SELECTION);
}
void setup_action_showmenu(ObAction **a, ObUserAction uact)
{
+ (*a)->data.showmenu.any.client_action = OB_CLIENT_ACTION_OPTIONAL;
/* you cannot call ShowMenu from inside a menu, cuz the menu code makes
assumptions that there is only one menu (and submenus) open at
a time! */
if (uact == OB_USER_ACTION_MENU_SELECTION) {
- action_free(*a);
+ action_unref(*a);
a = NULL;
}
}
+void setup_client_action(ObAction **a, ObUserAction uact)
+{
+ (*a)->data.any.client_action = OB_CLIENT_ACTION_ALWAYS;
+}
+
ActionString actionstrings[] =
{
{
{
"activate",
action_activate,
- NULL
+ setup_client_action
},
{
"focus",
action_focus,
- NULL
+ setup_client_action
},
{
"unfocus",
action_unfocus,
- NULL
+ setup_client_action
},
{
"iconify",
action_iconify,
- NULL
+ setup_client_action
},
{
"raiselower",
action_raiselower,
- NULL
+ setup_client_action
},
{
"raise",
action_raise,
- NULL
+ setup_client_action
},
{
"lower",
action_lower,
- NULL
+ setup_client_action
},
{
"close",
action_close,
- NULL
+ setup_client_action
},
{
"kill",
action_kill,
- NULL
+ setup_client_action
},
{
"shadelower",
action_shadelower,
- NULL
+ setup_client_action
},
{
"unshaderaise",
action_unshaderaise,
- NULL
+ setup_client_action
},
{
"shade",
action_shade,
- NULL
+ setup_client_action
},
{
"unshade",
action_unshade,
- NULL
+ setup_client_action
},
{
"toggleshade",
action_toggle_shade,
- NULL
+ setup_client_action
},
{
"toggleomnipresent",
action_toggle_omnipresent,
- NULL
+ setup_client_action
},
{
"moverelativehorz",
action_move_relative_horz,
- NULL
+ setup_client_action
},
{
"moverelativevert",
action_move_relative_vert,
- NULL
+ setup_client_action
},
{
"resizerelativehorz",
action_resize_relative_horz,
- NULL
+ setup_client_action
},
{
"resizerelativevert",
action_resize_relative_vert,
- NULL
+ setup_client_action
},
{
"maximizefull",
action_maximize_full,
- NULL
+ setup_client_action
},
{
"unmaximizefull",
action_unmaximize_full,
- NULL
+ setup_client_action
},
{
"togglemaximizefull",
action_toggle_maximize_full,
- NULL
+ setup_client_action
},
{
"maximizehorz",
action_maximize_horz,
- NULL
+ setup_client_action
},
{
"unmaximizehorz",
action_unmaximize_horz,
- NULL
+ setup_client_action
},
{
"togglemaximizehorz",
action_toggle_maximize_horz,
- NULL
+ setup_client_action
},
{
"maximizevert",
action_maximize_vert,
- NULL
+ setup_client_action
},
{
"unmaximizevert",
action_unmaximize_vert,
- NULL
+ setup_client_action
},
{
"togglemaximizevert",
action_toggle_maximize_vert,
- NULL
+ setup_client_action
},
{
"sendtodesktop",
{
"desktop",
action_desktop,
- NULL
+ setup_action_desktop
},
{
"desktopnext",
{
"toggledecorations",
action_toggle_decorations,
- NULL
+ setup_client_action
},
{
"move",
}
};
+/* 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;
for (i = 0; actionstrings[i].name; i++)
if (!g_ascii_strcasecmp(name, actionstrings[i].name)) {
exist = TRUE;
- a = action_new(actionstrings[i].func, uact);
+ 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. */
- if (uact != OB_USER_ACTION_KEYBOARD_KEY)
- a->data.any.interactive = FALSE;
+ INTERACTIVE_LIMIT(a, uact);
break;
}
if (!exist)
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);
}
return act;
for (it = acts; it; it = g_slist_next(it)) {
a = it->data;
- a->data.any.c = c;
- a->data.any.context = context;
- a->data.any.x = x;
- a->data.any.y = y;
+ if (!(a->data.any.client_action == OB_CLIENT_ACTION_ALWAYS && !c)) {
+ a->data.any.c = a->data.any.client_action ? c : NULL;
+ a->data.any.context = context;
+ a->data.any.x = x;
+ a->data.any.y = y;
- a->data.any.button = button;
+ a->data.any.button = button;
- if (a->data.any.interactive) {
- a->data.inter.cancel = cancel;
- a->data.inter.final = done;
- if (!(cancel || done))
- keyboard_interactive_grab(state, c, a);
- }
+ if (a->data.any.interactive) {
+ a->data.inter.cancel = cancel;
+ a->data.inter.final = done;
+ if (!(cancel || done))
+ keyboard_interactive_grab(state, a->data.any.c, a);
+ }
- a->func(&a->data);
+ ob_main_loop_queue_action(ob_main_loop, a);
+ }
}
}
+void action_run_string(const gchar *name, struct _ObClient *c)
+{
+ ObAction *a;
+ GSList *l;
+
+ a = action_from_string(name, OB_USER_ACTION_NONE);
+ g_assert(a);
+
+ l = g_slist_append(NULL, a);
+
+ action_run(l, c, 0);
+}
+
void action_execute(union ActionData *data)
{
GError *e = NULL;
void action_activate(union ActionData *data)
{
- if (data->activate.any.c)
- client_activate(data->activate.any.c, data->activate.here);
+ client_activate(data->activate.any.c, data->activate.here);
}
void action_focus(union ActionData *data)
{
- if (data->client.any.c)
- client_focus(data->client.any.c);
+ client_focus(data->client.any.c);
}
void action_unfocus (union ActionData *data)
{
- if (data->client.any.c)
- client_unfocus(data->client.any.c);
+ client_unfocus(data->client.any.c);
}
void action_iconify(union ActionData *data)
{
- if (data->client.any.c)
- client_iconify(data->client.any.c, TRUE, TRUE);
+ client_iconify(data->client.any.c, TRUE, TRUE);
}
void action_raiselower(union ActionData *data)
GList *it;
gboolean raise = FALSE;
- if (!c) return;
-
for (it = stacking_list; it; it = g_list_next(it)) {
ObClient *cit = it->data;
if (cit == c) break;
if (client_normal(cit) == client_normal(c) &&
cit->layer == c->layer &&
- cit->frame->visible)
+ cit->frame->visible &&
+ !client_search_transient(c, cit))
{
if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
raise = TRUE;
}
}
- if (raise) {
- ACT_START(data);
- stacking_raise(CLIENT_AS_WINDOW(c));
- ACT_END(data);
- } else {
- ACT_START(data);
- stacking_lower(CLIENT_AS_WINDOW(c));
- ACT_END(data);
- }
+ action_run_string((raise ? "Raise" : "Lower"), c);
}
void action_raise(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
- ACT_END(data);
- }
+ client_action_start(data);
+ stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
+ client_action_end(data);
}
void action_unshaderaise(union ActionData *data)
{
- if (data->client.any.c) {
- if (data->client.any.c->shaded) {
- ACT_START(data);
- client_shade(data->client.any.c, FALSE);
- ACT_END(data);
- } else {
- ACT_START(data);
- stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
- ACT_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) {
- if (data->client.any.c->shaded)
- stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
- else {
- ACT_START(data);
- client_shade(data->client.any.c, TRUE);
- ACT_END(data);
- }
- }
+ if (data->client.any.c->shaded)
+ action_run_string("Lower", data->client.any.c);
+ else
+ action_run_string("Shade", data->client.any.c);
}
void action_lower(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
- ACT_END(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)
{
- if (data->client.any.c)
- client_close(data->client.any.c);
+ client_close(data->client.any.c);
}
void action_kill(union ActionData *data)
{
- if (data->client.any.c)
- client_kill(data->client.any.c);
+ client_kill(data->client.any.c);
}
void action_shade(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_shade(data->client.any.c, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_shade(data->client.any.c, TRUE);
+ client_action_end(data);
}
void action_unshade(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_shade(data->client.any.c, FALSE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_shade(data->client.any.c, FALSE);
+ client_action_end(data);
}
void action_toggle_shade(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_shade(data->client.any.c, !data->client.any.c->shaded);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_shade(data->client.any.c, !data->client.any.c->shaded);
+ client_action_end(data);
}
void action_toggle_omnipresent(union ActionData *data)
{
- if (data->client.any.c)
- client_set_desktop(data->client.any.c,
- data->client.any.c->desktop == DESKTOP_ALL ?
- screen_desktop : DESKTOP_ALL, FALSE);
+ client_set_desktop(data->client.any.c,
+ data->client.any.c->desktop == DESKTOP_ALL ?
+ screen_desktop : DESKTOP_ALL, FALSE);
}
void action_move_relative_horz(union ActionData *data)
{
ObClient *c = data->relative.any.c;
- if (c) {
- ACT_START(data);
- client_move(c, c->area.x + data->relative.delta, c->area.y);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_move(c, c->area.x + data->relative.delta, c->area.y);
+ client_action_end(data);
}
void action_move_relative_vert(union ActionData *data)
{
ObClient *c = data->relative.any.c;
- if (c) {
- ACT_START(data);
- client_move(c, c->area.x, c->area.y + data->relative.delta);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_move(c, c->area.x, c->area.y + data->relative.delta);
+ client_action_end(data);
}
void action_resize_relative_horz(union ActionData *data)
{
ObClient *c = data->relative.any.c;
- if (c) {
- ACT_START(data);
- client_resize(c,
- c->area.width + data->relative.delta * c->size_inc.width,
- c->area.height);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_resize(c,
+ c->area.width + data->relative.delta * c->size_inc.width,
+ c->area.height);
+ client_action_end(data);
}
void action_resize_relative_vert(union ActionData *data)
{
ObClient *c = data->relative.any.c;
- if (c && !c->shaded) {
- ACT_START(data);
+ if (!c->shaded) {
+ client_action_start(data);
client_resize(c, c->area.width, c->area.height +
data->relative.delta * c->size_inc.height);
- ACT_END(data);
+ client_action_end(data);
}
}
void action_maximize_full(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c, TRUE, 0, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c, TRUE, 0, TRUE);
+ client_action_end(data);
}
void action_unmaximize_full(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c, FALSE, 0, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c, FALSE, 0, TRUE);
+ client_action_end(data);
}
void action_toggle_maximize_full(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c,
- !(data->client.any.c->max_horz ||
- data->client.any.c->max_vert),
- 0, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c,
+ !(data->client.any.c->max_horz ||
+ data->client.any.c->max_vert),
+ 0, TRUE);
+ client_action_end(data);
}
void action_maximize_horz(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c, TRUE, 1, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c, TRUE, 1, TRUE);
+ client_action_end(data);
}
void action_unmaximize_horz(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c, FALSE, 1, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c, FALSE, 1, TRUE);
+ client_action_end(data);
}
void action_toggle_maximize_horz(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c,
- !data->client.any.c->max_horz, 1, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c,
+ !data->client.any.c->max_horz, 1, TRUE);
+ client_action_end(data);
}
void action_maximize_vert(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c, TRUE, 2, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c, TRUE, 2, TRUE);
+ client_action_end(data);
}
void action_unmaximize_vert(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c, FALSE, 2, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c, FALSE, 2, TRUE);
+ client_action_end(data);
}
void action_toggle_maximize_vert(union ActionData *data)
{
- if (data->client.any.c) {
- ACT_START(data);
- client_maximize(data->client.any.c,
- !data->client.any.c->max_vert, 2, TRUE);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_maximize(data->client.any.c,
+ !data->client.any.c->max_vert, 2, TRUE);
+ client_action_end(data);
}
void action_send_to_desktop(union ActionData *data)
{
ObClient *c = data->sendto.any.c;
- if (!c || !client_normal(c)) return;
+ if (!client_normal(c)) return;
if (data->sendto.desk < screen_num_desktops ||
data->sendto.desk == DESKTOP_ALL) {
void action_desktop(union ActionData *data)
{
- if (data->desktop.desk < screen_num_desktops ||
- data->desktop.desk == DESKTOP_ALL)
- screen_set_desktop(data->desktop.desk);
+ static guint first = (unsigned) -1;
+
+ if (data->inter.any.interactive && first == (unsigned) -1)
+ first = screen_desktop;
+
+ if (!data->inter.any.interactive ||
+ (!data->inter.cancel && !data->inter.final))
+ {
+ if (data->desktop.desk < screen_num_desktops ||
+ data->desktop.desk == DESKTOP_ALL)
+ {
+ screen_set_desktop(data->desktop.desk);
+ if (data->inter.any.interactive)
+ screen_desktop_popup(data->desktop.desk, TRUE);
+ }
+ } else if (data->inter.cancel) {
+ screen_set_desktop(first);
+ }
+
+ if (!data->inter.any.interactive || data->inter.final) {
+ screen_desktop_popup(0, FALSE);
+ first = (unsigned) -1;
+ }
}
void action_desktop_dir(union ActionData *data)
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);
- screen_set_desktop(d);
+ if (!data->sendtodir.inter.any.interactive ||
+ !data->sendtodir.inter.final ||
+ data->sendtodir.inter.cancel)
+ {
+ screen_set_desktop(d);
+ }
}
void action_send_to_desktop_dir(union ActionData *data)
ObClient *c = data->sendtodir.inter.any.c;
guint d;
- if (!c || !client_normal(c)) return;
+ if (!client_normal(c)) return;
d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap,
data->sendtodir.linear,
data->sendtodir.inter.any.interactive,
data->sendtodir.inter.final,
data->sendtodir.inter.cancel);
- client_set_desktop(c, d, data->sendtodir.follow);
- if (data->sendtodir.follow)
- screen_set_desktop(d);
+ if (!data->sendtodir.inter.any.interactive ||
+ !data->sendtodir.inter.final ||
+ data->sendtodir.inter.cancel)
+ {
+ client_set_desktop(c, d, data->sendtodir.follow);
+ if (data->sendtodir.follow)
+ screen_set_desktop(d);
+ }
}
void action_desktop_last(union ActionData *data)
{
ObClient *c = data->client.any.c;
- if (c) {
- ACT_START(data);
- c->decorate = !c->decorate;
- client_setup_decor_and_functions(c);
- ACT_END(data);
- }
+ client_action_start(data);
+ client_set_undecorated(c, !c->undecorated);
+ client_action_end(data);
}
static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
ObClient *c = data->moveresize.any.c;
guint32 corner;
- if (!c || !client_normal(c)) return;
+ if (!client_normal(c)) return;
if (data->moveresize.keyboard) {
corner = (data->moveresize.move ?
void action_cycle_windows(union ActionData *data)
{
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)
{
focus_directional_cycle(data->interdiraction.direction,
- data->interdiraction.inter.any.interactive,
+ data->interdiraction.dialog,
data->interdiraction.inter.final,
data->interdiraction.inter.cancel);
}
int x, y;
ObClient *c = data->diraction.any.c;
- if (!c)
- return;
x = c->frame->area.x;
y = c->frame->area.y;
g_assert_not_reached();
}
frame_frame_gravity(c->frame, &x, &y);
- ACT_START(data);
+ client_action_start(data);
client_move(c, x, y);
- ACT_END(data);
-
+ client_action_end(data);
}
void action_growtoedge(union ActionData *data)
ObClient *c = data->diraction.any.c;
Rect *a;
- if (!c)
- return;
-
a = screen_area(c->desktop);
x = c->frame->area.x;
y = c->frame->area.y;
frame_frame_gravity(c->frame, &x, &y);
width -= c->frame->size.left + c->frame->size.right;
height -= c->frame->size.top + c->frame->size.bottom;
- ACT_START(data);
+ client_action_start(data);
client_move_resize(c, x, y, width, height);
- ACT_END(data);
+ client_action_end(data);
}
void action_send_to_layer(union ActionData *data)
{
- if (data->layer.any.c)
- client_set_layer(data->layer.any.c, data->layer.layer);
+ client_set_layer(data->layer.any.c, data->layer.layer);
}
void action_toggle_layer(union ActionData *data)
{
ObClient *c = data->layer.any.c;
- if (c) {
- ACT_START(data);
- if (data->layer.layer < 0)
- client_set_layer(c, c->below ? 0 : -1);
- else if (data->layer.layer > 0)
- client_set_layer(c, c->above ? 0 : 1);
- ACT_END(data);
- }
+ client_action_start(data);
+ if (data->layer.layer < 0)
+ client_set_layer(c, c->below ? 0 : -1);
+ else if (data->layer.layer > 0)
+ client_set_layer(c, c->above ? 0 : 1);
+ client_action_end(data);
}
void action_toggle_show_desktop(union ActionData *data)
projects / chaz / openbox / blobdiff