Changeset 421

Timestamp:

02/05/2008 17:59:23 (7 months ago)

Author:

why

Message:

• shoes/canvas.c: slight optimization and crash-prevention by removing items according to their type.
  

Location:

trunk/shoes

Files:

• canvas.c (modified) (4 diffs)
• canvas.h (modified) (1 diff)
• ruby.c (modified) (7 diffs)

trunk/shoes/canvas.c

@@ -1128 +1128 @@
 
 void
-shoes_canvas_remove_item(VALUE self, VALUE item)
+shoes_canvas_remove_item(VALUE self, VALUE item, char c, char t)
 {
   long i;
@@ -1134 +1134 @@
   Data_Get_Struct(self, shoes_canvas, self_t);
 #ifndef SHOES_GTK
-  i = rb_ary_index_of(self_t->slot.controls, item);
-  if (i >= 0)
-    rb_ary_insert_at(self_t->slot.controls, i, 1, Qnil);
-#endif
-  i = rb_ary_index_of(self_t->app->timers, item);
-  if (i >= 0)
-    rb_ary_insert_at(self_t->app->timers, i, 1, Qnil);
+  if (c)
+  {
+    i = rb_ary_index_of(self_t->slot.controls, item);
+    if (i >= 0)
+      rb_ary_insert_at(self_t->slot.controls, i, 1, Qnil);
+  }
+#endif
+  if (t)
+  {
+    i = rb_ary_index_of(self_t->app->timers, item);
+    if (i >= 0)
+      rb_ary_insert_at(self_t->app->timers, i, 1, Qnil);
+  }
   rb_ary_delete(self_t->contents, item);
 }
@@ -1196 +1202 @@
   Data_Get_Struct(self, shoes_canvas, self_t);
   shoes_canvas_empty(self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 0, 0);
   return self;
 }
@@ -1840 +1846 @@
 #endif
 
-  INFO("motion(%d, %d)\n", x, y);
-
   if (ATTR(self_t->attr, hidden) != Qtrue)
   {

trunk/shoes/canvas.h

@@ -292 +292 @@
 VALUE shoes_canvas_imagesize(VALUE, VALUE);
 VALUE shoes_canvas_shape(int, VALUE *, VALUE);
-void shoes_canvas_remove_item(VALUE, VALUE);
+void shoes_canvas_remove_item(VALUE, VALUE, char, char);
 VALUE shoes_canvas_move_to(VALUE, VALUE, VALUE);
 VALUE shoes_canvas_line_to(VALUE, VALUE, VALUE);

trunk/shoes/ruby.c

@@ -657 +657 @@
 {
   GET_STRUCT(shape, self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 0, 0);
   return self;
 }
@@ -844 +844 @@
 {
   GET_STRUCT(image, self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 0, 0);
   return self;
 }
@@ -1046 +1046 @@
   shoes_canvas *canvas;
   GET_STRUCT(video, self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 1, 0);
 
   Data_Get_Struct(self_t->parent, shoes_canvas, canvas);
@@ -1403 +1403 @@
 {
   GET_STRUCT(pattern, self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 0, 0);
   return self;
 }
@@ -1893 +1893 @@
 {
   GET_STRUCT(textblock, self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 0, 0);
   return self;
 }
@@ -2598 +2598 @@
   shoes_canvas *canvas;
   GET_STRUCT(control, self_t);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 1, 0);
 
   Data_Get_Struct(self_t->parent, shoes_canvas, canvas);
@@ -3541 +3541 @@
   GET_STRUCT(anim, self_t);
   shoes_anim_stop(self);
-  shoes_canvas_remove_item(self_t->parent, self);
+  shoes_canvas_remove_item(self_t->parent, self, 0, 1);
   return self;
 }