Changeset 13073


Ignore:
Timestamp:
Oct 22, 2009, 12:55:33 AM (10 years ago)
Author:
rme
Message:

Merge trunk changes r13036 through r13047

Location:
release/1.4/source
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • release/1.4/source/contrib/foy/list-definitions-cm/history-lists.lisp

    r12785 r13073  
    471471;;; ----------------------------------------------------------------------------
    472472;;; File History Interface:
    473 ;;;
    474 (objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
     473;;;
     474;;; *** Instead of doing all this stuff need the equivalent of:
     475;;; *** (setf ccl::*default-editor-class* 'derived-hemlock-frame-class)
     476#-syntax-styling
     477(objc:defMethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
    475478  (let* ((path (cmenu:window-path w))
    476479         (name (when (and path (string-equal (pathname-type path) "lisp"))
    477480                 (concatenate 'string (pathname-name path) ".lisp"))))
    478481    (when (and name path)
    479       (maybe-add-history-entry *file-history-list* name path))
    480     (call-next-method)))
     482      (maybe-add-history-entry *file-history-list* name path)))
     483  (let ((become-key-function (find-symbol "BECOME-KEY-WINDOW" (find-package :sax))))
     484    (when become-key-function (funcall become-key-function w)))
     485  (call-next-method))
     486
     487#+syntax-styling
     488(defMethod become-key-window ((w gui::hemlock-frame))
     489  (let* ((path (cmenu:window-path w))
     490         (name (when (and path (string-equal (pathname-type path) "lisp"))
     491                 (concatenate 'string (pathname-name path) ".lisp"))))
     492    (when (and name path)
     493      (maybe-add-history-entry *file-history-list* name path))))
    481494
    482495;;; ----------------------------------------------------------------------------
  • release/1.4/source/contrib/foy/list-definitions/history-lists.lisp

    r12746 r13073  
    476476;;; ----------------------------------------------------------------------------
    477477;;; File History Interface:
    478 ;;;
    479 (objc:defmethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
    480   (let* ((path (window-path w))
     478;;;
     479;;; *** Instead of doing all this stuff need the equivalent of:
     480;;; *** (setf ccl::*default-editor-class* 'derived-hemlock-frame-class)
     481#-syntax-styling
     482(objc:defMethod (#/becomeKeyWindow :void) ((w gui::hemlock-frame))
     483  (let* ((path (cmenu:window-path w))
    481484         (name (when (and path (string-equal (pathname-type path) "lisp"))
    482485                 (concatenate 'string (pathname-name path) ".lisp"))))
    483486    (when (and name path)
    484       (maybe-add-history-entry *file-history-list* name path))
    485     (call-next-method)))
     487      (maybe-add-history-entry *file-history-list* name path)))
     488  (let ((become-key-function (find-symbol "BECOME-KEY-WINDOW" (find-package :sax))))
     489    (when become-key-function (funcall become-key-function w)))
     490  (call-next-method))
     491
     492#+syntax-styling
     493(defMethod become-key-window ((w gui::hemlock-frame))
     494  (let* ((path (cmenu:window-path w))
     495         (name (when (and path (string-equal (pathname-type path) "lisp"))
     496                 (concatenate 'string (pathname-name path) ".lisp"))))
     497    (when (and name path)
     498      (maybe-add-history-entry *file-history-list* name path))))
    486499
    487500;;; ----------------------------------------------------------------------------
  • release/1.4/source/contrib/foy/window-parking-cm/window-parking.lisp

    r12849 r13073  
    2929(defparameter *window-parker* nil "The window-parker instance.")
    3030(defparameter *window-parking-menu* nil "The window-parking-menu instance.")
     31(defParameter *park-p* t "To park or not to park.")
    3132
    3233;;; ----------------------------------------------------------------------------
     
    246247    (ns:with-ns-rect (r (ps-h-position ps) (ps-v-position ps) (ps-h-dimension ps) (ps-v-dimension ps))
    247248      (#/setFrame:display: window r t))
    248     (#/makeKeyAndOrderFront: window nil)))
     249    (#/makeKeyAndOrderFront: window nil))
     250  (let ((style-screen-function (find-symbol "STYLE-SCREEN" (find-package :sax))))
     251    (when style-screen-function
     252      (let* ((hemlock-view (gui::hemlock-view window))
     253             (text-view (gui::text-pane-text-view (hi::hemlock-view-pane hemlock-view))))
     254        (when text-view
     255          (funcall style-screen-function text-view))))))
    249256
    250257;;; ----------------------------------------------------------------------------
     
    260267
    261268(defMethod park ((wp window-parker) (window parkable-hemlock-frame))
    262   (when (wp-parking-spots wp)
     269  (when (and (wp-parking-spots wp) *park-p*)
    263270    ;; Already parked?
    264271    (let* ((position (position window (wp-parking-spots wp) :key #'ps-tenant))
     
    372379;;; unless the parking-spot is not on screen or the window is already in that location.
    373380(defMethod move-window-to-position ((wp window-parker) window function-key)
    374   (let* ((parking-spot (find function-key (wp-parking-spots wp) :key #'ps-function-key))
    375          (tenant (when parking-spot (ps-tenant parking-spot))))
    376     (cond ((and parking-spot (parking-spot-on-screen-p parking-spot window))
    377            (cond (tenant
    378                   (cond ((eql window tenant)
    379                          (cmenu:echo-msg "Already in parking-spot ~a." function-key))
    380                         (t
    381                          (cond ((modified-p tenant)
    382                                 (cmenu:notify (format nil "First save: ~S. Then try again."
    383                                                       (cmenu:window-path tenant)))
    384                                 (init-parking tenant))
    385                                (t
    386                                 (vacate-current-location wp window)
    387                                 (bump-location-and-set-location-values wp parking-spot window)
    388                                 (#/makeKeyAndOrderFront: window nil)
    389                                 (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))))
    390                  (t
    391                   (vacate-current-location wp window)
    392                   (apply-parking-spot-values parking-spot window)
    393                   (#/makeKeyAndOrderFront: window nil)
    394                   (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))
    395           (t
    396            (if (null parking-spot)
    397              (cmenu:notify (format nil "Parking-spot ~a is not defined." function-key))
    398              (cmenu:notify (format nil "Parking-spot ~a is off screen." function-key)))))))
     381  (when *park-p*
     382    (let* ((parking-spot (find function-key (wp-parking-spots wp) :key #'ps-function-key))
     383           (tenant (when parking-spot (ps-tenant parking-spot))))
     384      (cond ((and parking-spot (parking-spot-on-screen-p parking-spot window))
     385             (cond (tenant
     386                    (cond ((eql window tenant)
     387                           (cmenu:echo-msg "Already in parking-spot ~a." function-key))
     388                          (t
     389                           (cond ((modified-p tenant)
     390                                  (cmenu:notify (format nil "First save: ~S. Then try again."
     391                                                        (cmenu:window-path tenant)))
     392                                  (init-parking tenant))
     393                                 (t
     394                                  (vacate-current-location wp window)
     395                                  (bump-location-and-set-location-values wp parking-spot window)
     396                                  (#/makeKeyAndOrderFront: window nil)
     397                                  (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))))
     398                   (t
     399                    (vacate-current-location wp window)
     400                    (apply-parking-spot-values parking-spot window)
     401                    (#/makeKeyAndOrderFront: window nil)
     402                    (cmenu:echo-msg "Moved to parking-spot ~a." function-key))))
     403            (t
     404             (if (null parking-spot)
     405               (cmenu:notify (format nil "Parking-spot ~a is not defined." function-key))
     406               (cmenu:notify (format nil "Parking-spot ~a is off screen." function-key))))))))
    399407
    400408;;; ----------------------------------------------------------------------------
  • release/1.4/source/lisp-kernel/darwinx8632/Makefile

    r11912 r13073  
    7070OSLIBS = $(OSEARLYLIBS) $(OSMIDDLELIBS) $(OSLATELIBS)
    7171
    72 ../../dx86cl:    $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
     72../../dx86cl:    tiger-sdk-check $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
    7373        $(LD)  $(LDFLAGS) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ)   $(OSLIBS)
    7474
     
    9595        strip -s retain ../../dx86cl
    9696
     97.PHONY: tiger-sdk-check
     98tiger-sdk-check:
     99        @test -d /Developer/SDKs/MacOSX10.4u.sdk || \
     100                 (echo "*** Install Xcode 10.4 support"; exit 1)
     101
     102
  • release/1.4/source/lisp-kernel/darwinx8664/Makefile

    r12601 r13073  
    9393OSLIBS = $(OSEARLYLIBS) $(OSMIDDLELIBS) $(OSLATELIBS)
    9494
    95 ../../dx86cl64:  $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
     95../../dx86cl64:  tiger-sdk-check $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
    9696        $(LD) $(LDFLAGS) $(KSPOBJ) $(KERNELOBJ)  $(DEBUGOBJ) $(OSLIBS)
    9797
     
    115115strip:  ../../dx86cl64
    116116        strip -s retain ../../dx86cl64
     117
     118.PHONY: tiger-sdk-check
     119tiger-sdk-check:
     120        @test -d /Developer/SDKs/MacOSX10.4u.sdk || \
     121                (echo "*** Install Xcode 10.4 support"; exit 1)
     122
Note: See TracChangeset for help on using the changeset viewer.