[clfswm-cvs] r337 - in clfswm: . doc src

Philippe Brochard pbrochard at common-lisp.net
Wed Sep 29 22:08:19 UTC 2010


Author: pbrochard
Date: Wed Sep 29 18:08:19 2010
New Revision: 337

Log:
TODO update. Documentation update.

Modified:
   clfswm/TODO
   clfswm/doc/corner.html
   clfswm/doc/corner.txt
   clfswm/doc/keys.html
   clfswm/doc/keys.txt
   clfswm/doc/menu.html
   clfswm/doc/menu.txt
   clfswm/load.lisp
   clfswm/src/clfswm-info.lisp
   clfswm/src/clfswm-util.lisp
   clfswm/src/menu-def.lisp

Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO	(original)
+++ clfswm/TODO	Wed Sep 29 18:08:19 2010
@@ -7,7 +7,7 @@
 ===============
 Should handle these soon.
 
-- configure: copy contrib/clfswm in . and set default values in it.
+- Add a binding/functions to circulate over children of the current child.
 
 MAYBE
 =====
@@ -28,6 +28,10 @@
     * up
     * down
 
+Maybe this can be done with a compositing system on Lisp with clx that support xrender.
+  http://en.wikipedia.org/wiki/Compositing_window_manager
+  http://ktown.kde.org/~fredrik/composite_howto.html
+
 - Undo/redo
 
 

Modified: clfswm/doc/corner.html
==============================================================================
--- clfswm/doc/corner.html	(original)
+++ clfswm/doc/corner.html	Wed Sep 29 18:08:19 2010
@@ -120,7 +120,7 @@
           Bottom-Left:
         </td>
         <td style="color:#0000ff" nowrap>
-          Start the file manager
+          ---
         </td>
       </tr>
     </table>

Modified: clfswm/doc/corner.txt
==============================================================================
--- clfswm/doc/corner.txt	(original)
+++ clfswm/doc/corner.txt	Wed Sep 29 18:08:19 2010
@@ -16,7 +16,7 @@
   Top-Left: Hide/Unhide a terminal
   Top-Right: Close or kill the current window (ask before doing anything)
   Bottom-Right: Present all windows in all frames (An expose like)
-  Bottom-Left: Start the file manager
+  Bottom-Left: ---
 
 *Corner-Second-Mode-Left-Button*:
   Top-Left: ---

Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html	(original)
+++ clfswm/doc/keys.html	Wed Sep 29 18:08:19 2010
@@ -321,7 +321,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ccedilla
+          1
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -332,7 +332,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Underscore
+          2
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -343,7 +343,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Egrave
+          3
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -354,7 +354,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Minus
+          4
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -365,7 +365,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Parenleft
+          5
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -376,7 +376,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quoteright
+          6
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -387,7 +387,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quotedbl
+          7
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -398,7 +398,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Eacute
+          8
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -409,7 +409,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ampersand
+          9
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -417,103 +417,15 @@
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Twosuperior
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
            Mod-1 
         </td>
         <td align="center" nowrap>
-          F2
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Open the Music Player Daemon (MPD) menu
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Mod-1 
-        </td>
-        <td align="center" nowrap>
-          Agrave
+          0
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
         </td>
       </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Pause
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Open the Reboot/Halt menu
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Control_r
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          176
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Raise the volume
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          174
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Lower the volume
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control 
-        </td>
-        <td align="center" nowrap>
-          66
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Present all windows in the current frame (An expose like)
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control  Shift 
-        </td>
-        <td align="center" nowrap>
-          66
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Present all windows in all frames (An expose like)
-        </td>
-      </tr>
     </table>
     <h3>
       <u>
@@ -1360,7 +1272,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ccedilla
+          1
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1371,7 +1283,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Underscore
+          2
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1382,7 +1294,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Egrave
+          3
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1393,7 +1305,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Minus
+          4
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1404,7 +1316,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Parenleft
+          5
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1415,7 +1327,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quoteright
+          6
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1426,7 +1338,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quotedbl
+          7
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1437,7 +1349,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Eacute
+          8
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1448,7 +1360,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ampersand
+          9
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1456,48 +1368,15 @@
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Twosuperior
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Agrave
+          0
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
         </td>
       </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Space
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the file manager
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Z
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the web browser
-        </td>
-      </tr>
     </table>
     <h3>
       <u>
@@ -2026,6 +1905,292 @@
           
         </td>
         <td align="center" nowrap>
+            A
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'a' (0)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            B
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'b' (1)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            C
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'c' (2)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            D
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'd' (3)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            E
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'e' (4)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            F
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'f' (5)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            G
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'g' (6)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            H
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'h' (7)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            I
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'i' (8)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            J
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'j' (9)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            K
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'k' (10)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            L
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'l' (11)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            M
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'm' (12)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            N
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'n' (13)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            O
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'o' (14)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            P
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'p' (15)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            Q
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'q' (16)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            R
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'r' (17)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            S
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 's' (18)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            T
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 't' (19)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            U
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'u' (20)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            V
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'v' (21)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            W
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'w' (22)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            X
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'x' (23)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            Y
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'y' (24)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            Z
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Select child 'z' (25)
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
           Escape
         </td>
         <td style="color:#0000ff" nowrap>
@@ -2175,17 +2340,6 @@
           Reset speed mouse coordinates
         </td>
       </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-            A
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Leave the expose mode
-        </td>
-      </tr>
     </table>
     <h3>
       <u>

Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt	(original)
+++ clfswm/doc/keys.txt	Wed Sep 29 18:08:19 2010
@@ -32,24 +32,16 @@
   Control              Escape          Close or kill the current window (ask before doing anything)
   Mod-1                T               Switch to editing mode
   Control              Less            Switch to editing mode
-  Mod-1                Ccedilla        Bind or jump to a slot (a frame or a window)
-  Mod-1                Underscore      Bind or jump to a slot (a frame or a window)
-  Mod-1                Egrave          Bind or jump to a slot (a frame or a window)
-  Mod-1                Minus           Bind or jump to a slot (a frame or a window)
-  Mod-1                Parenleft       Bind or jump to a slot (a frame or a window)
-  Mod-1                Quoteright      Bind or jump to a slot (a frame or a window)
-  Mod-1                Quotedbl        Bind or jump to a slot (a frame or a window)
-  Mod-1                Eacute          Bind or jump to a slot (a frame or a window)
-  Mod-1                Ampersand       Bind or jump to a slot (a frame or a window)
-                       Twosuperior     Move the pointer to the lower right corner of the screen
-  Mod-1                F2              Open the Music Player Daemon (MPD) menu
-  Mod-1                Agrave          Bind or jump to a slot (a frame or a window)
-                       Pause           Open the Reboot/Halt menu
-                       Control_r       Move the pointer to the lower right corner of the screen
-                       176             Raise the volume
-                       174             Lower the volume
-  Control              66              Present all windows in the current frame (An expose like)
-  Control Shift        66              Present all windows in all frames (An expose like)
+  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)
+  Mod-1                4               Bind or jump to a slot (a frame or a window)
+  Mod-1                5               Bind or jump to a slot (a frame or a window)
+  Mod-1                6               Bind or jump to a slot (a frame or a window)
+  Mod-1                7               Bind or jump to a slot (a frame or a window)
+  Mod-1                8               Bind or jump to a slot (a frame or a window)
+  Mod-1                9               Bind or jump to a slot (a frame or a window)
+  Mod-1                0               Bind or jump to a slot (a frame or a window)
 
 
 Mouse buttons actions in main mode:
@@ -135,19 +127,16 @@
   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)
