#include "openbox/frame.h"
#include <stdlib.h> /* for atoi */
+enum {
+ CURRENT_MONITOR = -1,
+ ALL_MONITORS = -2
+};
+
typedef struct {
gboolean xcenter;
gboolean ycenter;
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_moveto_startup()
+void action_moveresizeto_startup()
{
- actions_register("MoveTo",
+ actions_register("MoveResizeTo",
setup_func,
free_func,
run_func,
NULL, NULL);
}
+static void parse_coord(xmlDocPtr doc, xmlNodePtr n, gint *pos,
+ gboolean *opposite, gboolean *center)
+{
+ gchar *s = parse_string(doc, n);
+ if (g_ascii_strcasecmp(s, "current") != 0) {
+ if (!g_ascii_strcasecmp(s, "center"))
+ *center = TRUE;
+ else {
+ if (s[0] == '-')
+ *opposite = TRUE;
+ if (s[0] == '-' || s[0] == '+')
+ *pos = atoi(s+1);
+ else
+ *pos = atoi(s);
+ }
+ }
+ g_free(s);
+}
+
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
xmlNodePtr n;
o->y = G_MININT;
o->w = G_MININT;
o->h = G_MININT;
- o->monitor = -1;
+ o->monitor = CURRENT_MONITOR;
- if ((n = parse_find_node("x", node))) {
+ if ((n = parse_find_node("x", node)))
+ parse_coord(doc, n, &o->x, &o->xopposite, &o->xcenter);
+
+ if ((n = parse_find_node("y", node)))
+ parse_coord(doc, n, &o->y, &o->yopposite, &o->ycenter);
+
+ if ((n = parse_find_node("width", node))) {
gchar *s = parse_string(doc, n);
- if (!g_ascii_strcasecmp(s, "center"))
- o->xcenter = TRUE;
- else {
- if (s[0] == '-')
- o->xopposite = TRUE;
- if (s[0] == '-' || s[0] == '+')
- o->x = atoi(s+1);
- else
- o->x = atoi(s);
- }
+ if (g_ascii_strcasecmp(s, "current") != 0)
+ o->w = parse_int(doc, n);
+ g_free(s);
+ }
+ if ((n = parse_find_node("height", node))) {
+ gchar *s = parse_string(doc, n);
+ if (g_ascii_strcasecmp(s, "current") != 0)
+ o->h = parse_int(doc, n);
g_free(s);
}
- if ((n = parse_find_node("y", node))) {
+ if ((n = parse_find_node("monitor", node))) {
gchar *s = parse_string(doc, n);
- if (!g_ascii_strcasecmp(s, "center"))
- o->ycenter = TRUE;
- else {
- if (s[0] == '-')
- o->yopposite = TRUE;
- if (s[0] == '-' || s[0] == '+')
- o->y = atoi(s+1);
+ if (g_ascii_strcasecmp(s, "current") != 0) {
+ if (!g_ascii_strcasecmp(s, "all"))
+ o->monitor = ALL_MONITORS;
else
- o->y = atoi(s);
+ o->monitor = parse_int(doc, n) - 1;
}
g_free(s);
}
- if ((n = parse_find_node("width", node)))
- o->w = parse_int(doc, n) - 1;
- if ((n = parse_find_node("height", node)))
- o->h = parse_int(doc, n) - 1;
-
- if ((n = parse_find_node("monitor", node)))
- o->monitor = parse_int(doc, n) - 1;
-
return o;
}
c = data->client;
mon = o->monitor;
cmon = client_monitor(c);
- if (mon < 0) mon = cmon;
+ if (mon == CURRENT_MONITOR) mon = cmon;
+ else if (mon == ALL_MONITORS) mon = SCREEN_AREA_ALL_MONITORS;
area = screen_area(c->desktop, mon, NULL);
carea = screen_area(c->desktop, cmon, NULL);
/* get the client's size back */
w -= c->frame->size.left + c->frame->size.right;
- h -= c->frame->size.top + c->frame->size.bottom;
+ h -= c->frame->size.top + c->frame->size.bottom;
frame_frame_gravity(c->frame, &x, &y); /* get the client coords */
client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);