Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/event.c

diff --cc data/rc.xml
Simple merge

diff --cc obt/prop.c
Simple merge

diff --cc obt/prop.h
Simple merge

diff --cc openbox/actions/desktop.c
Simple merge

diff --cc openbox/client.c
index 658203132cd4e7049daf8129a962879f23cf5280,5686a93969b979f321b8f086b20f566fbf7979bb..fa5a979ddfef85e87ce3624cb337ad8c06f86e41
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -281,10 -284,11 +285,12 @@@ void client_manage(Window window, ObPro
          /* this means focus=true for window is same as config_focus_new=true */
          ((config_focus_new || (settings && settings->focus == 1)) ||
           client_search_focus_tree_full(self)) &&
+         /* NET_WM_USER_TIME 0 when mapping means don't focus */
+         (user_time != 0) &&
          /* this checks for focus=false for the window */
          (!settings || settings->focus != 0) &&
 -        focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE))
 +        focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE) &&
 +        (!focus_cycle_target || !config_focus_dontstop))
      {
          activate = TRUE;
      }

diff --cc openbox/event.c
Simple merge