-  Mod-1                Ccedilla        Bind or jump to a slot (a frame or a window)
-  Mod-1                Underscore      Bind or jump to a slot (a frame or a window)
-  Mod-1                Egrave          Bind or jump to a slot (a frame or a window)
-  Mod-1                Minus           Bind or jump to a slot (a frame or a window)
-  Mod-1                Parenleft       Bind or jump to a slot (a frame or a window)
-  Mod-1                Quoteright      Bind or jump to a slot (a frame or a window)
-  Mod-1                Quotedbl        Bind or jump to a slot (a frame or a window)
-  Mod-1                Eacute          Bind or jump to a slot (a frame or a window)
-  Mod-1                Ampersand       Bind or jump to a slot (a frame or a window)
-                       Twosuperior     Move the pointer to the lower right corner of the screen
-  Mod-1                Agrave          Bind or jump to a slot (a frame or a window)
-                       Space           start the file manager
-                       Z               start the web browser
+  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)
+  Mod-1                4               Bind or jump to a slot (a frame or a window)
+  Mod-1                5               Bind or jump to a slot (a frame or a window)
+  Mod-1                6               Bind or jump to a slot (a frame or a window)
+  Mod-1                7               Bind or jump to a slot (a frame or a window)
+  Mod-1                8               Bind or jump to a slot (a frame or a window)
+  Mod-1                9               Bind or jump to a slot (a frame or a window)
+  Mod-1                0               Bind or jump to a slot (a frame or a window)
 
 
 Mouse buttons actions in second mode:
@@ -214,6 +203,32 @@
 Expose windows mode keys:
 ------------------------
 
+                       A               Select child 'a' (0)
+                       B               Select child 'b' (1)
+                       C               Select child 'c' (2)
+                       D               Select child 'd' (3)
+                       E               Select child 'e' (4)
+                       F               Select child 'f' (5)
+                       G               Select child 'g' (6)
+                       H               Select child 'h' (7)
+                       I               Select child 'i' (8)
+                       J               Select child 'j' (9)
+                       K               Select child 'k' (10)
+                       L               Select child 'l' (11)
+                       M               Select child 'm' (12)
+                       N               Select child 'n' (13)
+                       O               Select child 'o' (14)
+                       P               Select child 'p' (15)
+                       Q               Select child 'q' (16)
+                       R               Select child 'r' (17)
+                       S               Select child 's' (18)
+                       T               Select child 't' (19)
+                       U               Select child 'u' (20)
+                       V               Select child 'v' (21)
+                       W               Select child 'w' (22)
+                       X               Select child 'x' (23)
+                       Y               Select child 'y' (24)
+                       Z               Select child 'z' (25)
                        Escape          Leave the expose mode
   Control              G               Leave the expose mode
   Mod-1                Escape          Leave the expose mode
@@ -228,7 +243,6 @@
   Control              Left            Undo last speed mouse move
   Control              Up              Revert to the first speed move mouse
   Control              Down            Reset speed mouse coordinates
-                       A               Leave the expose mode
 
 
 Mouse buttons actions in expose windows mode:

Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html	(original)
+++ clfswm/doc/menu.html	Wed Sep 29 18:08:19 2010
@@ -81,105 +81,6 @@
     <p>
       v: Show the current CLFSWM version
     </p>
