X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=d3426109626e43bbdf0fc3963e6a5bb12c9c51d4;hb=7bb829f8b721b8b5a75740b2686fa12f63a798ff;hp=51f93c3b73453b60a01f806a7f40aa55f91c86a6;hpb=44889c3c69f2d1d30a329dcfee57010ff9d5730f;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 51f93c3b..d3426109 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -15,6 +15,9 @@
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#ifdef HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
@@ -119,6 +122,9 @@ void event_process(XEvent *e)
 
     /* pick a window */
     switch (e->type) {
+    case MapRequest:
+	window = e->xmap.window;
+	break;
     case UnmapNotify:
 	window = e->xunmap.window;
 	break;
@@ -232,7 +238,11 @@ void event_process(XEvent *e)
 		if (fi.xfocus.window == e->xfocus.window)
 		    return;
 	    }
-	}
+	} else if (window == focus_backup && focus_client != NULL)
+            /* Something's focused but we got a focus event for the backup
+               window. this means that something unfocused before we received
+               the new FocusIn. Just ignore it. */
+               return;
 	break;
     case EnterNotify:
     case LeaveNotify:
@@ -247,10 +257,12 @@ void event_process(XEvent *e)
     client = g_hash_table_lookup(client_map, (gpointer)window);
 
     /* deal with it in the kernel */
-    if (client) {
+    if (client)
 	event_handle_client(client, e);
-    } else if (window == ob_root)
+    else if (window == ob_root)
 	event_handle_root(e);
+    else if (e->type == MapRequest)
+	client_manage(window);
     else if (e->type == ConfigureRequest) {
 	/* unhandled configure requests must be used to configure the
 	   window directly */
@@ -283,10 +295,6 @@ static void event_handle_root(XEvent *e)
     Atom msgtype;
      
     switch(e->type) {
-    case MapRequest:
-	g_message("MapRequest on root");
-	client_manage(e->xmap.window);
-	break;
     case ClientMessage:
 	if (e->xclient.format != 32) break;
 
@@ -319,24 +327,22 @@ static void event_handle_client(Client *client, XEvent *e)
      
     switch (e->type) {
     case FocusIn:
-	client->focused = TRUE;
-	engine_frame_adjust_focus(client->frame);
-
-	/* focus state can affect the stacking layer */
-	client_calc_layer(client);
-
         if (focus_client != client)
             focus_set_client(client);
-	break;
-    case FocusOut:
-	client->focused = FALSE;
-	engine_frame_adjust_focus(client->frame);
 
-	/* focus state can affect the stacking layer */
-	client_calc_layer(client);
+        /* focus state can affect the stacking layer */
+        client_calc_layer(client);
 
+        engine_frame_adjust_focus(client->frame);
+	break;
+    case FocusOut:
 	if (focus_client == client)
 	    focus_set_client(NULL);
+
+        /* focus state can affect the stacking layer */
+        client_calc_layer(client);
+
+        engine_frame_adjust_focus(client->frame);
 	break;
     case ConfigureRequest:
 	g_message("ConfigureRequest for window %lx", client->window);
@@ -447,9 +453,6 @@ static void event_handle_client(Client *client, XEvent *e)
 	client_unmanage(client);
 	break;
     case MapRequest:
-	/* we shouldn't be able to get this unless we're iconic */
-	g_assert(client->iconic);
-
         if (screen_showing_desktop)
             screen_show_desktop(FALSE);
         client_iconify(client, FALSE, TRUE);