From: Mikael Magnusson <mikachu@gmail.com>
Date: Wed, 29 Oct 2008 12:50:50 +0000 (+0100)
Subject: Merge branch 'work' into wip/mikabox
X-Git-Tag: mikabox-3.4.7.2~23
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a8eff8977567918068131d4e30e17d17dc55591c;p=mikachu%2Fopenbox.git

Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/event.c
---

a8eff8977567918068131d4e30e17d17dc55591c
diff --cc openbox/client.c
index 65820313,5686a939..fa5a979d
--- a/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;
      }