X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fresist.c;h=dc4e2d7051dea248fa92d243405b2b7c3d2ddfe8;hb=096dad0c6c027100494ede811b33cb8558d32e25;hp=62c2b293f0b9fe1879df403e0c5db067c24c15ca;hpb=9ee03ecd279e8f1c3ad56ec8c71f597eb1a588c3;p=chaz%2Fopenbox

diff --git a/openbox/resist.c b/openbox/resist.c
index 62c2b293..dc4e2d70 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -17,13 +17,13 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
+#include "resist.h"
 #include "client.h"
 #include "frame.h"
 #include "stacking.h"
 #include "screen.h"
 #include "dock.h"
 #include "config.h"
-#include "parser/parse.h"
 
 #include <glib.h>
 
@@ -161,7 +161,8 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
     cr = RECT_RIGHT(c->frame->area);
     cb = RECT_BOTTOM(c->frame->area);
 
-    RECT_SET(desired_area, *x, *y, c->area.width, c->area.height);
+    RECT_SET(desired_area, c->frame->area.x, c->frame->area.y,
+             c->frame->area.width, c->frame->area.height);
 
     for (i = 0; i < screen_num_monitors; ++i) {
         parea = screen_physical_area_monitor(i);
@@ -328,7 +329,6 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
     Rect *area, *parea;
     gint al, at, ar, ab; /* screen boundaries */
     gint pl, pt, pr, pb; /* physical screen boundaries */
-    gint incw, inch;
     guint i;
     Rect desired_area;
 
@@ -339,9 +339,6 @@ void resist_size_monitors(ObClient *c, gint resist, gint *w, gint *h,
     t = RECT_TOP(c->frame->area);
     b = RECT_BOTTOM(c->frame->area);
 
-    incw = c->size_inc.width;
-    inch = c->size_inc.height;
-
     RECT_SET(desired_area, c->area.x, c->area.y, *w, *h);
 
     for (i = 0; i < screen_num_monitors; ++i) {