From 2f0a58839f94493eae629ae5bf45f50bfcd9fa0e Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue, 14 Feb 2006 19:02:53 +0000
Subject: [PATCH 01/16] Removed an unused variable.

---
 src/ecore/rb_event_handler.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 8e73129..f296ae2 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 359 2006-02-12 15:51:58Z tilman $
+ * $Id: rb_event_handler.c 363 2006-02-14 19:02:53Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -131,7 +131,6 @@ static int on_ecore_event (void *data, int type, void *event)
 	RbEventHandler *h = NULL;
 	VALUE handler, klass, obj, tmp, res;
 	int handler_type, len, i;
-	bool called = false;
 
 	/* instantiate the event object
 	 * first, find the class we're gonna use
@@ -154,7 +153,6 @@ static int on_ecore_event (void *data, int type, void *event)
 		if (handler_type == type) {
 			Data_Get_Struct (handler, RbEventHandler, h);
 			res = rb_funcall (h->callback, rb_intern ("call"), 1, obj);
-			called = true;
 
 			/* if the block returned false, don't call the other
 			 * event handlers
-- 
2.30.2


From efd95201fd9c368eef6a4986e7c3bfe260da7e2c Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue, 14 Feb 2006 19:06:43 +0000
Subject: [PATCH 02/16] Reworked on_ecore_event().

If one event handler's block returns false, don't call neither the other
C handlers nor the other Ruby handlers.
---
 src/ecore/rb_event_handler.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index f296ae2..a360ef7 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 363 2006-02-14 19:02:53Z tilman $
+ * $Id: rb_event_handler.c 364 2006-02-14 19:06:43Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -130,7 +130,7 @@ static int on_ecore_event (void *data, int type, void *event)
 {
 	RbEventHandler *h = NULL;
 	VALUE handler, klass, obj, tmp, res;
-	int handler_type, len, i;
+	int handler_type, len, ret = 1, i;
 
 	/* instantiate the event object
 	 * first, find the class we're gonna use
@@ -157,13 +157,14 @@ static int on_ecore_event (void *data, int type, void *event)
 			/* if the block returned false, don't call the other
 			 * event handlers
 			 */
-			if (res == Qfalse)
+			if (res == Qfalse) {
+				ret = 0;
 				break;
+			}
 		}
 	}
 
-	/* call other event handlers, too */
-	return 1;
+	return ret;
 }
 
 VALUE c_ev_generic_init (VALUE self, VALUE event)
-- 
2.30.2


From 4f2835571a13e31777b36def3056547b997e0599 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue, 14 Feb 2006 21:50:47 +0000
Subject: [PATCH 03/16] Reworked event handling.

---
 src/ecore/rb_ecore.c         | 43 +++++-----------------------
 src/ecore/rb_event_handler.c | 54 +++++++++++++++++++++++++++---------
 src/ecore/rb_event_handler.h | 15 ++++++----
 src/ecore_con/rb_server.c    |  8 +++---
 src/ecore_x/rb_ecore_x.c     | 42 ++++++++++++++--------------
 5 files changed, 82 insertions(+), 80 deletions(-)

diff --git a/src/ecore/rb_ecore.c b/src/ecore/rb_ecore.c
index 345ce0b..06fa0bb 100644
--- a/src/ecore/rb_ecore.c
+++ b/src/ecore/rb_ecore.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore.c 361 2006-02-13 22:37:49Z tilman $
+ * $Id: rb_ecore.c 365 2006-02-14 21:50:47Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -77,30 +77,6 @@ static VALUE m_time_get (VALUE self)
 	return rb_float_new (ecore_time_get ());
 }
 
-static VALUE m_new_event_type (VALUE self, VALUE klass)
-{
-	VALUE num;
-
-	num = INT2NUM (ecore_event_type_new());
-	rb_hash_aset (event_classes, num, klass);
-
-	return num;
-}
-
-static void free_ruby_event (void *data, void *event)
-{
-	/* do nothing */
-}
-
-static VALUE m_add_event (VALUE self, VALUE type, VALUE event)
-{
-	Check_Type (type, T_FIXNUM);
-
-	ecore_event_add (FIX2INT (type), (void *) event, free_ruby_event, NULL);
-
-	return Qnil;
-}
-
 #if 0
 static VALUE c_ev_exe_exit_init (VALUE self, VALUE event)
 {
@@ -183,9 +159,6 @@ void Init_ecore (void)
 	rb_define_module_function (mEcore, "main_loop_quit",
 	                           m_main_loop_quit, 0);
 	rb_define_module_function (mEcore, "time", m_time_get, 0);
-	rb_define_module_function (mEcore, "new_event_type",
-	                           m_new_event_type, 1);
-	rb_define_module_function (mEcore, "add_event", m_add_event, 2);
 
 	Init_Timer ();
 	Init_Animator ();
@@ -195,33 +168,31 @@ void Init_ecore (void)
 	Init_FdHandler ();
 
 	/* SIGNAL_HUP */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_HUP,
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_HUP,
 	           "SignalHup", c);
-	rb_define_private_method (c, "initialize", c_ev_generic_init, 1);
 
 	/* SIGNAL_POWER */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_POWER,
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_POWER,
 	           "SignalPower", c);
-	rb_define_private_method (c, "initialize", c_ev_generic_init, 1);
 
 #if 0
 	/* EXE_EXIT */
-	ADD_EVENT (mEcore, ECORE_EVENT_, EXE_EXIT, "ExeExit", c);
+	ADD_EVENT (mEcore, ECORE_EVENT_EXE_EXIT, "ExeExit", c);
 	rb_define_private_method (c, "initialize", c_ev_exe_exit_init, 1);
 #endif
 
 	/* SIGNAL_USER */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_USER,
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_USER,
 	           "SignalUser", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_user_init, 1);
 
 	/* SIGNAL_EXIT */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_EXIT,
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_EXIT,
 	           "SignalExit", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_exit_init, 1);
 
 	/* SIGNAL_REALTIME */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_REALTIME,
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_REALTIME,
 	           "SignalRealtime", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_rt_init, 1);
 }
diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index a360ef7..5dabfe7 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 364 2006-02-14 19:06:43Z tilman $
+ * $Id: rb_event_handler.c 365 2006-02-14 21:50:47Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -29,11 +29,13 @@
 
 typedef struct {
 	Ecore_Event_Handler *real;
+	int type;
 	VALUE callback;
 	bool deleted;
 } RbEventHandler;
 
 static int on_ecore_event (void *data, int type, void *event);
+static VALUE c_ev_raise (VALUE klass, VALUE event);
 
 VALUE event_classes, cEcoreEvent;
 static VALUE handlers;
@@ -87,13 +89,14 @@ static VALUE c_init (VALUE self, VALUE type)
 
 	Data_Get_Struct (self, RbEventHandler, h);
 
-	t = NUM2INT (type);
+	if (rb_obj_is_kind_of (type, rb_cModule) != Qtrue)
+		rb_raise (rb_eArgError, "invalid argument");
 
+	t = NUM2INT (rb_const_get (type, rb_intern ("TYPE")));
 	if (t <= ECORE_EVENT_NONE)
 		rb_raise (rb_eStandardError, "invalid type");
 
-	rb_iv_set (self, "@type", type);
-
+	h->type = t;
 	h->callback = rb_block_proc ();
 	h->deleted = false;
 	h->real = ecore_event_handler_add (t, on_ecore_event, NULL);
