X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=1caa8accf90563e4dd30608dfeea91258ea1481d;hb=50d662681160c309ea86268c0d05794b87b75593;hp=38b6bec2ca3a413105ba919fc1c65eb2e080c5c2;hpb=ca1a27bebac84dbc4f1c594612ac6348b94b53b4;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 38b6bec2..1caa8acc 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1282,7 +1282,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                                        it can happen now when the window is on
                                        another desktop, but we still don't
                                        want it! */
-        client_activate(client, FALSE, TRUE, TRUE, TRUE);
+        client_activate(client, FALSE, FALSE, TRUE, TRUE, TRUE);
         break;
     case ClientMessage:
         /* validate cuz we query stuff off the client here */
@@ -1329,10 +1329,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                        (e->xclient.data.l[0] == 2 ? "user" : "INVALID"))));
             /* XXX make use of data.l[2] !? */
             if (e->xclient.data.l[0] == 1 || e->xclient.data.l[0] == 2) {
-                /* don't use the user's timestamp for client_focus, cuz if it's
-                   an old broken timestamp (happens all the time) then focus
-                   won't move even though we're trying to move it
-                  event_curtime = e->xclient.data.l[1];*/
+                event_curtime = e->xclient.data.l[1];
                 if (e->xclient.data.l[1] == 0)
                     ob_debug_type(OB_DEBUG_APP_BUGS,
                                   "_NET_ACTIVE_WINDOW message for window %s is"
@@ -1341,7 +1338,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 ob_debug_type(OB_DEBUG_APP_BUGS,
                               "_NET_ACTIVE_WINDOW message for window %s is "
                               "missing source indication", client->title);
-            client_activate(client, TRUE, TRUE, TRUE,
+            client_activate(client, FALSE, FALSE, TRUE, TRUE,
                             (e->xclient.data.l[0] == 0 ||
                              e->xclient.data.l[0] == 2));
         } else if (msgtype == OBT_PROP_ATOM(NET_WM_MOVERESIZE)) {
@@ -1754,30 +1751,30 @@ static gboolean event_handle_menu_input(XEvent *ev)
         else if (ev->type == KeyPress && (state & ~ControlMask) == 0) {
             frame->got_press = TRUE;
 
-            if (keycode == ob_keycode(OB_KEY_ESCAPE)) {
+            if (ob_keycode_match(keycode, OB_KEY_ESCAPE)) {
                 menu_frame_hide_all();
                 ret = TRUE;
             }
 
-            else if (keycode == ob_keycode(OB_KEY_LEFT)) {
+            else if (ob_keycode_match(keycode, OB_KEY_LEFT)) {
                 /* Left goes to the parent menu */
                 if (frame->parent)
                     menu_frame_select(frame, NULL, TRUE);
                 ret = TRUE;
             }
 
-            else if (keycode == ob_keycode(OB_KEY_RIGHT)) {
+            else if (ob_keycode_match(keycode, OB_KEY_RIGHT)) {
                 /* Right goes to the selected submenu */
                 if (frame->child) menu_frame_select_next(frame->child);
                 ret = TRUE;
             }
 
-            else if (keycode == ob_keycode(OB_KEY_UP)) {
+            else if (ob_keycode_match(keycode, OB_KEY_UP)) {
                 menu_frame_select_previous(frame);
                 ret = TRUE;
             }
 
-            else if (keycode == ob_keycode(OB_KEY_DOWN)) {
+            else if (ob_keycode_match(keycode, OB_KEY_DOWN)) {
                 menu_frame_select_next(frame);
                 ret = TRUE;
             }
@@ -1790,7 +1787,7 @@ static gboolean event_handle_menu_input(XEvent *ev)
         else if (ev->type == KeyRelease && (state & ~ControlMask) == 0 &&
                  frame->entries && frame->got_press)
         {
-            if (keycode == ob_keycode(OB_KEY_RETURN)) {
+            if (ob_keycode_match(keycode, OB_KEY_RETURN)) {
                 /* Enter runs the active item or goes into the submenu.
                    Control-Enter runs it without closing the menu. */
                 if (frame->child)
@@ -1888,7 +1885,12 @@ static void event_handle_menu(ObMenuFrame *frame, XEvent *ev)
             (f = find_active_menu()) && f->selected == e &&
             e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
         {
-            menu_frame_select(e->frame, NULL, FALSE);
+            ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
+                                                         ev->xcrossing.y_root);
+            /* if we're just going from one entry in the menu to the next,
+               don't unselect stuff first */
+            if (!u || e->frame != u->frame)
+                menu_frame_select(e->frame, NULL, FALSE);
         }
         break;
     }