X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=6548d83e993b4c983f5ee4e26667ccb0ce6e08c2;hb=e7e2a69fd0ed5073a57ce2974892ad5cf97f7faa;hp=43142e3a47ffefe81a0341d437c9a8d972b6e4d7;hpb=77bd01662820449ea9c958894fdba13ae3761d37;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 43142e3a..6548d83e 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);
@@ -22,12 +25,10 @@ static void event_handle_client(Client *c, XEvent *e);
 
 Time event_lasttime = 0;
 
-/*! A list of all possible combinations of keyboard lock masks */
-static unsigned int mask_list[8];
 /*! The value of the mask for the NumLock modifier */
-static unsigned int NumLockMask;
+unsigned int NumLockMask;
 /*! The value of the mask for the ScrollLock modifier */
-static unsigned int ScrollLockMask;
+unsigned int ScrollLockMask;
 /*! The key codes for the modifier keys */
 static XModifierKeymap *modmap;
 /*! Table of the constant modifier masks */
@@ -63,15 +64,6 @@ void event_startup()
 		ScrollLockMask = mask_table[cnt / modmap->max_keypermod];
 	}
     }
-
-    mask_list[0] = 0;
-    mask_list[1] = LockMask;
-    mask_list[2] = NumLockMask;
-    mask_list[3] = LockMask | NumLockMask;
-    mask_list[4] = ScrollLockMask;
-    mask_list[5] = ScrollLockMask | LockMask;
-    mask_list[6] = ScrollLockMask | NumLockMask;
-    mask_list[7] = ScrollLockMask | LockMask | NumLockMask;
 }
 
 void event_shutdown()
@@ -130,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;
@@ -248,16 +243,23 @@ 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;
 	break;
     }
 
     client = g_hash_table_lookup(client_map, (gpointer)window);
+    g_message("EVENT: 0x%lx -> 0x%lx", window, client);
 
     /* 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 */
@@ -290,10 +292,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;
 
@@ -326,24 +324,10 @@ 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);
+        client_set_focused(client, TRUE);
 	break;
     case FocusOut:
-	client->focused = FALSE;
-	engine_frame_adjust_focus(client->frame);
-
-	/* focus state can affect the stacking layer */
-	client_calc_layer(client);
-
-	if (focus_client == client)
-	    focus_set_client(NULL);
+        client_set_focused(client, FALSE);
 	break;
     case ConfigureRequest:
 	g_message("ConfigureRequest for window %lx", client->window);
@@ -454,10 +438,16 @@ 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);
-
-	/*HOOKFIRECLIENT(requestactivate, client);XXX*/
+        if (screen_showing_desktop)
+            screen_show_desktop(FALSE);
+        client_iconify(client, FALSE, TRUE);
+        if (!client->frame->visible)
+            /* if its not visible still, then don't mess with it */
+            break;
+        if (client->shaded)
+            client_shade(client, FALSE);
+        client_focus(client);
+        stacking_raise(client);
 	break;
     case ClientMessage:
 	/* validate cuz we query stuff off the client here */
@@ -516,8 +506,11 @@ static void event_handle_client(Client *client, XEvent *e)
 	    else if (!client->frame->visible)
 		/* if its not visible for other reasons, then don't mess
 		   with it */
-		return;
-	    /*HOOKFIRECLIENT(requestactivate, client);XXX*/
+		break;
+            if (client->shaded)
+                client_shade(client, FALSE);
+            client_focus(client);
+            stacking_raise(client);
 	}
 	break;
     case PropertyNotify: