}
void setup_action_directional_focus_north(ObAction *a)
-{
- a->data.diraction.direction = OB_DIRECTION_NORTH;
+{
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_NORTH;
}
void setup_action_directional_focus_east(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_EAST;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_EAST;
}
void setup_action_directional_focus_south(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTH;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_SOUTH;
}
void setup_action_directional_focus_west(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_WEST;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_WEST;
}
void setup_action_directional_focus_northeast(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_NORTHEAST;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
}
void setup_action_directional_focus_southeast(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTHEAST;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
}
void setup_action_directional_focus_southwest(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_SOUTHWEST;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
}
void setup_action_directional_focus_northwest(ObAction *a)
{
- a->data.diraction.direction = OB_DIRECTION_NORTHWEST;
+ a->data.interdiraction.inter.any.interactive = TRUE;
+ a->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
}
void setup_action_send_to_desktop(ObAction *a)
action_unshow_desktop,
NULL
},
+ {
+ "desktoplast",
+ action_desktop_last,
+ NULL
+ },
{
"restart",
action_restart,
if (parse_attr_string("name", node, &actname)) {
if ((act = action_from_string(actname))) {
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);
if ((n = parse_find_node("here", node->xmlChildrenNode)))
act->data.activate.here = parse_bool(doc, n);
}
-
- if (act->data.any.interactive) {
- if ((n = parse_find_node("interactive",node->xmlChildrenNode)))
- act->data.any.interactive = parse_bool(doc, n);
- }
}
g_free(actname);
}
{
ObClient *c = data->relative.any.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);
+ client_move(c, c->area.x + data->relative.delta, c->area.y);
}
void action_move_relative_vert(union ActionData *data)
{
ObClient *c = data->relative.any.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);
+ client_move(c, c->area.x, c->area.y + data->relative.delta);
}
void action_resize_relative_horz(union ActionData *data)
{
ObClient *c = data->relative.any.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);
+ client_resize(c,
+ c->area.width + data->relative.delta * c->size_inc.width,
+ c->area.height);
}
void action_resize_relative_vert(union ActionData *data)
{
ObClient *c = data->relative.any.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);
+ client_resize(c, c->area.width, c->area.height +
+ data->relative.delta * c->size_inc.height);
}
void action_maximize_full(union ActionData *data)
screen_set_desktop(d);
}
+void action_desktop_last(union ActionData *data)
+{
+ screen_set_desktop(screen_last_desktop);
+}
+
void action_toggle_decorations(union ActionData *data)
{
ObClient *c = data->client.any.c;
void action_cycle_windows(union ActionData *data)
{
- ObClient *c;
-
- c = focus_cycle(data->cycle.forward, data->cycle.linear,
- data->cycle.inter.any.interactive,
- data->cycle.inter.final, data->cycle.inter.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.any.c)
- return;
- if ((nf = client_find_directional(data->diraction.any.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)
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);
+ client_move(c, x, 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;
- client_configure(c, OB_CORNER_TOPLEFT, x, y, width, height, TRUE, TRUE);
+ client_move(c, x, y);
}
void action_send_to_layer(union ActionData *data)