[EGIT] [tools/enventor] master 01/01: menu: improve ui.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=4475f97d8a0e448696da6ca42be1585092a672ee commit 4475f97d8a0e448696da6ca42be1585092a672ee Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 15:00:31 2014 +0900 menu: improve ui. --- data/themes/default/layout_common.edc | 50 +-- src/bin/menu.c| 29 2 files changed, 24 insertions(+), 55 deletions(-) diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index b5075c5..913daf4 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -741,35 +741,6 @@ group { name: warning_layout; } } -group { name: button_layout; - parts { - part { name: elm.swallow.btn; - type: SWALLOW; - scale: 1; - description { state: default 0.0; -align: 0.5 0.5; -min: 50 50; -rel1.relative: 0.5 0.5; -rel2.relative: 0.5 0.5; -fixed: 1 1; - } - description { state: zoom 0.0; -inherit: default 0.0; -min: 80 80; - } - } - } - programs { - program { name: btn_effect; - signal: elm,action,btn,zoom; - source: ; - action: STATE_SET zoom 0.0; - target: elm.swallow.btn; - transition: LINEAR 0.25; - } - } -} - group { name: menu_layout; parts { part { name: bg; @@ -780,6 +751,9 @@ group { name: menu_layout; description { state: show 0.0; color: 0 0 0 175; } + description { state: anim 0.0; +color: 0 0 0 200; + } } part { name: clipper; type: RECT; @@ -820,7 +794,7 @@ group { name: menu_layout; font: FN; text: Enventor Menu; size: 28; - align: 0.5 1; + align: 0.5 0.5; min: 1 0; } color: 51 153 255 255; @@ -849,8 +823,9 @@ group { name: menu_layout; rel1.to: padding1; rel2.to: padding1; rel1.relative: 1 0; -align: 0 0.5; +align: 0 0; min: 80 80; +max: 80 80; fixed: 1 1; } } @@ -1030,6 +1005,19 @@ group { name: menu_layout; source: ; action: STATE_SET hide 0.0; target: event_blocker; + after: bg_anim; + } + program { name: bg_anim; + action: STATE_SET anim 0.0; + transition: DECELERATE 2; + target: bg; + after: bg_anim2; + } + program { name: bg_anim2; + action: STATE_SET show 0.0; + transition: DECELERATE 2; + target: bg; + after: bg_anim; } program { name: dismiss; signal: elm,state,dismiss; diff --git a/src/bin/menu.c b/src/bin/menu.c index 1bafb16..3848fc3 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -331,29 +331,16 @@ prev_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, static Evas_Object * btn_create(Evas_Object *parent, const char *label, Evas_Smart_Cb cb, void *data) { - Evas_Object *layout, *btn; - - layout = elm_layout_add(parent); - elm_layout_file_set(layout, EDJE_PATH, button_layout); - evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(layout); + Evas_Object *btn; - btn = elm_button_add(layout); + btn = elm_button_add(parent); + elm_object_style_set(btn, anchor); + elm_object_scale_set(btn, 1.45); evas_object_smart_callback_add(btn, clicked, cb, data); elm_object_text_set(btn, label); evas_object_show(btn); - elm_object_part_content_set(layout, elm.swallow.btn, btn); - - return layout; -} - -static Eina_Bool -btn_effect_timer_cb(void *data) -{ - Evas_Object *btn = data; - elm_object_signal_emit(btn, elm,action,btn,zoom, ); - return ECORE_CALLBACK_CANCEL; + return btn; } static void @@ -630,32 +617,26 @@ menu_open(menu_data *md) btn = btn_create(layout, New, new_btn_cb, md); elm_object_focus_set(btn, EINA_TRUE); elm_object_part_content_set(layout, elm.swallow.new_btn, btn); - ecore_timer_add(0, btn_effect_timer_cb, btn); //Button(Save) btn = btn_create(layout, Save, save_btn_cb, md); elm_object_part_content_set(layout, elm.swallow.save_btn, btn); - ecore_timer_add(0.03, btn_effect_timer_cb, btn); //Button(Load) btn = btn_create(layout, Load, load_btn_cb, md); elm_object_part_content_set(layout, elm.swallow.load_btn, btn); - ecore_timer_add(0.06, btn_effect_timer_cb, btn); //Button(Setting) btn = btn_create(layout, Setting, setting_btn_cb, md); elm_object_part_content_set(layout, elm.swallow.setting_btn, btn); - ecore_timer_add(0.09, btn_effect_timer_cb, btn); //Button(About) btn = btn_create(layout, About,
[EGIT] [tools/enventor] master 01/01: ctxpopup: support mouse wheel to go prev/next image.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=782a5f94a92467489ee0fd139a2ee30d7a1022ec commit 782a5f94a92467489ee0fd139a2ee30d7a1022ec Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 15:10:09 2014 +0900 ctxpopup: support mouse wheel to go prev/next image. --- src/bin/ctxpopup.c | 28 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/bin/ctxpopup.c b/src/bin/ctxpopup.c index d96f9dd..d1487f8 100644 --- a/src/bin/ctxpopup.c +++ b/src/bin/ctxpopup.c @@ -306,16 +306,34 @@ err: } static void +image_relay(ctxpopup_data *ctxdata, Eina_Bool up) +{ + if (up) + ctxdata-relay_cb(ctxdata-data, ctxdata-ctxpopup, (void *) 0); + else + ctxdata-relay_cb(ctxdata-data, ctxdata-ctxpopup, (void *) 1); +} + +static void +ctxpopup_mouse_wheel_cb(void *data, Evas *e EINA_UNUSED, +Evas_Object *obj EINA_UNUSED, void *event_info) +{ + Evas_Event_Mouse_Wheel *ev = event_info; + ctxpopup_data *ctxdata = data; + + if (ev-z 0) image_relay(ctxdata, EINA_FALSE); + else if (ev-z 0) image_relay(ctxdata, EINA_TRUE); +} + +static void ctxpopup_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { Evas_Event_Key_Down *ev = event_info; ctxpopup_data *ctxdata = data; - if (!strcmp(ev-key, Down)) - ctxdata-relay_cb(ctxdata-data, ctxdata-ctxpopup, (void *) 1); - else if (!strcmp(ev-key, Up)) - ctxdata-relay_cb(ctxdata-data, ctxdata-ctxpopup, (void *) 0); + if (!strcmp(ev-key, Down)) image_relay(ctxdata, EINA_FALSE); + else if (!strcmp(ev-key, Up)) image_relay(ctxdata, EINA_TRUE); } Evas_Object * @@ -364,6 +382,8 @@ ctxpopup_img_preview_create(edit_data *ed, ctxdata); evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_KEY_DOWN, ctxpopup_key_down_cb, ctxdata); + evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_MOUSE_WHEEL, + ctxpopup_mouse_wheel_cb, ctxdata); evas_object_focus_set(ctxpopup, EINA_TRUE); return ctxpopup; } --
[EGIT] [apps/rage] master 01/01: fix focus and key events in rage to have dummy button always
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=5f473687dd25af05a39aa4a1db9d12a3924a13af commit 5f473687dd25af05a39aa4a1db9d12a3924a13af Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 15:19:36 2014 +0900 fix focus and key events in rage to have dummy button always --- src/bin/win.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/bin/win.c b/src/bin/win.c index 5e5ee73..c03af31 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -325,7 +325,14 @@ win_add(void) evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _cb_mouse_move, win); - evas_object_event_callback_add(win, EVAS_CALLBACK_KEY_DOWN, + // a dummy button to collect key events and have focus + o = elm_button_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_win_resize_object_add(win, o); + evas_object_lower(o); + evas_object_show(o); + elm_object_focus_set(o, EINA_TRUE); + evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _cb_key_down, win); return win; } --
Re: [E-devel] Input for 1.11 release announcement
On Thu, 14 Aug 2014 11:50:10 +0200 Stefan Schmidt ste...@datenfreihafen.org said: Hello. I would like to get some input for the release announcement again. We will have the NEWS entries listed so all fixes and features that git tagged accordingly will show up there. I would like to get some more high level change descriptions for bigger items or important fixes. If you did something like this for 1.11 feel free to add something to https://phab.enlightenment.org/w/efl_and_elementary_1_11_release_announcement/ Looking through the NEWS file entries I think getting some descriptions for changes in * Eolian * Edje Edit * ETC2/TGV etc2 image decode support and etc2 texture format support. that'll do in the list * Elua * Edje dpi feature (?) also not worth a big mention - small yet nice thing to have. * DDS image file loader jpeg is away until monday - so you'll not hear much on dds from him. but it's not a big thing - so just mention dds format image loader and you'll be good. would be nice. For Elm I'm struggling a bit to pick out the changes that might be worth noting. SeoZ any good candidates for Elm? regards Stefan Schmidt -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/rage] master 01/01: rage - needs efl 1.11+
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=c54659f37b095de031db344c83dad0001d5b0eaa commit c54659f37b095de031db344c83dad0001d5b0eaa Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 17:31:41 2014 +0900 rage - needs efl 1.11+ --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index add2d71..c5b51e4 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_C___ATTRIBUTE__ -efl_version=1.10.99 +efl_version=1.11.0 requirements=\ elementary = ${efl_version} \ edje = ${efl_version} \ --
[EGIT] [apps/rage] master 01/01: update rage readme
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=df1a866856d51fad47dfdb25451e228fe982d65a commit df1a866856d51fad47dfdb25451e228fe982d65a Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 17:38:12 2014 +0900 update rage readme --- README | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README b/README index 6e90c53..4adbbc6 100644 --- a/README +++ b/README @@ -10,15 +10,15 @@ Rage 0.1.0 Requirements: - - * elementary (= 1.9.0) - * eina (= 1.9.0) - * eet (= 1.9.0) - * evas (= 1.9.0) - * ecore (= 1.9.0) - * edje (= 1.9.0) - * emotion (= 1.9.0) - * ecore-imf (= 1.9.0) - * ecore-imf-evas (= 1.9.0) - * ecore-input (= 1.9.0) - * ethumb (= 1.9.0) + * elementary (= 1.11.0) + * eina (= 1.11.0) + * eet (= 1.11.0) + * evas (= 1.11.0) + * ecore (= 1.11.0) + * edje (= 1.11.0) + * emotion (= 1.11.0) + * ecore-imf (= 1.11.0) + * ecore-imf-evas (= 1.11.0) + * ecore-input (= 1.11.0) + * ethumb (= 1.11.0) --
[EGIT] [core/elementary] master 01/01: entry: fix clearing selection region problem while it's already selected.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4d7622537f92cbf820fcaf41b4f9360e8f27359c commit 4d7622537f92cbf820fcaf41b4f9360e8f27359c Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 17:44:13 2014 +0900 entry: fix clearing selection region problem while it's already selected. if entry has selection, it would be cleared if selection region set is requested again. because entry cancel the selection area after it reset the selection area. unfortunately, the selection area is new selection so selection area is gone. this patch prevent clearing selection and keep the new selection. @fix --- src/lib/elm_entry.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 4a2cfaf..f0df346 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -3972,6 +3972,11 @@ _elm_entry_select_region_set(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, int start, edje_object_signal_emit(sd-entry_edje, elm,state,select,off, elm); } + /* Set have selection false to not be cleared handler in + selection_cleared_signal_cb() since that callback will be called while + resetting edje text. */ + sd-have_selection = EINA_FALSE; + edje_object_part_text_cursor_pos_set(sd-entry_edje, elm.text, EDJE_CURSOR_MAIN, start); edje_object_part_text_select_begin(sd-entry_edje, elm.text); edje_object_part_text_cursor_pos_set(sd-entry_edje, elm.text, EDJE_CURSOR_MAIN, end); --
[EGIT] [tools/enventor] master 01/01: edc_editor: update selection area when image preview goes prev/next.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=fe0a67bf9cc5316b9ab419708f8f39dda0948d8b commit fe0a67bf9cc5316b9ab419708f8f39dda0948d8b Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 17:54:03 2014 +0900 edc_editor: update selection area when image preview goes prev/next. --- src/bin/edc_editor.c | 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 07840b0..81b9b8b 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -438,8 +438,26 @@ preview_img_relay_show(edit_data *ed, Evas_Object *ctxpopup, Eina_Bool next) /* Since the ctxpopup will be shown again, Don't revert the focus in the dismiss cb. */ evas_object_data_set(ctxpopup, continue, (void *) 1); - } +//Set the entry selection region to next image. +const char *colon = parser_colon_pos_get(NULL, text); +if (!colon) goto end; + +const char *select = elm_entry_selection_get(ed-en_edit); +if (!select) goto end; + +char *select_utf8 = elm_entry_markup_to_utf8(select); +if (!select_utf8) goto end; +int select_len = strlen(select_utf8); +free(select_utf8); +const char *p = (colon - select_len); +if (p text) goto end; + +int cursor_pos = elm_entry_cursor_pos_get(ed-en_edit); +elm_entry_select_region_set(ed-en_edit, (cursor_pos - select_len), +cursor_pos); + } +end: menu_ctxpopup_unregister(ctxpopup); elm_ctxpopup_dismiss(ctxpopup); } --
[EGIT] [tools/enventor] master 01/01: edc_parser: missed push to previous commit.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=e120546b97b475cc0d462b2d65e13d6a95011d92 commit e120546b97b475cc0d462b2d65e13d6a95011d92 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 17:56:29 2014 +0900 edc_parser: missed push to previous commit. --- src/bin/edc_parser.c | 7 +++ src/include/edc_parser.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/bin/edc_parser.c b/src/bin/edc_parser.c index 4b8249f..5293618 100644 --- a/src/bin/edc_parser.c +++ b/src/bin/edc_parser.c @@ -54,6 +54,13 @@ parser_name_get(parser_data *pd EINA_UNUSED, const char *cur) return strndup(p, (end - p)); } +const char * +parser_colon_pos_get(parser_data *pd EINA_UNUSED, const char *cur) +{ + if (!cur) return NULL; + return strstr(cur, :); +} + attr_value * parser_attribute_get(parser_data *pd, const char *text, const char *cur) { diff --git a/src/include/edc_parser.h b/src/include/edc_parser.h index ab5d1d0..634a2c1 100644 --- a/src/include/edc_parser.h +++ b/src/include/edc_parser.h @@ -21,3 +21,5 @@ int parser_line_cnt_get(parser_data *pd EINA_UNUSED, const char *src); Eina_List *parser_states_filtered_name_get(Eina_List *states); int parser_end_of_parts_block_pos_get(const Evas_Object *entry, const char *group_name); Eina_Bool parser_images_pos_get(const Evas_Object *entry, int *pos); +const char * parser_colon_pos_get(parser_data *pd EINA_UNUSED, const char *cur); + --
[EGIT] [tools/enventor] master 01/01: remove workaround code
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c03a71d27c8f617c01975d528c20ed2af2d87a14 commit c03a71d27c8f617c01975d528c20ed2af2d87a14 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 17:59:14 2014 +0900 remove workaround code --- src/bin/edc_editor.c | 1 - src/bin/search.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 81b9b8b..9338609 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -96,7 +96,6 @@ entry_recover(edit_data *ed, int cursor_pos) if (!selected) return; char *utf8 = evas_textblock_text_markup_to_utf8(NULL, selected); ed-on_select_recover = EINA_TRUE; - elm_entry_select_none(ed-en_edit); elm_entry_select_region_set(ed-en_edit, ed-select_pos, cursor_pos); ed-on_select_recover = EINA_FALSE; free(utf8); diff --git a/src/bin/search.c b/src/bin/search.c index 3d270da..e206001 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -88,7 +88,6 @@ static Eina_Bool selection_region_anim_cb(void *data) { search_data *sd = data; - elm_entry_select_none(sd-entry); elm_entry_select_region_set(sd-entry, sd-pos, sd-pos + sd-len); return ECORE_CALLBACK_CANCEL; } --
[EGIT] [core/elementary] master 01/01: slider: update documentation on elm_slider_step_set/get (since 1.8)
billiob pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b3a282f180f90dab830f38f1efe1f597a33bb0eb commit b3a282f180f90dab830f38f1efe1f597a33bb0eb Author: Boris Faure bill...@gmail.com Date: Fri Aug 15 11:01:14 2014 +0200 slider: update documentation on elm_slider_step_set/get (since 1.8) --- src/lib/elm_slider.eo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/elm_slider.eo b/src/lib/elm_slider.eo index 3712789..8475cf7 100644 --- a/src/lib/elm_slider.eo +++ b/src/lib/elm_slider.eo @@ -303,6 +303,7 @@ class Elm_Slider (Elm_Layout, Elm_Interface_Atspi_Value, step { set { /*@ +@since 1.8 Set the step by which slider indicator will move. This value is used when draggable object is moved automatically i.e., in case @@ -316,6 +317,7 @@ class Elm_Slider (Elm_Layout, Elm_Interface_Atspi_Value, } get { /*@ +@since 1.8 Get the step by which slider indicator moves. @return The step value. --
[EGIT] [apps/rage] master 01/01: fix album art clip on new art find
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=edc845b9e9531d94b15ba399f3cc14b940abd191 commit edc845b9e9531d94b15ba399f3cc14b940abd191 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 18:00:55 2014 +0900 fix album art clip on new art find --- data/themes/default.edc | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 7aa1fbc..bdf2ab8 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -304,7 +304,7 @@ collections { image.normal: speaker-base.png; } } - part { name: art_clip; type: RECT; mouse_events: 0; + part { name: art_clip; type: RECT; clip_to: speaker_clip; description { state: default 0.0; visible: 0; @@ -324,9 +324,17 @@ collections { color: 255 255 255 255; } } - part { name: rage.art; type: SWALLOW; mouse_events: 0; + part { name: art_clip2; type: RECT; clip_to: art_clip; description { state: default 0.0; + rel1.to: speaker_base; + rel2.to: speaker_base; + fixed: 1 1; +} + } + part { name: rage.art; type: SWALLOW; mouse_events: 0; +clip_to: art_clip2; +description { state: default 0.0; rel1.to: art_clip; rel2.to: art_clip; } --
Re: [E-devel] [EGIT] [core/efl] master 01/02: Evas: 3D: Introducing 3D scene rendering features
On Fri, 25 Apr 2014 15:06:56 +0200 Cedric BAIL cedric.b...@free.fr wrote: On Fri, Apr 25, 2014 at 2:21 PM, David Seikel onef...@gmail.com wrote: hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8fda63173063e03e1d48c8b026ecf8b94298162c commit 8fda63173063e03e1d48c8b026ecf8b94298162c Author: Taekyun Kim tkq@samsung.com Date: Fri Dec 27 16:56:30 2013 +0900 Evas: 3D: Introducing 3D scene rendering features While I'm happy there's more 3D rendering support coming into EFL, this was a big shock to me. Was this discussed anywhere? Is there a road map? And more to the point of my personal 3D virtual world work, will this be suitable for 3D virtual worlds? Hum, it has been sitting in a branch for a 3 weeks or a month. I did point people to it on IRC, but I think we did fail to communicate on the mailing list. As for a road map, well, like every open source project. You have some free stuff, that will hopefully improve :-) More seriously, the first goal would be to make it useful and working for small object/scene, but after talking with Christophe who is doing a 3d engine with Evas_GL. I am now thinking that in fact we should accept any contribution that make this engine powerful enough to handle a 3d world for a game or virtual world like in your case. I guess that would be left to you and Christophe to improve it. On the middle term what may be done : - Add a plugin infrastructure for reading more file format for scene/object You where going to talk to the people in charge and get back to me on that. Never heard anything. I'm happy to add that libg3d thing I mentioned before to Evas_3D. http://automagically.de/g3dviewer/ and https://github.com/onefang/meta-impy/tree/mesh/linden/indra/mimesh/libg3d-0.0.8 in case you forgot. Hmm, does EFL have treat an archive as a file system type stuff in it? That would be needed to port libg3d to EFL. Either way, I want to add heightmap support soonish. - Integrate with Edje - Add a bigger demo to Elementary I've had my Elementary example in devs/onefang/evas-3d-elm for some time now, should I move it into Elementary as the official example (after the 1.11 release)? Or should I work on it more, adding the other Evas_3D examples to it as tabs or something? - Add partial update support - Keep improving the API and features set In itself it is already enough work for some month, but who knows where it will go. It only depend on who contribute to it :-) I've made big noises in the last few years about working on 3D virtual worlds, I would have hoped I could have been involved in this from an earlier stage of development. This is sadly a side effect of getting the approval for pushing the code in an open source project that take nearly more time than just writing the code. From now on improvement and change should be more step by step, minimal and iterative. Oh well, it's here now, thanks I guess. I hope I can make good use of it. I hope to ! -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 02/02: make themes compile with efl 1.7
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=d7ec90aefaeadd076d858fcc61be29d3481ecdc0 commit d7ec90aefaeadd076d858fcc61be29d3481ecdc0 Author: Boris Faure bill...@gmail.com Date: Fri Aug 15 11:05:10 2014 +0200 make themes compile with efl 1.7 --- data/themes/default.edc | 4 ++-- data/themes/mild.edc| 4 ++-- data/themes/nyanology/nyanology.edc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index a38dee1..5616114 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -288,7 +288,7 @@ collections { text { font: Sans; size: 8; align: 1.0 0.5; min: 1 1; - ellipsis: -1; + ellipsis: 0; } } description { state: over 0.0; @@ -315,7 +315,7 @@ collections { text { font: Sans; size: 8; align: 1.0 0.5; min: 1 1; - ellipsis: -1; + ellipsis: 0; } } description { state: over 0.0; diff --git a/data/themes/mild.edc b/data/themes/mild.edc index e6e8b01..b4476e8 100644 --- a/data/themes/mild.edc +++ b/data/themes/mild.edc @@ -279,7 +279,7 @@ collections { text { font: Sans; size: 8; align: 1.0 0.5; min: 1 1; - ellipsis: -1; + ellipsis: 0; } } description { state: over 0.0; @@ -301,7 +301,7 @@ collections { text { font: Sans; size: 8; align: 1.0 0.5; min: 1 1; - ellipsis: -1; + ellipsis: 0; } } description { state: over 0.0; diff --git a/data/themes/nyanology/nyanology.edc b/data/themes/nyanology/nyanology.edc index f933504..7d66c7b 100644 --- a/data/themes/nyanology/nyanology.edc +++ b/data/themes/nyanology/nyanology.edc @@ -148,7 +148,7 @@ collections { text { font: Sans; size: 8; align: 1.0 0.5; min: 1 1; - ellipsis: -1; + ellipsis: 0; } } description { state: over 0.0; @@ -175,7 +175,7 @@ collections { text { font: Sans; size: 8; align: 1.0 0.5; min: 1 1; - ellipsis: -1; + ellipsis: 0; } } description { state: over 0.0; --
[EGIT] [apps/terminology] master 01/02: elm_slider_step_set was only introduced in elm 1.8
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=eb347e9585af7bc20b9413fe1fb26e46afdc269b commit eb347e9585af7bc20b9413fe1fb26e46afdc269b Author: Boris Faure bill...@gmail.com Date: Fri Aug 15 11:03:51 2014 +0200 elm_slider_step_set was only introduced in elm 1.8 --- src/bin/options_behavior.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c index 94b0d43..6a9204b 100644 --- a/src/bin/options_behavior.c +++ b/src/bin/options_behavior.c @@ -539,7 +539,9 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); elm_slider_span_size_set(o, 40); +#if (EINA_VERSION_MAJOR 1) || (EINA_VERSION_MINOR = 8) elm_slider_step_set(o, 1); +#endif elm_slider_units_format_function_set(o, sback_units_format, (void(*)(char*))eina_stringshare_del); --
[EGIT] [tools/enventor] master 01/01: ui: update dummy swallow image.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c001e1e7fd885c3be949eff89fcdc40d552998ce commit c001e1e7fd885c3be949eff89fcdc40d552998ce Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 18:20:03 2014 +0900 ui: update dummy swallow image. --- data/themes/default/content.edc| 2 -- data/themes/default/images/swallow.png | Bin 31298 - 16847 bytes 2 files changed, 2 deletions(-) diff --git a/data/themes/default/content.edc b/data/themes/default/content.edc index dcb073d..6b9f83a 100644 --- a/data/themes/default/content.edc +++ b/data/themes/default/content.edc @@ -18,8 +18,6 @@ group { name: swallow; description { state: default 0.0; image.normal: swallow.png; align: 0.5 0.5; -min: 0 0; -max: 120 120; color: 255 255 255 127; aspect: 1 1; aspect_preference: BOTH; diff --git a/data/themes/default/images/swallow.png b/data/themes/default/images/swallow.png index f2ba89d..0a03237 100644 Binary files a/data/themes/default/images/swallow.png and b/data/themes/default/images/swallow.png differ --
[EGIT] [tools/enventor] master 01/01: ui: apply compact swallow image for simple.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=f86ca5079edb41b42f0762d7255646844bab4dc7 commit f86ca5079edb41b42f0762d7255646844bab4dc7 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 18:21:29 2014 +0900 ui: apply compact swallow image for simple. --- data/themes/default/content.edc| 1 - data/themes/default/images/swallow.png | Bin 16847 - 15229 bytes 2 files changed, 1 deletion(-) diff --git a/data/themes/default/content.edc b/data/themes/default/content.edc index 6b9f83a..bbc68c3 100644 --- a/data/themes/default/content.edc +++ b/data/themes/default/content.edc @@ -18,7 +18,6 @@ group { name: swallow; description { state: default 0.0; image.normal: swallow.png; align: 0.5 0.5; -color: 255 255 255 127; aspect: 1 1; aspect_preference: BOTH; } diff --git a/data/themes/default/images/swallow.png b/data/themes/default/images/swallow.png index 0a03237..1f0d68d 100644 Binary files a/data/themes/default/images/swallow.png and b/data/themes/default/images/swallow.png differ --
[EGIT] [core/emotion_generic_players] master 01/01: README: Update version for upcoming 1.11 release
stefan pushed a commit to branch master. http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=dbb00c741385405544b4b77656da7aff613e4602 commit dbb00c741385405544b4b77656da7aff613e4602 Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Aug 15 11:39:03 2014 +0200 README: Update version for upcoming 1.11 release --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 783fe37..1681ae2 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Emotion Generic Players 1.9.0 -= +Emotion Generic Players 1.11.0 +== ** FOR ANY ISSUES PLEASE EMAIL: --
[EGIT] [core/emotion_generic_players] master 01/01: NEWS: Manually add fix for T1530
stefan pushed a commit to branch master. http://git.enlightenment.org/core/emotion_generic_players.git/commit/?id=21686bb93d223f21ed668c218fad60370fa1213f commit 21686bb93d223f21ed668c218fad60370fa1213f Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Aug 15 11:41:05 2014 +0200 NEWS: Manually add fix for T1530 Not tagged with @fix so our tooling would not pick it up. As this is the only relevant change here in 1.11 add it by hand. --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 66cc03b..b9271dc 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,8 @@ Emotion Generic Players 1.11.0 Changes since Emotion Generic Players 1.10.0: - -No changes since version 1.10.0 +Fixes: + * emotion generic players - work around vlc bug that segvs (T1530) Changes since Emotion Generic Players 1.9.0: --
[EGIT] [core/evas_generic_loaders] master 01/01: README: Update for upcoming 1.11 and mention gstreamer 1.x support
stefan pushed a commit to branch master. http://git.enlightenment.org/core/evas_generic_loaders.git/commit/?id=01d71331a8773e0fb106a166475f99def7bf65e8 commit 01d71331a8773e0fb106a166475f99def7bf65e8 Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Aug 15 11:49:26 2014 +0200 README: Update for upcoming 1.11 and mention gstreamer 1.x support --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index f0ea8b3..2e0f816 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Evas generic loaders 1.9.0 -== +Evas generic loaders 1.11.0 +=== ** FOR ANY ISSUES PLEASE EMAIL: @@ -26,7 +26,7 @@ Required by default: Highly recommended: - * gstreamer (0.10) (ensure you have all the gstreamer codecs you need/want) + * gstreamer (1.x or 0.10) (ensure you have all the gstreamer codecs you need/want) * poppler * libraw * libspectre --
[EGIT] [core/elementary] master 01/01: tests: Ship elm_test_helper.h in dist tarball
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=550d62785fcacbfb386df99f7e2ca5243bed6f51 commit 550d62785fcacbfb386df99f7e2ca5243bed6f51 Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Aug 15 12:02:10 2014 +0200 tests: Ship elm_test_helper.h in dist tarball This is a first step to run elm make check during distcheck. --- src/tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index d4283fe..4766a31 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = elm_suite.h +EXTRA_DIST = \ + elm_suite.h \ + elm_test_helper.h TESTS = elm_suite check_PROGRAMS = elm_suite --
[EGIT] [tools/enventor] master 01/01: live_edit: revise theme.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=559131729d93472a99a67e1a702c2a0a54192a27 commit 559131729d93472a99a67e1a702c2a0a54192a27 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 19:34:57 2014 +0900 live_edit: revise theme. --- data/themes/default/images.edc | 32 ++-- data/themes/default/images/Makefile.am | 11 +- .../bg_glow_in.png = live_bg_glow_in.png} | Bin .../icon-live-edit.png = live_edit.png} | Bin .../images/live_edit_icons/rel1.dragable.png | Bin 162 - 0 bytes .../images/live_edit_icons/rel2.dragable.png | Bin 158 - 0 bytes .../icon-image.png = live_image.png} | Bin .../icon-rectangle.png = live_rectangle.png} | Bin data/themes/default/images/live_rel1_dragable.png | Bin 0 - 195 bytes data/themes/default/images/live_rel2_dragable.png | Bin 0 - 195 bytes .../icon-spacer.png = live_spacer.png}| Bin .../icon-swallow.png = live_swallow.png} | Bin .../icon-text.png = live_text.png}| Bin .../icon-textblock.png = live_textblock.png} | Bin data/themes/default/layout_common.edc | 169 ++--- src/bin/live_edit.c| 34 ++--- 16 files changed, 125 insertions(+), 121 deletions(-) diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index bf199e7..ac8ca4a 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -9,13 +9,13 @@ images { image: status.png COMP; image: swallow_s.png COMP; image: goto.png COMP; - image: live_edit_icons/icon-image.png COMP; - image: live_edit_icons/icon-rectangle.png COMP; - image: live_edit_icons/icon-swallow.png COMP; - image: live_edit_icons/icon-spacer.png COMP; - image: live_edit_icons/icon-text.png COMP; - image: live_edit_icons/icon-textblock.png COMP; - image: live_edit_icons/icon-live-edit.png COMP; + image: live_image.png COMP; + image: live_rectangle.png COMP; + image: live_swallow.png COMP; + image: live_spacer.png COMP; + image: live_text.png COMP; + image: live_textblock.png COMP; + image: live_edit.png COMP; } group { name: line; @@ -128,12 +128,12 @@ group { name: minus; } } -group { name: live-edit; +group { name: live_edit; parts { part { name: img; type: IMAGE; description { state: default 0.0; -image.normal: live_edit_icons/icon-live-edit.png; +image.normal: live_edit.png; } } } @@ -145,18 +145,16 @@ group { name: live-edit; part { name: img; \ description { state: default 0.0; \ image.normal: _image_path; \ - min: 10 10; \ - max: 10 10; \ } \ } \ } \ } -ADD_LIVE_EDIT_ICON_GROUP(IMAGE, live_edit_icons/icon-image.png) -ADD_LIVE_EDIT_ICON_GROUP(RECT, live_edit_icons/icon-rectangle.png) -ADD_LIVE_EDIT_ICON_GROUP(SPACER, live_edit_icons/icon-spacer.png) -ADD_LIVE_EDIT_ICON_GROUP(SWALLOW, live_edit_icons/icon-swallow.png) -ADD_LIVE_EDIT_ICON_GROUP(TEXT, live_edit_icons/icon-text.png) -ADD_LIVE_EDIT_ICON_GROUP(TEXTBLOCK, live_edit_icons/icon-textblock.png) +ADD_LIVE_EDIT_ICON_GROUP(IMAGE, live_image.png) +ADD_LIVE_EDIT_ICON_GROUP(RECT, live_rectangle.png) +ADD_LIVE_EDIT_ICON_GROUP(SPACER, live_spacer.png) +ADD_LIVE_EDIT_ICON_GROUP(SWALLOW, live_swallow.png) +ADD_LIVE_EDIT_ICON_GROUP(TEXT, live_text.png) +ADD_LIVE_EDIT_ICON_GROUP(TEXTBLOCK, live_textblock.png) #undef ADD_LIVE_EDIT_ICON_GROUP diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 0e31028..8c22e20 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -56,4 +56,13 @@ EXTRA_DIST = \ downlight_glow_right.png \ alarm_highlight.png \ disabler.png \ - swallow_spacer_mask.png + live_bg_glow_in.png \ + live_rel1_dragable.png \ + live_rel2_dragable.png \ + live_image.png \ + live_rectangle.png \ + live_swallow.png \ + live_spacer.png \ + live_text.png \ + live_textblock.png \ + live_edit.png diff --git a/data/themes/default/images/live_edit_icons/bg_glow_in.png b/data/themes/default/images/live_bg_glow_in.png similarity index 100% rename from data/themes/default/images/live_edit_icons/bg_glow_in.png rename to data/themes/default/images/live_bg_glow_in.png diff --git a/data/themes/default/images/live_edit_icons/icon-live-edit.png b/data/themes/default/images/live_edit.png similarity index 100% rename from data/themes/default/images/live_edit_icons/icon-live-edit.png rename to data/themes/default/images/live_edit.png diff --git a/data/themes/default/images/live_edit_icons/rel1.dragable.png b/data/themes/default/images/live_edit_icons/rel1.dragable.png deleted file mode 100644 index 59341a6..000 Binary files
[EGIT] [apps/rage] master 01/01: instead fo blank black boxes in video list for music files use art
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=a77abd4f74a4cf341b0d1896d14c494b3a77fd54 commit a77abd4f74a4cf341b0d1896d14c494b3a77fd54 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 19:35:38 2014 +0900 instead fo blank black boxes in video list for music files use art use albumart if already cached/found for video list thumbs for known music files... at least until a video frame is decoded. --- src/bin/albumart.c | 6 +++ src/bin/albumart.h | 1 + src/bin/video.c| 125 + src/bin/video.h| 2 + src/bin/winlist.c | 1 + 5 files changed, 126 insertions(+), 9 deletions(-) diff --git a/src/bin/albumart.c b/src/bin/albumart.c index 9c348f5..a62b793 100644 --- a/src/bin/albumart.c +++ b/src/bin/albumart.c @@ -281,3 +281,9 @@ albumart_find(Evas_Object *win, Evas_Object *vid) eina_strbuf_free(sb); } + +char * +albumart_file_get(const char *file) +{ + return _thumbpath(file); +} diff --git a/src/bin/albumart.h b/src/bin/albumart.h index 0130c69..3a803c3 100644 --- a/src/bin/albumart.h +++ b/src/bin/albumart.h @@ -2,5 +2,6 @@ #define _ALBUMART_H__ 1 void albumart_find(Evas_Object *win, Evas_Object *vid); +char *albumart_file_get(const char *file); #endif diff --git a/src/bin/video.c b/src/bin/video.c index d96846e..3f75224 100644 --- a/src/bin/video.c +++ b/src/bin/video.c @@ -2,18 +2,19 @@ #include video.h #include rage_config.h #include config.h +#include albumart.h typedef struct _Video Video; struct _Video { Evas_Object_Smart_Clipped_Data __clipped_data; - Evas_Object *clip, *o_vid, *o_event; + Evas_Object *clip, *o_vid, *o_img, *o_event; Ecore_Timer *smooth_timer; Ecore_Job *restart_job; const char *file; int w, h; - int iw, ih, piw, pih; + int iw, ih, piw, pih, tw, th; int resizes; struct { Evas_Coord x, y; @@ -23,6 +24,8 @@ struct _Video Eina_Bool lowqual : 1; Eina_Bool loop : 1; Eina_Bool fill : 1; + Eina_Bool novid : 1; + Eina_Bool doart : 1; }; static Evas_Smart *_smart = NULL; @@ -31,6 +34,49 @@ static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL; static void _ob_resize(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); static void +_art_check(Evas_Object *obj) +{ + Video *sd = evas_object_smart_data_get(obj); + if (!sd) return; + if (!sd-novid) + { +if (!emotion_object_video_handled_get(sd-o_vid)) + sd-novid = EINA_TRUE; + } + else + { +if (!emotion_object_video_handled_get(sd-o_vid)) + sd-novid = EINA_FALSE; + } + if (sd-doart) + { +char *thumb = NULL, *realfile; + +evas_object_show(sd-o_img); +realfile = ecore_file_realpath(sd-file); +if (realfile) + { + thumb = albumart_file_get(realfile); + free(realfile); + } +if (thumb) + { + Evas_Coord ox, oy, ow, oh; + + if (ecore_file_exists(thumb)) + { + evas_object_image_file_set(sd-o_img, thumb, NULL); + evas_object_image_size_get(sd-o_img, (sd-tw), (sd-th)); + evas_object_geometry_get(obj, ox, oy, ow, oh); + _ob_resize(obj, ox, oy, ow, oh); + } + free(thumb); + } + } + else evas_object_hide(sd-o_img); +} + +static void _cb_vid_frame(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) { Video *sd = evas_object_smart_data_get(data); @@ -39,6 +85,7 @@ _cb_vid_frame(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) if (!sd) return; evas_object_geometry_get(data, ox, oy, ow, oh); evas_object_show(sd-o_vid); + evas_object_hide(sd-o_img); evas_object_show(sd-clip); _ob_resize(data, ox, oy, ow, oh); evas_object_smart_callback_call(data, frame_decode, NULL); @@ -112,6 +159,7 @@ _cb_open_done(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) Video *sd = evas_object_smart_data_get(data); if (!sd) return; evas_object_smart_callback_call(data, opened, NULL); + _art_check(data); } static void @@ -204,11 +252,11 @@ _ob_resize(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coor { int iw = 1, ih = 1; double ratio; - + ratio = emotion_object_ratio_get(sd-o_vid); if (ratio 0.0) sd-iw = (sd-ih * ratio); else ratio = (double)sd-iw / (double)sd-ih; - + iw = w; ih = ((double)w + 1.0) / ratio; if (ih h) @@ -231,6 +279,29 @@ _ob_resize(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coor sd-pih = sd-ih; evas_object_smart_callback_call(obj, frame_resize, NULL); } + if ((sd-tw 0)
[EGIT] [tools/enventor] master 01/01: theme: code refactoring.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=3191a0e187783017eba415544d771e599915899b commit 3191a0e187783017eba415544d771e599915899b Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 19:50:47 2014 +0900 theme: code refactoring. use macro for simplify. --- data/themes/default/enventor.edc | 4 ++ data/themes/default/layout_common.edc | 124 ++--- data/themes/default/layout_setting.edc | 19 ++--- 3 files changed, 45 insertions(+), 102 deletions(-) diff --git a/data/themes/default/enventor.edc b/data/themes/default/enventor.edc index 8221c71..5504fbf 100644 --- a/data/themes/default/enventor.edc +++ b/data/themes/default/enventor.edc @@ -1,4 +1,8 @@ #define FN Sans +#define COL_HI 51 153 255 255; color2: 51 153 255 24; color3: 51 153 255 18 +#define COL_HI_TRANS 51 153 255 0; color2: 51 153 255 0; color3: 51 153 255 0 +#define COL_NM 255 255 255 255; color3: 0 0 0 128 +#define COL_NM_TRANS 255 255 255 0; color3: 0 0 0 0 data.item: version 110; diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index 50d261d..ef80556 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -214,9 +214,7 @@ group { name: fileselector_layout; align: 0.5 0.5; min: 1 0; } -color: 51 153 255 255; -color2: 51 153 255 24; -color3: 51 153 255 18; +color: COL_HI; } } part { name: elm.swallow.fileselector; @@ -414,9 +412,7 @@ group { name: newfile_layout; align: 0.5 0.5; min: 1 0; } -color: 51 153 255 255; -color2: 51 153 255 24; -color3: 51 153 255 18; +color: COL_HI; } } part { name: elm.swallow.content; @@ -603,9 +599,7 @@ group { name: warning_layout; } fixed: 1 1; align: 0.5 0.5; -color: 51 153 255 255; -color2: 51 153 255 24; -color3: 51 153 255 18; +color: COL_HI; } } part { name: elm.text.desc; @@ -797,9 +791,7 @@ group { name: menu_layout; align: 0.5 0.5; min: 1 0; } -color: 51 153 255 255; -color2: 51 153 255 24; -color3: 51 153 255 18; +color: COL_HI; } } part { name: padding1; @@ -1070,8 +1062,7 @@ group { name: goto_layout; size: 11; align: 0 0; } -color: 255 255 255 255; -color3: 0 0 0 128; +color: COL_NM; min: 180 20; fixed: 1 1; } @@ -1104,9 +1095,7 @@ group { name: goto_layout; size: 10; align: 0 0.5; } -color: 51 153 255 255; -color2: 51 153 255 16; -color3: 51 153 255 8; +color: COL_HI; min: 180 30; fixed: 1 1; } @@ -1163,8 +1152,7 @@ group { name: search_layout; align: 0 0; text: Find:; } -color: 255 255 255 255; -color3: 0 0 0 128; +color: COL_NM; min: 80 20; fixed: 1 1; } @@ -1186,8 +1174,7 @@ group { name: search_layout; align: 0 0; text: Replace with:; } -color: 255 255 255 255; -color3: 0 0 0 128; +color: COL_NM; min: 80 20; fixed: 1 1; } @@ -1209,9 +1196,7 @@ group { name: search_layout; align: 0 0.5; text: Forward; } -color: 51 153 255 255; -color2: 51 153 255 16; -color3: 51 153 255 8; +color: COL_HI; min: 80 30; fixed: 1 1; } @@ -1360,9 +1345,7 @@ group { name: live_edit_layout; description { rel1.to: rel1_dragable; rel2.to: rel1_dragable; -color: 51 153 255 255; -color2: 51 153 255 24; -color3: 51 153 255 18; +color: COL_HI; align: 0 0.5; fixed: 1 1; text { @@ -1397,9 +1380,7 @@ group { name: live_edit_layout; description { rel1.to: rel2_dragable; rel2.to: rel2_dragable; -color: 51 153 255 255; -color2: 51 153 255 24; -color3: 51 153 255 18; +color: COL_HI; align: 1 0.5; text { font: FN; @@ -1617,8 +1598,7 @@ group { name: statusbar_layout; rel1.offset: 0 -2; rel2.offset: -1 -3; fixed: 1 0; -color: 255 255 255 255; -color3: 0 0 0 128; +
[EGIT] [tools/enventor] master 01/01: menu: adjust ui.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=f67c8b02555b1cccafd47fad133368e3da619212 commit f67c8b02555b1cccafd47fad133368e3da619212 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 19:58:45 2014 +0900 menu: adjust ui. --- data/themes/default/layout_common.edc | 30 +++--- src/bin/menu.c| 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index ef80556..ef8bae1 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -788,7 +788,7 @@ group { name: menu_layout; font: FN; text: Enventor Menu; size: 28; - align: 0.5 0.5; + align: 0.5 1; min: 1 0; } color: COL_HI; @@ -802,7 +802,7 @@ group { name: menu_layout; rel2.relative: 0 0.5; rel1.to: base_frame; rel2.to: base_frame; -min: 23 120; +min: 23 100; fixed: 1 1; align: 0 0.5; } @@ -814,10 +814,10 @@ group { name: menu_layout; description { state: default 0.0; rel1.to: padding1; rel2.to: padding1; -rel1.relative: 1 0; +rel1.relative: 1 0.2; align: 0 0; -min: 80 80; -max: 80 80; +min: 80 50; +max: 80 50; fixed: 1 1; } } @@ -828,7 +828,7 @@ group { name: menu_layout; rel1.to: elm.swallow.new_btn; rel2.to: elm.swallow.new_btn; rel1.relative: 1 0; -min: 23 80; +min: 23 50; fixed: 1 1; align: 0 0.5; } @@ -842,7 +842,7 @@ group { name: menu_layout; rel2.to: padding2; rel1.relative: 1 0; align: 0 0.5; -min: 80 80; +min: 80 50; fixed: 1 1; } } @@ -853,7 +853,7 @@ group { name: menu_layout; rel1.to: elm.swallow.save_btn; rel2.to: elm.swallow.save_btn; rel1.relative: 1 0; -min: 23 80; +min: 23 50; fixed: 1 1; align: 0 0.5; } @@ -867,7 +867,7 @@ group { name: menu_layout; rel2.to: padding3; rel1.relative: 1 0; align: 0 0.5; -min: 80 80; +min: 80 50; fixed: 1 1; } } @@ -878,7 +878,7 @@ group { name: menu_layout; rel1.to: elm.swallow.load_btn; rel2.to: elm.swallow.load_btn; rel1.relative: 1 0; -min: 23 80; +min: 23 50; fixed: 1 1; align: 0 0.5; } @@ -892,7 +892,7 @@ group { name: menu_layout; rel2.to: padding4; rel1.relative: 1 0; align: 0 0.5; -min: 80 80; +min: 80 50; fixed: 1 1; } } @@ -903,7 +903,7 @@ group { name: menu_layout; rel1.to: elm.swallow.setting_btn; rel2.to: elm.swallow.setting_btn; rel1.relative: 1 0; -min: 23 80; +min: 23 50; fixed: 1 1; align: 0 0.5; } @@ -917,7 +917,7 @@ group { name: menu_layout; rel2.to: padding5; rel1.relative: 1 0; align: 0 0.5; -min: 80 80; +min: 80 50; fixed: 1 1; } } @@ -928,7 +928,7 @@ group { name: menu_layout; rel1.to: elm.swallow.about_btn; rel2.to: elm.swallow.about_btn; rel1.relative: 1 0; -min: 23 80; +min: 23 50; fixed: 1 1; align: 0 0.5; } @@ -942,7 +942,7 @@ group { name: menu_layout; rel2.to: padding6; rel1.relative: 1 0; align: 0 0.5; -min: 80 80; +min: 80 50; fixed: 1 1; } } diff --git a/src/bin/menu.c b/src/bin/menu.c index 3848fc3..c7a6cc9 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -335,7 +335,7 @@ btn_create(Evas_Object *parent, const char *label, Evas_Smart_Cb cb, void *data) btn = elm_button_add(parent); elm_object_style_set(btn, anchor); - elm_object_scale_set(btn, 1.45); + elm_object_scale_set(btn, 1.25); evas_object_smart_callback_add(btn, clicked, cb, data); elm_object_text_set(btn, label); evas_object_show(btn); --
[EGIT] [apps/terminology] master 01/01: fix segv on word set search
raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=cd0bfa5d0c91944c015fae51e400c17b0b6f2113 commit cd0bfa5d0c91944c015fae51e400c17b0b6f2113 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 20:00:24 2014 +0900 fix segv on word set search --- src/bin/termio.c | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index 74acb68..2974b47 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -2597,19 +2597,18 @@ _codepoint_is_wordsep(const Eina_Unicode g) 0xff65, 0xe002a }; - size_t imax = sizeof(wordsep)/sizeof(wordsep[0]) - 1, + size_t imax = (sizeof(wordsep) / sizeof(wordsep[0])) - 1, imin = 0; - while (imax = imin) -{ - size_t imid = (imin + imax) / 2; - if (wordsep[imid] == g) -return EINA_TRUE; - else if (wordsep[imid] g) -imin = imid + 1; - else -imax = imid - 1; -} + while (imax = imin) + { +size_t imid = (imin + imax) / 2; + +if (wordsep[imid] == g) return EINA_TRUE; +else if (wordsep[imid] g) imin = imid + 1; +else imax = imid - 1; +if ((imax == imin) || (imid == 0)) break; + } return EINA_FALSE; } --
[EGIT] [tools/enventor] master 01/01: live_edit: cancel live_edit if edc is reload.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=b2495c9a8d4759793483dc09afec81c7a2219a04 commit b2495c9a8d4759793483dc09afec81c7a2219a04 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 20:08:01 2014 +0900 live_edit: cancel live_edit if edc is reload. --- src/bin/edc_editor.c| 1 + src/bin/live_edit.c | 7 +++ src/include/live_edit.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 9338609..2cd4c19 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -1103,6 +1103,7 @@ edit_part_highlight_toggle(edit_data *ed, Eina_Bool msg) void edit_edc_reload(edit_data *ed, const char *edc_path) { + live_edit_cancel(); config_edc_path_set(edc_path); edit_new(ed); edj_mgr_reload_need_set(EINA_TRUE); diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index cdfd40e..ebf237f 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -327,6 +327,13 @@ live_edit_toggle(void) } void +live_edit_cancel(void) +{ + if (!config_live_edit_get()) return; + live_edit_toggle(); +} + +void live_edit_init(edit_data *ed) { live_data *ld = calloc(1, sizeof(live_data)); diff --git a/src/include/live_edit.h b/src/include/live_edit.h index 1a09be0..4653cf2 100644 --- a/src/include/live_edit.h +++ b/src/include/live_edit.h @@ -1,3 +1,4 @@ void live_edit_init(edit_data *ed); void live_edit_term(void); void live_edit_toggle(void); +void live_edit_cancel(void); --
[EGIT] [tools/enventor] master 01/01: add author list in readme
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=eccb47a28da797d0b2f139fafbd2b802d292a881 commit eccb47a28da797d0b2f139fafbd2b802d292a881 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Aug 15 20:16:10 2014 +0900 add author list in readme --- README | 15 +++ 1 file changed, 15 insertions(+) diff --git a/README b/README index 6c00b01..9d74a00 100644 --- a/README +++ b/README @@ -78,6 +78,21 @@ Ctrl+End = Go to the Bottom line enventor --help enventor [input file] [-id image path] [-sd sound path] [-fd font path] [-dd data path] + +[Authors] + +Hermet (Chuneon Park) +Cedric Bail +Raoul Hecky +Daniel Juyung Seo +Ryuan Choi +Jihoon Kim +The Rasterman (Carsten Haitzler) +Kateryna Fesyna +JaeHyun Jo +Mykyta Biliavskyi +Alex-P. Natsios + * FOR ANY ISSUES PLEASE EMAIL * enlightenment-devel@lists.sourceforge.net --
[EGIT] [apps/terminology] master 01/01: re-fix wrodsep to work again and not segv
raster pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=149d23d48480f91e0dcadeda5653f396f45cd360 commit 149d23d48480f91e0dcadeda5653f396f45cd360 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 20:20:15 2014 +0900 re-fix wrodsep to work again and not segv --- src/bin/termio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index 2974b47..16ed54f 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -2599,6 +2599,7 @@ _codepoint_is_wordsep(const Eina_Unicode g) }; size_t imax = (sizeof(wordsep) / sizeof(wordsep[0])) - 1, imin = 0; + size_t imaxmax = imax; while (imax = imin) { @@ -2607,7 +2608,7 @@ _codepoint_is_wordsep(const Eina_Unicode g) if (wordsep[imid] == g) return EINA_TRUE; else if (wordsep[imid] g) imin = imid + 1; else imax = imid - 1; -if ((imax == imin) || (imid == 0)) break; +if (imax imaxmax) break; } return EINA_FALSE; } --
[EGIT] [apps/rage] master 02/02: add readme info like key controls and other things
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=6bab1a533b68e78e470db71060b1648ac6a34d77 commit 6bab1a533b68e78e470db71060b1648ac6a34d77 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 20:33:46 2014 +0900 add readme info like key controls and other things --- README | 87 ++ 1 file changed, 87 insertions(+) diff --git a/README b/README index 4adbbc6..12aad09 100644 --- a/README +++ b/README @@ -7,6 +7,93 @@ Rage 0.1.0 ** +This is a Video + Audio player along the lines of mplayer. It's simple +yet decent looking. It finds album art for you for music files, +generates thumbnails for videos so you can select logaction by +thumbnail and more. It accepts file lists on the cmdline ala: + + rage file1.mp3 file2.mp3 file3.avi file4.mp4 file5.ogg + rage dvd:/ + rage http://www.blah.com/stream + +You can tell it what media/video engine in emotion to ue via -e: + + rage -e vlc blah.mov + rage -e xine dvd:/ + rage -e gstreamer1 blah.mp3 + +If you DND files onto its window, they are added to the playlist. +Mouse over the right of the window brings up the playlist. Mouse over +the position bar at the bottom, if it's a video, brings up a video +thumbnail of that position (it may take a while to generate thumbnails +for that video - they are cached). + +It's fully key controlled too. Key controls are: + ++-- +KEY | Action ++-- +Left- rewind or DVD nav left +[ - rewind +Right - fast forward or DVD nav right +] - fast forward +Up - Volume up or DVD nav up ++ - Volume up += - Volume up +Down- Volume down DVD nav down +- - Volume down +space - Pause toggle +Pause - Pause toggle +p - Pause toggle +XF86AudioPlay - pause toggle +s - Stop +XF86AudioStop - Stop +PgUp- Previous file +XF86AudioPrev - Previous file +PgDn- Next file +XF86AudioNext - Next file +Home- First file +End - Last file +m - Mute toggle +XF86AudioMute - Mute toggle +l - Loop 1 mode toggle +q - Exit +Escape - Exit +f - Fullscreen toggle +F11 - Fullscreen toggle +n - Normalize window size to video size +\ - Toggle File list +y - Video low quality toggle +z - Video zoom fit/fill modes toggle +e - Eject file/media +Return - DVD nav select +Enter - DVD nav select +, - DVD nav angle prev + - DVD nav angle prev +. - DVD nav angle next + - DVD nav angle next +Tab - DVD nav force +0 - DVD nav 0 +1 - DVD nav 1 +2 - DVD nav 2 +3 - DVD nav 3 +4 - DVD nav 4 +5 - DVD nav 5 +6 - DVD nav 6 +7 - DVD nav 7 +8 - DVD nav 8 +9 - DVD nav 9 +` - DVD nav 10 +~ - DVD nav 10 +F1 - DVD nav menu 1 +F2 - DVD nav menu 2 +F3 - DVD nav menu 3 +F4 - DVD nav menu 4 +F5 - DVD nav menu 5 +F6 - DVD nav menu 6 +F7 - DVD nav menu 7 ++-- + Requirements: - --
[EGIT] [apps/rage] master 01/02: fix comma key bind
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=3b2e8bb3a573287c3b3e45f58a87167e47542a48 commit 3b2e8bb3a573287c3b3e45f58a87167e47542a48 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 20:24:48 2014 +0900 fix comma key bind --- src/bin/key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/key.c b/src/bin/key.c index a33ac67..d18730a 100644 --- a/src/bin/key.c +++ b/src/bin/key.c @@ -192,7 +192,7 @@ key_handle(Evas_Object *win, Evas_Event_Key_Down *ev) { video_event_send(inf-vid, EMOTION_EVENT_SELECT); } - else if ((!strcmp(ev-key, comman)) || + else if ((!strcmp(ev-key, comma)) || (!strcmp(ev-key, less))) { video_event_send(inf-vid, EMOTION_EVENT_ANGLE_PREV); --
[EGIT] [apps/rage] master 01/01: make theme a bit nicer for video mode and file list
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=b32afb8c55d89d51b2a2603b8f70a7f182dc39e1 commit b32afb8c55d89d51b2a2603b8f70a7f182dc39e1 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Aug 15 21:27:23 2014 +0900 make theme a bit nicer for video mode and file list --- TODO| 4 +- data/themes/default.edc | 87 ++-- data/themes/images/Makefile.mk | 3 +- data/themes/images/vgrad-dark-inv-trans.png | Bin 0 - 4246 bytes 4 files changed, 60 insertions(+), 34 deletions(-) diff --git a/TODO b/TODO index 944721a..93104dd 100644 --- a/TODO +++ b/TODO @@ -10,6 +10,6 @@ * add subtitle file cmdline * loop all option * show busy anim until opened cb or failure -* add button/control top-left next to audio to do fullscreen/normal toggle -* detect letterboxing and auto-crop * thumbnail picker show all thumbs for video in a grid to select position +* fix initial sizing in audio mode to account for scaling +* add title/album/artis/file display inside window in music mode (at pos?) diff --git a/data/themes/default.edc b/data/themes/default.edc index bdf2ab8..f1a3a65 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -35,6 +35,7 @@ collections { images.image: bg_glint.png COMP; images.image: vgrad-dark-inv.png COMP; + images.image: vgrad-dark-inv-trans.png COMP; images.image: posglow.png COMP; images.image: speaker-base.png COMP; @@ -237,9 +238,17 @@ collections { description { state: default 0.0; } } - part { name: controlbar_shadow; mouse_events: 0; + + part { name: controlbar_shadow_clip; type: RECT; clip_to: controlbar_clip; description { state: default 0.0; + rel2.relative: 1.0 0.0; + rel2.to_y: controlbar; +} + } + part { name: controlbar_shadow; mouse_events: 0; +clip_to: controlbar_shadow_clip; +description { state: default 0.0; fixed: 1 1; rel1.to: controlbar; rel2.to: controlbar; @@ -466,6 +475,37 @@ collections { } } + part { name: rage.list; type: SWALLOW; +description { state: default 0.0; + align: 0.0 0.5; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + rel2.to_y: controlbar; + fixed: 1 1; +} +description { state: visible 0.0; + inherit: default 0.0; + align: 1.0 0.5; + visible: 1; +} + } + program { +signal: list,state,visible; source: rage; +action: STATE_SET visible 0.0; +transition: DECELERATE 0.3; +target: rage.list; + } + program { +signal: list,state,hidden; source: rage; +action: STATE_SET default 0.0; +transition: ACCELERATE 0.5; +target: rage.list; +after: list_hidden; + } + program { name: list_hidden; +action: SIGNAL_EMIT list,state,hidden,finished rage; + } + part { name: controlbar_clip; type: RECT; description { state: default 0.0; color: 255 255 255 0; @@ -479,7 +519,7 @@ collections { part { name: controlbar; mouse_events: 0; clip_to: controlbar_clip; description { state: default 0.0; - image.normal: vgrad-dark-inv.png; + image.normal: vgrad-dark-inv-trans.png; fill { smooth: 0; size.relative: 0.0 1.0; @@ -487,6 +527,20 @@ collections { } rel1.to: rage.pos.prev.swallow; } +description { state: novideo 0.0; + inherit: default 0.0; + image.normal: vgrad-dark-inv.png; +} + } + program { +signal: state,novideo; source: rage; +action: STATE_SET novideo 0.0; +target: controlbar; + } + program { +signal: state,video; source: rage; +action: STATE_SET default 0.0; +target: controlbar; } part { name: posclip; type: RECT; @@ -963,35 +1017,6 @@ collections { } } - part { name: rage.list; type: SWALLOW; -description { state: default 0.0; - align: 0.0 0.5; - rel1.relative: 1.0 0.0; - fixed: 1 1; -} -description { state: visible 0.0; - inherit: default 0.0; - align: 1.0 0.5; - visible: 1; -} - } - program { -signal:
[EGIT] [core/efl] master 01/01: tweak NEWS for my 1.11 commits
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e2b543e0ab19d7abba57411ca5c75d4e53a5c3ff commit e2b543e0ab19d7abba57411ca5c75d4e53a5c3ff Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Fri Aug 15 08:27:33 2014 -0400 tweak NEWS for my 1.11 commits --- NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 50fa5f1..37ed2e9 100644 --- a/NEWS +++ b/NEWS @@ -86,11 +86,12 @@ Features: * edje: Add dpi feature. * ecore animator - adjust ecore loop time when animtor ticks to be exact * add function to set ecore loop time + * add simple ecore-con-url test suite Fixes: * Eolian: fix generation when optimization is set. - * recursively hide edje group objects on edje hide + * Edje GROUP objects now recursively hide child objects when parent is hidden * Evas textblock: Fix wrong advance calculation when bidi is disabled. * Eo/evas events: Fix support of mixing legacy smart events and eo events. * evas loader - redo gif fix so it doesn't break everything --
[EGIT] [core/elementary] master 01/01: my 1.11 NEWS updates
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=e9c8a2aaa759333c1a5da62f7c815847514f9211 commit e9c8a2aaa759333c1a5da62f7c815847514f9211 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Fri Aug 15 08:36:09 2014 -0400 my 1.11 NEWS updates --- NEWS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 78e9d9b..2d6deaa 100644 --- a/NEWS +++ b/NEWS @@ -37,13 +37,12 @@ Fixes: * elementary: Don't segfault if we are not using an X11-compatible engine * list: call selected callback after set focus to the selected item * gengrid: corrected the reorder start and end evas smart callback call. - * fix notification theme to not clip text * map: Add missing legacy API into legacy header * elc_naviframe: Fix warning caused by elm_obj_layout_signal_emit override function in naviframe * ctxpopup: fix arrow geometry set. * ctxpopup: Fix wrong popup size. * elementary: Handle case where ELM_ENGINE environment variable is misspelled. - * photocam should reset its preload when a new file is loaded + * photocam no longer gets stuck in busy animations * Gengrid: fix position calculation * Genlist: do not segv if the user clear the list on item double-click * gengrid once again selects items using keyboard when no item was previously selected --
Re: [E-devel] Build error while building ELM with '--with-tests=regular'
Hello. On Fri, 2014-07-18 at 14:37, Cedric BAIL wrote: On Fri, Jul 18, 2014 at 1:41 PM, Lukasz Stanislawski l.stanisl...@samsung.com wrote: W dniu 18.07.2014 12:10, Stefan Schmidt pisze: Hello. On Tue, 2014-07-15 at 22:53, Tom Hacohen wrote: On 15/07/14 22:46, ryuan Choi wrote: I compiled Elementary with tests and got below errors. Some APIs look changed. What I did: cd elementary ./autogen.sh --prefix=/usr/elocal --with-tests=regular make -j8 sudo make install make check -j8 Error message: elm_suite-elm_test_atspi.o: In function `elm_test_atspi_object_children_get': /home/ryuan/workspace/project/efl/elementary/src/tests/elm_test_atspi.c:262: undefined reference to `_elm_atspi_root_get' elm_suite-elm_test_atspi.o: In function `generate_app': /home/ryuan/workspace/project/efl/elementary/src/tests/elm_test_atspi.c:35: undefined reference to `_elm_atspi_init' /home/ryuan/workspace/project/efl/elementary/src/tests/elm_test_atspi.c:37: undefined reference to `_elm_atspi_root_get' elm_suite-elm_test_entry.o: In function `elm_entry_atspi_text_text_get': /home/ryuan/workspace/project/efl/elementary/src/tests/elm_test_entry.c:271: undefined reference to `elm_interface_atspi_text_text_get' Best Regards, Ryuan Choi -- Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel Hey, I fixed the issue with the entry test, thanks for reporting. No idea about the rest. Can't find those functions or any trace of them, and don't really have the time to try and find them in history. It would be great if whoever who wrote it will fix it. Stefan: don't we make check for elementary on jenkins? I wonder how this was missed for so long. Took me a moment as I was on some training. We run make check but what we never did was actually configuring elm with regular tests. I changed this now and it is segfaulting nicely on jenkins. If anyone wants to have a look. https://build.enlightenment.org/job/changely_elm_gcc_x86_64/ws/src/tests/test-suite.log Hi Stefan, After quick invastigation it looks like segmentation faults may be caused by failures in setting elm objects text parts. Generally, all test cases doesn't assume that setting texts with elm_object_text_set method may fail and make string comparison directly on elm_object_text_get return value. I can add additonal NULL checks but all-in-all this tests will fail. It looks like elementary is unable to properly initialize without xserver running or because there is no desktop attached.(there are some log entries related to undefined desktop environmental variable). I'm not getting sigsegv on my local machine. I did try to test it on my computer and I get also some failure : 77%: Checks: 99, Failures: 21, Errors: 1 elm_test_entry.c:203:F:elm_entry:elm_entry_atspi_text_string_get_paragraph:0: Assertion 'val== dolor sit' failed: val== dolor sit amęt, dolor sit== dolor sit elm_test_entry.c:242:F:elm_entry:elm_entry_atspi_text_string_get_line:0: Assertion 'val==Lorem ipśum' failed: val==Lorem, Lorem ipśum==Lorem ipśum elm_test_entry.c:272:F:elm_entry:elm_entry_atspi_text_text_get:0: Assertion 'val==txtnom' failed: val==Lorem ip, txtnom==Lorem ipśum dolor sit amęt elm_test_atspi.c:36:E:elm_atspi:elm_atspi_name_get:0: (after this point) Received signal 11 (Segmentation fault) elm_test_atspi.c:64:F:elm_atspi:elm_atspi_role_get:0: Assertion 'role == ELM_ATSPI_ROLE_APPLICATION' failed elm_test_atspi.c:81:F:elm_atspi:elm_atspi_role_name_get:0: Assertion 'ret != ((void *)0)' failed elm_test_atspi.c:97:F:elm_atspi:elm_atspi_localized_role_name_get:0: Assertion 'ret != ((void *)0)' failed elm_test_atspi.c:121:F:elm_atspi:elm_atspi_description_set:0: Assertion 'ret != ((void *)0)' failed elm_test_atspi.c:140:F:elm_atspi:elm_atspi_children_and_parent:0: Assertion 'eina_list_count(child_list) == 1' failed elm_test_atspi.c:176:F:elm_atspi:elm_atspi_component_position:0: Assertion 'ret == ((Eina_Bool)1)' failed elm_test_atspi.c:205:F:elm_atspi:elm_atspi_component_size:0: Assertion 'ret == ((Eina_Bool)1)' failed elm_test_atspi.c:234:F:elm_atspi:elm_atspi_component_focus:0: Assertion 'ret == ((Eina_Bool)1)' failed elm_test_atspi.c:269:F:elm_atspi:elm_test_atspi_obj_index_in_parent_get:0: Assertion 'win != ((void *)0)' failed elm_test_atspi.c:362:F:elm_atspi:elm_atspi_children_and_parent2:0: Assertion 'eina_list_count(win_children) ==
[EGIT] [core/efl] master 01/01: evas-wayland-egl: Fix segmentation fault on dynamic loaded gl related functions.
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ac4074c4fa951240d4bfd1ee8f5ccbce913e6203 commit ac4074c4fa951240d4bfd1ee8f5ccbce913e6203 Author: Mun Gwan-gyeong elong...@gmail.com Date: Fri Aug 15 09:17:25 2014 -0400 evas-wayland-egl: Fix segmentation fault on dynamic loaded gl related functions. Summary: @fix Segfault in wayland_egl engine is casused by illegal library linking. Fix this by linking to GLESv2 and EGL libraries. Test Plan: N/A Reviewers: devilhorns, raster, cedric, Hermet Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1332 --- m4/evas_check_engine.m4| 1 + src/Makefile_Evas.am | 14 ++ src/modules/evas/engines/wayland_egl/evas_engine.c | 3 --- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index dd7030e..6c8ed81 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -575,6 +575,7 @@ if test x${have_dep} = xyes ; then PKG_CHECK_MODULES([WAYLAND_EGL], [${requirement}]) evas_engine_[]$1[]_cflags=${WAYLAND_EGL_CFLAGS} evas_engine_[]$1[]_libs=${WAYLAND_EGL_LIBS} + evas_engine_gl_common_libs=$evas_engine_[]$1[]_libdirs -lGLESv2 -lm -lEGL fi fi diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 78d9be7..ceb5f6c 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -883,6 +883,9 @@ modules_evas_engines_gl_generic_module_la_LIBTOOLFLAGS = --tag=disable-static if BUILD_ENGINE_GL_X11 modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@ endif +if BUILD_ENGINE_WAYLAND_EGL +modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@ +endif modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = @USE_EVAS_LIBS@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ @@ -1149,9 +1152,7 @@ modules/evas/engines/wayland_egl/evas_wl_main.c \ modules/evas/engines/wayland_egl/evas_engine.h if EVAS_STATIC_BUILD_WAYLAND_EGL lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES) -lib_evas_libevas_la_CPPFLAGS += \ --I$(top_srcdir)/src/modules/evas/engines/gl_common \ -@evas_engine_wayland_egl_cflags@ +lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@ lib_evas_libevas_la_LIBADD += @evas_engine_wayland_egl_libs@ else enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) @@ -1160,16 +1161,13 @@ modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) modules_evas_engines_wayland_egl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_srcdir)/src/modules/evas/engines/gl_common \ +-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ @EVAS_CFLAGS@ \ @evas_engine_wayland_egl_cflags@ modules_evas_engines_wayland_egl_module_la_LIBADD = \ @USE_EVAS_LIBS@ \ -modules/evas/engines/gl_common/libevas_engine_gl_common.la \ @evas_engine_wayland_egl_libs@ -modules_evas_engines_wayland_egl_module_la_DEPENDENCIES = \ -@USE_EVAS_INTERNAL_LIBS@ \ -modules/evas/engines/gl_common/libevas_engine_gl_common.la +modules_evas_engines_wayland_egl_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static endif diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index 0a133ba..bd5b72e 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -1043,9 +1043,6 @@ module_open(Evas_Module *em) /* check for valid module */ if (!em) return 0; - /* try to init evas_gl_common */ - if (!evas_gl_common_module_open()) return 0; - /* get whatever engine module we inherit from */ if (!_evas_module_engine_inherit(pfunc, gl_generic)) return 0; --
Re: [E-devel] ewebkit 1.11.0 - beta 1
On Wed, Aug 13, 2014 at 08:15:34PM +0900, ryuan Choi wrote: = EWebKit 1.11 beta tarballs = I'd like to share new ewebkit tarball beta. I reduced binary size by removing big ChangeLog-XXX. Now, binary size of ewebkit-1.11.0-beta1.tar.gz is about 18MB (the size of alpha was about 44MB) You can find the script in below git to know what I exclude from tarball https://github.com/ewebkit/script == Source == https://github.com/ewebkit/webkit branch : ewebkit-1.11 (master branch is for sync with webkit.org) == Download == http://download.enlightenment.org/rel/libs/webkit-efl/ewebkit-1.11.0-beta1.tar.gz ceb03ccefecccb5fc3a646e9b66806d605f2e8af35f72edb53fe56e14262351c http://download.enlightenment.org/rel/libs/webkit-efl/ewebkit-1.11.0-beta1.tar.xz 7d0545f79be3633973eb7340318552f80a213c5afddd2c3fee5ccd543cc0418d == NEWS == From the previous snapshot, * WebKit1/EFL was dropped. is there some simple opensource browser using ewebkit2 (or someone working on upgrading eve)? https://git.enlightenment.org/apps/eve.git/ -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] vlc plugin not working
Carsten Haitzler (The Rasterman), il 15/08/2014 05:13, ha scritto: now here comes the rub. i seem to have found that the yuv rendering in gl is not enabling interpolation for u and v - just for y! fixed in git now. Yay, now it looks good as in vlcc, thanks :) -- Massimo Maiurana Ragusa (RG) -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] ewebkit 1.11.0 - beta 1
https://github.com/bunhere?tab=repositories i really want to try but im afraid to build ewbkit, my pc have only 2gb ram :( On Fri, Aug 15, 2014 at 4:35 PM, Martin Jansa martin.ja...@gmail.com wrote: On Wed, Aug 13, 2014 at 08:15:34PM +0900, ryuan Choi wrote: = EWebKit 1.11 beta tarballs = I'd like to share new ewebkit tarball beta. I reduced binary size by removing big ChangeLog-XXX. Now, binary size of ewebkit-1.11.0-beta1.tar.gz is about 18MB (the size of alpha was about 44MB) You can find the script in below git to know what I exclude from tarball https://github.com/ewebkit/script == Source == https://github.com/ewebkit/webkit branch : ewebkit-1.11 (master branch is for sync with webkit.org) == Download == http://download.enlightenment.org/rel/libs/webkit-efl/ewebkit-1.11.0-beta1.tar.gz ceb03ccefecccb5fc3a646e9b66806d605f2e8af35f72edb53fe56e14262351c http://download.enlightenment.org/rel/libs/webkit-efl/ewebkit-1.11.0-beta1.tar.xz 7d0545f79be3633973eb7340318552f80a213c5afddd2c3fee5ccd543cc0418d == NEWS == From the previous snapshot, * WebKit1/EFL was dropped. is there some simple opensource browser using ewebkit2 (or someone working on upgrading eve)? https://git.enlightenment.org/apps/eve.git/ -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] ewebkit 1.11.0 - beta 1
Date: Sat, 16 Aug 2014 00:37:46 +0300 From: fancr...@gmail.com To: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 https://github.com/bunhere?tab=repositories i really want to try but im afraid to build ewbkit, my pc have only 2gb ram :( It can be built with 2gb of ram, I've done it. Just make sure you have some swap space and don't have any memory hungry programs running (like chromium/firefox/etc). -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: fix infinite stacking loop when enforcing nocomp
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=45906bdf204cd6c58b1c5bb16781145cd82eb53b commit 45906bdf204cd6c58b1c5bb16781145cd82eb53b Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Fri Aug 15 19:17:33 2014 -0400 fix infinite stacking loop when enforcing nocomp --- src/bin/e_comp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index d884f6c..5b95177 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -475,7 +475,9 @@ nocomp: { if (c-nocomp c-nocomp_ec) { - E_CLIENT_REVERSE_FOREACH(c, ec) + E_Client *nec = NULL; + for (ec = e_client_top_get(c), nec = e_client_below_get(ec); + (ec nec) (ec != nec); ec = nec, nec = e_client_below_get(ec)) { if (ec == c-nocomp_ec) break; if (e_client_is_stacking(ec)) continue; --
Re: [E-devel] ewebkit 1.11.0 - beta 1
On Fri, 15 Aug 2014 17:06:14 -0500 Doug Newgard scimmi...@outlook.com said: Date: Sat, 16 Aug 2014 00:37:46 +0300 From: fancr...@gmail.com To: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 https://github.com/bunhere?tab=repositories i really want to try but im afraid to build ewbkit, my pc have only 2gb ram :( It can be built with 2gb of ram, I've done it. Just make sure you have some swap space and don't have any memory hungry programs running (like chromium/firefox/etc). last time i saw it being built, linking used over 4g of ram. just the linker (ld) process alone was just over 4g. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] ewebkit 1.11.0 - beta 1
On Sat, Aug 16, 2014 at 09:24:50AM +0900, Carsten Haitzler wrote: On Fri, 15 Aug 2014 17:06:14 -0500 Doug Newgard scimmi...@outlook.com said: Date: Sat, 16 Aug 2014 00:37:46 +0300 From: fancr...@gmail.com To: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 https://github.com/bunhere?tab=repositories i really want to try but im afraid to build ewbkit, my pc have only 2gb ram :( It can be built with 2gb of ram, I've done it. Just make sure you have some swap space and don't have any memory hungry programs running (like chromium/firefox/etc). last time i saw it being built, linking used over 4g of ram. just the linker (ld) process alone was just over 4g. It's not so bad with gold and/or -Wl,--no-keep-memory, but of course depends on -g* flags you're building with. I'm building it relatively often on machine with 2G of ram and 4G of swap. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] ewebkit 1.11.0 - beta 1
Date: Sat, 16 Aug 2014 09:24:50 +0900 From: ras...@rasterman.com To: enlightenment-devel@lists.sourceforge.net CC: scimmi...@outlook.com Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 On Fri, 15 Aug 2014 17:06:14 -0500 Doug Newgard scimmi...@outlook.com said: Date: Sat, 16 Aug 2014 00:37:46 +0300 From: fancr...@gmail.com To: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 https://github.com/bunhere?tab=repositories i really want to try but im afraid to build ewbkit, my pc have only 2gb ram :( It can be built with 2gb of ram, I've done it. Just make sure you have some swap space and don't have any memory hungry programs running (like chromium/firefox/etc). last time i saw it being built, linking used over 4g of ram. just the linker (ld) process alone was just over 4g. If you're doing a debug build, I'm sure it will. A release build isn't nearly as bad, and the current alpha/betas now default to release builds. As I said, I've actually built it on a machine with 2GB of RAM and E running. It did hit swap, but not more than a couple hundred MB. -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] ewebkit 1.11.0 - beta 1
On Fri, 15 Aug 2014 20:04:44 -0500 Doug Newgard scimmi...@outlook.com said: Date: Sat, 16 Aug 2014 09:24:50 +0900 From: ras...@rasterman.com To: enlightenment-devel@lists.sourceforge.net CC: scimmi...@outlook.com Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 On Fri, 15 Aug 2014 17:06:14 -0500 Doug Newgard scimmi...@outlook.com said: Date: Sat, 16 Aug 2014 00:37:46 +0300 From: fancr...@gmail.com To: enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] ewebkit 1.11.0 - beta 1 https://github.com/bunhere?tab=repositories i really want to try but im afraid to build ewbkit, my pc have only 2gb ram :( It can be built with 2gb of ram, I've done it. Just make sure you have some swap space and don't have any memory hungry programs running (like chromium/firefox/etc). last time i saw it being built, linking used over 4g of ram. just the linker (ld) process alone was just over 4g. If you're doing a debug build, I'm sure it will. A release build isn't nearly as bad, and the current alpha/betas now default to release builds. As I said, I've actually built it on a machine with 2GB of RAM and E running. It did hit swap, but not more than a couple hundred MB. *ONLY* a couple hundred mb of swap... :) -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/02: evas gl - fix undefined return added from coverity fixing
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=401d788bd6ba43f8865dae2b98247d2bf678d4eb commit 401d788bd6ba43f8865dae2b98247d2bf678d4eb Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Aug 16 12:40:42 2014 +0900 evas gl - fix undefined return added from coverity fixing --- src/modules/evas/engines/gl_x11/evas_engine.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 3fa09fb..12c3490 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -401,10 +401,8 @@ evgl_eng_window_surface_create(void *data, void *native_window EINA_UNUSED) return (void *)surface; */ -// handled by EINA_UNUSED above -// return (void*)native_window; + return (void *)native_window; #endif - } static int --
[EGIT] [core/efl] master 02/02: eolain_gen - fix implementation generation - it didn't even compile
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d444e8f5f395d25b255ee9e927e22458cd8738bc commit d444e8f5f395d25b255ee9e927e22458cd8738bc Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sat Aug 16 13:09:17 2014 +0900 eolain_gen - fix implementation generation - it didn't even compile so the test suites were useless because they didn't ecompile what was generated. it was missing a ) at the end of calling eo_do_super to start with. it was missing a call to do_uper fo destructors too. also it didnt deal with the #include blah.eo.c at the file end either so it produced uncompilable src at the start. again - also fix. this also fixes test case comparisons to match the now correct generation that compiles. --- src/bin/eolian/impl_generator.c | 28 ++-- src/tests/eolian/data/object_impl_add_ref.c | 4 +++- src/tests/eolian/data/object_impl_ref.c | 4 +++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c index 2b7aa2b..d43fd7c 100644 --- a/src/bin/eolian/impl_generator.c +++ b/src/bin/eolian/impl_generator.c @@ -122,6 +122,8 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina Eina_Strbuf *params = NULL, *short_params = NULL, *super_invok = NULL; char func_name[PATH_MAX]; char impl_name[PATH_MAX]; + const char *fname; + int flen; _eolian_class_vars impl_env; if (!impl_desc eolian_function_is_virtual_pure(foo, ftype)) return EINA_TRUE; @@ -171,12 +173,26 @@ _prototype_generate(const Eolian_Function *foo, Eolian_Function_Type ftype, Eina if (impl_desc ftype == EOLIAN_CTOR) { eina_strbuf_append_printf(super_invok, - eo_do_super(obj, %s_%s, %s_%s(%s);\n, + eo_do_super(obj, %s_%s, %s_%s(%s));\n, class_env.upper_eo_prefix, class_env.upper_classtype, - impl_env.lower_classname, eolian_function_name_get(foo), + impl_env.lower_eo_prefix, eolian_function_name_get(foo), eina_strbuf_string_get(short_params)); } + fname = eolian_function_name_get(foo); + flen = strlen(fname); + if ((fname) (flen = strlen(destructor))) + { +if (impl_desc !strcmp(fname + flen - strlen(destructor), destructor)) + { + eina_strbuf_append_printf(super_invok, + eo_do_super(obj, %s_%s, %s_%s(%s));\n, + class_env.upper_eo_prefix, class_env.upper_classtype, + impl_env.lower_eo_prefix, eolian_function_name_get(foo), + eina_strbuf_string_get(short_params)); + } + } + const char *rettype = NULL; if (rettypet) rettype = eolian_type_c_type_get(rettypet); @@ -209,6 +225,7 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer) const Eolian_Function *foo; Eina_Strbuf *begin = eina_strbuf_new(); const char *class_name = eolian_class_name_get(class); + char core_incl[PATH_MAX]; _class_env_create(class, NULL, class_env); @@ -329,6 +346,13 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer) class_env.lower_classname); } } + printf(Removal of all inline instances of #include \%s.eo.c\\n, class_env.lower_classname); + snprintf(core_incl, sizeof(core_incl), \n#include \%s.eo.c\\n, class_env.lower_classname); + eina_strbuf_replace_all(buffer, core_incl, \n); + + snprintf(core_incl, sizeof(core_incl), \%s.eo.c\, class_env.lower_classname); + printf(Generation of #include \%s.eo.c\\n, class_env.lower_classname); + eina_strbuf_append_printf(buffer, #include \%s.eo.c\\n, class_env.lower_classname); ret = EINA_TRUE; end: diff --git a/src/tests/eolian/data/object_impl_add_ref.c b/src/tests/eolian/data/object_impl_add_ref.c index 5527619..6240887 100644 --- a/src/tests/eolian/data/object_impl_add_ref.c +++ b/src/tests/eolian/data/object_impl_add_ref.c @@ -52,13 +52,14 @@ _object_constructor_2(Eo *obj, Object_Data *pd) EOLIAN static void _object_base_constructor(Eo *obj, Object_Data *pd) { - eo_do_super(obj, OBJECT_CLASS, base_constructor(); + eo_do_super(obj, OBJECT_CLASS, base_constructor()); } EOLIAN static void _object_base_destructor(Eo *obj, Object_Data *pd) { + eo_do_super(obj, OBJECT_CLASS, base_destructor()); } @@ -86,3 +87,4 @@ _object_c_get(Eo *obj, Object_Data *pd) } +#include object.eo.c diff --git a/src/tests/eolian/data/object_impl_ref.c b/src/tests/eolian/data/object_impl_ref.c index 7786159..cc25fd4 100644 --- a/src/tests/eolian/data/object_impl_ref.c +++ b/src/tests/eolian/data/object_impl_ref.c @@ -52,13 +52,14 @@ _object_constructor_2(Eo *obj, Object_Data *pd) EOLIAN static void _object_base_constructor(Eo *obj, Object_Data *pd) { - eo_do_super(obj, OBJECT_CLASS,
[E-devel] Blog about EO
About time i got back to blogging about EFL etc. https://phab.enlightenment.org/phame/live/1//post/yet_another_c_object_model_but_better/ -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel