#include "openbox/client.h"
#include "openbox/screen.h"
#include "openbox/frame.h"
-#include <stdlib.h> /* for atoi */
+#include "openbox/config.h"
enum {
CURRENT_MONITOR = -1,
- ALL_MONITORS = -2
+ ALL_MONITORS = -2,
+ NEXT_MONITOR = -3,
+ PREV_MONITOR = -4
};
typedef struct {
- gboolean xcenter;
- gboolean ycenter;
- gboolean xopposite;
- gboolean yopposite;
- gint x;
- gint y;
+ GravityCoord x;
+ GravityCoord y;
gint w;
+ gint w_denom;
gint h;
+ gint h_denom;
gint monitor;
+ gboolean w_sets_client_size;
+ gboolean h_sets_client_size;
} Options;
static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
static gboolean run_func(ObActionsData *data, gpointer options);
+/* 3.4-compatibility */
+static gpointer setup_center_func(xmlNodePtr node);
void action_moveresizeto_startup(void)
{
- actions_register("MoveResizeTo", setup_func, g_free, run_func, NULL, NULL);
-}
-
-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);
+ actions_register("MoveResizeTo", setup_func, free_func, run_func);
+ /* 3.4-compatibility */
+ actions_register("MoveToCenter", setup_center_func, free_func, run_func);
}
static gpointer setup_func(xmlNodePtr node)
xmlNodePtr n;
Options *o;
- o = g_new0(Options, 1);
- o->x = G_MININT;
- o->y = G_MININT;
+ o = g_slice_new0(Options);
+ o->x.pos = G_MININT;
+ o->y.pos = G_MININT;
o->w = G_MININT;
o->h = G_MININT;
o->monitor = CURRENT_MONITOR;
- if ((n = obt_parse_find_node(node, "x")))
- parse_coord(n, &o->x, &o->xopposite, &o->xcenter);
+ if ((n = obt_xml_find_node(node, "x")))
+ config_parse_gravity_coord(n, &o->x);
- if ((n = obt_parse_find_node(node, "y")))
- parse_coord(n, &o->y, &o->yopposite, &o->ycenter);
+ if ((n = obt_xml_find_node(node, "y")))
+ config_parse_gravity_coord(n, &o->y);
- if ((n = obt_parse_find_node(node, "width"))) {
- gchar *s = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "width"))) {
+ gchar *s = obt_xml_node_string(n);
if (g_ascii_strcasecmp(s, "current") != 0)
- o->w = obt_parse_node_int(n);
+ config_parse_relative_number(s, &o->w, &o->w_denom);
g_free(s);
+
+ obt_xml_attr_bool(n, "client", &o->w_sets_client_size);
}
- if ((n = obt_parse_find_node(node, "height"))) {
- gchar *s = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "height"))) {
+ gchar *s = obt_xml_node_string(n);
if (g_ascii_strcasecmp(s, "current") != 0)
- o->h = obt_parse_node_int(n);
+ config_parse_relative_number(s, &o->h, &o->h_denom);
g_free(s);
+
+ obt_xml_attr_bool(n, "client", &o->h_sets_client_size);
}
- if ((n = obt_parse_find_node(node, "monitor"))) {
- gchar *s = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "monitor"))) {
+ gchar *s = obt_xml_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->monitor = obt_parse_node_int(n) - 1;
+ o->monitor = obt_xml_node_int(n) - 1;
}
g_free(s);
}
return o;
}
+static void free_func(gpointer o)
+{
+ g_slice_free(Options, 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 == CURRENT_MONITOR) mon = cmon;
- else if (mon == ALL_MONITORS) mon = SCREEN_AREA_ALL_MONITORS;
+ 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);
+ /* find a target size for the client/frame. */
w = o->w;
- if (w == G_MININT) w = c->area.width;
+ if (w == G_MININT) {
+ if (o->w_sets_client_size)
+ w = c->area.width;
+ else
+ w = c->frame->area.width;
+ }
+ else if (o->w_denom) w = (w * area->width) / o->w_denom;
h = o->h;
- if (h == G_MININT) h = c->area.height;
+ if (h == G_MININT) {
+ if (o->w_sets_client_size)
+ h = c->area.height;
+ else
+ h = c->frame->area.height;
+ }
+ else if (o->h_denom) h = (h * area->height) / o->h_denom;
+
+ /* get back to the client's size. */
+ if (!o->w_sets_client_size)
+ w -= c->frame->size.left + c->frame->size.right;
+ if (!o->h_sets_client_size)
+ h -= c->frame->size.top + c->frame->size.bottom;
/* it might not be able to resize how they requested, so find out what
it will actually be resized to */
w += c->frame->size.left + c->frame->size.right;
h += c->frame->size.top + c->frame->size.bottom;
- x = o->x;
- if (o->xcenter) x = (area->width - w) / 2;
+ x = o->x.pos;
+ if (o->x.denom)
+ x = (x * area->width) / o->x.denom;
+ if (o->x.center) 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->x.opposite) x = area->width - w - x;
x += area->x;
- y = o->y;
- if (o->ycenter) y = (area->height - h) / 2;
+ y = o->y.pos;
+ if (o->y.denom)
+ y = (y * area->height) / o->y.denom;
+ if (o->y.center) 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->y.opposite) y = area->height - h - y;
y += area->y;
/* get the client's size back */
client_configure(c, x, y, w, h, TRUE, TRUE, FALSE);
actions_client_move(data, FALSE);
- g_free(area);
- g_free(carea);
+ g_slice_free(Rect, area);
+ g_slice_free(Rect, carea);
}
return FALSE;
}
+
+/* 3.4-compatibility */
+static gpointer setup_center_func(xmlNodePtr node)
+{
+ Options *o;
+
+ o = g_slice_new0(Options);
+ o->x.pos = G_MININT;
+ o->y.pos = G_MININT;
+ o->w = G_MININT;
+ o->h = G_MININT;
+ o->monitor = -1;
+ o->x.center = TRUE;
+ o->y.center = TRUE;
+ return o;
+}
projects / dana / openbox.git / blobdiff