projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked event handling.
[ruby-ecore.git]
/
src
/
ecore
/
rb_ecore.c
diff --git
a/src/ecore/rb_ecore.c
b/src/ecore/rb_ecore.c
index f950f7e0079f3a0e2fac96a50fb77b0b400e00da..06fa0bb929cf3698263db17ca97a3957737d13c4 100644
(file)
--- a/
src/ecore/rb_ecore.c
+++ b/
src/ecore/rb_ecore.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_ecore.c
109 2004-09-01 20:33:15
Z tilman $
+ * $Id: rb_ecore.c
365 2006-02-14 21:50:47
Z tilman $
*
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
*
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
@@
-25,7
+25,9
@@
#define __RB_ECORE_C
#include "rb_ecore.h"
#include "rb_timer.h"
#define __RB_ECORE_C
#include "rb_ecore.h"
#include "rb_timer.h"
+#include "rb_animator.h"
#include "rb_idler.h"
#include "rb_idler.h"
+#include "rb_idle_enterer.h"
#include "rb_event_handler.h"
#include "rb_fd_handler.h"
#include "rb_event_handler.h"
#include "rb_fd_handler.h"
@@
-70,6
+72,12
@@
static VALUE m_main_loop_quit (VALUE self)
return Qnil;
}
return Qnil;
}
+static VALUE m_time_get (VALUE self)
+{
+ return rb_float_new (ecore_time_get ());
+}
+
+#if 0
static VALUE c_ev_exe_exit_init (VALUE self, VALUE event)
{
VALUE c = CLASS_OF (self);
static VALUE c_ev_exe_exit_init (VALUE self, VALUE event)
{
VALUE c = CLASS_OF (self);
@@
-89,6
+97,7
@@
static VALUE c_ev_exe_exit_init (VALUE self, VALUE event)
return self;
}
return self;
}
+#endif
static VALUE c_ev_sig_user_init (VALUE self, VALUE event)
{
static VALUE c_ev_sig_user_init (VALUE self, VALUE event)
{
@@
-128,10
+137,19
@@
static VALUE c_ev_sig_rt_init (VALUE self, VALUE event)
return self;
}
return self;
}
+static void at_exit ()
+{
+ ecore_shutdown ();
+}
+
void Init_ecore (void)
{
VALUE c;
void Init_ecore (void)
{
VALUE c;
+ ecore_init ();
+
+ atexit (at_exit);
+
mEcore = rb_define_module ("Ecore");
rb_define_module_function (mEcore, "main_loop_begin",
mEcore = rb_define_module ("Ecore");
rb_define_module_function (mEcore, "main_loop_begin",
@@
-140,38
+158,41
@@
void Init_ecore (void)
m_main_loop_iterate, 0);
rb_define_module_function (mEcore, "main_loop_quit",
m_main_loop_quit, 0);
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);
Init_Timer ();
Init_Timer ();
+ Init_Animator ();
Init_Idler ();
Init_Idler ();
+ Init_IdleEnterer ();
Init_EventHandler ();
Init_FdHandler ();
/* SIGNAL_HUP */
Init_EventHandler ();
Init_FdHandler ();
/* SIGNAL_HUP */
- ADD_EVENT (mEcore, ECORE_EVENT_
,
SIGNAL_HUP,
+ ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_HUP,
"SignalHup", c);
"SignalHup", c);
- rb_define_private_method (c, "initialize", c_ev_generic_init, 1);
/* SIGNAL_POWER */
/* SIGNAL_POWER */
- ADD_EVENT (mEcore, ECORE_EVENT_
,
SIGNAL_POWER,
+ ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_POWER,
"SignalPower", c);
"SignalPower", c);
- rb_define_private_method (c, "initialize", c_ev_generic_init, 1);
+#if 0
/* EXE_EXIT */
/* 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);
rb_define_private_method (c, "initialize", c_ev_exe_exit_init, 1);
+#endif
/* SIGNAL_USER */
/* 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 */
"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 */
"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);
}
"SignalRealtime", c);
rb_define_private_method (c, "initialize", c_ev_sig_rt_init, 1);
}