From 0a88576b5ef1f1fb3d40a37ae347f583f4c8b749 Mon Sep 17 00:00:00 2001 From: toy <toy> Date: Mon, 19 Aug 2002 16:22:20 +0000 Subject: [PATCH] From Iban Hatchondo: Also in request.lisp, we have all the grab/ungrab key/button that have 0 for the default value of the modifiers keyword argument. But the clx manual says: " A zero /modifier/mask is equivalent to issuing the request for all possible modifier-key combinations (including the combination of no modifiers)." Shouldn't be the default value :any ? Or is the documentation wrong ? --- clx/clx.lisp | 6 +++--- clx/requests.lisp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clx/clx.lisp b/clx/clx.lisp index b7b9852c3..ac98e1542 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 1ccef9579..c07e0a5ec 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)) -- GitLab