dont be rude to non-normal windows with keeping them onscreen

diff --git a/openbox/client.c b/openbox/client.c
index f1dc11aa03a62f802df400ba164e77ac0a776f44..dcde212ee420bac80236a14a7701a1ba68442a98 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -310,7 +310,7 @@ void client_manage(Window window)
 
     /* make sure the window is visible */
     if (ob_state() == OB_STATE_RUNNING)
-        client_move_onscreen(self, TRUE);
+        client_move_onscreen(self, client_normal(self));
 
     client_showhide(self);
 

diff --git a/openbox/event.c b/openbox/event.c
index b1a70dd4b6e4196b06ded579de5e922d44f59c04..bbd87a9d6d1a5245f10373ff38b8fb9637292ad9 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -805,7 +805,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                     client->frame->size.left + client->frame->size.right;
                 int fh = h +
                     client->frame->size.top + client->frame->size.bottom;
-                client_find_onscreen(client, &newx, &newy, fw, fh, TRUE);
+                client_find_onscreen(client, &newx, &newy, fw, fh,
+                                     client_noral(self));
                 if (e->xconfigurerequest.value_mask & CWX)
                     x = newx;
                 if (e->xconfigurerequest.value_mask & CWY)
@@ -1008,7 +1009,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                     client->frame->size.left + client->frame->size.right;
                 int fh = h +
                     client->frame->size.top + client->frame->size.bottom;
-                client_find_onscreen(client, &newx, &newy, fw, fh, TRUE);
+                client_find_onscreen(client, &newx, &newy, fw, fh,
+                                     client_normal(self));
                 if (e->xclient.data.l[0] & 1 << 8)
                     x = newx;
                 if (e->xclient.data.l[0] & 1 << 9)