X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=fa5f29ffdd3e18cfba2770b52307d850f4525d98;hb=06f27af0a994a6f92d1c3a9306f46a73e6162bb8;hp=91ba190b8824b124a6e0c5f8b60256377fd96b4b;hpb=5722e9e98d880f71729ecabb23ce330643529706;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 91ba190b..fa5f29ff 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;
     }
 
@@ -298,7 +297,7 @@ static void event_handle_root(XEvent *e)
 	msgtype = e->xclient.message_type;
 	if (msgtype == prop_atoms.net_current_desktop) {
 	    unsigned int d = e->xclient.data.l[0];
-	    if (d <= screen_num_desktops)
+	    if (d < screen_num_desktops)
 		screen_set_desktop(d);
 	} else if (msgtype == prop_atoms.net_number_of_desktops) {
 	    unsigned int d = e->xclient.data.l[0];
@@ -413,11 +412,9 @@ static void event_handle_client(Client *client, XEvent *e)
 	    client->ignore_unmaps--;
 	    break;
 	}
-	g_message("UnmapNotify for %lx", client->window);
 	client_unmanage(client);
 	break;
     case DestroyNotify:
-	g_message("DestroyNotify for %lx", client->window);
 	client_unmanage(client);
 	break;
     case ReparentNotify:
@@ -438,7 +435,7 @@ static void event_handle_client(Client *client, XEvent *e)
 	client_unmanage(client);
 	break;
     case MapRequest:
-        if (!client->iconic) break; /* this normal doesn't happen, but if it
+        if (!client->iconic) break; /* this normally doesn't happen, but if it
                                        does, we don't want it! */
         if (screen_showing_desktop)
             screen_show_desktop(FALSE);
@@ -485,7 +482,9 @@ 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 ||
+                (unsigned)e->xclient.data.l[0] == DESKTOP_ALL)
+                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",