X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=97e1412f00e902ef634b4949f360f44d08db14ca;hb=3f0e69b8e05a2c5dde2489dc9abad4e3aceee591;hp=0cf9cf1475fd52c49770595aa543b6528706177c;hpb=698b9a09986a41b6724ac7fb8e6ca668c3645cea;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 0cf9cf14..97e1412f 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -7,16 +7,17 @@
 #include "engine.h"
 #include "focus.h"
 #include "stacking.h"
-#include "keyboard.h"
-#include "pointer.h"
-#include "hooks.h"
 #include "extensions.h"
 #include "timer.h"
 #include "engine.h"
+#include "dispatch.h"
 
 #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);
@@ -24,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 */
@@ -65,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()
@@ -250,11 +240,16 @@ 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);
 
+    /* deal with it in the kernel */
     if (client) {
 	event_handle_client(client, e);
     } else if (window == ob_root)
@@ -282,45 +277,8 @@ void event_process(XEvent *e)
 	xerror_set_ignore(FALSE);
     }
 
-    /* dispatch Crossing, Pointer and Key events to the hooks */
-    switch(e->type) {
-    case EnterNotify:
-        if (client != NULL) engine_mouse_enter(client->frame, window);
-	HOOKFIRECLIENT(pointerenter, client);
-	break;
-    case LeaveNotify:
-        if (client != NULL) engine_mouse_leave(client->frame, window);
-	HOOKFIRECLIENT(pointerleave, client);
-	break;
-    case ButtonPress:
-        if (client != NULL) 
-            engine_mouse_press(client->frame, window,
-                               e->xbutton.x, e->xbutton.y);
-	pointer_event(e, client);
-        break;
-    case ButtonRelease:
-        if (client != NULL)
-            engine_mouse_release(client->frame, window,
-                                 e->xbutton.x, e->xbutton.y);
-	pointer_event(e, client);
-        break;
-    case MotionNotify:
-	pointer_event(e, client);
-	break;
-    case KeyPress:	
-    case KeyRelease:
-	keyboard_event(&e->xkey);
-	break;
-    default:
-	/* XKB events */
-	if (e->type == extensions_xkb_event_basep) {
-	    switch (((XkbAnyEvent*)&e)->xkb_type) {
-	    case XkbBellNotify:
-		HOOKFIRECLIENT(bell, client);
-		break;
-	    }
-	}
-    }
+    /* dispatch the event to registered handlers */
+    dispatch_x(e, client);
 }
 
 static void event_handle_root(XEvent *e)
@@ -364,23 +322,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);
-
-	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);
@@ -494,7 +439,16 @@ static void event_handle_client(Client *client, XEvent *e)
 	/* we shouldn't be able to get this unless we're iconic */
 	g_assert(client->iconic);
 
-	HOOKFIRECLIENT(requestactivate, client);
+        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 */
@@ -553,8 +507,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);
+		break;
+            if (client->shaded)
+                client_shade(client, FALSE);
+            client_focus(client);
+            stacking_raise(client);
 	}
 	break;
     case PropertyNotify: