Implemented a couple of Evas::Image methods.

Methods implemented: get_file/set_file, has_alpha, get_size/set_size,
get_fill/set_fill and reload.

diff --git a/ChangeLog b/ChangeLog
index 9e99d1b0242c9d10915eca65589a7c58f0a62d4c..519b521852adc8fb0736683bd6618becb78dbeca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-$Id: ChangeLog 61 2004-08-12 10:04:07Z tilman $
+$Id: ChangeLog 63 2004-08-12 19:36:40Z tilman $
 
 2004-08-12 Tilman Sauerbeck (tilman at code-monkey de)
         * Makefile.am, src/Makefile.am, src/rb_evas_main.c,
           src/rb_smart.[ch]:
           Added Smart object
+        * src/rb_image.c: Implemented get_file/set_file, has_alpha,
+          get_size/set_size, get_fill/set_fill and reload
 

diff --git a/src/rb_image.c b/src/rb_image.c
index c5d58ec6a9938fcba53b2475b4c1822f05704852..275dc32423c46dab4e6f3ff8610816bdafb72a59 100644 (file)
--- a/src/rb_image.c
+++ b/src/rb_image.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_image.c 49 2004-08-01 10:17:39Z tilman $
+ * $Id: rb_image.c 62 2004-08-12 19:35:01Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,6 +31,12 @@ static void c_free (RbEvasObject *e)
        c_evas_object_free (e, true);
 }
 
+/*
+ * call-seq:
+ *  Evas::Image.new(evas) => img
+ *
+ * Creates an Evas::Image object.
+ */
 static VALUE c_new (VALUE klass, VALUE evas)
 {
        VALUE self, argv[1];
@@ -49,9 +55,201 @@ static VALUE c_new (VALUE klass, VALUE evas)
        return self;
 }
 
+/*
+ * call-seq:
+ *  img.get_file => array
+ *
+ * Returns an array containing the filename and the key of <i>img</i>.
+ *
+ *  img.set_file("foo", "bar") #=> nil
+ *  img.get_file               #=> ["foo", "bar"]
+ */
+static VALUE c_get_file (VALUE self)
+{
+       char *file = NULL, *key = NULL;
+
+       GET_OBJ (self, RbEvasObject, e);
+
+       evas_object_image_file_get (e->real, &file, &key);
+
+       return rb_ary_new3 (2, file ? rb_str_new2 (file) : Qnil,
+                           key ? rb_str_new2 (key) : Qnil);
+}
+
+/*
+ * call-seq:
+ *  img.set_file(file [, key]) => nil
+ *
+ * Sets the filename and optionally the key of <i>img</i>.
+ *
+ *  img.set_file("foo.png")             #=> nil
+ *  img.set_file("foo.edb", "/bar/baz") #=> nil
+ */
+static VALUE c_set_file (int argc, VALUE *argv, VALUE self)
+{
+       VALUE file, key;
+       char *k = NULL;
+
+       GET_OBJ (self, RbEvasObject, e);
+
+       rb_scan_args (argc, argv, "11", &file, &key);
+
+       Check_Type (file, T_STRING);
+
+       if (!NIL_P (key)) {
+               Check_Type (key, T_STRING);
+               k = StringValuePtr (key);
+       }
+
+       evas_object_image_file_set (e->real, StringValuePtr (file), k);
+
+       return Qnil;
+}
+
+/*
+ * call-seq:
+ *  img.has_alpha? => true or false
+ *
+ * Returns true if <i>img</i> has an alpha channel, else returns false.
+ */
+static VALUE c_has_alpha_get (VALUE self)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       return evas_object_image_alpha_get (e->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *  img.has_alpha(true or false)
+ *
+ * Sets whether <i>img</i> has an alpha channel.
+ */
+static VALUE c_has_alpha_set (VALUE self, VALUE val)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       CHECK_BOOL (val);
+
+       evas_object_image_alpha_set (e->real, val == Qtrue);
+
+       return Qnil;
+}
+
+/*
+ * call-seq:
+ *  img.get_size => array
+ *
+ * Returns an array containing the size of <i>img</i>.
+ *
+ *  img.set_size(100, 200) #=> nil
+ *  img.get_size           #=> [100, 200]
+ */
+static VALUE c_get_size (VALUE self)
+{
+       int w = 0, h = 0;
+
+       GET_OBJ (self, RbEvasObject, e);
+
+       evas_object_image_size_get (e->real, &w, &h);
+
+       return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h));
+}
+
+/*
+ * call-seq:
+ *  img.set_size(x, y) => nil
+ *
+ * Returns an array containing the size of <i>img</i>.
+ *
+ *  img.set_size(100, 200) #=> nil
+ *  img.get_size           #=> [100, 200]
+ */
+static VALUE c_set_size (VALUE self, VALUE w, VALUE h)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       Check_Type (w, T_FIXNUM);
+       Check_Type (h, T_FIXNUM);
+
+       evas_object_image_size_set (e->real, FIX2INT (w), FIX2INT (h));
+
+       return Qnil;
+}
+
+/*
+ * call-seq:
+ *  img.get_fill => array
+ *
+ * Returns an array containing the dimensions of the rectangle
+ * on <i>img</i> that the image will be drawn to.
+ *
+ *  img.set_fill(1, 2, 3, 4) #=> nil
+ *  img.get_fill             #=> [1, 2, 3, 4]
+ */
+static VALUE c_get_fill (VALUE self)
+{
+       Evas_Coord x = 0, y = 0, w = 0, h = 0;
+
+       GET_OBJ (self, RbEvasObject, e);
+
+       evas_object_image_fill_get (e->real, &x, &y, &w, &h);
+
+       return rb_ary_new3 (4, INT2FIX ((int) x), INT2FIX ((int) y),
+                           INT2FIX ((int) w), INT2FIX ((int) h));
+}
+
+/*
+ * call-seq:
+ *  img.set_fill(x, y, w, h) => nil
+ *
+ * Sets the dimensions of the rectangle on <i>img</i> that
+ * the image will be drawn to.
+ *
+ *  img.set_fill(1, 2, 3, 4) #=> nil
+ */
+static VALUE c_set_fill (VALUE self, VALUE x, VALUE y, VALUE w, VALUE h)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       Check_Type (x, T_FIXNUM);
+       Check_Type (y, T_FIXNUM);
+       Check_Type (w, T_FIXNUM);
+       Check_Type (h, T_FIXNUM);
+
+       evas_object_image_fill_set (e->real, FIX2INT (x), FIX2INT (y),
+                                   FIX2INT (w), FIX2INT (h));
+
+       return Qnil;
+}
+
+/*
+ * call-seq:
+ *  img.reload => nil
+ *
+ * Reloads <i>img</i>.
+ */
+static VALUE c_reload (VALUE self)
+{
+       GET_OBJ (self, RbEvasObject, e);
+
+       evas_object_image_reload (e->real);
+
+       return Qnil;
+}
+
 void Init_Image (void)
 {
        VALUE c = rb_define_class_under (mEvas, "Image", cEvasObject);
 
        rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "get_file", c_get_file, -1);
+       rb_define_method (c, "set_file", c_set_file, -1);
+       rb_define_method (c, "has_alpha?", c_has_alpha_get, 0);
+       rb_define_method (c, "has_alpha=", c_has_alpha_set, 1);
+       rb_define_method (c, "get_size", c_get_size, 0);
+       rb_define_method (c, "set_size", c_set_size, 2);
+       rb_define_method (c, "get_fill", c_get_fill, 0);
+       rb_define_method (c, "set_fill", c_set_fill, 4);
+       rb_define_method (c, "reload", c_reload, 0);
 }