Added Ecore.new_event_type and Ecore.add_event.

[ruby-ecore.git] / src / ecore / rb_ecore.c

diff --git a/src/ecore/rb_ecore.c b/src/ecore/rb_ecore.c
index 7e673feaaa95f29a015d36c6adccc983a1b89cbd..239da0f89518826932c508c86cec865585c47143 100644 (file)
--- a/src/ecore/rb_ecore.c
+++ b/src/ecore/rb_ecore.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore.c 77 2004-08-19 17:39:29Z tilman $
+ * $Id: rb_ecore.c 360 2006-02-12 15:53:44Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -25,8 +25,11 @@
 #define __RB_ECORE_C
 #include "rb_ecore.h"
 #include "rb_timer.h"
+#include "rb_animator.h"
 #include "rb_idler.h"
+#include "rb_idle_enterer.h"
 #include "rb_event_handler.h"
+#include "rb_fd_handler.h"
 
 VALUE mEcore;
 
@@ -69,10 +72,47 @@ static VALUE m_main_loop_quit (VALUE self)
        return Qnil;
 }
 
+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 = INT2FIX (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)
 {
+       VALUE c = CLASS_OF (self);
        Ecore_Event_Exe_Exit *e = (void *) event;
 
+       rb_define_attr (c, "pid", 1, 0);
+       rb_define_attr (c, "exit_code", 1, 0);
+       rb_define_attr (c, "exit_signal", 1, 0);
+       rb_define_attr (c, "exited", 1, 0);
+       rb_define_attr (c, "signalled", 1, 0);
+
        rb_iv_set (self, "@pid", INT2FIX (e->pid));
        rb_iv_set (self, "@exit_code", INT2FIX (e->exit_code));
        rb_iv_set (self, "@exit_signal", INT2FIX (e->exit_signal));
@@ -81,11 +121,14 @@ static VALUE c_ev_exe_exit_init (VALUE self, VALUE event)
 
        return self;
 }
+#endif
 
 static VALUE c_ev_sig_user_init (VALUE self, VALUE event)
 {
        Ecore_Event_Signal_User *e = (void *) event;
 
+       rb_define_attr (CLASS_OF (self), "number", 1, 0);
+
        rb_iv_set (self, "@number", INT2FIX (e->number));
 
        return self;
@@ -93,8 +136,13 @@ static VALUE c_ev_sig_user_init (VALUE self, VALUE event)
 
 static VALUE c_ev_sig_exit_init (VALUE self, VALUE event)
 {
+       VALUE c = CLASS_OF (self);
        Ecore_Event_Signal_Exit *e = (void *) event;
 
+       rb_define_attr (c, "interrupt", 1, 0);
+       rb_define_attr (c, "quit", 1, 0);
+       rb_define_attr (c, "terminate", 1, 0);
+
        rb_iv_set (self, "@interrupt", e->interrupt ? Qtrue : Qfalse);
        rb_iv_set (self, "@quit", e->quit ? Qtrue : Qfalse);
        rb_iv_set (self, "@terminate", e->terminate ? Qtrue : Qfalse);
@@ -106,15 +154,26 @@ static VALUE c_ev_sig_rt_init (VALUE self, VALUE event)
 {
        Ecore_Event_Signal_Realtime *e = (void *) event;
 
+       rb_define_attr (CLASS_OF (self), "number", 1, 0);
+
        rb_iv_set (self, "@number", INT2FIX (e->num));
 
        return self;
 }
 
+static void at_exit ()
+{
+       ecore_shutdown ();
+}
+
 void Init_ecore (void)
 {
        VALUE c;
 
+       ecore_init ();
+
+       atexit (at_exit);
+
        mEcore = rb_define_module ("Ecore");
 
        rb_define_module_function (mEcore, "main_loop_begin",
@@ -123,10 +182,17 @@ void Init_ecore (void)
                                   m_main_loop_iterate, 0);
        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 ();
        Init_Idler ();
+       Init_IdleEnterer ();
        Init_EventHandler ();
+       Init_FdHandler ();
 
        /* SIGNAL_HUP */
        ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_HUP,
@@ -138,37 +204,25 @@ void Init_ecore (void)
                   "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);
        rb_define_private_method (c, "initialize", c_ev_exe_exit_init, 1);
-
-       rb_define_attr (c, "pid", 1, 0);
-       rb_define_attr (c, "exit_code", 1, 0);
-       rb_define_attr (c, "exit_signal", 1, 0);
-       rb_define_attr (c, "exited", 1, 0);
-       rb_define_attr (c, "signalled", 1, 0);
+#endif
 
        /* SIGNAL_USER */
        ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_USER,
                   "SignalUser", c);
        rb_define_private_method (c, "initialize", c_ev_sig_user_init, 1);
 
-       rb_define_attr (c, "number", 1, 0);
-
        /* SIGNAL_EXIT */
        ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_EXIT,
                   "SignalExit", c);
        rb_define_private_method (c, "initialize", c_ev_sig_exit_init, 1);
 
-       rb_define_attr (c, "interrupt", 1, 0);
-       rb_define_attr (c, "quit", 1, 0);
-       rb_define_attr (c, "terminate", 1, 0);
-
        /* SIGNAL_REALTIME */
        ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_REALTIME,
                   "SignalRealtime", c);
        rb_define_private_method (c, "initialize", c_ev_sig_rt_init, 1);
-
-       rb_define_attr (c, "number", 1, 0);
 }