-    <p>
-      F2: <a href="#MPD-MENU">< Music Player Daemon (MPD) menu ></a>
-    </p>
-    <p>
-      x: <a href="#XMMS-MENU">< XMMS menu ></a>
-    </p>
-    <p>
-      i: <a href="#CDPLAYER-MENU">< CDPLAYER menu ></a>
-    </p>
-    <hr>
-    <h3>
-      <a name="MPD-MENU"></a><a href="#HELP-MENU">Mpd-Menu</a>
-    </h3>
-    <p>
-      i: Show MPD informations
-    </p>
-    <p>
-      p: Play the previous song in the current playlist
-    </p>
-    <p>
-      n: Play the next song in the current playlist
-    </p>
-    <p>
-      t: Toggles Play/Pause, plays if stopped
-    </p>
-    <p>
-      y: Start playing
-    </p>
-    <p>
-      k: Stop the currently playing playlists
-    </p>
-    <p>
-      x: Seeks to +5%
-    </p>
-    <p>
-      w: Seeks to -5%
-    </p>
-    <p>
-      l: Show the current MPD playlist
-    </p>
-    <p>
-      s: Start sonata
-    </p>
-    <p>
-      g: Start gmpc
-    </p>
-    <hr>
-    <h3>
-      <a name="XMMS-MENU"></a><a href="#HELP-MENU">Xmms-Menu</a>
-    </h3>
-    <p>
-      r: Lanch XMMS
-    </p>
-    <p>
-      s: Show the current xmms status
-    </p>
-    <p>
-      l: Show the current xmms playlist
-    </p>
-    <p>
-      n: Play the next XMMS track
-    </p>
-    <p>
-      p: Play the previous XMMS track
-    </p>
-    <p>
-      e: open xmms "Load file(s)" dialog window.
-    </p>
-    <hr>
-    <h3>
-      <a name="CDPLAYER-MENU"></a><a href="#HELP-MENU">Cdplayer-Menu</a>
-    </h3>
-    <p>
-      y: Start playing CD
-    </p>
-    <p>
-      k: Stop playing CD
-    </p>
-    <p>
-      t: Toggle pause
-    </p>
-    <p>
-      s: Show the current CD status
-    </p>
-    <p>
-      l: Show the current CD playlist
-    </p>
-    <p>
-      n: Play the next CD track
-    </p>
-    <p>
-      p: Play the previous CD track
-    </p>
-    <p>
-      e: Eject CD
-    </p>
-    <p>
-      c: Close CD
-    </p>
     <hr>
     <h3>
       <a name="STANDARD-MENU"></a><a href="#MAIN">Standard-Menu</a>
@@ -2728,46 +2629,68 @@
       <a name="CONFIGURATION-MENU"></a><a href="#MAIN">Configuration-Menu</a>
     </h3>
     <p>
-      a: <a href="#CONF-HOOK-GROUP">< Hook group ></a>
+      a: <a href="#CONF-EXPOSE-MODE-GROUP">< Expose mode group ></a>
     </p>
     <p>
-      b: <a href="#CONF-MAIN-MODE-GROUP">< Main mode group ></a>
+      b: <a href="#CONF-HOOK-GROUP">< Hook group ></a>
     </p>
     <p>
-      c: <a href="#CONF-FRAME-COLORS-GROUP">< Frame colors group ></a>
+      c: <a href="#CONF-MAIN-MODE-GROUP">< Main mode group ></a>
     </p>
     <p>
-      d: <a href="#CONF-IDENTIFY-KEY-GROUP">< Identify key group ></a>
+      d: <a href="#CONF-FRAME-COLORS-GROUP">< Frame colors group ></a>
     </p>
     <p>
-      e: <a href="#CONF-CORNER-GROUP">< Corner group ></a>
+      e: <a href="#CONF-IDENTIFY-KEY-GROUP">< Identify key group ></a>
     </p>
     <p>
-      f: <a href="#CONF-QUERY-STRING-GROUP">< Query string group ></a>
+      f: <a href="#CONF-SECOND-MODE-GROUP">< Second mode group ></a>
     </p>
     <p>
-      g: <a href="#CONF-CIRCULATE-MODE-GROUP">< Circulate mode group ></a>
+      g: <a href="#CONF-CORNER-GROUP">< Corner group ></a>
     </p>
     <p>
-      h: <a href="#CONF-SECOND-MODE-GROUP">< Second mode group ></a>
+      h: <a href="#CONF-QUERY-STRING-GROUP">< Query string group ></a>
     </p>
     <p>
-      i: <a href="#CONF-PLACEMENT-GROUP">< Placement group ></a>
+      i: <a href="#CONF-CIRCULATE-MODE-GROUP">< Circulate mode group ></a>
     </p>
     <p>
-      j: <a href="#CONF-MISCELLANEOUS-GROUP">< Miscellaneous group ></a>
+      j: <a href="#CONF-PLACEMENT-GROUP">< Placement group ></a>
     </p>
     <p>
-      k: <a href="#CONF-INFO-MODE-GROUP">< Info mode group ></a>
+      k: <a href="#CONF-MISCELLANEOUS-GROUP">< Miscellaneous group ></a>
     </p>
     <p>
