Changeset 566

Timestamp:

Feb 23, 2004, 5:41:39 PM (21 years ago)

Author:

Gary Byers

Message:

more changes.

Location:

trunk/ccl

Files:

• examples/hemlock-textstorage.lisp (modified) (6 diffs)
• hemlock/src/bindings.lisp (modified) (3 diffs)
• hemlock/src/cocoa-hemlock.lisp (added)
• hemlock/src/interp.lisp (modified) (2 diffs)
• hemlock/src/modeline.lisp (modified) (3 diffs)
• hemlock/src/struct.lisp (modified) (1 diff)

trunk/ccl/examples/hemlock-textstorage.lisp

@@ -3 +3 @@
 (in-package "CCL")
 
-(require "COCOA")
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (require "HEMLOCK"))
 
 (eval-when (:compile-toplevel :execute)
@@ -9 +10 @@
 
 
-(defstruct hemlock-display
+(defstruct hemlock-display 
   buffer                                ; the hemlock buffer
   buflen                                ; length of buffer, if known
@@ -131 +132 @@
                           :effective-range ((* :<NSR>ange) rangeptr))
                      lisp-text-storage)
+  (declare (ignorable index))
   #+debug
   (#_NSLog #@"Attributes at index %d, rangeptr = %x"
@@ -212 +214 @@
 (define-objc-method ((:void :key-down event)
                      lisp-text-view)
+  #+debug
   (#_NSLog #@"Key down event = %@" :address event)
   (let* ((buffer (text-view-buffer self)))
@@ -258 +261 @@
                             :font (default-font
                                       :name "Courier New Bold Italic"
-                                      :size 12.0)))
+                                      :size 9.0)))
 
 (defun buffer-for-modeline-view (mv)
@@ -652 +655 @@
             (update-line-cache-for-index display pos))
 
-          (send textstorage
+          (send textstorage
                 :edited #$NSTextStorageEditedAttributes
                 :range (ns-make-range pos n)

trunk/ccl/hemlock/src/bindings.lisp

@@ -381 +381 @@
 (bind-key "Delete Previous Character Expanding Tabs" #k"delete" :mode "Lisp")
 
+#+listener-bindings
+(progn
 (bind-key "Evaluate Expression" #k"meta-escape")
 (bind-key "Evaluate Defun" #k"control-x control-e")
@@ -389 +391 @@
 (bind-key "Describe Function Call" #k"control-meta-A")
 (bind-key "Describe Symbol" #k"control-meta-S")
+)
 
 (bind-key "Goto Definition" #k"control-meta-F")
 
+#+debugger-bindings
+(progn
 (bind-key "Debug Up" #k"control-meta-hyper-u")
 (bind-key "Debug Down" #k"control-meta-hyper-d")
@@ -410 +415 @@
 (bind-key "Debug Edit Source" #k"control-meta-hyper-S")
 (bind-key "Debug Flush Errors" #k"control-meta-hyper-F")
-
+)
 
 

trunk/ccl/hemlock/src/interp.lisp

@@ -445 +445 @@
       (multiple-value-bind (trans-result prefix-p)
           (translate-key cmd trans)
+        #+debug
         (format t "~& trans-result = ~s, prefix-p = ~s" trans-result prefix-p)
         (multiple-value-bind (res t-bindings)
@@ -451 +452 @@
             (command 
              (let ((punt t))
+               #+debug
                (format t "~& key-event = ~s, res = ~s, t-bindings = ~s, prefix = ~s"
                        key-event

trunk/ccl/hemlock/src/modeline.lisp

@@ -100 +100 @@
                                    "Hemlock "))
 
+(make-modeline-field :name :external-format :width 4
+                     :function #'(lambda (buffer window)
+                                   "Returns indication of buffer's external-format"
+                                   (declare (ignore window))
+                                   (format nil "[~c] "
+                                           (schar
+                                            (string (buffer-external-format buffer)) 0))))
+
 (make-modeline-field
  :name :package
@@ -124 +132 @@
  :name :modifiedp
  :function #'(lambda (buffer window)
-               "Returns \"* \" if buffer is modified, or the empty string."
+               "Returns \"* \" if buffer is modified, or \"  \"."
                (declare (ignore window))
                (let ((modifiedp (buffer-modified buffer)))
                  (if modifiedp
                      "* "
-                     ""))))
+                     "  "))))
 
 (make-modeline-field
@@ -198 +206 @@
 
 (defvar *default-modeline-fields*
-  (list (modeline-field :hemlock-literal)
+  (list (modeline-field :modifiedp) ;(modeline-field :hemlock-literal)
+        (modeline-field :external-format)
         (modeline-field :package)
         (modeline-field :modes)
-        (modeline-field :modifiedp)
         (modeline-field :buffer-name)
         (modeline-field :buffer-pathname))

trunk/ccl/hemlock/src/struct.lisp

@@ -103 +103 @@
   %modeline-fields            ; List of modeline-field-info's.
   (delete-hook nil)           ; List of functions to call upon deletion.
+  (external-format :unix)     ; Line-termination, for the time being
   )