#include "screen.h"
#include "action.h"
#include "openbox.h"
+#include "grab.h"
#include <glib.h>
action_desktop_last,
NULL
},
+ {
+ "reconfigure",
+ action_reconfigure,
+ NULL
+ },
{
"restart",
action_restart,
actionstrings[i].setup(a);
break;
}
+ if (!a)
+ g_warning("Invalid action '%s' requested. No such action exists.",
+ name);
return a;
}
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);
void action_move_relative_horz(union ActionData *data)
{
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);
+ 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.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);
+ 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.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);
+ 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.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);
+ 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)
data->moveresize.button, data->moveresize.corner);
}
+void action_reconfigure(union ActionData *data)
+{
+ ob_reconfigure();
+}
+
void action_restart(union ActionData *data)
{
ob_restart_other(data->execute.path);
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);
}
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)