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

[Philippe Brochard]

Author: pbrochard
Date: Sat Aug 28 16:50:34 2010
New Revision: 304

Log:
src/clfswm.lisp (main-loop): Ensure that all events have been processed after a process-event.

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

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sat Aug 28 16:50:34 2010
@@ -1,5 +1,8 @@
 2010-08-28  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/clfswm.lisp (main-loop): Ensure that all events have been
+	processed after a process-event.
+
 	* src/clfswm-internal.lisp (is-in-current-child-p): New function.
 
 2010-08-27  Philippe Brochard  <pbrochard at common-lisp.net>

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Sat Aug 28 16:50:34 2010
@@ -321,7 +321,8 @@
 	   (loop until done do
 		(xlib:display-finish-output *display*)
 		(when (xlib:event-listen *display* *loop-timeout*)
-		  (xlib:process-event *display* :handler #'handle-identify)))
+		  (xlib:process-event *display* :handler #'handle-identify))
+		(xlib:display-finish-output *display*))
 	(xlib:destroy-window window)
 	(xlib:close-font font)
 	(xgrab-pointer *root* 66 67)))))

Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp	(original)
+++ clfswm/src/clfswm.lisp	Sat Aug 28 16:50:34 2010
@@ -132,7 +132,8 @@
        (call-hook *loop-hook*)
        (xlib:display-finish-output *display*)
        (when (xlib:event-listen *display* *loop-timeout*)
-	 (xlib:process-event *display* :handler #'handle-event)))))
+	 (xlib:process-event *display* :handler #'handle-event))
+       (xlib:display-finish-output *display*))))
 ;;(dbg "Main loop finish" c)))))
 
 

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Sat Aug 28 16:50:34 2010
@@ -219,7 +219,6 @@
   (when window
     (with-xlib-protect
 	(when (window-hidden-p window)
-	  (xlib:map-subwindows window)
 	  (xlib:map-window window)
 	  (setf (window-state window) +normal-state+
 		(xlib:window-event-mask window) *window-events*))))
@@ -229,7 +228,6 @@
 (defun map-window (window)
   (when window
     (with-xlib-protect
-      (xlib:map-subwindows window)
       (xlib:map-window window)
       (xlib:display-finish-output *display*))))
 
@@ -732,7 +730,7 @@
 		    "Alt_L" "Alt_R" "Meta_L" "Meta_R" "Hyper_L" "Hyper_R"
 		    "Mode_switch" "script_switch" "ISO_Level3_Shift"
 		    "Caps_Lock" "Scroll_Lock" "Num_Lock"))
-      (awhen (xlib:keysym->keycodes *display* (keysym-name->keysym name))  ;; PHIL: todo here
+      (awhen (xlib:keysym->keycodes *display* (keysym-name->keysym name))
 	(push it modifier-list))))
 
   (defun modifier-p (code)