Changeset 438

Timestamp:

02/29/2008 10:30:02 (6 months ago)

Author:

why

Message:

• shoes/app.c: okay, so, now there is no master window. the app is closed when the last window is closed. eventually, we'll track the focused window for dialogs. and maybe there will be a need for setting which window is the master.
  

Location:

trunk/shoes

Files:

• app.c (modified) (12 diffs)
• app.h (modified) (1 diff)
• canvas.c (modified) (1 diff)
• world.c (modified) (2 diffs)
• world.h (modified) (1 diff)

trunk/shoes/app.c

@@ -63 +63 @@
   rb_ary_push(shoes_world->apps, app);
   return app;
+}
+
+//
+// When a window is finished, call this to delete it from the master
+// list.  Returns 1 if all windows are gone.
+//
+static int
+shoes_app_remove(shoes_app *app)
+{
+  rb_ary_delete(shoes_world->apps, app->self);
+  return (RARRAY_LEN(shoes_world->apps) == 0);
 }
 
@@ -212 +223 @@
   if (v != Qnil)
     shoes_app_keypress(app, v);
+  return FALSE;
+}
+
+static gboolean
+shoes_app_gtk_quit(GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+  shoes_app *app = (shoes_app *)data;
+  if (shoes_app_remove(app))
+    gtk_main_quit();
   return FALSE;
 }
@@ -940 +960 @@
   {
     case WM_DESTROY:
-      PostQuitMessage(0);
+      if (shoes_app_remove(app))
+        PostQuitMessage(0);
     return 0; 
 
@@ -1319 +1340 @@
   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(app, "@main_app", block);
@@ -1359 +1377 @@
 
 shoes_code
-shoes_app_start(VALUE appobj, VALUE allapps, char *uri)
+shoes_app_start(VALUE allapps, char *uri)
 {
   int i;
@@ -1370 +1388 @@
     Data_Get_Struct(appobj2, shoes_app, app);
 
-    code = shoes_app_open(app, uri, appobj2 == appobj);
+    code = shoes_app_open(app, uri);
     if (code != SHOES_OK)
       return code;
   }
 
-  Data_Get_Struct(appobj, shoes_app, app);
-  code = shoes_app_loop(app);
+  code = shoes_app_loop();
   if (code != SHOES_OK)
     return code;
@@ -1441 +1458 @@
 
 shoes_code
-shoes_app_open(shoes_app *app, char *path, unsigned char is_main)
+shoes_app_open(shoes_app *app, char *path)
 {
   shoes_code code = SHOES_OK;
@@ -1461 +1478 @@
   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);
-  }
+  g_signal_connect(G_OBJECT(gk->window), "delete-event",
+                   G_CALLBACK(shoes_app_gtk_quit), app);
   app->slot.canvas = gk->window;
 #endif
@@ -1506 +1520 @@
   InitCursor();
 
-  if (is_main)
-  {
-    err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
-      NewAEEventHandlerUPP(shoes_app_quartz_quit), 0, false);
-    if (err != noErr)
-    {
-      QUIT("Out of memory.", 0);
-    }
+  err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, 
+    NewAEEventHandlerUPP(shoes_app_quartz_quit), 0, false);
+  if (err != noErr)
+  {
+    QUIT("Out of memory.", 0);
   }
 
@@ -1610 +1621 @@
 
 shoes_code
-shoes_app_loop(shoes_app *app)
+shoes_app_loop()
 {
   shoes_code code = SHOES_OK;
@@ -1658 +1669 @@
       if (msgs.message == WM_KEYDOWN || msgs.message == WM_KEYUP)
       {
-        VALUE appw = (VALUE)GetWindowLong(msgs.hwnd, GWL_USERDATA);
-        shoes_app *appk;
-        Data_Get_Struct(appw, shoes_app, appk);
-
+        shoes_app *appk = (shoes_app *)GetWindowLong(msgs.hwnd, GWL_USERDATA);
         if (RARRAY_LEN(appk->slot.controls) > 0)
         {
@@ -1678 +1686 @@
         msg = false;
       if (msg)
-        msg = IsDialogMessage(app->slot.window, &msgs);
+        msg = IsDialogMessage(msgs.hwnd, &msgs);
 
       if (!msg)

trunk/shoes/app.h

@@ -50 +50 @@
 shoes_code shoes_classex_init();
 #endif
-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_start(VALUE, char *);
+shoes_code shoes_app_open(shoes_app *, char *);
+shoes_code shoes_app_loop();
 shoes_code shoes_app_visit(shoes_app *, char *);
 shoes_code shoes_app_paint(shoes_app *);

trunk/shoes/canvas.c

@@ -2197 +2197 @@
     shoes_load(RSTRING_PTR(uri), "/");
 
-  return shoes_world->app;
-}
-
+  // TODO: do I send back an array of created App objects I guess?
+  return Qnil;
+}
+

trunk/shoes/world.c

@@ -16 +16 @@
   shoes_world_t *world = SHOE_ALLOC(shoes_world_t);
   SHOE_MEMZERO(world, shoes_world_t, 1);
-  world->app = Qnil;
   world->apps = rb_ary_new();
   rb_gc_register_address(&world->apps);
@@ -86 +85 @@
   }
 
-  if (!NIL_P(shoes_world->app))
-    return shoes_app_start(shoes_world->app, shoes_world->apps, uri);
-
-  return SHOES_QUIT;
+  return shoes_app_start(shoes_world->apps, uri);
 }
 

trunk/shoes/world.h

@@ -15 +15 @@
   SHOES_WORLD_OS os;
   char path[SHOES_BUFSIZE];
-  VALUE app, apps;
+  VALUE apps;
 } shoes_world_t;
 
 SHOES_EXTERN_VAR shoes_world_t *shoes_world;
 
+// TODO: allow a window to be chosen as the main window
 #define GLOBAL_APP(appvar) \
   shoes_app *appvar; \
-  Data_Get_Struct(shoes_world->app, shoes_app, appvar)
+  Data_Get_Struct(rb_ary_entry(shoes_world->apps, 0), shoes_app, appvar)
 
 //