X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=2d47fd328a09c55ec9f2a3f01a5e398cd8fba2ee;hb=3fcba81510c98ac517afbab0ba60ced3d30f202f;hp=d7c80949c87d7944a5d5250fb99ca4988335b398;hpb=f78b849af2667b19bdda4dd53dbe938d85312820;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index d7c80949..2d47fd32 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -319,7 +319,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
                         break;
                 if (fe.type == FocusOut) {
 #ifdef DEBUG_FOCUS
-                    ob_debug("found pending FocusOut");
+                    ob_debug("found pending FocusOut\n");
 #endif
                     if (!INVALID_FOCUSOUT(&fe)) {
                         /* if there is a VALID FocusOut still coming, don't
@@ -330,7 +330,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
                     }
                 } else {
 #ifdef DEBUG_FOCUS
-                    ob_debug("found pending FocusIn");
+                    ob_debug("found pending FocusIn\n");
 #endif
                     /* is the focused window getting a FocusOut/In back to
                        itself?
@@ -348,7 +348,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
                         if (focus_client) {
 #ifdef DEBUG_FOCUS
                             ob_debug("focused window got an Out/In back to "
-                                     "itself IGNORED both");
+                                     "itself IGNORED both\n");
 #endif
                             return TRUE;
                         } else {
@@ -356,7 +356,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 #ifdef DEBUG_FOCUS
                             ob_debug("focused window got an Out/In back to "
                                      "itself but focus_client was null "
-                                     "IGNORED just the Out");
+                                     "IGNORED just the Out\n");
 #endif
                             return TRUE;
                         }
@@ -376,7 +376,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
             if (fallback) {
 #ifdef DEBUG_FOCUS
                 ob_debug("no valid FocusIn and no FocusOut events found, "
-                         "falling back");
+                         "falling back\n");
 #endif
                 focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
             }
@@ -392,7 +392,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
             (e->xcrossing.mode == NotifyUngrab &&
              e->xcrossing.detail == NotifyVirtual)) {
 #ifdef DEBUG_FOCUS
-            ob_debug("%sNotify mode %d detail %d on %lx IGNORED",
+            ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
                      (e->type == EnterNotify ? "Enter" : "Leave"),
                      e->xcrossing.mode,
                      e->xcrossing.detail, client?client->window:0);
@@ -400,7 +400,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
             return TRUE;
         }
 #ifdef DEBUG_FOCUS
-        ob_debug("%sNotify mode %d detail %d on %lx",
+        ob_debug("%sNotify mode %d detail %d on %lx\n",
                  (e->type == EnterNotify ? "Enter" : "Leave"),
                  e->xcrossing.mode,
                  e->xcrossing.detail, client?client->window:0);
@@ -487,19 +487,20 @@ static void event_process(const XEvent *ec, gpointer data)
     {
         if (menu_frame_visible)
             event_handle_menu(e);
-        else if (moveresize_in_progress)
-            moveresize_event(e);
         else {
-            ObFrameContext context;
+            if (!keyboard_process_interactive_grab(e, &client)) {
+                if (moveresize_in_progress)
+                    moveresize_event(e);
 
-            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);
+                    mouse_event(client, e);
                 else if (e->type == KeyPress)
-                    keyboard_event(client, e);
+                    /* when in the middle of a focus cycling action, this
+                       causes the window which appears to be focused to be
+                       the one on which the actions will be executed */
+                    keyboard_event((focus_cycle_target ?
+                                    focus_cycle_target : client), e);
             }
         }
     }
@@ -1126,8 +1127,7 @@ static void event_handle_menu(XEvent *ev)
         else {
             if ((e = menu_entry_frame_under(ev->xbutton.x_root,
                                             ev->xbutton.y_root)))
-                menu_entry_frame_execute(e,
-                                         !(ev->xbutton.state & ControlMask));
+                menu_entry_frame_execute(e, ev->xbutton.state);
         }
         break;
     case MotionNotify:
@@ -1145,8 +1145,7 @@ static void event_handle_menu(XEvent *ev)
         else if (ev->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
             ObMenuFrame *f;
             if ((f = find_active_menu()))
-                menu_entry_frame_execute(f->selected,
-                                         !(ev->xkey.state & ControlMask));
+                menu_entry_frame_execute(f->selected, ev->xkey.state);
         } else if (ev->xkey.keycode == ob_keycode(OB_KEY_LEFT)) {
             ObMenuFrame *f;
             if ((f = find_active_menu()) && f->parent)