Changeset 11307


Ignore:
Timestamp:
Nov 6, 2008, 1:27:52 PM (12 years ago)
Author:
gb
Message:

Make the initial Cocoa listener load the init file in a standalone
application.

Location:
trunk/source/cocoa-ide
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/cocoa-ide/cocoa-listener.lisp

    r10614 r11307  
    215215     (window :reader cocoa-listener-process-window)))
    216216 
     217(defloadvar *first-listener* t)
    217218
    218219(defun new-cocoa-listener-process (procname window)
     220  (declare (special *standalone-cocoa-ide*))
    219221  (let* ((input-stream (make-instance 'cocoa-listener-input-stream))
    220222         (output-stream (make-instance 'cocoa-listener-output-stream
     
    242244           #'(lambda ()
    243245               (setq ccl::*listener-autorelease-pool* (create-autorelease-pool))
     246               (when (and *standalone-cocoa-ide*
     247                        (prog1 *first-listener* (setq *first-listener* nil)))
     248                 (ccl::startup-ccl (ccl::application-init-file ccl::*application*))
     249                 (ui-object-note-package *nsapp* *package*))
    244250               (ccl::listener-function))
    245251           :echoing nil
  • trunk/source/cocoa-ide/start.lisp

    r11035 r11307  
    7070  ())
    7171
    72 ;; Is this defined on application (rather than cocoa-application) for a reason?
    73 (defmethod ccl::application-error ((a application) condition error-pointer)
     72(defmethod ccl::application-error ((a cocoa-application) condition error-pointer)
    7473  (ccl::break-loop-handle-error condition error-pointer))
    7574
     75
     76(defmethod ccl::application-init-file ((a cocoa-application))
     77  '("home:ccl-init" "home:\\.ccl-init"))
    7678
    7779;;; If we're launched via the Finder, the only argument we'll
     
    140142;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    141143
     144#+x8632-target
     145(break "ready to start Cocoa event loop.")
     146
    142147(start-cocoa-application)
Note: See TracChangeset for help on using the changeset viewer.