Alter Makefile so that .nib files get copied into Resources/ directory

in the application bundle.

Don't load the IDE as part of the app.  As part of this:
  * change NSPrincipalClass in Info.plist to NSApplication
  * use ccl::*nsapp* instead of gui::*nsapp*
  * load some files from ccl:mac-ide; which contain functionality we need
  * use ccl::call-in-initial-process instead of gui::execute-in-gui
  * copy shift-key-now-p
  * use (require 'objc-support) rather than (require 'cocoa) in build.lisp

To get the app rolling, we define an :after method on the generic function
ccl::initialize-user-interface (see bottom of dpf.lisp).

Author: xrme

Info.plist

@@ -31,6 +31,6 @@
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
-	<string>LispApplication</string>
+	<string>NSApplication</string>
 </dict>
 </plist>

Makefile

@@ -1,4 +1,5 @@
 CONTENTS="build/Picture Window.app/Contents/"
+RESOURCES=$(CONTENTS)/Resources
 BINARY="$(CONTENTS)/MacOS/Picture Window"
 
 %.nib : en.lproj/%.xib
@@ -7,12 +8,11 @@ BINARY="$(CONTENTS)/MacOS/Picture Window"
 NIBS=MainMenu.nib dpf-preferences.nib help.nib
 
 build:  nibs 
-	mkdir -p $(CONTENTS)
-	cp $(NIBS) $(CONTENTS)
+	mkdir -p $(RESOURCES)
+	cp $(NIBS) $(RESOURCES)
 	ccl --no-init --load build.lisp
 
 nibs: $(NIBS)
-	
 
 clean:
 	rm -f $(NIBS)

application.lisp

@@ -1,21 +1,5 @@
 (in-package "CCL")
 
