X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_event_handler.c;h=39e2521c8abfd643503f890ebba8e19f392c9e36;hp=12e2739b1740392de2d1a8c81f9a47e93caf7941;hb=d907bd016f15dc5be72d12ee1742047eafc2abae;hpb=fecda12a49e445f7de3c6e6452c65b96cd6861e5 diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c index 12e2739..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 358 2006-02-12 15:42:28Z tilman $ + * $Id: rb_event_handler.c 373 2006-02-16 21:37:43Z tilman $ * * Copyright (C) 2004 ruby-ecore team (see AUTHORS) * @@ -29,14 +29,16 @@ typedef struct { Ecore_Event_Handler *real; + VALUE event_class; 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; +static VALUE event_args; static void c_mark (RbEventHandler *h) { @@ -45,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); } @@ -77,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; @@ -87,18 +70,17 @@ static VALUE c_init (VALUE self, VALUE type) Data_Get_Struct (self, RbEventHandler, h); - t = NUM2INT (type); + if (rb_obj_is_kind_of (klass, rb_cModule) != Qtrue) + rb_raise (rb_eArgError, "invalid argument"); + t = NUM2INT (rb_const_get (klass, rb_intern ("TYPE"))); if (t <= ECORE_EVENT_NONE) - rb_raise (rb_eStandardError, "invalid type"); - - rb_iv_set (self, "@type", type); + rb_raise (rb_eStandardError, "invalid event"); + 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; } @@ -106,79 +88,74 @@ 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; - return Qnil; - } + 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, argv[1], res; - int handler_type, len, i; - bool called = false; + RbEventHandler *h = data; + VALUE obj, tmp = (VALUE) event; + + obj = rb_obj_alloc (h->event_class); + + if (rb_respond_to (h->event_class, rb_intern ("raise"))) + rb_apply (obj, rb_intern ("initialize"), tmp); + else + rb_obj_call_init (obj, 1, &tmp); - /* instantiate the event object - * first, find the class we're gonna use + tmp = rb_funcall (h->callback, rb_intern ("call"), 1, obj); + + /* if the block returned false, don't call the other + * event handlers */ - if (NIL_P (klass = rb_hash_aref (event_classes, INT2NUM (type)))) { - rb_raise (rb_eException, "Cannot find event class " - "for event %i\n", type); - return 0; - } - - /* now create and init the object */ - obj = rb_obj_alloc (klass); - argv[0] = (VALUE) event; - rb_obj_call_init (obj, 1, argv); - - len = RARRAY (handlers)->len; - - for (i = 0; i < len; i++) { - handler = rb_ary_entry (handlers, i); - handler_type = NUM2INT (rb_iv_get (handler, "@type")); - - 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 - */ - if (res == Qfalse) - break; - } - } - - if (type == ECORE_EVENT_SIGNAL_EXIT && !called) - ecore_main_loop_quit (); - - /* call other event handlers, too */ - return 1; + return (tmp != Qfalse); +} + +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_event_args (void *data, void *argv) +{ + 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_event_args, NULL); + + return Qnil; +} + void Init_EventHandler (void) { VALUE cEventHandler; @@ -190,14 +167,14 @@ 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_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); }