Added Ecore::Evas::EcoreEvas#has_alpha? and #has_alpha=.

[ruby-ecore.git] / src / ecore_evas / rb_fb.c

diff --git a/src/ecore_evas/rb_fb.c b/src/ecore_evas/rb_fb.c
index 42412ee25740371595059069315794036f9911e4..830448d5ca89a3a705bef5527a818eca67d294c4 100644 (file)
--- a/src/ecore_evas/rb_fb.c
+++ b/src/ecore_evas/rb_fb.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_fb.c 50 2004-08-01 10:18:39Z 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,6 +23,7 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 
+#include "../ecore/rb_ecore.h"
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
@@ -31,15 +32,30 @@ static void c_free (RbEcoreEvas *ee)
        c_ecore_evas_free (ee, true);
 }
 
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
+static VALUE c_alloc (VALUE klass)
 {
-       VALUE self, disp, rot, w, h;
        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, RbEcoreEvas,
-                                c_ecore_evas_mark, c_free, ee);
+       GET_OBJ (self, RbEcoreEvas, ee);
 
        rb_scan_args (argc, argv, "04", &disp, &rot, &w, &h);
 
@@ -63,12 +79,9 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
                ih = FIX2INT (h);
        }
 
-       ecore_init ();
-       ecore_evas_init ();
-
        ee->real = ecore_evas_fb_new (cdisp, irot, iw, ih);
 
-       rb_obj_call_init (self, 0, NULL);
+       rb_call_super (argc, argv);
 
        return self;
 }
@@ -77,5 +90,6 @@ void Init_Fb (void)
 {
        VALUE c = rb_define_class_under (mEvas, "Fb", cEcoreEvas);
 
-       rb_define_singleton_method (c, "new", c_new, -1);
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, -1);
 }