@@ -29,7 +29,8 @@ demo-app.iconset: demo-app.svg

 mkapp: dylib demo-app demo-app.iconset

 	rm -rf demo.app

 	cp -R demo.app.template demo.app

-	mkdir -p demo.app/Contents/{Resources,MacOS}

+	mkdir -p demo.app/Contents/{Resources,MacOS,Frameworks}

 	iconutil -c icns demo-app.iconset -o demo.app/Contents/Resources/demo-app.icns

 	ibtool --compile demo.app/Contents/Resources/MainMenu.nib MainMenu.xib

-	cp demo-app libnsrect-expose.dylib demo.app/Contents/MacOS

+	cp demo-app demo.app/Contents/MacOS

+	cp libnsrect-expose.dylib demo.app/Contents/MacOS

@@ -1,5 +1,5 @@

 * Intro

-  

+

 CCL and LispWorks and other implementations have their own bridges to

 the objective-c runtime.  This project is an attempt to create a

 bridge that only uses CFFI so that arbitrary lisp implementations can

@@ -20,19 +20,23 @@ lisp's ffi types.

    https://github.com/fiddlerwoaroof/fwoar.lisputils and put it

    somewhere quicklisp can find it (e.g. ~/quicklisp/local-projects)

-2. Install rsvg-convert:

+2. clone cffi from https://github.com/cffi/cffi and put it in the same

+   place (on Big Sur, at least, I need changes that haven't made it to

+   Quicklisp)

+

+3. Install rsvg-convert:

     #+BEGIN_SRC sh :tangle no

-brew install librsvg

+      brew install librsvg

     #+END_SRC

-   

-3. build + run the demo:

+

+4. build + run the demo:

    #+BEGIN_SRC sh :tangle no

-make mkapp CCL=/path/to/ccl

-open demo.app

+     make mkapp CL=/path/to/cl

+     open demo.app

    #+END_SRC

 * Show me the code!

-  

+

 From demo-app.lisp:

 #+BEGIN_SRC lisp :tangle no

@@ -48,7 +52,7 @@ From demo-app.lisp:

                                   "profitButton")))

       (demo-app::load-nib "MainMenu")

-      

+

       (let ((app-delegate [objc-runtime::ns-app @(delegate)]))

         (demo-app::make-button-delegate (value-for-key app-delegate "actionButton")

                               (cffi:callback do-things-action))

@@ -56,7 +60,7 @@ From demo-app.lisp:

                               (cffi:callback alert-action))

         (demo-app::make-button-delegate (value-for-key app-delegate "profitButton")

                               (cffi:callback profit-action)))

-      

+

       [objc-runtime::ns-app @(activateIgnoringOtherApps:) :boolean t]

       [objc-runtime::ns-app @(run)]))

@@ -118,12 +122,12 @@ From demo-app.lisp:

      (defun main ()

        <<disable-sbcl-debugger>>

        (make-org-file *standard-output*

-                      (get-readinglist-info 

-                       (translate-plist 

+                      (get-readinglist-info

+                       (translate-plist

                         (get-bookmark-filename)))))

    #+end_src

-   

-   This pair of functions builds an org file from data extracted from the Safari bookmark file. 

+

+   This pair of functions builds an org file from data extracted from the Safari bookmark file.

    #+name: make-org-file

    #+begin_src lisp :tangle no :results no

@@ -141,7 +145,7 @@ From demo-app.lisp:

                url

                (serapeum:tokens preview)))

    #+end_src

-   

+

    Here we extract the data from Bookmarks.plist using our polymorphic objc data extractor framework

    #+name: translate-plist

@@ -180,7 +184,7 @@ From demo-app.lisp:

    #+end_src

 ** Appendices

-  

+

 *** objc-data-extractor.lisp

     #+begin_src lisp :tangle objc-data-extractors.lisp :noweb yes :comments both

@@ -270,7 +274,7 @@ From demo-app.lisp:

     #+end_src

 *** build-reading-list-reader.sh

-   

+

     #+begin_src sh :tangle build-reading-list-reader.sh

       #!/usr/bin/env bash

       set -eu -x -o pipefail