-      l: <a href="#CONF-MENU-GROUP">< Menu group ></a>
+      l: <a href="#CONF-INFO-MODE-GROUP">< Info mode group ></a>
+    </p>
+    <p>
+      m: <a href="#CONF-MENU-GROUP">< Menu group ></a>
     </p>
     <p>
       F2: Save all configuration variables in clfswmrc
     </p>
     <hr>
     <h3>
+      <a name="CONF-EXPOSE-MODE-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Expose-Mode-Group</a>
+    </h3>
+    <p>
+      a: Configure EXPOSE-FOREGROUND
+    </p>
+    <p>
+      b: Configure EXPOSE-VALID-ON-KEY
+    </p>
+    <p>
+      c: Configure EXPOSE-BORDER
+    </p>
+    <p>
+      d: Configure EXPOSE-FONT-STRING
+    </p>
+    <p>
+      e: Configure EXPOSE-BACKGROUND
+    </p>
+    <hr>
+    <h3>
       <a name="CONF-HOOK-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Hook-Group</a>
     </h3>
     <p>
@@ -2829,6 +2752,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-CORNER-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Corner-Group</a>
     </h3>
     <p>
@@ -2841,16 +2786,16 @@
       c: Configure CORNER-SECOND-MODE-LEFT-BUTTON
     </p>
     <p>
-      d: Configure CORNER-SECOND-MODE-RIGHT-BUTTON
+      d: Configure CORNER-MAIN-MODE-RIGHT-BUTTON
     </p>
     <p>
-      e: Configure CORNER-SIZE
+      e: Configure CORNER-SECOND-MODE-RIGHT-BUTTON
     </p>
     <p>
-      f: Configure CLFSWM-TERMINAL-CMD
+      f: Configure CORNER-SIZE
     </p>
     <p>
-      g: Configure CORNER-MAIN-MODE-RIGHT-BUTTON
+      g: Configure CLFSWM-TERMINAL-CMD
     </p>
     <p>
       h: Configure VIRTUAL-KEYBOARD-CMD
@@ -2882,10 +2827,10 @@
       <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-WIDTH
     </p>
     <p>
-      b: Configure CIRCULATE-WIDTH
+      b: Configure CIRCULATE-BORDER
     </p>
     <p>
       c: Configure CIRCULATE-HEIGHT
@@ -2904,28 +2849,6 @@
     </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-PLACEMENT-GROUP"></a><a href="#CONFIGURATION-MENU">Conf-Placement-Group</a>
     </h3>
     <p>
@@ -2938,10 +2861,13 @@
       c: Configure BANISH-POINTER-PLACEMENT
     </p>
     <p>
-      d: Configure INFO-MODE-PLACEMENT
+      d: Configure EXPOSE-MODE-PLACEMENT
     </p>
     <p>
-      e: Configure SECOND-MODE-PLACEMENT
+      e: Configure INFO-MODE-PLACEMENT
+    </p>
+    <p>
+      f: Configure SECOND-MODE-PLACEMENT
     </p>
     <hr>
     <h3>
@@ -3052,28 +2978,6 @@
     <p>
       x: Exit clfswm
     </p>
-    <p>
-      Pause: <a href="#REBOOT-HALT-MENU">< Suspend/Reboot/Halt menu ></a>
-    </p>
-    <hr>
-    <h3>
-      <a name="REBOOT-HALT-MENU"></a><a href="#CLFSWM-MENU">Reboot-Halt-Menu</a>
-    </h3>
-    <p>
-      -: Do nothing
-    </p>
-    <p>
-      s: Suspend the computer to RAM
-    </p>
-    <p>
-      d: Suspend the computer to DISK
-    </p>
-    <p>
-      r: Reboot the computer
-    </p>
-    <p>
-      h: Halt the computer
-    </p>
     <hr>
     <p>
       <small>

Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt	(original)
+++ clfswm/doc/menu.txt	Wed Sep 29 18:08:19 2010
@@ -24,41 +24,6 @@
 p: Show current processes sorted by CPU usage
 m: Show current processes sorted by memory usage
 v: Show the current CLFSWM version
