From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 25 Jul 2004 13:14:34 +0000 (+0000)
Subject: Macro tweaks.
X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=commitdiff_plain;h=094fc971409b22abd413ed08935786dba73a9062

Macro tweaks.
---

diff --git a/src/ecore/rb_ecore.h b/src/ecore/rb_ecore.h
index 8ce5432..115aca8 100644
--- a/src/ecore/rb_ecore.h
+++ b/src/ecore/rb_ecore.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore.h 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_ecore.h 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -21,6 +21,37 @@
 #ifndef __RB_ECORE_H
 #define __RB_ECORE_H
 
+#define GET_OBJ(obj, type, o) \
+	type *(o) = NULL; \
+\
+	Data_Get_Struct ((obj), type, (o)); \
+\
+	if (!*(o)) { \
+		rb_raise (rb_eException, \
+		          "%s destroyed already", \
+		          rb_obj_classname ((obj))); \
+		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; \
+	}
+
+#define INSPECT(obj, type) \
+	char buf[128]; \
+\
+	GET_OBJ (obj, type, o); \
+\
+	snprintf (buf, sizeof (buf), \
+	          "#<%s:%p ptr=%p>", rb_obj_classname ((obj)), \
+	          (void *) obj, *o); \
+\
+	return rb_str_new2 (buf);
+
 VALUE mEcore;
 
 #endif
diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index 414b6fb..ce6bc03 100644
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_idler.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_idler.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,8 +31,6 @@ typedef struct {
 	bool deleted;
 } RbEcoreIdler;
 
