X-Git-Url: http://git.code-monkey.de/?p=ruby-evas.git;a=blobdiff_plain;f=src%2Frb_image.c;h=6efca2853fc81471bc6befeb49532e0b4c241bd4;hp=275dc32423c46dab4e6f3ff8610816bdafb72a59;hb=c3202d026f3800676461ee407f2a5e46dc20e2f2;hpb=12ccdf817e025157564aaa229933049838b6b40c

diff --git a/src/rb_image.c b/src/rb_image.c
index 275dc32..6efca28 100644
--- a/src/rb_image.c
+++ b/src/rb_image.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_image.c 62 2004-08-12 19:35:01Z tilman $
- *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
@@ -26,31 +24,21 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-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)
+static VALUE c_init (VALUE self, VALUE evas)
 {
-	VALUE self, argv[1];
-	RbEvasObject *img;
-
 	CHECK_CLASS (evas, cEvas);
 	GET_OBJ (evas, RbEvas, e);
+	GET_OBJ (self, RbEvasObject, img);
 
-	self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
-	                         c_free, img);
 	img->real = evas_object_image_add (e->real);
 
-	argv[0] = evas;
-	rb_obj_call_init (self, 1, argv);
+	rb_call_super (1, &evas);
 
 	return self;
 }
@@ -94,12 +82,8 @@ static VALUE c_set_file (int argc, VALUE *argv, VALUE self)
 
 	rb_scan_args (argc, argv, "11", &file, &key);
 
-	Check_Type (file, T_STRING);
-
-	if (!NIL_P (key)) {
-		Check_Type (key, T_STRING);
+	if (!NIL_P (key))
 		k = StringValuePtr (key);
-	}
 
 	evas_object_image_file_set (e->real, StringValuePtr (file), k);
 
@@ -223,6 +207,33 @@ static VALUE c_set_fill (VALUE self, VALUE x, VALUE y, VALUE w, VALUE h)
 	return Qnil;
 }
 
+static VALUE c_get_border (VALUE self)
+{
+	int x = 0, y = 0, w = 0, h = 0;
+
+	GET_OBJ (self, RbEvasObject, e);
+
+	evas_object_image_border_get (e->real, &x, &y, &w, &h);
+
+	return rb_ary_new3 (4, INT2FIX (x), INT2FIX (y),
+	                    INT2FIX (w), INT2FIX (h));
+}
+
+static VALUE c_set_border (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_border_set (e->real, FIX2INT (x), FIX2INT (y),
+	                              FIX2INT (w), FIX2INT (h));
+
+	return Qnil;
+}
+
 /*
  * call-seq:
  *  img.reload => nil
@@ -238,11 +249,51 @@ static VALUE c_reload (VALUE self)
 	return Qnil;
 }
 
+static VALUE c_data_get (int argc, VALUE *argv, VALUE self)
+{
+	VALUE read_write = Qfalse;
+	void *data;
+	int w = 0, h = 0;
+
+	GET_OBJ (self, RbEvasObject, e);
+
+	rb_scan_args (argc, argv, "01", &read_write);
+
+	if (NIL_P (read_write))
+		read_write = Qfalse;
+
+	data = evas_object_image_data_get (e->real, read_write == Qtrue);
+	evas_object_image_size_get (e->real, &w, &h);
+
+	return rb_str_new (data, h * w * 4);
+}
+
+static VALUE c_data_set (VALUE self, VALUE data)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	evas_object_image_data_set (e->real, StringValuePtr (data));
+
+	return Qnil;
+}
+
+static VALUE c_data_update_add (VALUE self, VALUE x, VALUE y,
+                                VALUE w, VALUE h)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	evas_object_image_data_update_add (e->real,
+	                                   FIX2INT (x), FIX2INT (y),
+	                                   FIX2INT (w), FIX2INT (h));
+
+	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, "initialize", c_init, 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);
@@ -251,5 +302,10 @@ void Init_Image (void)
 	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, "get_border", c_get_border, 0);
+	rb_define_method (c, "set_border", c_set_border, 4);
 	rb_define_method (c, "reload", c_reload, 0);
+	rb_define_method (c, "data", c_data_get, -1);
+	rb_define_method (c, "data=", c_data_set, 1);
+	rb_define_method (c, "data_update_add", c_data_update_add, 4);
 }