Changeset 760

Timestamp:

Apr 7, 2004, 8:38:00 PM (21 years ago)

Author:

Gary Byers

Message:

Handle control-g (abort-event) in GET-KEY-EVENT.

File:

• trunk/ccl/hemlock/src/cocoa-hemlock.lisp (modified) (1 diff)

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

@@ -71 +71 @@
 (defvar *input-transcript* ())
 
+(defparameter editor-abort-key-events (list #k"Control-g" #k"Control-G"))
+
+(defmacro abort-key-event-p (key-event)
+  `(member ,key-event editor-abort-key-events))
+
+
 (defun get-key-event (q &optional ignore-pending-aborts)
-  (declare (ignore ignore-pending-aborts))
   (do* ((e (dequeue-key-event q) (dequeue-key-event q)))
-       ((typep e 'hemlock-ext:key-event)        
+       ((typep e 'hemlock-ext:key-event)
+        (unless ignore-pending-aborts
+          (when (abort-key-event-p e)
+            (beep)
+            (throw 'editor-top-level-catcher nil)))
         (setq *last-key-event-typed* e))
     (if (typep e 'buffer-operation)