-(defclass cocoa-event-process (process)
-  ())
-
-(defmethod process-interrupt ((process cocoa-event-process) function
-			      &rest args)
-  (if (eq process *current-process*)
-    (apply function args)
-    (if (and *nsapp* (#/isRunning *nsapp*))
-      (queue-for-event-process #'(lambda () (apply function args)))
-      (call-next-method))))
-
-(defmethod process-exit-application :before ((process cocoa-event-process)
-					     (thunk t))
-  (when (eq process *initial-process*)
-    (#/terminate: *nsapp* +null-ptr+)))
-
 (defclass cocoa-ui-object (ui-object)
   ())
 
@@ -90,7 +74,6 @@
 	app))))
 
 (defun become-foreground-application ()
-  #+apple-objc
   (rlet ((psn #>ProcessSerialNumber))
     (#_GetCurrentProcess psn)
     (#_TransformProcessType psn #$kProcessTransformToForegroundApplication)))

build.lisp

@@ -2,8 +2,6 @@
 
 (setq ccl:*save-source-locations* nil)
 
-(require "COCOA")
-
 (defparameter *source-dir* (make-pathname :name nil :type nil
 					  :defaults *load-truename*))
 (defparameter *build-dir* (merge-pathnames "build/" *source-dir*))
@@ -52,12 +50,14 @@
     (finish-output t)
     (save-application (merge-pathnames "ccl/Picture Window.image"
 				       *resources-dir*)
-		      :application-class (find-symbol "DPF-APPLICATION"
-						      "DPF"))))
+		      :application-class (find-symbol "COCOA-APPLICATION"
+						      "CCL"))))
 
-(require 'cocoa)
+(require 'objc-support)
 (ccl::define-special-objc-word "DPF")
 ;; Core Animation lives in QuartzCore
 (objc:load-framework "QuartzCore" :quartzcore)
 
+(load "ccl:mac-ui;cf-utils")
+(load "ccl:mac-ui;event-process")
 (build-dpf)

dpf.lisp

@@ -5,7 +5,7 @@
 	 (b (#/initWithFrame: (#/alloc ns:ns-button) r)))
     (#/setButtonType: b #$NSSwitchButton)
     (#/setTitle: b #@"Look for pictures in subfolders")
-    (gui::execute-in-gui
+    (ccl::call-in-initial-process
      #'(lambda ()
 	 (let ((op (#/openPanel ns:ns-open-panel)))
 	   (#/retain op)
@@ -457,7 +457,7 @@
 
 (defun restore-slideshow-state ()
   (let ((path (merge-pathnames *saved-state-filename* *saved-state-directory*)))
-    (if (gui::shift-key-now-p)
+    (if (shift-key-now-p)
       (ignore-errors (delete-file path))
       (when (probe-file path)
 	(with-open-file (input path)
@@ -1055,13 +1055,13 @@
 	    (make-instance 'iphoto-library
 			   :album-data-pathname
 			   (merge-pathnames "AlbumData.xml" dir)))))
-  (gui::execute-in-gui #'(lambda ()
-        		   (retarget-preferences-menu-item)
-        		   (make-view-menu)
-                           (add-slideshow-menu)
-        		   (configure-help-menu)
-        		   (maybe-show-help-window)
-        		   (restore-slideshow-state))))
+  (ccl::call-in-initial-process #'(lambda ()
+				    (retarget-preferences-menu-item)
+				    (make-view-menu)
+				    (add-slideshow-menu)
+				    (configure-help-menu)
+				    (maybe-show-help-window)
+				    (restore-slideshow-state))))
 
 (defun make-slideshow (assets title source &optional plist)
   (ns:with-ns-rect (r 0 0 500 310)
@@ -1085,15 +1085,15 @@
       (if (directory-pathname-p title)
 	(with-cfstring (s (native-translated-namestring title))
 	  (#/setTitleWithRepresentedFilename: w s)
-	  (#/addWindowsItem:title:filename: gui::*nsapp* w
+	  (#/addWindowsItem:title:filename: ccl::*nsapp* w
 					    (#/lastPathComponent s) nil)
 	  (#/setFrameAutosaveName: w s)
 	  (unless (#/setFrameUsingName: w s)
 	    ;; lower left corner
 	    (#/setFrameOrigin: w #&NSZeroPoint)))
 	(with-cfstring (s (native-translated-namestring title))
 	  (#/setTitle: w s)
-	  (#/addWindowsItem:title:filename: gui::*nsapp* w s nil)
+	  (#/addWindowsItem:title:filename: ccl::*nsapp* w s nil)
 	  (#/setFrameAutosaveName: w s)
 	  (unless (#/setFrameUsingName: w s)
 	    ;; lower left corner
@@ -1192,17 +1192,7 @@
 	(make-slideshow assets (iphoto-album-name album)
 			(iphoto-album-name album) plist)))))
 
-;;; hack-o-rama.  better than having to alter the ide sources, though.
 
-(defclass dpf-application (ccl::cocoa-application)
-  ())
 
-(defmethod toplevel-function ((a dpf-application) init-file)
-  (declare (ignore init-file))
-  (process-run-function "initialize DPF"
-			#'(lambda ()
-			    ;; (wait-on-semaphore
-			    ;;  gui::*cocoa-ide-finished-launching*)
-			    (objc:with-autorelease-pool 
-				(init-slideshow))))
-  (call-next-method))
+(defmethod ccl::initialize-user-interface :after ((a ccl::cocoa-application))
+  (init-slideshow))

misc.lisp

@@ -14,3 +14,10 @@
 
 (defloadvar *black-color* (#/retain (#/blackColor ns:ns-color)))
 (defloadvar *clear-color* (#/retain (#/clearColor ns:ns-color)))
+
+(defun shift-key-now-p ()
+  (let* ((event (#_CGEventCreate +null-ptr+))
+	 (flags (#_CGEventGetFlags event)))
+    (prog1
+	(logtest flags #$kCGEventFlagMaskShift)
+      (#_CFRelease event))))