more testing

2 files changed, 4 insertions, 7 deletions

diff --git a/openbox/client.c b/openbox/client.c
index 03789466..0386d23d 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -603,7 +603,8 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
     /* XXX watch for xinerama dead areas */
     /* This makes sure windows aren't entirely outside of the screen so you
      * can't see them at all */
-    a = screen_area(self->desktop);
+    //a = screen_area(self->desktop);
+    a = screen_physical_area_monitor(client_monitor(self));
     if (client_normal(self)) {
         if (!self->strut.right && *x >= a->x + a->width - 1)
             *x = a->x + a->width - self->frame->area.width;
@@ -619,10 +620,6 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
      * not applied to all windows. Not sure if it's going to stay at all.
      * I wonder if disabling this will break struts somehow? Let's find out. */
     if (rude) {
-        /* avoid the xinerama monitor divide while we're at it,
-         * remember to fix the placement stuff to avoid it also and
-         * then remove this XXX */
-        a = screen_physical_area_monitor(client_monitor(self));
         /* this is ben's MOZILLA BITCHSLAP. "oh ya it fucking feels good.
            Java can suck it too." */
 
diff --git a/openbox/place.c b/openbox/place.c
index 29d58734..67a1631b 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -324,9 +324,9 @@ static gboolean place_under_mouse(ObClient *client, gint *x, gint *y)
     b = area->y + area->height - client->frame->area.height;
 
     *x = px - client->area.width / 2 - client->frame->size.left;
-//    *x = MIN(MAX(*x, l), r);
+    *x = MIN(MAX(*x, l), r);
     *y = py - client->area.height / 2 - client->frame->size.top;
-//    *y = MIN(MAX(*y, t), b);
+    *y = MIN(MAX(*y, t), b);
 
     return TRUE;
 }