@@ -130,7 +133,7 @@ static int on_ecore_event (void *data, int type, void *event)
 {
 	RbEventHandler *h = NULL;
 	VALUE handler, klass, obj, tmp, res;
-	int handler_type, len, ret = 1, i;
+	int len, ret = 1, i;
 
 	/* instantiate the event object
 	 * first, find the class we're gonna use
@@ -148,10 +151,9 @@ static int on_ecore_event (void *data, int type, void *event)
 
 	for (i = 0; i < len; i++) {
 		handler = rb_ary_entry (handlers, i);
-		handler_type = NUM2INT (rb_iv_get (handler, "@type"));
+		Data_Get_Struct (handler, RbEventHandler, h);
 
-		if (handler_type == type) {
-			Data_Get_Struct (handler, RbEventHandler, h);
+		if (h->type == type) {
 			res = rb_funcall (h->callback, rb_intern ("call"), 1, obj);
 
 			/* if the block returned false, don't call the other
@@ -167,10 +169,37 @@ static int on_ecore_event (void *data, int type, void *event)
 	return ret;
 }
 
-VALUE c_ev_generic_init (VALUE self, VALUE event)
+VALUE c_ev_inherited (VALUE klass, VALUE child)
 {
-	/* dummy */
-	return self;
+	VALUE t;
+
+	t = INT2FIX (ecore_event_type_new ());
+	rb_hash_aset (event_classes, t, child);
+
+	rb_define_const (child, "TYPE", t);
+	rb_define_singleton_method (child, "raise", c_ev_raise, 1);
+
+	return Qnil;
+}
+
+VALUE c_ev_inherited_noop (VALUE klass, VALUE child)
+{
+	return Qnil;
+}
+
+static void free_ruby_event (void *data, void *event)
+{
+	/* do nothing */
+}
+
+static VALUE c_ev_raise (VALUE klass, VALUE event)
+{
+	VALUE t;
+
+	t = rb_const_get (klass, rb_intern ("TYPE"));
+	ecore_event_add (FIX2INT (t), (void *) event, free_ruby_event, NULL);
+
+	return Qnil;
 }
 
 void Init_EventHandler (void)
@@ -192,6 +221,5 @@ void Init_EventHandler (void)
 
 	/* define a base event class */
 	cEcoreEvent = rb_define_class_under (mEcore, "Event", rb_cObject);
-	rb_define_private_method (rb_singleton_class (cEcoreEvent),
-	                          "new", NULL, 0);
+	rb_define_singleton_method (cEcoreEvent, "inherited", c_ev_inherited, 1);
 }
diff --git a/src/ecore/rb_event_handler.h b/src/ecore/rb_event_handler.h
index 1c40153..b9d56a8 100644
--- a/src/ecore/rb_event_handler.h
+++ b/src/ecore/rb_event_handler.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.h 343 2005-05-07 20:22:56Z tilman $
+ * $Id: rb_event_handler.h 365 2006-02-14 21:50:47Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -21,19 +21,22 @@
 #ifndef __RB_EVENT_HANDLER_H
 #define __RB_EVENT_HANDLER_H
 
-#define ADD_EVENT(mod, prefix, constname, clsname, obj) \
-	rb_define_const ((mod), #constname, \
-	                 INT2FIX (prefix##constname)); \
+#define ADD_EVENT(mod, constname, clsname, obj) \
+	rb_define_singleton_method (cEcoreEvent, "inherited", \
+	                            c_ev_inherited_noop, 1); \
 \
 	(obj) = rb_define_class_under ((mod), (clsname), cEcoreEvent); \
 	rb_define_private_method (rb_singleton_class ((obj)), \
 	                          "new", NULL, 0); \
 \
-	rb_hash_aset (event_classes, INT2FIX (prefix##constname), (obj));
+	rb_define_const ((obj), "TYPE", INT2FIX (constname)); \
+	rb_hash_aset (event_classes, INT2FIX (constname), (obj)); \
+	rb_define_singleton_method (cEcoreEvent, "inherited", c_ev_inherited, 1);
 
 void Init_EventHandler (void);
 
-VALUE c_ev_generic_init (VALUE self, VALUE event);
+VALUE c_ev_inherited (VALUE klass, VALUE child);
+VALUE c_ev_inherited_noop (VALUE klass, VALUE child);
 
 #ifndef __RB_EVENT_HANDLER_C
 extern VALUE event_classes, cEcoreEvent;
diff --git a/src/ecore_con/rb_server.c b/src/ecore_con/rb_server.c
index d267350..20a95df 100644
--- a/src/ecore_con/rb_server.c
+++ b/src/ecore_con/rb_server.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_server.c 362 2006-02-13 22:46:35Z tilman $
+ * $Id: rb_server.c 365 2006-02-14 21:50:47Z tilman $
  *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
@@ -179,15 +179,15 @@ void Init_Server (VALUE m)
 	rb_define_alias (c, "<<", "write");
 	rb_define_method (c, "delete", c_delete, 0);
 
-	ADD_EVENT (m, ECORE_CON_EVENT_, SERVER_ADD, "ServerAdd", c);
+	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_ADD, "ServerAdd", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_server_add_init, 1);
 
-	ADD_EVENT (m, ECORE_CON_EVENT_, SERVER_DATA, "ServerData", c);
+	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_DATA, "ServerData", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_server_data_init, 1);
 
-	ADD_EVENT (m, ECORE_CON_EVENT_, SERVER_DEL, "ServerDel", c);
+	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_DEL, "ServerDel", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_server_del_init, 1);
 }
diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index 766b39a..69520a3 100644
--- a/src/ecore_x/rb_ecore_x.c
+++ b/src/ecore_x/rb_ecore_x.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_x.c 101 2004-08-27 23:56:26Z tilman $
+ * $Id: rb_ecore_x.c 365 2006-02-14 21:50:47Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -456,92 +456,92 @@ void Init_ecore_x (void)
 	DEF_CONST (c, ECORE_X_MODIFIER_, WIN);
 
 	/* events */
-	ADD_EVENT (mX, ECORE_X_EVENT_, KEY_DOWN, "KeyDown", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_KEY_DOWN, "KeyDown", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_key_down_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, KEY_UP, "KeyUp", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_KEY_UP, "KeyUp", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_key_down_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_BUTTON_DOWN,
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
 	           "MouseButtonDown", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_button_down_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_BUTTON_UP,
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_BUTTON_UP,
 	           "MouseButtonUp", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_button_up_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_MOVE, "MouseMove", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_MOVE, "MouseMove", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_move_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_IN, "MouseIn", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_IN, "MouseIn", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_in_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_OUT, "MouseOut", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_OUT, "MouseOut", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_in_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_FOCUS_IN,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_FOCUS_IN,
 	           "WindowFocusIn", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_focus_change_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_FOCUS_OUT,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_FOCUS_OUT,
 	           "WindowFocusOut", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_focus_change_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DELETE_REQUEST,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DELETE_REQUEST,
 	           "WindowDeleteRequest", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE_REQUEST,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST,
 	           "WindowConfigureRequest", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_configure_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CONFIGURE,
 	           "WindowConfigure", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_configure_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_RESIZE_REQUEST,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_RESIZE_REQUEST,
 	           "WindowResizeRequest", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_resize_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DAMAGE, "WindowDamage", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DAMAGE, "WindowDamage", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_damage_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_VISIBILITY_CHANGE,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE,
 	           "WindowVisibilityChange", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_visibility_change_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CREATE, "WindowCreate", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CREATE, "WindowCreate", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_create_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DESTROY, "WindowDestroy", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DESTROY, "WindowDestroy", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_SHOW, "WindowShow", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW, "WindowShow", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_HIDE, "WindowHide", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_HIDE, "WindowHide", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_SHOW_REQUEST,
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW_REQUEST,
 	           "WindowShowRequest", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_show_request_init, 1);
-- 
2.30.2


From 4bd5752ec9ffb1bb45abc77a5461b6e386b4acf4 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue, 14 Feb 2006 21:53:15 +0000
Subject: [PATCH 04/16] Tweaked event names.

