From 2118372cfbb06b10e6254539b30887e0342650fd Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Tue, 22 Jun 2004 20:46:56 +0000 Subject: [PATCH] Lots of new stuff. --- src/Makefile.am | 5 +- src/rb_evas.c | 206 +++++++++++++++++++++++++++++++++- src/rb_evas.h | 5 +- src/rb_evas_main.c | 44 ++++++++ src/rb_evas_main.h | 26 +++++ src/rb_evas_object.c | 262 ++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 534 insertions(+), 14 deletions(-) create mode 100644 src/rb_evas_main.c create mode 100644 src/rb_evas_main.h diff --git a/src/Makefile.am b/src/Makefile.am index 52b0e12..a2765f6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am 11 2004-06-19 20:02:40Z tilman $ +## $Id: Makefile.am 20 2004-06-22 20:46:56Z tilman $ AM_CFLAGS = $(EVAS_CFLAGS) INCLUDES = -I$(RUBYDIR) @@ -6,7 +6,8 @@ INCLUDES = -I$(RUBYDIR) ext_LTLIBRARIES = evas.la extdir = $(RUBYSITEDIR) -evas_la_SOURCES = rb_evas.c rb_evas.h \ +evas_la_SOURCES = rb_evas_main.c rb_evas_main.h \ + rb_evas.c rb_evas.h \ rb_evas_object.c rb_evas_object.h evas_la_LIBADD = -lruby $(EVAS_LIBS) diff --git a/src/rb_evas.c b/src/rb_evas.c index 2ba53d1..dfb949a 100644 --- a/src/rb_evas.c +++ b/src/rb_evas.c @@ -1,5 +1,5 @@ /* - * $Id: rb_evas.c 2 2004-06-19 18:55:39Z tilman $ + * $Id: rb_evas.c 20 2004-06-22 20:46:56Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -22,9 +22,20 @@ #include +#include "rb_evas_main.h" +#include "rb_evas.h" #include "rb_evas_object.h" -VALUE cEvas; +#define GET_OBJ(obj, type, o, desc) \ + type **(o) = NULL; \ +\ + Data_Get_Struct ((obj), type *, (o)); \ +\ + if (!*(o)) { \ + rb_raise (rb_eException, desc " destroyed already"); \ + return Qnil; \ + } + static VALUE parents; static void c_mark (Evas **e) @@ -55,16 +66,199 @@ VALUE TO_EVAS (VALUE parent, Evas *e) return self; } -void Init_evas (void) +static VALUE c_font_path_clear (VALUE self) +{ + GET_OBJ (self, Evas, e, "Evas"); + + evas_font_path_clear (*e); + + return Qnil; +} + +static VALUE c_font_path_append (VALUE self, VALUE path) +{ + GET_OBJ (self, Evas, e, "Evas"); + + Check_Type (path, T_STRING); + + evas_font_path_append (*e, StringValuePtr (path)); + + return Qnil; +} + +static VALUE c_font_path_prepend (VALUE self, VALUE path) { - cEvas = rb_define_class ("Evas", rb_cObject); + GET_OBJ (self, Evas, e, "Evas"); + + Check_Type (path, T_STRING); + + evas_font_path_append (*e, StringValuePtr (path)); + + return Qnil; +} + +static VALUE c_font_path_get (VALUE self) +{ + VALUE ary; + const Evas_List *list, *l; + + GET_OBJ (self, Evas, e, "Evas"); + + if (!(list = evas_font_path_list (*e))) + return rb_ary_new (); + + ary = rb_ary_new2 (evas_list_count ((Evas_List *) list)); + + for (l = list; l; l = l->next) + rb_ary_push (ary, rb_str_new2 (l->data)); + + return ary; +} + +static VALUE c_font_cache_get (VALUE self) + { + GET_OBJ (self, Evas, e, "Evas"); + + return INT2FIX (evas_font_cache_get (*e)); +} + +static VALUE c_font_cache_set (VALUE self, VALUE val) +{ + GET_OBJ (self, Evas, e, "Evas"); + + Check_Type (val, T_FIXNUM); + + evas_font_cache_set (*e, FIX2INT (val)); + + return Qnil; +} + +static VALUE c_font_cache_flush (VALUE self) +{ + GET_OBJ (self, Evas, e, "Evas"); + + evas_font_cache_flush (*e); + + return Qnil; +} + +static VALUE c_image_cache_get (VALUE self) +{ + GET_OBJ (self, Evas, e, "Evas"); + + return INT2FIX (evas_image_cache_get (*e)); +} + +static VALUE c_image_cache_set (VALUE self, VALUE val) +{ + GET_OBJ (self, Evas, e, "Evas"); + + Check_Type (val, T_FIXNUM); + + evas_image_cache_set (*e, FIX2INT (val)); + + return Qnil; +} + +static VALUE c_image_cache_reload (VALUE self) +{ + GET_OBJ (self, Evas, e, "Evas"); + + evas_image_cache_reload (*e); + + return Qnil; +} + +static VALUE c_image_cache_flush (VALUE self) +{ + GET_OBJ (self, Evas, e, "Evas"); + + evas_image_cache_flush (*e); + + return Qnil; +} + +static VALUE c_top_get (VALUE self) +{ + Evas_Object *o; + void *obj; + + GET_OBJ (self, Evas, e, "Evas"); + + if (!(o = evas_object_top_get (*e))) + 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; +} + +static VALUE c_bottom_get (VALUE self) +{ + Evas_Object *o; + void *obj; + + GET_OBJ (self, Evas, e, "Evas"); + + if (!(o = evas_object_bottom_get (*e))) + 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; +} + +static VALUE c_find_object (VALUE self, VALUE name) +{ + Evas_Object *o; + void *obj; + + GET_OBJ (self, Evas, e, "Evas"); + + Check_Type (name, T_STRING); + + if (!(o = evas_object_name_find (*e, 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 (VALUE) obj; +} + +void Init_Evas (void) +{ + cEvas = rb_define_class_under (mEvas, "Evas", rb_cObject); /* not publically instantiable yet */ rb_define_private_method (rb_singleton_class (cEvas), "new", NULL, 0); + rb_define_method (cEvas, "font_path_clear", c_font_path_clear, 0); + rb_define_method (cEvas, "font_path_append", c_font_path_append, 1); + rb_define_method (cEvas, "font_path_prepend", c_font_path_prepend, 1); + rb_define_method (cEvas, "font_path", c_font_path_get, 0); + rb_define_method (cEvas, "font_cache", c_font_cache_get, 0); + rb_define_method (cEvas, "font_cache=", c_font_cache_set, 1); + rb_define_method (cEvas, "font_cache_flush", + c_font_cache_flush, 0); + rb_define_method (cEvas, "image_cache", c_image_cache_get, 0); + rb_define_method (cEvas, "image_cache=", c_image_cache_set, 1); + rb_define_method (cEvas, "image_cache_reload", + c_image_cache_reload, 0); + rb_define_method (cEvas, "image_cache_flush", + c_image_cache_flush, 0); + 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); parents = rb_hash_new (); rb_global_variable (&parents); - - Init_EvasObject (); } diff --git a/src/rb_evas.h b/src/rb_evas.h index 5bf0cf5..aae1cd6 100644 --- a/src/rb_evas.h +++ b/src/rb_evas.h @@ -1,5 +1,5 @@ /* - * $Id: rb_evas.h 2 2004-06-19 18:55:39Z tilman $ + * $Id: rb_evas.h 20 2004-06-22 20:46:56Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -21,8 +21,11 @@ #ifndef __RB_EVAS_H #define __RB_EVAS_H +#define RUBY_EVAS_OBJECT_KEY "__RB_EVAS_OBJECT_OBJECT" + VALUE cEvas; +void Init_Evas (void); VALUE TO_EVAS (VALUE parent, Evas *e); #endif diff --git a/src/rb_evas_main.c b/src/rb_evas_main.c new file mode 100644 index 0000000..719320d --- /dev/null +++ b/src/rb_evas_main.c @@ -0,0 +1,44 @@ +/* + * $Id: rb_evas_main.c 20 2004-06-22 20:46:56Z tilman $ + * + * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include + +#include + +#include "rb_evas_main.h" +#include "rb_evas.h" +#include "rb_evas_object.h" + +static VALUE m_shutdown (VALUE self) +{ + evas_shutdown (); + + return Qnil; +} + +void Init_evas (void) +{ + mEvas = rb_define_module ("Evas"); + + rb_define_module_function (mEvas, "shutdown", m_shutdown, 0); + + Init_Evas (); + Init_EvasObject (); +} diff --git a/src/rb_evas_main.h b/src/rb_evas_main.h new file mode 100644 index 0000000..214a7a4 --- /dev/null +++ b/src/rb_evas_main.h @@ -0,0 +1,26 @@ +/* + * $Id: rb_evas_main.h 20 2004-06-22 20:46:56Z tilman $ + * + * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __RB_EVAS_MAIN_H +#define __RB_EVAS_MAIN_H + +VALUE mEvas; + +#endif diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c index cd448bf..6492a4e 100644 --- a/src/rb_evas_object.c +++ b/src/rb_evas_object.c @@ -1,5 +1,5 @@ /* - * $Id: rb_evas_object.c 2 2004-06-19 18:55:39Z tilman $ + * $Id: rb_evas_object.c 20 2004-06-22 20:46:56Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -22,6 +22,8 @@ #include +#include "rb_evas_main.h" +#include "rb_evas.h" #include "rb_evas_object.h" #define GET_OBJ(obj, type, o, desc) \ @@ -34,6 +36,14 @@ return Qnil; \ } +#define CHECK_BOOL(val) \ + if (TYPE ((val)) != T_TRUE && TYPE ((val)) != T_FALSE) { \ + rb_raise (rb_eTypeError, \ + "wrong argument type %s (expected true or false)", \ + rb_obj_classname ((val))); \ + return Qnil; \ + } + static VALUE parents; /* called by the child classes */ @@ -58,11 +68,25 @@ static VALUE c_init (VALUE self, VALUE parent) { GET_OBJ (self, Evas_Object, e, "EvasObject"); + evas_object_data_set (*e, RUBY_EVAS_OBJECT_KEY, (void *) self); + rb_hash_aset (parents, INT2NUM ((long) e), parent); return self; } +static VALUE c_inspect (VALUE self) +{ + char buf[128]; + + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + snprintf (buf, sizeof (buf), "#", + (void *) self, *e); + + return rb_str_new2 (buf); +} + static VALUE c_delete (VALUE self) { GET_OBJ (self, Evas_Object, e, "EvasObject"); @@ -88,6 +112,32 @@ static VALUE c_resize (VALUE self, VALUE w, VALUE h) return Qnil; } +static VALUE c_move (VALUE self, VALUE x, VALUE y) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + Check_Type (x, T_FIXNUM); + Check_Type (y, T_FIXNUM); + + evas_object_move (*e, (Evas_Coord) FIX2INT (x), + (Evas_Coord) FIX2INT (y)); + + return Qnil; +} + +static VALUE c_geometry_get (VALUE self) +{ + int x = 0, y = 0, w = 0, h = 0; + + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + evas_object_geometry_get (*e, (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)); +} + static VALUE c_show (VALUE self) { GET_OBJ (self, Evas_Object, e, "EvasObject"); @@ -106,26 +156,228 @@ static VALUE c_hide (VALUE self) return Qnil; } -static VALUE c_is_visible (VALUE self) +static VALUE c_visible_get (VALUE self) { GET_OBJ (self, Evas_Object, e, "EvasObject"); return evas_object_visible_get (*e) ? Qtrue : Qfalse; } +static VALUE c_evas_get (VALUE self) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + return rb_hash_aref (parents, INT2NUM ((long) (e))); +} + +static VALUE c_name_get (VALUE self) +{ + const char *name; + + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + if (!(name = evas_object_name_get (*e))) + return Qnil; + else + return rb_str_new2 (name); +} + +static VALUE c_name_set (VALUE self, VALUE val) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + Check_Type (val, T_STRING); + + evas_object_name_set (*e, StringValuePtr (val)); + + return Qnil; +} + +static VALUE c_layer_get (VALUE self) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + return INT2FIX (evas_object_layer_get (*e)); +} + +static VALUE c_layer_set (VALUE self, VALUE val) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + Check_Type (val, T_FIXNUM); + + evas_object_layer_set (*e, NUM2INT (val)); + + return Qnil; +} + +static VALUE c_get_color (VALUE self) +{ + int r = 0, g = 0, b = 0, a = 0; + + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + evas_object_color_get (*e, &r, &g, &b, &a); + + return rb_ary_new3 (4, INT2FIX (r), INT2FIX (g), INT2FIX (b), + INT2FIX (a)); +} + +static VALUE c_set_color (VALUE self, VALUE r, VALUE g, VALUE b, + VALUE a) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + Check_Type (r, T_FIXNUM); + Check_Type (g, T_FIXNUM); + Check_Type (b, T_FIXNUM); + Check_Type (a, T_FIXNUM); + + evas_object_color_set (*e, FIX2INT (r), FIX2INT (g), FIX2INT (b), + FIX2INT (a)); + + return Qnil; +} + +static VALUE c_pass_events_get (VALUE self) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + return evas_object_pass_events_get (*e) ? Qtrue : Qfalse; +} + +static VALUE c_pass_events_set (VALUE self, VALUE val) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + CHECK_BOOL (val); + + evas_object_pass_events_set (*e, val == Qtrue ? 1 : 0); + + return Qnil; +} + +static VALUE c_raise (VALUE self) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + evas_object_raise (*e); + + return Qnil; +} + +static VALUE c_lower (VALUE self) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + evas_object_lower (*e); + + return Qnil; +} + +static VALUE c_stack_above (VALUE self, VALUE target) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + if (!rb_obj_is_kind_of (target, cEvasObject)) { + rb_raise (rb_eTypeError, + "wrong argument type %s (expected EvasObject)", + rb_obj_classname (target)); + return Qnil; + } + + GET_OBJ (target, Evas_Object, target2, "EvasObject"); + + evas_object_stack_above (*e, *target2); + + return Qnil; +} + +static VALUE c_stack_below (VALUE self, VALUE target) +{ + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + if (!rb_obj_is_kind_of (target, cEvasObject)) { + rb_raise (rb_eTypeError, + "wrong argument type %s (expected EvasObject)", + rb_obj_classname (target)); + return Qnil; + } + + GET_OBJ (target, Evas_Object, target2, "EvasObject"); + + evas_object_stack_below (*e, *target2); + + return Qnil; +} + +static VALUE c_above_get (VALUE self) +{ + Evas_Object *o; + void *obj; + + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + if (!(evas_object_above_get (*e))) + 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; +} + +static VALUE c_below_get (VALUE self) +{ + Evas_Object *o; + void *obj; + + GET_OBJ (self, Evas_Object, e, "EvasObject"); + + if (!(evas_object_below_get (*e))) + 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; +} + void Init_EvasObject (void) { - cEvasObject = rb_define_class ("EvasObject", rb_cObject); + cEvasObject = rb_define_class_under (mEvas, "EvasObject", + rb_cObject); rb_define_private_method (rb_singleton_class (cEvasObject), "new", NULL, 0); - rb_define_method (cEvasObject, "initialize", c_init, 1); + rb_define_method (cEvasObject, "inspect", c_inspect, 0); rb_define_method (cEvasObject, "delete", c_delete, 0); rb_define_method (cEvasObject, "resize", c_resize, 2); + rb_define_method (cEvasObject, "move", c_move, 2); + rb_define_method (cEvasObject, "geometry", c_geometry_get, 0); rb_define_method (cEvasObject, "show", c_show, 0); rb_define_method (cEvasObject, "hide", c_hide, 0); - rb_define_method (cEvasObject, "visible?", c_is_visible, 0); + rb_define_method (cEvasObject, "visible?", c_visible_get, 0); + rb_define_method (cEvasObject, "evas", c_evas_get, 0); + rb_define_method (cEvasObject, "name", c_name_get, 0); + rb_define_method (cEvasObject, "name=", c_name_set, 1); + rb_define_method (cEvasObject, "layer", c_layer_get, 0); + rb_define_method (cEvasObject, "layer=", c_layer_set, 1); + rb_define_method (cEvasObject, "get_color", c_get_color, 0); + rb_define_method (cEvasObject, "set_color", c_set_color, 4); + rb_define_method (cEvasObject, "pass_events?", c_pass_events_get, 0); + rb_define_method (cEvasObject, "pass_events=", c_pass_events_set, 1); + rb_define_method (cEvasObject, "raise", c_raise, 0); + rb_define_method (cEvasObject, "lower", c_lower, 0); + rb_define_method (cEvasObject, "stack_above", c_stack_above, 1); + rb_define_method (cEvasObject, "stack_below", c_stack_below, 1); + rb_define_method (cEvasObject, "above", c_above_get, 0); + rb_define_method (cEvasObject, "below", c_below_get, 0); parents = rb_hash_new (); rb_global_variable (&parents); -- 2.30.2