X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=0c2b4c394984b107dcf6213f2274f80ac89f6d66;hb=b48c0e0b47b649af5b93619af8021420264b19d6;hp=6560402f6e6a01dba8c845376b5ef01b5ad1f619;hpb=c9a35f0b813d9804fce1e38647204314f4eee3a1;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 6560402f..0c2b4c39 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -246,10 +246,9 @@ void event_process(XEvent *e)
     case EnterNotify:
     case LeaveNotify:
 	event_lasttime = e->xcrossing.time;
-        /* XXX this caused problems before... but i don't remember why. hah.
-           so back it is. if problems arise again, then try filtering on the
-           detail instead of the mode. */
-        if (e->xcrossing.mode != NotifyNormal) return;
+        /* NotifyUngrab occurs when a mouse button is released and the event is
+           caused, like when lowering a window */
+        if (e->xcrossing.mode == NotifyGrab) return;
 	break;
     }
 
@@ -485,7 +484,8 @@ static void event_handle_client(Client *client, XEvent *e)
 		}
 		e->xclient = ce.xclient;
 	    }
-	    client_set_desktop(client, e->xclient.data.l[0]);
+            if ((unsigned)e->xclient.data.l[0] < screen_num_desktops)
+                client_set_desktop(client, (unsigned)e->xclient.data.l[0]);
 	} else if (msgtype == prop_atoms.net_wm_state) {
 	    /* can't compress these */
 	    g_message("net_wm_state %s %ld %ld for 0x%lx",