0
@@ -327,7 +327,7 @@ else
0
 
0
   case PLATFORM when /darwin/
0
     DLEXT = "dylib"
0
-    LINUX_CFLAGS << " -DSHOES_QUARTZ -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -fpascal-strings #{Config::CONFIG["CFLAGS"]} -x objective-c"
0
+    LINUX_CFLAGS << " -DSHOES_QUARTZ -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -fpascal-strings #{Config::CONFIG["CFLAGS"]} -x objective-c -fobjc-exceptions"
0
     LINUX_LDFLAGS = "-framework Cocoa -framework Carbon -dynamiclib -Wl,-single_module #{Config::CONFIG["LDFLAGS"]} INSTALL_NAME"
0
     LINUX_LIB_NAMES << 'pixman-1' << 'jpeg.62'
0
     if ENV['VIDEO']

0
@@ -48,13 +48,14 @@ class Shoes::Setup
0
         end
0
 
0
         start do
0
-          Thread.start(self.app) do |app|
0
-            begin
0
-              setup.start(app)
0
-            rescue => e
0
-              puts e.message
0
+          @th = 
0
+            Thread.start(self.app) do |app|
0
+              begin
0
+                setup.start(app)
0
+              rescue => e
0
+                puts e.message
0
+              end
0
             end
0
-          end
0
         end
0
       end
0
 
0
@@ -66,6 +67,10 @@ class Shoes::Setup
0
           stroke rgb(0.7, 0.7, 0.9, 1.0 - (i * 0.1))
0
           oval(@logo.left - i, @logo.top - i, @logo.width + (i * 2)) 
0
         end
0
+        if @script
0
+          Shoes.visit(@script)
0
+          close
0
+        end
0
       end
0
     end
0
   end
0
@@ -131,9 +136,7 @@ class Shoes::Setup
0
       ui.progress count, total
0
     end
0
     Gem::DefaultUserInteraction.ui = old_ui
0
-
0
-    Shoes.visit(@script)
0
-    app.close
0
+    app.instance_variable_set("@script", @script)
0
   end
0
 
0
   def svn(dir, save_as = nil, &blk)

0
@@ -306,18 +306,10 @@ shoes_app_visit(shoes_app *app, char *path)
0
   shoes_exec exec;
0
   shoes_canvas *canvas;
0
   VALUE meth;
0
-  VALUE ary = rb_ary_dup(app->extras);
0
   Data_Get_Struct(app->canvas, shoes_canvas, canvas);
0
 
0
   canvas->slot->scrolly = 0;
0
   shoes_native_slot_clear(canvas);
0
-  for (i = 0; i < RARRAY_LEN(ary); i++) 
0
-  {
0
-    VALUE timer = rb_ary_entry(ary, i);
0
-    if (!NIL_P(timer))
0
-      rb_funcall(timer, s_remove, 0);
0
-  }
0
-
0
   shoes_app_clear(app);
0
   shoes_app_reset_styles(app);
0
   meth = rb_funcall(cShoes, s_run, 1, app->location = rb_str_new2(path));

0
@@ -14,6 +14,12 @@
0
 
0
 #define INIT    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]
0
 #define RELEASE [pool release]
0
+#define COCOA_DO(statements) do {\
0
+  INIT; \
0
+  @try { statements; } \
0
+  @catch (NSException *e) { ; } \
0
+  RELEASE; \
0
+} while (0)
0
 
0
 @implementation ShoesEvents
0
 - (id)init
0
@@ -643,8 +649,10 @@ void shoes_native_slot_lengthen(SHOES_SLOT_OS *slot, int height, int endy)
0
   if (slot->vscroll)
0
   {
0
     float s = slot->scrolly * 1., e = endy * 1., h = height * 1., d = (endy - height) * 1.;
0
-    [slot->vscroll setFloatValue: (d > 0 ? s / d : 0) knobProportion: (h / e)];
0
-    [slot->vscroll setHidden: endy <= height ? YES : NO];
0
+    COCOA_DO({
0
+      [slot->vscroll setFloatValue: (d > 0 ? s / d : 0) knobProportion: (h / e)];
0
+      [slot->vscroll setHidden: endy <= height ? YES : NO];
0
+    });
0
   }
0
 }
0
 
0
@@ -698,23 +706,23 @@ shoes_native_app_resized(shoes_app *app)
0
 void
0
 shoes_native_app_title(shoes_app *app, char *msg)
0
 {
0
-  [app->os.window setTitle: [NSString stringWithUTF8String: msg]];
0
+  COCOA_DO([app->os.window setTitle: [NSString stringWithUTF8String: msg]]);
0
 }
