diff --git a/meson.build b/meson.build index 0ae8b3ea9a..c40d30c185 100644 --- a/meson.build +++ b/meson.build @@ -244,7 +244,7 @@ subprojects = [ ['ethumb' ,[] , true, true, true, false, false, false, ['eina', 'efl', 'eo'], []], ['ethumb_client' ,[] , false, true, true, false, false, true, ['eina', 'efl', 'eo', 'ethumb'], []], ['elocation' ,[] , false, true, false, false, false, false, ['ecore', 'eldbus'], []], -['elementary' ,[] , true, true, true, false, true, false, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio', 'elocation'], ['atspi']], +['elementary' ,[] , true, true, true, true, true, false, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ethumb-client', 'emotion', 'ecore-imf', 'ecore-con', 'eldbus', 'efreet', 'efreet-mime', 'efreet-trash', 'eio', 'elocation'], ['atspi']], ['efl_wl' ,['wl'] , false, true, true, false, false, false, ['evas', 'ecore'], []], ['elua' ,['elua'] , false, true, true, false, true, false, ['eina', 'luajit'], []], ['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, ['eina'], []], diff --git a/src/benchmarks/elementary/focus_widget_tree.c b/src/benchmarks/elementary/focus_widget_tree.c new file mode 100644 index 0000000000..3b95781bad --- /dev/null +++ b/src/benchmarks/elementary/focus_widget_tree.c @@ -0,0 +1,264 @@ +#ifdef HAVE_CONFIG_H +# include "elementary_config.h" +#endif + +#include +#include +#include "elm_widget.h" + +#define PSIZE 318 + +typedef struct +{ + Evas_Object *scroller; + Evas_Object *first_it; + Ecore_Timer *timer; + Ecore_Event_Key key; + int frames; + int focus_max; + int state; + int total_count; + unsigned long long total, min, max, first; +} Focus; + +static Eina_Bool +_focus_test_cb(void *data) +{ + Focus *focus = data; + + if (!ecore_evas_focus_get(ecore_evas_ecore_evas_get(evas_object_evas_get(focus->scroller)))) + return EINA_TRUE; + + if (focus->state == -1 || focus->state == 0) + focus->state = 1; + + if (focus->state & 1) + { + focus->key.keyname = "Down"; + focus->key.key = "Down"; + focus->key.keycode = 116; + } + else + { + focus->key.keyname = "Up"; + focus->key.key = "Up"; + focus->key.keycode = 111; + } + struct timespec t0, t1; + unsigned long long t1ll, t0ll, trll, ret; + + clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t0); + ecore_event_evas_key_down(NULL, 0, &(focus->key)); + clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t1); + + t0ll = ((unsigned long long) t0.tv_sec * 1000000000ULL) + t0.tv_nsec; + t1ll = ((unsigned long long) t1.tv_sec * 1000000000ULL) + t1.tv_nsec; + trll = t1ll - t0ll; + if (focus->min > trll) focus->min = trll; + if (focus->max < trll) focus->max = trll; + focus->total += trll; + focus->total_count++; + if (focus->total_count == 1) + focus->first = trll; + //printf("time : %llu\n", trll); + + ret = focus->total / focus->total_count; + + if (focus->state > focus->focus_max * 2) + { + printf(" first : %llu nsec, min : %llu nsec, max : %llu nsec\n", focus->first, focus->min, focus->max); + printf(" average : %llu nsec (total : %llu nsec / count : %d)\n", ret, focus->total, focus->total_count); + elm_exit(); + } + return EINA_TRUE; +} + +static void +_scroll2_del_cb(void *data, Evas *e EINA_UNUSED, + Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Focus *focus = data; + + ecore_timer_del(focus->timer); + free(focus); +} + +static void +_focus_state_change_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) +{ + Focus *focus = data; + + focus->state++; +} + +static void +force_focus(Evas_Object *win) +{ + Ecore_Evas *ee; + + ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win)); + ecore_evas_focus_set(ee, EINA_TRUE); + ecore_evas_callback_focus_in_set(ee, NULL); + ecore_evas_callback_focus_out_set(ee, NULL); + + Elm_Widget_Smart_Data *pd = efl_data_scope_safe_get(win, EFL_UI_WIDGET_CLASS); + pd->top_win_focused = EINA_TRUE; +} + +void +focus_test1(int focus_max) +{ + Evas_Object *win, *bt, *bx, *bx2, *sc, *tb, *tb2, *rc; + Focus *focus; + int i, j; + + focus = calloc(1, sizeof(Focus)); + focus->max = 0; + focus->min = ULONG_MAX; + + win = elm_win_util_standard_add("scroller2", "Scroller 2"); + force_focus(win); + elm_win_autodel_set(win, EINA_TRUE); + + bx = elm_box_add(win); + evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0); + + /* { */ + for (i = 0; i < 3; i++) + { + bt = elm_button_add(win); + elm_object_text_set(bt, "Vertical"); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + if (i == 0) + { + evas_object_smart_callback_add(bt, "focused", _focus_state_change_cb, focus); + focus->first_it = bt; + } + } + /* } */ + + /* { */ + sc = elm_scroller_add(win); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, 0.5); + elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE); + elm_scroller_content_min_limit(sc, 0, 1); + elm_box_pack_end(bx, sc); + evas_object_show(sc); + + bx2 = elm_box_add(win); + elm_box_horizontal_set(bx2, EINA_TRUE); + + for (i = 0; i < 10; i++) + { + bt = elm_button_add(win); + elm_object_text_set(bt, "... Horizontal scrolling ..."); + elm_box_pack_end(bx2, bt); + evas_object_show(bt); + } + + elm_object_content_set(sc, bx2); + evas_object_show(bx2); + /* } */ + + /* { */ + for (i = 0; i < 3; i++) + { + bt = elm_button_add(win); + elm_object_text_set(bt, "Vertical"); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + } + /* } */ + + /* { */ + tb = elm_table_add(win); + evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_box_pack_end(bx, tb); + evas_object_show(tb); + + rc = evas_object_rectangle_add(evas_object_evas_get(win)); + evas_object_size_hint_min_set(rc, 200, 120); + elm_table_pack(tb, rc, 0, 0, 1, 1); + + sc = elm_scroller_add(win); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_table_pack(tb, sc, 0, 0, 1, 1); + evas_object_show(sc); + + tb2 = elm_table_add(win); + + for (j = 0; j < 20; j++) + { + for (i = 0; i < 20; i++) + { + bt = elm_button_add(win); + elm_object_text_set(bt, "Both"); + elm_table_pack(tb2, bt, i, j, 1, 1); + evas_object_show(bt); + } + } + + elm_object_content_set(sc, tb2); + evas_object_show(tb2); + /* } */ + + for (i = 0; i < 24; i++) + { + bt = elm_button_add(win); + elm_object_text_set(bt, "Vertical"); + evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5); + elm_box_pack_end(bx, bt); + evas_object_show(bt); + + if (i == 23) + evas_object_smart_callback_add(bt, "focused", _focus_state_change_cb, focus); + } + + sc = elm_scroller_add(win); + evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE); + elm_win_resize_object_add(win, sc); + elm_object_content_set(sc, bx); + evas_object_show(bx); + evas_object_show(sc); + + focus->scroller = sc; + + evas_object_resize(win, 320, 480); + evas_object_show(win); + elm_object_focus_set(focus->first_it, EINA_TRUE); + focus->state = -1; + + evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _scroll2_del_cb, focus); + + focus->key.window = elm_win_window_id_get(win); + focus->key.event_window = elm_win_window_id_get(win); + focus->focus_max = focus_max; + focus->timer = ecore_timer_add(0.05, _focus_test_cb, focus); + + elm_run(); +} + +EAPI_MAIN int +elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) +{ + setenv("ELM_DISPLAY", "buffer", 1); + elm_config_focus_autoscroll_mode_set(ELM_FOCUS_AUTOSCROLL_MODE_BRING_IN); + elm_config_window_auto_focus_animate_set(EINA_FALSE); + elm_config_focus_highlight_animate_set(EINA_TRUE); + focus_test1(atoi(argv[1])); + + return EXIT_SUCCESS; +} +ELM_MAIN() diff --git a/src/benchmarks/elementary/meson.build b/src/benchmarks/elementary/meson.build new file mode 100644 index 0000000000..158a535ae2 --- /dev/null +++ b/src/benchmarks/elementary/meson.build @@ -0,0 +1,9 @@ +focus_widget_tree_bench = executable('focus_widget_tree_bench', + 'focus_widget_tree.c', + dependencies: [elementary, ecore_input_evas], +) + +benchmark('focus_widget_tree', focus_widget_tree_bench, + args: ['5'], + timeout : 5*60 +)