0
@@ -83,7 +83,9 @@ st_table *nu_block_table = NULL;
0
 #define NSRECT_SIGNATURE1 "{_NSRect=\"origin\"{_NSPoint=\"x\"d\"y\"d}\"size\"{_NSSize=\"width\"d\"height\"d}}"
0
 #define NSRECT_SIGNATURE2 "{_NSRect}"
0
 
0
-#define CGRECT_SIGNATURE "{CGRect={CGPoint=dd}{CGSize=dd}}"
0
+#define CGRECT_SIGNATURE0 "{CGRect={CGPoint=dd}{CGSize=dd}}"
0
+#define CGRECT_SIGNATURE1 "{CGRect=\"origin\"{CGPoint=\"x\"d\"y\"d}\"size\"{CGSize=\"width\"d\"height\"d}}"
0
+#define CGRECT_SIGNATURE2 "{CGRect}"
0
 
0
 #define NSRANGE_SIGNATURE "{_NSRange=QQ}"
0
 #define NSRANGE_SIGNATURE1 "{_NSRange}"
0
@@ -106,7 +108,9 @@ st_table *nu_block_table = NULL;
0
 #define NSRECT_SIGNATURE1 "{_NSRect=\"origin\"{_NSPoint=\"x\"f\"y\"f}\"size\"{_NSSize=\"width\"f\"height\"f}}"
0
 #define NSRECT_SIGNATURE2 "{_NSRect}"
0
 
0
-#define CGRECT_SIGNATURE "{CGRect={CGPoint=ff}{CGSize=ff}}"
0
+#define CGRECT_SIGNATURE0 "{CGRect={CGPoint=ff}{CGSize=ff}}"
0
+#define CGRECT_SIGNATURE1 "{CGRect=\"origin\"{CGPoint=\"x\"f\"y\"f}\"size\"{CGSize=\"width\"f\"height\"f}}"
0
+#define CGRECT_SIGNATURE2 "{CGRect}"
0
 
0
 #define NSRANGE_SIGNATURE "{_NSRange=II}"
0
 #define NSRANGE_SIGNATURE1 "{_NSRange}"
0
@@ -235,7 +239,9 @@ ffi_type *ffi_type_for_objc_type(const char *typeString)
0
             if (!strcmp(typeString, NSRECT_SIGNATURE0) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE1) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE2) ||
0
-                !strcmp(typeString, CGRECT_SIGNATURE)
0
+                !strcmp(typeString, CGRECT_SIGNATURE0) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE1) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE2)
0
             ) {
0
                 if (!initialized_ffi_types) initialize_ffi_types();
0
                 return &ffi_type_nsrect;
0
@@ -306,7 +312,9 @@ size_t size_of_objc_type(const char *typeString)
0
             if (!strcmp(typeString, NSRECT_SIGNATURE0) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE1) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE2) ||
0
-                !strcmp(typeString, CGRECT_SIGNATURE)
0
+                !strcmp(typeString, CGRECT_SIGNATURE0) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE1) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE2)
0
             ) {
0
                 return sizeof(NSRect);
0
             }
0
@@ -373,7 +381,9 @@ void *value_buffer_for_objc_type(const char *typeString)
0
             if (!strcmp(typeString, NSRECT_SIGNATURE0) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE1) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE2) ||
0
-                !strcmp(typeString, CGRECT_SIGNATURE)
0
+                !strcmp(typeString, CGRECT_SIGNATURE0) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE1) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE2)
0
             ) {
0
                 return malloc(sizeof(NSRect));
0
             }
0
@@ -525,7 +535,9 @@ int set_objc_value_from_nu_value(void *objc_value, id nu_value, const char *type
0
                 !strcmp(typeString, NSRECT_SIGNATURE0) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE1) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE2) ||
0
-                !strcmp(typeString, CGRECT_SIGNATURE)
0
+                !strcmp(typeString, CGRECT_SIGNATURE0) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE1) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE2)
0
             ) {
0
                 NSRect *rect = (NSRect *) objc_value;
0
                 id cursor = nu_value;
0
@@ -750,7 +762,9 @@ id get_nu_value_from_objc_value(void *objc_value, const char *typeString)
0
                 !strcmp(typeString, NSRECT_SIGNATURE0) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE1) ||
0
                 !strcmp(typeString, NSRECT_SIGNATURE2) ||
0
-                !strcmp(typeString, CGRECT_SIGNATURE)
0
+                !strcmp(typeString, CGRECT_SIGNATURE0) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE1) ||
0
+                !strcmp(typeString, CGRECT_SIGNATURE2)
0
             ) {
0
                 NSRect *rect = (NSRect *)objc_value;
0
                 NuCell *list = [[[NuCell alloc] init] autorelease];

0
@@ -18,6 +18,9 @@ limitations under the License.
0
 
0
 #import "handler.h"
0
 #import "cell.h"
0
+#ifdef IPHONE
0
+#import <CoreGraphics/CoreGraphics.h>
0
+#endif
0
 
0
 static id collect_arguments(struct handler_description *description, va_list ap)
0
 {
0
@@ -53,6 +56,13 @@ static id collect_arguments(struct handler_description *description, va_list ap)
0
             //NSLog(@"argument is %lf", x);
0
             [cursor setCar:get_nu_value_from_objc_value(&x, type)];
0
         }
0
+        #ifdef IPHONE
0
+        else if (!strcmp(type, "{CGRect={CGPoint=ff}{CGSize=ff}}")
0
+        || (!strcmp(type, "{CGRect=\"origin\"{CGPoint=\"x\"f\"y\"f}\"size\"{CGSize=\"width\"f\"height\"f}}"))) {
0
+            CGRect x = va_arg(ap, CGRect);
0
+            [cursor setCar:get_nu_value_from_objc_value(&x, type)];
0
+        }
0
+        #endif
0
         else {
0
             NSLog(@"unsupported argument type %s, see objc/handler.m to add support for it", type);
0
         }

0
@@ -25,6 +25,7 @@ END)))
0
 
0
 (function generate-handlers (class-name handlers)
0
      (eval (NuTemplate codeForString:<<-END
0
+#ifdef IPHONE
0
 #import "handler.h"  
0
 #import <CoreGraphics/CoreGraphics.h>
0
 
0
@@ -42,6 +43,7 @@ END)))
0
 <% )) %>
0
 }
0
 @end
0
+#endif
0
 END)))
0
 
0
 (set source