---
 src/ecore/rb_ecore.c      | 14 ++++++-------
 src/ecore_con/rb_server.c |  8 ++++----
 src/ecore_x/rb_ecore_x.c  | 42 +++++++++++++++++++--------------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/ecore/rb_ecore.c b/src/ecore/rb_ecore.c
index 06fa0bb..9aea96f 100644
--- a/src/ecore/rb_ecore.c
+++ b/src/ecore/rb_ecore.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore.c 365 2006-02-14 21:50:47Z tilman $
+ * $Id: rb_ecore.c 366 2006-02-14 21:53:15Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -169,31 +169,31 @@ void Init_ecore (void)
 
 	/* SIGNAL_HUP */
 	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_HUP,
-	           "SignalHup", c);
+	           "SignalHupEvent", c);
 
 	/* SIGNAL_POWER */
 	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_POWER,
-	           "SignalPower", c);
+	           "SignalPowerEvent", c);
 
 #if 0
 	/* EXE_EXIT */
-	ADD_EVENT (mEcore, ECORE_EVENT_EXE_EXIT, "ExeExit", c);
+	ADD_EVENT (mEcore, ECORE_EVENT_EXE_EXIT, "ExeExitEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_exe_exit_init, 1);
 #endif
 
 	/* SIGNAL_USER */
 	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_USER,
-	           "SignalUser", c);
+	           "SignalUserEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_user_init, 1);
 
 	/* SIGNAL_EXIT */
 	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_EXIT,
-	           "SignalExit", c);
+	           "SignalExitEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_exit_init, 1);
 
 	/* SIGNAL_REALTIME */
 	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_REALTIME,
-	           "SignalRealtime", c);
+	           "SignalRealtimeEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_rt_init, 1);
 }
 
diff --git a/src/ecore_con/rb_server.c b/src/ecore_con/rb_server.c
index 20a95df..089754f 100644
--- a/src/ecore_con/rb_server.c
+++ b/src/ecore_con/rb_server.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_server.c 365 2006-02-14 21:50:47Z tilman $
+ * $Id: rb_server.c 366 2006-02-14 21:53:15Z tilman $
  *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
@@ -179,15 +179,15 @@ void Init_Server (VALUE m)
 	rb_define_alias (c, "<<", "write");
 	rb_define_method (c, "delete", c_delete, 0);
 
-	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_ADD, "ServerAdd", c);
+	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_ADD, "ServerAddEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_server_add_init, 1);
 
-	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_DATA, "ServerData", c);
+	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_DATA, "ServerDataEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_server_data_init, 1);
 
-	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_DEL, "ServerDel", c);
+	ADD_EVENT (m, ECORE_CON_EVENT_SERVER_DEL, "ServerDelEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_server_del_init, 1);
 }
diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index 69520a3..6881ed8 100644
--- a/src/ecore_x/rb_ecore_x.c
+++ b/src/ecore_x/rb_ecore_x.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_x.c 365 2006-02-14 21:50:47Z tilman $
+ * $Id: rb_ecore_x.c 366 2006-02-14 21:53:15Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -456,93 +456,93 @@ void Init_ecore_x (void)
 	DEF_CONST (c, ECORE_X_MODIFIER_, WIN);
 
 	/* events */
-	ADD_EVENT (mX, ECORE_X_EVENT_KEY_DOWN, "KeyDown", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_KEY_DOWN, "KeyDownEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_key_down_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_KEY_UP, "KeyUp", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_KEY_UP, "KeyUpEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_key_down_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
-	           "MouseButtonDown", c);
+	           "MouseButtonDownEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_button_down_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_BUTTON_UP,
-	           "MouseButtonUp", c);
+	           "MouseButtonUpEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_button_up_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_MOVE, "MouseMove", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_MOVE, "MouseMoveEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_move_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_IN, "MouseIn", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_IN, "MouseInEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_in_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_OUT, "MouseOut", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_OUT, "MouseOutEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_in_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_FOCUS_IN,
-	           "WindowFocusIn", c);
+	           "WindowFocusInEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_focus_change_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_FOCUS_OUT,
-	           "WindowFocusOut", c);
+	           "WindowFocusOutEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_focus_change_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DELETE_REQUEST,
-	           "WindowDeleteRequest", c);
+	           "WindowDeleteRequestEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST,
-	           "WindowConfigureRequest", c);
+	           "WindowConfigureRequestEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_configure_request_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CONFIGURE,
-	           "WindowConfigure", c);
+	           "WindowConfigureEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_configure_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_RESIZE_REQUEST,
-	           "WindowResizeRequest", c);
+	           "WindowResizeRequestEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_resize_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DAMAGE, "WindowDamage", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DAMAGE, "WindowDamageEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_damage_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE,
-	           "WindowVisibilityChange", c);
+	           "WindowVisibilityChangeEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_visibility_change_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CREATE, "WindowCreate", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CREATE, "WindowCreateEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_create_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DESTROY, "WindowDestroy", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DESTROY, "WindowDestroyEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW, "WindowShow", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW, "WindowShowEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
-	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_HIDE, "WindowHide", c);
+	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_HIDE, "WindowHideEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_delete_request_init, 1);
 
 	ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW_REQUEST,
-	           "WindowShowRequest", c);
+	           "WindowShowRequestEvent", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_show_request_init, 1);
 }
-- 
2.30.2


From da60033d0c34fe073a29d927e7b0d20538818af3 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue, 14 Feb 2006 22:20:14 +0000
Subject: [PATCH 05/16] More event system tweaks.

---
 src/ecore/rb_event_handler.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 5dabfe7..4dd45ce 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 365 2006-02-14 21:50:47Z tilman $
+ * $Id: rb_event_handler.c 367 2006-02-14 22:20:14Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -35,7 +35,7 @@ typedef struct {
 } RbEventHandler;
 
 static int on_ecore_event (void *data, int type, void *event);
-static VALUE c_ev_raise (VALUE klass, VALUE event);
+static VALUE c_ev_raise (VALUE klass, VALUE argv);
 
 VALUE event_classes, cEcoreEvent;
 static VALUE handlers;
@@ -145,7 +145,16 @@ static int on_ecore_event (void *data, int type, void *event)
 
 	/* now create and init the object */
 	tmp = (VALUE) event;
-	obj = rb_class_new_instance (1, &tmp, klass);
+
+	/* if tmp is a Ruby class, we'll just pass the arguments to the
+	 * initialize method.
+	 * if it's a c struct, we can use rb_class_new_instance()
+	 */
+	if (rb_respond_to (klass, rb_intern ("raise"))) {
+		obj = rb_obj_alloc (klass);
+		rb_apply (obj, rb_intern ("initialize"), tmp);
+	} else
+		obj = rb_class_new_instance (1, &tmp, klass);
 
 	len = RARRAY (handlers)->len;
 
@@ -177,11 +186,16 @@ VALUE c_ev_inherited (VALUE klass, VALUE child)
 	rb_hash_aset (event_classes, t, child);
 
 	rb_define_const (child, "TYPE", t);
-	rb_define_singleton_method (child, "raise", c_ev_raise, 1);
+	rb_define_singleton_method (child, "raise", c_ev_raise, -2);
 
 	return Qnil;
 }
 
+static VALUE c_ev_init (int argc, VALUE *argv, VALUE self)
+{
+	return self;
+}
+
 VALUE c_ev_inherited_noop (VALUE klass, VALUE child)
 {
 	return Qnil;
@@ -192,12 +206,12 @@ static void free_ruby_event (void *data, void *event)
 	/* do nothing */
 }
 
-static VALUE c_ev_raise (VALUE klass, VALUE event)
+static VALUE c_ev_raise (VALUE klass, VALUE argv)
 {
 	VALUE t;
 
 	t = rb_const_get (klass, rb_intern ("TYPE"));
-	ecore_event_add (FIX2INT (t), (void *) event, free_ruby_event, NULL);
+	ecore_event_add (FIX2INT (t), (void *) argv, free_ruby_event, NULL);
 
 	return Qnil;
 }
