X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=openbox%2Fevent.c;h=341db70641ec27dcdf0e04fb4bb2e5a1a6ec1e3b;hb=7abaa532e36946ca16a19ed4825cbf2572849c45;hp=00b2857cc43ff83fa26057f3f0b49a2081a7f96b;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 00b2857c..341db706 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -7,11 +7,9 @@
 #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 <X11/Xlib.h>
 #include <X11/keysym.h>
@@ -249,8 +247,6 @@ void event_process(XEvent *e)
     case EnterNotify:
     case LeaveNotify:
 	event_lasttime = e->xcrossing.time;
-	if (e->xcrossing.mode != NotifyNormal)
-	    return; /* skip me! */
 	break;
     }
 
@@ -286,26 +282,38 @@ void event_process(XEvent *e)
     /* dispatch Crossing, Pointer and Key events to the hooks */
     switch(e->type) {
     case EnterNotify:
-	HOOKFIRECLIENT(pointerenter, client);
+        if (client != NULL) engine_mouse_enter(client->frame, window);
+	/*HOOKFIRECLIENT(pointerenter, client);XXX*/
 	break;
     case LeaveNotify:
-	HOOKFIRECLIENT(pointerleave, client);
+        if (client != NULL) engine_mouse_leave(client->frame, window);
+	/*HOOKFIRECLIENT(pointerleave, client);XXX*/
 	break;
     case ButtonPress:
+        if (client != NULL) 
+            engine_mouse_press(client->frame, window,
+                               e->xbutton.x, e->xbutton.y);
+	/*pointer_event(e, client);XXX*/
+        break;
     case ButtonRelease:
+        if (client != NULL)
+            engine_mouse_release(client->frame, window,
+                                 e->xbutton.x, e->xbutton.y);
+	/*pointer_event(e, client);XXX*/
+        break;
     case MotionNotify:
-	pointer_event(e, client);
+	/*pointer_event(e, client);XXX*/
 	break;
     case KeyPress:	
     case KeyRelease:
-	keyboard_event(&e->xkey);
+	/*keyboard_event(&e->xkey);XXX*/
 	break;
     default:
 	/* XKB events */
 	if (e->type == extensions_xkb_event_basep) {
 	    switch (((XkbAnyEvent*)&e)->xkb_type) {
 	    case XkbBellNotify:
-		HOOKFIRECLIENT(bell, client);
+		/*HOOKFIRECLIENT(bell, client);XXX*/
 		break;
 	    }
 	}
@@ -483,7 +491,7 @@ 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);
+	/*HOOKFIRECLIENT(requestactivate, client);XXX*/
 	break;
     case ClientMessage:
 	/* validate cuz we query stuff off the client here */
@@ -543,7 +551,7 @@ static void event_handle_client(Client *client, XEvent *e)
 		/* if its not visible for other reasons, then don't mess
 		   with it */
 		return;
-	    HOOKFIRECLIENT(requestactivate, client);
+	    /*HOOKFIRECLIENT(requestactivate, client);XXX*/
 	}
 	break;
     case PropertyNotify: