Changeset 186

Timestamp:

09/21/2007 02:44:26 (12 months ago)

Author:

why

Message:

* shoes/world.c: introduced the new shoes_world_t struct so I can start to implement multiple windows soon.
* shoes/app.c: the shoes_app struct is now wrapped by the App class.
* shoes/ruby.c: heavy reorganization of how blocks are called. prevalent use of instance_eval has been abandoned in favor of evaluation at the app-level and tracking of canvas nesting. i just think instance_eval was too confusing for beginners, I'm much happier with this. In this way, instance variables can be used to store elements rather than plain variables.
* samples/: use of instance variables to store controls and changes to reflect the new scoping. this revision breaks a lot of old code and doesn't yet compile on osx and win32.

Location:

trunk

Files:

• bin/main.skel (modified) (2 diffs)
• samples/book.rb (modified) (2 diffs)
• samples/bounce.rb (modified) (2 diffs)
• samples/form.rb (modified) (2 diffs)
• samples/rect.rb (modified) (1 diff)
• samples/timer.rb (modified) (1 diff)
• shoes/app.c (modified) (39 diffs)
• shoes/app.h (modified) (3 diffs)
• shoes/canvas.c (modified) (11 diffs)
• shoes/canvas.h (modified) (3 diffs)
• shoes/config.h (modified) (7 diffs)
• shoes/dialogs.c (modified) (13 diffs)
• shoes/ruby.c (modified) (8 diffs)
• shoes/ruby.h (modified) (2 diffs)
• shoes/world.c (added)
• shoes/world.h (added)

trunk/bin/main.skel

@@ -17 +17 @@
 #endif
 {
+  shoes_code code;
+  char *path = NULL;
 #ifdef SHOES_WIN32
   int argc;
@@ -23 +25 @@
 #endif
   %DEFAULTS%
-  shoes_init();
-  shoes_app *app = shoes_app_new();
+  code = shoes_init();
+  if (code != SHOES_OK)
+    goto done;
+
 #ifdef SHOES_WIN32
-  app->kit.instance = inst;
-  app->kit.style = style;
-  app->path = SHOE_ALLOC_N(char, SHOES_BUFSIZE);
-  GetModuleFileName(NULL, (LPSTR)app->path, SHOES_BUFSIZE);
+  world->instance = inst;
+  world->style = style;
+  path = SHOE_ALLOC_N(char, SHOES_BUFSIZE);
+  GetModuleFileName(NULL, (LPSTR)world->path, SHOES_BUFSIZE);
 #else
-  app->path = argv[0];
+  path = argv[0];
 #endif
   ruby_set_argv(argc - 1, &argv[1]);
-  if (shoes_app_load(app) != SHOES_QUIT)
-  {
-    shoes_app_open(app);
-    shoes_app_loop(app, "/");
-    shoes_app_close(app);
-  }
+  code = shoes_load(path);
+  if (code != SHOES_OK)
+    goto done;
+
+  code = shoes_start("/");
+  if (code != SHOES_OK)
+    goto done;
+
+done:
 #ifdef SHOES_WIN32
-  SHOE_FREE(app->path);
+  if (path != NULL)
+    SHOE_FREE(path);
 #endif
-  shoes_app_free(app);
+  shoes_final();
   return 0;
 }

trunk/samples/book.rb

@@ -19 +19 @@
   def incident(num)
     num = num.to_i
-    toc = table_of_contents
     flow :margin => 10, :margin_left => 200, :margin_top => 20 do
       text "<span font_desc='Arial 46px'>Incident</span>\n" +
@@ -25 +24 @@
     end
     flow :width => 180, :margin_left => 10 do
-      text toc
+      text table_of_contents
     end
     flow :width => -250, :margin_left => 10 do

trunk/samples/bounce.rb

@@ -3 +3 @@
 
 Shoes.app do
-  background "#DFA".."#F90", :angle => 45
+  background "#DFA"
   border black, :strokewidth => 6
 
   nostroke
-  icon = image "static/shoes-icon.png", :left => 100, :top => 100
+  @icon = image "static/shoes-icon.png", :left => 100, :top => 100
 
   x, y = self.width / 2, self.height / 2
-  size = icon.size
+  size = @icon.size
   animate(30) do
     x += xspeed * xdir
@@ -18 +18 @@
     ydir *= -1 if y > self.height - size[1] or y < 0
 
-    icon.move x.to_i, y.to_i
+    @icon.move x.to_i, y.to_i
   end
 end

trunk/samples/form.rb

