Changeset 811

Timestamp:

May 2, 2004, 12:28:06 AM (21 years ago)

Author:

Gary Byers

Message:

save-as, open-document for Hemlock.
Fix off-by-one in paren-blinking; lock view focus when disabling blink
to fix display glitch.

File:

• trunk/ccl/examples/cocoa-editor.lisp (modified) (5 diffs)

trunk/ccl/examples/cocoa-editor.lisp

@@ -538 +538 @@
   (send-super :set-background-color color))
 
-;;; Maybe cause 1 character in the textview to blink (by setting/clearing a
-;;; temporary attribute) in synch with the insertion point.
+;;; Maybe cause 1 character in the textview to blink (by drawing an empty
+;;; character rectangle) in synch with the insertion point.
 
 (define-objc-method ((:void :draw-insertion-point-in-rect (:<NSR>ect r)
@@ -558 +558 @@
                     (ns-make-range (text-view-blink-location self) 1)
                     :actual-character-range (%null-ptr))))
-        #+debug (#_NSLog #@"Flag = %d" :<BOOL> (if flag #$YES #$NO))
+        #+debug (#_NSLog #@"Flag = %d, location = %d" :<BOOL> (if flag #$YES #$NO) :int (text-view-blink-location self))
         (if flag
           (slet ((rect (send layout
@@ -576 +576 @@
   (when (eql (text-view-blink-enabled self) #$YES)
     (setf (text-view-blink-enabled self) #$NO)
-    (let* ((layout (send self 'layout-manager)))
-      (slet ((glyph-range (send layout
-                                :glyph-range-for-character-range
-                                (ns-make-range (text-view-blink-location self)
-                                              1)
-                                :actual-character-range (%null-ptr))))
-          (send layout
-                :draw-glyphs-for-glyph-range glyph-range
-                :at-point  (send self 'text-container-origin))))))
+    (unwind-protect
+         (progn
+           (send self 'lock-focus)
+           (let* ((layout (send self 'layout-manager)))
+             (slet ((glyph-range (send layout
+                                       :glyph-range-for-character-range
+                                       (ns-make-range (text-view-blink-location self)
+                                                      1)
+                                       :actual-character-range (%null-ptr))))
+                   (send layout
+                         :draw-glyphs-for-glyph-range glyph-range
+                         :at-point  (send self 'text-container-origin)))))
+      (send self 'unlock-focus))))
 
 (defmethod update-blink ((self hemlock-textstorage-text-view))
@@ -601 +605 @@
                      #+debug (#_NSLog #@"enable blink, forward")
                      (setf (text-view-blink-location self)
-                           (mark-absolute-position temp)
+                           (1- (mark-absolute-position temp))
                            (text-view-blink-enabled self) #$YES))))
                 ((eql (hi::previous-character point) #\))
@@ -1818 +1822 @@
 
 
+(defun hi::open-document ()
+  (send (send (find-class 'ns:ns-document-controller)
+              'shared-document-controller)
+        :perform-selector-on-main-thread (@selector "openDocument:")
+        :with-object (%null-ptr)
+        :wait-until-done t))
+  
 (defmethod hi::save-hemlock-document ((self hemlock-editor-document))
-  (send self :save-document (%null-ptr)))
+  (send self
+        :perform-selector-on-main-thread (@selector "saveDocument:")
+        :with-object (%null-ptr)
+        :wait-until-done t))
+
+
+(defmethod hi::save-hemlock-document ((self hemlock-editor-document))
+  (send self
+        :perform-selector-on-main-thread (@selector "saveDocumentAs:")
+        :with-object (%null-ptr)
+        :wait-until-done t))
 
 ;;; This needs to run on the main thread.