X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=e77a4ea6f9e141eb6d5acf61c71f45fea503b35b;hb=cb7752cd1f48cbb9de4b3fa5062fa44e8d584701;hp=b0482faa6003beb4a8321aa3a4ccddc9996504da;hpb=382d37553d9dc7679464cf71aecf8590cc06a2cb;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index b0482faa..e77a4ea6 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -565,7 +565,7 @@ void client_unmanage(ObClient *self)
 
     /* ignore enter events from the unmap so it doesnt mess with the
        focus */
-    event_ignore_queued_enters();
+    event_ignore_all_queued_enters();
 
     mouse_grab_for_client(self, FALSE);
 
@@ -853,9 +853,11 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
     gint ox = *x, oy = *y;
     gboolean rudel = rude, ruder = rude, rudet = rude, rudeb = rude;
     gint fw, fh;
+    Rect desired;
 
+    RECT_SET(desired, *x, *y, w, h);
     all_a = screen_area(self->desktop);
-    mon_a = screen_area_monitor(self->desktop, client_monitor(self));
+    mon_a = screen_area_monitor(self->desktop, screen_find_monitor(&desired));
 
     /* get where the frame would be */
     frame_client_gravity(self->frame, x, y, w, h);