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

pbrochard at common-lisp.net pbrochard at common-lisp.net
Mon May 12 20:31:17 UTC 2008


Author: pbrochard
Date: Mon May 12 16:31:09 2008
New Revision: 123

Modified:
   clfswm/ChangeLog
   clfswm/doc/keys.html
   clfswm/doc/keys.txt
   clfswm/doc/menu.html
   clfswm/doc/menu.txt
   clfswm/src/bindings-second-mode.lisp
   clfswm/src/clfswm-autodoc.lisp
   clfswm/src/clfswm-util.lisp
Log:
Show a message to follow the autodocumentation process. Second mode #\a: New	binding on 'add-default-frame'.

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Mon May 12 16:31:09 2008
@@ -1,3 +1,11 @@
+2008-05-12  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/bindings-second-mode.lisp (define-second-key #\a): New
+	binding on 'add-default-frame'.
+
+	* src/clfswm-autodoc.lisp (produce-*-doc-*-in-file): Show a
+	message to follow the autodocumentation process.
+
 2008-05-10  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-util.lisp (bind-or-jump): Bind "Tab", "Return" and

Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html	(original)
+++ clfswm/doc/keys.html	Mon May 12 16:31:09 2008
@@ -112,7 +112,7 @@
            Mod-1  Shift 
         </td>
         <td align="center" nowrap>
-          Iso_left_tab
+          Tab
         </td>
         <td style="color:#0000ff" nowrap>
           Select the previous child
@@ -544,7 +544,7 @@
           
         </td>
         <td align="center" nowrap>
-            <
+          Less
         </td>
         <td style="color:#0000ff" nowrap>
           Open the main menu
@@ -555,7 +555,7 @@
            Control 
         </td>
         <td align="center" nowrap>
-            <
+          Less
         </td>
         <td style="color:#0000ff" nowrap>
           Open the main menu
@@ -775,7 +775,7 @@
            Mod-1  Shift 
         </td>
         <td align="center" nowrap>
-          Iso_left_tab
+          Tab
         </td>
         <td style="color:#0000ff" nowrap>
           Select the previous child
@@ -871,6 +871,17 @@
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
+          
+        </td>
+        <td align="center" nowrap>
+            A
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Add a default frame in the current frame
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
            Control  Shift 
         </td>
         <td align="center" nowrap>
@@ -1328,17 +1339,6 @@
           
         </td>
         <td align="center" nowrap>
-             
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Leave the info mode
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
           Twosuperior
         </td>
         <td style="color:#0000ff" nowrap>

Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt	(original)
+++ clfswm/doc/keys.txt	Mon May 12 16:31:09 2008
@@ -13,7 +13,7 @@
 Mod-1                Down            Select the previous level in frame
 Mod-1                Up              Select the next level in frame
 Mod-1                Tab             Select the next child
-Mod-1 Shift          Iso_left_tab    Select the previous child
+Mod-1 Shift          Tab             Select the previous child
 Mod-1                Return          Enter in the selected frame - ie make it the root frame
 Mod-1 Shift          Return          Leave the selected frame - ie make its parent the root frame
 Mod-1                Home            Switch to the root frame
@@ -59,8 +59,8 @@
 
 Mod-1                F1              Open the help and info window for the second mode
                      M               Open the main menu
-                     <               Open the main menu
-Control              <               Open the main menu
+                     Less            Open the main menu
+Control              Less            Open the main menu
                      F               Open the frame menu
                      W               Open the window menu
                      N               Open the action by name menu
@@ -80,7 +80,7 @@
 Mod-1                Down            Select the previous level in frame
 Mod-1                Up              Select the next level in frame
 Mod-1                Tab             Select the next child
-Mod-1 Shift          Iso_left_tab    Select the previous child
+Mod-1 Shift          Tab             Select the previous child
 Mod-1                Return          Enter in the selected frame - ie make it the root frame
 Mod-1 Shift          Return          Leave the selected frame - ie make its parent the root frame
 Mod-1                Home            Switch to the root frame
@@ -89,6 +89,7 @@
 Mod-1                B               Move the pointer to the lower right corner of the screen
                      O               Open the next window in a new frame in the root frame
 Control              O               Open the next window in a new frame in the parent frame
+                     A               Add a default frame in the current frame
 Control Shift        Escape          Delete the focus window in all frames and workspaces
 Mod-1 Control Shift  Escape          Destroy the focus window in all frames and workspaces
 Control              Escape          Remove the focus window in the current frame
@@ -137,7 +138,6 @@
                      Q               Leave the info mode
                      Return          Leave the info mode
                      Escape          Leave the info mode
-                                     Leave the info mode
                      Twosuperior     Move the pointer to the lower right corner of the screen
                      Down            Move one line down
                      Up              Move one line up

Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html	(original)
+++ clfswm/doc/menu.html	Mon May 12 16:31:09 2008
@@ -74,10 +74,10 @@
       <a name="FRAME-ADDING-MENU"></a><a href="#FRAME-MENU">Frame-Adding-Menu</a>
     </h3>
     <p>
-      a: Add a default frame
+      a: Add a default frame in the current frame
     </p>
     <p>
-      p: Add a placed frame
+      p: Add a placed frame in the current frame
     </p>
     <hr>
     <h3>

Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt	(original)
+++ clfswm/doc/menu.txt	Mon May 12 16:31:09 2008
@@ -22,8 +22,8 @@
 x: Create a new frame for each window in frame
 
 Frame-Adding-Menu
-a: Add a default frame
-p: Add a placed frame
+a: Add a default frame in the current frame
+p: Add a placed frame in the current frame
 
 Frame-Layout-Menu
 a: Maximize windows in there frame - leave frame to there size (no layout)

Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp	(original)
+++ clfswm/src/bindings-second-mode.lisp	Mon May 12 16:31:09 2008
@@ -66,8 +66,8 @@
 
 
 (define-second-key ("m") 'open-menu)
-(define-second-key (#\<) 'open-menu)
-(define-second-key (#\< :control) 'open-menu)
+(define-second-key ("less") 'open-menu)
+(define-second-key ("less" :control) 'open-menu)
 
 (define-second-key ("f") 'open-frame-menu)
 (define-second-key ("w") 'open-window-menu)
@@ -124,6 +124,8 @@
 (define-second-key (#\o) 'set-open-in-new-frame-in-root-frame-nw-hook)
 (define-second-key (#\o :control) 'set-open-in-new-frame-in-parent-frame-nw-hook)
 
+(define-second-key (#\a) 'add-default-frame)
+
 ;;;; Escape
 (define-second-key ("Escape" :control :shift) 'delete-focus-window)
 (define-second-key ("Escape" :mod-1 :control :shift) 'destroy-focus-window)
@@ -154,7 +156,7 @@
 (define-shell (#\e) b-start-emacs "start emacs" "exec emacs")
 (define-shell (#\e :control) b-start-emacsremote
   "start an emacs for another user"
-  "exec emacsremote-Eterm")
+  "exec xterm -e emacsremote")
 (define-shell (#\h) b-start-xclock "start an xclock" "exec xclock -d")
 
 

Modified: clfswm/src/clfswm-autodoc.lisp
==============================================================================
--- clfswm/src/clfswm-autodoc.lisp	(original)
+++ clfswm/src/clfswm-autodoc.lisp	Mon May 12 16:31:09 2008
@@ -71,11 +71,13 @@
 
 
 (defun produce-doc-html-in-file (filename)
+  (format t "Producing html keys documentation in ~S " filename)
   (with-open-file (stream filename :direction :output
 			  :if-exists :supersede :if-does-not-exist :create)
     (produce-doc-html (list *main-keys* *main-mouse* *second-keys* *second-mouse*
 			    *info-keys* *info-mouse*)
-		      stream)))
+		      stream))
+  (format t " done~%"))
 
 
 
@@ -103,11 +105,13 @@
 			   
 
 (defun produce-doc-in-file (filename)
+  (format t "Producing text keys documentation in ~S " filename)
   (with-open-file (stream filename :direction :output
 			  :if-exists :supersede :if-does-not-exist :create)
     (produce-doc (list *main-keys* *main-mouse* *second-keys* *second-mouse*
 		       *info-keys* *info-mouse*)
-		 stream)))
+		 stream))
+  (format t " done~%"))
 
 
 
@@ -136,9 +140,11 @@
 
   
 (defun produce-menu-doc-in-file (filename)
+  (format t "Producing text menus documentation in ~S " filename)
   (with-open-file (stream filename :direction :output
 			  :if-exists :supersede :if-does-not-exist :create)
-    (produce-menu-doc stream)))
+    (produce-menu-doc stream))
+  (format t " done~%"))
 
 
 
@@ -179,9 +185,11 @@
 
   
 (defun produce-menu-doc-html-in-file (filename)
+  (format t "Producing html menus documentation in ~S " filename)
   (with-open-file (stream filename :direction :output
 			  :if-exists :supersede :if-does-not-exist :create)
-    (produce-menu-doc-html stream)))
+    (produce-menu-doc-html stream))
+  (format t " done~%"))
 
 
 

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Mon May 12 16:31:09 2008
@@ -56,7 +56,7 @@
 
 
 (defun add-default-frame ()
-  "Add a default frame"
+  "Add a default frame in the current frame"
   (when (frame-p *current-child*)
     (let ((name (query-string "Frame name")))
       (push (create-frame :name name) (frame-child *current-child*))))
@@ -64,7 +64,7 @@
     
 
 (defun add-placed-frame ()
-  "Add a placed frame"
+  "Add a placed frame in the current frame"
   (when (frame-p *current-child*)
     (let ((name (query-string "Frame name"))
 	  (x (/ (query-number "Frame x in percent (%)") 100))



More information about the clfswm-cvs mailing list