ecore_eolian_files = \
lib/ecore/efl_loop.eo \
- lib/ecore/efl_loop_args.eo \
lib/ecore/efl_loop_user.eo \
lib/ecore/efl_loop_fd.eo \
lib/ecore/ecore_parent.eo \
lib/ecore/ecore_idler.c \
lib/ecore/ecore_job.c \
lib/ecore/ecore_main.c \
-lib/ecore/efl_loop_args.c \
lib/ecore/efl_loop_user.c \
lib/ecore/efl_loop_fd.c \
lib/ecore/ecore_pipe.c \
#include "efl_loop.eo.h"
-#include "efl_loop_args.eo.h"
-
#include "efl_loop_user.eo.h"
#include "efl_loop_fd.eo.h"
}
static void
-_efl_loop_args_job_cb(void *data, void *value EINA_UNUSED)
+_efl_loop_arguments_cleanup(Eina_Array *arga)
{
- Efl_Loop_Args *args = data;
- Eo *obj = eo_parent_get(args);
+ Eina_Stringshare *s;
- eo_event_callback_call(obj, EFL_LOOP_EVENT_ARGS, args);
- eo_del(args);
+ while ((s = eina_array_pop(arga)))
+ eina_stringshare_del(s);
+ eina_array_free(arga);
}
-EOLIAN static void
-_efl_loop_args_add(Eo *obj, Efl_Loop_Data *pd EINA_UNUSED, int argc, const char **argv)
+static void
+_efl_loop_arguments_send(void *data, void *value EINA_UNUSED)
+{
+ Efl_Loop_Arguments arge;
+ Eina_Array *arga = data;
+
+ arge.argv = arga;
+
+ eo_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, &arge);
+
+ _efl_loop_arguments_cleanup(arga);
+}
+
+static void
+_efl_loop_arguments_cancel(void *data, Eina_Error err EINA_UNUSED)
+{
+ _efl_loop_arguments_cleanup(data);
+}
+
+// It doesn't make sense to send those argument to any other mainloop
+// As it also doesn't make sense to allow anyone to override this, so
+// should be internal for sure, not even protected.
+EAPI void
+ecore_loop_arguments_send(int argc, const char **argv)
{
Eina_Promise *job;
- Efl_Loop_Args *args = eo_add(EFL_LOOP_ARGS_CLASS, obj);
+ Eina_Array *arga;
+ int i = 0;
+
+ arga = eina_array_new(argc);
+ for (i = 0; i < argc; i++)
+ eina_array_push(arga, eina_stringshare_add(argv[i]));
- if (!args) return;
- efl_loop_args_set(args, argc, argv);
- job = efl_loop_job(obj, NULL);
- eina_promise_then(job, _efl_loop_args_job_cb, NULL, args);
+ job = efl_loop_job(ecore_main_loop_get(), NULL);
+ eina_promise_then(job, _efl_loop_arguments_send, _efl_loop_arguments_cancel, arga);
}
static void _efl_loop_timeout_force_cancel_cb(void *data, const Eo_Event *event EINA_UNUSED);
Ecore_Magic m,
Ecore_Magic req_m,
const char *fname);
+EAPI void ecore_loop_arguments_send(int argc, const char **argv);
void _ecore_time_init(void);
+struct Efl.Loop.Arguments {
+ argv: const(array<const(stringshare)>);
+}
+
class Efl.Loop (Eo.Base)
{
[[The Efl Main Loop
}
return: bool; [[true if successfully unregistered, false otherwise.]]
}
- args_add {
- [[Add a new set of arguments to the loop that makes an args event.]]
- params {
- argc: int; [[The number of strings in the argv array.]]
- argv: string*; [[The array of argument strings.]]
- }
- }
}
events {
idle,enter @restart; [[Event occurs once the main loop enters the idle state.]]
idle,exit @restart; [[Event occurs once the main loop exits the idle state.]]
idle @restart; [[Event occurs once the main loop is idler. Be carefull, this will spin your CPU high if you keep listening on this event.]]
- args: Efl.Loop.Args; [[Event happens when args are provided to the loop by args_add().]]
- /* TODO: All of the legacy ecore events. (Ecore.h header) */
+ arguments: Efl.Loop.Arguments; [[Event happens when args are provided to the loop by args_add().]]
}
implements {
Eo.Base.constructor;
+++ /dev/null
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <Ecore.h>
-
-#include "ecore_private.h"
-
-#define MY_CLASS EFL_LOOP_ARGS_CLASS
-
-typedef struct _Efl_Loop_Args_Data Efl_Loop_Args_Data;
-struct _Efl_Loop_Args_Data
-{
- int argc;
- const char **argv;
-};
-
-EOLIAN static void
-_efl_loop_args_args_set(Eo *obj EINA_UNUSED, Efl_Loop_Args_Data *pd, int argc, const char **argv)
-{
- int i;
-
- if (argc < 0) return;
- for (i = 0; i < pd->argc; i++) eina_stringshare_del(pd->argv[i]);
- free(pd->argv);
- pd->argc = argc;
- if (argc > 0)
- {
- pd->argv = malloc(argc * sizeof(const char *));
- for (i = 0; i < argc; i++) pd->argv[i] = eina_stringshare_add(argv[i]);
- }
-}
-
-EOLIAN static int
-_efl_loop_args_arg_num_get(Eo *obj EINA_UNUSED, Efl_Loop_Args_Data *pd)
-{
- return pd->argc;
-}
-
-EOLIAN const char *
-_efl_loop_args_arg_get(Eo *obj EINA_UNUSED, Efl_Loop_Args_Data *pd, int num)
-{
- if ((num < 0) || (num >= pd->argc)) return NULL;
- return pd->argv[num];
-}
-
-EOLIAN static void
-_efl_loop_args_eo_base_destructor(Eo *obj EINA_UNUSED, Efl_Loop_Args_Data *pd)
-{
- int i;
-
- for (i = 0; i < pd->argc; i++) eina_stringshare_del(pd->argv[i]);
- free(pd->argv);
- pd->argv = NULL;
- pd->argc = 0;
- eo_destructor(eo_super(obj, MY_CLASS));
-}
-
-#include "efl_loop_args.eo.c"
+++ /dev/null
-class Efl.Loop.Args (Eo.Base)
-{
- [[The object holding arguments provided to the loop.]]
- methods {
- args_set {
- [[Add a new set of arguments to the loop that makes an args event.]]
- params {
- argc: int; [[The number of strings in the argv array.]]
- argv: string*; [[The array of argument strings.]]
- }
- }
- arg_num_get {
- return: int; [[The number of argument strings.]]
- }
- arg_get {
- params {
- num: int; [[The argument number to get.]]
- }
- return: string; [[The argument string.]]
- }
- }
- implements {
- Eo.Base.destructor;
- }
-}
return ECORE_CALLBACK_PASS_ON;
}
+// To be used here only, do not copy that anywhere else for now.
+EAPI void ecore_loop_arguments_send(int argc, const char **argv);
+
EAPI int
elm_init(int argc, char **argv)
{
elm_quicklaunch_init(argc, argv);
elm_quicklaunch_sub_init(argc, argv);
- efl_loop_args_add(ecore_main_loop_get(),
- argc - 1,
- (argc > 1) ? ((const char **)argv + 1) : NULL);
+ ecore_loop_arguments_send(argc - 1,
+ (argc > 1) ? ((const char **)argv + 1) : NULL);
_prefix_shutdown();
#include <Ecore.h>
#include "ecore_suite.h"
+EAPI void ecore_loop_arguments_send(int argc, const char **argv);
+
+static const char *args[] = {
+ "a", "b", "c", "d", "e", "f", "g", "h"
+};
+
static void
_cb_args1(void *data EINA_UNUSED, const Eo_Event *event)
{
- Efl_Loop_Args *args = event->info;
- int n;
+ Efl_Loop_Arguments *arge = event->info;
+ unsigned int i;
- n = efl_loop_args_arg_num_get(args);
- fail_if(n != 8);
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "a"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "b"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "c"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 3), "d"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 4), "e"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 5), "f"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 6), "g"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 7), "h"));
+ fail_if(eina_array_count(arge->argv) != (sizeof (args) / sizeof (args[0])));
+ for (i = 0; i < eina_array_count(arge->argv); i++)
+ {
+ fail_if(!!strcmp(eina_array_data_get(arge->argv, i), args[i]));
+ }
ecore_main_loop_quit();
}
START_TEST(ecore_test_args1)
{
- const char *args[] =
- {
- "a", "b", "c", "d", "e", "f", "g", "h"
- };
-
ecore_init();
- eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGS,
+ eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args1, NULL);
- efl_loop_args_add(ecore_main_loop_get(), 8, args);
+ ecore_loop_arguments_send(8, args);
ecore_main_loop_begin();
ecore_shutdown();
}
static void
_cb_args2(void *data EINA_UNUSED, const Eo_Event *event)
{
- Efl_Loop_Args *args = event->info;
- int n;
+ Efl_Loop_Arguments *arge = event->info;
- n = efl_loop_args_arg_num_get(args);
- fail_if(n != 1);
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "hello world"));
+ fail_if(eina_array_count(arge->argv) != 1);
+ fail_if(!!strcmp(eina_array_data_get(arge->argv, 0), "hello world"));
ecore_main_loop_quit();
}
START_TEST(ecore_test_args2)
{
- const char *args[] =
- {
- "hello world"
- };
+ const char *simple_args[] = {
+ "hello world"
+ };
ecore_init();
- eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGS,
+ eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args2, NULL);
- efl_loop_args_add(ecore_main_loop_get(), 1, args);
+ ecore_loop_arguments_send(1, simple_args);
ecore_main_loop_begin();
ecore_shutdown();
}
static void
_cb_args3(void *data EINA_UNUSED, const Eo_Event *event)
{
- Efl_Loop_Args *args = event->info;
- int n;
+ Efl_Loop_Arguments *arge = event->info;
- n = efl_loop_args_arg_num_get(args);
- fail_if(n != 0);
+ fail_if(eina_array_count(arge->argv) != 0);
ecore_main_loop_quit();
}
START_TEST(ecore_test_args3)
{
ecore_init();
- eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGS,
+ eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args3, NULL);
- efl_loop_args_add(ecore_main_loop_get(), 0, NULL);
- ecore_main_loop_begin();
- ecore_shutdown();
-}
-END_TEST
-
-static void
-_cb_args4(void *data EINA_UNUSED, const Eo_Event *event)
-{
- Efl_Loop_Args *args = event->info;
- int n;
-
- n = efl_loop_args_arg_num_get(args);
- fail_if(n != 3);
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 0), "some really long string with lots more to it than is needed for an argument blah"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 1), "xxxxx"));
- fail_if(!!strcmp(efl_loop_args_arg_get(args, 2), "y"));
- ecore_main_loop_quit();
-}
-
-START_TEST(ecore_test_args4)
-{
- const char *args[] =
- {
- "some really long string with lots more to it than is needed for an argument blah",
- "xxxxx",
- "y"
- };
-
- ecore_init();
- eo_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGS,
- _cb_args4, NULL);
- efl_loop_args_add(ecore_main_loop_get(), 3, args);
+ ecore_loop_arguments_send(0, NULL);
ecore_main_loop_begin();
ecore_shutdown();
}
tcase_add_test(tc, ecore_test_args1);
tcase_add_test(tc, ecore_test_args2);
tcase_add_test(tc, ecore_test_args3);
- tcase_add_test(tc, ecore_test_args4);
}
projects / platform / upstream / efl.git / commitdiff