Removed RCS-style IDs.

[ruby-evas.git] / src / rb_evas.c

diff --git a/src/rb_evas.c b/src/rb_evas.c
index 3e333a59dd9c2c1847c29b157380419f8436522f..4eb21344ed2380422c45cdc4303af3e905d79b15 100644 (file)
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_evas.c 58 2004-08-10 14:10:02Z tilman $
- *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
@@ -34,21 +32,27 @@ static void c_mark (RbEvas *e)
        rb_gc_mark (e->parent);
 }
 
+static VALUE c_alloc (VALUE klass)
+{
+       RbEvas *evas = NULL;
+
+       return Data_Make_Struct (cEvas, RbEvas, c_mark, free, evas);
+}
+
 VALUE TO_EVAS (VALUE parent, Evas *e)
 {
        VALUE self;
-       RbEvas *evas = NULL;
 
        if (NIL_P (parent) || !e)
                return Qnil;
 
-       self = Data_Make_Struct (cEvas, RbEvas,
-                                c_mark, free, evas);
+       self = rb_class_new_instance (0, NULL, cEvas);
+
+       GET_OBJ (self, RbEvas, evas);
+
        evas->real = e;
        evas->parent = parent;
 
-       rb_obj_call_init (self, 0, NULL);
-
        return self;
 }
 
@@ -92,8 +96,6 @@ static VALUE c_font_path_append (VALUE self, VALUE path)
 {
        GET_OBJ (self, RbEvas, e);
 
-       Check_Type (path, T_STRING);
-
        evas_font_path_append (e->real, StringValuePtr (path));
 
        return Qnil;
@@ -109,9 +111,7 @@ static VALUE c_font_path_prepend (VALUE self, VALUE path)
 {
        GET_OBJ (self, RbEvas, e);
 
-       Check_Type (path, T_STRING);
-
-       evas_font_path_append (e->real, StringValuePtr (path));
+       evas_font_path_prepend (e->real, StringValuePtr (path));
 
        return Qnil;
 }
@@ -253,19 +253,13 @@ static VALUE c_image_cache_flush (VALUE self)
 static VALUE c_top_get (VALUE self)
 {
        Evas_Object *o;
-       void *obj;
 
        GET_OBJ (self, RbEvas, e);
 
        if (!(o = evas_object_top_get (e->real)))
                return Qnil;
 
-       if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
-               rb_raise (rb_eException, "EvasObject Ruby object key missing");
-               return Qnil;
-       }
-
-       return (VALUE) obj;
+       return TO_EVAS_OBJECT (o);
 }
 
 /*
@@ -277,19 +271,13 @@ static VALUE c_top_get (VALUE self)
 static VALUE c_bottom_get (VALUE self)
 {
        Evas_Object *o;
-       void *obj;
 
        GET_OBJ (self, RbEvas, e);
 
        if (!(o = evas_object_bottom_get (e->real)))
                return Qnil;
 
-       if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
-               rb_raise (rb_eException, "EvasObject Ruby object key missing");
-               return Qnil;
-       }
-
-       return (VALUE) obj;
+       return TO_EVAS_OBJECT (o);
 }
 
 /*
@@ -301,27 +289,46 @@ static VALUE c_bottom_get (VALUE self)
 static VALUE c_find_object (VALUE self, VALUE name)
 {
        Evas_Object *o;
-       void *obj;
 
        GET_OBJ (self, RbEvas, e);
 
-       Check_Type (name, T_STRING);
-
        if (!(o = evas_object_name_find (e->real, StringValuePtr (name))))
                return Qnil;
 
-       if (!(obj = evas_object_data_get (o, RUBY_EVAS_OBJECT_KEY))) {
-               rb_raise (rb_eException, "EvasObject Ruby object key missing");
-               return Qnil;
-       }
+       return TO_EVAS_OBJECT (o);
+}
+
+static VALUE c_output_size_get (VALUE self)
+{
+       int w = 0, h = 0;
+
+       GET_OBJ (self, RbEvas, e);
+
+       evas_output_size_get (e->real, &w, &h);
 
-       return (VALUE) obj;
+       return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h));
+}
+
+static VALUE c_output_viewport_get (VALUE self)
+{
+       int x = 0, y = 0, w = 0, h = 0;
+
+       GET_OBJ (self, RbEvas, e);
+
+       evas_output_viewport_get (e->real,
+                                 (Evas_Coord *) &x, (Evas_Coord *) &y,
+                                 (Evas_Coord *) &w, (Evas_Coord *) &h);
+
+       return rb_ary_new3 (4, INT2FIX (x), INT2FIX (y), INT2FIX (w),
+                           INT2FIX (h));
 }
 
 void Init_Evas (void)
 {
        cEvas = rb_define_class_under (mEvas, "Evas", rb_cObject);
 
+       rb_define_alloc_func (cEvas, c_alloc);
+
        /* not publically instantiable yet */
        rb_define_private_method (rb_singleton_class (cEvas),
                                  "new", NULL, 0);
@@ -344,4 +351,6 @@ void Init_Evas (void)
        rb_define_method (cEvas, "top", c_top_get, 0);
        rb_define_method (cEvas, "bottom", c_bottom_get, 0);
        rb_define_method (cEvas, "find_object", c_find_object, 1);
+       rb_define_method (cEvas, "output_size", c_output_size_get, 0);
+       rb_define_method (cEvas, "output_viewport", c_output_viewport_get, 0);
 }