From 022a35bb0ee3adab6b9e56bdf0022bfb021939aa Mon Sep 17 00:00:00 2001 From: Philippe Brochard Date: Tue, 17 May 2011 23:35:21 +0200 Subject: [PATCH] Documentation update --- doc/keys.html | 22 ++++++++++++++++++++++ doc/keys.txt | 2 ++ doc/menu.html | 17 ++++++++++------- doc/menu.txt | 15 ++++++++------- doc/variables.html | 8 ++++++++ doc/variables.txt | 2 ++ load.lisp | 12 ++++++++---- src/bindings-second-mode.lisp | 6 ------ src/clfswm-second-mode.lisp | 10 ++++++++++ src/clfswm-util.lisp | 8 +++----- 10 files changed, 73 insertions(+), 29 deletions(-) diff --git a/doc/keys.html b/doc/keys.html index 98c0a4e..d8a53cf 100644 --- a/doc/keys.html +++ b/doc/keys.html @@ -821,6 +821,28 @@ Or do actions on corners + Q + + + Close focus window: Delete the focus window in all frames and workspaces + + + + + + + + K + + + Close or kill the current window (ask before doing anything) + + + + + + + I diff --git a/doc/keys.txt b/doc/keys.txt index 52fb858..29c2af8 100644 --- a/doc/keys.txt +++ b/doc/keys.txt @@ -86,6 +86,8 @@ Second mode keys: R Open the frame resize menu X Update layout managed children position Control G Stop all pending actions + Q Close focus window: Delete the focus window in all frames and workspaces + K Close or kill the current window (ask before doing anything) I Identify a key Colon Eval a lisp form from the query input Exclam Run a program from the query input diff --git a/doc/menu.html b/doc/menu.html index a0098f1..469465b 100644 --- a/doc/menu.html +++ b/doc/menu.html @@ -3355,25 +3355,28 @@ Conf-Placement

- a: Configure NOTIFY-WINDOW-PLACEMENT + a: Configure ASK-CLOSE/KILL-PLACEMENT

- b: Configure EXPOSE-MODE-PLACEMENT + b: Configure NOTIFY-WINDOW-PLACEMENT

- c: Configure CIRCULATE-MODE-PLACEMENT + c: Configure EXPOSE-MODE-PLACEMENT

- d: Configure QUERY-MODE-PLACEMENT + d: Configure CIRCULATE-MODE-PLACEMENT

- e: Configure INFO-MODE-PLACEMENT + e: Configure QUERY-MODE-PLACEMENT

- f: Configure SECOND-MODE-PLACEMENT + f: Configure INFO-MODE-PLACEMENT

- g: Configure BANISH-POINTER-PLACEMENT + g: Configure SECOND-MODE-PLACEMENT +

+

+ h: Configure BANISH-POINTER-PLACEMENT

diff --git a/doc/menu.txt b/doc/menu.txt index 886bd02..666f7ca 100644 --- a/doc/menu.txt +++ b/doc/menu.txt @@ -1153,13 +1153,14 @@ i: Configure CORNER-MAIN-MODE-LEFT-BUTTON j: Configure CORNER-SIZE Conf-Placement -a: Configure NOTIFY-WINDOW-PLACEMENT -b: Configure EXPOSE-MODE-PLACEMENT -c: Configure CIRCULATE-MODE-PLACEMENT -d: Configure QUERY-MODE-PLACEMENT -e: Configure INFO-MODE-PLACEMENT -f: Configure SECOND-MODE-PLACEMENT -g: Configure BANISH-POINTER-PLACEMENT +a: Configure ASK-CLOSE/KILL-PLACEMENT +b: Configure NOTIFY-WINDOW-PLACEMENT +c: Configure EXPOSE-MODE-PLACEMENT +d: Configure CIRCULATE-MODE-PLACEMENT +e: Configure QUERY-MODE-PLACEMENT +f: Configure INFO-MODE-PLACEMENT +g: Configure SECOND-MODE-PLACEMENT +h: Configure BANISH-POINTER-PLACEMENT Conf-Hook a: Configure DEFAULT-NW-HOOK diff --git a/doc/variables.html b/doc/variables.html index c947d7d..953a819 100644 --- a/doc/variables.html +++ b/doc/variables.html @@ -960,6 +960,14 @@         Notify window placement
+ +    *ask-close/kill-placement* + + + = TOP-RIGHT-PLACEMENT
+ +         Ask close/kill window placement
+

