[clfswm-cvs] r15 - clfswm

[pbrochard at common-lisp.net]

Author: pbrochard
Date: Wed Mar  5 17:12:47 2008
New Revision: 15

Modified:
   clfswm/clfswm-internal.lisp
   clfswm/clfswm.asd
   clfswm/xlib-util.lisp
Log:
Solve a wrong with-gcontext bug (xlib::string-concat)

Modified: clfswm/clfswm-internal.lisp
==============================================================================
--- clfswm/clfswm-internal.lisp	(original)
+++ clfswm/clfswm-internal.lisp	Wed Mar  5 17:12:47 2008
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Tue Mar  4 22:36:13 2008
+;;; #Date#: Wed Mar  5 23:09:42 2008
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Main functions
@@ -37,6 +37,18 @@
     (t (apply hook args))))
 
 
+
+
+(defgeneric group-p (group))
+(defmethod group-p ((group group))
+  (declare (ignore group))
+  t)
+(defmethod group-p (group)
+  (declare (ignore group))
+  nil)
+
+
+
 ;;; Group data manipulation functions
 (defun group-data-slot (group slot)
   "Return the value associated to data slot"
@@ -55,13 +67,6 @@
 
 
 
-(defgeneric group-p (group))
-(defmethod group-p ((group group))
-  (declare (ignore group))
-  t)
-(defmethod group-p (group)
-  (declare (ignore group))
-  nil)
 
 
 
@@ -252,30 +257,30 @@
     (with-slots (name number gc window child) group
       (when (equal group *current-root*)
 	(xlib:clear-area window))
-      (xlib:with-gcontext (gc :foreground (get-color (if (and (equal group *current-root*)
+      (setf (xlib:gcontext-foreground gc) (get-color (if (and (equal group *current-root*)
 							      (equal group *current-child*))
 							 "Red" "Green")))
-	(xlib:draw-image-glyphs window gc 5 dy		 
-				(format nil "Group: ~A~A                                                  "
-					number
-					(if name  (format nil " - ~A" name) "")))
-	(let ((pos dy))
-	  (when (equal group *current-root*)
+      (xlib:draw-image-glyphs window gc 5 dy		 
+			      (format nil "Group: ~A~A                                                  "
+				      number
+				      (if name  (format nil " - ~A" name) "")))
+      (let ((pos dy))
+	(when (equal group *current-root*)
+	  (xlib:draw-image-glyphs window gc 5 (incf pos dy)
+				  (format nil "~A hidden windows             " (length (get-hidden-windows))))
+	  (when *child-selection*
 	    (xlib:draw-image-glyphs window gc 5 (incf pos dy)
-				    (format nil "~A hidden windows             " (length (get-hidden-windows))))
-	    (when *child-selection*
-	      (xlib:draw-image-glyphs window gc 5 (incf pos dy)
-				      (with-output-to-string (str)
-					(format str "Selection: ")
-					(dolist (child *child-selection*)
-					  (typecase child
-					    (xlib:window (format str "~A " (xlib:wm-name child)))
-					    (group (format str "group:~A[~A] " (group-number child)
-							   (aif (group-name child) it "")))))
-					(format str "                                                   ")))))
-	  (dolist (ch child)
-	    (when (xlib:window-p ch)
-	      (xlib:draw-glyphs window gc 5 (incf pos dy) (ensure-printable (xlib:wm-name ch))))))))))
+				    (with-output-to-string (str)
+				      (format str "Selection: ")
+				      (dolist (child *child-selection*)
+					(typecase child
+					  (xlib:window (format str "~A " (xlib:wm-name child)))
+					  (group (format str "group:~A[~A] " (group-number child)
+							 (aif (group-name child) it "")))))
+				      (format str "                                                   ")))))
+	(dolist (ch child)
+	  (when (xlib:window-p ch)
+	    (xlib:draw-glyphs window gc 5 (incf pos dy) (ensure-printable (xlib:wm-name ch)))))))))
 
 
 

Modified: clfswm/clfswm.asd
==============================================================================
--- clfswm/clfswm.asd	(original)
+++ clfswm/clfswm.asd	Wed Mar  5 17:12:47 2008
@@ -2,7 +2,7 @@
 ;;;; Author: Philippe Brochard <hocwp at free.fr>
 ;;;; ASDF System Definition
 ;;;
-;;; #date#: Tue Mar  4 22:30:25 2008
+;;; #date#: Wed Mar  5 23:08:25 2008
 
 (in-package #:asdf)
 
@@ -36,7 +36,7 @@
 		 (:file "clfswm-info"
 			:depends-on ("package" "xlib-util" "config" "clfswm-keys" "clfswm" "clfswm-internal"))
 		 (:file "clfswm-util"
-			:depends-on ("clfswm" "keysyms" "clfswm-info" "clfswm-second-mode"))
+			:depends-on ("clfswm" "keysyms" "clfswm-info" "clfswm-second-mode" "clfswm-query"))
 		 (:file "clfswm-query"
 			:depends-on ("package" "config"))
 		 (:file "clfswm-layout"
@@ -44,7 +44,7 @@
 		 (:file "bindings"
 			:depends-on ("clfswm" "clfswm-internal"))
 		 (:file "bindings-second-mode"
-			:depends-on ("clfswm" "clfswm-util"))))
+			:depends-on ("clfswm" "clfswm-util" "clfswm-query"))))
 
 
 

Modified: clfswm/xlib-util.lisp
==============================================================================
--- clfswm/xlib-util.lisp	(original)
+++ clfswm/xlib-util.lisp	Wed Mar  5 17:12:47 2008
@@ -1,7 +1,7 @@
 ;;; --------------------------------------------------------------------------
 ;;; CLFSWM - FullScreen Window Manager
 ;;;
-;;; #Date#: Thu Feb 28 21:55:00 2008
+;;; #Date#: Wed Mar  5 22:22:59 2008
 ;;;
 ;;; --------------------------------------------------------------------------
 ;;; Documentation: Utility functions
@@ -423,7 +423,7 @@
   ;; implementation (see translate.lisp and keysyms.lisp).  For now,
   ;; we do like this.  It suffices for modifiers and ASCII symbols.
   (if (fboundp 'xlib:character->keysyms)
-      (xlib:character->keysyms ch))
+      (xlib:character->keysyms ch)
       (list
        (case ch
 	 (:character-set-switch #xFF7E)
@@ -447,7 +447,7 @@
 	     ;; Latin-1 characters have their own value as keysym
 	     (if (< 31 (char-code ch) 256)
 		 (char-code ch)
-		 (error "Don't know how to get keysym from ~A" ch))))))))
+		 (error "Don't know how to get keysym from ~A" ch)))))))))