From 286ee1f527e2223dab6069e8248c5b3d4f422b4c Mon Sep 17 00:00:00 2001 From: Philippe Brochard Date: Tue, 9 Nov 2010 22:49:36 +0100 Subject: [PATCH] Documentation update --- clfswm.asd | 2 +- doc/keys.html | 52 +++++++++++----------- doc/keys.txt | 20 ++++----- doc/menu.html | 100 +++++++++++++++++++++--------------------- doc/menu.txt | 72 +++++++++++++++--------------- load.lisp | 2 +- src/bindings-second-mode.lisp | 9 ++-- src/clfswm-expose-mode.lisp | 13 +++--- 8 files changed, 137 insertions(+), 133 deletions(-) diff --git a/clfswm.asd b/clfswm.asd index e830cab..367dcdb 100644 --- a/clfswm.asd +++ b/clfswm.asd @@ -47,7 +47,7 @@ :depends-on ("package" "clfswm" "clfswm-internal" "clfswm-generic-mode" "clfswm-placement")) (:file "clfswm-expose-mode" - :depends-on ("package" "config" "clfswm-internal" "xlib-util" "tools" "clfswm-keys")) + :depends-on ("package" "config" "clfswm-internal" "xlib-util" "tools" "clfswm-keys" "clfswm-generic-mode")) (:file "clfswm-corner" :depends-on ("package" "config" "clfswm-internal" "clfswm-expose-mode" "xlib-util")) (:file "clfswm-info" diff --git a/doc/keys.html b/doc/keys.html index 163cf43..b17e134 100644 --- a/doc/keys.html +++ b/doc/keys.html @@ -252,68 +252,68 @@ - Shift + Control Shift F10 - Show all frames info windows until a key is release + Present all windows in all frames (An expose like) - Mod-1 Shift + F10 - Show all frames info windows + Present all windows in the current child (An expose like) - Control Shift + Control F10 - Show/Hide the root frame + Present all windows in the current frame (An expose like) - + Control - F10 + L2 - Present all windows in the current frame (An expose like) + Hide/Unhide a terminal - Control + Shift - F10 + L2 - Present all windows in all frames (An expose like) + Show all frames info windows until a key is release - Control + Mod-1 Shift L2 - Hide/Unhide a terminal + Show all frames info windows @@ -1269,57 +1269,57 @@ Or do actions on corners - Shift + Control Shift F10 - Show all frames info windows until a key is release + Present all windows in all frames (An expose like) - Mod-1 Shift + F10 - Show all frames info windows + Present all windows in the current child (An expose like) - Control Shift + Control F10 - Show/Hide the root frame + Present all windows in the current frame (An expose like) - + Shift - F10 + L2 - Present all windows in the current frame (An expose like) + Show all frames info windows until a key is release - Control + Mod-1 Shift - F10 + L2 - Present all windows in all frames (An expose like) + Show all frames info windows diff --git a/doc/keys.txt b/doc/keys.txt index 87fe995..fe5cfbc 100644 --- a/doc/keys.txt +++ b/doc/keys.txt @@ -26,12 +26,12 @@ Main mode keys: Mod-1 Home Switch to the root frame Mod-1 Shift Home Switch and select the root frame Mod-1 F10 Switch between two layouts - Shift F10 Show all frames info windows until a key is release - Mod-1 Shift F10 Show all frames info windows - Control Shift F10 Show/Hide the root frame - F10 Present all windows in the current frame (An expose like) - Control F10 Present all windows in all frames (An expose like) + Control Shift F10 Present all windows in all frames (An expose like) + F10 Present all windows in the current child (An expose like) + Control F10 Present all windows in the current frame (An expose like) Control L2 Hide/Unhide a terminal + Shift L2 Show all frames info windows until a key is release + Mod-1 Shift L2 Show all frames info windows Mod-1 B Move the pointer to the lower right corner of the screen Control Escape Close or kill the current window (ask before doing anything) Mod-1 T Switch to editing mode (second mode) @@ -127,11 +127,11 @@ Second mode keys: Control E start an emacs for another user H start an xclock Mod-1 F10 Switch between two layouts - Shift F10 Show all frames info windows until a key is release - Mod-1 Shift F10 Show all frames info windows - Control Shift F10 Show/Hide the root frame - F10 Present all windows in the current frame (An expose like) - Control F10 Present all windows in all frames (An expose like) + Control Shift F10 Present all windows in all frames (An expose like) + F10 Present all windows in the current child (An expose like) + Control F10 Present all windows in the current frame (An expose like) + Shift L2 Show all frames info windows until a key is release + Mod-1 Shift L2 Show all frames info windows Mod-1 1 Bind or jump to a slot (a frame or a window) Mod-1 2 Bind or jump to a slot (a frame or a window) Mod-1 3 Bind or jump to a slot (a frame or a window) diff --git a/doc/menu.html b/doc/menu.html index 2c6d64a..b4b46dd 100644 --- a/doc/menu.html +++ b/doc/menu.html @@ -2698,40 +2698,40 @@ b: < Notify Window mode group >

- c: < Identify key group > + c: < Expose mode group >

- d: < Expose mode group > + d: < Hook group >

- e: < Hook group > + e: < Main mode group >

- f: < Main mode group > + f: < Frame colors group >

- g: < Frame colors group > + g: < Identify key group >

- h: < Second mode group > + h: < Corner group >

- i: < Corner group > + i: < Circulate mode group >

- j: < Circulate mode group > + j: < Query string group >

- k: < Query string group > + k: < Placement group >

- l: < Placement group > + l: < Miscellaneous group >

- m: < Miscellaneous group > + m: < Info mode group >

- n: < Info mode group > + n: < Second mode group >

o: < Menu group > @@ -2764,22 +2764,6 @@

- Conf-Identify-Key-Group -

-

- a: Configure IDENTIFY-FOREGROUND -

-

- b: Configure IDENTIFY-BACKGROUND -

-

- c: Configure IDENTIFY-FONT-STRING -

-

- d: Configure IDENTIFY-BORDER -

-
-

Conf-Expose-Mode-Group

@@ -2850,25 +2834,19 @@

- Conf-Second-Mode-Group + Conf-Identify-Key-Group

- a: Configure SM-FOREGROUND-COLOR -

-

- b: Configure SM-BACKGROUND-COLOR -

-

- c: Configure SM-HEIGHT + a: Configure IDENTIFY-FOREGROUND

- d: Configure SM-WIDTH + b: Configure IDENTIFY-FONT-STRING

- e: Configure SM-BORDER-COLOR + c: Configure IDENTIFY-BORDER

- f: Configure SM-FONT-STRING + d: Configure IDENTIFY-BACKGROUND

@@ -2909,19 +2887,19 @@ Conf-Circulate-Mode-Group

- a: Configure CIRCULATE-BORDER + a: Configure CIRCULATE-TEXT-LIMITE

- b: Configure CIRCULATE-HEIGHT + b: Configure CIRCULATE-BORDER

- c: Configure CIRCULATE-TEXT-LIMITE + c: Configure CIRCULATE-WIDTH

- d: Configure CIRCULATE-FONT-STRING + d: Configure CIRCULATE-HEIGHT

- e: Configure CIRCULATE-WIDTH + e: Configure CIRCULATE-FONT-STRING

f: Configure CIRCULATE-BACKGROUND @@ -2987,28 +2965,28 @@ Conf-Miscellaneous-Group

- a: Configure CREATE-FRAME-ON-ROOT + a: Configure HAVE-TO-COMPRESS-NOTIFY

- b: Configure HAVE-TO-COMPRESS-NOTIFY + b: Configure HIDE-UNMANAGED-WINDOW

c: Configure DEFAULT-WINDOW-WIDTH

- d: Configure NEVER-MANAGED-WINDOW-LIST + d: Configure CREATE-FRAME-ON-ROOT

e: Configure DEFAULT-MANAGED-TYPE

- f: Configure HIDE-UNMANAGED-WINDOW + f: Configure DEFAULT-FRAME-DATA

- g: Configure DEFAULT-FRAME-DATA + g: Configure DEFAULT-MODIFIERS

- h: Configure DEFAULT-MODIFIERS + h: Configure NEVER-MANAGED-WINDOW-LIST

i: Configure DEFAULT-WINDOW-HEIGHT @@ -3061,6 +3039,28 @@

+ Conf-Second-Mode-Group +

+

+ a: Configure SM-FOREGROUND-COLOR +

+

+ b: Configure SM-BACKGROUND-COLOR +

+

+ c: Configure SM-HEIGHT +

+

+ d: Configure SM-WIDTH +

+

+ e: Configure SM-BORDER-COLOR +

+

+ f: Configure SM-FONT-STRING +

+
+

Conf-Menu-Group

diff --git a/doc/menu.txt b/doc/menu.txt index e0c0683..6493d46 100644 --- a/doc/menu.txt +++ b/doc/menu.txt @@ -926,18 +926,18 @@ p: Prompt for an other window manager Configuration-Menu a: < Notify Window group > b: < Notify Window mode group > -c: < Identify key group > -d: < Expose mode group > -e: < Hook group > -f: < Main mode group > -g: < Frame colors group > -h: < Second mode group > -i: < Corner group > -j: < Circulate mode group > -k: < Query string group > -l: < Placement group > -m: < Miscellaneous group > -n: < Info mode group > +c: < Expose mode group > +d: < Hook group > +e: < Main mode group > +f: < Frame colors group > +g: < Identify key group > +h: < Corner group > +i: < Circulate mode group > +j: < Query string group > +k: < Placement group > +l: < Miscellaneous group > +m: < Info mode group > +n: < Second mode group > o: < Menu group > F2: Save all configuration variables in clfswmrc @@ -950,12 +950,6 @@ d: Configure NOTIFY-WINDOW-BACKGROUND Conf-Notify-Window-Mode-Group a: Configure NOTIFY-WINDOW-FONT-STRING -Conf-Identify-Key-Group -a: Configure IDENTIFY-FOREGROUND -b: Configure IDENTIFY-BACKGROUND -c: Configure IDENTIFY-FONT-STRING -d: Configure IDENTIFY-BORDER - Conf-Expose-Mode-Group a: Configure EXPOSE-FOREGROUND b: Configure EXPOSE-SHOW-WINDOW-TITLE @@ -982,13 +976,11 @@ b: Configure FRAME-FOREGROUND c: Configure FRAME-FOREGROUND-HIDDEN d: Configure FRAME-BACKGROUND -Conf-Second-Mode-Group -a: Configure SM-FOREGROUND-COLOR -b: Configure SM-BACKGROUND-COLOR -c: Configure SM-HEIGHT -d: Configure SM-WIDTH -e: Configure SM-BORDER-COLOR -f: Configure SM-FONT-STRING +Conf-Identify-Key-Group +a: Configure IDENTIFY-FOREGROUND +b: Configure IDENTIFY-FONT-STRING +c: Configure IDENTIFY-BORDER +d: Configure IDENTIFY-BACKGROUND Conf-Corner-Group a: Configure CORNER-MAIN-MODE-LEFT-BUTTON @@ -1003,11 +995,11 @@ i: Configure CORNER-MAIN-MODE-MIDDLE-BUTTON j: Configure CLFSWM-TERMINAL-NAME Conf-Circulate-Mode-Group -a: Configure CIRCULATE-BORDER -b: Configure CIRCULATE-HEIGHT -c: Configure CIRCULATE-TEXT-LIMITE -d: Configure CIRCULATE-FONT-STRING -e: Configure CIRCULATE-WIDTH +a: Configure CIRCULATE-TEXT-LIMITE +b: Configure CIRCULATE-BORDER +c: Configure CIRCULATE-WIDTH +d: Configure CIRCULATE-HEIGHT +e: Configure CIRCULATE-FONT-STRING f: Configure CIRCULATE-BACKGROUND g: Configure CIRCULATE-FOREGROUND @@ -1031,14 +1023,14 @@ f: Configure INFO-MODE-PLACEMENT g: Configure SECOND-MODE-PLACEMENT Conf-Miscellaneous-Group -a: Configure CREATE-FRAME-ON-ROOT -b: Configure HAVE-TO-COMPRESS-NOTIFY +a: Configure HAVE-TO-COMPRESS-NOTIFY +b: Configure HIDE-UNMANAGED-WINDOW c: Configure DEFAULT-WINDOW-WIDTH -d: Configure NEVER-MANAGED-WINDOW-LIST +d: Configure CREATE-FRAME-ON-ROOT e: Configure DEFAULT-MANAGED-TYPE -f: Configure HIDE-UNMANAGED-WINDOW -g: Configure DEFAULT-FRAME-DATA -h: Configure DEFAULT-MODIFIERS +f: Configure DEFAULT-FRAME-DATA +g: Configure DEFAULT-MODIFIERS +h: Configure NEVER-MANAGED-WINDOW-LIST i: Configure DEFAULT-WINDOW-HEIGHT j: Configure DEFAULT-FONT-STRING k: Configure DEFAULT-FOCUS-POLICY @@ -1057,6 +1049,14 @@ i: Configure INFO-FONT-STRING j: Configure INFO-COLOR-TITLE k: Configure INFO-COLOR-SECOND +Conf-Second-Mode-Group +a: Configure SM-FOREGROUND-COLOR +b: Configure SM-BACKGROUND-COLOR +c: Configure SM-HEIGHT +d: Configure SM-WIDTH +e: Configure SM-BORDER-COLOR +f: Configure SM-FONT-STRING + Conf-Menu-Group a: Configure MENU-COLOR-COMMENT b: Configure MENU-COLOR-KEY diff --git a/load.lisp b/load.lisp index 67a2793..4703487 100644 --- a/load.lisp +++ b/load.lisp @@ -58,7 +58,7 @@ (in-package :clfswm) (ignore-errors - (main :read-conf-file-p t)) + (main :read-conf-file-p t)) ;;;; Uncomment lines above to save the default documentation. diff --git a/src/bindings-second-mode.lisp b/src/bindings-second-mode.lisp index c6d3cbf..5a7fb54 100644 --- a/src/bindings-second-mode.lisp +++ b/src/bindings-second-mode.lisp @@ -145,11 +145,12 @@ "exec xterm -e emacsremote") (define-shell (#\h) b-start-xclock "start an xclock" "exec xclock -d") (define-second-key ("F10" :mod-1) 'fast-layout-switch) - (define-second-key ("F10" :shift) 'show-all-frames-info-key) - (define-second-key ("F10" :shift :mod-1) 'show-all-frames-info) (define-second-key ("F10" :shift :control) 'toggle-show-root-frame) - (define-second-key ("F10") 'expose-windows-mode) - (define-second-key ("F10" :control) 'expose-all-windows-mode) + (define-second-key ("F10") 'expose-windows-current-child-mode) + (define-second-key ("F10" :control) 'expose-windows-mode) + (define-second-key ("F10" :control :shift) 'expose-all-windows-mode) + (define-second-key ("L2" :shift) 'show-all-frames-info-key) + (define-second-key ("L2" :shift :mod-1) 'show-all-frames-info) ;; Bind or jump functions (define-second-key ("1" :mod-1) 'bind-or-jump 1) (define-second-key ("2" :mod-1) 'bind-or-jump 2) diff --git a/src/clfswm-expose-mode.lisp b/src/clfswm-expose-mode.lisp index cf27198..3563094 100644 --- a/src/clfswm-expose-mode.lisp +++ b/src/clfswm-expose-mode.lisp @@ -184,7 +184,8 @@ (grab-main-keys)) (if grab-pointer-p (xgrab-pointer *root* 66 67) - (xungrab-pointer))) + (xungrab-pointer)) + (wait-no-key-or-button-press)) t) @@ -211,11 +212,13 @@ (stop-button-event) (when (frame-p *current-child*) (let ((orig-root *current-root*)) - (hide-all *current-root*) - (setf *current-root* *current-child*) + (unless (child-equal-p *current-child* *current-root*) + (hide-all *current-root*) + (setf *current-root* *current-child*)) (expose-windows-generic *current-root*) - (hide-all *current-root*) - (setf *current-root* orig-root) + (unless (child-equal-p *current-child* orig-root) + (hide-all *current-root*) + (setf *current-root* orig-root)) (show-all-children *current-root*)))) -- 2.11.4.GIT