Update of /project/climacs/cvsroot/climacs In directory clnet:/tmp/cvs-serv20027

Modified Files: window-commands.lisp gui.lisp Log Message: Changes relating to the new help facilities in ESA.

--- /project/climacs/cvsroot/climacs/window-commands.lisp 2006/05/12 10:31:56 1.7 +++ /project/climacs/cvsroot/climacs/window-commands.lisp 2006/05/13 17:19:10 1.8 @@ -103,20 +103,6 @@ (full-redisplay current-window) new-pane))))

-(define-command (com-describe-bindings :name t :command-table climacs-help-table) - ((sort-by-keystrokes 'boolean :prompt "Sort by keystrokes?")) - (let* ((window (current-window)) - (buffer (buffer (current-window))) - (stream (typeout-window - (format nil "~10THelp: Describe Bindings for ~A" (name buffer)))) - (command-table (command-table window))) - (esa::describe-bindings stream command-table - (if sort-by-keystrokes - #'esa::sort-by-keystrokes - #'esa::sort-by-name)))) - -(set-key `(com-describe-bindings ,*numeric-argument-p*) 'climacs-help-table '((#\h :control) (#\b))) - (defun make-pane-constellation (&optional (with-scrollbars *with-scrollbars*)) "make a vbox containing a scroller pane as its first child and an info pane as its second child. The scroller pane contains a viewport --- /project/climacs/cvsroot/climacs/gui.lisp 2006/05/12 10:31:56 1.213 +++ /project/climacs/cvsroot/climacs/gui.lisp 2006/05/13 17:19:10 1.214 @@ -495,48 +495,8 @@ 'pane-table '((#\x :control) (#\k)))

-;;; Commands for calling the ESA help functions. +;;; For the ESA help functions.

-(define-command (com-describe-binding :name t :command-table help-table) - () - "Display documentation for the command invoked by a giving gesture sequence. -When invoked, this command will wait for user input. If the user inputs a gesture -sequence bound to a command available in the syntax of the current buffer, -documentation and other details will be displayed in a typeout pane." - (let ((command-table (esa:find-applicable-command-table *application-frame*))) - (multiple-value-bind (command gestures) - (esa::read-gestures-for-help command-table) - (let ((gesture-name (format nil "~{~A~#[~; ~; ~]~}" - (mapcar #'esa:gesture-name gestures)))) - (if command - (let ((out-stream (typeout-window (format nil "~10THelp: Describe Binding for ~A" gesture-name)))) - (describe-command-binding-to-stream gesture-name command - :command-table command-table - :stream out-stream)) - (display-message "Unbound gesture: ~A" gesture-name)))))) +(defmethod help-stream ((frame climacs) title) + (typeout-window (format nil "~10T~A" title)))

-(define-command (com-describe-command :name t :command-table climacs-help-table) - ((command 'command-name)) - "Display documentation for the given command." - (unless command - (setf command (accept 'command-name))) - (let ((command-table (esa::find-applicable-command-table *application-frame*)) - (out-stream (typeout-window (format nil "~10THelp: Describe Command for ~A" command)))) - (describe-command-to-stream command - :command-table command-table - :stream out-stream))) - -(set-key 'com-describe-binding - 'climacs-help-table - '((#\h :control) (#\k))) - -(set-key '(com-describe-command nil) - 'climacs-help-table - '((#\h :control) (#\f))) - -(define-presentation-to-command-translator describe-command - (command-name com-describe-command climacs-help-table - :gesture :select - :documentation "Describe command") - (object) - (list object))