-static VALUE cIdler;
-
 static int on_idler (void *data)
 {
 	VALUE r;
@@ -97,9 +95,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Idler (void)
 {
-	cIdler = rb_define_class_under (mEcore, "Idler", rb_cObject);
+	VALUE c = rb_define_class_under (mEcore, "Idler", rb_cObject);
 
-	rb_define_singleton_method (cIdler, "new", c_new, 1);
-	rb_define_method (cIdler, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-
diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 315a65a..543a541 100644
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_timer.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_timer.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,8 +31,6 @@ typedef struct {
 	bool deleted;
 } RbEcoreTimer;
 
-static VALUE cTimer;
-
 static int on_timer (void *data)
 {
 	VALUE r;
@@ -98,9 +96,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Timer (void)
 {
-	cTimer = rb_define_class_under (mEcore, "Timer", rb_cObject);
+	VALUE c = rb_define_class_under (mEcore, "Timer", rb_cObject);
 
-	rb_define_singleton_method (cTimer, "new", c_new, 1);
-	rb_define_method (cTimer, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-
diff --git a/src/ecore_evas/Makefile.am b/src/ecore_evas/Makefile.am
index f9687ae..9b4b71a 100644
--- a/src/ecore_evas/Makefile.am
+++ b/src/ecore_evas/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 22 2004-06-26 16:43:41Z tilman $
+## $Id: Makefile.am 40 2004-07-25 13:14:34Z tilman $
 
 AM_CFLAGS = $(ECORE_CFLAGS) $(EVAS_CFLAGS)
 INCLUDES = -I$(RUBYDIR) -I$(RUBYSITEDIR)
@@ -14,3 +14,6 @@ ecore_evas_la_SOURCES = rb_ecore_evas_main.c rb_ecore_evas_main.h \
 
 ecore_evas_la_LIBADD = -lruby $(ECORE_LIBS) $(EVAS_LIBS)
 ecore_evas_la_LDFLAGS = -module -avoid-version
+
+pkgincludedir = $(RUBYSITEDIR)
+pkginclude_HEADERS = rb_ecore_evas.h
diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index 7c78a26..e59b2b9 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 30 2004-07-10 14:05:30Z tilman $
+ * $Id: rb_ecore_evas.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -24,47 +24,55 @@
 #include <Ecore_Evas.h>
 #include <rb_evas.h>
 
+#include "../ecore/rb_ecore.h"
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-#define GET_OBJ(obj, type, o) \
-	type **(o) = NULL; \
+#define CALLBACK_ADD_HANDLER(name) \
+	static void on_##name (Ecore_Evas *ee) \
+	{ \
+		VALUE self = rb_hash_aref (objects, INT2NUM ((long) ee)); \
+		VALUE hash = rb_hash_aref (callbacks, self); \
 \
-	Data_Get_Struct ((obj), type *, (o)); \
+		rb_funcall (rb_hash_aref (hash, rb_str_new2 (#name)), \
+		            rb_intern ("call"), 0); \
+	} \
 \
-	if (!*(o)) { \
-		rb_raise (rb_eException, \
-		          "%s destroyed already", \
-		          rb_obj_classname ((obj))); \
-		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; \
-	}
-
-#define INSPECT(obj, type) \
-	char buf[128]; \
+	static VALUE c_on_##name (VALUE self) \
+	{ \
+		VALUE hash; \
+\
+		GET_OBJ (self, Ecore_Evas *, ee); \
+\
+		if (!rb_block_given_p ()) \
+			return Qnil; \
 \
-	GET_OBJ (obj, type, o); \
+		if (NIL_P ((hash = rb_hash_aref (callbacks, self)))) { \
+			hash = rb_hash_new (); \
 \
-	snprintf (buf, sizeof (buf), \
-	          "#<%s:%p ptr=%p>", rb_obj_classname ((obj)), \
-	          (void *) obj, *o); \
+			rb_global_variable (&hash); \
+			rb_hash_aset (callbacks, self, hash); \
+		} \
 \
-	return rb_str_new2 (buf);
+		rb_hash_aset (hash, rb_str_new2 (#name), rb_block_proc ()); \
+\
+		ecore_evas_callback_##name##_set (*ee, on_##name); \
+\
+		return Qnil; \
+	}
 
-static VALUE evases;
+#define CALLBACK_ADD(mod, name) \
+	rb_define_method ((mod), "on_"#name, c_on_##name, 0);
+
+static VALUE evases, callbacks, objects;
 
 /* called by the child classes */
 void c_ecore_evas_free (Ecore_Evas **ee)
 {
-	if (*ee)
+	if (*ee) {
+		rb_hash_aset (objects, INT2NUM ((long) *ee), Qnil);
 		ecore_evas_free (*ee);
+	}
 
 	rb_hash_aset (evases, INT2NUM ((long) ee), Qnil);
 
@@ -74,14 +82,25 @@ void c_ecore_evas_free (Ecore_Evas **ee)
 	free (ee);
 }
 
+static VALUE c_initialize (int argc, VALUE *argv, VALUE self)
+{
+	Ecore_Evas **ee = NULL;
+
+	Data_Get_Struct (self, Ecore_Evas *, ee);
+
+	rb_hash_aset (objects, INT2NUM ((long) *ee), self);
+
+	return Qnil;
+}
+
 static VALUE c_inspect (VALUE self)
 {
-	INSPECT (self, Ecore_Evas);
+	INSPECT (self, Ecore_Evas *);
 }
 
 static VALUE c_show (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	ecore_evas_show (*ee);
 
@@ -90,7 +109,7 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	ecore_evas_hide (*ee);
 
@@ -99,14 +118,14 @@ static VALUE c_hide (VALUE self)
 
 static VALUE c_visible_get (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	return ecore_evas_visibility_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_raise (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	ecore_evas_raise (*ee);
 
@@ -115,7 +134,7 @@ static VALUE c_raise (VALUE self)
 
 static VALUE c_lower (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	ecore_evas_lower (*ee);
 
@@ -124,14 +143,14 @@ static VALUE c_lower (VALUE self)
 
 static VALUE c_layer_get (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	return INT2FIX (ecore_evas_layer_get (*ee));
 }
 
 static VALUE c_layer_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (val, T_FIXNUM);
 
@@ -140,11 +159,11 @@ static VALUE c_layer_set (VALUE self, VALUE val)
 	return Qnil;
 }
 
-static VALUE c_evas (VALUE self)
+static VALUE c_evas_get (VALUE self)
 {
 	VALUE evas;
 
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	if (NIL_P (evas = rb_hash_aref (evases, INT2NUM ((long) (ee))))) {
 		evas = TO_EVAS (self, ecore_evas_get (*ee));
@@ -154,11 +173,23 @@ static VALUE c_evas (VALUE self)
 	return evas;
 }
 
+static VALUE c_geometry_get (VALUE self)
+{
+	int x = 0, y = 0, w = 0, h = 0;
+
+	GET_OBJ (self, Ecore_Evas *, ee);
+
+	ecore_evas_geometry_get (*ee, &x, &y, &w, &h);
+
+	return rb_ary_new3 (4, INT2FIX (x), INT2FIX (y),
+	                    INT2FIX (w), INT2FIX (h));
+}
+
 static VALUE c_get_size_min (VALUE self)
 {
 	int w = 0, h = 0;
 
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	ecore_evas_size_min_get (*ee, &w, &h);
 
@@ -167,7 +198,7 @@ static VALUE c_get_size_min (VALUE self)
 
 static VALUE c_set_size_min (VALUE self, VALUE w, VALUE h)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
@@ -181,7 +212,7 @@ static VALUE c_get_size_max (VALUE self)
 {
 	int w = 0, h = 0;
 
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	ecore_evas_size_max_get (*ee, &w, &h);
 
@@ -190,7 +221,7 @@ static VALUE c_get_size_max (VALUE self)
 
 static VALUE c_set_size_max (VALUE self, VALUE w, VALUE h)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
@@ -202,7 +233,7 @@ static VALUE c_set_size_max (VALUE self, VALUE w, VALUE h)
 
 static VALUE c_move (VALUE self, VALUE x, VALUE y)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (x, T_FIXNUM);
 	Check_Type (y, T_FIXNUM);
@@ -214,7 +245,7 @@ static VALUE c_move (VALUE self, VALUE x, VALUE y)
 
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (w, T_FIXNUM);
 	Check_Type (h, T_FIXNUM);
@@ -228,7 +259,7 @@ static VALUE c_title_get (VALUE self)
 {
 	const char *tmp;
 
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	if (!(tmp = ecore_evas_title_get (*ee)))
 		return Qnil;
@@ -238,7 +269,7 @@ static VALUE c_title_get (VALUE self)
 
 static VALUE c_title_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (val, T_STRING);
 
@@ -249,14 +280,14 @@ static VALUE c_title_set (VALUE self, VALUE val)
 
 static VALUE c_borderless_get (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	return ecore_evas_borderless_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_borderless_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	CHECK_BOOL (val);
 
@@ -267,14 +298,14 @@ static VALUE c_borderless_set (VALUE self, VALUE val)
 
 static VALUE c_shaped_get (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	return ecore_evas_shaped_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_shaped_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	CHECK_BOOL (val);
 
@@ -285,14 +316,14 @@ static VALUE c_shaped_set (VALUE self, VALUE val)
 
 static VALUE c_sticky_get (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	return ecore_evas_sticky_get (*ee) ? Qtrue : Qfalse;
 }
 
 static VALUE c_sticky_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	CHECK_BOOL (val);
 
@@ -303,14 +334,14 @@ static VALUE c_sticky_set (VALUE self, VALUE val)
 
 static VALUE c_rotation_get (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	return INT2FIX (ecore_evas_rotation_get (*ee));
 }
 
 static VALUE c_rotation_set (VALUE self, VALUE val)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	Check_Type (val, T_FIXNUM);
 
@@ -319,25 +350,41 @@ static VALUE c_rotation_set (VALUE self, VALUE val)
 	return Qnil;
 }
 
+/* FIXME: this is unsafe! */
 static VALUE c_delete (VALUE self)
 {
-	GET_OBJ (self, Ecore_Evas, ee);
+	GET_OBJ (self, Ecore_Evas *, ee);
 
 	/* reap our children */
 	rb_gc_start ();
 
 	ecore_evas_free (*ee);
+	rb_hash_aset (objects, INT2NUM ((long) *ee), Qnil);
 	*ee = NULL;
 
 	return Qnil;
 }
 
+CALLBACK_ADD_HANDLER (resize);
+CALLBACK_ADD_HANDLER (move);
+CALLBACK_ADD_HANDLER (show);
+CALLBACK_ADD_HANDLER (hide);
+CALLBACK_ADD_HANDLER (delete_request);
+CALLBACK_ADD_HANDLER (destroy);
+CALLBACK_ADD_HANDLER (focus_in);
+CALLBACK_ADD_HANDLER (focus_out);
+CALLBACK_ADD_HANDLER (mouse_in);
+CALLBACK_ADD_HANDLER (mouse_out);
+CALLBACK_ADD_HANDLER (pre_render);
+CALLBACK_ADD_HANDLER (post_render);
+
 void Init_EcoreEvas (void)
 {
 	cEcoreEvas = rb_define_class_under (mEvas, "EcoreEvas", rb_cObject);
 
 	rb_define_private_method (rb_singleton_class (cEcoreEvas),
 	                          "new", NULL, 0);
+	rb_define_method (cEcoreEvas, "initialize", c_initialize, -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);
@@ -347,7 +394,8 @@ void Init_EcoreEvas (void)
 	rb_define_method (cEcoreEvas, "lower", c_lower, 0);
 	rb_define_method (cEcoreEvas, "layer", c_layer_get, 0);
 	rb_define_method (cEcoreEvas, "layer=", c_layer_set, 1);
-	rb_define_method (cEcoreEvas, "evas", c_evas, 0);
+	rb_define_method (cEcoreEvas, "evas", c_evas_get, 0);
+	rb_define_method (cEcoreEvas, "geometry", c_geometry_get, 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);
@@ -365,6 +413,25 @@ void Init_EcoreEvas (void)
 	rb_define_method (cEcoreEvas, "rotation", c_rotation_get, 0);
 	rb_define_method (cEcoreEvas, "rotation=", c_rotation_set, 1);
 
+	CALLBACK_ADD (cEcoreEvas, resize);
+	CALLBACK_ADD (cEcoreEvas, move);
+	CALLBACK_ADD (cEcoreEvas, show);
+	CALLBACK_ADD (cEcoreEvas, hide);
+	CALLBACK_ADD (cEcoreEvas, delete_request);
+	CALLBACK_ADD (cEcoreEvas, destroy);
+	CALLBACK_ADD (cEcoreEvas, focus_in);
+	CALLBACK_ADD (cEcoreEvas, focus_out);
+	CALLBACK_ADD (cEcoreEvas, mouse_in);
+	CALLBACK_ADD (cEcoreEvas, mouse_out);
+	CALLBACK_ADD (cEcoreEvas, pre_render);
+	CALLBACK_ADD (cEcoreEvas, post_render);
+
 	evases = rb_hash_new ();
 	rb_global_variable (&evases);
+
+	objects = rb_hash_new ();
+	rb_global_variable (&objects);
+
+	callbacks = rb_hash_new ();
+	rb_global_variable (&callbacks);
 }
diff --git a/src/ecore_evas/rb_fb.c b/src/ecore_evas/rb_fb.c
index b5c262b..8359ef2 100644
--- a/src/ecore_evas/rb_fb.c
+++ b/src/ecore_evas/rb_fb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_fb.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_fb.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -70,7 +70,7 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 
 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_singleton_method (c, "new", c_new, -1);
 }
diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index de65a73..274230e 100644
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_gl_x11.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_gl_x11.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -64,7 +64,7 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 
 void Init_GlX11 (void)
 {
-	VALUE cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
+	VALUE c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
 
-	rb_define_singleton_method (cGlX11, "new", c_new, -1);
+	rb_define_singleton_method (c, "new", c_new, -1);
 }
diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index d61c66f..055c17e 100644
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_software_x11.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_software_x11.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -23,9 +23,13 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 
+#include "../ecore/rb_ecore.h"
+#include "../ecore_x/rb_window.h"
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
+static VALUE windows;
+
 static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
 	VALUE self, disp, parent, geom[4];
@@ -62,11 +66,33 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 	return self;
 }
 
+static VALUE c_window_get (VALUE self)
+{
+	VALUE o;
+	Ecore_X_Window w;
+
+	GET_OBJ (self, Ecore_Evas *, ee);
+
+	if (NIL_P (o = rb_hash_aref (windows, INT2NUM ((long) (ee))))) {
+		w = ecore_evas_software_x11_window_get (*ee);
+		o = TO_ECORE_X_WINDOW (self, w);
+		rb_hash_aset (windows, INT2NUM ((long) ee), o);
+	}
+
+	return o;
+}
+
 void Init_SoftwareX11 (void)
 {
-	VALUE cSoftwareX11 = rb_define_class_under (mEvas,
-	                                            "SoftwareX11",
-	                                            cEcoreEvas);
+	VALUE c;
+
+	rb_require ("ecore_x");
+
+	c = rb_define_class_under (mEvas, "SoftwareX11", cEcoreEvas);
+
+	rb_define_singleton_method (c, "new", c_new, -1);
+	rb_define_method (c, "window", c_window_get, 0);
 
-	rb_define_singleton_method (cSoftwareX11, "new", c_new, -1);
+	windows = rb_hash_new ();
+	rb_global_variable (&windows);
 }
diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index e0b1691..0ef669b 100644
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_job.c 27 2004-07-08 18:25:05Z tilman $
+ * $Id: rb_job.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,8 +32,6 @@ typedef struct {
 	bool deleted;
 } RbEcoreJob;
 
-static VALUE cJob;
-
 static void on_job (void *data)
 {
 	RbEcoreJob *job = data;
@@ -91,9 +89,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Job (void)
 {
-	cJob = rb_define_class_under (mJob, "Job", rb_cObject);
+	VALUE c = rb_define_class_under (mJob, "Job", rb_cObject);
 
-	rb_define_singleton_method (cJob, "new", c_new, 0);
-	rb_define_method (cJob, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 0);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-