[clfswm-cvs] r407 - clfswm/src

[Philippe Brochard]

Author: pbrochard
Date: Sun Feb 13 17:23:28 2011
New Revision: 407

Log:
Better clfswm terminal identification

Modified:
   clfswm/src/clfswm-corner.lisp
   clfswm/src/config.lisp
   clfswm/src/xlib-util.lisp

Modified: clfswm/src/clfswm-corner.lisp
==============================================================================
--- clfswm/src/clfswm-corner.lisp	(original)
+++ clfswm/src/clfswm-corner.lisp	Sun Feb 13 17:23:28 2011
@@ -90,6 +90,7 @@
   (unless (find-window-in-query-tree win)
     (do-shell cmd)
     (setf win (wait-window-in-query-tree wait-test))
+    (grab-all-buttons win)
     (hide-window win))
   (cond ((window-hidden-p win)
 	 (unhide-window win)
@@ -113,6 +114,9 @@
 
 
 (let (win)
+  (defun equal-clfswm-terminal-id (window)
+    (when win
+      (equal (xlib:window-id window) (xlib:window-id win))))
   (defun present-clfswm-terminal ()
     "Hide/Unhide a terminal"
     (setf win (generic-present-body *clfswm-terminal-cmd*

Modified: clfswm/src/config.lisp
==============================================================================
--- clfswm/src/config.lisp	(original)
+++ clfswm/src/config.lisp	Sun Feb 13 17:23:28 2011
@@ -49,7 +49,7 @@
 (defparameter *never-managed-window-list*
   (list (list (equal-wm-class-fun "ROX-Pinboard") nil)
 	(list (equal-wm-class-fun "xvkbd") 'raise-window)
-	(list (equal-wm-name-fun "clfswm-terminal") 'raise-and-focus-window))
+	(list 'equal-clfswm-terminal-id 'raise-and-focus-window))
   "Config(): CLFSWM will never manage windows of this type.
 A list of (list match-function handle-function)")
 
@@ -130,8 +130,8 @@
 (defparameter *clfswm-terminal-name* "clfswm-terminal"
   "Config(Corner group): The clfswm terminal name")
 ;;(defparameter *clfswm-terminal-cmd* (format nil "xterm -T ~A -e /bin/bash --noprofile --norc" *clfswm-terminal-name*)
-(defparameter *clfswm-terminal-cmd* (format nil "urxvt -name ~A" *clfswm-terminal-name*)
-;;(defparameter *clfswm-terminal-cmd* (format nil "xterm -T ~A" *clfswm-terminal-name*)
+;;(defparameter *clfswm-terminal-cmd* (format nil "urxvt -name ~A" *clfswm-terminal-name*)
+(defparameter *clfswm-terminal-cmd* (format nil "xterm -T ~A" *clfswm-terminal-name*)
   "Config(Corner group): The clfswm terminal command.
 This command must set the window title to *clfswm-terminal-name*")
 

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Sun Feb 13 17:23:28 2011
@@ -396,7 +396,7 @@
   (when (xlib:window-p window)
     (when (window-hidden-p window)
       (unhide-window window))
-    (setf (xlib:window-priority window) :top-if)))
+    (setf (xlib:window-priority window) :above)))
 
 (defun focus-window (window)
   "Give the window focus."