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

[Philippe Brochard]

Author: pbrochard
Date: Fri Jul 16 16:34:18 2010
New Revision: 276

Log:
identify-key, move-window, resize-window, wait-mouse-button-release: Add a timeout in xlib:process-event.

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

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Fri Jul 16 16:34:18 2010
@@ -1,3 +1,11 @@
+2010-07-16  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-util.lisp (identify-key): Add a timeout in
+	xlib:process-event.
+
+	* src/xlib-util.lisp (move-window, resize-window)
+	(wait-mouse-button-release): Add a timeout in xlib:process-event.
+
 2010-04-11  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-util.lisp (run-other-window-manager): Add the ability

Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp	(original)
+++ clfswm/load.lisp	Fri Jul 16 16:34:18 2010
@@ -63,6 +63,7 @@
 
 ;;; For debuging: start Xnest or Zephyr and
 ;;; add the lines above in a dot-clfswmrc-debug file
+;;; mod-2 is the numlock key on some keyboards.
 ;;(setf *default-modifiers* '(:mod-2))
 ;;
 ;;(defun my-add-escape ()

Modified: clfswm/src/bindings.lisp
==============================================================================
--- clfswm/src/bindings.lisp	(original)
+++ clfswm/src/bindings.lisp	Fri Jul 16 16:34:18 2010
@@ -116,6 +116,8 @@
   (stop-button-event)
   (mouse-focus-move/resize-generic root-x root-y #'resize-frame t))
 
+
+
 (defun set-default-main-mouse ()
   (define-main-mouse (1) 'mouse-click-to-focus-and-move)
   (define-main-mouse (2) 'mouse-middle-click)

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Fri Jul 16 16:34:18 2010
@@ -39,7 +39,7 @@
 	     (etc-conf (probe-file #p"/etc/clfswmrc"))
 	     (config-user-conf (probe-file (make-pathname :directory (append (xdg-config-home) '("clfswm"))
 							  :name "clfswmrc")))
-	     (alternate-conf (probe-file alternate-name)))
+	     (alternate-conf (and alternate-name (probe-file alternate-name))))
 	(setf saved-conf-name (or alternate-conf config-user-conf user-conf etc-conf))))
     (print saved-conf-name)
     saved-conf-name))
@@ -320,7 +320,7 @@
       (unwind-protect
 	   (loop until done do
 		(xlib:display-finish-output *display*)
-		(xlib:process-event *display* :handler #'handle-identify))
+		(xlib:process-event *display* :handler #'handle-identify :timeout *loop-timeout*))
 	(xlib:destroy-window window)
 	(xlib:close-font font)
 	(xgrab-pointer *root* 66 67)))))

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Fri Jul 16 16:34:18 2010
@@ -500,7 +500,7 @@
       (loop until done
 	 do (with-xlib-protect
 	      (xlib:display-finish-output *display*)
-	      (xlib:process-event *display* :handler #'handle-event)))
+	      (xlib:process-event *display* :handler #'handle-event :timeout *loop-timeout*)))
       (unless pointer-grabbed-p
 	(xungrab-pointer)))))
 
@@ -543,7 +543,7 @@
       (loop until done
 	 do (with-xlib-protect
 	      (xlib:display-finish-output *display*)
-	      (xlib:process-event *display* :handler #'handle-event)))
+	      (xlib:process-event *display* :handler #'handle-event :timeout *loop-timeout*)))
       (unless pointer-grabbed-p
 	(xungrab-pointer)))))
 
@@ -571,7 +571,7 @@
       (loop until done
 	 do (with-xlib-protect
 	      (xlib:display-finish-output *display*)
-	      (xlib:process-event *display* :handler #'handle-event)))
+	      (xlib:process-event *display* :handler #'handle-event :timeout *loop-timeout*)))
       (unless pointer-grabbed-p
 	(xungrab-pointer)))))