kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2019-07-30 16:04:32 +09:00
parent c015b9d92c 895ffd93cc
commit be23f9bc8d
247 changed files with 2439 additions and 1817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/docfx/default_efl/partials/namespace.tmpl.partial Normal file
View File

@ -0,0 +1,15 @@
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
<h1 id="{{id}}" data-uid="{{uid}}" class="text-break">{{>partials/title}}</h1>
<div class="markdown level0 summary">{{{summary}}}</div>
<div class="markdown level0 conceptual">{{{conceptual}}}</div>
{{#remarks}}
<div class="markdown level0 remarks">{{{remarks}}}</div>
{{/remarks}}
{{#children}}
<h3 id="{{id}}">{{>partials/namespaceSubtitle}}</h3>
{{#children}}
<h4><xref uid="{{uid}}" altProperty="fullName" displayProperty="name"/></h4>
<section>{{{summary}}}</section>
{{/children}}
{{/children}}

2
doc/docfx/filterConfig.yml
View File

@ -4,7 +4,7 @@ apiRules:
- exclude:
uidRegex: ^.*NativeStruct$
- exclude:
uidRegex: ^.*ConstructingHandle.*$
uidRegex: ^.*NativeClass$
- exclude:
uidRegex: ^.*WrappingHandle.*$
- exclude:

15
header_checks/meson.build
View File

@ -78,6 +78,7 @@ function_checks = [
['alloca', ['alloca.h']],
['backtrace', ['execinfo.h']],
['backtrace_symbols', ['execinfo.h']],
['chown', ['unistd.h']],
['clock_gettime', ['time.h']],
['dirfd', ['dirent.h sys/types.h']],
['fchmod', ['sys/stat.h']],
@ -123,6 +124,20 @@ function_checks = [
['dladdr', ['dlfcn.h'], ['dl'], '-D_GNU_SOURCE=1']
]
open_cloexec = cc.compiles('''#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
int main(int argc, char **argv) {
int res = open(argv[0], O_RDONLY | O_CLOEXEC);
if (res < 0) return 1;
return 0;
}
''',
name : 'open works with O_CLOEXEC')
if open_cloexec
config_h.set10('HAVE_OPEN_CLOEXEC', true)
endif
strerror_r_char_p = cc.compiles('''#define _GNU_SOURCE
#include <string.h>
int func (void)

4
src/benchmarks/elementary/focus_widget_tree.c
View File

@ -2,6 +2,10 @@
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* setenv */
#endif
#include <Elementary.h>
#include <Ecore_Input_Evas.h>
#include "elm_widget.h"

10
src/benchmarks/elementary/item_container.c
View File

@ -10,11 +10,11 @@ _timer_tick(void *data, const Efl_Event *ev)
{
if (timer % 2 == 0)
{
efl_ui_item_container_item_scroll(data, last, EINA_TRUE);
efl_ui_collection_item_scroll(data, last, EINA_TRUE);
}
else
{
efl_ui_item_container_item_scroll(data, first, EINA_TRUE);
efl_ui_collection_item_scroll(data, first, EINA_TRUE);
}
timer--;
@ -51,7 +51,7 @@ _started_cb(void *data, const Efl_Event *ev EINA_UNUSED)
static void
_first_frame_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
efl_ui_item_container_item_scroll(data, middle, EINA_FALSE);
efl_ui_collection_item_scroll(data, middle, EINA_FALSE);
//give time to stabelize
efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_loop_timer_interval_set(efl_added, 15.0),
@ -72,8 +72,8 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
);
list = efl_new(EFL_UI_POSITION_MANAGER_LIST_CLASS);
item_container = efl_add(EFL_UI_ITEM_CONTAINER_CLASS, win,
efl_ui_item_container_position_manager_set(efl_added, list));
item_container = efl_add(EFL_UI_COLLECTION_CLASS, win,
efl_ui_collection_position_manager_set(efl_added, list));
efl_content_set(win, item_container);
printf("Building 5000 objects\n");

1
src/bin/elementary/meson.build
View File

@ -157,6 +157,7 @@ elementary_test_src = [
'test_ui_tab_pager.c',
'test_ui_relative_layout.c',
'test_ui_item_container.c',
'test_ui_items.c',
'test.h'
]

103
src/bin/elementary/test.c
View File

@ -3,6 +3,11 @@
#endif
#include <string.h>
#ifdef _WIN32
# include <evil_private.h> /* strcasestr */
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "test.h"
@ -238,6 +243,7 @@ void test_label_wrap(void *data, Evas_Object *obj, void *event_info);
void test_label_ellipsis(void *data, Evas_Object *obj, void *event_info);
void test_label_colors(void *data, Evas_Object *obj, void *event_info);
void test_label_emoji(void *data, Evas_Object *obj, void *event_info);
void test_label_variation_sequence(void *data, Evas_Object *obj, void *event_info);
void test_conformant(void *data, Evas_Object *obj, void *event_info);
void test_conformant2(void *data, Evas_Object *obj, void *event_info);
void test_conformant_indicator(void *data, Evas_Object *obj, void *event_info);
@ -394,15 +400,18 @@ void test_ui_spotlight_scroll(void *data, Evas_Object *obj, void *event_info);
void test_ui_relative_layout(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_radio(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_item_container_list(void *data, Evas_Object *obj, void *event_info );
void test_efl_ui_item_container_grid(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_collection_list(void *data, Evas_Object *obj, void *event_info );
void test_efl_ui_collection_grid(void *data, Evas_Object *obj, void *event_info);
void test_efl_ui_item(void *data, Evas_Object *obj, void *event_info);
static void _list_udpate(void);
static Evas_Object *win, *tbx, *entry; // TODO: refactoring
static void *tt;
static Eina_List *tests;
static Eina_List *tests, *cur_test;;
static Eina_Bool hide_legacy = EINA_FALSE;
static Eina_Bool hide_beta = EINA_FALSE;
static Eina_Bool all_tests = EINA_FALSE;
struct elm_test
{
@ -574,6 +583,7 @@ _menu_create(const char *option_str)
}
pcat = t->category;
if (t == tt) tt = cfr;
if (all_tests) t->cb(NULL, NULL, NULL);
}
}
@ -638,6 +648,32 @@ _space_removed_string_get(const char *name)
return ret;
}
static Eina_Bool
_my_win_key_up(void *d EINA_UNUSED, int type EINA_UNUSED, Ecore_Event_Key *ev)
{
struct elm_test *t;
if (eina_streq(ev->key, "comma") && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT))
{
if (cur_test)
cur_test = eina_list_prev(cur_test);
if (!cur_test)
cur_test = eina_list_last(tests);
t = eina_list_data_get(cur_test);
t->cb(NULL, NULL, NULL);
}
else if (eina_streq(ev->key, "period") && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT))
{
if (cur_test)
cur_test = eina_list_next(cur_test);
if (!cur_test)
cur_test = tests;
t = eina_list_data_get(cur_test);
t->cb(NULL, NULL, NULL);
}
return ECORE_CALLBACK_RENEW;
}
static void
my_win_main(const char *autorun, Eina_Bool test_win_only)
{
@ -869,8 +905,9 @@ add_tests:
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table (Linear API)", test_ui_table_linear);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Table_Static", test_ui_table_static);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Relative_Layout", test_ui_relative_layout);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Item_Container List", test_efl_ui_item_container_list);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Item_Container Grid", test_efl_ui_item_container_grid);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection List", test_efl_ui_collection_list);
ADD_TEST_EO(NULL, "Containers", "Efl.Ui.Collection Grid", test_efl_ui_collection_grid);
ADD_TEST_EO(NULL, "Containers", "Items", test_efl_ui_item);
//------------------------------//
ADD_TEST_EO(NULL, "Events", "Event Refeed", test_events);
@ -1167,6 +1204,7 @@ add_tests:
ADD_TEST(NULL, "Text", "Label Ellipsis", test_label_ellipsis);
ADD_TEST(NULL, "Text", "Label Colors", test_label_colors);
ADD_TEST(NULL, "Text", "Label Emoji", test_label_emoji);
ADD_TEST(NULL, "Text", "Label Variation Sequnece", test_label_variation_sequence);
ADD_TEST_EO(NULL, "Text", "Efl.Ui.Textpath", test_ui_textpath);
//------------------------------//
@ -1295,7 +1333,10 @@ add_tests:
}
if (tests)
_menu_create(NULL);
{
_menu_create(NULL);
ecore_event_handler_add(ECORE_EVENT_KEY_UP, (Ecore_Event_Handler_Cb)_my_win_key_up, NULL);
}
/* bring in autorun frame */
if (autorun)
@ -1382,33 +1423,41 @@ efl_main(void *data EINA_UNUSED,
/* if called with a single argument try to autorun a test with
* the same name as the given param
* ex: elementary_test "Box Vert 2" */
if (eina_array_count(arge->argv) == 2)
if (eina_array_count(arge->argv) >= 2)
{
if ((!strcmp(eina_array_data_get(arge->argv, 1), "--help")) ||
(!strcmp(eina_array_data_get(arge->argv, 1), "-help")) ||
(!strcmp(eina_array_data_get(arge->argv, 1), "-h")))
unsigned int i;
for (i = 1; i < eina_array_count(arge->argv); i++)
{
efl_loop_quit(ev->object,
eina_value_string_init("Usages:\n"
"$ elementary_test\n"
"$ elementary_test --test-win-only [TEST_NAME]\n"
"$ elementary_test -to [TEST_NAME]\n\n"
"Examples:\n"
"$ elementary_test -to Button\n\n"));
return ;
char *arg = eina_array_data_get(arge->argv, i);
if ((!strcmp(arg, "--help")) ||
(!strcmp(arg, "-help")) ||
(!strcmp(arg, "-h")))
{
efl_loop_quit(ev->object,
eina_value_string_init("Usages:\n"
"$ elementary_test\n"
"$ elementary_test --test-win-only [TEST_NAME]\n"
"$ elementary_test -to [TEST_NAME]\n\n"
"Examples:\n"
"$ elementary_test -to Button\n\n"));
return ;
}
/* Just a workaround to make the shot module more
* useful with elementary test. */
if ((!strcmp(arg, "--test-win-only")) ||
(!strcmp(arg, "-to")))
{
test_win_only = EINA_TRUE;
}
else if (eina_streq(arg, "--all") || eina_streq(arg, "-a"))
all_tests = EINA_TRUE;
else if ((i == eina_array_count(arge->argv) - 1) && (arg[0] != '-'))
autorun = arg;
}
autorun = eina_array_data_get(arge->argv, 1);
}
else if (eina_array_count(arge->argv) == 3)
{
/* Just a workaround to make the shot module more
* useful with elementary test. */
if ((!strcmp(eina_array_data_get(arge->argv, 1), "--test-win-only")) ||
(!strcmp(eina_array_data_get(arge->argv, 1), "-to")))
{
test_win_only = EINA_TRUE;
autorun = eina_array_data_get(arge->argv, 2);
}
}
my_win_main(autorun, test_win_only); /* create main window */

4
src/bin/elementary/test_bg.c
View File

@ -358,7 +358,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_file_set(efl_added, buf),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _file_cb, win),
efl_pack(box, efl_added));
snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get());
@ -366,7 +366,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_file_set(efl_added, buf),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _image_cb, win),
efl_pack(box, efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));

5
src/bin/elementary/test_combobox.c
View File

@ -2,6 +2,11 @@
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* strcasestr */
#endif
#include <Elementary.h>
static void

10
src/bin/elementary/test_efl_ui_text.c
View File

@ -184,14 +184,14 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Sel");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt3_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Wr");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt6_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
@ -376,21 +376,21 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Image");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_image_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Emoticon");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Factory");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_factory_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);

6
src/bin/elementary/test_evas_mask.c
View File

@ -182,19 +182,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
// FIXME: button EO API
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle mask (image)"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_mask, ly),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle map"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, ly),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Rotate Window"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _rotate_win, win),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));

8
src/bin/elementary/test_evas_snapshot.c
View File

@ -184,25 +184,25 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_text_set(efl_added, "Toggle animation"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _anim_toggle, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Save to file"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _save_image, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Map"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Close"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _close_do, win));
efl_key_wref_set(win, "snap", snap);
efl_key_wref_set(win, "table", table);

4
src/bin/elementary/test_events.c
View File

@ -227,9 +227,9 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_pack(bx, o);
efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
efl_event_callback_add(td->button, EFL_INPUT_EVENT_CLICKED, _clicked_button1, td);
efl_event_callback_array_add(td->button, button_pointer_callbacks(), (void*)(intptr_t)0x1);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _clicked_button2, td);
efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td);
efl_event_callback_array_add(o, rect_pointer_callbacks(), td);
efl_event_callback_array_add(win, win_key_callbacks(), td);

4
src/bin/elementary/test_fileselector.c
View File

@ -2,6 +2,10 @@
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* mkdir stelocale */
#endif
#include <Elementary.h>
#ifndef ENABLE_NLS
# ifndef setlocale

4
src/bin/elementary/test_fileselector_button.c
View File

@ -3,6 +3,10 @@
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* mkdir */
#endif
#include <Elementary.h>
struct _api_data

4
src/bin/elementary/test_fileselector_entry.c
View File

@ -3,6 +3,10 @@
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* mkdir */
#endif
#include <Elementary.h>
struct _api_data

5
src/bin/elementary/test_genlist.c
View File

@ -3,6 +3,11 @@
#ifdef HAVE_CONFIG_H
#include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* strcasestr */
#endif
#include <Elementary.h>
#include "test_explode.h"

4
src/bin/elementary/test_gfx_filters.c
View File

@ -378,7 +378,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_text_set(efl_added, "Flip"),
efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _flip_click, win));
efl_pack(box2, o);
}
@ -409,7 +409,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_object_tooltip_text_set(efl_added, images[k].src_name));
if (efl_player_playable_get(o))
efl_player_play_set(o, 1);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _img_click, win);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win);
efl_pack(box2, o);
}

29
src/bin/elementary/test_label.c
View File

@ -1,6 +1,11 @@
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* strcasestr */
#endif
#include <Elementary.h>
enum _slide_style
@ -396,6 +401,30 @@ test_label_colors(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
evas_object_show(win);
}
/*** Label variation sequence **************************************************************/
void
test_label_variation_sequence(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *win, *lb;
win = elm_win_util_standard_add("label-variation sequence", "Label variation sequnece");
elm_win_autodel_set(win, EINA_TRUE);
lb = elm_label_add(win);
elm_object_text_set(lb,
"You need to have at least on font contains variation sequence<br>"
"Three different 8 glyphs : <br>"
"8<tab>8&#xfe0f;<tab>8&#xfe0f;&#x20E3;<br>"
"line with 3 variation glyphs : <br>"
"8&#xfe0f;&#x20E3;&#x262a;&#xfe0f;AAA&#x262a;&#xfe0E;1234567&#xfe0f;&#x20E3;"
);
evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, lb);
evas_object_show(lb);
evas_object_show(win);
}
/*** Label Emoji *************************************************************/
static char *
_fontlist_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED)

5
src/bin/elementary/test_panel.c
View File

@ -1,6 +1,11 @@
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifdef _WIN32
# include <evil_private.h> /* mkdir */
#endif
#include <Elementary.h>
#define LIST_ITEM_MAX 20

6
src/bin/elementary/test_part_bg.c
View File

@ -181,9 +181,9 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
radio_group = _create_box_contents(vbox);
efl_event_callback_add(reset_btn, EFL_UI_EVENT_CLICKED, _reset_cb, radio_group);
efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group);
efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group);
efl_event_callback_add(reset_btn, EFL_INPUT_EVENT_CLICKED, _reset_cb, radio_group);
efl_event_callback_add(color_btn, EFL_INPUT_EVENT_CLICKED, _color_cb, radio_group);
efl_event_callback_add(scale_btn, EFL_INPUT_EVENT_CLICKED, _scale_type_cb, radio_group);
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
}

4
src/bin/elementary/test_part_shadow.c
View File

@ -181,12 +181,12 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_pack(bx, bt_bx);
bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start"));
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_start, td);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_start, td);
efl_pack(bt_bx, bt);
td->btn_start = bt;
bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Stop"));
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_stop, td);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_stop, td);
efl_ui_widget_disabled_set(bt, EINA_TRUE);
efl_pack(bt_bx, bt);
td->btn_stop = bt;

2
src/bin/elementary/test_photocam.c
View File

@ -827,7 +827,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_file_set(efl_added, buf),
efl_file_load(efl_added),
efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
);
if (efl_player_playable_get(zoomable))

18
src/bin/elementary/test_ui_button.c
View File

@ -42,18 +42,18 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Text"),
efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL)
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
);
// Icon Only Button
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL)
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
);
efl_add(EFL_UI_IMAGE_CLASS, btn,
efl_file_set(efl_added, buf),
@ -65,9 +65,9 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Text + Icon"),
efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL)
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
);
efl_add(EFL_UI_IMAGE_CLASS, btn,
efl_file_set(efl_added, buf),

2
src/bin/elementary/test_ui_clock.c
View File

@ -102,6 +102,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Back to the future..."),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}

4
src/bin/elementary/test_ui_image.c
View File

@ -573,13 +573,13 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
{
bt = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Image Reload"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _reload_clicked, win)
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _reload_clicked, win)
);
efl_pack(hbox, bt);
bt = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Image Switch"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _switch_clicked, win)
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _switch_clicked, win)
);
efl_pack(hbox, bt);
}

30
src/bin/elementary/test_ui_item_container.c
View File

@ -20,7 +20,7 @@ _scroll_to_animated_cb(void *data, const Efl_Event *ev EINA_UNUSED)
EINA_SAFETY_ON_NULL_RETURN(element_1154);
efl_ui_item_container_item_scroll(data, element_1154, EINA_TRUE);
efl_ui_collection_item_scroll(data, element_1154, EINA_TRUE);
}
static void
@ -30,7 +30,7 @@ _scroll_to_cb(void *data, const Efl_Event *ev EINA_UNUSED)
EINA_SAFETY_ON_NULL_RETURN(element_10);
efl_ui_item_container_item_scroll(data, element_10, EINA_FALSE);
efl_ui_collection_item_scroll(data, element_10, EINA_FALSE);
}
static void
@ -54,7 +54,7 @@ _change_min_size_cb(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
typedef struct {
Efl_Ui_Check *v, *h;
Efl_Ui_Item_Container *c;
Efl_Ui_Collection *c;
} Match_Content_Ctx;
static void
@ -76,7 +76,7 @@ _widget_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
}
static void
_add_item(Efl_Ui_Item_Container *c)
_add_item(Efl_Ui_Collection *c)
{
Efl_Class *itc = efl_key_data_get(c, "__item_class");
char buf[PATH_MAX];
@ -143,7 +143,7 @@ _add_thousend_items(void *data, const Efl_Event *ev EINA_UNUSED)
static void
_select_value_cb(void *data, const Efl_Event *ev)
{
Efl_Ui_Item_Container *c = data;
Efl_Ui_Collection *c = data;
efl_ui_select_mode_set(c, efl_ui_radio_group_selected_value_get(ev->object));
}
@ -160,8 +160,8 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
tbl = efl_add(EFL_UI_TABLE_CLASS, win);
efl_content_set(win, tbl);
item_container = o = efl_add(EFL_UI_ITEM_CONTAINER_CLASS, win,
efl_ui_item_container_position_manager_set(efl_added, manager));
item_container = o = efl_add(EFL_UI_COLLECTION_CLASS, win,
efl_ui_collection_position_manager_set(efl_added, manager));
efl_key_data_set(o, "__item_class", item);
efl_event_callback_add(o, EFL_EVENT_DEL, _widget_del_cb, ctx);
for (int i = 0; i < 2000; ++i)
@ -175,21 +175,21 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Scroll to 1154 ANIMATED");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_animated_cb, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_animated_cb, item_container);
efl_pack_table(tbl, o, 0, 1, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Scroll to 10");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_cb, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_cb, item_container);
efl_pack_table(tbl, o, 0, 2, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Change min size of 0");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _change_min_size_cb, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _change_min_size_cb, item_container);
efl_pack_table(tbl, o, 0, 3, 1, 1);
o = efl_add(EFL_UI_CHECK_CLASS, tbl,
@ -221,21 +221,21 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Remove all items");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _remove_all_cb, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _remove_all_cb, item_container);
efl_pack_table(tbl, o, 0, 7, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Add 1 item");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_one_item, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_one_item, item_container);
efl_pack_table(tbl, o, 0, 8, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Add 1000 item");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_thousend_items, item_container);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_thousend_items, item_container);
efl_pack_table(tbl, o, 0, 9, 1, 1);
bx = efl_add(EFL_UI_RADIO_BOX_CLASS, tbl,
@ -257,14 +257,14 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
efl_pack_end(bx, o);
}
void test_efl_ui_item_container_grid(void *data EINA_UNUSED,
void test_efl_ui_collection_grid(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
create_item_container_ui(efl_new(EFL_UI_POSITION_MANAGER_GRID_CLASS), EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Item_Container Grid");
}
void test_efl_ui_item_container_list(void *data EINA_UNUSED,
void test_efl_ui_collection_list(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{

87
src/bin/elementary/test_ui_items.c Normal file
View File

@ -0,0 +1,87 @@
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#include <Efl_Ui.h>
static Efl_Ui_Widget*
_item_add(Eo *box, const Efl_Class *c, int i)
{
Eo *check, *rect, *il = efl_add(c, box);
int r = 0, g = 0, b = 0;
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
efl_text_set(il, buf);
rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(il));
switch (i % 5)
{
case 0:
r = 255;
break;
case 1:
g = 255;
break;
case 2:
b = 255;
break;
case 3:
r = g = b = 255;
break;
case 4:
r = g = b = 0;
break;
}
efl_gfx_color_set(rect, r, g, b, 255);
efl_content_set(il, rect);
check = efl_add(EFL_UI_CHECK_CLASS, il);
efl_content_set(efl_part(il, "extra"), check);
if (c == EFL_UI_GRID_DEFAULT_ITEM_CLASS)
efl_gfx_hint_size_min_set(il, EINA_SIZE2D(100, 180));
else
efl_gfx_hint_size_min_set(il, EINA_SIZE2D(40, 40+(i%2)*40));
return il;
}
void test_efl_ui_item(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Eo *win, *box, *o;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
efl_text_set(efl_added, "Item examples"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
);
box = efl_add(EFL_UI_BOX_CLASS, win,
efl_content_set(win, efl_added));
o = _item_add(box, EFL_UI_GRID_DEFAULT_ITEM_CLASS, 1);
efl_pack_end(box, o);
o = _item_add(box, EFL_UI_GRID_DEFAULT_ITEM_CLASS, 2);
efl_ui_widget_disabled_set(o, EINA_TRUE);
efl_pack_end(box, o);
o = _item_add(box, EFL_UI_LIST_DEFAULT_ITEM_CLASS, 3);
efl_pack_end(box, o);
o = _item_add(box, EFL_UI_LIST_DEFAULT_ITEM_CLASS, 4);
efl_ui_widget_disabled_set(o, EINA_TRUE);
efl_pack_end(box, o);
o = efl_add(EFL_UI_LIST_PLACEHOLDER_ITEM_CLASS, box);
efl_gfx_hint_size_min_set(o, EINA_SIZE2D(40, 40+40));
efl_pack_end(box, o);
o = efl_add(EFL_UI_LIST_PLACEHOLDER_ITEM_CLASS, box);
efl_gfx_hint_size_min_set(o, EINA_SIZE2D(40, 40));
efl_ui_widget_disabled_set(o, EINA_TRUE);
efl_pack_end(box, o);
}

32
src/bin/elementary/test_ui_pager.c
View File

@ -337,7 +337,7 @@ static void page_size_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -439,7 +439,7 @@ static void pack_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -478,7 +478,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -496,7 +496,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -514,7 +514,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -532,7 +532,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -550,7 +550,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -569,7 +569,7 @@ static void pack_cb(void *data,
pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT;
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param);
@ -603,7 +603,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -624,7 +624,7 @@ static void current_page_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -656,7 +656,7 @@ static void current_page_cb(void *data,
psp->pager = pager;
psp->spinner = sp;
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
}
@ -670,7 +670,7 @@ static void indicator_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -680,13 +680,13 @@ static void indicator_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_none_btn_cb, params),
efl_pack_end(box, efl_added));
}
@ -735,13 +735,13 @@ void test_ui_pager(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, prev_btn_cb, pager),
EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, next_btn_cb, pager),
EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));

40
src/bin/elementary/test_ui_pager_scroll.c
View File

@ -391,7 +391,7 @@ static void page_size_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -491,7 +491,7 @@ static void padding_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -518,7 +518,7 @@ static void side_page_num_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -551,7 +551,7 @@ static void pack_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -590,7 +590,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -608,7 +608,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -626,7 +626,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -644,7 +644,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -662,7 +662,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -681,7 +681,7 @@ static void pack_cb(void *data,
pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT;
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param);
@ -715,7 +715,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -735,7 +735,7 @@ static void current_page_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -767,7 +767,7 @@ static void current_page_cb(void *data,
psp->pager = pager;
psp->spinner = sp;
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
}
@ -783,7 +783,7 @@ static void scroll_block_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -822,7 +822,7 @@ static void loop_cb(void *data EINA_UNUSED,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_RADIO_BOX_CLASS, navi,
@ -870,7 +870,7 @@ static void indicator_cb(void *data EINA_UNUSED,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -880,13 +880,13 @@ static void indicator_cb(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_none_btn_cb, params),
efl_pack_end(box, efl_added));
}
@ -936,13 +936,13 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, prev_btn_cb, pager),
EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, next_btn_cb, pager),
EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
tran = efl_add(EFL_PAGE_TRANSITION_SCROLL_CLASS, pager,

2
src/bin/elementary/test_ui_panel.c
View File

@ -154,7 +154,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_content_set(panel, list);
efl_event_callback_add(panel, EFL_UI_PANEL_EVENT_TOGGLED, _panel_toggled, check);
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _btn_clicked, panel);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _btn_clicked, panel);
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
}

84
src/bin/elementary/test_ui_popup.c
View File

@ -251,7 +251,7 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
efl_text_set(repeat_test_btn, "Repeat Event Test");
efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL);
efl_event_callback_add(repeat_test_btn, EFL_INPUT_EVENT_CLICKED, _repeat_test_cb, NULL);
efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
p_data->win = win;
@ -263,73 +263,73 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_text_set(create_btn, "Create Popup");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _create_cb, p_data);
Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(delete_btn, "Delete Popup");
efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data);
efl_event_callback_add(delete_btn, EFL_INPUT_EVENT_CLICKED, _delete_cb, p_data);
Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(repeat_event_btn, "Repeat Event Set");
efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data);
efl_event_callback_add(repeat_event_btn, EFL_INPUT_EVENT_CLICKED, _repeat_event_cb, p_data);
Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(dummy_btn, "Show Dummy Button");
efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data);
efl_event_callback_add(dummy_btn, EFL_INPUT_EVENT_CLICKED, _dummy_cb, p_data);
Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
efl_text_set(backwall_btn, "Backwall Set");
efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data);
efl_event_callback_add(backwall_btn, EFL_INPUT_EVENT_CLICKED, _backwall_cb, p_data);
Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(timeout_btn, "Timeout Set");
efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data);
efl_event_callback_add(timeout_btn, EFL_INPUT_EVENT_CLICKED, _timeout_set_cb, p_data);
Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(center_btn, "Center Align");
efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
efl_event_callback_add(center_btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data);
Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(top_btn, "Top Align");
efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
efl_event_callback_add(top_btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data);
Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(left_btn, "Left Align");
efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data);
Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(right_btn, "Right Align");
efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data);
Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(bottom_btn, "Bottom Align");
efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
efl_event_callback_add(bottom_btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data);
Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(position_btn, "Position Set (x:0, y:0)");
efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250));
efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50));
efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
efl_event_callback_add(position_btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data);
}
static void
@ -517,31 +517,31 @@ test_ui_scroll_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case5_cb, win);
}
static void
@ -900,85 +900,85 @@ test_ui_text_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case5_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case6_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case7_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case8_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case9_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case10_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case11_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case12_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case13_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win);
efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case14_cb, win);
}
static void
@ -1009,7 +1009,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win);
snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
efl_file_simple_load(layout, buf, "efl_ui_anchor_popup_layout");
efl_file_simple_load(layout, buf, "efl_ui_popup_anchor_layout");
efl_gfx_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_content_set(win, layout);
@ -1036,7 +1036,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(btn, "anchor");
efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup);
snprintf(buf, sizeof(buf), "anchor%d", i+1);
efl_content_set(efl_part(layout, buf), btn);
@ -1045,7 +1045,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(btn, "anchor none");
efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup);
efl_content_set(efl_part(layout, "anchor_none"), btn);
Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup);
@ -1054,43 +1054,43 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Center Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data);
efl_pack_table(table, btn, 0, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Top Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data);
efl_pack_table(table, btn, 2, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Bottom Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data);
efl_pack_table(table, btn, 4, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Left Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data);
efl_pack_table(table, btn, 0, 1, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Right Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data);
efl_pack_table(table, btn, 3, 1, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Position Set");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data);
efl_pack_table(table, btn, 0, 2, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Resize");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _popup_resize_cb, p_data);
efl_pack_table(table, btn, 3, 2, 3, 1);
efl_content_set(efl_ui_popup, table);

6
src/bin/elementary/test_ui_progressbar.c
View File

@ -224,20 +224,20 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "start"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_start_btn_clicked_cb, pd),
efl_pack(btbx, efl_added)
);
pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "stop"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_stop_btn_clicked_cb, pd),
efl_pack(btbx, efl_added)
);
pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "reset"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_reset_btn_clicked_cb, pd),
efl_pack(btbx, efl_added)
);

8
src/bin/elementary/test_ui_radio.c
View File

@ -94,7 +94,7 @@ void test_efl_ui_radio(void *data EINA_UNUSED,
Efl_Ui_Box *bx;
Eina_Array *arr;
Efl_Ui_Button *o;
Efl_Ui_Radio *uk;
Efl_Ui_Radio *uk = NULL;
win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
@ -119,18 +119,18 @@ void test_efl_ui_radio(void *data EINA_UNUSED,
o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 0, 1, 1);
efl_text_set(o, "Selected France check");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2));
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2));
o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 1, 1, 1);
efl_text_set(o, "Set value for Germany");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_btn_clicked, bx);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_btn_clicked, bx);
o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 2, 1, 1);
efl_text_set(o, "Set object for UK");
efl_key_data_set(o, "uk", uk);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_object_btn_clicked, bx);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_object_btn_clicked, bx);
eina_array_free(arr);
}

4
src/bin/elementary/test_ui_relative_layout.c
View File

@ -167,7 +167,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
efl_key_wref_set(efl_added, "to", to),
efl_key_wref_set(efl_added, "btn", btn),
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option),
efl_pack(hbox, efl_added));
efl_add(EFL_UI_SLIDER_CLASS, hbox,
@ -308,7 +308,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "button1"),
efl_gfx_hint_align_set(efl_added, 0.0, 0.0),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_color_clicked_cb, layout),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_color_clicked_cb, layout),
efl_ui_relative_layout_relation_right_set(layout, efl_added, layout, 0.0),
efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0));

16
src/bin/elementary/test_ui_scroller.c
View File

@ -60,7 +60,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
@ -76,7 +76,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
{
efl_add(EFL_UI_BUTTON_CLASS, bx2,
efl_text_set(efl_added, "... Horizontal scrolling ..."),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx2, efl_added));
}
@ -86,7 +86,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
@ -114,7 +114,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
{
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Both"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack_table(gd2, efl_added, i, j, 1, 1));
}
}
@ -125,7 +125,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
}
@ -161,7 +161,7 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
}
@ -197,13 +197,13 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack_table(tb, efl_added, 0, i, 1, 1));
efl_add(EFL_UI_BUTTON_CLASS, tb,
efl_text_set(efl_added, "Horizontal"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack_table(tb, efl_added, 1, i, 1, 1));
}
}

4
src/bin/elementary/test_ui_spin.c
View File

@ -58,12 +58,12 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Increse Spinner value"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _inc_clicked, sp),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _inc_clicked, sp),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Decrease Spinner value"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _dec_clicked, sp),
efl_pack(bx, efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 120));

46
src/bin/elementary/test_ui_spotlight.c
View File

@ -101,7 +101,7 @@ view_add(View_Type p, Eo *parent)
case BUTTON:
page = efl_add(EFL_UI_BUTTON_CLASS, parent,
efl_text_set(efl_added, "Button Page"));
efl_event_callback_add(page, EFL_UI_EVENT_CLICKED, page_clicked_cb, NULL);
efl_event_callback_add(page, EFL_INPUT_EVENT_CLICKED, page_clicked_cb, NULL);
efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
break;
@ -347,7 +347,7 @@ indicator_icon_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
Params *params = data;
params->indicator = efl_add(EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS, params->spotlight);
params->indicator = efl_new(EFL_UI_SPOTLIGHT_INDICATOR_ICON_CLASS);
efl_ui_spotlight_indicator_set(params->spotlight, params->indicator);
}
@ -370,7 +370,7 @@ spotlight_size(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -479,7 +479,7 @@ view_animation_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -508,7 +508,7 @@ pack_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -549,7 +549,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -567,7 +567,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -585,7 +585,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -603,7 +603,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -621,7 +621,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -640,7 +640,7 @@ pack_cb(void *data,
pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT;
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param);
@ -674,7 +674,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@ -695,7 +695,7 @@ active_index_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -727,7 +727,7 @@ active_index_cb(void *data,
psp->spotlight = spotlight;
psp->spinner = sp;
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
}
@ -742,7 +742,7 @@ indicator_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -752,13 +752,13 @@ indicator_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_none_btn_cb, params),
efl_pack_end(box, efl_added));
}
@ -810,13 +810,13 @@ test_ui_spotlight_stack(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));
@ -910,13 +910,13 @@ test_ui_spotlight_plain(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));
@ -1011,13 +1011,13 @@ test_ui_spotlight_scroll(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));

12
src/bin/elementary/test_ui_stack.c
View File

@ -70,7 +70,7 @@ _bar_left_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
efl_text_set(left_btn, "Prev");
efl_content_set(efl_part(bn, "left_content"), left_btn);
efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data);
//Positions of "left_content" and "back_button" are the same.
efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE);
@ -85,7 +85,7 @@ _bar_right_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
efl_text_set(right_btn, "Next");
efl_content_set(efl_part(bn, "right_content"), right_btn);
efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data);
}
static void
@ -95,7 +95,7 @@ _fifth_layout_insert(void *data, const Efl_Event *ev EINA_UNUSED)
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to remove top layout");
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_remove, stack);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_remove, stack);
Eo *nl = _navigation_layout_create(stack, "5th layout", btn);
@ -109,7 +109,7 @@ _third_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to pop");
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_pop, stack);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_pop, stack);
Eo *nl = _navigation_layout_create(stack, "3rd layout", btn);
@ -125,7 +125,7 @@ _second_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to double push");
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_double_push, stack);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_double_push, stack);
Eo *nl = _navigation_layout_create(stack, "2nd layout", btn);
@ -139,7 +139,7 @@ _first_layout_push(Eo *win, Eo *stack)
{
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to delete stack");
efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_del, stack);
efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_del, stack);
Eo *nl = _navigation_layout_create(stack, "1st layout", btn);

40
src/bin/elementary/test_ui_tab_pager.c
View File

@ -222,7 +222,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@ -238,7 +238,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Current Tab Page Set"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tab_set_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tab_set_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _tab_set_btn_del_cb, tsd),
efl_pack_end(box, efl_added));
}
@ -327,7 +327,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@ -336,25 +336,25 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Pack Begin */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Pack End */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_end_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_end_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Pack Before */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Tab Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_before_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_before_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Pack After */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Tab Page"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_after_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_after_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
in_box = efl_add(EFL_UI_BOX_CLASS, box,
@ -373,7 +373,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Pack At */
btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
efl_text_set(efl_added, "Pack At"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_at_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_at_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _pack_at_btn_del_cb, tsd),
efl_pack_end(in_box, efl_added));
}
@ -431,7 +431,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@ -440,20 +440,20 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Clear */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clear_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clear_btn_cb, tab_pager),
efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(box, efl_added));
/* Unpack */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unpack"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Unpack All */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unpack All"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager),
efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(box, efl_added));
@ -473,7 +473,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Unpack At */
btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
efl_text_set(efl_added, "Unpack At"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_at_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_at_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _unpack_at_btn_del_cb, tsd),
efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(in_box, efl_added));
@ -526,7 +526,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@ -548,7 +548,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Change"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _change_btn_cb, tcd),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _change_btn_cb, tcd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _change_btn_del_cb, tcd),
efl_pack_end(box, efl_added));
}
@ -558,7 +558,6 @@ _tran_set_btn_scroll_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
Efl_Ui_Spotlight_Manager_Scroll *scroll = efl_new(EFL_UI_SPOTLIGHT_MANAGER_SCROLL_CLASS);
efl_ui_spotlight_manager_set(data, scroll);
efl_unref(scroll);
}
static void
@ -566,7 +565,6 @@ _tran_set_btn_stack_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
Efl_Ui_Spotlight_Manager_Scroll *stack = efl_new(EFL_UI_SPOTLIGHT_MANAGER_STACK_CLASS);
efl_ui_spotlight_manager_set(data, stack);
efl_unref(stack);
}
static void
@ -588,7 +586,7 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@ -596,15 +594,15 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Scroll"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager),
efl_pack_end(box, efl_added));
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Stack"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager),
efl_pack_end(box, efl_added));
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unset"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
}

12
src/bin/elementary/test_ui_table.c
View File

@ -543,7 +543,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
efl_text_set(o, btn_text("appended"));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
elm_object_tooltip_text_set(o, "Click to unpack");
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
@ -597,7 +597,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_content_set(o, ico);
elm_object_text_set(o, "Append");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, append_cb, table);
efl_pack(hbox, o);
efl_gfx_entity_visible_set(o, 1);
@ -606,7 +606,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_content_set(o, ico);
elm_object_text_set(o, "Clear");
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, clear_cb, table);
efl_pack(hbox, o);
efl_gfx_entity_visible_set(o, 1);
@ -657,7 +657,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
@ -665,7 +665,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
@ -673,7 +673,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);

4
src/bin/elementary/test_ui_table_static.c
View File

@ -133,7 +133,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
bt = elm_button_add(win);
elm_object_text_set(bt, "Next API function");
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _api_bt_clicked, api);
efl_pack_table(table, bt, 30, 0, 40, 10);
elm_object_disabled_set(bt, api->state == API_STATE_LAST);
efl_gfx_entity_visible_set(bt, 1);
@ -162,7 +162,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
bt = elm_button_add(win);
elm_object_text_set(bt, "Change");
efl_pack_table(table, bt, 40, 40, 20, 20);
efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table);
efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _ch_table, table);
efl_gfx_entity_visible_set(bt, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);

2
src/bin/elementary/test_ui_tags.c
View File

@ -83,7 +83,7 @@ test_ui_tags(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Change mode"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, tags),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, tags),
elm_object_part_content_set(layout, "box", efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 480));

8
src/bin/elementary/test_win_indicator.c
View File

@ -106,18 +106,18 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Indicator Off"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _off_clicked, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _off_clicked, win),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Bg Opaque"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _opaque_clicked, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _opaque_clicked, win),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Bg Transparent"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _transparent_clicked, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _transparent_clicked, win),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Hidden"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _hidden_clicked, win),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _hidden_clicked, win),
efl_pack(bx, efl_added));
}

5
src/bin/elementary/test_win_modal.c
View File

@ -27,6 +27,11 @@ test_win_modal(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_U
{
Evas_Object *parent_win, *win, *bg, *txt, *bx, *bt;
if (!obj)
{
fprintf(stderr, "The modal win test can only be run by clicking the button for it in the main elementary_test window.\n");
return;
}
parent_win = _parent_win_get(obj);
win = elm_win_add(parent_win, "modal", ELM_WIN_BASIC);

5
src/bin/elementary/test_win_plug.c
View File

@ -196,7 +196,10 @@ test_win_plug(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UN
evas_object_event_callback_add(plug, EVAS_CALLBACK_DEL, _timer_del, NULL);
if (!elm_plug_connect(plug, "ello", 0, EINA_FALSE))
{
_notify_error(data, "Unable to connect to the Window Socket!");
if (data)
_notify_error(data, "Unable to connect to the Window Socket!");
else
fprintf(stderr, "Unable to connect to the Window Socket!\n");
evas_object_del(win);
return;
}

6
src/bin/eolian_mono/eolian/mono/klass.hh
View File

@ -204,7 +204,8 @@ struct klass
if (!as_generator
(
scope_tab << "/// <summary>Constructor to be used when objects are expected to be constructed from native code.</summary>\n"
scope_tab << "/// <summary>Subclasses should override this constructor if they are expected to be instantiated from native code.\n"
<< scope_tab << "/// Do not call this constructor directly.</summary>\n"
<< scope_tab << "/// <param name=\"ch\">Tag struct storing the native handle of the object being constructed.</param>\n"
<< scope_tab << "private " << concrete_name << "(ConstructingHandle ch) : base(ch)\n"
<< scope_tab << "{\n"
@ -511,7 +512,8 @@ struct klass
<< (*(scope_tab << scope_tab << constructor_invocation << "\n"))
<< scope_tab << scope_tab << "FinishInstantiation();\n"
<< scope_tab << "}\n\n"
<< scope_tab << "/// <summary>Constructor to be used when objects are expected to be constructed from native code.</summary>\n"
<< scope_tab << "/// <summary>Subclasses should override this constructor if they are expected to be instantiated from native code.\n"
<< scope_tab << "/// Do not call this constructor directly.</summary>\n"
<< scope_tab << "/// <param name=\"ch\">Tag struct storing the native handle of the object being constructed.</param>\n"
<< scope_tab << "protected " << inherit_name << "(ConstructingHandle ch) : base(ch)\n"
<< scope_tab << "{\n"

7
src/bindings/mono/eo_mono/iwrapper.cs
View File

@ -569,11 +569,8 @@ public class Globals
/// <summary>Creates a new wrapper for the given Eo id.
///
/// <para>If the Eo was created from a non-generated class (i.e. C#-pure class), it returns
/// the C# instance handle stored in the Eo's private data.</para>
///
/// <para>For generated-class Eo instance, we use reflection to get the correct C# type to re-wrap
/// it.</para>
/// <para>If the Eo have a WrapperSupervisor, it returns the C# instance handle stored in its
/// WrapperSupervisor. otherwise, we use reflection to get the correct C# type to re-wrap it.</para>
/// </summary>
///
/// <param name="handle">The Eo id to be wrapped.</param>

82
src/bindings/mono/eo_mono/workaround.cs
View File

@ -108,6 +108,88 @@ public struct EventDescription
}
};
/// <summary>
/// A parameter passed in event callbacks holding extra event parameters.
/// This is the full event information passed to callbacks in C.
/// (Since EFL 1.22)
/// </summary>
[StructLayout(LayoutKind.Sequential)]
[Efl.Eo.BindingEntity]
public struct Event
{
/// <summary>The object the callback was called on.
/// (Since EFL 1.22)</summary>
public Efl.Object Object;
/// <summary>The event description.
/// (Since EFL 1.22)</summary>
public Efl.EventDescription Desc;
/// <summary>Extra event information passed by the event caller.
/// Must be cast to the event type declared in the EO file. Keep in mind that:
/// 1) Objects are passed as a normal Eo*. Event subscribers can call functions on these objects.
/// 2) Structs, built-in types and containers are passed as const pointers, with one level of indirection.
/// (Since EFL 1.22)</summary>
public System.IntPtr Info;
/// <summary>Constructor for Event.</summary>
public Event(
Efl.Object obj = default(Efl.Object),
Efl.EventDescription desc = default(Efl.EventDescription),
System.IntPtr info = default(System.IntPtr))
{
this.Object = obj;
this.Desc = desc;
this.Info = info;
}
/// <summary>Implicit conversion to the managed representation from a native pointer.</summary>
/// <param name="ptr">Native pointer to be converted.</param>
public static implicit operator Event(IntPtr ptr)
{
var tmp = (Event.NativeStruct) Marshal.PtrToStructure(ptr, typeof(Event.NativeStruct));
return tmp;
}
/// <summary>Internal wrapper for struct Event.</summary>
[StructLayout(LayoutKind.Sequential)]
public struct NativeStruct
{
/// <summary>Internal wrapper for field Object</summary>
public System.IntPtr Object;
/// <summary>Internal wrapper for field Desc</summary>
public System.IntPtr Desc;
/// <summary>Internal wrapper for field Info</summary>
public System.IntPtr Info;
/// <summary>Implicit conversion to the internal/marshalling representation.</summary>
/// <param name="externalStruct">Managed struct to be converted.</param>
/// <returns>Native representation of the managed struct.</returns>
public static implicit operator Event.NativeStruct(Event externalStruct)
{
var internalStruct = new Event.NativeStruct();
internalStruct.Object = externalStruct.Object?.NativeHandle ?? System.IntPtr.Zero;
internalStruct.Desc = Eina.PrimitiveConversion.ManagedToPointerAlloc(externalStruct.Desc);
internalStruct.Info = externalStruct.Info;
return internalStruct;
}
/// <summary>Implicit conversion to the managed representation.</summary>
/// <param name="internalStruct">Native struct to be converted.</param>
/// <returns>Managed representation of the native struct.</returns>
public static implicit operator Event(Event.NativeStruct internalStruct)
{
var externalStruct = new Event();
externalStruct.Object = (Efl.Object) Efl.Eo.Globals.CreateWrapperFor(internalStruct.Object);
externalStruct.Desc = Eina.PrimitiveConversion.PointerToManaged<Efl.EventDescription>(internalStruct.Desc);
externalStruct.Info = internalStruct.Info;
return externalStruct;
}
}
}
public delegate void EventCb(System.IntPtr data, ref Event.NativeStruct evt);
public delegate void FreeWrapperSupervisorCb(System.IntPtr obj);

3
src/examples/ecore_avahi/ecore_avahi_browse_example.c
View File

@ -151,8 +151,9 @@ _ecore_avahi_client_cb(AvahiClient *c, AvahiClientState state, void * userdata)
ecore_main_loop_quit();
break;
}
break;
case AVAHI_CLIENT_CONNECTING:
FREE_CLEAN(example->sb, avahi_service_browser_free);
break;

15
src/examples/edje/edje-text.c
View File

@ -77,9 +77,20 @@ _on_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o, void
static void
_on_mouse_down_text(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
{
static char *env_lang_str = NULL;
char *s;
lang_idx = (lang_idx + 1) % (sizeof (lang)/ sizeof (lang[0]));
fprintf(stderr, "Setting lang to '%s'\n", lang[lang_idx]);
setenv("LANGUAGE", lang[lang_idx], 1);
s = malloc(10 + strlen(lang[lang_idx]));
if (s)
{
strcpy(s, "LANGUAGE=");
strcpy(s + 9, lang[lang_idx]);
putenv(s);
if (env_lang_str) free(env_lang_str);
env_lang_str = s;
}
edje_language_set(lang[lang_idx]);
}
int
@ -122,7 +133,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
evas_object_move(edje_obj, 0, 20);
evas_object_resize(edje_obj, WIDTH - 40, HEIGHT - 40);
evas_object_show(edje_obj);
setenv("LANGUAGE", "en_IN", 1);
putenv("LANGUAGE=en_IN");
edje_object_language_set(edje_obj, "en_IN");
edje_object_text_change_cb_set(edje_obj, _on_text_change, NULL);
edje_object_part_text_set(edje_obj, "part_two", "<b>Click here");

4
src/examples/elementary/button_cxx_example_00.cc
View File

@ -29,7 +29,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto cb(std::bind([wbt]() {
std::cout << wbt->text_get() << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, bt, cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, bt, cb);
efl::ui::Button bt2(instantiate, win);
bt2.text_set("Click to quit");
@ -39,7 +39,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto cb2(std::bind([wwin]() {
::efl_del(wwin->_eo_ptr()); // FIXME: No proper C++ API to delete win
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, bt2, cb2);
efl::eolian::event_add(efl::input::Clickable::clicked_event, bt2, cb2);
win.size_set({320,160});
}

20
src/examples/elementary/button_cxx_example_01.cc
View File

@ -67,17 +67,17 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
wright->autorepeat_gap_timeout_set(t);
}
}, std::placeholders::_1);
efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn, btn_options);
efl::eolian::event_add(efl::input::Clickable::clicked_event, btn, btn_options);
efl::ui::Button btn2(instantiate, win);
btn2.text_set("Initial: 1.0");
box_initial.pack_end(btn2);
efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn2, btn_options);
efl::eolian::event_add(efl::input::Clickable::clicked_event, btn2, btn_options);
efl::ui::Button btn3(instantiate, win);
btn3.text_set("Initial: 5.0");
box_initial.pack_end(btn3);
efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn3, btn_options);
efl::eolian::event_add(efl::input::Clickable::clicked_event, btn3, btn_options);
efl::ui::Box box_gap(instantiate, win);
box_gap.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
@ -87,17 +87,17 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl::ui::Button btn4(instantiate, win);
btn4.text_set("Gap: 0.1");
box_gap.pack_end(btn4);
efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn4, btn_options);
efl::eolian::event_add(efl::input::Clickable::clicked_event, btn4, btn_options);
efl::ui::Button btn5(instantiate, win);
btn5.text_set("Gap: 0.5");
box_gap.pack_end(btn5);
efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn5, btn_options);
efl::eolian::event_add(efl::input::Clickable::clicked_event, btn5, btn_options);
efl::ui::Button btn6(instantiate, win);
btn6.text_set("Gap: 1.0");
box_gap.pack_end(btn6);
efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn6, btn_options);
efl::eolian::event_add(efl::input::Clickable::clicked_event, btn6, btn_options);
up.autorepeat_enabled_set(true);
up.autorepeat_initial_timeout_set(1.0);
@ -169,7 +169,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
icon_still = nullptr;
}
});
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, up, btn_cursors_release);
efl::eolian::event_add(efl::input::Clickable::unpressed_event, up, btn_cursors_release);
efl::ui::Image icon_up(instantiate, win);
icon_up.icon_set("arrow_up");
@ -188,7 +188,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
left.hint_align_set(0.0, 0.5);
box_inferior.pack_end(left);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, left, btn_cursors_move);
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, left, btn_cursors_release);
efl::eolian::event_add(efl::input::Clickable::unpressed_event, left, btn_cursors_release);
efl::ui::Image icon_left(instantiate, win);
icon_left.icon_set("arrow_left");
@ -208,7 +208,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
right.hint_align_set(0.0, 0.5);
box_inferior.pack_end(right);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, right, btn_cursors_move);
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, right, btn_cursors_release);
efl::eolian::event_add(efl::input::Clickable::unpressed_event, right, btn_cursors_release);
efl::ui::Image icon_right(instantiate, win);
icon_right.icon_set("arrow_right");
@ -222,7 +222,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
down.hint_align_set(0.5, 0.0);
box.pack_end(down);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, down, btn_cursors_move);
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, down, btn_cursors_release);
efl::eolian::event_add(efl::input::Clickable::unpressed_event, down, btn_cursors_release);
efl::ui::Image icon_down(instantiate, win);
icon_down.icon_set("arrow_down");

20
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -30,7 +30,7 @@ _list_selected(void *data EINA_UNUSED, const Efl_Event *ev)
Eo *item = ev->info, *tmp;
printf("list item [%p:%d] is %s\n", item, efl_ui_item_index_get(item), (efl_ui_item_selected_get(item)? "selected" : "unselected"));
Eina_Iterator *selects = efl_ui_item_container_selected_items_get(list);
Eina_Iterator *selects = efl_ui_collection_selected_items_get(list);
EINA_ITERATOR_FOREACH(selects, tmp)
printf("selected [%p:%d] ", tmp, efl_ui_item_index_get(tmp));
@ -82,18 +82,18 @@ _anim_radio_changed(void *data, const Efl_Event *ev EINA_UNUSED)
static void
_scrl_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
Efl_Ui_List_Item *item = efl_ui_item_container_last_selected_item_get(priv_d.list);
Efl_Ui_List_Default_Item *item = efl_ui_collection_last_selected_item_get(priv_d.list);
printf("show [%d:%p] [%d]\n", efl_ui_item_index_get(item), item, priv_d.anim);
efl_ui_item_container_item_scroll(priv_d.list, item, priv_d.anim);
efl_ui_collection_item_scroll(priv_d.list, item, priv_d.anim);
}
static void
_scrl_align_btn_clicked(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
Efl_Ui_List_Item *item = efl_ui_item_container_last_selected_item_get(priv_d.list);
Efl_Ui_List_Default_Item *item = efl_ui_collection_last_selected_item_get(priv_d.list);
double align = efl_ui_range_value_get(priv_d.slider);
printf("show [%d:%p] [%.2lf], [%d]\n", efl_ui_item_index_get(item), item, align, priv_d.anim);
efl_ui_item_container_item_scroll_align(priv_d.list, item, align, priv_d.anim);
efl_ui_collection_item_scroll_align(priv_d.list, item, align, priv_d.anim);
}
EAPI_MAIN int
@ -129,9 +129,9 @@ elm_main(int argc EINA_UNUSED, char **argv)
efl_event_callback_add(list, EFL_UI_EVENT_ITEM_SELECTED, _list_selected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_ITEM_UNSELECTED, _list_unselected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL);
efl_event_callback_add(list, EFL_INPUT_EVENT_PRESSED, _list_pressed, NULL);
efl_event_callback_add(list, EFL_INPUT_EVENT_UNPRESSED, _list_unpressed, NULL);
efl_event_callback_add(list, EFL_INPUT_EVENT_LONGPRESSED, _list_longpressed, NULL);
for (i = 0; i < NUM_ITEMS; i++)
{
@ -299,14 +299,14 @@ elm_main(int argc EINA_UNUSED, char **argv)
efl_text_set(scrl_btn, "Scroll Item");
efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5);
efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25));
efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_btn_clicked, NULL);
efl_event_callback_add(scrl_btn, EFL_INPUT_EVENT_CLICKED, _scrl_btn_clicked, NULL);
efl_pack_end(rbox, scrl_btn);
scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox);
efl_text_set(scrl_btn, "Scroll Item Align");
efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5);
efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25));
efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_align_btn_clicked, NULL);
efl_event_callback_add(scrl_btn, EFL_INPUT_EVENT_CLICKED, _scrl_align_btn_clicked, NULL);
efl_pack_end(rbox, scrl_btn);
efl_pack_end(bbox, rbox);

2
src/examples/elementary/efl_ui_slideshow_example.c
View File

@ -110,7 +110,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack_table(table, efl_added, 0, 1, 1, 1),
efl_text_set(efl_added, "Play"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _play_toggle, NULL));
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _play_toggle, NULL));
efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200));
}

2
src/examples/elementary/efl_ui_theme_example_01.c
View File

@ -62,7 +62,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unload extension"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_extension_clicked_cb, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_extension_clicked_cb, NULL),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,

2
src/examples/elementary/efl_ui_theme_example_02.c
View File

@ -62,7 +62,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unload overlay"),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_overlay_clicked_cb, NULL),
efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_overlay_clicked_cb, NULL),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,

1
src/examples/elementary/fileselector_example.c
View File

@ -10,6 +10,7 @@
*/
#include <Elementary.h>
#include <locale.h>
/* 'done' cb */
static void

26
src/examples/elementary/popup_cxx_example.cc
View File

@ -84,7 +84,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto repeat_events_test_cb(std::bind([]() {
std::cout << "Repeat Test Button is clicked" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, repeat_events_test_btn, repeat_events_test_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, repeat_events_test_btn, repeat_events_test_cb);
g_repeat_events_test_btn = repeat_events_test_btn;
@ -110,7 +110,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
}
}
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, create_btn, create_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, create_btn, create_cb);
//Delete Button
@ -128,7 +128,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
else
std::cout << "Efl.Ui.Popup does not exist" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, delete_btn, delete_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, delete_btn, delete_cb);
//Repeat Events Button
@ -156,7 +156,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
repeat_events_btn.text_set("Unset Repeat Events");
}
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, repeat_events_btn, repeat_events_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, repeat_events_btn, repeat_events_cb);
//Dummy Button
@ -184,7 +184,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
dummy_btn.text_set("Hide Dummy Button");
}
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, dummy_btn, dummy_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, dummy_btn, dummy_cb);
//Backwall Button
@ -215,7 +215,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
backwall_btn.text_set("Set Backwall");
}
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, backwall_btn, backwall_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, backwall_btn, backwall_cb);
//Timeout Button
@ -230,7 +230,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.timeout_set(3);
std::cout << "Timeout is set to 3 seconds" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, timeout_btn, timeout_set_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, timeout_btn, timeout_set_cb);
//Center Button
@ -245,7 +245,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_CENTER);
std::cout << "Align Center" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, center_btn, center_align_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, center_btn, center_align_cb);
//Top Button
@ -260,7 +260,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_TOP);
std::cout << "Align Top" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, top_btn, top_align_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, top_btn, top_align_cb);
//Left Button
@ -275,7 +275,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_LEFT);
std::cout << "Align Left" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, left_btn, left_align_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, left_btn, left_align_cb);
//Right Button
@ -290,7 +290,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_RIGHT);
std::cout << "Align Right" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, right_btn, right_align_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, right_btn, right_align_cb);
//Bottom Button
@ -305,7 +305,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_BOTTOM);
std::cout << "Align Bottom" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, bottom_btn, bottom_align_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, bottom_btn, bottom_align_cb);
//Position Button
@ -320,6 +320,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.position_set({0, 0});
std::cout << "Position is set to (0, 0)" << std::endl;
}));
efl::eolian::event_add(efl::ui::Clickable::clicked_event, position_btn, position_set_cb);
efl::eolian::event_add(efl::input::Clickable::clicked_event, position_btn, position_set_cb);
}
EFL_MAIN()

8
src/examples/elementary/twitter_example_01.js
View File

@ -13,10 +13,10 @@ Twitter = require('twitter');
user_acount = 'EnlightenmentKo'
var twit = new Twitter({
consumer_key: 'ZbSM93w5Sp2cyZ2SG0XuCvoHV',
consumer_secret: 'g8N7EEQLpdKPnAsS9hWuQV29FYjBkhH62jhZzXyYymDw87DKye',
access_token_key: '222611263-pPhKKjYh59uuNLP0b86sP7aAtLhdecjVQaEsCDCv',
access_token_secret: 'l7ccNKXTVv6cymfSD1gQH61tmfixkdna2QmOjPtpVxSHD'
consumer_key: '', // replace with consumer_key
consumer_secret: '', // replace with consumer_secret
access_token_key: '', // replace with access_token_key
access_token_secret: '' // replace with access_token_secret
});
win = new efl.Efl.Ui.Win(null, "Efl JS Example", efl.Efl.Ui.Win.Type.BASIC, "hw");

2
src/examples/evas/evas-3d-blending.c
View File

@ -266,7 +266,7 @@ main(void)
if (!ecore_evas_init()) return 0;
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
ecore_evas = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
if (!ecore_evas) return 0;

2
src/examples/evas/evas-3d-cube.c
View File

@ -218,7 +218,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
Scene_Data data;

2
src/examples/evas/evas-3d-cube2.c
View File

@ -213,7 +213,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
Scene_Data data;

2
src/examples/evas/evas-3d-eet.c
View File

@ -98,7 +98,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-fog.c
View File

@ -190,7 +190,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
Scene_Data data;
Ecore_Animator *anim;

2
src/examples/evas/evas-3d-frustum.c
View File

@ -405,7 +405,7 @@ main(void)
if (!ecore_evas_init()) return 0;
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
ecore_evas = ecore_evas_new("opengl_x11", 0, 0, WIDTH, HEIGHT, NULL);
if (!ecore_evas) return 0;

2
src/examples/evas/evas-3d-hull.c
View File

@ -412,7 +412,7 @@ main(void)
Scene_Data data;
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-md2.c
View File

@ -75,7 +75,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-mmap-set.c
View File

@ -165,7 +165,7 @@ main(void)
Eina_File *obj_file, *ply_file, *eet_file, *md2_file;
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-obj.c
View File

@ -143,7 +143,7 @@ main(void)
char buffer[PATH_MAX], full_file_path[PATH_MAX + 4];
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-parallax-occlusion.c
View File

@ -217,7 +217,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
Scene_Data data;

2
src/examples/evas/evas-3d-pick.c
View File

@ -101,7 +101,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-ply.c
View File

@ -114,7 +114,7 @@ main(void)
}
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;

2
src/examples/evas/evas-3d-proxy.c
View File

@ -201,7 +201,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
Scene_Data data;

2
src/examples/evas/evas-3d-shadows.c
View File

@ -626,7 +626,7 @@ main(void)
Eina_List *nodes1 = NULL, *nodes2 = NULL;
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
if (!ecore_evas_init()) return 0;
ecore_evas = ecore_evas_new(NULL, 10, 10, WIDTH, HEIGHT, NULL);

2
src/examples/evas/evas-3d-static-lod.c
View File

@ -235,7 +235,7 @@ int
main(void)
{
// Unless Evas 3D supports Software renderer, we force use of the gl backend.
setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
putenv("ECORE_EVAS_ENGINE=opengl_x11");
Scene_Data data;

2
src/examples/evas/evas-vg-batman.c
View File

@ -104,7 +104,7 @@ main(void)
if (!ecore_evas_init())
return -1;
//setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1);
//putenv("ECORE_EVAS_ENGINE=opengl_x11");
ee = ecore_evas_new(NULL, 0, 0, WIDTH, HEIGHT, NULL);
if (!ee) return -1;

2
src/examples/evas/evas-vg-json.c
View File

@ -59,7 +59,7 @@ int
main(void)
{
//Cairo backend is not supported.
setenv("ECTOR_BACKEND", "default", 1);
putenv("ECTOR_BACKEND=default");
if (!ecore_evas_init())
return EXIT_FAILURE;

6
src/lib/ecore/ecore_main.c
View File

@ -331,6 +331,7 @@ _ecore_main_uv_poll_cb(uv_poll_t *handle, int status, int events)
{
DBG("not IDLE anymore");
_ecore_main_uv_idling = EINA_FALSE;
eina_file_statgen_next();
efl_event_callback_call(obj, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
_ecore_animator_run_reset();
}
@ -794,6 +795,7 @@ _ecore_main_gsource_dispatch(GSource *source EINA_UNUSED,
if (ecore_idling && events_ready)
{
_ecore_animator_run_reset();
eina_file_statgen_next();
efl_event_callback_call(obj, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
ecore_idling = 0;
}
@ -808,6 +810,7 @@ _ecore_main_gsource_dispatch(GSource *source EINA_UNUSED,
if (ecore_fds_ready || events_ready || timers_ready)
{
_ecore_animator_run_reset();
eina_file_statgen_next();
efl_event_callback_call(obj, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
ecore_idling = 0;
}
@ -867,6 +870,7 @@ _ecore_main_loop_timer_run(uv_timer_t *timer EINA_UNUSED)
if (_ecore_main_uv_idling)
{
_ecore_main_uv_idling = EINA_FALSE;
eina_file_statgen_next();
efl_event_callback_call(obj, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
_ecore_animator_run_reset();
}
@ -2243,6 +2247,7 @@ _ecore_main_loop_uv_prepare(uv_prepare_t *handle EINA_UNUSED)
if (_ecore_main_uv_idling)
{
eina_file_statgen_next();
efl_event_callback_call(obj, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
_ecore_animator_run_reset();
_ecore_main_uv_idling = EINA_FALSE;
@ -2473,6 +2478,7 @@ process_all: //-*********************************************************
if (!once_only)
{
_ecore_animator_run_reset(); // XXX:
eina_file_statgen_next();
efl_event_callback_call(obj, EFL_LOOP_EVENT_IDLE_EXIT, NULL);
}
// call the fd handler per fd that became alive...

4
src/lib/ecore/efl_threadio.eo
View File

@ -3,14 +3,14 @@ import efl_object;
function @beta EFlThreadIOCall {
[[ A Function to call on the "other end" of a thread obvject ]]
params {
@cref event: Efl.Event; [[ ]]
@in event: const(event); [[ ]]
}
};
function @beta EFlThreadIOCallSync {
[[ A Function to call on the "other end" of a thread obvject ]]
params {
@cref event: Efl.Event; [[ ]]
@in event: const(event); [[ ]]
}
return: void_ptr; [[ ]]
};

6
src/lib/ecore_con/ecore_con_local.c
View File

@ -10,7 +10,11 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <pwd.h>
#ifdef _WIN32
# include <evil_private.h> /* mkdir */
#else
# include <pwd.h>
#endif
#include <libgen.h>
#ifdef HAVE_SYSTEMD

2
src/lib/ecore_win32/Ecore_Win32.h
View File

@ -6,6 +6,7 @@
* THE API MAY CHANGE.
*/
/*
#ifndef ECORE_WIN32_WIP_POZEFLKSD
# ifdef _MSC_VER
# pragma message ("You are using a work in progress API. This API is not stable")
@ -15,6 +16,7 @@
# warning "and is subject to change. You use this at your own risk."
# endif
#endif
*/
#include <Eina.h>

7
src/lib/ector/software/ector_software_rasterizer.c
View File

@ -54,6 +54,7 @@ _blend_alpha(int count, const SW_FT_Span *spans, void *user_data)
Span_Data *sd = user_data;
const int pix_stride = sd->raster_buffer->stride / 4;
Ector_Software_Buffer_Base_Data *mask = sd->mask;
if (!mask || !mask->pixels.u32) return;
// multiply the color with mul_col if any
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
@ -97,6 +98,7 @@ _blend_alpha_inv(int count, const SW_FT_Span *spans, void *user_data)
Span_Data *sd = user_data;
const int pix_stride = sd->raster_buffer->stride / 4;
Ector_Software_Buffer_Base_Data *mask = sd->mask;
if (!mask || !mask->pixels.u32) return;
// multiply the color with mul_col if any
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
@ -140,6 +142,7 @@ _blend_mask_add(int count, const SW_FT_Span *spans, void *user_data)
{
Span_Data *sd = user_data;
Ector_Software_Buffer_Base_Data *mask = sd->mask;
if (!mask || !mask->pixels.u32) return;
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color);
@ -164,6 +167,7 @@ _blend_mask_sub(int count, const SW_FT_Span *spans, void *user_data)
{
Span_Data *sd = user_data;
Ector_Software_Buffer_Base_Data *mask = sd->mask;
if (!mask || !mask->pixels.u32) return;
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color);
@ -189,6 +193,7 @@ _blend_mask_ins(int count, const SW_FT_Span *spans, void *user_data)
{
Span_Data *sd = user_data;
Ector_Software_Buffer_Base_Data *mask = sd->mask;
if (!mask || !mask->pixels.u32) return;
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color);
@ -227,6 +232,7 @@ _blend_mask_diff(int count, const SW_FT_Span *spans, void *user_data)
{
Span_Data *sd = user_data;
Ector_Software_Buffer_Base_Data *mask = sd->mask;
if (!mask || !mask->pixels.u32) return;
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color);
@ -905,6 +911,7 @@ ector_software_rasterizer_draw_rle_data(Software_Rasterizer *rasterizer,
int mask_op)
{
if (!rle) return;
if (!rasterizer->fill_data.raster_buffer->pixels.u32) return;
rasterizer->fill_data.offx = x;
rasterizer->fill_data.offy = y;

2
src/lib/edje/edje_calc.c
View File

@ -3018,7 +3018,9 @@ _edje_part_recalc_single(Edje *ed,
params->req.x = TO_INT(params->eval.x);
params->req.y = TO_INT(params->eval.y);
params->req.w = TO_INT(params->eval.w);
if (params->req.w < 0) params->req.w = 0;
params->req.h = TO_INT(params->eval.h);
if (params->req.h < 0) params->req.h = 0;
/* adjust for min size */
_edje_part_recalc_single_min(desc, params, minw, minh, apref);

22
src/lib/efl/interfaces/efl_gfx_color.c
View File

@ -1,24 +1,6 @@
#include "config.h"
#include "Efl.h"
static int
_format_clean_param(Eina_Tmpstr *s)
{
Eina_Tmpstr *ss;
char *ds;
int len = 0;
ds = (char*) s;
for (ss = s; *ss; ss++, ds++, len++)
{
if ((*ss == '\\') && *(ss + 1)) ss++;
if (ds != ss) *ds = *ss;
}
*ds = 0;
return len;
}
static int
_hex_string_get(char ch, Eina_Bool *ok)
{
@ -102,7 +84,7 @@ _efl_gfx_color_color_code_set(Eo *obj, void *_pd EINA_UNUSED, const char *colorc
int len;
unsigned char r, g, b, a;
len = _format_clean_param(colorcode);
len = (size_t) strlen(colorcode);
_format_color_parse(colorcode, len, &r, &g, &b, &a);
efl_gfx_color_set(obj, r, g, b, a);
@ -124,7 +106,7 @@ _efl_gfx_color_class_color_class_code_set(Eo *obj, void *_pd EINA_UNUSED, const
int len;
unsigned char r, g, b, a;
len = _format_clean_param(colorcode);
len = (size_t) strlen(colorcode);
_format_color_parse(colorcode, len, &r, &g, &b, &a);
return efl_gfx_color_class_set(obj, color_class, layer, r, g, b, a);

11
src/lib/efl/interfaces/efl_gfx_hint.eo
View File

@ -4,6 +4,17 @@ import efl_gfx_types;
const Efl.Gfx.Hint_Expand: double = 1.0;
[[Use with @Efl.Gfx.Hint.hint_weight.]]
const Efl.Gfx.Hint_Align_Left: double = 0.0;
[[Use with @Efl.Gfx.Hint.hint_align.]]
const Efl.Gfx.Hint_Align_Right: double = 1.0;
[[Use with @Efl.Gfx.Hint.hint_align.]]
const Efl.Gfx.Hint_Align_Top: double = 0.0;
[[Use with @Efl.Gfx.Hint.hint_align.]]
const Efl.Gfx.Hint_Align_Bottom: double = 1.0;
[[Use with @Efl.Gfx.Hint.hint_align.]]
const Efl.Gfx.Hint_Align_Center: double = 0.5;
[[Use with @Efl.Gfx.Hint.hint_align.]]
interface Efl.Gfx.Hint
{
[[Efl graphics hint interface

6
src/lib/efl/interfaces/efl_gfx_image.eo
View File

@ -40,7 +40,7 @@ enum @beta Efl.Gfx.Image_Scale_Type
none [[Not scale the image]]
}
struct Efl.Gfx.Image.Stretch_Region
struct Efl.Gfx.Image_Stretch_Region
{
[[This struct holds the description of a stretchable region in one dimension (vertical or horizontal).
Used when scaling an image.
@ -183,8 +183,8 @@ interface @beta Efl.Gfx.Image
}
get {}
values {
horizontal: iterator<ptr(Efl.Gfx.Image.Stretch_Region)>; [[Representation of area that are stretchable in the image horizontal space.]]
vertical: iterator<ptr(Efl.Gfx.Image.Stretch_Region)>; [[Representation of area that are stretchable in the image vertical space.]]
horizontal: iterator<ptr(Efl.Gfx.Image_Stretch_Region)>; [[Representation of area that are stretchable in the image horizontal space.]]
vertical: iterator<ptr(Efl.Gfx.Image_Stretch_Region)>; [[Representation of area that are stretchable in the image vertical space.]]
}
}
@property image_size {

3
src/lib/efreet/efreet_base.c
View File

@ -8,10 +8,11 @@
#include <unistd.h>
#include <ctype.h>
#include <sys/types.h>
#include <pwd.h>
#ifdef _WIN32
# include <winsock2.h>
#else
# include <pwd.h>
#endif
#include <Ecore_File.h>

61
src/lib/eina/eina_file.c
View File

@ -795,37 +795,51 @@ eina_file_open(const char *path, Eina_Bool shared)
Eina_Stringshare *filename;
struct stat file_stat;
int fd = -1;
Eina_Statgen statgen;
EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
filename = eina_file_sanitize(path);
if (!filename) return NULL;
if (shared)
#ifdef HAVE_SHM_OPEN
fd = shm_open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO);
#else
goto on_error;
#endif
else
fd = open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO);
if (fd < 0) goto on_error;
if (!eina_file_close_on_exec(fd, EINA_TRUE))
goto on_error;
if (fstat(fd, &file_stat))
goto on_error;
statgen = eina_file_statgen_get();
eina_lock_take(&_eina_file_lock_cache);
file = eina_hash_find(_eina_file_cache, filename);
if ((file) && !_eina_file_timestamp_compare(file, &file_stat))
statgen = eina_file_statgen_get();
if ((!file) || (file->statgen != statgen) || (statgen == 0))
{
file->delete_me = EINA_TRUE;
eina_hash_del(_eina_file_cache, file->filename, file);
file = NULL;
if (shared)
{
#ifdef HAVE_SHM_OPEN
fd = shm_open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO);
if ((fd != -1) && (!eina_file_close_on_exec(fd, EINA_TRUE)))
goto on_error;
#else
goto on_error;
#endif
}
else
{
#ifdef HAVE_OPEN_CLOEXEC
fd = open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO | O_CLOEXEC);
#else
fd = open(filename, O_RDONLY, S_IRWXU | S_IRWXG | S_IRWXO);
if ((fd != -1) && (!eina_file_close_on_exec(fd, EINA_TRUE)))
goto on_error;
#endif
}
if (fd < 0) goto on_error;
if (fstat(fd, &file_stat))
goto on_error;
if (file) file->statgen = statgen;
if ((file) && !_eina_file_timestamp_compare(file, &file_stat))
{
file->delete_me = EINA_TRUE;
eina_hash_del(_eina_file_cache, file->filename, file);
file = NULL;
}
}
if (!file)
@ -865,7 +879,7 @@ eina_file_open(const char *path, Eina_Bool shared)
}
else
{
close(fd);
if (fd >= 0) close(fd);
n = file;
}
eina_lock_take(&n->lock);
@ -877,6 +891,7 @@ eina_file_open(const char *path, Eina_Bool shared)
return n;
on_error:
eina_lock_release(&_eina_file_lock_cache);
INF("Could not open file [%s].", filename);
eina_stringshare_del(filename);

32
src/lib/eina/eina_file.h
View File

@ -768,6 +768,38 @@ EAPI Eina_Bool eina_file_close_on_exec(int fd, Eina_Bool on);
#include "eina_inline_file.x"
/**
* @typedef Eina_Statgen
* @brief Stat Generation count state with it being 0 when disabled or some other value that is comparable (== or !=) to a stored value and if it is not equal, then do the actual stat i/o work
* @since 1.23
*/
typedef unsigned int Eina_Statgen;
/**
* @brief Force the stat generation counter to tick over so any following i/o does real i/o and stat calls
* @since 1.23
*/
EAPI void eina_file_statgen_next(void);
/**
* @brief Get the current stat generation counter value
* @return 0 if you should always do stat calls and compare, or some other value that changes like a generation counter
* @since 1.23
*/
EAPI Eina_Statgen eina_file_statgen_get(void);
/**
* @brief Enable stat generation count optimiziing to only stat/do file i/o between generation counts changing
* @since 1.23
*/
EAPI void eina_file_statgen_enable(void);
/**
* @brief Disable stat generation count optimiziing to only stat/do file i/o between generation counts changing
* @since 1.23
*/
EAPI void eina_file_statgen_bisable(void);
/**
* @}
*/

44
src/lib/eina/eina_file_common.c
View File

@ -74,6 +74,47 @@ Eina_Lock _eina_file_lock_cache;
# define EINA_FILE_MAGIC_CHECK(f, ...) do {} while(0)
#endif
static Eina_Spinlock _eina_statgen_lock;
static Eina_Statgen _eina_statgen = 0;
EAPI void
eina_file_statgen_next(void)
{
eina_spinlock_take(&_eina_statgen_lock);
if (_eina_statgen != 0)
{
_eina_statgen++;
if (_eina_statgen == 0) _eina_statgen = 1;
}
eina_spinlock_release(&_eina_statgen_lock);
}
EAPI Eina_Statgen
eina_file_statgen_get(void)
{
Eina_Statgen s;
eina_spinlock_take(&_eina_statgen_lock);
s = _eina_statgen;
eina_spinlock_release(&_eina_statgen_lock);
return s;
}
EAPI void
eina_file_statgen_enable(void)
{
eina_spinlock_take(&_eina_statgen_lock);
if (_eina_statgen != 0) _eina_statgen = 1;
eina_spinlock_release(&_eina_statgen_lock);
}
EAPI void
eina_file_statgen_bisable(void)
{
eina_spinlock_take(&_eina_statgen_lock);
_eina_statgen = 0;
eina_spinlock_release(&_eina_statgen_lock);
}
static char *
_eina_file_escape(char *path, size_t len)
{
@ -1072,6 +1113,8 @@ eina_file_init(void)
return EINA_FALSE;
}
if (getenv("EINA_STATGEN")) _eina_statgen = 1;
eina_spinlock_new(&_eina_statgen_lock);
eina_lock_recursive_new(&_eina_file_lock_cache);
eina_magic_string_set(EINA_FILE_MAGIC, "Eina_File");
@ -1102,6 +1145,7 @@ eina_file_shutdown(void)
eina_log_domain_unregister(_eina_file_log_dom);
_eina_file_log_dom = -1;
eina_spinlock_free(&_eina_statgen_lock);
return EINA_TRUE;
}

1
src/lib/eina/eina_file_common.h
View File

@ -89,6 +89,7 @@ struct _Eina_File
int refcount; /**< Keeps track of references to #map. */
int global_refcount; /**< Keeps track of references to #global_map. */
Eina_Statgen statgen;/**< For inexact stats a stat gen count to rate limit syscalls to stat file */
#ifndef _WIN32
int fd; /**< The file descriptor. */

6
src/lib/eina/eina_mmap.c
View File

@ -198,10 +198,16 @@ eina_mmap_safety_enabled_set(Eina_Bool enabled)
/* no zero page device - open it */
if (_eina_mmap_zero_fd < 0)
{
#ifdef HAVE_OPEN_CLOEXEC
_eina_mmap_zero_fd = open("/dev/zero", O_RDWR | O_CLOEXEC);
/* if we don;'t have one - fail to set up mmap safety */
if (_eina_mmap_zero_fd < 0) return EINA_FALSE;
#else
_eina_mmap_zero_fd = open("/dev/zero", O_RDWR);
/* if we don;'t have one - fail to set up mmap safety */
if (_eina_mmap_zero_fd < 0) return EINA_FALSE;
eina_file_close_on_exec(_eina_mmap_zero_fd, EINA_TRUE);
#endif
}
/* set up signal handler for SIGBUS */
sa.sa_sigaction = _eina_mmap_safe_sigbus;

6
src/lib/eina/eina_vpath.c
View File

@ -3,7 +3,11 @@
#endif
#include <sys/types.h>
#include <pwd.h>
#ifdef _WIN32
# include <evil_private.h> /* mkdir */
#else
# include <pwd.h>
#endif
#include <Eina.h>

4
src/lib/eina/eina_vpath_xdg.c
View File

@ -3,7 +3,9 @@
#endif
#include <sys/types.h>
#include <pwd.h>
#ifndef _WIN32
# include <pwd.h>
#endif
#include <Eina.h>

4
src/lib/eina/meson.build
View File

@ -299,7 +299,9 @@ if cc.has_header_symbol(pthread_np_header_file, 'pthread_attr_setaffinity_np', a
endif
if debug_threads or get_option('debug-threads')
eina_config.set('EINA_HAVE_DEBUG_THREADS', '1')
if cc.has_header_symbol('execinfo.h', 'backtrace')
eina_config.set('EINA_HAVE_DEBUG_THREADS', '1')
endif
endif
eina_config.set('EINA_SIZEOF_WCHAR_T', cc.sizeof('wchar_t', prefix : '#include<wchar.h>'))

3
src/lib/eio/Eio_Legacy.h
View File

@ -394,6 +394,9 @@ EAPI Eio_File *eio_file_chmod(const char *path,
*
* This function will change the owner of a path, setting it to the user and
* group passed as argument. It's equivalent to the chown shell command.
*
* @note Some platforms (including Windows) do not support chown(). In that
* case, this function returns @c NULL.
*/
EAPI Eio_File *eio_file_chown(const char *path,
const char *user,

22
src/lib/eio/eio_single.c
View File

@ -204,16 +204,10 @@ _eio_file_chmod(void *data, Ecore_Thread *thread)
eio_file_thread_error(&ch->common, thread);
}
#if defined(HAVE_CHOWN) && defined(HAVE_GETPWENT)
static void
_eio_file_chown(void *data, Ecore_Thread *thread)
{
#ifdef _WIN32
/* FIXME:
* look at http://wwwthep.physik.uni-mainz.de/~frink/chown/readme.html
*/
(void)data;
(void)thread;
#else
Eio_File_Chown *own = data;
char *tmp;
uid_t owner = -1;
@ -266,7 +260,6 @@ _eio_file_chown(void *data, Ecore_Thread *thread)
on_error:
ecore_thread_cancel(thread);
return;
#endif
}
static void
@ -297,6 +290,7 @@ _eio_file_chown_error(void *data, Ecore_Thread *thread EINA_UNUSED)
eio_file_error(&ch->common);
_eio_chown_free(ch);
}
#endif
/**
* @endcond
@ -585,6 +579,7 @@ eio_file_chown(const char *path,
Eio_Error_Cb error_cb,
const void *data)
{
#if defined(HAVE_CHOWN) && defined(HAVE_GETPWENT)
Eio_File_Chown *c = NULL;
EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
@ -601,11 +596,20 @@ eio_file_chown(const char *path,
if (!eio_file_set(&c->common,
done_cb,
error_cb,
data,
data,
_eio_file_chown,
_eio_file_chown_done,
_eio_file_chown_error))
return NULL;
return &c->common;
#else
EINA_SAFETY_ON_NULL_RETURN_VAL(error_cb, NULL);
error_cb(data, NULL, EINVAL);
return NULL;
(void)path;
(void)user;
(void)group;
(void)done_cb;
#endif
}

20
src/lib/eldbus/Eldbus.h
View File

@ -212,7 +212,25 @@ typedef void (*Eldbus_Signal_Cb)(void *data, const Eldbus_Message *msg);
* @}
*/
#include "eldbus_types.eot.h"
/* FIXME: these are duplicated as @extern in eldbus_types.eot */
/** Represents a client object bound to an interface
*
* @ingroup Eldbus
*/
typedef struct _Eldbus_Proxy Eldbus_Proxy;
/** Represents a connection of one the type of connection with the DBus daemon.
*
* @ingroup Eldbus
*/
typedef struct _Eldbus_Connection Eldbus_Connection;
/** Represents an object path already attached with bus name or unique id
*
* @ingroup Eldbus
*/
typedef struct _Eldbus_Object Eldbus_Object;
#include "eldbus_connection.h"
#include "eldbus_message.h"

104
src/lib/eldbus/eldbus_introspection.h
View File

@ -4,7 +4,109 @@
#include <Eina.h>
#include <Eo.h>
#include "eldbus_types.eot.h"
/* FIXME: these are duplicated as @extern in eldbus_types.eot */
/** Argument direction
*
* @ingroup Eldbus_Introspection
*/
typedef enum
{
ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_NONE = 0, /**< No direction */
ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_IN, /**< Incoming direction */
ELDBUS_INTROSPECTION_ARGUMENT_DIRECTION_OUT /**< Outgoing direction */
} Eldbus_Introspection_Argument_Direction;
/** Property access rights
*
* @ingroup Eldbus_Introspection
*/
typedef enum
{
ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READ = 0, /**< Property can be read */
ELDBUS_INTROSPECTION_PROPERTY_ACCESS_WRITE, /**< Property can be written */
ELDBUS_INTROSPECTION_PROPERTY_ACCESS_READWRITE /**< Property can be read and
* written */
} Eldbus_Introspection_Property_Access;
/** DBus Node
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Node
{
Eina_Stringshare *name; /**< Node name (optional) */
Eina_List *nodes; /**< List with nodes */
Eina_List *interfaces; /**< List with interfaces */
} Eldbus_Introspection_Node;
/** DBus Interface
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Interface
{
Eina_Stringshare *name; /**< Interface name */
Eina_List *methods; /**< List with interface methods */
Eina_List *signals; /**< List with interface signals */
Eina_List *properties; /**< List with interface properties */
Eina_List *annotations; /**< List with interface annotations */
} Eldbus_Introspection_Interface;
/** DBus Method
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Method
{
Eina_Stringshare *name; /**< Method name */
Eina_List *arguments; /**< List with method arguments */
Eina_List *annotations; /**< List with method annotations */
} Eldbus_Introspection_Method;
/** DBus Property
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Property
{
Eina_Stringshare *name; /**< Property name */
Eina_Stringshare *type; /**< Property type */
Eldbus_Introspection_Property_Access access; /**< Property access rights */
Eina_List *annotations; /**< List with property annotations */
} Eldbus_Introspection_Property;
/** DBus Annotation
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Annotation
{
Eina_Stringshare *name; /**< Annotation name */
Eina_Stringshare *value; /**< Annotation value */
} Eldbus_Introspection_Annotation;
/** DBus Argument
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Argument
{
Eina_Stringshare *name; /**< Argument name (optional) */
Eina_Stringshare *type; /**< Argument type */
Eldbus_Introspection_Argument_Direction direction; /**< Argument direction */
} Eldbus_Introspection_Argument;
/** DBus Signal
*
* @ingroup Eldbus_Introspection
*/
typedef struct _Eldbus_Introspection_Signal
{
Eina_Stringshare *name; /**< Signal name */
Eina_List *arguments; /**< List with signal arguments */
Eina_List *annotations; /**< List with signal annotations */
} Eldbus_Introspection_Signal;
/**
* @brief Parses the introspection xml abstracting it to an object tree

Some files were not shown because too many files have changed in this diff Show More