[clfswm-cvs] r381 - in clfswm: . doc src
Philippe Brochard
pbrochard at common-lisp.net
Tue Nov 9 21:47:00 UTC 2010
Author: pbrochard
Date: Tue Nov 9 16:47:00 2010
New Revision: 381
Log:
Documentation update
Modified:
clfswm/clfswm.asd
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/doc/menu.html
clfswm/doc/menu.txt
clfswm/load.lisp
clfswm/src/bindings-second-mode.lisp
clfswm/src/clfswm-expose-mode.lisp
Modified: clfswm/clfswm.asd
==============================================================================
--- clfswm/clfswm.asd (original)
+++ clfswm/clfswm.asd Tue Nov 9 16:47:00 2010
@@ -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"
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html (original)
+++ clfswm/doc/keys.html Tue Nov 9 16:47:00 2010
@@ -252,68 +252,68 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Shift
+ Control Shift
</td>
<td align="center" nowrap>
F10
</td>
<td style="color:#0000ff" nowrap>
- Show all frames info windows until a key is release
+ Present all windows in all frames (An expose like)
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Mod-1 Shift
+
</td>
<td align="center" nowrap>
F10
</td>
<td style="color:#0000ff" nowrap>
- Show all frames info windows
+ Present all windows in the current child (An expose like)
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control Shift
+ Control
</td>
<td align="center" nowrap>
F10
</td>
<td style="color:#0000ff" nowrap>
- Show/Hide the root frame
+ Present all windows in the current frame (An expose like)
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
-
+ Control
</td>
<td align="center" nowrap>
- F10
+ L2
</td>
<td style="color:#0000ff" nowrap>
- Present all windows in the current frame (An expose like)
+ Hide/Unhide a terminal
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control
+ Shift
</td>
<td align="center" nowrap>
- F10
+ L2
</td>
<td style="color:#0000ff" nowrap>
- Present all windows in all frames (An expose like)
+ Show all frames info windows until a key is release
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control
+ Mod-1 Shift
</td>
<td align="center" nowrap>
L2
</td>
<td style="color:#0000ff" nowrap>
- Hide/Unhide a terminal
+ Show all frames info windows
</td>
</tr>
<tr>
@@ -1269,57 +1269,57 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Shift
+ Control Shift
</td>
<td align="center" nowrap>
F10
</td>
<td style="color:#0000ff" nowrap>
- Show all frames info windows until a key is release
+ Present all windows in all frames (An expose like)
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Mod-1 Shift
+
</td>
<td align="center" nowrap>
F10
</td>
<td style="color:#0000ff" nowrap>
- Show all frames info windows
+ Present all windows in the current child (An expose like)
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control Shift
+ Control
</td>
<td align="center" nowrap>
F10
</td>
<td style="color:#0000ff" nowrap>
- Show/Hide the root frame
+ Present all windows in the current frame (An expose like)
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
-
+ Shift
</td>
<td align="center" nowrap>
- F10
+ L2
</td>
<td style="color:#0000ff" nowrap>
- Present all windows in the current frame (An expose like)
+ Show all frames info windows until a key is release
</td>
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control
+ Mod-1 Shift
</td>
<td align="center" nowrap>
- F10
+ L2
</td>
<td style="color:#0000ff" nowrap>
- Present all windows in all frames (An expose like)
+ Show all frames info windows
</td>
</tr>
<tr>
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt (original)
+++ clfswm/doc/keys.txt Tue Nov 9 16:47:00 2010
@@ -26,12 +26,12 @@
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 @@
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)
Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html (original)
+++ clfswm/doc/menu.html Tue Nov 9 16:47:00 2010
@@ -2698,40 +2698,40 @@
b: <a href="#CONF-NOTIFY-WINDOW-MODE-GROUP">< Notify Window mode group ></a>
</p>
<p>
- c: <a href="#CONF-IDENTIFY-KEY-GROUP">< Identify key group ></a>
+ c: <a href="#CONF-EXPOSE-MODE-GROUP">< Expose mode group ></a>
</p>
<p>
- d: <a href="#CONF-EXPOSE-MODE-GROUP">< Expose mode group ></a>
+ d: <a href="#CONF-HOOK-GROUP">< Hook group ></a>
</p>
<p>
- e: <a href="#CONF-HOOK-GROUP">< Hook group ></a>
+ e: <a href="#CONF-MAIN-MODE-GROUP">< Main mode group ></a>
</p>
<p>
- f: <a href="#CONF-MAIN-MODE-GROUP">< Main mode group ></a>
+ f: <a href="#CONF-FRAME-COLORS-GROUP">< Frame colors group ></a>
</p>
<p>
- g: <a href="#CONF-FRAME-COLORS-GROUP">< Frame colors group ></a>
+ g: <a href="#CONF-IDENTIFY-KEY-GROUP">< Identify key group ></a>
</p>
<p>
- h: <a href="#CONF-SECOND-MODE-GROUP">< Second mode group ></a>
+ h: <a href="#CONF-CORNER-GROUP">< Corner group ></a>
</p>
<p>
- i: <a href="#CONF-CORNER-GROUP">< Corner group ></a>
+ i: <a href="#CONF-CIRCULATE-MODE-GROUP">< Circulate mode group ></a>
</p>
<p>
- j: <a href="#CONF-CIRCULATE-MODE-GROUP">< Circulate mode group ></a>
+ j: <a href="#CONF-QUERY-STRING-GROUP">< Query string group ></a>
</p>
<p>
- k: <a href="#CONF-QUERY-STRING-GROUP">< Query string group ></a>
+ k: <a href="#CONF-PLACEMENT-GROUP">< Placement group ></a>
</p>
<p>
- l: <a href="#CONF-PLACEMENT-GROUP">< Placement group ></a>
+ l: <a href="#CONF-MISCELLANEOUS-GROUP">< Miscellaneous group ></a>
</p>
<p>
- m: <a href="#CONF-MISCELLANEOUS-GROUP">< Miscellaneous group ></a>
+ m: <a href="#CONF-INFO-MODE-GROUP">< Info mode group ></a>
</p>
<p>
- n: <a href="#CONF-INFO-MODE-GROUP">< Info mode group ></a>
+ n: <a href="#CONF-SECOND-MODE-GROUP">< Second mode group ></a>
</p>
<p>
o: <a href="#CONF-MENU-GROUP">< Menu group ></a>
@@ -2764,22 +2764,6 @@
</p>
<hr>
<h3>
- <a name="CONF-IDENTIFY-KEY-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Identify-Key-Group</a>
- </h3>
- <p>
- a: Configure IDENTIFY-FOREGROUND
- </p>
- <p>
- b: Configure IDENTIFY-BACKGROUND
- </p>
- <p>
- c: Configure IDENTIFY-FONT-STRING
- </p>
- <p>
- d: Configure IDENTIFY-BORDER
- </p>
- <hr>
- <h3>
<a name="CONF-EXPOSE-MODE-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Expose-Mode-Group</a>
</h3>
<p>
@@ -2850,25 +2834,19 @@
</p>
<hr>
<h3>
- <a name="CONF-SECOND-MODE-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Second-Mode-Group</a>
+ <a name="CONF-IDENTIFY-KEY-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Identify-Key-Group</a>
</h3>
<p>
- a: Configure SM-FOREGROUND-COLOR
- </p>
- <p>
- b: Configure SM-BACKGROUND-COLOR
- </p>
- <p>
- c: Configure SM-HEIGHT
+ a: Configure IDENTIFY-FOREGROUND
</p>
<p>
- d: Configure SM-WIDTH
+ b: Configure IDENTIFY-FONT-STRING
</p>
<p>
- e: Configure SM-BORDER-COLOR
+ c: Configure IDENTIFY-BORDER
</p>
<p>
- f: Configure SM-FONT-STRING
+ d: Configure IDENTIFY-BACKGROUND
</p>
<hr>
<h3>
@@ -2909,19 +2887,19 @@
<a name="CONF-CIRCULATE-MODE-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Circulate-Mode-Group</a>
</h3>
<p>
- a: Configure CIRCULATE-BORDER
+ a: Configure CIRCULATE-TEXT-LIMITE
</p>
<p>
- b: Configure CIRCULATE-HEIGHT
+ b: Configure CIRCULATE-BORDER
</p>
<p>
- c: Configure CIRCULATE-TEXT-LIMITE
+ c: Configure CIRCULATE-WIDTH
</p>
<p>
- d: Configure CIRCULATE-FONT-STRING
+ d: Configure CIRCULATE-HEIGHT
</p>
<p>
- e: Configure CIRCULATE-WIDTH
+ e: Configure CIRCULATE-FONT-STRING
</p>
<p>
f: Configure CIRCULATE-BACKGROUND
@@ -2987,28 +2965,28 @@
<a name="CONF-MISCELLANEOUS-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Miscellaneous-Group</a>
</h3>
<p>
- a: Configure CREATE-FRAME-ON-ROOT
+ a: Configure HAVE-TO-COMPRESS-NOTIFY
</p>
<p>
- b: Configure HAVE-TO-COMPRESS-NOTIFY
+ b: Configure HIDE-UNMANAGED-WINDOW
</p>
<p>
c: Configure DEFAULT-WINDOW-WIDTH
</p>
<p>
- d: Configure NEVER-MANAGED-WINDOW-LIST
+ d: Configure CREATE-FRAME-ON-ROOT
</p>
<p>
e: Configure DEFAULT-MANAGED-TYPE
</p>
<p>
- f: Configure HIDE-UNMANAGED-WINDOW
+ f: Configure DEFAULT-FRAME-DATA
</p>
<p>
- g: Configure DEFAULT-FRAME-DATA
+ g: Configure DEFAULT-MODIFIERS
</p>
<p>
- h: Configure DEFAULT-MODIFIERS
+ h: Configure NEVER-MANAGED-WINDOW-LIST
</p>
<p>
i: Configure DEFAULT-WINDOW-HEIGHT
@@ -3061,6 +3039,28 @@
</p>
<hr>
<h3>
+ <a name="CONF-SECOND-MODE-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Second-Mode-Group</a>
+ </h3>
+ <p>
+ a: Configure SM-FOREGROUND-COLOR
+ </p>
+ <p>
+ b: Configure SM-BACKGROUND-COLOR
+ </p>
+ <p>
+ c: Configure SM-HEIGHT
+ </p>
+ <p>
+ d: Configure SM-WIDTH
+ </p>
+ <p>
+ e: Configure SM-BORDER-COLOR
+ </p>
+ <p>
+ f: Configure SM-FONT-STRING
+ </p>
+ <hr>
+ <h3>
<a name="CONF-MENU-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Menu-Group</a>
</h3>
<p>
Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt (original)
+++ clfswm/doc/menu.txt Tue Nov 9 16:47:00 2010
@@ -926,18 +926,18 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp (original)
+++ clfswm/load.lisp Tue Nov 9 16:47:00 2010
@@ -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.
Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp (original)
+++ clfswm/src/bindings-second-mode.lisp Tue Nov 9 16:47:00 2010
@@ -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)
Modified: clfswm/src/clfswm-expose-mode.lisp
==============================================================================
--- clfswm/src/clfswm-expose-mode.lisp (original)
+++ clfswm/src/clfswm-expose-mode.lisp Tue Nov 9 16:47:00 2010
@@ -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*))))
More information about the clfswm-cvs
mailing list