X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_ecore_evas.c;h=7edb1685b908f90715b5eb45e2aefeb9e5713c53;hb=2df440b7f214ee703b3bf911a6f744175dc07c13;hp=040ac6848275e0eee27a8a156ac4155fe6fb417c;hpb=f007c429dfb7b76be36317212a0585401e13984a;p=ruby-ecore.git

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index 040ac68..7edb168 100644
--- a/src/ecore_evas/rb_ecore_evas.c
+++ b/src/ecore_evas/rb_ecore_evas.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_evas.c 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_ecore_evas.c 18 2004-06-22 20:32:57Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,13 +26,21 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-#define GET_OBJ(obj, ee) \
-	Ecore_Evas **(ee) = NULL; \
+#define GET_OBJ(obj, type, o, desc) \
+	type **(o) = NULL; \
 \
-	Data_Get_Struct ((obj), Ecore_Evas *, (ee)); \
+	Data_Get_Struct ((obj), type *, (o)); \
 \
-	if (!*(ee)) { \
-		rb_raise (rb_eException, "EcoreEvas destroyed already"); \
+	if (!*(o)) { \
+		rb_raise (rb_eException, desc " destroyed already"); \
+		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; \
 	}
 
@@ -45,21 +53,21 @@ void c_ecore_evas_free (Ecore_Evas **ee)
 	free (ee);
 }
 
-#if 0
-static VALUE c_init (int argc, VALUE argv, VALUE self)
+static VALUE c_inspect (VALUE self)
 {
-	rb_iv_set (self, "@title", rb_str_new2 (""));
-	rb_iv_set (self, "@name", rb_str_new2 (""));
-	rb_iv_set (self, "@class", rb_str_new2 (""));
-	rb_iv_set (self, "@name", rb_str_new2 (""));
+	char buf[128];
+
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
+
+	snprintf (buf, sizeof (buf), "#<EcoreEvas:%p ptr=%p>",
+	          (void *) self, *ee);
 
-	return self;
+	return rb_str_new2 (buf);
 }
-#endif
 
 static VALUE c_show (VALUE self)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	ecore_evas_show (*ee);
 
@@ -68,30 +76,76 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	ecore_evas_hide (*ee);
 
 	return Qnil;
 }
 
-static VALUE c_is_visible (VALUE self)
+static VALUE c_visible_get (VALUE self)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	return ecore_evas_visibility_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_evas (VALUE self)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	return TO_EVAS (self, ecore_evas_get (*ee));
 }
 
+static VALUE c_get_size_min (VALUE self)
+{
+	int w = 0, h = 0;
+
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
+
+	ecore_evas_size_min_get (*ee, &w, &h);
+
+	return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h));
+}
+
+static VALUE c_set_size_min (VALUE self, VALUE w, VALUE h)
+{
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
+
+	Check_Type (w, T_FIXNUM);
+	Check_Type (h, T_FIXNUM);
+
+	ecore_evas_size_min_set (*ee, FIX2INT (w), FIX2INT (h));
+
+	return Qnil;
+}
+
+static VALUE c_get_size_max (VALUE self)
+{
+	int w = 0, h = 0;
+
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
+
+	ecore_evas_size_max_get (*ee, &w, &h);
+
+	return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h));
+}
+
+static VALUE c_set_size_max (VALUE self, VALUE w, VALUE h)
+{
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
+
+	Check_Type (w, T_FIXNUM);
+	Check_Type (h, T_FIXNUM);
+
+	ecore_evas_size_max_set (*ee, FIX2INT (w), FIX2INT (h));
+
+	return Qnil;
+}
+
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
@@ -105,7 +159,7 @@ static VALUE c_title_get (VALUE self)
 {
 	const char *tmp;
 
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	if (!(tmp = ecore_evas_title_get (*ee)))
 		return Qnil;
@@ -115,33 +169,27 @@ static VALUE c_title_get (VALUE self)
 
 static VALUE c_title_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	Check_Type (val, T_STRING);
 
-	ecore_evas_title_set (*ee, STR2CSTR (val));
+	ecore_evas_title_set (*ee, StringValuePtr (val));
 
 	return Qnil;
 }
 
 static VALUE c_borderless_get (VALUE self)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	return ecore_evas_borderless_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_borderless_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
-	/* make sure we're passed a boolean */
-	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;
-	}
+	CHECK_BOOL (val);
 
 	ecore_evas_borderless_set (*ee, val == Qtrue ? 1 : 0);
 
@@ -150,7 +198,7 @@ static VALUE c_borderless_set (VALUE self, VALUE val)
 
 static VALUE c_delete (VALUE self)
 {
-	GET_OBJ (self, ee);
+	GET_OBJ (self, Ecore_Evas, ee, "EcoreEvas");
 
 	/* reap our children */
 	rb_gc_start ();
@@ -167,16 +215,19 @@ void Init_EcoreEvas (void)
 
 	rb_define_private_method (rb_singleton_class (cEcoreEvas),
 	                          "new", NULL, 0);
-	/*rb_define_method (cEcoreEvas, "initialize", c_init, -1);*/
+	rb_define_method (cEcoreEvas, "inspect", c_inspect, 0);
 	rb_define_method (cEcoreEvas, "delete", c_delete, 0);
 	rb_define_method (cEcoreEvas, "show", c_show, 0);
 	rb_define_method (cEcoreEvas, "hide", c_hide, 0);
-	rb_define_method (cEcoreEvas, "visible?", c_is_visible, 0);
+	rb_define_method (cEcoreEvas, "visible?", c_visible_get, 0);
 	rb_define_method (cEcoreEvas, "evas", c_evas, 0);
+	rb_define_method (cEcoreEvas, "get_size_min", c_get_size_min, 0);
+	rb_define_method (cEcoreEvas, "set_size_min", c_set_size_min, 2);
+	rb_define_method (cEcoreEvas, "get_size_max", c_get_size_max, 0);
+	rb_define_method (cEcoreEvas, "set_size_max", c_set_size_max, 2);
 	rb_define_method (cEcoreEvas, "resize", c_resize, 2);
 	rb_define_method (cEcoreEvas, "title", c_title_get, 0);
 	rb_define_method (cEcoreEvas, "title=", c_title_set, 1);
 	rb_define_method (cEcoreEvas, "borderless", c_borderless_get, 0);
 	rb_define_method (cEcoreEvas, "borderless=", c_borderless_set, 1);
 }
-