From: Philippe Brochard <pbrochard@common-lisp.net>
Date: Wed, 31 Jul 2013 15:04:59 +0000 (+0200)
Subject: Ensure query strings and info strings are printable
X-Git-Url: https://repo.or.cz/w/clfswm.git/commitdiff_plain/34d0b45167698365f5b786db8bb9cd9971359a64

Ensure query strings and info strings are printable
---

diff --git a/src/clfswm-info.lisp b/src/clfswm-info.lisp
index 836ce43..ca9983b 100644
--- a/src/clfswm-info.lisp
+++ b/src/clfswm-info.lisp
@@ -96,7 +96,7 @@
                         *pixmap-buffer* (info-gc info)
                         (- (+ (info-ilw info) (* posx (info-ilw info))) (info-x info))
                         (info-y-display-coords info posy)
-                        (format nil "~A" line)))
+                        (ensure-printable (format nil "~A" line))))
 	     (+ posx (length line))))
     (clear-pixmap-buffer (info-window info) (info-gc info))
     (loop for line in (info-list info)
diff --git a/src/clfswm-query.lisp b/src/clfswm-query.lisp
index 091eda5..0181374 100644
--- a/src/clfswm-query.lisp
+++ b/src/clfswm-query.lisp
@@ -137,7 +137,7 @@
     (xlib:draw-glyphs *pixmap-buffer* *query-gc*
 		      (+ 10 dec)
 		      (+ (* 2 (+ (xlib:max-char-ascent *query-font*) (xlib:max-char-descent *query-font*))) 5)
-		      *query-string*)
+		      (ensure-printable *query-string*))
     (setf (xlib:gcontext-foreground *query-gc*) (get-color *query-cursor-color*))
     (xlib:draw-line *pixmap-buffer* *query-gc*
 		    (+ 10 (* *query-pos* (xlib:max-char-width *query-font*)) dec)