discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3dbca39f98288580c62a43c179ac11621433ec88
commit 3dbca39f98288580c62a43c179ac11621433ec88 Author: Mike Blumenkrantz <[email protected]> Date: Mon Feb 26 13:40:41 2018 -0500 efl: move signal events from efl.loop to efl.app these are process-wide and not loop-specific --- src/lib/ecore/ecore_signal.c | 18 ++++++------------ src/lib/ecore/efl_app.eo | 5 +++++ src/lib/ecore/efl_loop.eo | 3 --- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/lib/ecore/ecore_signal.c b/src/lib/ecore/ecore_signal.c index 98934e63b3..40a1b58eb6 100644 --- a/src/lib/ecore/ecore_signal.c +++ b/src/lib/ecore/ecore_signal.c @@ -46,7 +46,7 @@ typedef struct _Signal_Data } Signal_Data; static Eina_Bool -_ecore_signal_pipe_read(Eo *obj) +_ecore_signal_pipe_read(Eo *obj EINA_UNUSED) { Signal_Data sdata; int ret; @@ -74,14 +74,10 @@ _ecore_signal_pipe_read(Eo *obj) ecore_event_add(ECORE_EVENT_SIGNAL_USER, e, _ecore_signal_generic_free, NULL); } - Eo *loop = efl_provider_find(obj, EFL_LOOP_CLASS); - if (loop) - { - if (sdata.sig == SIGUSR1) - efl_event_callback_call(loop, EFL_LOOP_EVENT_SIGNAL_USR1, NULL); - else - efl_event_callback_call(loop, EFL_LOOP_EVENT_SIGNAL_USR2, NULL); - } + if (sdata.sig == SIGUSR1) + efl_event_callback_call(_efl_app, EFL_APP_EVENT_SIGNAL_USR1, NULL); + else + efl_event_callback_call(_efl_app, EFL_APP_EVENT_SIGNAL_USR2, NULL); } break; case SIGHUP: @@ -93,9 +89,7 @@ _ecore_signal_pipe_read(Eo *obj) ecore_event_add(ECORE_EVENT_SIGNAL_HUP, e, _ecore_signal_generic_free, NULL); } - Eo *loop = efl_provider_find(obj, EFL_LOOP_CLASS); - if (loop) - efl_event_callback_call(loop, EFL_LOOP_EVENT_SIGNAL_HUP, NULL); + efl_event_callback_call(_efl_app, EFL_APP_EVENT_SIGNAL_HUP, NULL); } break; case SIGQUIT: diff --git a/src/lib/ecore/efl_app.eo b/src/lib/ecore/efl_app.eo index 6411984b78..a913f8b4bf 100644 --- a/src/lib/ecore/efl_app.eo +++ b/src/lib/ecore/efl_app.eo @@ -38,6 +38,11 @@ class Efl.App (Efl.Object) } } } + events { + signal,usr1; [[System specific, but on unix maps to SIGUSR1 signal to the process - only called on main loop object]] + signal,usr2; [[System specific, but on unix maps to SIGUSR2 signal to the process - only called on main loop object]] + signal,hup; [[System specific, but on unix maps to SIGHUP signal to the process - only called on main loop object]] + } implements { Efl.Object.constructor; Efl.Object.destructor; diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo index e9bd12ef5c..d851750a02 100644 --- a/src/lib/ecore/efl_loop.eo +++ b/src/lib/ecore/efl_loop.eo @@ -124,9 +124,6 @@ class Efl.Loop (Efl.Task) pause; [[Called when the window is not going be displayed for some time]] resume; [[Called before a window is rendered after a pause event]] terminate; [[Called before starting the shutdown of Elementary]] - signal,usr1; [[System specific, but on unix maps to SIGUSR1 signal to the process - only called on main loop object]] - signal,usr2; [[System specific, but on unix maps to SIGUSR2 signal to the process - only called on main loop object]] - signal,hup; [[System specific, but on unix maps to SIGHUP signal to the process - only called on main loop object]] } implements { Efl.Object.constructor; --
