[clfswm-cvs] r135 - in clfswm: . src

[pbrochard at common-lisp.net]

Author: pbrochard
Date: Fri May 23 16:51:51 2008
New Revision: 135

Modified:
   clfswm/ChangeLog
   clfswm/TODO
   clfswm/src/clfswm-internal.lisp
   clfswm/src/clfswm-util.lisp
   clfswm/src/menu-def.lisp
Log:
rename-current-child: Do not display the frame info for a window.

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Fri May 23 16:51:51 2008
@@ -1,3 +1,8 @@
+2008-05-23  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-util.lisp (rename-current-child): Do not display the
+	frame info for a window.
+
 2008-05-20  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-internal.lisp (remove-child-in-frame): Destroy the

Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO	(original)
+++ clfswm/TODO	Fri May 23 16:51:51 2008
@@ -15,11 +15,11 @@
 
 - cd/pwd a la shell to navigate throw frames. [Philippe] 
 
-- Hide/Unhide frame [Philippe]
+- Hide/Unhide child [Philippe]
 
 - Undo/redo (any idea to implement this is welcome)
 
-- Raise/lower frame - this can be done with children order [Philippe]
+- Raise/lower child - this can be done with children order [Philippe]
 
 - Show config -> list and display documentation for all tweakable global variables. [Philippe]
 

Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp	(original)
+++ clfswm/src/clfswm-internal.lisp	Fri May 23 16:51:51 2008
@@ -144,7 +144,8 @@
 (defgeneric rename-child (child name))
 
 (defmethod rename-child ((child frame) name)
-  (setf (frame-name child) name))
+  (setf (frame-name child) name)
+  (display-frame-info child))
 
 (defmethod rename-child ((child xlib:window) name)
   (setf (xlib:wm-name child) name))

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Fri May 23 16:51:51 2008
@@ -40,7 +40,6 @@
   (let ((name (query-string (format nil "New child name: (last: ~A)" (child-name *current-child*))
 			    (child-name *current-child*))))
     (rename-child *current-child* name)
-    (display-frame-info *current-child*)
     (leave-second-mode)))
 
 
@@ -178,7 +177,15 @@
   (remove-child-in-frame *current-child* (find-parent-frame *current-child* *current-root*))
   (setf *current-child* *current-root*)
   (leave-second-mode))
-      
+
+
+(defun remove-current-child-from-tree ()
+  "Remove the current child from the CLFSWM tree"
+  (remove-child-in-frame *current-child* (find-parent-frame *current-child* *current-root*))
+  (setf *current-child* *current-root*)
+  (leave-second-mode))
+
+
 
 (defun paste-selection-no-clear ()
   "Paste the selection in the current frame - Do not clear the selection after paste"

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Fri May 23 16:51:51 2008
@@ -62,6 +62,7 @@
 
 
 
+(add-sub-menu 'main "c" 'child-menu "Child menu")
 (add-sub-menu 'main "f" 'frame-menu "Frame menu")
 (add-sub-menu 'main "w" 'window-menu "Window menu")
 (add-sub-menu 'main "s" 'selection-menu "Selection menu")
@@ -71,6 +72,11 @@
 
 
 
+(add-menu-key 'child-menu "r" 'rename-current-child)
+(add-menu-key 'child-menu "x" 'remove-current-child-from-tree)
+(add-menu-key 'child-menu "Delete" 'remove-current-child)
+
+
 (add-sub-menu 'frame-menu "a" 'frame-adding-menu "Adding frame menu")
 (add-sub-menu 'frame-menu "l" 'frame-layout-menu "Frame layout menu")
 (add-sub-menu 'frame-menu "o" 'frame-layout-once-menu "Frame layout menu (Only once)")
@@ -78,7 +84,6 @@
 (add-sub-menu 'frame-menu "m" 'frame-movement-menu "Frame movement menu")
 (add-sub-menu 'frame-menu "w" 'managed-window-menu "Managed window type menu")
 (add-sub-menu 'frame-menu "i" 'frame-info-menu "Frame info menu")
-(add-menu-key 'frame-menu "r" 'rename-current-child)
 (add-menu-key 'frame-menu "u" 'renumber-current-frame)
 (add-menu-key 'frame-menu "x" 'explode-current-frame)