X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmoveresizeto.c;h=3ee3498a4cc3122c1c6dd054ff9ba918717ff6d9;hb=308478e4a5f4dc76d69395dda8a9bc42cb69eec4;hp=d355dafdc5c30ea0535c1b239a2a62275899e364;hpb=db49122dece88956856606fe4c17158859f81837;p=chaz%2Fopenbox

diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index d355dafd..3ee3498a 100644
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -6,7 +6,9 @@
 
 enum {
     CURRENT_MONITOR = -1,
-    ALL_MONITORS = -2
+    ALL_MONITORS = -2,
+    NEXT_MONITOR = -3,
+    PREV_MONITOR = -4
 };
 
 typedef struct {
@@ -84,6 +86,10 @@ static gpointer setup_func(xmlNodePtr node)
         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;
         }
@@ -109,6 +115,9 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         cmon = client_monitor(c);
         if (mon == CURRENT_MONITOR) mon = cmon;
         else if (mon == ALL_MONITORS) mon = SCREEN_AREA_ALL_MONITORS;
+        else if (mon == NEXT_MONITOR) mon = (cmon + 1 > screen_num_monitors - 1) ? 0 : (cmon + 1);
+        else if (mon == PREV_MONITOR) mon = (cmon == 0) ? (screen_num_monitors - 1) : (cmon - 1);
+
         area = screen_area(c->desktop, mon, NULL);
         carea = screen_area(c->desktop, cmon, NULL);
 
@@ -131,13 +140,13 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         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 */