Changeset 492

Timestamp:

03/17/2008 10:36:04 (5 months ago)

Author:

why

Message:

• shoes/canvas.c: introducing start and finish which are sort of like html's load and unload.
  

Location:

trunk

Files:

• lib/shoes/cache.rb (modified) (1 diff)
• shoes/canvas.c (modified) (5 diffs)
• shoes/canvas.h (modified) (3 diffs)
• shoes/ruby.h (modified) (1 diff)

trunk/lib/shoes/cache.rb

@@ -79 +79 @@
           para "", :size => 10, :margin => 0, :margin_top => 8, :width => 220
           progress :width => 1.0, :top => 80
-        end
-        Thread.start(self) do |app|
-          begin
-            sleep(1) until app.started?
-            setup.start
-          rescue => e
-            puts e.message
+
+          start do
+            Thread.start(self) do |app|
+              begin
+                sleep(1) until app.started?
+                setup.start
+              rescue => e
+                puts e.message
+              end
+            end
           end
         end

trunk/shoes/canvas.c

@@ -365 +365 @@
   rb_gc_mark_maybe(canvas->motion);
   rb_gc_mark_maybe(canvas->keypress);
+  rb_gc_mark_maybe(canvas->start);
+  rb_gc_mark_maybe(canvas->finish);
   rb_gc_mark_maybe(canvas->attr);
   rb_gc_mark_maybe(canvas->parent);
@@ -382 +384 @@
   SHOE_MEMZERO(canvas, shoes_canvas, 1);
   canvas->app = NULL;
+  canvas->stage = CANVAS_NADA;
   canvas->width = 0;
   canvas->height = 0;
@@ -441 +444 @@
   canvas->release = Qnil;
   canvas->keypress = Qnil;
+  canvas->start = Qnil;
+  canvas->finish = Qnil;
 #ifdef SHOES_GTK
   canvas->radios = NULL;
@@ -1433 +1438 @@
     if (self_t->cr == canvas->cr)
       self_t->cr = NULL;
-  }
+
+    if (canvas->stage == CANVAS_NADA)
+    {
+      canvas->stage = CANVAS_STARTED;
+      if (!NIL_P(self_t->start))
+      {
+        shoes_safe_block(self, self_t->start, rb_ary_new());
+      }
+    }
+  }
+
   return self;
 }
@@ -1682 +1697 @@
 EVENT_HANDLER(motion);
 EVENT_HANDLER(keypress);
+EVENT_HANDLER(start);
+EVENT_HANDLER(finish);
 
 static VALUE

trunk/shoes/canvas.h

@@ -207 +207 @@
 #endif
 } shoes_timer;
+
+#define CANVAS_NADA    0
+#define CANVAS_STARTED 1
+#define CANVAS_REMOVED 2
 
 //
@@ -224 +228 @@
   VALUE attr;
   VALUE click, release,     // canvas-level event handlers
-    motion, keypress;
+    motion, keypress,
+    start, finish;
+  unsigned char stage;
   double sw;                // current stroke-width
   int cx, cy;               // cursor x and y (stored in absolute coords)
@@ -349 +355 @@
 VALUE shoes_canvas_toggle(VALUE);
 VALUE shoes_canvas_mouse(VALUE);
+VALUE shoes_canvas_start(int, VALUE *, VALUE);
+VALUE shoes_canvas_finish(int, VALUE *, VALUE);
 VALUE shoes_canvas_click(int, VALUE *, VALUE);
 VALUE shoes_canvas_release(int, VALUE *, VALUE);

trunk/shoes/ruby.h

@@ -172 +172 @@
   f("show", show, 0); \
   f("toggle", toggle, 0); \
+  f("start", start, -1); \
+  f("finish", finish, -1); \
   f("click", click, -1); \
   f("release", release, -1); \