X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_evas%2Frb_fb.c;h=830448d5ca89a3a705bef5527a818eca67d294c4;hp=b5c262b7484a9883fe23236ca22e35c0e8e971e3;hb=d907bd016f15dc5be72d12ee1742047eafc2abae;hpb=98ce45a70b8b219b738bb804297417aae0ae9baa

diff --git a/src/ecore_evas/rb_fb.c b/src/ecore_evas/rb_fb.c
index b5c262b..830448d 100644
--- a/src/ecore_evas/rb_fb.c
+++ b/src/ecore_evas/rb_fb.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_fb.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_fb.c 351 2006-02-10 15:25:40Z tilman $
  *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,18 +23,39 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 
+#include "../ecore/rb_ecore.h"
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static void c_free (RbEcoreEvas *ee)
 {
-	VALUE self, disp, rot, w, h;
-	Ecore_Evas **ee = NULL;
+	c_ecore_evas_free (ee, true);
+}
+
+static VALUE c_alloc (VALUE klass)
+{
+	RbEcoreEvas *ee = NULL;
+
+	ecore_init ();
+	ecore_evas_init ();
+
+	return Data_Make_Struct (klass, RbEcoreEvas,
+	                         c_ecore_evas_mark, c_free, ee);
+}
+
+/*
+ * call-seq:
+ *  Ecore::Evas::Fb.new([display, rotation, w, h]) => fb
+ *
+ * Creates an Ecore::Evas::Fb object.
+ */
+static VALUE c_init (int argc, VALUE *argv, VALUE self)
+{
+	VALUE disp, rot, w, h;
 	char *cdisp = NULL;
 	int irot = 0, iw = 0, ih = 0;
 
-	self = Data_Make_Struct (klass, Ecore_Evas *,
-	                         NULL, c_ecore_evas_free, ee);
+	GET_OBJ (self, RbEcoreEvas, ee);
 
 	rb_scan_args (argc, argv, "04", &disp, &rot, &w, &h);
 
@@ -45,32 +66,30 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 
 	if (!NIL_P (rot)) {
 		Check_Type (rot, T_FIXNUM);
-		irot = NUM2INT (rot);
+		irot = FIX2INT (rot);
 	}
 
 	if (!NIL_P (w)) {
 		Check_Type (w, T_FIXNUM);
-		iw = NUM2INT (w);
+		iw = FIX2INT (w);
 	}
 
 	if (!NIL_P (h)) {
 		Check_Type (h, T_FIXNUM);
-		ih = NUM2INT (h);
+		ih = FIX2INT (h);
 	}
 
-	ecore_init ();
-	ecore_evas_init ();
-
-	*ee = ecore_evas_fb_new (cdisp, irot, iw, ih);
+	ee->real = ecore_evas_fb_new (cdisp, irot, iw, ih);
 
-	rb_obj_call_init (self, 0, NULL);
+	rb_call_super (argc, argv);
 
 	return self;
 }
 
 void Init_Fb (void)
 {
-	VALUE cFb = rb_define_class_under (mEvas, "Fb", cEcoreEvas);
+	VALUE c = rb_define_class_under (mEvas, "Fb", cEcoreEvas);
 
-	rb_define_singleton_method (cFb, "new", c_new, -1);
+	rb_define_alloc_func (c, c_alloc);
+	rb_define_method (c, "initialize", c_init, -1);
 }