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

Philippe Brochard pbrochard at common-lisp.net
Sun May 10 21:10:51 UTC 2009


Author: pbrochard
Date: Sun May 10 17:10:50 2009
New Revision: 229

Log:
reorder-brother: Handle root-frame correctly.

Modified:
   clfswm/ChangeLog
   clfswm/doc/keys.html
   clfswm/doc/keys.txt
   clfswm/doc/menu.html
   clfswm/doc/menu.txt
   clfswm/src/clfswm-circulate-mode.lisp
   clfswm/src/clfswm-second-mode.lisp
   clfswm/src/menu-def.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sun May 10 17:10:50 2009
@@ -1,5 +1,8 @@
 2009-05-10  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/clfswm-circulate-mode.lisp (reorder-brother): Handle
+	root-frame correctly.
+
 	* clfswm.asd: Dependency fix for clfswm-generic-mode.
 
 	* src/clfswm-circulate-mode.lisp (reorder-child)

Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html	(original)
+++ clfswm/doc/keys.html	Sun May 10 17:10:50 2009
@@ -313,8 +313,7 @@
             T
         </td>
         <td style="color:#0000ff" nowrap>
-          <nil>
-          </nil>
+          Switch to editing mode
         </td>
       </tr>
       <tr>
@@ -325,8 +324,7 @@
           Less
         </td>
         <td style="color:#0000ff" nowrap>
-          <nil>
-          </nil>
+          Switch to editing mode
         </td>
       </tr>
       <tr>
@@ -1627,7 +1625,7 @@
           
         </td>
         <td align="center" nowrap>
-          Motion
+          Clfswm  motion
         </td>
         <td style="color:#0000ff" nowrap>
           Grab text

Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt	(original)
+++ clfswm/doc/keys.txt	Sun May 10 17:10:50 2009
@@ -31,8 +31,8 @@
   Mod-1 Control Shift  Escape          Kill focus window: Destroy the focus window in all frames and workspaces
   Control              Escape          Remove the focus window in the current frame
   Shift                Escape          Unhide all hidden windows into the current child
-  Mod-1                T               NIL
-  Control              Less            NIL
+  Mod-1                T               Switch to editing mode
+  Control              Less            Switch to editing mode
   Mod-1                |1|             Bind or jump to a slot
   Mod-1                |2|             Bind or jump to a slot
   Mod-1                |3|             Bind or jump to a slot
@@ -171,7 +171,7 @@
                        2               Leave the info mode
                        4               Move one line up
                        5               Move one line down
-                       Motion          Grab text
+                       Clfswm::motion   Grab text
 
 
 

Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html	(original)
+++ clfswm/doc/menu.html	Sun May 10 17:10:50 2009
@@ -93,9 +93,6 @@
       a: <a href="#FRAME-ADDING-MENU">< Adding frame menu ></a>
     </p>
     <p>
-      x: Maximize/Unmaximize the current frame in its parent frame
-    </p>
-    <p>
       l: <a href="#FRAME-LAYOUT-MENU">< Frame layout menu ></a>
     </p>
     <p>
@@ -113,6 +110,9 @@
     <p>
       s: <a href="#FRAME-MISCELLANEOUS-MENU">< Frame miscallenous menu ></a>
     </p>
+    <p>
+      x: Maximize/Unmaximize the current frame in its parent frame
+    </p>
     <hr>
     <h3>
       <a name="FRAME-ADDING-MENU"></a><a href="#FRAME-MENU">Frame-Adding-Menu</a>

Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt	(original)
+++ clfswm/doc/menu.txt	Sun May 10 17:10:50 2009
@@ -29,13 +29,13 @@
 
 Frame-Menu
 a: < Adding frame menu >
-x: Maximize/Unmaximize the current frame in its parent frame
 l: < Frame layout menu >
 n: < Frame new window hook menu >
 m: < Frame movement menu >
 f: < Frame focus policy menu >
 w: < Managed window type menu >
 s: < Frame miscallenous menu >
+x: Maximize/Unmaximize the current frame in its parent frame
 
 Frame-Adding-Menu
 a: Add a default frame in the current frame

Modified: clfswm/src/clfswm-circulate-mode.lisp
==============================================================================
--- clfswm/src/clfswm-circulate-mode.lisp	(original)
+++ clfswm/src/clfswm-circulate-mode.lisp	Sun May 10 17:10:50 2009
@@ -95,7 +95,9 @@
 		*current-child* (frame-selected-child *circulate-parent*)))
 	(when frame-is-root?
 	  (setf *current-root* *current-child*))))
-    (show-all-children (find-parent-frame *current-child*))
+    (show-all-children (if frame-is-root?
+			   *current-child*
+			   (find-parent-frame *current-child*)))
     (draw-circulate-mode-window)))
 
 

Modified: clfswm/src/clfswm-second-mode.lisp
==============================================================================
--- clfswm/src/clfswm-second-mode.lisp	(original)
+++ clfswm/src/clfswm-second-mode.lisp	Sun May 10 17:10:50 2009
@@ -238,6 +238,7 @@
 
 
 (defun second-key-mode ()
+  "Switch to editing mode"
   (generic-mode 'exit-second-loop
 		:enter-function #'sm-enter-function
 		:loop-function #'sm-loop-function

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Sun May 10 17:10:50 2009
@@ -77,14 +77,13 @@
 
 
 (add-sub-menu 'frame-menu "a" 'frame-adding-menu "Adding frame menu")
-(add-menu-key 'frame-menu "x" 'frame-toggle-maximize)
 (add-sub-menu 'frame-menu "l" 'frame-layout-menu "Frame layout menu")
 (add-sub-menu 'frame-menu "n" 'frame-nw-hook-menu "Frame new window hook menu")
 (add-sub-menu 'frame-menu "m" 'frame-movement-menu "Frame movement menu")
 (add-sub-menu 'frame-menu "f" 'frame-focus-policy "Frame focus policy menu")
 (add-sub-menu 'frame-menu "w" 'frame-managed-window-menu "Managed window type menu")
 (add-sub-menu 'frame-menu "s" 'frame-miscellaneous-menu "Frame miscallenous menu")
-
+(add-menu-key 'frame-menu "x" 'frame-toggle-maximize)
 
 
 (add-menu-key 'frame-adding-menu "a" 'add-default-frame)




More information about the clfswm-cvs mailing list