-F2: < Music Player Daemon (MPD) menu >
-x: < XMMS menu >
-i: < CDPLAYER menu >
-
-Mpd-Menu
-i: Show MPD informations
-p: Play the previous song in the current playlist
-n: Play the next song in the current playlist
-t: Toggles Play/Pause, plays if stopped
-y: Start playing
-k: Stop the currently playing playlists
-x: Seeks to +5%
-w: Seeks to -5%
-l: Show the current MPD playlist
-s: Start sonata
-g: Start gmpc
-
-Xmms-Menu
-r: Lanch XMMS
-s: Show the current xmms status
-l: Show the current xmms playlist
-n: Play the next XMMS track
-p: Play the previous XMMS track
-e: open xmms "Load file(s)" dialog window.
-
-Cdplayer-Menu
-y: Start playing CD
-k: Stop playing CD
-t: Toggle pause
-s: Show the current CD status
-l: Show the current CD playlist
-n: Play the next CD track
-p: Play the previous CD track
-e: Eject CD
-c: Close CD
 
 Standard-Menu
 a: < TEXTEDITOR >
@@ -938,20 +903,28 @@
 p: Prompt for an other window manager
 
 Configuration-Menu
-a: < Hook group >
-b: < Main mode group >
-c: < Frame colors group >
-d: < Identify key group >
-e: < Corner group >
-f: < Query string group >
-g: < Circulate mode group >
-h: < Second mode group >
-i: < Placement group >
-j: < Miscellaneous group >
-k: < Info mode group >
-l: < Menu group >
+a: < Expose mode group >
+b: < Hook group >
+c: < Main mode group >
+d: < Frame colors group >
+e: < Identify key group >
+f: < Second mode group >
+g: < Corner group >
+h: < Query string group >
+i: < Circulate mode group >
+j: < Placement group >
+k: < Miscellaneous group >
+l: < Info mode group >
+m: < Menu group >
 F2: Save all configuration variables in clfswmrc
 
+Conf-Expose-Mode-Group
+a: Configure EXPOSE-FOREGROUND
+b: Configure EXPOSE-VALID-ON-KEY
+c: Configure EXPOSE-BORDER
+d: Configure EXPOSE-FONT-STRING
+e: Configure EXPOSE-BACKGROUND
+
 Conf-Hook-Group
 a: Configure INIT-HOOK
 b: Configure DEFAULT-NW-HOOK
@@ -975,14 +948,22 @@
 c: Configure IDENTIFY-BORDER
 d: Configure IDENTIFY-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-Corner-Group
 a: Configure CORNER-MAIN-MODE-LEFT-BUTTON
 b: Configure CORNER-SECOND-MODE-MIDDLE-BUTTON
 c: Configure CORNER-SECOND-MODE-LEFT-BUTTON
-d: Configure CORNER-SECOND-MODE-RIGHT-BUTTON
-e: Configure CORNER-SIZE
-f: Configure CLFSWM-TERMINAL-CMD
-g: Configure CORNER-MAIN-MODE-RIGHT-BUTTON
+d: Configure CORNER-MAIN-MODE-RIGHT-BUTTON
+e: Configure CORNER-SECOND-MODE-RIGHT-BUTTON
+f: Configure CORNER-SIZE
+g: Configure CLFSWM-TERMINAL-CMD
 h: Configure VIRTUAL-KEYBOARD-CMD
 i: Configure CORNER-MAIN-MODE-MIDDLE-BUTTON
 j: Configure CLFSWM-TERMINAL-NAME
@@ -994,28 +975,21 @@
 d: Configure QUERY-FOREGROUND
 
 Conf-Circulate-Mode-Group
