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

[Philippe Brochard]

Author: pbrochard
Date: Fri Jul 23 17:28:21 2010
New Revision: 285

Log:
src/clfswm-util.lisp (delete-current-child): Invert bindings and menu entry between delete-current-child and remove-current-child. ie: Delete a child and its children in all frames by default.

Modified:
   clfswm/ChangeLog
   clfswm/src/bindings-second-mode.lisp
   clfswm/src/clfswm-query.lisp
   clfswm/src/clfswm-util.lisp
   clfswm/src/menu-def.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Fri Jul 23 17:28:21 2010
@@ -1,3 +1,9 @@
+2010-07-23  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-util.lisp (delete-current-child): Invert bindings and
+	menu entry between delete-current-child and remove-current-child.
+	ie: Delete a child and its children in all frames by default.
+
 2010-07-21  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/package.lisp: Add a placement configuration group.

Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp	(original)
+++ clfswm/src/bindings-second-mode.lisp	Fri Jul 23 17:28:21 2010
@@ -127,8 +127,8 @@
   (define-second-key ("c" :control) 'copy-current-child)
   (define-second-key ("v" :control) 'paste-selection)
   (define-second-key ("v" :control :shift) 'paste-selection-no-clear)
-  (define-second-key ("Delete") 'remove-current-child)
-  (define-second-key ("Delete" :control) 'delete-current-child)
+  (define-second-key ("Delete" :control) 'remove-current-child)
+  (define-second-key ("Delete") 'delete-current-child)
   (define-shell (#\c) b-start-xterm "start an xterm" "exec xterm")
   (define-shell (#\e) b-start-emacs "start emacs" "exec emacs")
   (define-shell (#\e :control) b-start-emacsremote

Modified: clfswm/src/clfswm-query.lisp
==============================================================================
--- clfswm/src/clfswm-query.lisp	(original)
+++ clfswm/src/clfswm-query.lisp	Fri Jul 23 17:28:21 2010
@@ -296,6 +296,7 @@
 	(xgrab-pointer *root* 66 67)
 	(xungrab-pointer)))
   (when (member *query-return* '(:Return :Complet))
+    (pushnew default *query-history* :test #'equal)
     (push *query-string* *query-history*))
   (values *query-string*
 	  *query-return*))

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Fri Jul 23 17:28:21 2010
@@ -206,7 +206,7 @@
   (leave-second-mode))
 
 (defun delete-current-child ()
-  "Delete the current child and its children"
+  "Delete the current child and its children in all frames"
   (hide-all *current-child*)
   (delete-child-and-children-in-all-frames *current-child*)
   (leave-second-mode))

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Fri Jul 23 17:28:21 2010
@@ -78,8 +78,8 @@
 (add-menu-key 'child-menu "r" 'rename-current-child)
 (add-menu-key 'child-menu "e" 'ensure-unique-name)
 (add-menu-key 'child-menu "n" 'ensure-unique-number)
-(add-menu-key 'child-menu "Delete" 'remove-current-child)
-(add-menu-key 'child-menu "X" 'delete-current-child)
+(add-menu-key 'child-menu "Delete" 'delete-current-child)
+(add-menu-key 'child-menu "X" 'remove-current-child)
 (add-menu-key 'child-menu "h" 'hide-current-child)
 (add-menu-key 'child-menu "u" 'unhide-a-child)
 (add-menu-key 'child-menu "f" 'unhide-a-child-from-all-frames)