Changeset 443

Timestamp:

03/04/2008 00:13:21 (6 months ago)

Author:

why

Message:

• shoes/app.c: debugged self-closing on gtk. the timers were still going after the window was destroyed. started working on a method to destroy the toplevel slot, which is great since i can start allocation a new slot for every url.
  
• lib/shoes.rb: shoes now runs from the directory where a script is located. really, such an obvious omission.
  

Location:

trunk

Files:

• lib/shoes.rb (modified) (1 diff)
• samples/book.rb (modified) (1 diff)
• shoes/app.c (modified) (2 diffs)
• shoes/canvas.c (modified) (3 diffs)
• shoes/canvas.h (modified) (1 diff)
• shoes/ruby.c (modified) (1 diff)
• shoes/ruby.h (modified) (1 diff)

trunk/lib/shoes.rb

@@ -194 +194 @@
         Shoes.debug "Loaded SHY: #{shy.name} #{shy.version} by #{shy.creator}"
         path = shy.launch
+      else
+        Dir.chdir(File.dirname(path))
+        path = File.basename(path)
       end
       eval(File.read(path), TOPLEVEL_BINDING)

trunk/samples/book.rb

@@ -7 +7 @@
   end
 
-  INCIDENTS = YAML.load_file('samples/book.yaml')
+  INCIDENTS = YAML.load_file('book.yaml')
 
   def table_of_contents

trunk/shoes/app.c

@@ -72 +72 @@
 shoes_app_remove(shoes_app *app)
 {
+  shoes_ele_remove_all(app->timers);
   rb_ary_delete(shoes_world->apps, app->self);
   return (RARRAY_LEN(shoes_world->apps) == 0);
@@ -1972 +1973 @@
 shoes_app_close_window(shoes_app *app)
 {
+  shoes_ele_remove_all(app->timers);
 #ifdef SHOES_GTK
-  gtk_widget_destroy(GTK_WIDGET(APP_WINDOW(app)));
+  shoes_app_gtk_quit(app->os.window, NULL, (gpointer)app);
+  gtk_widget_destroy(app->os.window);
+  app->os.window = NULL;
 #endif
 #ifdef SHOES_WIN32

trunk/shoes/canvas.c

@@ -345 +345 @@
   rb_gc_mark_maybe(canvas->bg);
   rb_gc_mark_maybe(canvas->contents);
-  rb_gc_mark_maybe(canvas->timers);
   rb_gc_mark_maybe(canvas->click);
   rb_gc_mark_maybe(canvas->release);
@@ -391 +390 @@
 shoes_canvas_empty(shoes_canvas *canvas)
 {
-  if (!NIL_P(canvas->contents))
-  {
-    long i;
-    VALUE ary;
-    ary = rb_ary_dup(canvas->contents);
-    for (i = 0; i < RARRAY_LEN(ary); i++) 
-      rb_funcall(rb_ary_entry(ary, i), s_remove, 0);
-    rb_ary_clear(canvas->contents);
-  }
+  shoes_ele_remove_all(canvas->contents);
 }
 
@@ -1253 +1244 @@
   Data_Get_Struct(self, shoes_canvas, self_t);
   shoes_canvas_empty(self_t);
-  shoes_canvas_remove_item(self_t->parent, self, 0, 0);
+  if (!NIL_P(self_t->parent))
+    shoes_canvas_remove_item(self_t->parent, self, 0, 0);
   return self;
 }

trunk/shoes/canvas.h

@@ -219 +219 @@
   ID mode;
   VALUE contents;
-  VALUE timers;
   VALUE parent;
   VALUE attr;

trunk/shoes/ruby.c

@@ -392 +392 @@
   place->ih = place->h - (tmargin + bmargin);
   INFO("PLACE: (%d, %d), (%d, %d) [%d, %d] %d %x\n", place->x, place->y, place->w, place->h, ABSX(*place), ABSY(*place), place->flags, canvas->marginy);
+}
+
+void
+shoes_ele_remove_all(VALUE contents)
+{
+  if (!NIL_P(contents))
+  {
+    long i;
+    VALUE ary;
+    ary = rb_ary_dup(contents);
+    for (i = 0; i < RARRAY_LEN(ary); i++) 
+      rb_funcall(rb_ary_entry(ary, i), s_remove, 0);
+    rb_ary_clear(contents);
+  }
 }
 

trunk/shoes/ruby.h

@@ -100 +100 @@
 VALUE rb_str_to_pas(VALUE);
 void shoes_place_decide(shoes_place *, VALUE, VALUE, int, int, unsigned char, int);
+void shoes_ele_remove_all(VALUE);
 void shoes_cairo_rect(cairo_t *, double, double, double, double, double);