diff --git a/clx/clx.lisp b/clx/clx.lisp index b7b9852c3c68baeacf5469896da9caa831d22111..ac98e15428af4ef009153645553c67a14d54c666 100644 --- a/clx/clx.lisp +++ b/clx/clx.lisp @@ -17,7 +17,7 @@ ;;; #+cmu (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/clx/clx.lisp,v 1.12 2001/12/11 00:48:06 pmai Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/clx/clx.lisp,v 1.13 2002/08/19 16:22:20 toy Exp $") ;; Primary Interface Author: ;; Robert W. Scheifler @@ -884,8 +884,8 @@ (defun encode-modifier-mask (modifier-mask) (declare (type modifier-mask modifier-mask)) (declare (clx-values mask16)) - (or (encode-mask *state-mask-vector* modifier-mask 'modifier-key) - (and (eq modifier-mask :any) #x8000) + (or (and (eq modifier-mask :any) #x8000) + (encode-mask *state-mask-vector* modifier-mask 'modifier-key) (x-type-error modifier-mask 'modifier-mask))) (defun encode-state-mask (state-mask) diff --git a/clx/requests.lisp b/clx/requests.lisp index 1ccef9579293f10f4a1796f9d26a89d0df4af933..c07e0a5ec95f7482cff63dae3f78f43a5a950e3e 100644 --- a/clx/requests.lisp +++ b/clx/requests.lisp @@ -17,7 +17,7 @@ ;;; #+cmu (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/clx/requests.lisp,v 1.5 1998/12/19 15:21:20 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/clx/requests.lisp,v 1.6 2002/08/19 16:22:20 toy Exp $") (in-package :xlib) @@ -523,7 +523,7 @@ ((or null card32) time))) (defun grab-button (window button event-mask - &key (modifiers 0) + &key (modifiers :any) owner-p sync-pointer-p sync-keyboard-p confine-to cursor) (declare (type window window) (type (or (member :any) card8) button) @@ -543,7 +543,7 @@ (pad8 1) (card16 (encode-modifier-mask modifiers)))) -(defun ungrab-button (window button &key (modifiers 0)) +(defun ungrab-button (window button &key (modifiers :any)) (declare (type window window) (type (or (member :any) card8) button) (type modifier-mask modifiers))