Changeset 13073

Timestamp:

Oct 21, 2009, 5:55:33 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

Merge trunk changes r13036 through r13047

Location:

release/1.4/source

Files:

• contrib/foy/list-definitions-cm/history-lists.lisp (modified) (1 diff)
• contrib/foy/list-definitions/history-lists.lisp (modified) (1 diff)
• contrib/foy/syntax-styling (copied) (copied from trunk/source/contrib/foy/syntax-styling )
• contrib/foy/window-parking-cm/window-parking.lisp (modified) (4 diffs)
• lisp-kernel/darwinx8632/Makefile (modified) (2 diffs)
• lisp-kernel/darwinx8664/Makefile (modified) (2 diffs)

release/1.4/source/contrib/foy/list-definitions-cm/history-lists.lisp

@@ -471 +471 @@
 ;;; ----------------------------------------------------------------------------
 ;;; File History Interface:
-;;; 
-(objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
+;;;
+;;; *** Instead of doing all this stuff need the equivalent of:
+;;; *** (setf ccl::*default-editor-class* 'derived-hemlock-frame-class)
+#-syntax-styling 
+(objc:defMethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
   (let* ((path (cmenu:window-path w))
          (name (when (and path (string-equal (pathname-type path) "lisp"))
                  (concatenate 'string (pathname-name path) ".lisp"))))
     (when (and name path)
-      (maybe-add-history-entry *file-history-list* name path))
-    (call-next-method)))
+      (maybe-add-history-entry *file-history-list* name path)))
+  (let ((become-key-function (find-symbol "BECOME-KEY-WINDOW" (find-package :sax))))
+    (when become-key-function (funcall become-key-function w)))
+  (call-next-method))
+
+#+syntax-styling
+(defMethod become-key-window ((w gui::hemlock-frame))
+  (let* ((path (cmenu:window-path w))
+         (name (when (and path (string-equal (pathname-type path) "lisp"))
+                 (concatenate 'string (pathname-name path) ".lisp"))))
+    (when (and name path)
+      (maybe-add-history-entry *file-history-list* name path))))
 
 ;;; ----------------------------------------------------------------------------

release/1.4/source/contrib/foy/list-definitions/history-lists.lisp

@@ -476 +476 @@
 ;;; ----------------------------------------------------------------------------
 ;;; File History Interface:
-;;; 
-(objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
-  (let* ((path (window-path w))
+;;;
+;;; *** Instead of doing all this stuff need the equivalent of:
+;;; *** (setf ccl::*default-editor-class* 'derived-hemlock-frame-class)
+#-syntax-styling 
+(objc:defMethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
+  (let* ((path (cmenu:window-path w))
          (name (when (and path (string-equal (pathname-type path) "lisp"))
                  (concatenate 'string (pathname-name path) ".lisp"))))
     (when (and name path)
-      (maybe-add-history-entry *file-history-list* name path))
-    (call-next-method)))
+      (maybe-add-history-entry *file-history-list* name path)))
+  (let ((become-key-function (find-symbol "BECOME-KEY-WINDOW" (find-package :sax))))
+    (when become-key-function (funcall become-key-function w)))
+  (call-next-method))
+
+#+syntax-styling
+(defMethod become-key-window ((w gui::hemlock-frame))
+  (let* ((path (cmenu:window-path w))
+         (name (when (and path (string-equal (pathname-type path) "lisp"))
+                 (concatenate 'string (pathname-name path) ".lisp"))))
+    (when (and name path)
+      (maybe-add-history-entry *file-history-list* name path))))
 
 ;;; ----------------------------------------------------------------------------

release/1.4/source/contrib/foy/window-parking-cm/window-parking.lisp

@@ -29 +29 @@
 (defparameter *window-parker* nil "The window-parker instance.")
 (defparameter *window-parking-menu* nil "The window-parking-menu instance.")
+(defParameter *park-p* t "To park or not to park.")
 
 ;;; ----------------------------------------------------------------------------
@@ -246 +247 @@
     (ns:with-ns-rect (r (ps-h-position ps) (ps-v-position ps) (ps-h-dimension ps) (ps-v-dimension ps))
       (#/setFrame:display: window r t))
-    (#/makeKeyAndOrderFront: window nil)))
+    (#/makeKeyAndOrderFront: window nil))
+  (let ((style-screen-function (find-symbol "STYLE-SCREEN" (find-package :sax))))
+    (when style-screen-function
+      (let* ((hemlock-view (gui::hemlock-view window))
+             (text-view (gui::text-pane-text-view (hi::hemlock-view-pane hemlock-view))))
+        (when text-view
+          (funcall style-screen-function text-view))))))
 
 ;;; ----------------------------------------------------------------------------
@@ -260 +267 @@
 
 (defMethod park ((wp window-parker) (window parkable-hemlock-frame))
-  (when (wp-parking-spots wp)
+  (when (and (wp-parking-spots wp) *park-p*)
     ;; Already parked?
     (let* ((position (position window (wp-parking-spots wp) :key #'ps-tenant))
@@ -372 +379 @@
 ;;; unless the parking-spot is not on screen or the window is already in that location.
 (defMethod move-window-to-position ((wp window-parker) window function-key)
-  (let* ((parking-spot (find function-key (wp-parking-spots wp) :key #'ps-function-key))
-         (tenant (when parking-spot (ps-tenant parking-spot))))
-    (cond ((and parking-spot (parking-spot-on-screen-p parking-spot window))
-           (cond (tenant
-                  (cond ((eql window tenant)
-                         (cmenu:echo-msg "Already in parking-spot ~a." function-key))
-                        (t
-                         (cond ((modified-p tenant)
-                                (cmenu:notify (format nil "First save: ~S. Then try again." 
-                                                      (cmenu:window-path tenant)))
-                                (init-parking tenant))
-                               (t
-                                (vacate-current-location wp window)
-                                (bump-location-and-set-location-values wp parking-spot window)
-                                (#/makeKeyAndOrderFront: window nil)
-                                (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))))
-                 (t 
-                  (vacate-current-location wp window)
-                  (apply-parking-spot-values parking-spot window)
-                  (#/makeKeyAndOrderFront: window nil)
-                  (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))
-          (t
-           (if (null parking-spot)
-             (cmenu:notify (format nil "Parking-spot ~a is not defined." function-key))
-             (cmenu:notify (format nil "Parking-spot ~a is off screen." function-key)))))))
+  (when *park-p*
+    (let* ((parking-spot (find function-key (wp-parking-spots wp) :key #'ps-function-key))
+           (tenant (when parking-spot (ps-tenant parking-spot))))
+      (cond ((and parking-spot (parking-spot-on-screen-p parking-spot window))
+             (cond (tenant
+                    (cond ((eql window tenant)
+                           (cmenu:echo-msg "Already in parking-spot ~a." function-key))
+                          (t
+                           (cond ((modified-p tenant)
+                                  (cmenu:notify (format nil "First save: ~S. Then try again." 
+                                                        (cmenu:window-path tenant)))
+                                  (init-parking tenant))
+                                 (t
+                                  (vacate-current-location wp window)
+                                  (bump-location-and-set-location-values wp parking-spot window)
+                                  (#/makeKeyAndOrderFront: window nil)
+                                  (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))))
+                   (t 
+                    (vacate-current-location wp window)
+                    (apply-parking-spot-values parking-spot window)
+                    (#/makeKeyAndOrderFront: window nil)
+                    (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))
+            (t
+             (if (null parking-spot)
+               (cmenu:notify (format nil "Parking-spot ~a is not defined." function-key))
+               (cmenu:notify (format nil "Parking-spot ~a is off screen." function-key))))))))
 
 ;;; ----------------------------------------------------------------------------

release/1.4/source/lisp-kernel/darwinx8632/Makefile

@@ -70 +70 @@
 OSLIBS = $(OSEARLYLIBS) $(OSMIDDLELIBS) $(OSLATELIBS)
 
-../../dx86cl:    $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
+../../dx86cl:    tiger-sdk-check $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
         $(LD)  $(LDFLAGS) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ)   $(OSLIBS)
 
@@ -95 +95 @@
         strip -s retain ../../dx86cl
 
+.PHONY: tiger-sdk-check
+tiger-sdk-check:
+        @test -d /Developer/SDKs/MacOSX10.4u.sdk || \
+                 (echo "*** Install Xcode 10.4 support"; exit 1)
+
+

release/1.4/source/lisp-kernel/darwinx8664/Makefile

@@ -93 +93 @@
 OSLIBS = $(OSEARLYLIBS) $(OSMIDDLELIBS) $(OSLATELIBS)
 
-../../dx86cl64:  $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
+../../dx86cl64:  tiger-sdk-check $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
         $(LD) $(LDFLAGS) $(KSPOBJ) $(KERNELOBJ)  $(DEBUGOBJ) $(OSLIBS)
 
@@ -115 +115 @@
 strip:  ../../dx86cl64
         strip -s retain ../../dx86cl64
+
+.PHONY: tiger-sdk-check
+tiger-sdk-check:
+        @test -d /Developer/SDKs/MacOSX10.4u.sdk || \
+                (echo "*** Install Xcode 10.4 support"; exit 1)
+