X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=ed0e0965b733d41b4b55b726c758f9629d0a46e7;hb=888c3d1f6ae80c3e2d8ab37ebead8a96a8d0a565;hp=a0515e2eebd73e419a32023bdcd73a93479a09a2;hpb=164a09537518f39313e2c10ead6651cba259ccd5;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index a0515e2e..ed0e0965 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -8,6 +8,8 @@
 #include "screen.h"
 #include "frame.h"
 #include "menu.h"
+#include "keyboard.h"
+#include "mouse.h"
 #include "framerender.h"
 #include "focus.h"
 #include "moveresize.h"
@@ -223,32 +225,38 @@ static Window event_get_window(XEvent *e)
 
 static void event_set_lasttime(XEvent *e)
 {
+    Time t = 0;
+
     /* grab the lasttime and hack up the state */
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
-	event_lasttime = e->xbutton.time;
+	t = e->xbutton.time;
 	break;
     case KeyPress:
-	event_lasttime = e->xkey.time;
+	t = e->xkey.time;
 	break;
     case KeyRelease:
-	event_lasttime = e->xkey.time;
+	t = e->xkey.time;
 	break;
     case MotionNotify:
-	event_lasttime = e->xmotion.time;
+	t = e->xmotion.time;
 	break;
     case PropertyNotify:
-	event_lasttime = e->xproperty.time;
+	t = e->xproperty.time;
 	break;
     case EnterNotify:
     case LeaveNotify:
-	event_lasttime = e->xcrossing.time;
+	t = e->xcrossing.time;
 	break;
     default:
-        event_lasttime = CurrentTime;
+        /* if more event types are anticipated, get their timestamp
+           explicitly */
         break;
     }
+
+    if (t > event_lasttime)
+        event_lasttime = t;
 }
 
 #define STRIP_MODS(s) \
@@ -535,13 +543,23 @@ static void event_process(XEvent *e)
         }
 
     /* user input (action-bound) events */
-    /*
     if (e->type == ButtonPress || e->type == ButtonRelease ||
-        e->type == MotionNotify)
-        mouse_event(e, client);
-    else if (e->type == KeyPress || e->type == KeyRelease)
-        ;
-    */
+        e->type == MotionNotify || e->type == KeyPress ||
+        e->type == KeyRelease)
+    {
+        ObFrameContext context;
+
+        context = frame_context(client, e->xany.window);
+
+        if (!keyboard_process_interactive_grab(e, &client, &context)) {
+
+            if (e->type == ButtonPress || e->type == ButtonRelease ||
+                e->type == MotionNotify)
+                mouse_event(client, context, e);
+            else if (e->type == KeyPress)
+                keyboard_event(client, e);
+        }
+    }
 
     /* dispatch the event to registered handlers */
     dispatch_x(e, client);
@@ -921,7 +939,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
 	    client_close(client);
 	} else if (msgtype == prop_atoms.net_active_window) {
 	    ob_debug("net_active_window for 0x%lx\n", client->window);
-            client_activate(client);
+            client_activate(client, FALSE);
 	} else if (msgtype == prop_atoms.net_wm_moveresize) {
 	    ob_debug("net_wm_moveresize for 0x%lx\n", client->window);
             if ((Atom)e->xclient.data.l[2] ==