#include "openbox/frame.h"
#include <stdlib.h> /* for atoi */
+enum {
+ CURRENT_MONITOR = -1,
+ ALL_MONITORS = -2,
+ NEXT_MONITOR = -3,
+ PREV_MONITOR = -4
+};
+
typedef struct {
gboolean xcenter;
gboolean ycenter;
gint monitor;
} Options;
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static void free_func(gpointer options);
+static gpointer setup_func(xmlNodePtr node);
static gboolean run_func(ObActionsData *data, gpointer options);
+/* 3.4-compatibility */
+static gpointer setup_center_func(xmlNodePtr node);
-void action_moveto_startup()
+void action_moveresizeto_startup(void)
{
- actions_register("MoveTo",
- setup_func,
- free_func,
- run_func,
+ actions_register("MoveResizeTo", setup_func, g_free, run_func, NULL, NULL);
+/* 3.4-compatibility */
+ actions_register("MoveToCenter", setup_center_func, g_free, run_func,
NULL, NULL);
}
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static void parse_coord(xmlNodePtr n, gint *pos,
+ gboolean *opposite, gboolean *center)
+{
+ gchar *s = obt_parse_node_string(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(xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
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))) {
- 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 ((n = obt_parse_find_node(node, "x")))
+ parse_coord(n, &o->x, &o->xopposite, &o->xcenter);
+
+ if ((n = obt_parse_find_node(node, "y")))
+ parse_coord(n, &o->y, &o->yopposite, &o->ycenter);
+
+ if ((n = obt_parse_find_node(node, "width"))) {
+ gchar *s = obt_parse_node_string(n);
+ if (g_ascii_strcasecmp(s, "current") != 0)
+ o->w = obt_parse_node_int(n);
+ g_free(s);
+ }
+ if ((n = obt_parse_find_node(node, "height"))) {
+ gchar *s = obt_parse_node_string(n);
+ if (g_ascii_strcasecmp(s, "current") != 0)
+ o->h = obt_parse_node_int(n);
g_free(s);
}
- if ((n = parse_find_node("y", 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 ((n = obt_parse_find_node(node, "monitor"))) {
+ gchar *s = obt_parse_node_string(n);
+ if (g_ascii_strcasecmp(s, "current") != 0) {
+ if (!g_ascii_strcasecmp(s, "all"))
+ o->monitor = ALL_MONITORS;
+ else if(!g_ascii_strcasecmp(s, "next"))
+ o->monitor = NEXT_MONITOR;
+ else if(!g_ascii_strcasecmp(s, "prev"))
+ o->monitor = PREV_MONITOR;
else
- o->y = atoi(s);
+ o->monitor = obt_parse_node_int(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;
}
-static void free_func(gpointer options)
-{
- Options *o = options;
-
- g_free(o);
-}
-
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
if (data->client) {
Rect *area, *carea;
ObClient *c;
- gint mon, cmon;
+ guint mon, cmon;
gint x, y, lw, lh, w, h;
c = data->client;
mon = o->monitor;
cmon = client_monitor(c);
- if (mon < 0) mon = cmon;
+ switch (mon) {
+ case CURRENT_MONITOR:
+ mon = cmon; break;
+ case ALL_MONITORS:
+ mon = SCREEN_AREA_ALL_MONITORS; break;
+ case NEXT_MONITOR:
+ mon = (cmon + 1 > screen_num_monitors - 1) ? 0 : (cmon + 1); break;
+ case PREV_MONITOR:
+ mon = (cmon == 0) ? (screen_num_monitors - 1) : (cmon - 1); break;
+ default:
+ g_assert_not_reached();
+ }
+
area = screen_area(c->desktop, mon, NULL);
carea = screen_area(c->desktop, cmon, NULL);
x = o->x;
if (o->xcenter) x = (area->width - w) / 2;
else if (x == G_MININT) x = c->frame->area.x - carea->x;
- else if (o->xopposite) x = area->width - w;
+ else if (o->xopposite) x = area->width - w - x;
x += area->x;
y = o->y;
if (o->ycenter) y = (area->height - h) / 2;
else if (y == G_MININT) y = c->frame->area.y - carea->y;
- else if (o->yopposite) y = area->height - h;
+ else if (o->yopposite) y = area->height - h - y;
y += area->y;
/* 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);
return FALSE;
}
+
+/* 3.4-compatibility */
+static gpointer setup_center_func(xmlNodePtr node)
+{
+ Options *o;
+
+ o = g_new0(Options, 1);
+ o->x = G_MININT;
+ o->y = G_MININT;
+ o->w = G_MININT;
+ o->h = G_MININT;
+ o->monitor = -1;
+ o->xcenter = TRUE;
+ o->ycenter = TRUE;
+ return o;
+}