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

[Philippe Brochard]

Author: pbrochard
Date: Wed Jul 21 09:11:10 2010
New Revision: 283

Log:
src/binding*.lisp: Bind control+g to escape the current action like emacs.

Modified:
   clfswm/ChangeLog
   clfswm/TODO
   clfswm/src/bindings-second-mode.lisp
   clfswm/src/clfswm-info.lisp
   clfswm/src/clfswm-query.lisp
   clfswm/src/clfswm-util.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Wed Jul 21 09:11:10 2010
@@ -1,5 +1,8 @@
 2010-07-21  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/binding*.lisp: Bind control+g to escape the current action
+	like emacs.
+
 	* src/clfswm-internal.lisp
 	(delete-child-and-children-in-all-frames): New function and
 	binding: Second mode - Control+Delete delete the current child and

Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO	(original)
+++ clfswm/TODO	Wed Jul 21 09:11:10 2010
@@ -7,8 +7,6 @@
 ===============
 Should handle these soon.
 
-- Bind control+g to escape all actions like emacs.
-
 - Remote access to the clfswm REPL [Philippe]
    this can be done with net.lisp or via xprop (ie the Stumpwm way).
    Protocol:

Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp	(original)
+++ clfswm/src/bindings-second-mode.lisp	Wed Jul 21 09:11:10 2010
@@ -97,6 +97,7 @@
   (define-second-key ("exclam") 'run-program-from-query-string)
   (define-second-key ("Return") 'leave-second-mode)
   (define-second-key ("Escape") 'leave-second-mode)
+  (define-second-key ("g" :control) 'leave-second-mode)
   (define-second-key ("t") 'tile-current-frame)
   (define-second-key ("Home" :mod-1 :control :shift) 'exit-clfswm)
   (define-second-key ("Right" :mod-1) 'select-next-brother)

Modified: clfswm/src/clfswm-info.lisp
==============================================================================
--- clfswm/src/clfswm-info.lisp	(original)
+++ clfswm/src/clfswm-info.lisp	Wed Jul 21 09:11:10 2010
@@ -124,6 +124,7 @@
   (define-info-key ("Return") 'leave-info-mode-and-valid)
   (define-info-key ("space") 'leave-info-mode-and-valid)
   (define-info-key ("Escape") 'leave-info-mode)
+  (define-info-key ("g" :control) 'leave-info-mode)
   (define-info-key ("twosuperior")
       (defun info-banish-pointer (info)
 	"Move the pointer to the lower right corner of the screen"

Modified: clfswm/src/clfswm-query.lisp
==============================================================================
--- clfswm/src/clfswm-query.lisp	(original)
+++ clfswm/src/clfswm-query.lisp	Wed Jul 21 09:11:10 2010
@@ -230,6 +230,7 @@
 (defun set-default-query-keys ()
   (define-query-key ("Return") 'leave-query-mode-valid)
   (define-query-key ("Escape") 'leave-query-mode)
+  (define-query-key ("g" :control) 'leave-query-mode)
   (define-query-key ("Tab") 'leave-query-mode-complet)
   (define-query-key ("BackSpace") 'query-backspace)
   (define-query-key ("BackSpace" :control) 'query-backspace-word)

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Wed Jul 21 09:11:10 2010
@@ -111,7 +111,7 @@
       (when (equal window *current-child*)
 	(setf *current-child* *current-root*))
       (hide-child window)
-      (delete-child-and-children-in-all-frames window)
+      (delete-child-and-children-in-all-frames window close-fun)
       (show-all-children))))
 
 (defun delete-focus-window ()