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

[Philippe Brochard]

Author: pbrochard
Date: Thu Oct  7 08:58:08 2010
New Revision: 348

Log:
src/clfswm-query.lisp (add-in-query-string): Handle correctly the mod-5 modifier.

Modified:
   clfswm/ChangeLog
   clfswm/src/clfswm-query.lisp
   clfswm/src/xlib-util.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Thu Oct  7 08:58:08 2010
@@ -1,3 +1,8 @@
+2010-10-07  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm-query.lisp (add-in-query-string): Handle correctly
+	the mod-5 modifier.
+
 2010-10-06  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* src/clfswm-query.lisp (query-print-string): Change cursor color

Modified: clfswm/src/clfswm-query.lisp
==============================================================================
--- clfswm/src/clfswm-query.lisp	(original)
+++ clfswm/src/clfswm-query.lisp	Thu Oct  7 08:58:08 2010
@@ -267,8 +267,8 @@
 (defun add-in-query-string (code state)
   (let* ((modifiers (state->modifiers state))
 	 (keysym (keycode->keysym code modifiers))
-	 (char (xlib:keysym->character *display* keysym)))
-    (when (and (characterp char) (standard-char-p char))
+	 (char (xlib:keysym->character *display* keysym state)))
+    (when (and char (characterp char))
       (setf *query-string* (concatenate 'string
 					(when (<= *query-pos* (length *query-string*))
 					  (subseq *query-string* 0 *query-pos*))

Modified: clfswm/src/xlib-util.lisp
==============================================================================
--- clfswm/src/xlib-util.lisp	(original)
+++ clfswm/src/xlib-util.lisp	Thu Oct  7 08:58:08 2010
@@ -703,9 +703,9 @@
   (xlib:make-state-keys state))
 
 (defun keycode->keysym (code modifiers)
-  (xlib:keycode->keysym *display* code (cond  ((member :shift modifiers) 1)
-					      ((member :mod-5 modifiers) 2)
-					      (t 0))))
+  (xlib:keycode->keysym *display* code (cond ((member :shift modifiers) 1)
+					     ((member :mod-5 modifiers) 4)
+					     (t 0))))
 
 
 (defmacro with-grab-keyboard-and-pointer ((cursor mask old-cursor old-mask) &body body)