#include "openbox/client.h"
#include "openbox/screen.h"
#include "openbox/frame.h"
-#include <stdlib.h> /* for atoi */
+#include "openbox/config.h"
typedef struct {
gint x;
+ gint x_denom;
gint y;
+ gint y_denom;
} Options;
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static void free_func(gpointer options);
+static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
static gboolean run_func(ObActionsData *data, gpointer options);
-void action_moverelative_startup()
+void action_moverelative_startup(void)
{
- actions_register("MoveRelative",
- setup_func,
- free_func,
- run_func,
- NULL, NULL);
+ actions_register("MoveRelative", setup_func, free_func, run_func);
}
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
+ gchar *s;
- o = g_new0(Options, 1);
+ o = g_slice_new0(Options);
- if ((n = parse_find_node("x", node)))
- o->x = parse_int(doc, n);
- if ((n = parse_find_node("y", node)))
- o->y = parse_int(doc, n);
+ if ((n = obt_xml_find_node(node, "x"))) {
+ s = obt_xml_node_string(n);
+ config_parse_relative_number(s, &o->x, &o->x_denom);
+ g_free(s);
+ }
+ if ((n = obt_xml_find_node(node, "y"))) {
+ s = obt_xml_node_string(n);
+ config_parse_relative_number(s, &o->y, &o->y_denom);
+ g_free(s);
+ }
return o;
}
-static void free_func(gpointer options)
+static void free_func(gpointer o)
{
- Options *o = options;
-
- g_free(o);
+ g_slice_free(Options, o);
}
/* Always return FALSE because its not interactive */
gint x, y, lw, lh, w, h;
c = data->client;
- x = data->client->area.x + o->x;
- y = data->client->area.y + o->y;
- w = data->client->area.width;
- h = data->client->area.height;
- client_try_configure(data->client, &x, &y, &w, &h, &lw, &lh, TRUE);
- client_find_onscreen(data->client, &x, &y, w, h, FALSE);
+ x = o->x;
+ y = o->y;
+ if (o->x_denom || o->y_denom) {
+ const Rect *carea;
+
+ carea = screen_area(c->desktop, client_monitor(c), NULL);
+ if (o->x_denom)
+ x = (x * carea->width) / o->x_denom;
+ if (o->y_denom)
+ y = (y * carea->height) / o->y_denom;
+ }
+ x = c->area.x + x;
+ y = c->area.y + y;
+ w = c->area.width;
+ h = c->area.height;
+ client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);
+ client_find_onscreen(c, &x, &y, w, h, FALSE);
- client_configure(data->client, x, y, w, h, TRUE, TRUE, FALSE);
+ actions_client_move(data, TRUE);
+ client_configure(c, x, y, w, h, TRUE, TRUE, FALSE);
+ actions_client_move(data, FALSE);
}
return FALSE;