From 28df6162a9fbca4544e8f384d3fdae70870f531a Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 1 Mar 2010 15:55:27 -0500
Subject: [PATCH] when an app tries to move to 0,0 and there is a strut there
 (java swing!), move it to inside the strut instead (unless it is an oldschool
 fullscreen app)

---
 openbox/client.c |  8 +++++---
 openbox/event.c  | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index 3fe3faa..83ea46f 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -345,9 +345,11 @@ void client_manage(Window window, ObPrompt *prompt)
             Rect *r;
 
             r = screen_area(self->desktop, SCREEN_AREA_ALL_MONITORS, NULL);
-            place.x = r->x;
-            place.y = r->y;
-            ob_debug("Moving buggy app from (0,0) to (%d,%d)", r->x, r->y);
+            if (r->x || r->y) {
+                place.x = r->x;
+                place.y = r->y;
+                ob_debug("Moving buggy app from (0,0) to (%d,%d)", r->x, r->y);
+            }
             g_slice_free(Rect, r);
         }
 
diff --git a/openbox/event.c b/openbox/event.c
index 14aa696..7596fe3 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1247,6 +1247,49 @@ static void event_handle_client(ObClient *client, XEvent *e)
                notify is sent or not */
         }
 
+        /* check for broken apps (java swing) moving to 0,0 when there is a
+           strut there.
+
+           XXX remove this some day...that would be nice. but really unexpected
+           from Sun Microsystems.
+        */
+        g_print("x %d y %d grav %d %d\n", x, y, client->gravity, NorthWestGravity);
+        if (x == 0 && y == 0 && client->gravity == NorthWestGravity) {
+            const Rect to = { x, y, w, h };
+            Rect const *monitor, *allmonitors;
+            monitor = screen_physical_area_monitor(client_monitor(client));
+            allmonitors = screen_physical_area_all_monitors();
+
+            /* oldschool fullscreen windows are allowed */
+            if (!(client->decorations == 0 &&
+                  (RECT_EQUAL(to, *monitor) ||
+                   RECT_EQUAL(to, *allmonitors))))
+            {
+                Rect *r;
+
+                r = screen_area(client->desktop, SCREEN_AREA_ALL_MONITORS,
+                                NULL);
+                if (r->x || r->y) {
+                    /* move the window only to the corner outside struts */
+                    x = r->x;
+                    y = r->y;
+
+                    ob_debug_type(OB_DEBUG_APP_BUGS,
+                                  "Application %s is trying to move via "
+                                  "ConfigureRequest to 0,0 using "
+                                  "NorthWestGravity, while there is a "
+                                  "strut there. "
+                                  "Moving buggy app from (0,0) to (%d,%d)",
+                                  client->title, r->x, r->y);
+                }
+
+                g_slice_free(Rect, r);
+
+                /* they still requested a move, so don't change whether a
+                   notify is sent or not */
+            }
+        }
+
         {
             gint lw, lh;
 
-- 
1.9.1