@@ -1 @@
-name, phone, address = nil
 Shoes.app :width => 320, :height => 350 do
   background "static/menu-gray.png"
@@ -11 +10 @@
     stack :margin => 10 do
       text "Name"
-      name = list_box :items => ["Yes, please!", "NO.  No thankyou."]
+      @name = list_box :items => ["Yes, please!", "NO.  No thankyou."]
     end
     stack :margin => 10 do
       text "Address"
-      address = edit_line
+      @address = edit_line
     end
     stack :margin => 10 do
       text "Phone"
-      phone = edit_line
+      @phone = edit_line
     end
     stack :margin => 10 do
       button "Save" do
-        Shoes.p [name.text, address.text, phone.text]
+        Shoes.p [@name.text, @address.text, @phone.text]
       end
     end

trunk/samples/rect.rb

@@ -1 @@
-rectangles = proc do
-  20.times do
-    nostroke
-    fill rgb((0.6..1.0).rand, (0.1..1.0).rand, (0.2..1.0).rand, (0.4..1.0).rand)
-    r = rand(300) + 60
-    rect :left => (10..100).rand, :top => (10..200).rand, :width => r, :height => r
+Shoes.app :width => 400, :height => 500 do
+  rectangles = proc do
+    20.times do
+      nostroke
+      fill rgb((0.6..1.0).rand, (0.1..1.0).rand, (0.2..1.0).rand, (0.4..1.0).rand)
+      r = rand(300) + 60
+      rect :left => (10..100).rand, :top => (10..200).rand, :width => r, :height => r
+    end
+    button "OK", :left => 300, :top => 400 do
+      clear &rectangles
+    end
   end
-  button "OK", :left => 300, :top => 400 do
-    clear &rectangles
-  end
+
+  rectangles[]
 end
-
-Shoes.app :width => 400, :height => 500, &rectangles

trunk/samples/timer.rb

@@ -1 @@
-label, time = nil, Time.now
 Shoes.app :height => 150, :width => 250 do
   background rgb(240, 250, 208)
   stack :margin => 10 do
     button "Start" do
-      time = Time.now
-      label.replace "Stop watch started at #{time}"
+      @time = Time.now
+      @label.replace "Stop watch started at #@time"
     end
     button "Stop" do
-      label.replace "Stopped, #{Time.now - time} seconds elapsed."
+      @label.replace "Stopped, #{Time.now - @time} seconds elapsed."
     end
-    label = text "Press start to begin timing."
+    @label = text "Press start to begin timing."
   end
 end

trunk/shoes/app.c

@@ -7 +7 @@
 #include "shoes/ruby.h"
 #include "shoes/canvas.h"
+#include "shoes/world.h"
 #include "node.h"
 
-shoes_app *global_app = NULL;
-
-shoes_app *
-shoes_app_new()
+static void
+shoes_app_mark(shoes_app *app)
+{
+#ifndef SHOES_GTK
+  rb_gc_mark_maybe(app->slot.controls);
+#endif
+  rb_gc_mark_maybe(app->canvas);
+  rb_gc_mark_maybe(app->nesting);
+  rb_gc_mark_maybe(app->timers);
+}
+
+static void
+shoes_app_free(shoes_app *app)
+{
+  free(app);
+}
+
+VALUE
+shoes_app_alloc(VALUE klass)
 {
   shoes_app *app = SHOE_ALLOC(shoes_app);
+  SHOE_MEMZERO(app, shoes_app, 1);
   app->canvas = shoes_canvas_new(cShoes, app);
-  rb_gc_register_address(&app->canvas);
+  app->nesting = rb_ary_new();
   app->timers = rb_ary_new();
-  rb_gc_register_address(&app->timers);
   app->title = Qnil;
   app->width = SHOES_APP_WIDTH;
@@ -26 +42 @@
   app->slot.window = NULL;
 #else
-  app->kit.window = NULL;
-#endif
-  return app;
-}
-
-void
-shoes_app_free(shoes_app *app)
-{
-#ifdef SHOES_QUARTZ
-  CFRelease(app->kit.clip);
-  TECDisposeConverter(app->kit.converter);
-#endif
-#ifndef SHOES_GTK
-  if (!NIL_P(app->slot.controls))
-    rb_gc_unregister_address(&app->slot.controls);
-#endif
-  rb_gc_unregister_address(&app->canvas);
-  rb_gc_unregister_address(&app->timers);
-  if (app != NULL)
-    SHOE_FREE(app);
+  app->os.window = NULL;
+#endif
+  app->self = Data_Wrap_Struct(klass, shoes_app_mark, shoes_app_free, app);
+  return app->self;
+}
+
+VALUE
+shoes_app_new()
+{
+  return shoes_app_alloc(cApp);
 }
 