@@ -222,4 +236,5 @@ void Init_EventHandler (void)
 	/* define a base event class */
 	cEcoreEvent = rb_define_class_under (mEcore, "Event", rb_cObject);
 	rb_define_singleton_method (cEcoreEvent, "inherited", c_ev_inherited, 1);
+	rb_define_method (cEcoreEvent, "initialize", c_ev_init, -1);
 }
-- 
2.30.2


From 3c4e4d849820f3b70c237ee2ef2ff33805b22ab6 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 15 Feb 2006 18:39:12 +0000
Subject: [PATCH 06/16] Tweaked event/callback system.

---
 src/ecore_evas/rb_ecore_evas.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index 1e08533..10cbdcb 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 353 2006-02-10 17:00:24Z tilman $
+ * $Id: rb_ecore_evas.c 371 2006-02-15 18:39:12Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -35,14 +35,14 @@
 #define CALLBACK_DEFINE_HANDLER(name) \
 	static void on_##name (Ecore_Evas *real) \
 	{ \
-		VALUE self; \
-		VALUE cb; \
+		VALUE self, cb; \
 \
 		self = (VALUE) ecore_evas_data_get (real, \
 		                                    RUBY_ECORE_EVAS_KEY); \
 		GET_OBJ (self, RbEcoreEvas, ee); \
 \
-		cb = rb_hash_aref (ee->callbacks, rb_str_new2 (#name)); \
+		cb = rb_hash_aref (ee->callbacks, \
+		                   LONG2NUM ((long) ecore_evas_callback_##name##_set)); \
 		rb_funcall (cb, rb_intern ("call"), 0); \
 	} \
 
@@ -55,7 +55,8 @@
 		if (NIL_P (ee->callbacks)) \
 			ee->callbacks = rb_hash_new (); \
 \
-		rb_hash_aset (ee->callbacks, rb_str_new2 (#name), \
+		rb_hash_aset (ee->callbacks, \
+		              LONG2NUM ((long) ecore_evas_callback_##name##_set), \
 		              rb_block_proc ()); \
 \
 		ecore_evas_callback_##name##_set (ee->real, on_##name); \
-- 
2.30.2


From 6c769aac08caf234bbff82cca822d8f209283bbe Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu, 16 Feb 2006 20:39:55 +0000
Subject: [PATCH 07/16] Reworked ADD_EVENT() wrt handling of the inherited
 method.

In that macro, we now remove Ecore#EventHandler.inherited temporarily
when defining C event classes rather than overriding the method.
---
 src/ecore/rb_event_handler.c | 7 +------
 src/ecore/rb_event_handler.h | 6 ++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 4dd45ce..18e2fc7 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 367 2006-02-14 22:20:14Z tilman $
+ * $Id: rb_event_handler.c 372 2006-02-16 20:39:55Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -196,11 +196,6 @@ static VALUE c_ev_init (int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
-VALUE c_ev_inherited_noop (VALUE klass, VALUE child)
-{
-	return Qnil;
-}
-
 static void free_ruby_event (void *data, void *event)
 {
 	/* do nothing */
diff --git a/src/ecore/rb_event_handler.h b/src/ecore/rb_event_handler.h
index b9d56a8..34df332 100644
--- a/src/ecore/rb_event_handler.h
+++ b/src/ecore/rb_event_handler.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.h 365 2006-02-14 21:50:47Z tilman $
+ * $Id: rb_event_handler.h 372 2006-02-16 20:39:55Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -22,8 +22,7 @@
 #define __RB_EVENT_HANDLER_H
 
 #define ADD_EVENT(mod, constname, clsname, obj) \
-	rb_define_singleton_method (cEcoreEvent, "inherited", \
-	                            c_ev_inherited_noop, 1); \
+	rb_remove_method (rb_singleton_class (cEcoreEvent), "inherited"); \
 \
 	(obj) = rb_define_class_under ((mod), (clsname), cEcoreEvent); \
 	rb_define_private_method (rb_singleton_class ((obj)), \
@@ -36,7 +35,6 @@
 void Init_EventHandler (void);
 
 VALUE c_ev_inherited (VALUE klass, VALUE child);
-VALUE c_ev_inherited_noop (VALUE klass, VALUE child);
 
 #ifndef __RB_EVENT_HANDLER_C
 extern VALUE event_classes, cEcoreEvent;
-- 
2.30.2


From 5466e8806f4496694a95033f548763ca771d5045 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu, 16 Feb 2006 21:37:43 +0000
Subject: [PATCH 08/16] Event system tweaks.

---
 src/ecore/rb_event_handler.c | 129 ++++++++++-------------------------
 1 file changed, 37 insertions(+), 92 deletions(-)

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 18e2fc7..39e2521 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 372 2006-02-16 20:39:55Z tilman $
+ * $Id: rb_event_handler.c 373 2006-02-16 21:37:43Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -29,7 +29,7 @@
 
 typedef struct {
 	Ecore_Event_Handler *real;
-	int type;
+	VALUE event_class;
 	VALUE callback;
 	bool deleted;
 } RbEventHandler;
@@ -38,7 +38,7 @@ static int on_ecore_event (void *data, int type, void *event);
 static VALUE c_ev_raise (VALUE klass, VALUE argv);
 
 VALUE event_classes, cEcoreEvent;
-static VALUE handlers;
+static VALUE event_args;
 
 static void c_mark (RbEventHandler *h)
 {
@@ -47,27 +47,8 @@ static void c_mark (RbEventHandler *h)
 
 static void c_free (RbEventHandler *h)
 {
-	RbEventHandler *h2 = NULL;
-	int len = RARRAY (handlers)->len, i;
-	VALUE el;
-
-	if (!h->real || h->deleted) {
-		free (h);
-		return;
-	}
-
-	for (i = 0; i < len; i++) {
-		el = rb_ary_shift (handlers);
-
-		Data_Get_Struct (el, RbEventHandler, h2);
-
-		if (h == h2) {
-			ecore_event_handler_del (h->real);
-			break;
-		}
-
-		rb_ary_push (handlers, el);
-	}
+	if (h->real && !h->deleted)
+		ecore_event_handler_del (h->real);
 
 	free (h);
 }
@@ -79,7 +60,7 @@ static VALUE c_alloc (VALUE klass)
 	return Data_Make_Struct (klass, RbEventHandler, c_mark, c_free, h);
 }
 
-static VALUE c_init (VALUE self, VALUE type)
+static VALUE c_init (VALUE self, VALUE klass)
 {
 	RbEventHandler *h = NULL;
 	int t;
@@ -89,19 +70,17 @@ static VALUE c_init (VALUE self, VALUE type)
 
 	Data_Get_Struct (self, RbEventHandler, h);
 
-	if (rb_obj_is_kind_of (type, rb_cModule) != Qtrue)
+	if (rb_obj_is_kind_of (klass, rb_cModule) != Qtrue)
 		rb_raise (rb_eArgError, "invalid argument");
 
-	t = NUM2INT (rb_const_get (type, rb_intern ("TYPE")));
+	t = NUM2INT (rb_const_get (klass, rb_intern ("TYPE")));
 	if (t <= ECORE_EVENT_NONE)
-		rb_raise (rb_eStandardError, "invalid type");
+		rb_raise (rb_eStandardError, "invalid event");
 
-	h->type = t;
+	h->event_class = klass;
 	h->callback = rb_block_proc ();
 	h->deleted = false;
-	h->real = ecore_event_handler_add (t, on_ecore_event, NULL);
-
-	rb_ary_push (handlers, self);
+	h->real = ecore_event_handler_add (t, on_ecore_event, h);
 
 	return self;
 }
@@ -109,73 +88,37 @@ static VALUE c_init (VALUE self, VALUE type)
 static VALUE c_delete (VALUE self)
 {
 	RbEventHandler *h = NULL;
-	int len = RARRAY (handlers)->len, i;
-	VALUE el;
 
-	for (i = 0; i < len; i++) {
-		el = rb_ary_shift (handlers);
-		if (el == self) {
-			Data_Get_Struct (self, RbEventHandler, h);
-			ecore_event_handler_del (h->real);
-			h->real = NULL;
-			h->deleted = true;
-
-			break;
-		}
+	Data_Get_Struct (self, RbEventHandler, h);
 
-		rb_ary_push (handlers, el);
-	}
+	if (h->real && !h->deleted) {
+		ecore_event_handler_del (h->real);
+		h->real = NULL;
+		h->deleted = true;
+	} else
+		rb_raise (rb_eException, "EventHandler already deleted!");
 
 	return Qnil;
 }
 
 static int on_ecore_event (void *data, int type, void *event)
 {
-	RbEventHandler *h = NULL;
-	VALUE handler, klass, obj, tmp, res;
-	int len, ret = 1, i;
+	RbEventHandler *h = data;
+	VALUE obj, tmp = (VALUE) event;
 
-	/* instantiate the event object
-	 * first, find the class we're gonna use
-	 */
-	klass = rb_hash_aref (event_classes, INT2NUM (type));
-	if (NIL_P (klass))
-		rb_raise (rb_eException, "Cannot find event class "
-		                         "for event %i\n", type);
+	obj = rb_obj_alloc (h->event_class);
 
-	/* now create and init the object */
-	tmp = (VALUE) event;
-
-	/* if tmp is a Ruby class, we'll just pass the arguments to the
-	 * initialize method.
-	 * if it's a c struct, we can use rb_class_new_instance()
-	 */
-	if (rb_respond_to (klass, rb_intern ("raise"))) {
-		obj = rb_obj_alloc (klass);
+	if (rb_respond_to (h->event_class, rb_intern ("raise")))
 		rb_apply (obj, rb_intern ("initialize"), tmp);
-	} else
-		obj = rb_class_new_instance (1, &tmp, klass);
-
-	len = RARRAY (handlers)->len;
-
-	for (i = 0; i < len; i++) {
-		handler = rb_ary_entry (handlers, i);
-		Data_Get_Struct (handler, RbEventHandler, h);
+	else
+		rb_obj_call_init (obj, 1, &tmp);
 
-		if (h->type == type) {
-			res = rb_funcall (h->callback, rb_intern ("call"), 1, obj);
+	tmp = rb_funcall (h->callback, rb_intern ("call"), 1, obj);
 
-			/* if the block returned false, don't call the other
-			 * event handlers
-			 */
-			if (res == Qfalse) {
-				ret = 0;
-				break;
-			}
-		}
-	}
-
-	return ret;
+	/* if the block returned false, don't call the other
+	 * event handlers
+	 */
+	return (tmp != Qfalse);
 }
 
 VALUE c_ev_inherited (VALUE klass, VALUE child)
@@ -196,17 +139,19 @@ static VALUE c_ev_init (int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
-static void free_ruby_event (void *data, void *event)
+static void free_event_args (void *data, void *argv)
 {
-	/* do nothing */
+	rb_ary_delete (event_args, (VALUE) argv);
 }
 
 static VALUE c_ev_raise (VALUE klass, VALUE argv)
 {
 	VALUE t;
 
+	rb_ary_push (event_args, argv);
+
 	t = rb_const_get (klass, rb_intern ("TYPE"));
-	ecore_event_add (FIX2INT (t), (void *) argv, free_ruby_event, NULL);
+	ecore_event_add (FIX2INT (t), (void *) argv, free_event_args, NULL);
 
 	return Qnil;
 }
@@ -222,12 +167,12 @@ void Init_EventHandler (void)
 	rb_define_method (cEventHandler, "initialize", c_init, 1);
 	rb_define_method (cEventHandler, "delete", c_delete, 0);
 
-	handlers = rb_ary_new ();
-	rb_global_variable (&handlers);
-
 	event_classes = rb_hash_new ();
 	rb_global_variable (&event_classes);
 
+	event_args = rb_ary_new ();
+	rb_global_variable (&event_args);
+
 	/* define a base event class */
 	cEcoreEvent = rb_define_class_under (mEcore, "Event", rb_cObject);
 	rb_define_singleton_method (cEcoreEvent, "inherited", c_ev_inherited, 1);
-- 
2.30.2


From c2e939cb2a57644fd23db480f44671d6460d39c4 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat, 25 Feb 2006 10:11:45 +0000
Subject: [PATCH 09/16] Create target directories if they don't exist.

---
 Rakefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Rakefile b/Rakefile
index d020227..2e9c318 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# $Id: Rakefile 362 2006-02-13 22:46:35Z tilman $
+# $Id: Rakefile 377 2006-02-25 10:11:45Z tilman $
 
 require "library"
 require "rake/clean"
@@ -33,11 +33,13 @@ task :install => ext_libs.map { |l| l.so } do |t|
 	destdir = "#{ENV["DESTDIR"]}"
 	sitearchdir = ENV["RUBYARCHDIR"] || Config::CONFIG['sitearchdir']
 
-	FileUtils::Verbose.install(t.prerequisites.to_a, destdir + sitearchdir,
+	ddir = destdir + sitearchdir
+	FileUtils::Verbose.mkdir_p(ddir) unless File.directory?(ddir)
+	FileUtils::Verbose.install(t.prerequisites.to_a, ddir,
 	                           :mode => 0755)
 
 	ddir = destdir + sitearchdir + "/ecore"
-	FileUtils::Verbose.mkdir(ddir) unless File.directory?(ddir)
+	FileUtils::Verbose.mkdir_(ddir) unless File.directory?(ddir)
 
 	headers = ["src/ecore_evas/rb_ecore_evas.h",
 	           "src/ecore_x/rb_window.h"]
-- 
2.30.2


From 60f5121448f1e15bc5eea494cda7026921033503 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 2 Apr 2006 21:45:20 +0000
Subject: [PATCH 10/16] Fixed mkdir_p call.

---
 Rakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 2e9c318..d0bb464 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# $Id: Rakefile 377 2006-02-25 10:11:45Z tilman $
+# $Id: Rakefile 379 2006-04-02 21:45:20Z tilman $
 
 require "library"
 require "rake/clean"
@@ -39,7 +39,7 @@ task :install => ext_libs.map { |l| l.so } do |t|
 	                           :mode => 0755)
 
 	ddir = destdir + sitearchdir + "/ecore"
-	FileUtils::Verbose.mkdir_(ddir) unless File.directory?(ddir)
+	FileUtils::Verbose.mkdir_p(ddir) unless File.directory?(ddir)
 
 	headers = ["src/ecore_evas/rb_ecore_evas.h",
 	           "src/ecore_x/rb_window.h"]
-- 
2.30.2


From 45f545180849ddf721711df2469ea12f2ff9990a Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 20 Aug 2006 15:21:14 +0000
Subject: [PATCH 11/16] Added Ecore::Evas::EcoreEvas#iconified? and
 #iconified=.

---
 src/ecore_evas/rb_ecore_evas.c | 35 +++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index 10cbdcb..e51a4f4 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 371 2006-02-15 18:39:12Z tilman $
+ * $Id: rb_ecore_evas.c 385 2006-08-20 15:21:14Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -555,6 +555,37 @@ static VALUE c_name_class_set (VALUE self, VALUE ary)
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *  ee.iconified? => true or false
+ *
+ * Returns true if <i>ee</i> is iconified, else returns false.
+ */
+static VALUE c_iconified_get (VALUE self)
+{
+	GET_OBJ (self, RbEcoreEvas, ee);
+
+	return ecore_evas_iconified_get (ee->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *  ee.iconified(true or false)
+ *
+ * Sets whether <i>ee</i> is iconified or not.
+ */
+static VALUE c_iconified_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbEcoreEvas, ee);
+
+	CHECK_BOOL (val);
+
+	ecore_evas_iconified_set (ee->real, val == Qtrue);
+
+	return Qnil;
+}
+
+
 /* FIXME: this is unsafe!
  * :nodoc:
  */
@@ -750,6 +781,8 @@ void Init_EcoreEvas (void)
 	rb_define_method (cEcoreEvas, "rotation=", c_rotation_set, 1);
 	rb_define_method (cEcoreEvas, "name_class", c_name_class_get, 0);
 	rb_define_method (cEcoreEvas, "name_class=", c_name_class_set, 1);
+	rb_define_method (cEcoreEvas, "iconified?", c_iconified_get, 0);
+	rb_define_method (cEcoreEvas, "iconified=", c_iconified_set, 1);
 
 	rb_define_method (cEcoreEvas, "on_resize", c_on_resize, 0);
 	rb_define_method (cEcoreEvas, "on_move", c_on_move, 0);
-- 
2.30.2


From d907bd016f15dc5be72d12ee1742047eafc2abae Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed, 6 Sep 2006 19:38:45 +0000
Subject: [PATCH 12/16] Added Ecore::Evas::EcoreEvas#has_alpha? and
 #has_alpha=.

---
 src/ecore_evas/rb_ecore_evas.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index e51a4f4..c2d17f0 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 385 2006-08-20 15:21:14Z tilman $
+ * $Id: rb_ecore_evas.c 386 2006-09-06 19:38:45Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -585,6 +585,35 @@ static VALUE c_iconified_set (VALUE self, VALUE val)
 	return Qnil;
 }
 
+/*
+ * call-seq:
+ *  ee.has_alpha? => true or false
+ *
+ * Returns true if <i>ee</i> has an alpha channel, else returns false.
+ */
+static VALUE c_has_alpha_get (VALUE self)
+{
+	GET_OBJ (self, RbEcoreEvas, ee);
+
+	return ecore_evas_alpha_get (ee->real) ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
+ *  ee.has_alpha(true or false)
+ *
+ * Sets whether <i>ee</i> has an alpha channel or not.
+ */
+static VALUE c_has_alpha_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbEcoreEvas, ee);
+
+	CHECK_BOOL (val);
+
+	ecore_evas_alpha_set (ee->real, val == Qtrue);
+
+	return Qnil;
+}
 
 /* FIXME: this is unsafe!
  * :nodoc:
@@ -783,6 +812,8 @@ void Init_EcoreEvas (void)
 	rb_define_method (cEcoreEvas, "name_class=", c_name_class_set, 1);
 	rb_define_method (cEcoreEvas, "iconified?", c_iconified_get, 0);
 	rb_define_method (cEcoreEvas, "iconified=", c_iconified_set, 1);
+	rb_define_method (cEcoreEvas, "has_alpha?", c_has_alpha_get, 0);
+	rb_define_method (cEcoreEvas, "has_alpha=", c_has_alpha_set, 1);
 
 	rb_define_method (cEcoreEvas, "on_resize", c_on_resize, 0);
 	rb_define_method (cEcoreEvas, "on_move", c_on_move, 0);
-- 
2.30.2


From 5c851d60ccd05df625b6ccaf4a425339912a1da3 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat, 11 Nov 2006 11:40:24 +0000
Subject: [PATCH 13/16] Resolve the cWindow reference using Ruby.

---
 src/ecore_evas/rb_ecore_evas_main.c | 9 ++++++++-
 src/ecore_evas/rb_ecore_evas_main.h | 4 ++--
 src/ecore_evas/rb_gl_x11.c          | 4 +---
 src/ecore_evas/rb_software_x11.c    | 4 +---
 src/ecore_evas/rb_xrender_x11.c     | 4 +---
 src/ecore_x/rb_window.c             | 4 ++--
 src/ecore_x/rb_window.h             | 6 +-----
 7 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/ecore_evas/rb_ecore_evas_main.c b/src/ecore_evas/rb_ecore_evas_main.c
index b77925f..abe87af 100644
--- a/src/ecore_evas/rb_ecore_evas_main.c
+++ b/src/ecore_evas/rb_ecore_evas_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_evas_main.c 348 2005-12-24 17:11:24Z tilman $
+ * $Id: rb_ecore_evas_main.c 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004-2005 ruby-ecore team (see AUTHORS)
  *
@@ -33,9 +33,16 @@
 
 void Init_ecore_evas (void)
 {
+	VALUE m;
+
 	rb_require ("ecore");
 	rb_require ("evas");
 
+	rb_require ("ecore_x");
+
+	m = rb_const_get (mEcore, rb_intern ("X"));
+	cWindow = rb_const_get (m, rb_intern ("Window"));
+
 	mEvas = rb_define_module_under (mEcore, "Evas");
 
 	Init_EcoreEvas ();
diff --git a/src/ecore_evas/rb_ecore_evas_main.h b/src/ecore_evas/rb_ecore_evas_main.h
index 8817478..58bacbd 100644
--- a/src/ecore_evas/rb_ecore_evas_main.h
+++ b/src/ecore_evas/rb_ecore_evas_main.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_evas_main.h 77 2004-08-19 17:39:29Z tilman $
+ * $Id: rb_ecore_evas_main.h 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -21,7 +21,7 @@
 #ifndef __RB_ECORE_EVAS_MAIN_H
 #define __RB_ECORE_EVAS_MAIN_H
 
-VALUE mEvas;
+VALUE mEvas, cWindow;
 
 #endif
 
diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index c0e5136..a6da8b1 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 351 2006-02-10 15:25:40Z tilman $
+ * $Id: rb_gl_x11.c 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -133,8 +133,6 @@ void Init_GlX11 (void)
 {
 	VALUE c;
 
-	rb_require ("ecore_x");
-
 	c = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
 
 	rb_define_alloc_func (c, c_alloc);
diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index 8549dc5..e8c3833 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 351 2006-02-10 15:25:40Z tilman $
+ * $Id: rb_software_x11.c 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -133,8 +133,6 @@ void Init_SoftwareX11 (void)
 {
 	VALUE c;
 
-	rb_require ("ecore_x");
-
 	c = rb_define_class_under (mEvas, "SoftwareX11", cEcoreEvas);
 
 	rb_define_alloc_func (c, c_alloc);
diff --git a/src/ecore_evas/rb_xrender_x11.c b/src/ecore_evas/rb_xrender_x11.c
index 505638d..a214ed1 100644
--- a/src/ecore_evas/rb_xrender_x11.c
+++ b/src/ecore_evas/rb_xrender_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_xrender_x11.c 351 2006-02-10 15:25:40Z tilman $
+ * $Id: rb_xrender_x11.c 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
@@ -133,8 +133,6 @@ void Init_XRenderX11 (void)
 {
 	VALUE c;
 
-	rb_require ("ecore_x");
-
 	c = rb_define_class_under (mEvas, "XRenderX11", cEcoreEvas);
 
 	rb_define_alloc_func (c, c_alloc);
diff --git a/src/ecore_x/rb_window.c b/src/ecore_x/rb_window.c
index 204d301..3005b4a 100644
--- a/src/ecore_x/rb_window.c
+++ b/src/ecore_x/rb_window.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_window.c 351 2006-02-10 15:25:40Z tilman $
+ * $Id: rb_window.c 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -29,7 +29,7 @@
 #include "rb_window.h"
 #include "rb_cursor.h"
 
-VALUE cWindow;
+static VALUE cWindow;
 
 static void c_mark (RbWindow *w)
 {
diff --git a/src/ecore_x/rb_window.h b/src/ecore_x/rb_window.h
index f9f04e5..efd9713 100644
--- a/src/ecore_x/rb_window.h
+++ b/src/ecore_x/rb_window.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_window.h 77 2004-08-19 17:39:29Z tilman $
+ * $Id: rb_window.h 389 2006-11-11 11:40:24Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -29,8 +29,4 @@ typedef struct {
 void Init_Window (void);
 VALUE TO_ECORE_X_WINDOW (VALUE parent, Ecore_X_Window w);
 
-#ifndef __RB_WINDOW_C
-extern VALUE cWindow;
-#endif
-
 #endif
-- 
2.30.2


From 0f8d24c745efc1057f8d25ada1375c88a1ab2ed7 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 8 Apr 2007 11:50:30 +0200
Subject: [PATCH 14/16] Removed RCS-style IDs.

---
 AUTHORS                             | 2 --
 ChangeLog                           | 2 --
 README                              | 2 --
 Rakefile                            | 2 --
 library.rb                          | 2 --
 src/ecore/rb_animator.c             | 2 --
 src/ecore/rb_animator.h             | 2 --
 src/ecore/rb_ecore.c                | 2 --
 src/ecore/rb_ecore.h                | 2 --
 src/ecore/rb_event_handler.c        | 2 --
 src/ecore/rb_event_handler.h        | 2 --
 src/ecore/rb_fd_handler.c           | 2 --
 src/ecore/rb_fd_handler.h           | 2 --
 src/ecore/rb_idle_enterer.c         | 2 --
 src/ecore/rb_idle_enterer.h         | 2 --
 src/ecore/rb_idler.c                | 2 --
 src/ecore/rb_idler.h                | 2 --
 src/ecore/rb_timer.c                | 2 --
 src/ecore/rb_timer.h                | 2 --
 src/ecore_con/rb_ecore_con.c        | 2 --
 src/ecore_con/rb_server.c           | 2 --
 src/ecore_evas/rb_buffer.c          | 2 --
 src/ecore_evas/rb_buffer.h          | 2 --
 src/ecore_evas/rb_ecore_evas.c      | 2 --
 src/ecore_evas/rb_ecore_evas.h      | 2 --
 src/ecore_evas/rb_ecore_evas_main.c | 2 --
 src/ecore_evas/rb_ecore_evas_main.h | 2 --
 src/ecore_evas/rb_fb.c              | 2 --
 src/ecore_evas/rb_fb.h              | 2 --
 src/ecore_evas/rb_gl_x11.c          | 2 --
 src/ecore_evas/rb_gl_x11.h          | 2 --
 src/ecore_evas/rb_software_x11.c    | 2 --
 src/ecore_evas/rb_software_x11.h    | 2 --
 src/ecore_evas/rb_xrender_x11.c     | 2 --
 src/ecore_evas/rb_xrender_x11.h     | 2 --
 src/ecore_job/rb_ecore_job.c        | 2 --
 src/ecore_job/rb_ecore_job.h        | 2 --
 src/ecore_job/rb_job.c              | 2 --
 src/ecore_job/rb_job.h              | 2 --
 src/ecore_x/rb_cursor.c             | 2 --
 src/ecore_x/rb_cursor.h             | 2 --
 src/ecore_x/rb_ecore_x.c            | 2 --
 src/ecore_x/rb_ecore_x.h            | 2 --
 src/ecore_x/rb_window.c             | 2 --
 src/ecore_x/rb_window.h             | 2 --
 45 files changed, 90 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2de2408..4c2439d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,3 @@
-$Id: AUTHORS 77 2004-08-19 17:39:29Z tilman $
-
 Tilman Sauerbeck (tilman at code-monkey de)
 
 Contributors:
diff --git a/ChangeLog b/ChangeLog
index 8e2002c..2ff52ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-$Id: ChangeLog 279 2005-03-13 14:32:25Z tilman $
-
 2005-03-13 Tilman Sauerbeck (tilman at code-monkey de)
         * src/ecore/rb_timer.c: Implemented Timer#interval=
 
diff --git a/README b/README
index ee8b1c5..e8004b0 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-$Id: README 318 2005-04-26 11:11:48Z tilman $
-
 ruby-ecore - Ruby bindings for Ecore
 ==================================
 
diff --git a/Rakefile b/Rakefile
index d0bb464..88c524a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,3 @@
-# $Id: Rakefile 379 2006-04-02 21:45:20Z tilman $
-
 require "library"
 require "rake/clean"
 require "rake/testtask"
diff --git a/library.rb b/library.rb
index da4f8bb..33a3132 100644
--- a/library.rb
+++ b/library.rb
@@ -1,5 +1,3 @@
-# $Id: library.rb 321 2005-04-27 14:01:11Z tilman $
-
 require "rbconfig"
 
 class Library
diff --git a/src/ecore/rb_animator.c b/src/ecore/rb_animator.c
index 9a3ce27..a5eb846 100644
--- a/src/ecore/rb_animator.c
+++ b/src/ecore/rb_animator.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_animator.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_animator.h b/src/ecore/rb_animator.h
index b0bc3a5..39f32ca 100644
--- a/src/ecore/rb_animator.h
+++ b/src/ecore/rb_animator.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_animator.h 146 2004-11-27 15:38:52Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_ecore.c b/src/ecore/rb_ecore.c
index 9aea96f..0d18a9a 100644
--- a/src/ecore/rb_ecore.c
+++ b/src/ecore/rb_ecore.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore.c 366 2006-02-14 21:53:15Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_ecore.h b/src/ecore/rb_ecore.h
index 95cbde4..5f3565b 100644
--- a/src/ecore/rb_ecore.h
+++ b/src/ecore/rb_ecore.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore.h 109 2004-09-01 20:33:15Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 39e2521..da5f91a 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_event_handler.c 373 2006-02-16 21:37:43Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_event_handler.h b/src/ecore/rb_event_handler.h
index 34df332..d9a7fd3 100644
--- a/src/ecore/rb_event_handler.h
+++ b/src/ecore/rb_event_handler.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_event_handler.h 372 2006-02-16 20:39:55Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_fd_handler.c b/src/ecore/rb_fd_handler.c
index c37e310..1f628d1 100644
--- a/src/ecore/rb_fd_handler.c
+++ b/src/ecore/rb_fd_handler.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_fd_handler.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_fd_handler.h b/src/ecore/rb_fd_handler.h
index 87f09f2..f208288 100644
--- a/src/ecore/rb_fd_handler.h
+++ b/src/ecore/rb_fd_handler.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_fd_handler.h 109 2004-09-01 20:33:15Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_idle_enterer.c b/src/ecore/rb_idle_enterer.c
index 236f891..641d60c 100644
--- a/src/ecore/rb_idle_enterer.c
+++ b/src/ecore/rb_idle_enterer.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_idle_enterer.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_idle_enterer.h b/src/ecore/rb_idle_enterer.h
index f4e7bac..83eed55 100644
--- a/src/ecore/rb_idle_enterer.h
+++ b/src/ecore/rb_idle_enterer.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_idle_enterer.h 152 2004-12-09 18:33:15Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index 7462290..41f1cb3 100644
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_idler.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_idler.h b/src/ecore/rb_idler.h
index c0affed..bbafae1 100644
--- a/src/ecore/rb_idler.h
+++ b/src/ecore/rb_idler.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_idler.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 939a88d..4d05d48 100644
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_timer.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore/rb_timer.h b/src/ecore/rb_timer.h
index c74b7e4..10f3ed8 100644
--- a/src/ecore/rb_timer.h
+++ b/src/ecore/rb_timer.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_timer.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_con/rb_ecore_con.c b/src/ecore_con/rb_ecore_con.c
index 0fbfc37..db2110a 100644
--- a/src/ecore_con/rb_ecore_con.c
+++ b/src/ecore_con/rb_ecore_con.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_con.c 362 2006-02-13 22:46:35Z tilman $
- *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_con/rb_server.c b/src/ecore_con/rb_server.c
index 089754f..9dd547c 100644
--- a/src/ecore_con/rb_server.c
+++ b/src/ecore_con/rb_server.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_server.c 366 2006-02-14 21:53:15Z tilman $
- *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_buffer.c b/src/ecore_evas/rb_buffer.c
index 9526f96..423bb8f 100644
--- a/src/ecore_evas/rb_buffer.c
+++ b/src/ecore_evas/rb_buffer.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_buffer.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004-2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_buffer.h b/src/ecore_evas/rb_buffer.h
index 27f11a3..c1e799b 100644
--- a/src/ecore_evas/rb_buffer.h
+++ b/src/ecore_evas/rb_buffer.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_buffer.h 174 2005-01-19 21:31:04Z tilman $
- *
  * Copyright (C) 2004-2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_ecore_evas.c b/src/ecore_evas/rb_ecore_evas.c
index c2d17f0..b5d7a9e 100644
--- a/src/ecore_evas/rb_ecore_evas.c
+++ b/src/ecore_evas/rb_ecore_evas.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_evas.c 386 2006-09-06 19:38:45Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_ecore_evas.h b/src/ecore_evas/rb_ecore_evas.h
index 8e5849a..573b4a5 100644
--- a/src/ecore_evas/rb_ecore_evas.h
+++ b/src/ecore_evas/rb_ecore_evas.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_evas.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_ecore_evas_main.c b/src/ecore_evas/rb_ecore_evas_main.c
index abe87af..07920ba 100644
--- a/src/ecore_evas/rb_ecore_evas_main.c
+++ b/src/ecore_evas/rb_ecore_evas_main.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_evas_main.c 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2004-2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_ecore_evas_main.h b/src/ecore_evas/rb_ecore_evas_main.h
index 58bacbd..d2a0709 100644
--- a/src/ecore_evas/rb_ecore_evas_main.h
+++ b/src/ecore_evas/rb_ecore_evas_main.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_evas_main.h 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_fb.c b/src/ecore_evas/rb_fb.c
index 830448d..236713f 100644
--- a/src/ecore_evas/rb_fb.c
+++ b/src/ecore_evas/rb_fb.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_fb.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_fb.h b/src/ecore_evas/rb_fb.h
index 25146fc..92cbc9f 100644
--- a/src/ecore_evas/rb_fb.h
+++ b/src/ecore_evas/rb_fb.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_fb.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index a6da8b1..84c09e2 100644
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_gl_x11.c 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_gl_x11.h b/src/ecore_evas/rb_gl_x11.h
index b40cc2e..72774ca 100644
--- a/src/ecore_evas/rb_gl_x11.h
+++ b/src/ecore_evas/rb_gl_x11.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_gl_x11.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_software_x11.c b/src/ecore_evas/rb_software_x11.c
index e8c3833..fe27329 100644
--- a/src/ecore_evas/rb_software_x11.c
+++ b/src/ecore_evas/rb_software_x11.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_software_x11.c 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_software_x11.h b/src/ecore_evas/rb_software_x11.h
index a49509e..a6b09b7 100644
--- a/src/ecore_evas/rb_software_x11.h
+++ b/src/ecore_evas/rb_software_x11.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_software_x11.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_xrender_x11.c b/src/ecore_evas/rb_xrender_x11.c
index a214ed1..166babd 100644
--- a/src/ecore_evas/rb_xrender_x11.c
+++ b/src/ecore_evas/rb_xrender_x11.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_xrender_x11.c 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_evas/rb_xrender_x11.h b/src/ecore_evas/rb_xrender_x11.h
index e40a9c4..c43315f 100644
--- a/src/ecore_evas/rb_xrender_x11.h
+++ b/src/ecore_evas/rb_xrender_x11.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_xrender_x11.h 348 2005-12-24 17:11:24Z tilman $
- *
  * Copyright (C) 2005 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_job/rb_ecore_job.c b/src/ecore_job/rb_ecore_job.c
index 0221844..9b37310 100644
--- a/src/ecore_job/rb_ecore_job.c
+++ b/src/ecore_job/rb_ecore_job.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_job.c 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_job/rb_ecore_job.h b/src/ecore_job/rb_ecore_job.h
index 0f268df..1245e82 100644
--- a/src/ecore_job/rb_ecore_job.h
+++ b/src/ecore_job/rb_ecore_job.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_job.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 5c4ff46..0ef3ad9 100644
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_job.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_job/rb_job.h b/src/ecore_job/rb_job.h
index a5aa078..5b6e1a1 100644
--- a/src/ecore_job/rb_job.h
+++ b/src/ecore_job/rb_job.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_job.h 77 2004-08-19 17:39:29Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_x/rb_cursor.c b/src/ecore_x/rb_cursor.c
index f025f6e..14da4c7 100644
--- a/src/ecore_x/rb_cursor.c
+++ b/src/ecore_x/rb_cursor.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_cursor.c 351 2006-02-10 15:25:40Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_x/rb_cursor.h b/src/ecore_x/rb_cursor.h
index b54a18e..de44cb3 100644
--- a/src/ecore_x/rb_cursor.h
+++ b/src/ecore_x/rb_cursor.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_cursor.h 98 2004-08-26 13:12:55Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index 6881ed8..d309abc 100644
--- a/src/ecore_x/rb_ecore_x.c
+++ b/src/ecore_x/rb_ecore_x.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_x.c 366 2006-02-14 21:53:15Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_x/rb_ecore_x.h b/src/ecore_x/rb_ecore_x.h
index f089738..02ef3bd 100644
--- a/src/ecore_x/rb_ecore_x.h
+++ b/src/ecore_x/rb_ecore_x.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore_x.h 109 2004-09-01 20:33:15Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_x/rb_window.c b/src/ecore_x/rb_window.c
index 3005b4a..e3f1bcf 100644
--- a/src/ecore_x/rb_window.c
+++ b/src/ecore_x/rb_window.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_window.c 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/ecore_x/rb_window.h b/src/ecore_x/rb_window.h
index efd9713..71964a1 100644
--- a/src/ecore_x/rb_window.h
+++ b/src/ecore_x/rb_window.h
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_window.h 389 2006-11-11 11:40:24Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
-- 
2.30.2


From fe0c874678b5696bf621b3feab57430a24f5a9c1 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 8 Apr 2007 11:51:27 +0200
Subject: [PATCH 15/16] Removed ChangeLog and NEWS.

---
 ChangeLog | 16 ----------------
 NEWS      |  0
 2 files changed, 16 deletions(-)
 delete mode 100644 ChangeLog
 delete mode 100644 NEWS

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 2ff52ce..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2005-03-13 Tilman Sauerbeck (tilman at code-monkey de)
-        * src/ecore/rb_timer.c: Implemented Timer#interval=
-
-2004-08-21 Tilman Sauerbeck (tilman at code-monkey de)
-        * src/ecore/rb_ecore.c: Moved rb_define_attr() calls to
-          the event init functions
-        * src/ecore_x/rb_ecore_x.c: Implemented more events,
-          added more enums
-
-2004-08-19 Tilman Sauerbeck (tilman at code-monkey de)
-        * src/ecore/Makefile.am, src/ecore/rb_event_handler.[ch]:
-          Added event handler, based on code by George Gensure
-        * src/ecore/rb_ecore.[ch]: Added events
-        * src/ecore_x/rb_ecore_x.c: Added events and eventmask
-          constants
-        * src/ecore_x/rb_window.c: Implemented more methods
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
-- 
2.30.2


From 8aa2ce42e7794c2ef0ee7d32883258603c9ea95c Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 8 Apr 2007 11:54:16 +0200
Subject: [PATCH 16/16] Added .gitignore.

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..74cb124
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+ChangeLog
+doc
+pkg
+*.o
+*.so
-- 
2.30.2