0
 
0
 shoes_code
0
 shoes_native_app_open(shoes_app *app, char *path, int dialog)
0
 {
0
-  INIT;
0
   unsigned int mask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
0
   shoes_code code = SHOES_OK;
0
 
0
-  if (app->resizable)
0
-    mask |= NSResizableWindowMask;
0
-  app->os.window = [[ShoesWindow alloc] initWithContentRect: NSMakeRect(0, 0, app->width, app->height)
0
-    styleMask: mask backing: NSBackingStoreBuffered defer: NO];
0
-  [app->os.window prepareWithApp: app->self];
0
-  app->slot->view = [app->os.window contentView];
0
-  RELEASE;
0
+  COCOA_DO({
0
+    if (app->resizable)
0
+      mask |= NSResizableWindowMask;
0
+    app->os.window = [[ShoesWindow alloc] initWithContentRect: NSMakeRect(0, 0, app->width, app->height)
0
+      styleMask: mask backing: NSBackingStoreBuffered defer: NO];
0
+    [app->os.window prepareWithApp: app->self];
0
+    app->slot->view = [app->os.window contentView];
0
+  });
0
 
0
 quit:
0
   return code;
0
@@ -723,7 +731,7 @@ quit:
0
 void
0
 shoes_native_app_show(shoes_app *app)
0
 {
0
-  [app->os.window orderFront: nil];
0
+  COCOA_DO([app->os.window orderFront: nil]);
0
 }
0
 
0
 void
0
@@ -736,9 +744,7 @@ shoes_native_loop()
0
 void
0
 shoes_native_app_close(shoes_app *app)
0
 {
0
-  INIT;
0
-  [app->os.window close];
0
-  RELEASE;
0
+  COCOA_DO([app->os.window close]);
0
 }
0
 
0
 void
0
@@ -752,32 +758,32 @@ shoes_browser_open(char *url)
0
 void
0
 shoes_slot_init(VALUE c, SHOES_SLOT_OS *parent, int x, int y, int width, int height, int scrolls, int toplevel)
0
 {
0
-  INIT;
0
   shoes_canvas *canvas;
0
   SHOES_SLOT_OS *slot;
0
   Data_Get_Struct(c, shoes_canvas, canvas);
0
 
0
-  slot = shoes_slot_alloc(canvas, parent, toplevel);
0
-  slot->controls = parent->controls;
0
-  slot->view = [[ShoesView alloc] initWithFrame: NSMakeRect(x, y, width, height) andCanvas: c];
0
-  [slot->view setAutoresizesSubviews: NO];
0
-  if (toplevel)
0
-    [slot->view setAutoresizingMask: (NSViewWidthSizable | NSViewHeightSizable)];
0
-  slot->vscroll = NULL;
0
-  if (scrolls)
0
-  {
0
-    slot->vscroll = [[NSScroller alloc] initWithFrame: 
0
-      NSMakeRect(width - [NSScroller scrollerWidth], 0, [NSScroller scrollerWidth], height)];
0
-    [slot->vscroll setEnabled: YES];
0
-    [slot->vscroll setTarget: slot->view];
0
-    [slot->vscroll setAction: @selector(scroll:)];
0
-    [slot->view addSubview: slot->vscroll];
0
-  }
0
-  if (parent->vscroll)
0
-    [parent->view addSubview: slot->view positioned: NSWindowBelow relativeTo: parent->vscroll];
0
-  else
0
-    [parent->view addSubview: slot->view];
0
-  RELEASE;
0
+  COCOA_DO({
0
+    slot = shoes_slot_alloc(canvas, parent, toplevel);
0
+    slot->controls = parent->controls;
0
+    slot->view = [[ShoesView alloc] initWithFrame: NSMakeRect(x, y, width, height) andCanvas: c];
0
+    [slot->view setAutoresizesSubviews: NO];
0
+    if (toplevel)
0
+      [slot->view setAutoresizingMask: (NSViewWidthSizable | NSViewHeightSizable)];
0
+    slot->vscroll = NULL;
0
+    if (scrolls)
0
+    {
0
+      slot->vscroll = [[NSScroller alloc] initWithFrame: 
0
+        NSMakeRect(width - [NSScroller scrollerWidth], 0, [NSScroller scrollerWidth], height)];
0
+      [slot->vscroll setEnabled: YES];
0
+      [slot->vscroll setTarget: slot->view];
0
+      [slot->vscroll setAction: @selector(scroll:)];
0
+      [slot->view addSubview: slot->vscroll];
0
+    }
0
+    if (parent->vscroll)
0
+      [parent->view addSubview: slot->view positioned: NSWindowBelow relativeTo: parent->vscroll];
0
+    else
0
+      [parent->view addSubview: slot->view];
0
+  });
0
 }
0
 
0
 void
0
@@ -838,13 +844,13 @@ shoes_native_canvas_resize(shoes_canvas *canvas)
0
 void
0
 shoes_native_control_hide(SHOES_CONTROL_REF ref)
0
 {
0
-  [ref setHidden: YES];
0
+  COCOA_DO([ref setHidden: YES]);
0
 }
0
 
0
 void
0
 shoes_native_control_show(SHOES_CONTROL_REF ref)
0
 {
0
-  [ref setHidden: NO];
0
+  COCOA_DO([ref setHidden: NO]);
0
 }
0
 
0
 static void
0
@@ -884,15 +890,13 @@ shoes_native_control_repaint(SHOES_CONTROL_REF ref, shoes_place *p1,
0
 void
0
 shoes_native_control_focus(SHOES_CONTROL_REF ref)
0
 {
0
-  [[ref window] makeFirstResponder: ref];
0
+  COCOA_DO([[ref window] makeFirstResponder: ref]);
0
 }
0
 
0
 void
0
 shoes_native_control_remove(SHOES_CONTROL_REF ref, shoes_canvas *canvas)
0
 {
0
-  INIT;
0
-  [ref removeFromSuperview];
0
-  RELEASE;
0
+  COCOA_DO([ref removeFromSuperview]);
0
 }
0
 
0
 void
0
@@ -975,9 +979,7 @@ shoes_native_edit_line_get_text(SHOES_CONTROL_REF ref)
0
 void
0
 shoes_native_edit_line_set_text(SHOES_CONTROL_REF ref, char *msg)
0
 {
0
-  INIT;
0
-  [ref setStringValue: [NSString stringWithUTF8String: msg]];
0
-  RELEASE;
0
+  COCOA_DO([ref setStringValue: [NSString stringWithUTF8String: msg]]);
0
 }
0
 
0
 SHOES_CONTROL_REF
0
@@ -1006,9 +1008,7 @@ shoes_native_edit_box_get_text(SHOES_CONTROL_REF ref)
0
 void
0
 shoes_native_edit_box_set_text(SHOES_CONTROL_REF ref, char *msg)
0
 {
0
-  INIT;
0
-  [[[(ShoesTextView *)ref textStorage] mutableString] setString: [NSString stringWithUTF8String: msg]];
0
-  RELEASE;
0
+  COCOA_DO([[[(ShoesTextView *)ref textStorage] mutableString] setString: [NSString stringWithUTF8String: msg]]);
0
 }
0
 
0
 SHOES_CONTROL_REF
0
@@ -1026,18 +1026,18 @@ shoes_native_list_box(VALUE self, shoes_canvas *canvas, shoes_place *place, VALU
0
 void
0
 shoes_native_list_box_update(SHOES_CONTROL_REF ref, VALUE ary)
0
 {
0
-  INIT;
0
   long i;
0
   ShoesPopUpButton *pop = (ShoesPopUpButton *)ref;
0
-  [pop removeAllItems];
0
-  for (i = 0; i < RARRAY_LEN(ary); i++)
0
-  {
0
-    VALUE msg_s = shoes_native_to_s(rb_ary_entry(ary, i));
0
-    char *msg = RSTRING_PTR(msg_s);
0
-    [[pop menu] insertItemWithTitle: [NSString stringWithUTF8String: msg] action: nil
0
-      keyEquivalent: @"" atIndex: i];
0
-  }
0
-  RELEASE;
0
+  COCOA_DO({
0
+    [pop removeAllItems];
0
+    for (i = 0; i < RARRAY_LEN(ary); i++)
0
+    {
0
+      VALUE msg_s = shoes_native_to_s(rb_ary_entry(ary, i));
0
+      char *msg = RSTRING_PTR(msg_s);
0
+      [[pop menu] insertItemWithTitle: [NSString stringWithUTF8String: msg] action: nil
0
+        keyEquivalent: @"" atIndex: i];
0
+    }
0
+  });
0
 }
0
 
0
 VALUE
0
@@ -1054,7 +1054,7 @@ shoes_native_list_box_set_active(SHOES_CONTROL_REF ref, VALUE ary, VALUE item)
0
 {
0
   int idx = rb_ary_index_of(ary, item);
0
   if (idx < 0) return;
0
-  [(ShoesPopUpButton *)ref selectItemAtIndex: idx];
0
+  COCOA_DO([(ShoesPopUpButton *)ref selectItemAtIndex: idx]);
0
 }
0
 
0
 SHOES_CONTROL_REF
0
@@ -1078,7 +1078,7 @@ shoes_native_progress_get_fraction(SHOES_CONTROL_REF ref)
0
 void
0
 shoes_native_progress_set_fraction(SHOES_CONTROL_REF ref, double perc)
0
 {
0
-  [(NSProgressIndicator *)ref setDoubleValue: perc * 100.];
0
+  COCOA_DO([(NSProgressIndicator *)ref setDoubleValue: perc * 100.]);
0
 }
0
 
0
 SHOES_CONTROL_REF
0
@@ -1099,7 +1099,7 @@ shoes_native_check_get(SHOES_CONTROL_REF ref)
0
 void
0
 shoes_native_check_set(SHOES_CONTROL_REF ref, int on)
0
 {
0
-  [(ShoesButton *)ref setState: on ? NSOnState : NSOffState];
0
+  COCOA_DO([(ShoesButton *)ref setState: on ? NSOnState : NSOffState]);
0
 }
0
 
0
 SHOES_CONTROL_REF
0
@@ -1115,9 +1115,7 @@ shoes_native_radio(VALUE self, shoes_canvas *canvas, shoes_place *place, VALUE a
0
 void
0
 shoes_native_timer_remove(shoes_canvas *canvas, SHOES_TIMER_REF ref)
0
 {
0
-  INIT;
0
-  [ref invalidate];
0
-  RELEASE;
0
+  COCOA_DO([ref invalidate]);
0
 }
0
 
0
 SHOES_TIMER_REF
0
@@ -1144,11 +1142,11 @@ shoes_native_clipboard_get(shoes_app *app)
0
 void
0
 shoes_native_clipboard_set(shoes_app *app, VALUE string)
0
 {
0
-  INIT;
0
-  [[NSPasteboard generalPasteboard] declareTypes: [NSArray arrayWithObject: NSStringPboardType] owner: nil];
0
-  [[NSPasteboard generalPasteboard] setString: [NSString stringWithUTF8String: RSTRING_PTR(string)]
0
-    forType: NSStringPboardType];
0
-  RELEASE;
0
+  COCOA_DO({
0
+    [[NSPasteboard generalPasteboard] declareTypes: [NSArray arrayWithObject: NSStringPboardType] owner: nil];
0
+    [[NSPasteboard generalPasteboard] setString: [NSString stringWithUTF8String: RSTRING_PTR(string)]
0
+      forType: NSStringPboardType];
0
+  });
0
 }
0
 
0
 VALUE
0
@@ -1179,55 +1177,53 @@ shoes_native_dialog_color(shoes_app *app)
0
 VALUE
0
 shoes_dialog_alert(VALUE self, VALUE msg)
0
 {
0
-  INIT;
0
   VALUE answer = Qnil;
0
-  msg = shoes_native_to_s(msg);
0
-  NSAlert *alert = [NSAlert alertWithMessageText: @"Shoes says:"
0
-    defaultButton: @"OK" alternateButton: nil otherButton: nil 
0
-    informativeTextWithFormat: [NSString stringWithUTF8String: RSTRING_PTR(msg)]];
0
-  [alert runModal];
0
-  RELEASE;
0
+  COCOA_DO({
0
+    msg = shoes_native_to_s(msg);
0
+    NSAlert *alert = [NSAlert alertWithMessageText: @"Shoes says:"
0
+      defaultButton: @"OK" alternateButton: nil otherButton: nil 
0
+      informativeTextWithFormat: [NSString stringWithUTF8String: RSTRING_PTR(msg)]];
0
+    [alert runModal];
0
+  });
0
   return Qnil;
0
 }
0
 
0
 VALUE
0
 shoes_dialog_ask(int argc, VALUE *argv, VALUE self)
0
 {
0
-  INIT;
0
   VALUE quiz, attr = Qnil, answer = Qnil;
0
   rb_scan_args(argc, argv, "11", &quiz, &attr);
0
   quiz = shoes_native_to_s(quiz);
0
-  NSAlert *alert = [NSAlert alertWithMessageText: @"Shoes asks:"
0
-    defaultButton:@"OK" alternateButton:@"Cancel" otherButton:nil
0
-    informativeTextWithFormat: [NSString stringWithUTF8String: RSTRING_PTR(quiz)]];
0
-  NSTextField *input;
0
-  if (RTEST(ATTR(attr, secret)))
0
-    input = [[NSSecureTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
0
-  else
0
-    input = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
0
-  [input setStringValue:@""];
0
-  [alert setAccessoryView:input];
0
-  if ([alert runModal] == NSOKButton)
0
-  {
0
-    answer = rb_str_new2([[input stringValue] UTF8String]);
0
-  }
0
-  RELEASE;
0
+  COCOA_DO({
0
+    NSAlert *alert = [NSAlert alertWithMessageText: @"Shoes asks:"
0
+      defaultButton:@"OK" alternateButton:@"Cancel" otherButton:nil
0
+      informativeTextWithFormat: [NSString stringWithUTF8String: RSTRING_PTR(quiz)]];
0
+    NSTextField *input;
0
+    if (RTEST(ATTR(attr, secret)))
0
+      input = [[NSSecureTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
0
+    else
0
+      input = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
0
+    [input setStringValue:@""];
0
+    [alert setAccessoryView:input];
0
+    if ([alert runModal] == NSOKButton)
0
+      answer = rb_str_new2([[input stringValue] UTF8String]);
0
+  });
0
   return answer;
0
 }
0
 
0
 VALUE
0
 shoes_dialog_confirm(VALUE self, VALUE quiz)
0
 {
0
-  INIT;
0
   char *msg;
0
   VALUE answer = Qnil;
0
-  quiz = shoes_native_to_s(quiz);
0
-  msg = RSTRING_PTR(quiz);
0
-  NSAlert *alert = [NSAlert alertWithMessageText: @"Shoes asks:"
0
-    defaultButton: @"OK" alternateButton: @"Cancel" otherButton:nil 
0
-    informativeTextWithFormat: [NSString stringWithUTF8String: msg]];
0
-  answer = ([alert runModal] == NSOKButton ? Qtrue : Qfalse);
0
-  RELEASE;
0
+  COCOA_DO({
0
+    quiz = shoes_native_to_s(quiz);
0
+    msg = RSTRING_PTR(quiz);
0
+    NSAlert *alert = [NSAlert alertWithMessageText: @"Shoes asks:"
0
+      defaultButton: @"OK" alternateButton: @"Cancel" otherButton:nil 
0
+      informativeTextWithFormat: [NSString stringWithUTF8String: msg]];
0
+    answer = ([alert runModal] == NSOKButton ? Qtrue : Qfalse);
0
+  });
0
   return answer;
0
 }
0
 
0
@@ -1252,17 +1248,20 @@ shoes_dialog_color(VALUE self, VALUE title)
0
 static VALUE
0
 shoes_dialog_chooser(VALUE self, NSString *title, BOOL directories)
0
 {
0
-  NSOpenPanel* openDlg = [NSOpenPanel openPanel];
0
-  [openDlg setCanChooseFiles: !directories];
0
-  [openDlg setCanChooseDirectories: directories];
0
-  [openDlg setAllowsMultipleSelection: NO];
0
-  if ( [openDlg runModalForDirectory: nil file: nil] == NSOKButton )
0
-  {
0
-    NSArray* files = [openDlg filenames];
0
-    char *filename = [[files objectAtIndex: 0] UTF8String];
0
-    return rb_str_new2(filename);
0
-  }
0
-  return Qnil;
0
+  VALUE path = Qnil;
0
+  COCOA_DO({
0
+    NSOpenPanel* openDlg = [NSOpenPanel openPanel];
0
+    [openDlg setCanChooseFiles: !directories];
0
+    [openDlg setCanChooseDirectories: directories];
0
+    [openDlg setAllowsMultipleSelection: NO];
0
+    if ( [openDlg runModalForDirectory: nil file: nil] == NSOKButton )
0
+    {
0
+      NSArray* files = [openDlg filenames];
0
+      char *filename = [[files objectAtIndex: 0] UTF8String];
0
+      path = rb_str_new2(filename);
0
+    }
0
+  });
0
+  return path;
0
 }
0
 
0
 VALUE
0
@@ -1274,12 +1273,15 @@ shoes_dialog_open(VALUE self)
0
 VALUE
0
 shoes_dialog_save(VALUE self)
0
 {
0
-  NSSavePanel* saveDlg = [NSSavePanel savePanel];
0
-  if ( [saveDlg runModalForDirectory:nil file:nil] == NSOKButton )
0
-  {
0
-    char *filename = [[saveDlg filename] UTF8String];
0
-    return rb_str_new2(filename);
0
-  }
0
+  VALUE path = Qnil;
0
+  COCOA_DO({
0
+    NSSavePanel* saveDlg = [NSSavePanel savePanel];
0
+    if ( [saveDlg runModalForDirectory:nil file:nil] == NSOKButton )
0
+    {
0
+      char *filename = [[saveDlg filename] UTF8String];
0
+      path = rb_str_new2(filename);
0
+    }
0
+  });
0
   return Qnil;
0
 }
0