Changeset 674

Timestamp:

Mar 19, 2004, 11:36:23 PM (21 years ago)

Author:

Gary Byers

Message:

More command-interpreter changes.

Location:

trunk/ccl/hemlock/src

Files:

• cocoa-hemlock.lisp (modified) (2 diffs)
• command.lisp (modified) (1 diff)
• interp.lisp (modified) (4 diffs)

trunk/ccl/hemlock/src/cocoa-hemlock.lisp

@@ -15 +15 @@
   (prefix-argument-supplied nil)
   frame
-  (function nil)
+  (event-mode-list nil)                 ; for extended modal
   )
 
 (defvar *current-command-info* nil)
+
+(defun push-event-mode-function (f)
+  (push f (command-interpreter-info-event-mode-list *current-command-info*))
+  f)
+
+(defun exit-event-mode ()
+  (setf (command-interpreter-info-event-mode-list *current-command-info*)
+        (cdr (command-interpreter-info-event-mode-list *current-command-info*))))
+
+(defun current-event-mode ()
+  (car (command-interpreter-info-event-mode-list *current-command-info*)))
+
+(defun add-one-shot-event-mode-function (f)
+  (push-event-mode-function #'(lambda (key)
+                                (exit-event-mode)
+                                (funcall f key))))
+
+
 
 (defun buffer-windows (buffer)
@@ -38 +56 @@
   #+not-yet
   (invoke-hook hemlock::set-window-hook new-window)
-  #+clx
-  (move-mark (window-point *current-window*)
-             (buffer-point (window-buffer *current-window*)))
-  #+clx
-  (move-mark (buffer-point (window-buffer new-window))
-             (window-point new-window))
+  (activate-hemlock-view new-window)
   (setq *current-window* new-window))
 

trunk/ccl/hemlock/src/command.lisp

@@ -64 +64 @@
   With prefix argument, insert the character that many times."
   "Reads a key-event from *editor-input* and inserts it at the point."
-  (setf (hi::command-interpreter-info-function hi::*current-command-info*)
-        #'(lambda (key-event)
+  (hi::add-one-shot-event-mode-function
+   #'(lambda (key-event)
             (let* ((char (hemlock-ext:key-event-char key-event))
                    (point (current-point)))

trunk/ccl/hemlock/src/interp.lisp

@@ -428 +428 @@
          (cmd (command-interpreter-info-current-command info))
          (trans (command-interpreter-info-current-translation info))
-         (func (command-interpreter-info-function info)))
+         (func (current-event-mode)))
     (handler-bind
         ;; Bind this outside the invocation loop to save consing.
@@ -450 +450 @@
                 (write-char #\space *echo-area-stream*)))))
       (cond (func
-             (setf (command-interpreter-info-function info) nil)
              (funcall func key-event))
              (t
@@ -493 +492 @@
 ;;;    Read commands from the terminal and execute them, forever.
 ;;;
+#+original
 (defun %command-loop ()
   (let  ((cmd *current-command*)
@@ -551 +551 @@
               (hash-table))))))))
 
+(defun %command-loop ()
+  (format t "~& in %command-loop: current buffer = ~s" (current-buffer)))
+
+
 
 ;;; EXIT-HEMLOCK  --  Public