sawfish r4309 - in trunk: . lisp/sawfish/wm/state

[chrisb svn gnome org]

Author: chrisb
Date: Sat Nov 29 22:04:22 2008
New Revision: 4309
URL: http://svn.gnome.org/viewvc/sawfish?rev=4309&view=rev

Log:
support _NET_WM_USER_TIME


Modified:
   trunk/ChangeLog
   trunk/lisp/sawfish/wm/state/transient.jl
   trunk/lisp/sawfish/wm/state/wm-spec.jl

Modified: trunk/lisp/sawfish/wm/state/transient.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/transient.jl	(original)
+++ trunk/lisp/sawfish/wm/state/transient.jl	Sat Nov 29 22:04:22 2008
@@ -162,7 +162,8 @@
 		(transient-of-p w (input-focus) #:allow-root t))
 	   (set-input-focus w))
 	  ((and (or (and focus-windows-when-mapped
-			 (not (window-get w 'never-focus)))
+			 (not (window-get w 'never-focus))
+			 (not (window-get w 'inhibit-focus-when-mapped)))
 		    (window-get w 'focus-when-mapped))
 		(or (not (window-transient-p w))
 		    (eql (window-transient-p w) (root-window-id)))

Modified: trunk/lisp/sawfish/wm/state/wm-spec.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/wm-spec.jl	(original)
+++ trunk/lisp/sawfish/wm/state/wm-spec.jl	Sat Nov 29 22:04:22 2008
@@ -122,7 +122,8 @@
      _NET_WM_WINDOW_TYPE_TOOLBAR
      _NET_WM_WINDOW_TYPE_MENU
      _NET_WM_WINDOW_TYPE_UTILITY
-     _NET_WM_WINDOW_TYPE_SPLASH])
+     _NET_WM_WINDOW_TYPE_SPLASH
+     _NET_WM_USER_TIME])
   
   (defvar wm-spec-below-depth -2)
   (defvar wm-spec-above-depth +2)
@@ -316,7 +317,10 @@
 
     (let ((geom (get-x-property w '_NET_WM_ICON_GEOMETRY)))
       (when geom
-	(update-icon-geometry w (nth 2 geom)))))
+	(update-icon-geometry w (nth 2 geom))))
+      (when (equal (get-x-property w '_NET_WM_USER_TIME)
+          '(CARDINAL 32 #(0)))
+        (window-put w 'inhibit-focus-when-mapped t)))
 
 ;;; helper functions