@@ -88 +94 @@
 {
   shoes_app *app = (shoes_app *)data;
-  gtk_container_propagate_expose(GTK_CONTAINER(app->kit.window), widget, app->slot.expose);
+  gtk_container_propagate_expose(GTK_CONTAINER(app->os.window), widget, app->slot.expose);
 }
 
@@ -95 +101 @@
 { 
   shoes_app *app = (shoes_app *)data;
-  gtk_window_get_size(GTK_WINDOW(app->kit.window), &app->width, &app->height);
+  gtk_window_get_size(GTK_WINDOW(app->os.window), &app->width, &app->height);
   shoes_canvas_size(app->canvas, app->width, app->height);
   app->slot.expose = event;
-  gtk_container_forall(GTK_CONTAINER(app->kit.window), shoes_app_gtk_paint_children, app);
+  gtk_container_forall(GTK_CONTAINER(app->os.window), shoes_app_gtk_paint_children, app);
   app->slot.expose = NULL;
 }
@@ -383 +389 @@
 
 OSStatus
-shoes_slot_quartz_create(VALUE self, APPSLOT *parent, int w, int h)
+shoes_slot_quartz_create(VALUE self, SHOES_SLOT_OS *parent, int w, int h)
 {
   HIRect rect;
@@ -389 +395 @@
   EventRef event;
   shoes_canvas *canvas;
-  APPSLOT *slot;
+  SHOES_SLOT_OS *slot;
   Data_Get_Struct(self, shoes_canvas, canvas);
   slot = &canvas->slot;
@@ -458 +464 @@
     if (modifier & controlKey) \
       KEY_STATE(control); \
-    shoes_app_keypress(global_app, v); \
+    shoes_app_keypress(app, v); \
   } else
 
@@ -569 +575 @@
 
               text8 = SHOE_ALLOC_N(char, len);
-              status = TECConvertText(app->kit.converter, text, len, &nread, text8, len, &nwrite);
+              status = TECConvertText(app->os.converter, text, len, &nread, text8, len, &nwrite);
 
               if (nwrite == 1 && text8[0] == '\r') 
@@ -594 +600 @@
       INFO("kEventClassMouse\n", 0);
       GetMouse(&mouseLoc);
-      GetWindowBounds(app->kit.window, kWindowContentRgn, &bounds);
+      GetWindowBounds(app->os.window, kWindowContentRgn, &bounds);
       if (mouseLoc.h < bounds.left || mouseLoc.v < bounds.top) break;
       GetEventParameter(inEvent, kEventParamMouseButton, typeMouseButton, 0, sizeof(EventMouseButton), 0, &button);
@@ -628 +634 @@
   
   SetRect(&windowRect, 0, 0, app->width, app->height);
-  InvalWindowRect(app->kit.window, &windowRect);
+  InvalWindowRect(app->os.window, &windowRect);
 }
 
@@ -647 +653 @@
   y = HIWORD(l)
 