@@ -310,7 +314,7 @@ From demo-app.lisp:

 *** reading-list-reader.lisp

-    #+begin_src lisp :mkdirp yes :results no :noweb yes :tangle reading-list-reader.lisp 

+    #+begin_src lisp :mkdirp yes :results no :noweb yes :tangle reading-list-reader.lisp

       (defpackage :reading-list-reader

         (:use :cl )

         (:export ))

@@ -349,7 +353,7 @@ From demo-app.lisp:

               (sb-alien:extern-alien "disable_lossage_handler"

                                      (function sb-alien:void))))

     #+end_src

- 

+

 # Local Variables:

 # fill-column: 120 :

@@ -10,22 +10,30 @@

     (format t "~&Exxception: ~a~%" [exception reason])

     (values)))

-(cffi:defcfun (init-window "initWindow")

-    :pointer

-  (window :pointer)

-  (rect :pointer)

-  (a :char)

-  (b :char)

-  (c :boolean))

+(defun init-window (window rect a b c)

+  (format t "~&got rect: ~s" rect)

+  (cffi:foreign-funcall "objc_msgSend"

+                        :pointer window

+                        :pointer @(initWithContentRect:)

+                        :pointer window

+                        (:struct objc-runtime::ns-rect) rect

+                        :char a

+                        :char b

+                        :boolean c

+                        :pointer))

 (defmacro selector-lambda (selector &rest args)

   `(lambda (receiver)

      [receiver ,selector ,@args]))

-(cffi:defcfun (init-with-frame "initWithFrame")

-    :pointer

-  (thing :pointer)

-  (rect :pointer))

+(defun init-with-frame (thing rect)

+  (format t "~&got rect: ~s" rect)

+  (cffi:foreign-funcall "objc_msgSend"

+                        :pointer thing

+                        :pointer @(initWithFrame:)

+                        (:struct objc-runtime::ns-rect) rect

+                        :pointer))

+

 (cffi:defcfun (print-rect "printRect")

     :void

@@ -110,7 +118,7 @@

   (load "~/quicklisp/setup.lisp")

   (funcall (intern "QUICKLOAD" (find-package :QL)) :swank)

   (funcall (intern "CREATE-SERVER" (find-package :swank)) :port 5060 :dont-close t)

-  

+

   (show-alert "Started swank on 5060"))

 (cffi:defcallback alert-action :void ((a :pointer) (b :pointer) (sender :pointer))

@@ -199,7 +207,7 @@

                                 "profitButton")))

     (load-nib "MainMenu.nib")

-    

+

     (let ((app-delegate [objc-runtime::ns-app @(delegate)]))

       (make-button-delegate (value-for-key app-delegate "actionButton")

                             (cffi:callback do-things-action))

@@ -207,7 +215,7 @@

                             (cffi:callback alert-action))

       (make-button-delegate (value-for-key app-delegate "profitButton")

                             (cffi:callback profit-action)))

-    

+

     [objc-runtime::ns-app @(activateIgnoringOtherApps:) :boolean t]

     [objc-runtime::ns-app @(run)]))

@@ -303,7 +311,7 @@

       (with-point (p (20 20))

         (let* ((foreign-rect (make-rect 10 10 120 120))

                (the-window (init-window [#@NSWindow @(alloc)] foreign-rect 15 2 nil)))

-          

+

           [(value-for-key the-window "contentView") @(addSubview:) :pointer (main-view *application-shim*)]

           [the-window @(cascadeTopLeftFromPoint:) :pointer p]

           [the-window @(setTitle:) :pointer application-name]

@@ -344,8 +352,8 @@

 (defun text-view (parent-view)

   (let ((text-view [#@NSTextView @(alloc)]))

-    

-    

+

+

     (trivial-main-thread:with-body-in-main-thread (:blocking nil)

@@ -354,7 +362,7 @@

         (init-with-frame *text-view* v))

       [*window-view* @(addSubview:) :pointer *text-view*]?)

-    (defparameter *view-dictionary* 

+    (defparameter *view-dictionary*

       )

     ))

deleted file mode 100644

@@ -1,43 +0,0 @@

-#include <stdio.h>

-

-// #include <Foundation/NSException.h>

-#include <Foundation/NSGeometry.h>

-#include <AppKit/NSWindow.h>

-

-#import <Cocoa/Cocoa.h>

-

-#define EXPORT __attribute__((visibility("default")))

-

-// // misguided attempt to recover from cocoa exceptions

-// EXPORT void set_uncaught_exception_handler(NSUncaughtExceptionHandler * _Nullable handler) {

-//   NSSetUncaughtExceptionHandler(handler);};

-

-EXPORT void printRect(NSRect rect) {

-  printf("Got a rect: (%f %f), (%f %f)\n",

-         rect.size.width,

-         rect.size.height,

-         rect.origin.x,

-         rect.origin.y);}

-

-EXPORT id initWindow(NSWindow *window, NSRect *rect, char a, char b, Boolean c) {

-  printf("Got a rect: (%f %f), (%f %f)\n", rect->size.width, rect->size.height, rect->origin.x, rect->origin.y);

-  return [window initWithContentRect: *rect

-                           styleMask: a

-                             backing: b

-                               defer: c];}

-EXPORT id initWithFrame(id thing, NSRect *rect) {

-  printf("Got a rect: (%f %f), (%f %f)\n", rect->size.width, rect->size.height, rect->origin.x, rect->origin.y);

-  return [thing initWithFrame: *rect];}

-

-// one way to make this usable with performSelectorOnMainThread:

-// @interface NSStackView (FWOARStackView)

-// - (NSStackView *)addViewLeading:(NSView *)view;

-// @end

-

-// @implementation NSStackView (FWOARStackView)

-// - (NSStackView *)addViewLeading:(NSView *)view {

-//   [self addView:view

-//       inGravity:NSStackViewGravityLeading];

-//   return self;

-// }

-// @end

@@ -5,18 +5,15 @@

 (serapeum:eval-always

   (cffi:define-foreign-library cocoa

     (:darwin (:framework "Cocoa")))

-  (define-foreign-library foundation

+  (cffi:define-foreign-library foundation

     (:darwin (:framework "Foundation")))

-  (define-foreign-library appkit

-    (:darwin (:framework "AppKit")))

-  (define-foreign-library expose-stuff

-    (:darwin #p"libnsrect-expose.dylib")))

+  (cffi:define-foreign-library appkit

+    (:darwin (:framework "AppKit"))))

 (use-foreign-library foundation)

 (use-foreign-library cocoa)

 (use-foreign-library appkit)

-(use-foreign-library expose-stuff)

 (defctype o-class :pointer)

 (defctype o-selector :pointer)

@@ -340,7 +337,7 @@

   (let* ((class-cache (objc-class-cache (closer-mop:class-prototype (find-class 'objc-class))))

          (cached (gethash name class-cache)))

     (if cached

-        cached 

+        cached

         (let ((objc-class (objc-look-up-class name)))

           (if (null-pointer-p objc-class)

               (error 'no-such-objc-class :wanted-name name)

@@ -353,7 +350,7 @@

 ;;         Or should we let that fall through to message sending?

 (defun %ensure-wrapped-objc-selector (name target-class result-type args)

   (assert (= (count #\: name)

-             (length args))

+            (length args))

           (name args)

           "Invalid number of arg types for selector ~s" name)

@@ -361,7 +358,7 @@

          (cached (gethash (list name target-class)

                           class-cache)))

     (if cached

-        cached 

+        cached

         (let ((objc-selector (ensure-selector name)))

           (setf (gethash (list name target-class) class-cache)

                 (make-instance 'objc-selector

@@ -411,10 +408,9 @@

 (defmacro with-typed-selectors ((&rest defs) &body body)

   (let ((expanded-defs (loop for ((name objc-name) args ret-type) in defs

-                          collect

-                            `((,name (&rest r) (apply ,name r))

-                              (,name (%ensure-wrapped-objc-selector ,objc-name ',ret-type ',args))))))

+                             collect

+                             `((,name (&rest r) (apply ,name r))

+                               (,name (%ensure-wrapped-objc-selector ,objc-name ',ret-type ',args))))))

     `(let (,@(mapcar #'second expanded-defs))

        (flet (,@(mapcar #'first expanded-defs))

          ,@body))))

-