Changeset 436

Timestamp:

02/29/2008 01:37:22 (6 months ago)

Author:

why

Message:

• shoes/app.c: initial work to get multiple Shoes.app blocks to work at once. this breaks alot of stuff, sorry!
  

Location:

trunk

Files:

• lib/shoes.rb (modified) (3 diffs)
• shoes/app.c (modified) (10 diffs)
• shoes/app.h (modified) (1 diff)
• shoes/world.c (modified) (2 diffs)

trunk/lib/shoes.rb

@@ -103 +103 @@
 
   @mounts = []
-  @main_app = nil
 
   OPTS = OptionParser.new do |opts|
@@ -110 +109 @@
     opts.on("-m", "--manual",
             "Open the built-in manual.") do
-      @main_app = Shoes::Help
+      Shoes.app(&Shoes::Help)
     end
 
     opts.on("-s", "--shy DIRECTORY",
             "Compress a directory into a Shoes YAML (SHY) archive.") do |s|
-      @main_app = ShyMake.call(s)
+      Shoes.app(&ShyMake.call(s))
     end
 
@@ -152 +151 @@
     end
     case uri.path when "/"
-      [@main_app]
+      [nil]
     when SHOES_URL_RE
       [proc { eval(URI("http://#$1:53045#$2").read) }]

trunk/shoes/app.c

@@ -1315 +1315 @@
 {
   VALUE attr, block;
-  GLOBAL_APP(app);
+  VALUE app = shoes_app_new();
+  shoes_app *app_t;
+  Data_Get_Struct(app, shoes_app, app_t);
+
+  if (NIL_P(shoes_world->app))
+    shoes_world->app = app;
 
   rb_scan_args(argc, argv, "01&", &attr, &block);
-  rb_iv_set(self, "@main_app", block);
-
-  app->title = ATTR(attr, title);
-  app->resizable = (ATTR(attr, resizable) != Qfalse);
-  shoes_app_resize(app, ATTR2(int, attr, width, SHOES_APP_WIDTH), ATTR2(int, attr, height, SHOES_APP_HEIGHT));
-  shoes_canvas_init(app->canvas, app->slot, attr, app->width, app->height);
+  rb_iv_set(app, "@main_app", block);
+
+  app_t->title = ATTR(attr, title);
+  app_t->resizable = (ATTR(attr, resizable) != Qfalse);
+  shoes_app_resize(app_t, ATTR2(int, attr, width, SHOES_APP_WIDTH), ATTR2(int, attr, height, SHOES_APP_HEIGHT));
+  shoes_canvas_init(app_t->canvas, app_t->slot, attr, app_t->width, app_t->height);
   return self;
 }
@@ -1354 +1359 @@
 
 shoes_code