-#define KEY_SYM(sym)  shoes_app_keypress(global_app, ID2SYM(rb_intern("" # sym)))
+#define KEY_SYM(sym)  shoes_app_keypress(app, ID2SYM(rb_intern("" # sym)))
 #define KEYPRESS(name, sym) \
   else if (w == VK_##name) { \
     VALUE v = ID2SYM(rb_intern("" # sym)); \
-    if (global_app->kit.altkey) \
+    if (app->os.altkey) \
       KEY_STATE(alt); \
-    if (global_app->kit.shiftkey) \
+    if (app->os.shiftkey) \
       KEY_STATE(shift); \
-    if (global_app->kit.ctrlkey) \
+    if (app->os.ctrlkey) \
       KEY_STATE(control); \
-    shoes_app_keypress(global_app, v); \
+    shoes_app_keypress(app, v); \
   }
 
@@ -678 +684 @@
     {
       RECT rect;
-      GetClientRect(global_app->slot.window, &rect);
-      global_app->width = rect.right;
-      global_app->height = rect.bottom;
-      shoes_canvas_size(global_app->canvas, global_app->width, global_app->height);
-      shoes_app_paint(global_app);
+      GetClientRect(app->slot.window, &rect);
+      app->width = rect.right;
+      app->height = rect.bottom;
+      shoes_canvas_size(app->canvas, app->width, app->height);
+      shoes_app_paint(app);
     }
     break;
@@ -688 +694 @@
     case WM_LBUTTONDOWN:
       WM_POINTS();
-      shoes_app_click(global_app, 1, x, y);
+      shoes_app_click(app, 1, x, y);
     break;
 
     case WM_RBUTTONDOWN:
       WM_POINTS();
-      shoes_app_click(global_app, 2, x, y);
+      shoes_app_click(app, 2, x, y);
     break;
 
     case WM_MBUTTONDOWN:
       WM_POINTS();
-      shoes_app_click(global_app, 3, x, y);
+      shoes_app_click(app, 3, x, y);
     break;
 
     case WM_LBUTTONUP:
       WM_POINTS();
-      shoes_app_release(global_app, 1, x, y);
+      shoes_app_release(app, 1, x, y);
     break;
 
     case WM_RBUTTONUP:
       WM_POINTS();
-      shoes_app_release(global_app, 2, x, y);
+      shoes_app_release(app, 2, x, y);
     break;
 
     case WM_MBUTTONUP:
       WM_POINTS();
-      shoes_app_release(global_app, 3, x, y);
+      shoes_app_release(app, 3, x, y);
     break;
 
     case WM_MOUSEMOVE:
       WM_POINTS();
-      shoes_app_motion(global_app, x, y);
+      shoes_app_motion(app, x, y);
     break;
 
@@ -733 +739 @@
 
         case 0x0D:
-          shoes_app_keypress(global_app, rb_str_new2("\n"));
+          shoes_app_keypress(app, rb_str_new2("\n"));
         break;
 
@@ -744 +750 @@
           str[len] = '\0';
           v = rb_str_new(str, len);
-          shoes_app_keypress(global_app, v);
+          shoes_app_keypress(app, v);
         }
       }
@@ -752 +758 @@
     case WM_KEYDOWN:
       if (w == VK_CONTROL)
-        global_app->kit.ctrlkey = true;
+        app->os.ctrlkey = true;
       else if (w == VK_MENU)
-        global_app->kit.altkey = true;
+        app->os.altkey = true;
       else if (w == VK_SHIFT)
-        global_app->kit.shiftkey = true;
+        app->os.shiftkey = true;
       KEYPRESS(PRIOR, page_up)
       KEYPRESS(NEXT, page_down)
@@ -781 +787 @@
         char letter = w + 32;
         v = rb_str_new(&letter, 1);
-        if (global_app->kit.altkey) {
+        if (app->os.altkey) {
           KEY_STATE(alt);
-          shoes_app_keypress(global_app, v);
+          shoes_app_keypress(app, v);
         }
       }
@@ -791 +797 @@
     case WM_KEYUP:
       if (w == VK_CONTROL)
-        global_app->kit.ctrlkey = false;
+        app->os.ctrlkey = false;
       else if (w == VK_MENU)
-        global_app->kit.altkey = false;
+        app->os.altkey = false;
       else if (w == VK_SHIFT)
-        global_app->kit.shiftkey = false;
+        app->os.shiftkey = false;
     break;
 
