[clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1212-50-g544f93c

[Philippe Brochard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CLFSWM - A(nother) Common Lisp FullScreen Window Manager".

The branch, master has been updated
       via  544f93c4df12c31b343f7e60bdbba40a8041b361 (commit)
      from  cc7b5ea960ee6511b6d66c38eb0bf3c6f799de96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 544f93c4df12c31b343f7e60bdbba40a8041b361
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Fri Dec 6 21:03:55 2013 +0100

    Add some necessary ensure-printable protection

diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index 19af51c..b322c38 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -239,7 +239,7 @@
 (defgeneric child-name (child))
 
 (defmethod child-name ((child xlib:window))
-  (xlib:wm-name child))
+  (ensure-printable (xlib:wm-name child)))
 
 (defmethod child-name ((child frame))
   (frame-name child))
@@ -268,12 +268,14 @@
 (defgeneric child-fullname (child))
 
 (defmethod child-fullname ((child xlib:window))
-  (format nil "~A (~A)" (or (xlib:wm-name child) "?") (or (xlib:get-wm-class child) "?")))
+  (ensure-printable
+   (format nil "~A (~A)" (or (xlib:wm-name child) "?") (or (xlib:get-wm-class child) "?"))))
 
 (defmethod child-fullname ((child frame))
-  (aif (frame-name child)
-       (format nil "~A (Frame ~A)" it (frame-number child))
-       (format nil "Frame ~A" (frame-number child))))
+  (ensure-printable
+   (aif (frame-name child)
+        (format nil "~A (Frame ~A)" it (frame-number child))
+        (format nil "Frame ~A" (frame-number child)))))
 
 (defmethod child-fullname (child)
   (declare (ignore child))
diff --git a/src/clfswm-query.lisp b/src/clfswm-query.lisp
index 0181374..d7a14cd 100644
--- a/src/clfswm-query.lisp
+++ b/src/clfswm-query.lisp
@@ -41,12 +41,13 @@
 
 
 (defun add-char-in-query-string (char)
-  (setf *query-string* (concatenate 'string
-                                    (when (<= *query-pos* (length *query-string*))
-                                      (subseq *query-string* 0 *query-pos*))
-                                    (string char)
-                                    (when (< *query-pos* (length *query-string*))
-                                      (subseq *query-string* *query-pos*))))
+  (setf *query-string* (ensure-printable
+                        (concatenate 'string
+                                     (when (<= *query-pos* (length *query-string*))
+                                       (subseq *query-string* 0 *query-pos*))
+                                     (string char)
+                                     (when (< *query-pos* (length *query-string*))
+                                       (subseq *query-string* *query-pos*)))))
   (incf *query-pos*))
 
 

-----------------------------------------------------------------------

Summary of changes:
 src/clfswm-internal.lisp |   12 +++++++-----
 src/clfswm-query.lisp    |   13 +++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CLFSWM - A(nother) Common Lisp FullScreen Window Manager