<= Query String Group => diff --git a/doc/variables.txt b/doc/variables.txt index 1c2ed04..551180e 100644 --- a/doc/variables.txt +++ b/doc/variables.txt @@ -277,6 +277,8 @@ on the root window in the main mode with the mouse Expose mode window placement (Selection keys position) *NOTIFY-WINDOW-PLACEMENT* = BOTTOM-RIGHT-PLACEMENT Notify window placement + *ASK-CLOSE/KILL-PLACEMENT* = TOP-RIGHT-PLACEMENT + Ask close/kill window placement <= Query String Group => diff --git a/load.lisp b/load.lisp index 66c97f6..b58f9c8 100644 --- a/load.lisp +++ b/load.lisp @@ -57,14 +57,18 @@ (in-package :clfswm) +;;;;;; Uncomment lines above to save the default documentation. +;;(pushnew :BUILD-DOC *features*) + +#-:BUILD-DOC (ignore-errors (main :read-conf-file-p t)) -;;;;;; Uncomment lines above to save the default documentation. -;;(ignore-errors -;; (main :read-conf-file-p nil)) -;;(produce-all-docs) +#+:BUILD-DOC +(ignore-errors + (main :read-conf-file-p nil) + (produce-all-docs)) ;;; For debuging: start another sever (for example: 'startx -- :1'), Xnest diff --git a/src/bindings-second-mode.lisp b/src/bindings-second-mode.lisp index 097b8ca..0419fea 100644 --- a/src/bindings-second-mode.lisp +++ b/src/bindings-second-mode.lisp @@ -86,12 +86,6 @@ (do-shell cmd)))) (leave-second-mode)))) -(defun sm-ask-close/kill-current-window () - "Close or kill the current window (ask before doing anything)" - (setf *second-mode-leave-function* #'ask-close/kill-current-window) - (leave-second-mode)) - - (defun set-default-second-keys () (define-second-key ("F1" :mod-1) 'help-on-clfswm) diff --git a/src/clfswm-second-mode.lisp b/src/clfswm-second-mode.lisp index a80a4ef..9d36c53 100644 --- a/src/clfswm-second-mode.lisp +++ b/src/clfswm-second-mode.lisp @@ -156,3 +156,13 @@ (t (setf *in-second-mode* nil) (show-all-children)))) + +(defun sm-delete-focus-window () + "Close focus window: Delete the focus window in all frames and workspaces" + (setf *second-mode-leave-function* 'delete-focus-window) + (leave-second-mode)) + +(defun sm-ask-close/kill-current-window () + "Close or kill the current window (ask before doing anything)" + (setf *second-mode-leave-function* #'ask-close/kill-current-window) + (leave-second-mode)) diff --git a/src/clfswm-util.lisp b/src/clfswm-util.lisp index ec1348b..09621d2 100644 --- a/src/clfswm-util.lisp +++ b/src/clfswm-util.lisp @@ -272,11 +272,9 @@ (defun cut-focus-window () "Cut the focus window to the selection" (with-focus-window (window) - (let ((new-current-child nil)) - (let ((*current-child* window)) - (setf new-current-child (cut-current-child nil))) - (setf *current-child* new-current-child) - (show-all-children t)))) + (setf *current-child* (let ((*current-child* window)) + (cut-current-child nil))) + (show-all-children t))) -- 2.11.4.GIT