-a: Configure CIRCULATE-BORDER
-b: Configure CIRCULATE-WIDTH
+a: Configure CIRCULATE-WIDTH
+b: Configure CIRCULATE-BORDER
 c: Configure CIRCULATE-HEIGHT
 d: Configure CIRCULATE-TEXT-LIMITE
 e: Configure CIRCULATE-FONT-STRING
 f: Configure CIRCULATE-BACKGROUND
 g: Configure CIRCULATE-FOREGROUND
 
-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-Placement-Group
 a: Configure CIRCULATE-MODE-PLACEMENT
 b: Configure QUERY-MODE-PLACEMENT
 c: Configure BANISH-POINTER-PLACEMENT
-d: Configure INFO-MODE-PLACEMENT
-e: Configure SECOND-MODE-PLACEMENT
+d: Configure EXPOSE-MODE-PLACEMENT
+e: Configure INFO-MODE-PLACEMENT
+f: Configure SECOND-MODE-PLACEMENT
 
 Conf-Miscellaneous-Group
 a: Configure HAVE-TO-COMPRESS-NOTIFY
@@ -1055,14 +1029,6 @@
 r: Reset clfswm
 l: Reload clfswm
 x: Exit clfswm
-Pause: < Suspend/Reboot/Halt menu >
-
-Reboot-Halt-Menu
--: Do nothing
-s: Suspend the computer to RAM
-d: Suspend the computer to DISK
-r: Reboot the computer
-h: Halt the computer
 
 
 This documentation was produced with the CLFSWM auto-doc functions. To reproduce it, use the produce-menu-doc-in-file or

Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp	(original)
+++ clfswm/load.lisp	Wed Sep 29 18:08:19 2010
@@ -61,6 +61,11 @@
 (ignore-errors
   (main :read-conf-file-p t))
 
+
+;;;; Uncomment lines above to save the default documentation.
+;;#-BUILD
+;;(ignore-errors
+;;  (main :read-conf-file-p nil))
 ;;(produce-all-docs)
 
 

Modified: clfswm/src/clfswm-info.lisp
==============================================================================
--- clfswm/src/clfswm-info.lisp	(original)
+++ clfswm/src/clfswm-info.lisp	Wed Sep 29 18:08:19 2010
@@ -458,6 +458,14 @@
   "Show the second mode key binding"
   (show-key-binding *second-keys* *second-mouse*))
 
+(defun show-circulate-mode-key-binding ()
+  "Show the circulate mode key binding"
+  (show-key-binding *circulate-keys*))
+
+(defun show-expose-window-mode-key-binding ()
+  "Show the expose window mode key binding"
+  (show-key-binding *expose-keys* *expose-mouse*))
+
 
 
 (defun corner-help-colorize-line (list)

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Wed Sep 29 18:08:19 2010
@@ -1210,9 +1210,9 @@
 
 
 ;;; Standard menu functions - Based on the XDG specifications
-(defparameter *xdg-section-list* (nconc '(TextEditor FileManager WebBrowser)
-					'(AudioVideo Audio Video Development Education Game Graphics Network Office Settings System Utility)
-					'(TerminalEmulator Archlinux Screensaver))
+(defparameter *xdg-section-list* (append '(TextEditor FileManager WebBrowser)
+					 '(AudioVideo Audio Video Development Education Game Graphics Network Office Settings System Utility)
+					 '(TerminalEmulator Archlinux Screensaver))
   "Config(Menu group): Standard menu sections")
 
 

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Wed Sep 29 18:08:19 2010
@@ -67,6 +67,8 @@
 (add-menu-key 'help-menu "h" 'show-global-key-binding)
 (add-menu-key 'help-menu "b" 'show-main-mode-key-binding)
 (add-menu-key 'help-menu "s" 'show-second-mode-key-binding)
+(add-menu-key 'help-menu "r" 'show-circulate-mode-key-binding)
+(add-menu-key 'help-menu "e" 'show-expose-window-mode-key-binding)
 (add-menu-key 'help-menu "c" 'show-corner-help)
 (add-menu-key 'help-menu "g" 'show-config-variable)
 (add-menu-key 'help-menu "d" 'show-date)




More information about the clfswm-cvs mailing list