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

[Philippe Brochard]

Author: pbrochard
Date: Tue May 12 19:06:15 2009
New Revision: 230

Log:
info-mode: Optimization in loop function. *.lisp: Handle motion with a default modifier.

Modified:
   clfswm/ChangeLog
   clfswm/src/clfswm-info.lisp
   clfswm/src/clfswm-second-mode.lisp
   clfswm/src/clfswm.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Tue May 12 19:06:15 2009
@@ -1,3 +1,15 @@
+2009-05-13  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-second-mode.lisp (sm-handle-motion-notify): Handle
+	motion with a default modifier.
+
+	* src/clfswm.lisp (handle-motion-notify): Handle motion with a
+	default modifier.
+
+	* src/clfswm-info.lisp (info-mode): Handle motion with a default
+	modifier.
+	(info-mode): Optimization in loop function.
+
 2009-05-10  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-circulate-mode.lisp (reorder-brother): Handle

Modified: clfswm/src/clfswm-info.lisp
==============================================================================
--- clfswm/src/clfswm-info.lisp	(original)
+++ clfswm/src/clfswm-info.lisp	Tue May 12 19:06:15 2009
@@ -179,7 +179,7 @@
   (define-info-mouse (2) 'mouse-leave-info-mode)
   (define-info-mouse (4) 'info-mouse-previous-line)
   (define-info-mouse (5) 'info-mouse-next-line)
-  (define-info-mouse ('Motion) 'info-mouse-motion nil))
+  (define-info-mouse ('motion) 'info-mouse-motion nil))
 
 (add-hook *binding-hook* 'set-default-info-mouse)
 
@@ -236,7 +236,8 @@
 		 (handle-motion-notify (&rest event-slots &key root-x root-y &allow-other-keys)
 		   (declare (ignore event-slots))
 		   (unless (compress-motion-notify)
-		     (funcall-button-from-code *info-mouse* 'motion 0 window root-x root-y *fun-press* (list info))))
+		     (funcall-button-from-code *info-mouse* 'motion (modifiers->state *default-modifiers*)
+					       window root-x root-y *fun-press* (list info))))
 		 (handle-button-press (&rest event-slots &key window root-x root-y code state &allow-other-keys)
 		   (declare (ignore event-slots))
 		   (funcall-button-from-code *info-mouse* code state window root-x root-y *fun-press* (list info)))
@@ -250,8 +251,7 @@
 	    (xgrab-keyboard *root*))
 	  (generic-mode 'exit-info-loop
 			:loop-function (lambda ()
-					 (raise-window (info-window info))
-					 (draw-info-window info))
+					 (raise-window (info-window info)))
 			:button-press-hook #'handle-button-press
 			:button-release-hook #'handle-button-release
 			:motion-notify-hook #'handle-motion-notify

Modified: clfswm/src/clfswm-second-mode.lisp
==============================================================================
--- clfswm/src/clfswm-second-mode.lisp	(original)
+++ clfswm/src/clfswm-second-mode.lisp	Tue May 12 19:06:15 2009
@@ -61,7 +61,9 @@
 (defun sm-handle-motion-notify (&rest event-slots &key window root-x root-y &allow-other-keys)
   (declare (ignore event-slots))
   (unless (compress-motion-notify)
-    (funcall-button-from-code *second-mouse* 'motion 0 window root-x root-y *fun-press*)))
+    (funcall-button-from-code *second-mouse* 'motion
+			      (modifiers->state *default-modifiers*)
+			      window root-x root-y *fun-press*)))
 
 (defun sm-handle-button-press (&rest event-slots &key window root-x root-y code state &allow-other-keys)
   (declare (ignore event-slots))

Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp	(original)
+++ clfswm/src/clfswm.lisp	Tue May 12 19:06:15 2009
@@ -50,7 +50,9 @@
 (defun handle-motion-notify (&rest event-slots &key window root-x root-y &allow-other-keys)
   (declare (ignore event-slots))
   (unless (compress-motion-notify)
-    (funcall-button-from-code *main-mouse* 'motion 0 window root-x root-y *fun-press*)))
+    (funcall-button-from-code *main-mouse* 'motion
+			      (modifiers->state *default-modifiers*)
+			      window root-x root-y *fun-press*)))
 
 
 (defun handle-configure-request (&rest event-slots &key stack-mode #|parent|# window #|above-sibling|#