Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv5235
Modified Files:
esa.lisp
Log Message:
Sync esa with gsharp: menu-item input context
Date: Tue Nov 1 10:51:03 2005
Author: crhodes
Index: climacs/esa.lisp
diff -u climacs/esa.lisp:1.21 climacs/esa.lisp:1.22
--- climacs/esa.lisp:1.21 Sat Oct 29 00:16:01 2005
+++ climacs/esa.lisp Tue Nov 1 10:51:03 2005
@@ -212,7 +212,7 @@
(defun process-gestures-or-command (frame command-table)
(with-input-context
- (`(command :command-table ,(command-table (car (windows frame)))))
+ (`(or menu-item (command :command-table ,(command-table (car (windows frame))))))
(object)
(let ((gestures '()))
(multiple-value-bind (numarg numargp)
@@ -234,7 +234,18 @@
(execute-frame-command frame command)
(return)))
(t nil))))))
- (t
+ (menu-item
+ (let ((command (command-menu-item-value object)))
+ (unless (listp command)
+ (setq command (list command)))
+ (when (and (typep (frame-standard-input frame) 'interactor-pane)
+ (member *unsupplied-argument-marker* command :test #'eq))
+ (setq command
+ (command-line-read-remaining-arguments-for-partial-command
+ (frame-command-table frame) (frame-standard-input frame)
+ command 0)))
+ (execute-frame-command frame command)))
+ (command
(execute-frame-command frame object))))
(defmethod redisplay-frame-panes :around ((frame esa-frame-mixin) &key force-p)
