[clfswm-cvs] r195 - in clfswm: . src

[Philippe Brochard]

Author: pbrochard
Date: Tue Oct 28 21:48:46 2008
New Revision: 195

Log:
Add children navigation menu in the movement menu (select next/previous child/brother/level). - clisp/new-clx is supported with a least the 2.48 version (not yet released)

Modified:
   clfswm/ChangeLog
   clfswm/TODO
   clfswm/src/clfswm-util.lisp
   clfswm/src/menu-def.lisp
   clfswm/src/xlib-util.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Tue Oct 28 21:48:46 2008
@@ -1,3 +1,8 @@
+2008-10-28  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/menu-def.lisp: Add children navigation menu in the movement
+	menu (select next/previous child/brother/level).
+
 2008-10-26  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	*  *: Rename 'sister' frame to 'brother' frame.

Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO	(original)
+++ clfswm/TODO	Tue Oct 28 21:48:46 2008
@@ -15,8 +15,6 @@
       ...
       ;;;; AUTO-CONFIG End : You can add your configurations below this line.
 
-- Support clisp/new-clx and prevent to crash clisp with this CLX version.
-
 - Mouse support in menu
 
 - Remote access to the clfswm REPL [Philippe]

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Tue Oct 28 21:48:46 2008
@@ -794,6 +794,28 @@
   (with-movement (resize-minimal-frame *current-child*)))
 
 
+;;; Children navigation
+(defun with-movement-select-next-brother ()
+  "Select the next brother frame"
+  (with-movement (select-next-brother)))
+
+(defun with-movement-select-previous-brother ()
+  "Select the previous brother frame"
+  (with-movement (select-previous-brother)))
+
+(defun with-movement-select-next-level ()
+  "Select the next level"
+  (with-movement (select-next-level)))
+
+(defun with-movement-select-previous-level ()
+  "Select the previous levelframe"
+  (with-movement (select-previous-level)))
+
+(defun with-movement-select-next-child ()
+  "Select the next child"
+  (with-movement (select-next-child)))
+
+
 
 ;;; Adapt frame functions
 (defun adapt-current-frame-to-window-hints-generic (width-p height-p)

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Tue Oct 28 21:48:46 2008
@@ -94,6 +94,11 @@
 (add-sub-menu 'frame-movement-menu "f" 'frame-fill-menu "Frame fill menu")
 (add-sub-menu 'frame-movement-menu "r" 'frame-resize-menu "Frame resize menu")
 (add-menu-key 'frame-movement-menu "c" 'center-current-frame)
+(add-menu-key 'frame-movement-menu "Right" 'with-movement-select-next-brother)
+(add-menu-key 'frame-movement-menu "Left" 'with-movement-select-previous-brother)
+(add-menu-key 'frame-movement-menu "Up" 'with-movement-select-next-level)
+(add-menu-key 'frame-movement-menu "Down" 'with-movement-select-previous-level)
+(add-menu-key 'frame-movement-menu "Tab" 'with-movement-select-next-child)
 
 
 (add-menu-key 'frame-pack-menu "Up" 'current-frame-pack-up)

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Tue Oct 28 21:48:46 2008
@@ -405,6 +405,16 @@
 		    :sync-pointer-p t
 		    :sync-keyboard-p nil))
 
+;;(dbg "todo: confirm this")
+;;(defun grab-all-buttons (window) 
+;;  (ungrab-all-buttons window)
+;;  (dotimes (i 5)
+;;    (xlib:grab-button window i '(:button-press :button-release :pointer-motion)
+;;		      :modifiers :any
+;;		      :owner-p nil
+;;		      :sync-pointer-p t
+;;		      :sync-keyboard-p nil)))
+
 
 (defun ungrab-all-keys (window)
   (xlib:ungrab-key window :any :modifiers :any))
@@ -520,8 +530,8 @@
 	       t))
       (unless pointer-grabbed-p
 	(xgrab-pointer *root* nil nil))
-;      (when additional-fn
-;	(apply additional-fn additional-arg))
+      (when additional-fn
+	(apply additional-fn additional-arg))
       (loop until done
 	 do (with-xlib-protect
 	      (xlib:display-finish-output *display*)