@@ -801 +807 @@
     {
       int id = LOWORD(w);
-      VALUE timer = rb_ary_entry(global_app->timers, id - SHOES_CONTROL1);
+      VALUE timer = rb_ary_entry(app->timers, id - SHOES_CONTROL1);
       if (!NIL_P(timer))
         shoes_anim_call(timer);
@@ -811 +817 @@
       {
         int id = LOWORD(w);
-        VALUE control = rb_ary_entry(global_app->slot.controls, id - SHOES_CONTROL1);
+        VALUE control = rb_ary_entry(app->slot.controls, id - SHOES_CONTROL1);
         if (!NIL_P(control))
           shoes_control_send(control, s_click);
@@ -822 +828 @@
 
 shoes_code
-shoes_app_load(shoes_app *app)
-{
-  char bootup[512];
-  if (global_app == NULL)
-    global_app = app;
-
-  sprintf(bootup,
-    "begin;"
-      "DIR = File.expand_path(File.dirname(%%q<%s>));"
-      "$:.replace([DIR+'/ruby/lib/'+PLATFORM, DIR+'/ruby/lib', DIR+'/lib']);"
-      "require 'shoes';"
-      "'OK';"
-    "rescue Object => e;"
-      SHOES_META
-        "define_method :load do |path|; end;"
-        EXC_RUN
-      "end;"
-      "e.message;"
-    "end",
-    app->path);
-  VALUE str = rb_eval_string(bootup);
-  StringValue(str);
-  INFO("Bootup: %s\n", RSTRING(str)->ptr);
-
-  VALUE uri = rb_eval_string("$SHOES_URI = Shoes.args!");
-  if (!RTEST(uri))
-    return SHOES_QUIT;
-
-  sprintf(bootup,
-    "begin;"
-      "Shoes.load($SHOES_URI) if $SHOES_URI.is_a?(String);"
-    "rescue Object => e;"
-      SHOES_META
-        EXC_RUN
-      "end;"
-    "end;");
-  rb_eval_string(bootup);
-
-  return SHOES_OK;
-}
-
-shoes_code
 shoes_app_cursor(shoes_app *app, ID cursor)
 {
 #ifdef SHOES_GTK
-  if (app->kit.window == NULL || app->kit.window->window == NULL || app->cursor == cursor)
+  if (app->os.window == NULL || app->os.window->window == NULL || app->cursor == cursor)
     goto done;
 
@@ -882 +846 @@
     goto done;
 
-  gdk_window_set_cursor(app->kit.window->window, c);
+  gdk_window_set_cursor(app->os.window->window, c);
 #endif
 
 #ifdef SHOES_QUARTZ
-  if (app->kit.window == NULL || app->cursor == cursor)
+  if (app->os.window == NULL || app->cursor == cursor)
     goto done;
 
@@ -931 +895 @@
 
 #ifdef SHOES_GTK
-  if (app->kit.window != NULL)
-    gtk_widget_set_size_request(app->kit.window, app->width, app->height);
+  if (app->os.window != NULL)
+    gtk_widget_set_size_request(app->os.window, app->width, app->height);
 #endif
 
@@ -955 +919 @@
   int width, height;
   VALUE attr, block;
+  GLOBAL_APP(app);
+
   rb_scan_args(argc, argv, "01&", &attr, &block);
   rb_iv_set(self, "@main_app", block);
-  global_app->title = ATTR(attr, title);
-  global_app->resizable = (ATTR(attr, resizable) != Qfalse);
-  shoes_app_resize(global_app, ATTR2(int, attr, width, SHOES_APP_WIDTH), ATTR2(int, attr, height, SHOES_APP_HEIGHT));
-  shoes_canvas_init(global_app->canvas, global_app->slot, attr, global_app->width, global_app->height);
+
+  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);
   return self;
 }
@@ -978 +945 @@
 
 #ifdef SHOES_GTK
-  gtk_window_set_title(GTK_WINDOW(app->kit.window), _(msg));
+  gtk_window_set_title(GTK_WINDOW(app->os.window), _(msg));
 #endif
 
 #ifdef SHOES_QUARTZ
   CFStringRef cfmsg = CFStringCreateWithCString(NULL, msg, kCFStringEncodingUTF8);
-  OSStatus err = SetWindowTitleWithCFString(app->kit.window, cfmsg);
+  OSStatus err = SetWindowTitleWithCFString(app->os.window, cfmsg);
 #endif
 
@@ -992 +959 @@
 
 shoes_code
+shoes_app_start(VALUE appobj, char *uri)
+{
+  shoes_code code;
+  shoes_app *app;
+  Data_Get_Struct(appobj, shoes_app, app);
+
+  code = shoes_app_open(app);
+  if (code != SHOES_OK)
+    return code;
+
+  code = shoes_app_loop(app, uri);
+  if (code != SHOES_OK)
+    return code;
+
+  return shoes_app_close(app);
+}
+
+shoes_code
 shoes_app_open(shoes_app *app)
 {
@@ -997 +982 @@
 
 #ifdef SHOES_GTK
-  shoes_app_gtk *gk = &app->kit;
+  shoes_app_gtk *gk = &app->os;
   shoes_slot_gtk *gs = &app->slot;
 
@@ -1049 +1034 @@
     ^ (app->resizable ? kWindowResizableAttribute : 0),
     &gRect,
-    &app->kit.window);
+    &app->os.window);
 
   if (err != noErr)
@@ -1072 +1057 @@
 
   INFO("Event handler.\n", 0);
-  err = InstallWindowEventHandler(app->kit.window,
+  err = InstallWindowEventHandler(app->os.window,
     gTestWindowEventProc, GetEventTypeCount(windowEvents),
     windowEvents, app, NULL);
 
-  HIViewFindByID(HIViewGetRoot(app->kit.window), kHIViewWindowContentID, &app->slot.view);
-
-  if (PasteboardCreate(kPasteboardClipboard, &app->kit.clip) != noErr) {
+  HIViewFindByID(HIViewGetRoot(app->os.window), kHIViewWindowContentID, &app->slot.view);