[clfswm-cvs] CVS clfswm

[pbrochard]

Update of /project/clfswm/cvsroot/clfswm
In directory clnet:/tmp/cvs-serv19100

Modified Files:
	ChangeLog bindings-second-mode.lisp clfswm-second-mode.lisp 
	package.lisp 
Log Message:
Display the action on mouse motion in second mode.

--- /project/clfswm/cvsroot/clfswm/ChangeLog	2008/01/01 16:32:45	1.9
+++ /project/clfswm/cvsroot/clfswm/ChangeLog	2008/01/01 19:13:44	1.10
@@ -1,5 +1,8 @@
 2008-01-01  Philippe Brochard  <hocwp at free.fr>
 
+	* clfswm-second-mode.lisp (draw-second-mode-window): Display
+	the action on mouse motion in second mode.
+
 	* clfswm.lisp (handle-exposure): Redisplay groups on exposure
 	event but do not clear the root window.
 	(handle-configure-request): Adjust unmanaged window from there
--- /project/clfswm/cvsroot/clfswm/bindings-second-mode.lisp	2007/12/31 16:32:41	1.8
+++ /project/clfswm/cvsroot/clfswm/bindings-second-mode.lisp	2008/01/01 19:13:45	1.9
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Mon Dec 31 00:14:27 2007
+;;; #Date#: Tue Jan  1 19:23:19 2008
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Bindings keys and mouse for second mode
@@ -384,13 +384,6 @@
 
 
 
-(defparameter *motion-action* nil)
-(defparameter *motion-object* nil)
-(defparameter *motion-start-group* nil)
-(defparameter *motion-dx* nil)
-(defparameter *motion-dy* nil)
-
-
 
 (let ((accept-motion t)
       (selected-group nil))
@@ -533,7 +526,8 @@
   "Move selected window"
   (xgrab-pointer *root* 50 51)
   (select-group-under-mouse root-x root-y)
-  (setf *motion-object* (current-window))
+  (setf *motion-object* (current-window)
+	*motion-action* :move-window)
   (when *motion-object*
     (setf *motion-start-group* (current-group))))
 
@@ -553,7 +547,8 @@
 
 (defun copy-selected-window (root-x root-y)
   "Copy selected window"
-  (move-selected-window root-x root-y))
+  (move-selected-window root-x root-y)
+  (setf *motion-action* :copy-window))
 
 (defun release-copy-selected-window (root-x root-y)
   "Release button"
--- /project/clfswm/cvsroot/clfswm/clfswm-second-mode.lisp	2007/12/31 16:38:36	1.8
+++ /project/clfswm/cvsroot/clfswm/clfswm-second-mode.lisp	2008/01/01 19:13:45	1.9
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Mon Dec 31 17:37:12 2007
+;;; #Date#: Tue Jan  1 20:12:23 2008
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Second mode functions
@@ -36,9 +36,10 @@
 
 (defun draw-second-mode-window ()
   (clear-area *sm-window*)
-  (let* ((text (format nil "Workspace ~A ~:(~A~) ~A ~A"
+  (let* ((text (format nil "Workspace ~A ~:(~A~) ~A ~A ~A"
 		       (workspace-number (current-workspace))
 		       (if *arrow-action* *arrow-action* "")
+		       (if *motion-action* *motion-action* "")
 		       (cond ((numberp *open-next-window-in-new-workspace*)
 			      (format nil ">W:~A" *open-next-window-in-new-workspace*))
 			     (*open-next-window-in-new-workspace* ">W")
--- /project/clfswm/cvsroot/clfswm/package.lisp	2007/12/29 15:20:10	1.8
+++ /project/clfswm/cvsroot/clfswm/package.lisp	2008/01/01 19:13:45	1.9
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Fri Dec 28 22:32:54 2007
+;;; #Date#: Tue Jan  1 20:11:50 2008
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Package definition
@@ -135,6 +135,13 @@
 (defparameter *pager-exposure-hook* nil)
 
 
+;;; Second mode global variables
+(defparameter *motion-action* nil)
+(defparameter *motion-object* nil)
+(defparameter *motion-start-group* nil)
+(defparameter *motion-dx* nil)
+(defparameter *motion-dy* nil)
+
 
 ;; For debug - redefine defun
 ;;(shadow :defun)