Merge branch 'work' into wip/mikabox

Conflicts:

	openbox/client.c

diff --cc openbox/client.c
index 5188851e07a84295501c7b0a4b91afe4ef4a631d,0ccb343b1ce32c0808eb914b2f30c75c5bd5ba6d..cb1d6160b56a55f61cce9e0f0ef3831ac81d0940
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -427,9 -428,24 +430,15 @@@ void client_manage(Window window, ObPro
                        "launched at %u (last user interaction time %u)",
                        self->window, map_time, launch_time,
                        event_last_user_time);
+         ob_debug_type(OB_DEBUG_FOCUS,
+                       "Current focus_client: %s",
+                       (focus_client ? focus_client->title : "(none)"));
+         ob_debug_type(OB_DEBUG_FOCUS,
+                       "parent focuesed: %d  relative focused: %d",
+                       parent_focused, relative_focused);
  
 -        if (menu_frame_visible || moveresize_in_progress) {
 -            activate = FALSE;
 -            raise = TRUE;
 -            ob_debug_type(OB_DEBUG_FOCUS,
 -                          "Not focusing the window because the user is inside "
 -                          "an Openbox menu or is move/resizing a window and "
 -                          "we don't want to interrupt them");
 -        }
 -
          /* if it's on another desktop */
 -        else if (!(self->desktop == screen_desktop ||
 +        if (!(self->desktop == screen_desktop ||
                     self->desktop == DESKTOP_ALL) &&
                   /* the timestamp is from before you changed desktops */
                   launch_time && screen_desktop_user_time &&

diff --cc openbox/client.h
Simple merge