nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

you can use -'s for opposite sides of the screen in moveto

Browse source
This commit is contained in:
Dana Jansens 2007-07-11 19:50:47 +00:00
parent e5aee030e5
commit 9320558ae9
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
openbox/actions/moveto.c
View file

@ -7,6 +7,8 @@
typedef struct { typedef struct {
gboolean xcenter; gboolean xcenter;
gboolean ycenter; gboolean ycenter;
gboolean xopposite;
gboolean yopposite;
gint x; gint x;
gint y; gint y;
gint monitor; gint monitor;
@ -39,8 +41,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
gchar *s = parse_string(doc, n); gchar *s = parse_string(doc, n);
if (!g_ascii_strcasecmp(s, "center")) if (!g_ascii_strcasecmp(s, "center"))
o->xcenter = TRUE; o->xcenter = TRUE;
else else {
o->x = atoi(s); if (s[0] == '-')
o->xopposite = TRUE;
if (s[0] == '-' || s[0] == '+')
o->x = atoi(s+1);
else
o->x = atoi(s);
}
g_free(s); g_free(s);
} }
@ -48,8 +56,14 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
gchar *s = parse_string(doc, n); gchar *s = parse_string(doc, n);
if (!g_ascii_strcasecmp(s, "center")) if (!g_ascii_strcasecmp(s, "center"))
o->ycenter = TRUE; o->ycenter = TRUE;
else else {
o->y = atoi(s); if (s[0] == '-')
o->yopposite = TRUE;
if (s[0] == '-' || s[0] == '+')
o->y = atoi(s+1);
else
o->y = atoi(s);
}
g_free(s); g_free(s);
} }
@ -83,14 +97,19 @@ static gboolean run_func(ObActionsData *data, gpointer options)
if (mon < 0) mon = cmon; if (mon < 0) mon = cmon;
area = screen_area(c->desktop, mon, NULL); area = screen_area(c->desktop, mon, NULL);
carea = screen_area(c->desktop, cmon, NULL); carea = screen_area(c->desktop, cmon, NULL);
x = o->x; x = o->x;
if (x == G_MININT) x = c->frame->area.x - carea->x;
if (o->xcenter) x = (area->width - c->frame->area.width) / 2; if (o->xcenter) x = (area->width - c->frame->area.width) / 2;
else if (x == G_MININT) x = c->frame->area.x - carea->x;
else if (o->xopposite) x = area->width - c->frame->area.width;
x += area->x; x += area->x;
y = o->y; y = o->y;
if (y == G_MININT) y = c->frame->area.y - carea->y;
if (o->ycenter) y = (area->height - c->frame->area.height) / 2; if (o->ycenter) y = (area->height - c->frame->area.height) / 2;
else if (y == G_MININT) y = c->frame->area.y - carea->y;
else if (o->yopposite) y = area->height - c->frame->area.height;
y += area->y; y += area->y;
w = c->area.width; w = c->area.width;
h = c->area.height; h = c->area.height;