X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore%2Frb_event_handler.c;h=18e2fc7fc5a0562576da4a2dbe9ef8c45d528d05;hb=6c769aac08caf234bbff82cca822d8f209283bbe;hp=f296ae26255655b8f0f96966738b841fd2368f29;hpb=2f0a58839f94493eae629ae5bf45f50bfcd9fa0e;p=ruby-ecore.git

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index f296ae2..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 363 2006-02-14 19:02:53Z tilman $
+ * $Id: rb_event_handler.c 372 2006-02-16 20:39:55Z 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 argv);
 
 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, i;
+	int len, ret = 1, i;
 
 	/* instantiate the event object
 	 * first, find the class we're gonna use
@@ -142,36 +145,72 @@ 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;
 
 	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
 			 * event handlers
 			 */
-			if (res == Qfalse)
+			if (res == Qfalse) {
+				ret = 0;
 				break;
+			}
 		}
 	}
 
-	/* call other event handlers, too */
-	return 1;
+	return ret;
+}
+
+VALUE c_ev_inherited (VALUE klass, VALUE child)
+{
+	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, -2);
+
+	return Qnil;
 }
 
-VALUE c_ev_generic_init (VALUE self, VALUE event)
+static VALUE c_ev_init (int argc, VALUE *argv, VALUE self)
 {
-	/* dummy */
 	return self;
 }
 
+static void free_ruby_event (void *data, void *event)
+{
+	/* do nothing */
+}
+
+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 *) argv, free_ruby_event, NULL);
+
+	return Qnil;
+}
+
 void Init_EventHandler (void)
 {
 	VALUE cEventHandler;
@@ -191,6 +230,6 @@ 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);
+	rb_define_method (cEcoreEvent, "initialize", c_ev_init, -1);
 }