#include "menu.h"
#include "prop.h"
#include "stacking.h"
-#include "frame.h"
#include "screen.h"
#include "action.h"
-#include "dispatch.h"
#include "openbox.h"
+#include "grab.h"
+#include "keyboard.h"
#include <glib.h>
typedef struct ActionString {
char *name;
void (*func)(union ActionData *);
- void (*setup)(ObAction *);
+ void (*setup)(ObAction **, ObUserAction uact);
} ActionString;
-ObAction *action_new(void (*func)(union ActionData *data))
+static ObAction *action_new(void (*func)(union ActionData *data),
+ ObUserAction uact)
{
ObAction *a = g_new0(ObAction, 1);
a->func = func;
g_free(a);
}
-void setup_action_directional_focus_north(ObAction *a)
-{
- a->data.diraction.direction = OB_DIRECTION_NORTH;
-}
-
-void setup_action_directional_focus_east(ObAction *a)
-{
- a->data.diraction.direction = OB_DIRECTION_EAST;
-}
-
-void setup_action_directional_focus_south(ObAction *a)
-{
- a->data.diraction.direction = OB_DIRECTION_SOUTH;
-}
-
-void setup_action_directional_focus_west(ObAction *a)
-{
- a->data.diraction.direction = OB_DIRECTION_WEST;
+void setup_action_directional_focus_north(ObAction **a, ObUserAction uact)
+{
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_NORTH;
}
-void setup_action_directional_focus_northeast(ObAction *a)
+void setup_action_directional_focus_east(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_NORTHEAST;
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_EAST;
}
-void setup_action_directional_focus_southeast(ObAction *a)
+void setup_action_directional_focus_south(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTHEAST;
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH;
}
-void setup_action_directional_focus_southwest(ObAction *a)
+void setup_action_directional_focus_west(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTHWEST;
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_WEST;
}
-void setup_action_directional_focus_northwest(ObAction *a)
+void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_NORTHWEST;
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
}
-void setup_action_send_to_desktop(ObAction *a)
+void setup_action_directional_focus_southeast(ObAction **a, ObUserAction uact)
{
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
}
-void setup_action_send_to_desktop_prev(ObAction *a)
+void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact)
{
- a->data.sendtodir.dir = OB_DIRECTION_WEST;
- a->data.sendtodir.linear = TRUE;
- a->data.sendtodir.wrap = TRUE;
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
}
-void setup_action_send_to_desktop_next(ObAction *a)
+void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact)
{
- a->data.sendtodir.dir = OB_DIRECTION_EAST;
- a->data.sendtodir.linear = TRUE;
- a->data.sendtodir.wrap = TRUE;
+ (*a)->data.interdiraction.inter.any.interactive = TRUE;
+ (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
}
-void setup_action_send_to_desktop_left(ObAction *a)
+void setup_action_send_to_desktop(ObAction **a, ObUserAction uact)
{
- a->data.sendtodir.dir = OB_DIRECTION_WEST;
- a->data.sendtodir.linear = FALSE;
- a->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendto.follow = TRUE;
}
-void setup_action_send_to_desktop_right(ObAction *a)
+void setup_action_send_to_desktop_prev(ObAction **a, ObUserAction uact)
{
- a->data.sendtodir.dir = OB_DIRECTION_EAST;
- a->data.sendtodir.linear = FALSE;
- a->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.inter.any.interactive = TRUE;
+ (*a)->data.sendtodir.dir = OB_DIRECTION_WEST;
+ (*a)->data.sendtodir.linear = TRUE;
+ (*a)->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.follow = TRUE;
}
-void setup_action_send_to_desktop_up(ObAction *a)
+void setup_action_send_to_desktop_next(ObAction **a, ObUserAction uact)
{
- a->data.sendtodir.dir = OB_DIRECTION_NORTH;
- a->data.sendtodir.linear = FALSE;
- a->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.inter.any.interactive = TRUE;
+ (*a)->data.sendtodir.dir = OB_DIRECTION_EAST;
+ (*a)->data.sendtodir.linear = TRUE;
+ (*a)->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.follow = TRUE;
}
-void setup_action_send_to_desktop_down(ObAction *a)
+void setup_action_send_to_desktop_left(ObAction **a, ObUserAction uact)
{
- a->data.sendtodir.dir = OB_DIRECTION_SOUTH;
- a->data.sendtodir.linear = FALSE;
- a->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.inter.any.interactive = TRUE;
+ (*a)->data.sendtodir.dir = OB_DIRECTION_WEST;
+ (*a)->data.sendtodir.linear = FALSE;
+ (*a)->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.follow = TRUE;
}
-void setup_action_desktop_prev(ObAction *a)
+void setup_action_send_to_desktop_right(ObAction **a, ObUserAction uact)
{
- a->data.desktopdir.dir = OB_DIRECTION_WEST;
- a->data.desktopdir.linear = TRUE;
- a->data.desktopdir.wrap = TRUE;
+ (*a)->data.sendtodir.inter.any.interactive = TRUE;
+ (*a)->data.sendtodir.dir = OB_DIRECTION_EAST;
+ (*a)->data.sendtodir.linear = FALSE;
+ (*a)->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.follow = TRUE;
}
-void setup_action_desktop_next(ObAction *a)
+void setup_action_send_to_desktop_up(ObAction **a, ObUserAction uact)
{
- a->data.desktopdir.dir = OB_DIRECTION_EAST;
- a->data.desktopdir.linear = TRUE;
- a->data.desktopdir.wrap = TRUE;
+ (*a)->data.sendtodir.inter.any.interactive = TRUE;
+ (*a)->data.sendtodir.dir = OB_DIRECTION_NORTH;
+ (*a)->data.sendtodir.linear = FALSE;
+ (*a)->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.follow = TRUE;
}
-void setup_action_desktop_left(ObAction *a)
+void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
{
- a->data.desktopdir.dir = OB_DIRECTION_WEST;
- a->data.desktopdir.linear = FALSE;
- a->data.desktopdir.wrap = TRUE;
+ (*a)->data.sendtodir.inter.any.interactive = TRUE;
+ (*a)->data.sendtodir.dir = OB_DIRECTION_SOUTH;
+ (*a)->data.sendtodir.linear = FALSE;
+ (*a)->data.sendtodir.wrap = TRUE;
+ (*a)->data.sendtodir.follow = TRUE;
}
-void setup_action_desktop_right(ObAction *a)
+void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
{
- a->data.desktopdir.dir = OB_DIRECTION_EAST;
- a->data.desktopdir.linear = FALSE;
- a->data.desktopdir.wrap = TRUE;
+ (*a)->data.desktopdir.inter.any.interactive = TRUE;
+ (*a)->data.desktopdir.dir = OB_DIRECTION_WEST;
+ (*a)->data.desktopdir.linear = TRUE;
+ (*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_desktop_up(ObAction *a)
+void setup_action_desktop_next(ObAction **a, ObUserAction uact)
{
- a->data.desktopdir.dir = OB_DIRECTION_NORTH;
- a->data.desktopdir.linear = FALSE;
- a->data.desktopdir.wrap = TRUE;
+ (*a)->data.desktopdir.inter.any.interactive = TRUE;
+ (*a)->data.desktopdir.dir = OB_DIRECTION_EAST;
+ (*a)->data.desktopdir.linear = TRUE;
+ (*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_desktop_down(ObAction *a)
+void setup_action_desktop_left(ObAction **a, ObUserAction uact)
{
- a->data.desktopdir.dir = OB_DIRECTION_SOUTH;
- a->data.desktopdir.linear = FALSE;
- a->data.desktopdir.wrap = TRUE;
+ (*a)->data.desktopdir.inter.any.interactive = TRUE;
+ (*a)->data.desktopdir.dir = OB_DIRECTION_WEST;
+ (*a)->data.desktopdir.linear = FALSE;
+ (*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_move_keyboard(ObAction *a)
+void setup_action_desktop_right(ObAction **a, ObUserAction uact)
{
- a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard;
+ (*a)->data.desktopdir.inter.any.interactive = TRUE;
+ (*a)->data.desktopdir.dir = OB_DIRECTION_EAST;
+ (*a)->data.desktopdir.linear = FALSE;
+ (*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_move(ObAction *a)
+void setup_action_desktop_up(ObAction **a, ObUserAction uact)
{
- a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move;
+ (*a)->data.desktopdir.inter.any.interactive = TRUE;
+ (*a)->data.desktopdir.dir = OB_DIRECTION_NORTH;
+ (*a)->data.desktopdir.linear = FALSE;
+ (*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_resize(ObAction *a)
+void setup_action_desktop_down(ObAction **a, ObUserAction uact)
{
- a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft;
+ (*a)->data.desktopdir.inter.any.interactive = TRUE;
+ (*a)->data.desktopdir.dir = OB_DIRECTION_SOUTH;
+ (*a)->data.desktopdir.linear = FALSE;
+ (*a)->data.desktopdir.wrap = TRUE;
}
-void setup_action_resize_keyboard(ObAction *a)
+void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact)
{
- a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard;
+ (*a)->data.cycle.inter.any.interactive = TRUE;
+ (*a)->data.cycle.linear = FALSE;
+ (*a)->data.cycle.forward = TRUE;
}
-void setup_action_cycle_windows_linear_next(ObAction *a)
+void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact)
{
- a->data.cycle.linear = TRUE;
- a->data.cycle.forward = TRUE;
+ (*a)->data.cycle.inter.any.interactive = TRUE;
+ (*a)->data.cycle.linear = FALSE;
+ (*a)->data.cycle.forward = FALSE;
}
-void setup_action_cycle_windows_linear_previous(ObAction *a)
+void setup_action_movetoedge_north(ObAction **a, ObUserAction uact)
{
- a->data.cycle.linear = TRUE;
- a->data.cycle.forward = FALSE;
+ (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
}
-void setup_action_cycle_windows_next(ObAction *a)
+void setup_action_movetoedge_south(ObAction **a, ObUserAction uact)
{
- a->data.cycle.linear = FALSE;
- a->data.cycle.forward = TRUE;
+ (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
}
-void setup_action_cycle_windows_previous(ObAction *a)
+void setup_action_movetoedge_east(ObAction **a, ObUserAction uact)
{
- a->data.cycle.linear = FALSE;
- a->data.cycle.forward = FALSE;
+ (*a)->data.diraction.direction = OB_DIRECTION_EAST;
}
-void setup_action_movetoedge_north(ObAction *a)
+void setup_action_movetoedge_west(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_NORTH;
+ (*a)->data.diraction.direction = OB_DIRECTION_WEST;
}
-void setup_action_movetoedge_south(ObAction *a)
+void setup_action_growtoedge_north(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTH;
+ (*a)->data.diraction.direction = OB_DIRECTION_NORTH;
}
-void setup_action_movetoedge_east(ObAction *a)
+void setup_action_growtoedge_south(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_EAST;
+ (*a)->data.diraction.direction = OB_DIRECTION_SOUTH;
}
-void setup_action_movetoedge_west(ObAction *a)
+void setup_action_growtoedge_east(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_WEST;
+ (*a)->data.diraction.direction = OB_DIRECTION_EAST;
}
-void setup_action_growtoedge_north(ObAction *a)
+void setup_action_growtoedge_west(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_NORTH;
+ (*a)->data.diraction.direction = OB_DIRECTION_WEST;
}
-void setup_action_growtoedge_south(ObAction *a)
+void setup_action_top_layer(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTH;
+ (*a)->data.layer.layer = 1;
}
-void setup_action_growtoedge_east(ObAction *a)
+void setup_action_normal_layer(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_EAST;
+ (*a)->data.layer.layer = 0;
}
-void setup_action_growtoedge_west(ObAction *a)
+void setup_action_bottom_layer(ObAction **a, ObUserAction uact)
{
- a->data.diraction.direction = OB_DIRECTION_WEST;
+ (*a)->data.layer.layer = -1;
}
-void setup_action_top_layer(ObAction *a)
+void setup_action_move(ObAction **a, ObUserAction uact)
{
- a->data.layer.layer = 1;
+ (*a)->data.moveresize.move = TRUE;
+ (*a)->data.moveresize.keyboard =
+ (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+ uact == OB_USER_ACTION_MENU_SELECTION);
}
-void setup_action_normal_layer(ObAction *a)
+void setup_action_resize(ObAction **a, ObUserAction uact)
{
- a->data.layer.layer = 0;
+ (*a)->data.moveresize.move = FALSE;
+ (*a)->data.moveresize.keyboard =
+ (uact == OB_USER_ACTION_KEYBOARD_KEY ||
+ uact == OB_USER_ACTION_MENU_SELECTION);
}
-void setup_action_bottom_layer(ObAction *a)
+void setup_action_showmenu(ObAction **a, ObUserAction uact)
{
- a->data.layer.layer = -1;
+ /* 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);
+ a = NULL;
+ }
}
ActionString actionstrings[] =
{
"activate",
action_activate,
- NULL,
+ NULL
},
{
"focus",
action_focus,
- NULL,
+ NULL
},
{
"unfocus",
action_toggle_decorations,
NULL
},
- {
- "keyboardmove",
- action_moveresize,
- setup_action_move_keyboard
- },
{
"move",
action_moveresize,
action_moveresize,
setup_action_resize
},
- {
- "keyboardresize",
- action_moveresize,
- setup_action_resize_keyboard
- },
{
"toggleshowdesktop",
action_toggle_show_desktop,
action_unshow_desktop,
NULL
},
+ {
+ "desktoplast",
+ action_desktop_last,
+ NULL
+ },
+ {
+ "reconfigure",
+ action_reconfigure,
+ NULL
+ },
{
"restart",
action_restart,
{
"showmenu",
action_showmenu,
- NULL
+ setup_action_showmenu
},
{
"sendtotoplayer",
action_toggle_layer,
setup_action_bottom_layer
},
- {
- "nextwindowlinear",
- action_cycle_windows,
- setup_action_cycle_windows_linear_next
- },
- {
- "previouswindowlinear",
- action_cycle_windows,
- setup_action_cycle_windows_linear_previous
- },
{
"nextwindow",
action_cycle_windows,
}
};
-ObAction *action_from_string(char *name)
+ObAction *action_from_string(char *name, ObUserAction uact)
{
ObAction *a = NULL;
+ gboolean exist = FALSE;
int i;
for (i = 0; actionstrings[i].name; i++)
if (!g_ascii_strcasecmp(name, actionstrings[i].name)) {
- a = action_new(actionstrings[i].func);
+ exist = TRUE;
+ a = action_new(actionstrings[i].func, uact);
if (actionstrings[i].setup)
- actionstrings[i].setup(a);
+ actionstrings[i].setup(&a, uact);
break;
}
+ if (!exist)
+ g_warning("Invalid action '%s' requested. No such action exists.",
+ name);
+ if (!a)
+ g_warning("Invalid use of action '%s'. Action will be ignored.", name);
return a;
}
-ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+ ObUserAction uact)
{
char *actname;
ObAction *act = NULL;
xmlNodePtr n;
if (parse_attr_string("name", node, &actname)) {
- if ((act = action_from_string(actname))) {
+ if ((act = action_from_string(actname, uact))) {
if (act->func == action_execute || act->func == action_restart) {
- if ((n = parse_find_node("execute", node->xmlChildrenNode)))
- act->data.execute.path = parse_string(doc, n);
+ if ((n = parse_find_node("execute", node->xmlChildrenNode))) {
+ gchar *s = parse_string(doc, n);
+ act->data.execute.path = ob_expand_tilde(s);
+ g_free(s);
+ }
} else if (act->func == action_showmenu) {
if ((n = parse_find_node("menu", node->xmlChildrenNode)))
act->data.showmenu.name = parse_string(doc, n);
+ } else if (act->func == action_move_relative_horz ||
+ act->func == action_move_relative_vert ||
+ act->func == action_resize_relative_horz ||
+ act->func == action_resize_relative_vert) {
+ if ((n = parse_find_node("delta", node->xmlChildrenNode)))
+ act->data.relative.delta = parse_int(doc, n);
} else if (act->func == action_desktop) {
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--;
- } else if (act->func == action_send_to_desktop) {
+ } else if (act->func == action_send_to_desktop) {
if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
act->data.sendto.desk = parse_int(doc, n);
if (act->data.sendto.desk > 0) act->data.sendto.desk--;
- } else if (act->func == action_move_relative_horz ||
- act->func == action_move_relative_vert ||
- act->func == action_resize_relative_horz ||
- act->func == action_resize_relative_vert) {
- if ((n = parse_find_node("delta", node->xmlChildrenNode)))
- act->data.relative.delta = parse_int(doc, n);
+ if ((n = parse_find_node("follow", node->xmlChildrenNode)))
+ act->data.sendto.follow = parse_bool(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("wrap", node->xmlChildrenNode)))
+ act->data.desktopdir.wrap = 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);
} 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);
}
}
g_free(actname);
return act;
}
+void action_run_full(ObAction *a, struct _ObClient *c,
+ ObFrameContext context,
+ guint state, guint button, gint x, gint y,
+ gboolean cancel, gboolean done)
+{
+ if (x < 0 && y < 0)
+ screen_pointer_pos(&x, &y);
+
+ a->data.any.c = c;
+ a->data.any.x = x;
+ a->data.any.y = y;
+
+ 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, context, a);
+ }
+
+ a->func(&a->data);
+}
+
void action_execute(union ActionData *data)
{
GError *e = NULL;
void action_activate(union ActionData *data)
{
- if (data->activate.c)
- client_activate(data->activate.c, data->activate.here);
+ if (data->activate.any.c)
+ client_activate(data->activate.any.c, data->activate.here);
}
void action_focus(union ActionData *data)
{
- if (data->client.c)
- client_focus(data->client.c);
+ if (data->client.any.c)
+ client_focus(data->client.any.c);
}
void action_unfocus (union ActionData *data)
{
- if (data->client.c)
- client_unfocus(data->client.c);
+ if (data->client.any.c)
+ client_unfocus(data->client.any.c);
}
void action_iconify(union ActionData *data)
{
- if (data->client.c)
- client_iconify(data->client.c, TRUE, TRUE);
+ if (data->client.any.c)
+ client_iconify(data->client.any.c, TRUE, TRUE);
}
void action_raiselower(union ActionData *data)
{
- ObClient *c = data->client.c;
+ ObClient *c = data->client.any.c;
GList *it;
gboolean raise = FALSE;
ObClient *cit = it->data;
if (cit == c) break;
- if (client_normal(cit) == client_normal(c) && cit->layer == c->layer) {
+ if (client_normal(cit) == client_normal(c) &&
+ cit->layer == c->layer &&
+ cit->frame->visible)
+ {
if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
raise = TRUE;
break;
void action_raise(union ActionData *data)
{
- if (data->client.c)
- stacking_raise(CLIENT_AS_WINDOW(data->client.c));
+ if (data->client.any.c)
+ stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
}
void action_unshaderaise(union ActionData *data)
{
- if (data->client.c) {
- if (data->client.c->shaded)
- client_shade(data->client.c, FALSE);
+ if (data->client.any.c) {
+ if (data->client.any.c->shaded)
+ client_shade(data->client.any.c, FALSE);
else
- stacking_raise(CLIENT_AS_WINDOW(data->client.c));
+ stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
}
}
void action_shadelower(union ActionData *data)
{
- if (data->client.c) {
- if (data->client.c->shaded)
- stacking_lower(CLIENT_AS_WINDOW(data->client.c));
+ if (data->client.any.c) {
+ if (data->client.any.c->shaded)
+ stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
else
- client_shade(data->client.c, TRUE);
+ client_shade(data->client.any.c, TRUE);
}
}
void action_lower(union ActionData *data)
{
- if (data->client.c)
- stacking_lower(CLIENT_AS_WINDOW(data->client.c));
+ if (data->client.any.c)
+ stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
}
void action_close(union ActionData *data)
{
- if (data->client.c)
- client_close(data->client.c);
+ if (data->client.any.c)
+ client_close(data->client.any.c);
}
void action_kill(union ActionData *data)
{
- if (data->client.c)
- client_kill(data->client.c);
+ if (data->client.any.c)
+ client_kill(data->client.any.c);
}
void action_shade(union ActionData *data)
{
- if (data->client.c)
- client_shade(data->client.c, TRUE);
+ if (data->client.any.c)
+ client_shade(data->client.any.c, TRUE);
}
void action_unshade(union ActionData *data)
{
- if (data->client.c)
- client_shade(data->client.c, FALSE);
+ if (data->client.any.c)
+ client_shade(data->client.any.c, FALSE);
}
void action_toggle_shade(union ActionData *data)
{
- if (data->client.c)
- client_shade(data->client.c, !data->client.c->shaded);
+ if (data->client.any.c)
+ client_shade(data->client.any.c, !data->client.any.c->shaded);
}
void action_toggle_omnipresent(union ActionData *data)
{
- if (data->client.c)
- client_set_desktop(data->client.c,
- data->client.c->desktop == DESKTOP_ALL ?
+ if (data->client.any.c)
+ 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.c;
- if (c)
- client_configure(c, OB_CORNER_TOPLEFT,
- c->area.x + data->relative.delta, c->area.y,
- c->area.width, c->area.height, TRUE, TRUE);
+ ObClient *c = data->relative.any.c;
+ if (c) {
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+ client_move(c, c->area.x + data->relative.delta, c->area.y);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ }
}
void action_move_relative_vert(union ActionData *data)
{
- ObClient *c = data->relative.c;
- if (c)
- client_configure(c, OB_CORNER_TOPLEFT,
- c->area.x, c->area.y + data->relative.delta,
- c->area.width, c->area.height, TRUE, TRUE);
+ ObClient *c = data->relative.any.c;
+ if (c) {
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+ client_move(c, c->area.x, c->area.y + data->relative.delta);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ }
}
void action_resize_relative_horz(union ActionData *data)
{
- ObClient *c = data->relative.c;
- if (c)
- client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
- c->area.width +
- data->relative.delta * c->size_inc.width,
- c->area.height, TRUE, TRUE);
+ ObClient *c = data->relative.any.c;
+ if (c) {
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+ client_resize(c,
+ c->area.width + data->relative.delta * c->size_inc.width,
+ c->area.height);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ }
}
void action_resize_relative_vert(union ActionData *data)
{
- ObClient *c = data->relative.c;
- if (c && !c->shaded)
- client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
- c->area.width, c->area.height +
- data->relative.delta * c->size_inc.height,
- TRUE, TRUE);
+ ObClient *c = data->relative.any.c;
+ if (c && !c->shaded) {
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+ client_resize(c, c->area.width, c->area.height +
+ data->relative.delta * c->size_inc.height);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
+ }
}
void action_maximize_full(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, TRUE, 0, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, TRUE, 0, TRUE);
}
void action_unmaximize_full(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, FALSE, 0, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, FALSE, 0, TRUE);
}
void action_toggle_maximize_full(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c,
- !(data->client.c->max_horz ||
- data->client.c->max_vert),
+ if (data->client.any.c)
+ client_maximize(data->client.any.c,
+ !(data->client.any.c->max_horz ||
+ data->client.any.c->max_vert),
0, TRUE);
}
void action_maximize_horz(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, TRUE, 1, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, TRUE, 1, TRUE);
}
void action_unmaximize_horz(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, FALSE, 1, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, FALSE, 1, TRUE);
}
void action_toggle_maximize_horz(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c,
+ !data->client.any.c->max_horz, 1, TRUE);
}
void action_maximize_vert(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, TRUE, 2, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, TRUE, 2, TRUE);
}
void action_unmaximize_vert(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, FALSE, 2, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, FALSE, 2, TRUE);
}
void action_toggle_maximize_vert(union ActionData *data)
{
- if (data->client.c)
- client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE);
+ if (data->client.any.c)
+ client_maximize(data->client.any.c, !data->client.any.c->max_vert, 2, TRUE);
}
void action_send_to_desktop(union ActionData *data)
{
- ObClient *c = data->sendto.c;
+ ObClient *c = data->sendto.any.c;
if (!c || !client_normal(c)) return;
if (data->sendto.desk < screen_num_desktops ||
data->sendto.desk == DESKTOP_ALL) {
- client_set_desktop(c, data->sendto.desk, TRUE);
- screen_set_desktop(data->sendto.desk);
+ client_set_desktop(c, data->sendto.desk, data->sendto.follow);
+ if (data->sendto.follow)
+ screen_set_desktop(data->sendto.desk);
}
}
{
guint d;
- d = screen_cycle_desktop(data->desktopdir.dir, data->desktopdir.wrap,
+ d = screen_cycle_desktop(data->desktopdir.dir,
+ data->desktopdir.wrap,
data->sendtodir.linear,
- data->desktopdir.final, data->desktopdir.cancel);
+ data->desktopdir.inter.any.interactive,
+ data->desktopdir.inter.final,
+ data->desktopdir.inter.cancel);
screen_set_desktop(d);
}
void action_send_to_desktop_dir(union ActionData *data)
{
- ObClient *c = data->sendtodir.c;
+ ObClient *c = data->sendtodir.inter.any.c;
guint d;
if (!c || !client_normal(c)) return;
d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap,
data->sendtodir.linear,
- data->sendtodir.final, data->sendtodir.cancel);
- client_set_desktop(c, d, TRUE);
- screen_set_desktop(d);
-}
-
-#if 0
-void action_desktop_right(union ActionData *data)
-{
- guint r, c, d;
-
- cur_row_col(&r, &c);
- ++c;
- if (c >= screen_desktop_layout.columns) {
- if (!data->desktopdir.wrap) return;
- c = 0;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->desktopdir.wrap) return;
- ++c;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
-}
-
-void action_send_to_desktop_right(union ActionData *data)
-{
- ObClient *cl = data->sendto.c;
- guint r, c, d;
-
- if (!cl || !client_normal(cl)) return;
-
- cur_row_col(&r, &c);
- ++c;
- if (c >= screen_desktop_layout.columns) {
- if (!data->sendtodir.wrap) return;
- c = 0;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->sendtodir.wrap) return;
- ++c;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops) {
- client_set_desktop(cl, d, data->sendtodir.follow);
- if (data->sendtodir.follow)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
- }
+ 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_left(union ActionData *data)
+void action_desktop_last(union ActionData *data)
{
- guint r, c, d;
-
- cur_row_col(&r, &c);
- --c;
- if (c >= screen_desktop_layout.columns) {
- if (!data->desktopdir.wrap) return;
- c = screen_desktop_layout.columns - 1;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->desktopdir.wrap) return;
- --c;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
+ screen_set_desktop(screen_last_desktop);
}
-void action_send_to_desktop_left(union ActionData *data)
+void action_toggle_decorations(union ActionData *data)
{
- ObClient *cl = data->sendto.c;
- guint r, c, d;
-
- if (!cl || !client_normal(cl)) return;
-
- cur_row_col(&r, &c);
- --c;
- if (c >= screen_desktop_layout.columns) {
- if (!data->sendtodir.wrap) return;
- c = screen_desktop_layout.columns - 1;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->sendtodir.wrap) return;
- --c;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops) {
- client_set_desktop(cl, d, data->sendtodir.follow);
- if (data->sendtodir.follow)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
- }
-}
+ ObClient *c = data->client.any.c;
-void action_desktop_down(union ActionData *data)
-{
- guint r, c, d;
+ if (!c) return;
- cur_row_col(&r, &c);
- ++r;
- if (r >= screen_desktop_layout.rows) {
- if (!data->desktopdir.wrap) return;
- r = 0;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->desktopdir.wrap) return;
- ++r;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
+ c->decorate = !c->decorate;
+ client_setup_decor_and_functions(c);
}
-void action_send_to_desktop_down(union ActionData *data)
+static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch)
{
- guint r, c, d;
-
- if (data->sendtodir.c) {
- cur_row_col(&r, &c);
- ++r;
- if (r >= screen_desktop_layout.rows) {
- if (!data->sendtodir.wrap) return;
- r = 0;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->sendtodir.wrap) return;
- ++r;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops) {
- client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
- if (data->sendtodir.follow)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
- }
+ if (x - cx > cw / 2) {
+ if (y - cy > ch / 2)
+ return prop_atoms.net_wm_moveresize_size_bottomright;
+ else
+ return prop_atoms.net_wm_moveresize_size_topright;
+ } else {
+ if (y - cy > ch / 2)
+ return prop_atoms.net_wm_moveresize_size_bottomleft;
+ else
+ return prop_atoms.net_wm_moveresize_size_topleft;
}
}
-void action_desktop_up(union ActionData *data)
+void action_moveresize(union ActionData *data)
{
- guint r, c, d;
-
- cur_row_col(&r, &c);
- --r;
- if (r >= screen_desktop_layout.rows) {
- if (!data->desktopdir.wrap) return;
- r = screen_desktop_layout.rows - 1;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->desktopdir.wrap) return;
- --r;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
-}
+ ObClient *c = data->moveresize.any.c;
+ guint32 corner;
-void action_send_to_desktop_up(union ActionData *data)
-{
- guint r, c, d;
+ if (!c || !client_normal(c)) return;
- if (data->sendtodir.c) {
- cur_row_col(&r, &c);
- --r;
- if (r >= screen_desktop_layout.rows) {
- if (!data->sendtodir.wrap) return;
- r = screen_desktop_layout.rows - 1;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->sendtodir.wrap) return;
- --r;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops) {
- client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
- if (data->sendtodir.follow)
- screen_cycle_desktop(d, data->desktopdir.final,
- data->desktopdir.cancel);
- }
+ if (data->moveresize.keyboard) {
+ corner = (data->moveresize.move ?
+ prop_atoms.net_wm_moveresize_move_keyboard :
+ prop_atoms.net_wm_moveresize_size_keyboard);
+ } else {
+ corner = (data->moveresize.move ?
+ prop_atoms.net_wm_moveresize_move :
+ pick_corner(data->any.x, data->any.y,
+ c->frame->area.x, c->frame->area.y,
+ /* use the client size because the frame
+ can be differently sized (shaded
+ windows) and we want this based on the
+ clients size */
+ c->area.width + c->frame->size.left +
+ c->frame->size.right,
+ c->area.height + c->frame->size.top +
+ c->frame->size.bottom));
}
-}
-#endif
-
-void action_toggle_decorations(union ActionData *data)
-{
- ObClient *c = data->client.c;;
- if (!c) return;
-
- c->decorate = !c->decorate;
- client_setup_decor_and_functions(c);
+ moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
}
-void action_moveresize(union ActionData *data)
+void action_reconfigure(union ActionData *data)
{
- ObClient *c = data->moveresize.c;
-
- if (!c || !client_normal(c)) return;
-
- moveresize_start(c, data->moveresize.x, data->moveresize.y,
- data->moveresize.button, data->moveresize.corner);
+ ob_reconfigure();
}
void action_restart(union ActionData *data)
void action_showmenu(union ActionData *data)
{
if (data->showmenu.name) {
- menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y,
- data->showmenu.c);
+ menu_show(data->showmenu.name, data->any.x, data->any.y,
+ data->showmenu.any.c);
}
}
void action_cycle_windows(union ActionData *data)
{
- ObClient *c;
-
- c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
- data->cycle.cancel);
+ focus_cycle(data->cycle.forward, data->cycle.linear,
+ data->cycle.inter.any.interactive,
+ data->cycle.inter.final, data->cycle.inter.cancel);
}
void action_directional_focus(union ActionData *data)
{
- ObClient *nf;
-
- if (!data->diraction.c)
- return;
- if ((nf = client_find_directional(data->diraction.c,
- data->diraction.direction)))
- client_activate(nf, FALSE);
+ focus_directional_cycle(data->interdiraction.direction,
+ data->interdiraction.inter.any.interactive,
+ data->interdiraction.inter.final,
+ data->interdiraction.inter.cancel);
}
void action_movetoedge(union ActionData *data)
{
int x, y;
- ObClient *c = data->diraction.c;
+ ObClient *c = data->diraction.any.c;
if (!c)
return;
g_assert_not_reached();
}
frame_frame_gravity(c->frame, &x, &y);
- client_configure(c, OB_CORNER_TOPLEFT,
- x, y, c->area.width, c->area.height, TRUE, TRUE);
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+ client_move(c, x, y);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
}
void action_growtoedge(union ActionData *data)
{
int x, y, width, height, dest;
- ObClient *c = data->diraction.c;
+ ObClient *c = data->diraction.any.c;
Rect *a = screen_area(c->desktop);
if (!c)
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;
- client_configure(c, OB_CORNER_TOPLEFT, x, y, width, height, TRUE, TRUE);
+ grab_pointer(TRUE, OB_CURSOR_NONE);
+ client_move_resize(c, x, y, width, height);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
}
void action_send_to_layer(union ActionData *data)
{
- if (data->layer.c)
- client_set_layer(data->layer.c, data->layer.layer);
+ if (data->layer.any.c)
+ client_set_layer(data->layer.any.c, data->layer.layer);
}
void action_toggle_layer(union ActionData *data)
{
- ObClient *c = data->layer.c;
+ ObClient *c = data->layer.any.c;
if (c) {
if (data->layer.layer < 0)
projects / chaz / openbox / blobdiff