Changeset 463

Timestamp:

03/05/2008 03:52:04 (6 months ago)

Author:

why

Message:

• lib/shoes.rb: on osx, file open dialog was coming up despite "open documents" event.
  
• platform/mac/Info.plist: default file assoc for .shy.
  
• shoes/app.c: the Shoes.APPS method for getting a list of open windows.
  

Location:

trunk

Files:

• lib/shoes.rb (modified) (1 diff)
• platform/mac/Info.plist (modified) (1 diff)
• shoes/app.c (modified) (5 diffs)
• shoes/app.h (modified) (1 diff)
• shoes/ruby.c (modified) (1 diff)
• shoes/world.c (modified) (1 diff)

trunk/lib/shoes.rb

@@ -177 +177 @@
 
   def self.args!
-    if ARGV.empty?
-      fname = ask_open_file
-      if fname
-        ARGV << fname
-      else
-        return false
+    if PLATFORM !~ /darwin/
+      if ARGV.empty?
+        fname = ask_open_file
+        if fname
+          ARGV << fname
+        else
+          return false
+        end
       end
     end

trunk/platform/mac/Info.plist

@@ -32 +32 @@
                         <key>CFBundleTypeIconFile</key>
                         <string>Shoes.icns</string>
+      <key>CFBundleTypeMIMETypes</key>
+      <array>
+        <string>application/x-shy</string>
+      </array>
                         <key>CFBundleTypeName</key>
       <string>Shoes Package</string>
                         <key>CFBundleTypeRole</key>
                         <string>Viewer</string>
+      <key>LSIsAppleDefaultForType</key>
+      <true/>
                 </dict>
                 <dict>

trunk/shoes/app.c

@@ -68 +68 @@
   rb_ary_push(shoes_world->apps, app);
   return app;
+}
+
+VALUE
+shoes_apps_get(VALUE self)
+{
+  return rb_ary_dup(shoes_world->apps);
 }
 
@@ -737 +743 @@
   long numberOFiles;
   FSRef fr;
-  char _path[SHOES_BUFSIZE], bootup[SHOES_BUFSIZE];
+  char _path[SHOES_BUFSIZE];
 
   if (!(err = AEGetParamDesc(appleEvt, keyDirectObject, typeAEList, &fileDesc)))
@@ -751 +757 @@
         {
           FSRefMakePath(&fr, &_path, SHOES_BUFSIZE);
-          shoes_load(RSTRING(_path));
+          printf("Opening %s\n", _path);
+          shoes_load(_path);
         }
       }
@@ -766 +773 @@
   QuitApplicationEventLoop();
   return 128;
+}
+
+void 
+shoes_app_quartz_install()
+{
+  AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
+    NewAEEventHandlerUPP(shoes_app_quartz_quit), 0, false);
+
+  AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, 
+    NewAEEventHandlerUPP(shoes_app_quartz_open), 0, false);
 }
 
@@ -1566 +1583 @@
   InitCursor();
 
-  err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
-    NewAEEventHandlerUPP(shoes_app_quartz_quit), 0, false);
-  if (err != noErr)
-  {
-    QUIT("Out of memory.", 0);
-  }
-
-  err = AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, 
-    NewAEEventHandlerUPP(shoes_app_quartz_open), 0, false);
-  if (err != noErr)
-  {
-    QUIT("Out of memory.", 0);
-  }
-
   gTestWindowEventProc = NewEventHandlerUPP(shoes_app_quartz_handler);
   if (gTestWindowEventProc == NULL)

trunk/shoes/app.h

@@ -49 +49 @@
 VALUE shoes_app_alloc(VALUE);
 VALUE shoes_app_new(VALUE);
+VALUE shoes_apps_get(VALUE);
 #ifdef SHOES_WIN32
 shoes_code shoes_classex_init();
+#endif
+#ifdef SHOES_QUARTZ
+void shoes_app_quartz_install();
 #endif
 shoes_code shoes_app_start(VALUE, char *);

trunk/shoes/ruby.c

@@ -3884 +3884 @@
   );
 
+  rb_define_singleton_method(cShoes, "APPS", CASTHOOK(shoes_apps_get), 0);
   rb_define_singleton_method(cShoes, "app", CASTHOOK(shoes_app_main), -1);
   rb_define_singleton_method(cShoes, "p", CASTHOOK(shoes_p), 1);

trunk/shoes/world.c

@@ -52 +52 @@
   shoes_ruby_init();
 #ifdef SHOES_QUARTZ
+  shoes_app_quartz_install();
   shoes_slot_quartz_register();
 #endif