Changeset 587

Timestamp:

Feb 28, 2004, 1:23:22 AM (21 years ago)

Author:

Gary Byers

Message:

More changes for Cocoa Hemlock.

Location:

trunk/ccl/hemlock/src

Files:

• bindings.lisp (modified) (2 diffs)
• cocoa-hemlock.lisp (modified) (1 diff)
• filecoms.lisp (modified) (1 diff)
• htext1.lisp (modified) (1 diff)
• htext3.lisp (modified) (3 diffs)
• modeline.lisp (modified) (1 diff)
• streams.lisp (modified) (2 diffs)
• struct.lisp (modified) (1 diff)

trunk/ccl/hemlock/src/bindings.lisp

@@ -65 +65 @@
 (bind-key "Scroll Next Window Up" #k"control-meta-V")
 
-(bind-key "Process File Options" #k"control-meta-m")
-(bind-key "Ensure File Options Line" #k"control-meta-M")
+(bind-key "Process File Options" #k"control-x m" :global)
+(bind-key "Ensure File Options Line" #k"control-meta-M" :global)
 (bind-key "Help" #k"home")
 (bind-key "Help" #k"control-_")
@@ -90 +90 @@
 (bind-key "Find File" #k"control-x control-f")
 (bind-key "Backup File" #k"control-x meta-b")
-(bind-key "Save All Files" #k"control-x control-m")
-(bind-key "Save All Files" #k"control-x return")
-(bind-key "Save All Files and Exit" #k"control-x meta-z")
+;(bind-key "Save All Files" #k"control-x control-m")
+;(bind-key "Save All Files" #k"control-x return")
+;(bind-key "Save All Files and Exit" #k"control-x meta-z")
 
 (bind-key "List Buffers" #k"control-x control-b")

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

@@ -33 +33 @@
   (setq *current-window* new-window))
 
+;;; This is a public variable.
+;;;
+(defvar *last-key-event-typed* ()
+  "This variable contains the last key-event typed by the user and read as
+   input.")
+
+(defvar *input-transcript* ())

trunk/ccl/hemlock/src/filecoms.lisp

@@ -235 +235 @@
               (funcall (cdr hook) buffer type)
               (setq mode (buffer-major-mode buffer)))))
-        (with-mark ((mark (buffer-start-mark buffer)))
+        (with-mark ((mark (buffer-start-mark buffer) :left-inserting))
           (if (string-equal mode "Lisp")
             (let* ((package-name

trunk/ccl/hemlock/src/htext1.lisp

@@ -191 +191 @@
                  (buffer-unmodified-tick ,b))
           (invoke-hook hemlock::buffer-modified-hook ,b t))
-        (setf (buffer-modified-tick ,b) (tick)))
+        (setf (buffer-modified ,b) t))
       (unwind-protect
            (progn

trunk/ccl/hemlock/src/htext3.lisp

@@ -71 +71 @@
     (declare (simple-string string))
     (unless (zerop (- end start))
-      (modifying-buffer
-       buffer
-       (modifying-line line mark)
-       (if (%sp-find-character string start end #\newline)
-         (with-mark ((mark mark :left-inserting))
+      (if (%sp-find-character string start end #\newline)
+        (with-mark ((mark mark :left-inserting))
            (do ((left-index start (1+ right-index))
                 (right-index
@@ -85 +82 @@
              (insert-string mark string left-index right-index)
              (insert-character mark #\newline)))
+        (modifying-buffer
+         buffer
+         (modifying-line line mark)
          (let ((length (- end start)))
            (if (<= *right-open-pos* (+ *left-open-pos* end))
@@ -99 +99 @@
               (let ((new (+ *left-open-pos* length)))
                 (%sp-byte-blt string start *open-chars* *left-open-pos* new)
-                (setq *left-open-pos* new))))))
-       (buffer-note-insertion buffer mark (- end start))))))
+                (setq *left-open-pos* new)))))
+         (buffer-note-insertion buffer mark (- end start)))))))
 
 

trunk/ccl/hemlock/src/modeline.lisp

@@ -219 +219 @@
   "This is the default value for \"Default Modeline Fields\".")
 
+(defun %init-redisplay ()
+  (add-hook hemlock::buffer-major-mode-hook 'queue-buffer-change)
+  (add-hook hemlock::buffer-minor-mode-hook 'queue-buffer-change)
+  (add-hook hemlock::buffer-name-hook 'queue-buffer-change)
+  (add-hook hemlock::buffer-pathname-hook 'queue-buffer-change)
+  (add-hook hemlock::buffer-modified-hook 'queue-buffer-change)
+  (add-hook hemlock::window-buffer-hook 'queue-window-change))
+
+(defun queue-buffer-change (buffer &optional something-else another-else)
+  (declare (ignore something-else another-else))
+  (dolist (w (buffer-windows buffer))
+    (invalidate-modeline w)))

trunk/ccl/hemlock/src/streams.lisp

@@ -228 +228 @@
 ;;;; Stuff to support keyboard macros.
 
+#+later
+(progn
+  
 (defstruct (kbdmac-stream
             (:include editor-input
@@ -262 +265 @@
   (setf (kbdmac-stream-buffer stream) input)
   stream)
+)

trunk/ccl/hemlock/src/struct.lisp

@@ -104 +104 @@
   (delete-hook nil)           ; List of functions to call upon deletion.
   (external-format :unix)     ; Line-termination, for the time being
+  process                     ; Maybe a listener
   )