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

[Philippe Brochard]

Author: pbrochard
Date: Mon Jul 19 18:11:29 2010
New Revision: 279

Log:
src/clfswm-util.lisp (mouse-click-to-focus-generic): Redisplay all children in *current-root* after moving/resizing a frame.

Modified:
   clfswm/ChangeLog
   clfswm/load.lisp
   clfswm/src/clfswm-util.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Mon Jul 19 18:11:29 2010
@@ -1,3 +1,8 @@
+2010-07-20  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-util.lisp (mouse-click-to-focus-generic): Redisplay
+	all children in *current-root* after moving/resizing a frame.
+
 2010-07-18  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-util.lisp (delete-focus-window)

Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp	(original)
+++ clfswm/load.lisp	Mon Jul 19 18:11:29 2010
@@ -56,7 +56,7 @@
 
 #-BUILD
 (ignore-errors
-  (main :read-conf-file-p t))
+  (main-unprotected :read-conf-file-p t))
 
 ;;(produce-all-docs)
 

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Mon Jul 19 18:11:29 2010
@@ -579,11 +579,13 @@
 		(unless (equal (type-of child) 'frame)
 		  (setf child (find-frame-window child *current-root*)))
 		(setf parent (find-parent-frame child)))))
-	(when (and child parent (focus-all-children child parent))
-	  (when (show-all-children)
-	    (setf to-replay nil)))
+	(when (and child parent)
+	  (focus-all-children child parent)
+	  (show-all-children))
 	(when (equal (type-of child) 'frame)
-	  (funcall mouse-fn child parent root-x root-y)))
+	  (funcall mouse-fn child parent root-x root-y))
+  	(when (show-all-children *current-root*)
+	  (setf to-replay nil)))
       (if to-replay
 	  (replay-button-event)
 	  (stop-button-event)))))
@@ -634,7 +636,7 @@
 		   child root-x root-y)))
       (frame (funcall mouse-fn child parent root-x root-y)))
     (focus-all-children child parent window-parent)
-    (show-all-children)))
+    (show-all-children *current-root*)))
 
 
 
@@ -1005,6 +1007,7 @@
   "Move the window under the mouse cursor to another frame"
   (declare (ignore window))
   (let ((child (find-child-under-mouse root-x root-y)))
+    (dbg child (frame-child child))
     (unless (equal child *current-root*)
       (hide-child child)
       (remove-child-in-frame child (find-parent-frame child))
@@ -1015,7 +1018,13 @@
 	  (when (xlib:window-p dest)
 	    (setf dest (find-parent-frame dest)))
 	  (unless (equal child dest)
-	    (move-child-to child dest))))))
+	    ;;(move-child-to child dest))))))
+	    (dbg dest (frame-child dest))
+	    (pushnew child (frame-child dest))
+	    (dbg dest (frame-child dest))
+	    (dbg child (frame-child child))
+	    ;;(focus-all-children child dest)
+	    (show-all-children *current-root*))))))
   (stop-button-event))