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

[Philippe Brochard]

Author: pbrochard
Date: Sat Oct 23 17:51:20 2010
New Revision: 360

Log:
* src/xlib-util.lisp: Remove unnecessary xlib:display-finish-output.

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

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Sat Oct 23 17:51:20 2010
@@ -1,5 +1,7 @@
 2010-10-23  Philippe Brochard  <pbrochard at common-lisp.net>
 
+	* src/xlib-util.lisp: Remove unnecessary xlib:display-finish-output.
+
 	* src/clfswm-internal.lisp (show-child): Show window only if not
 	hidden.
 

Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp	(original)
+++ clfswm/src/clfswm-internal.lisp	Sat Oct 23 17:51:20 2010
@@ -581,8 +581,8 @@
 	(when (or *show-root-frame-p* (not (child-equal-p frame *current-root*)))
 	  (map-window window)
 	  (when raise-p
-	    (raise-window window)
-	    (display-frame-info frame)))
+	    (raise-window window))
+	  (display-frame-info frame))
 	(hide-window window))))
 
 
@@ -596,13 +596,13 @@
 
 
 (defmethod show-child ((window xlib:window) parent raise-p)
-  (if (and raise-p
-	   (or (managed-window-p window parent)
-	       (not (hide-unmanager-window-p parent))
-	       (child-equal-p parent *current-child*)))
+  (if (or (managed-window-p window parent)
+	  (not (hide-unmanager-window-p parent))
+	  (child-equal-p parent *current-child*))
       (progn
 	(map-window window)
-	(raise-window window))
+	(when raise-p
+	  (raise-window window)))
       (hide-window window)))
 
 (defmethod show-child (child parent raise-p)

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Sat Oct 23 17:51:20 2010
@@ -228,27 +228,20 @@
     (when (window-hidden-p window)
       (xlib:map-window window)
       (setf (window-state window) +normal-state+
-	    (xlib:window-event-mask window) *window-events*)))
-  (xlib:display-finish-output *display*))
-
+	    (xlib:window-event-mask window) *window-events*))))
 
 
 (defun map-window (window)
   (when window
-    (xlib:map-window window)
-    (xlib:display-finish-output *display*)))
+    (xlib:map-window window)))
+
 
 (defun delete-window (window)
   (send-client-message window :WM_PROTOCOLS
-		       (xlib:intern-atom *display* "WM_DELETE_WINDOW"))
-  (xlib:display-finish-output *display*))
+		       (xlib:intern-atom *display* "WM_DELETE_WINDOW")))
 
 (defun destroy-window (window)
-  (xlib:kill-client *display* (xlib:window-id window))
-  (xlib:display-finish-output *display*))
-
-
-
+  (xlib:kill-client *display* (xlib:window-id window)))
 
 
 
@@ -343,8 +336,7 @@
     (setf (window-state window) +iconic-state+
 	  (xlib:window-event-mask window) (remove :structure-notify *window-events*))
     (xlib:unmap-window window)
-    (setf (xlib:window-event-mask window) *window-events*))
-  (xlib:display-finish-output *display*))
+    (setf (xlib:window-event-mask window) *window-events*)))
 
 
 
@@ -402,25 +394,17 @@
   (when window
     (when (window-hidden-p window)
       (unhide-window window))
-    (setf (xlib:window-priority window) :top-if))
-  (xlib:display-finish-output *display*))
+    (setf (xlib:window-priority window) :top-if)))
 
 (defun focus-window (window)
   "Give the window focus."
   (when window
-    (xlib:set-input-focus *display* window :parent))
-  (xlib:display-finish-output *display*))
-
-
-
-
-
+    (xlib:set-input-focus *display* window :parent)))
 
 
 (defun no-focus ()
   "don't focus any window but still read keyboard events."
-  (xlib:set-input-focus *display* *no-focus-window* :pointer-root)
-  (xlib:display-finish-output *display*))
+  (xlib:set-input-focus *display* *no-focus-window* :pointer-root))