-shoes_app_start(VALUE appobj, char *uri)
-{
+shoes_app_start(VALUE appobj, VALUE allapps, char *uri)
+{
+  int i;
   shoes_code code;
   shoes_app *app;
+
+  for (i = 0; i < RARRAY_LEN(allapps); i++)
+  {
+    VALUE appobj2 = rb_ary_entry(allapps, i);
+    Data_Get_Struct(appobj2, shoes_app, app);
+
+    code = shoes_app_open(app, uri, appobj2 == appobj);
+    if (code != SHOES_OK)
+      return code;
+  }
+
   Data_Get_Struct(appobj, shoes_app, app);
-
-  code = shoes_app_open(app);
+  code = shoes_app_loop(app);
   if (code != SHOES_OK)
     return code;
 
-  code = shoes_app_loop(app, uri);
-  if (code != SHOES_OK)
-    return code;
-
-  return shoes_app_close(app);
+  for (i = 0; i < RARRAY_LEN(allapps); i++)
+  {
+    Data_Get_Struct(rb_ary_entry(allapps, i), shoes_app, app);
+
+    code = shoes_app_close(app);
+    if (code != SHOES_OK)
+      return code;
+  }
+
+  return SHOES_OK;
 }
 
 shoes_code
-shoes_app_open(shoes_app *app)
+shoes_app_open(shoes_app *app, char *path, unsigned char is_main)
 {
   shoes_code code = SHOES_OK;
@@ -1390 +1411 @@
   g_signal_connect(G_OBJECT(gk->window), "motion-notify-event", 
                    G_CALLBACK(shoes_app_gtk_motion), app);
-  g_signal_connect(G_OBJECT(gk->window), "delete-event",
-                   G_CALLBACK(gtk_main_quit), NULL);
   g_signal_connect(G_OBJECT(gk->window), "key-press-event",
                    G_CALLBACK(shoes_app_gtk_keypress), app);
+  if (is_main)
+  {
+    g_signal_connect(G_OBJECT(gk->window), "delete-event",
+                     G_CALLBACK(gtk_main_quit), NULL);
+  }
   app->slot.canvas = gk->window;
 #endif
@@ -1434 +1458 @@
   InitCursor();
 
-  err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
-    NewAEEventHandlerUPP(shoes_app_quartz_quit), 0, false);
-  if (err != noErr)
-  {
-    QUIT("Out of memory.", 0);
+  if (is_main)
+  {
+    err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
+      NewAEEventHandlerUPP(shoes_app_quartz_quit), 0, false);
+    if (err != noErr)
+    {
+      QUIT("Out of memory.", 0);
+    }
   }
 
@@ -1545 +1572 @@
   shoes_app_title(app, app->title);
 
-quit:
-  return code;
-}
-
-shoes_code
-shoes_app_loop(shoes_app *app, char *path)
-{
-  shoes_code code = SHOES_OK;
 #ifndef SHOES_GTK
   app->slot.controls = rb_ary_new();
@@ -1561 +1580 @@
   if (code != SHOES_OK)
     return code;
-  INFO("RUNNING LOOP.\n", 0);
+
+#ifdef SHOES_WIN32
+  ShowWindow(app->slot.window, SW_SHOWNORMAL);
+#endif
+
+#ifdef SHOES_GTK
+  gtk_widget_show_all(app->os.window);
+#endif
 
 #ifdef SHOES_QUARTZ
   ShowWindow(app->os.window);
+#endif
+
+quit:
+  return code;
+}
+
+shoes_code
+shoes_app_loop(shoes_app *app)
+{
+  shoes_code code = SHOES_OK;
+  INFO("RUNNING LOOP.\n", 0);
+
+#ifdef SHOES_QUARTZ
   TextEncoding utf8Encoding, unicodeEncoding;
   utf8Encoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
@@ -1581 +1620 @@
   {
     OSStatus err = ReceiveNextEvent(0, NULL, kEventDurationNoWait, true, &theEvent);
-    if (err == noErr)                                                                                                                 {                                                                                                                                   SendEventToEventTarget (theEvent, theTarget);
+    if (err == noErr)
+    {
+      SendEventToEventTarget (theEvent, theTarget);
       ReleaseEvent(theEvent);
     }
@@ -1592 +1633 @@
 
 #ifdef SHOES_GTK
-  gtk_widget_show_all(app->os.window);
   g_main_set_poll_func(shoes_app_g_poll);
   gtk_main();
@@ -1599 +1639 @@
 #ifdef SHOES_WIN32
   MSG msgs;
-  ShowWindow(app->slot.window, SW_SHOWNORMAL);
   while (WM_QUIT != msgs.message)
   {
@@ -1721 +1760 @@
   if (NIL_P(rb_ary_entry(meth, 0)))
   {
-    VALUE script = shoes_dialog_open(app->canvas);
-    if (NIL_P(script))
-      return SHOES_QUIT;
-    rb_funcall(cShoes, rb_intern("load"), 1, script);
-    meth = rb_funcall(cShoes, s_run, 1, app->location);
+    VALUE app_block = rb_iv_get(app->self, "@main_app");
+    if (!NIL_P(app_block))
+      rb_ary_store(meth, 0, app_block);
+    else
+    {
+      VALUE script = shoes_dialog_open(app->canvas);
+      if (NIL_P(script))
+        return SHOES_QUIT;
+      rb_funcall(cShoes, rb_intern("load"), 1, script);
+      meth = rb_funcall(cShoes, s_run, 1, app->location);
+    }
   }
 

trunk/shoes/app.h

@@ -47 +47 @@
 VALUE shoes_app_alloc(VALUE);
 VALUE shoes_app_new(void);
-shoes_code shoes_app_start(VALUE, char *);
-shoes_code shoes_app_open(shoes_app *);
-shoes_code shoes_app_loop(shoes_app *, char *);
+shoes_code shoes_app_start(VALUE, VALUE, char *);
+shoes_code shoes_app_open(shoes_app *, char *, unsigned char);
+shoes_code shoes_app_loop(shoes_app *);
 shoes_code shoes_app_visit(shoes_app *, char *);
 shoes_code shoes_app_paint(shoes_app *);

trunk/shoes/world.c

@@ -68 +68 @@
 shoes_load(char *path, char *uri)
 {
-  VALUE appobj = shoes_app_new();
+  shoes_code code = SHOES_QUIT;
 
   if (path)
@@ -81 +81 @@
   }
 
-  return shoes_app_start(appobj, uri);
+  if (!NIL_P(shoes_world->app))
+    return shoes_app_start(shoes_world->app, shoes_world->apps, uri);
+
+  return SHOES_QUIT;
 }