[EGIT] [core/efl] master 01/01: Evas filters: Remove unused variable
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=15d5125d6ede35cfd73e31941a4642e4823f5198 commit 15d5125d6ede35cfd73e31941a4642e4823f5198 Author: Jean-Philippe AndreDate: Fri Dec 4 16:30:54 2015 +0900 Evas filters: Remove unused variable --- src/lib/evas/filters/evas_filter_parser.c | 1 - src/lib/evas/filters/evas_filter_private.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c index 46ba86e..1122bef 100644 --- a/src/lib/evas/filters/evas_filter_parser.c +++ b/src/lib/evas/filters/evas_filter_parser.c @@ -2870,7 +2870,6 @@ _buffers_update(Evas_Filter_Context *ctx, Evas_Filter_Program *pgm) buf->cid = evas_filter_buffer_empty_new(ctx, buf->alpha); fb = _filter_buffer_get(ctx, buf->cid); - fb->proxy = pb->eo_proxy; fb->source = pb->eo_source; fb->source_name = eina_stringshare_ref(pb->name); fb->ctx->has_proxies = EINA_TRUE; diff --git a/src/lib/evas/filters/evas_filter_private.h b/src/lib/evas/filters/evas_filter_private.h index d48a177..02dd977 100644 --- a/src/lib/evas/filters/evas_filter_private.h +++ b/src/lib/evas/filters/evas_filter_private.h @@ -234,8 +234,6 @@ struct _Evas_Filter_Buffer void *glimage; int w, h; - Evas_Object *proxy; - Eina_Bool alpha_only : 1; // 1 channel (A) instead of 4 (RGBA) Eina_Bool transient : 1; // temporary buffer (automatic allocation) Eina_Bool locked : 1; // internal flag --
[EGIT] [core/efl] master 01/01: Evas: Remove unwanted file added by accident
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d8b5e5da7b21ab7cefdd02187ef2d12990bbc3f8 commit d8b5e5da7b21ab7cefdd02187ef2d12990bbc3f8 Author: Jean-Philippe AndreDate: Tue Dec 8 14:54:21 2015 +0900 Evas: Remove unwanted file added by accident From commit 82504d9d77f761f2575f63095459011eba02a594 --- src/lib/evas/#Evas_# | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/evas/#Evas_# b/src/lib/evas/#Evas_# deleted file mode 100644 index 96d80cd..000 --- a/src/lib/evas/#Evas_# +++ /dev/null @@ -1 +0,0 @@ -C \ No newline at end of file --
[EGIT] [tools/eflete] master 27/28: UTC: delete not actual tests
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=5c70962f796b2c085ca75769fe7f8550b5143e8a commit 5c70962f796b2c085ca75769fe7f8550b5143e8a Author: Vyacheslav ReutskiyDate: Mon Dec 7 11:22:31 2015 +0200 UTC: delete not actual tests Change-Id: I195b1b8b25c4707e8304f2beb207bd85b2c05c45 --- tests/Makefile.am | 2 - tests/test_groupedit/groupedit_bg_set.c | 119 -- tests/test_groupedit/groupedit_bg_unset.c | 83 - tests/test_groupedit/test_groupedit.c | 5 -- tests/test_groupedit/test_groupedit.h | 5 -- 5 files changed, 214 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1ebe7a6..f4a3db0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -407,8 +407,6 @@ ui_workspace_test_LDADD = ${LD} groupedit_test_SOURCES = \ ../tests/test_groupedit/test_groupedit.c \ ../tests/test_groupedit/groupedit_add.c \ -../tests/test_groupedit/groupedit_bg_set.c \ -../tests/test_groupedit/groupedit_bg_unset.c \ ../tests/test_groupedit/groupedit_edit_object_part_above.c \ ../tests/test_groupedit/groupedit_edit_object_part_below.c \ ../tests/test_groupedit/groupedit_edit_object_part_draw_get.c \ diff --git a/tests/test_groupedit/groupedit_bg_set.c b/tests/test_groupedit/groupedit_bg_set.c deleted file mode 100644 index d033ce6..000 --- a/tests/test_groupedit/groupedit_bg_set.c +++ /dev/null @@ -1,119 +0,0 @@ -/** - * Edje Theme Editor - * Copyright (C) 2013-2014 Samsung Electronics. - * - * This file is part of Edje Theme Editor. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; If not, see www.gnu.org/licenses/lgpl.html. - */ - -#include "test_groupedit.h" - -/** - * @addtogroup groupedit_test - * @{ - * @addtogroup groupedit_bg_set - * @{ - * Groupedit - * - * @} - */ - -/** - * @addtogroup groupedit_bg_set - * @{ - * - * groupedit_bg_set - * groupedit_bg_set_test_p - * - * @precondition - * @step 1 initialize elementary library - * @step 2 create parent window - * @step 3 create evas image - * - * @procedure - * @step 1 call groupedit_add - * @step 2 call groupedit_bg_set - * @step 3 check returned value - * - * (Evas_Object *) groupedit, (Evas_Object *) image - * Returned value is EINA_TRUE - * - * @} - */ -EFLETE_TEST(groupedit_bg_set_test_p) -{ - Evas_Object *parent, *groupedit, *image; - Eina_Bool res; - - elm_init(0, 0); - - parent = elm_win_add(NULL, "test", ELM_WIN_BASIC); - image = evas_object_image_add(evas_object_evas_get(parent)); - - groupedit = groupedit_add(parent, NULL); - res = groupedit_bg_set(groupedit, image); - ck_assert_msg(res != EINA_FALSE, "Failed create groupedit object."); - evas_object_del(image); - evas_object_del(parent); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup groupedit_bg_set - * @{ - * - * groupedit_bg_set - * groupedit_bg_set_test_p1 - * - * @precondition - * @step 1 initialize elementary library - * @step 2 create parent window - * - * @procedure - * @step 1 call groupedit_add - * @step 2 call groupedit_bg_set - * @step 3 check returned value - * - * (Evas_Object *) groupedit, NULL - * Returned value is EINA_TRUE - * - * @} - */ -EFLETE_TEST(groupedit_bg_set_test_p1) -{ - Evas_Object *parent, *groupedit; - Eina_Bool res; - - elm_init(0, 0); - - parent = elm_win_add(NULL, "test", ELM_WIN_BASIC); - - groupedit = groupedit_add(parent, NULL); - res = groupedit_bg_set(groupedit, NULL); - ck_assert_msg(res != EINA_FALSE, "Failed create groupedit object."); - evas_object_del(parent); - - elm_shutdown(); -} -END_TEST - -/** - * @addtogroup groupedit_bg_set - * @{ - * - * @} - * @} - */ diff --git a/tests/test_groupedit/groupedit_bg_unset.c b/tests/test_groupedit/groupedit_bg_unset.c deleted file mode 100644 index 18ed9df..000 --- a/tests/test_groupedit/groupedit_bg_unset.c +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Edje Theme Editor - * Copyright (C) 2013-2014 Samsung Electronics. - * - * This file is part of Edje Theme Editor. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -
[EGIT] [tools/eflete] master 17/28: Merge "style_editor: add search by text in the list of styles"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=9459087dfb9c31564cdabd77edf59377dfeec404 commit 9459087dfb9c31564cdabd77edf59377dfeec404 Merge: b177a05 7bea813 Author: Gerrit UserDate: Mon Dec 7 11:38:12 2015 +0200 Merge "style_editor: add search by text in the list of styles" src/bin/ui/editors/style_editor.c | 133 +++--- 1 file changed, 124 insertions(+), 9 deletions(-) --
[EGIT] [tools/eflete] master 05/28: group_navigator: add new part item dialog
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=693c5e055a1ef945b76e4e0f4189723560652284 commit 693c5e055a1ef945b76e4e0f4189723560652284 Author: Andrii KroitorDate: Thu Dec 3 14:41:57 2015 +0200 group_navigator: add new part item dialog --- src/bin/ui/group_navigator.c | 105 ++- 1 file changed, 95 insertions(+), 10 deletions(-) diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c index d58df96..07e2362 100644 --- a/src/bin/ui/group_navigator.c +++ b/src/bin/ui/group_navigator.c @@ -56,7 +56,7 @@ typedef struct struct { Evas_Object *entry_name; Evas_Object *spinner_value; -Evas_Object *combobox_dup; +Evas_Object *combobox; Evas_Object *btn_add; Evas_Object *btn_cancel; } popup; @@ -489,6 +489,30 @@ _state_validate(void *data, } static void +_item_validate(void *data, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + Part_List *pl = data; + const char *name, *item; + Part_ *part; + Eina_Bool valid; + Eina_List *l; + + assert(pl != NULL); + + part = elm_object_item_data_get(pl->selected_part_item); + + name = elm_entry_entry_get(pl->popup.entry_name); + valid = (elm_validator_regexp_status_get(pl->name_validator) == ELM_REG_NOERROR); + valid = valid && (ewe_combobox_select_item_get(pl->popup.combobox) != NULL); + EINA_LIST_FOREACH(part->items, l, item) + valid = valid && strcmp(item, name); + + elm_object_disabled_set(pl->popup.btn_add, !valid); +} + +static void _job_popup_del(void *data) { Part_List *pl = data; @@ -639,7 +663,7 @@ _popup_add_state_ok_clicked(void *data, val = elm_spinner_value_get(pl->popup.spinner_value); val = ((int) (val * 100)) / 100.0; /* only first two digets after point are used */ - item = ewe_combobox_select_item_get(pl->popup.combobox_dup); + item = ewe_combobox_select_item_get(pl->popup.combobox); if (item->index == 0) { msg = eina_stringshare_printf(_("added new state \"%s\" %.2f"), name, val); @@ -718,7 +742,7 @@ _editor_state_added_cb(void *data, static void _on_menu_add_state_clicked(void *data __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *ei __UNUSED__) { Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); @@ -756,15 +780,15 @@ _on_menu_add_state_clicked(void *data __UNUSED__, elm_box_pack_end(box, item); LAYOUT_PROP_ADD(box, _("Duplicate state:"), "property", "1swallow") - EWE_COMBOBOX_ADD(item, pl->popup.combobox_dup) + EWE_COMBOBOX_ADD(item, pl->popup.combobox) - ewe_combobox_item_add(pl->popup.combobox_dup, _("None")); - ewe_combobox_select_item_set(pl->popup.combobox_dup, 0); + ewe_combobox_item_add(pl->popup.combobox, _("None")); + ewe_combobox_select_item_set(pl->popup.combobox, 0); EINA_LIST_FOREACH(part->states, l, state) { - ewe_combobox_item_add(pl->popup.combobox_dup, state->name); + ewe_combobox_item_add(pl->popup.combobox, state->name); } - elm_object_part_content_set(item, "elm.swallow.content", pl->popup.combobox_dup); + elm_object_part_content_set(item, "elm.swallow.content", pl->popup.combobox); elm_box_pack_end(box, item); elm_object_content_set(ap.popup, box); @@ -785,11 +809,72 @@ _on_menu_add_state_clicked(void *data __UNUSED__, } static void +_popup_add_item_ok_clicked(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + printf("_popup_add_item_ok_clicked\n"); +} + +static void _on_menu_add_item_clicked(void *data __UNUSED__, - Evas_Object *obj __UNUSED__, + Evas_Object *obj, void *ei __UNUSED__) { - printf("_on_menu_add_item_clicked\n"); + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); + Part_ *part; + Group *group; + Eina_Stringshare *title; + Evas_Object *box, *item; + Eina_List *l; + + assert(pl != NULL); + + part = elm_object_item_data_get(pl->selected_part_item); + + ap.popup = elm_popup_add(ap.win); + title = eina_stringshare_printf(_("Add new item to part \"%s\""), part->name); + elm_object_part_text_set(ap.popup, "title,text", title); + eina_stringshare_del(title); + + BOX_ADD(ap.popup, box, false, false); + LAYOUT_PROP_ADD(box, _("Name:"), "property", "1swallow") + ENTRY_ADD(item, pl->popup.entry_name, true); + eo_do(pl->popup.entry_name, eo_event_callback_add(ELM_ENTRY_EVENT_VALIDATE, + elm_validator_regexp_helper, pl->name_validator)); + evas_object_smart_callback_add(pl->popup.entry_name, "changed", _item_validate, pl); + elm_object_part_text_set(pl->popup.entry_name, "guide", _("Enter name
[EGIT] [tools/eflete] master 26/28: groupedit: show/hide part by signal from group_navigator
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=904e430b6392e2d2fb68d74948d14dc2d322564f commit 904e430b6392e2d2fb68d74948d14dc2d322564f Author: Vyacheslav ReutskiyDate: Mon Dec 7 10:56:40 2015 +0200 groupedit: show/hide part by signal from group_navigator Change-Id: Ib8b08f32fdcabd9627332624fb3d2e42a4351c90 --- src/bin/ui/workspace/groupedit.c | 14 +++--- src/bin/ui/workspace/groupedit.h | 8 +++- src/bin/ui/workspace/groupedit_calc.c | 2 ++ src/bin/ui/workspace/workspace.c | 22 -- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c index b5f58aa..e4c27ec 100644 --- a/src/bin/ui/workspace/groupedit.c +++ b/src/bin/ui/workspace/groupedit.c @@ -444,21 +444,21 @@ groupedit_edit_object_part_select(Evas_Object *obj, const char *part) TODO("remove this from public API and use callback from part list"); -Eina_Bool -groupedit_part_visible_set(Evas_Object *obj, const char *part, Eina_Bool visible __UNUSED__) +void +groupedit_part_visible_set(Evas_Object *obj, Part_ *part) { Groupedit_Part *gp; WS_GROUPEDIT_DATA_GET(obj, sd); assert(part != NULL); - gp = _parts_list_find(sd->parts, part); + gp = _parts_list_find(sd->parts, part->name); assert(gp != NULL); - - sd->manual_calc = true; - evas_object_smart_changed(sd->obj); - return true; + if (part->visible) + evas_object_show(gp->draw); + else + evas_object_hide(gp->draw); } Eina_Bool diff --git a/src/bin/ui/workspace/groupedit.h b/src/bin/ui/workspace/groupedit.h index e7844f0..4858c56 100644 --- a/src/bin/ui/workspace/groupedit.h +++ b/src/bin/ui/workspace/groupedit.h @@ -252,15 +252,13 @@ groupedit_edit_object_part_select(Evas_Object *obj, const char *part); * Set a visibility for groupedit part. * * @param obj The groupedit object - * @param part The name of groupedit part to be showed of hided + * @param part The Part object to be showed of hided * @param visible Use EINA_TRUE to show, EINA_FALSE to hide part. * - * @return EINA_FALSE on failure, EINA_TRUE on success. - * * @ingroup Groupedit */ -Eina_Bool -groupedit_part_visible_set(Evas_Object *obj, const char *part, Eina_Bool visible); +void +groupedit_part_visible_set(Evas_Object *obj, Part_ *part); /** * Restack part above another part in groupedit module. diff --git a/src/bin/ui/workspace/groupedit_calc.c b/src/bin/ui/workspace/groupedit_calc.c index e0b74ae..c65208e 100644 --- a/src/bin/ui/workspace/groupedit_calc.c +++ b/src/bin/ui/workspace/groupedit_calc.c @@ -706,6 +706,8 @@ _part_draw_add(Ws_Groupedit_Smart_Data *sd, Part_ *part) evas_object_show(gp->layout); elm_box_pack_end(gp->draw, gp->layout); + gp->part->visible = true; + #define PART_VIEW_PROXY_SET() \ gp->proxy_part = evas_object_image_filled_add(sd->e); \ evas_object_size_hint_weight_set(gp->proxy_part, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); \ diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 87e442b..b3cca6c 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -1461,6 +1461,20 @@ _on_group_navigator_part_state_select(void *data, } static void +_on_group_navigator_part_visible_changed(void *data, +Evas_Object *obj __UNUSED__, +void *event_info) +{ + Evas_Object *workspace = (Evas_Object *)data; + Part_ *part = event_info; + + WS_DATA_GET(workspace, sd); + + groupedit_part_visible_set(sd->groupedit, part); +} + + +static void _on_groupedit_part_unselect(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) @@ -1500,6 +1514,9 @@ workspace_add(Evas_Object *parent, Group *group) _on_group_navigator_part_select, obj); evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED, _on_group_navigator_part_state_select, obj); + evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_VISIBLE_CHANGED, + _on_group_navigator_part_visible_changed, obj); + /* create conteiner with handlers */ sd->container.obj = container_add(sd->scroller); @@ -1729,12 +1746,13 @@ workspace_edit_object_part_restack(Evas_Object *obj, Eina_Bool workspace_edit_object_visible_set(Evas_Object *obj, const char *part, - Eina_Bool visible) + Eina_Bool visible __UNUSED__) { WS_DATA_GET(obj, sd); assert(part != NULL); - return groupedit_part_visible_set(sd->groupedit, part, visible); + //groupedit_part_visible_set(sd->groupedit, part); + return
[EGIT] [core/elementary] elementary-1.15 01/02: release: Update NEWS and bump version for 1.15.3 release
seoz pushed a commit to branch elementary-1.15. http://git.enlightenment.org/core/elementary.git/commit/?id=2aaea457f946b3b577439a8d7210bf719bf9fd98 commit 2aaea457f946b3b577439a8d7210bf719bf9fd98 Author: Daniel Juyung SeoDate: Tue Dec 8 00:36:28 2015 +0900 release: Update NEWS and bump version for 1.15.3 release --- NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 35e9fdd..855762c 100644 --- a/NEWS +++ b/NEWS @@ -51,6 +51,9 @@ Fixes: * gengrid: fix duplicate edje signal (elm,state,focused) to item on focus * spinner: fix extra callback calls * multibuttonentry: Fix MBE item box min size calc error. + * toolbar: do not change align for "noicon" toolbar items (T2782) + * deskmirror: unset proxy.source_clip for urgency effects + * border: bring sparklebear theme up-to-date with current efl rendering Changes since 1.14.0: - diff --git a/configure.ac b/configure.ac index 056aa7c..419b331 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [15], [2], [release]) +EFL_VERSION([1], [15], [3], [release]) AC_INIT([elementary], [efl_version], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ(2.63) --
[EGIT] [core/efl] master 01/01: ecore-wl2: Don't free display structure during display cleanup function
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8287202c43e07c3363853406df4a07fca7409397 commit 8287202c43e07c3363853406df4a07fca7409397 Author: Chris MichaelDate: Mon Dec 7 10:00:23 2015 -0500 ecore-wl2: Don't free display structure during display cleanup function Due to reference caching, we cannot free the display structure here yet. During calls to ecore_wl2_display_destroy (or others), if the number of references reaches zero, then we end up calling wl_display_destroy (or equivelant). If we free our display structure during cleanup function, then calls to wl_display_destroy will cause a segfault as our display->wayland_display has already been freed from the structure @fix Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_display.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 289485b..6f5abfb 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -363,7 +363,6 @@ _ecore_wl2_display_cleanup(Ecore_Wl2_Display *ewd) eina_hash_del_by_key(_client_displays, ewd->name); free(ewd->name); - free(ewd); } Ecore_Wl2_Window * --
[EGIT] [core/elementary] elementary-1.15 02/02: po: Update po files.
seoz pushed a commit to branch elementary-1.15. http://git.enlightenment.org/core/elementary.git/commit/?id=dd937657a48d0032be2d40f7980a43724eb3faca commit dd937657a48d0032be2d40f7980a43724eb3faca Author: Daniel Juyung SeoDate: Tue Dec 8 00:50:56 2015 +0900 po: Update po files. --- po/ar.po| 2 +- po/az_IR.po | 2 +- po/ca.po| 2 +- po/cs.po| 2 +- po/de.po| 2 +- po/el.po| 2 +- po/eo.po| 2 +- po/es.po| 2 +- po/fa.po| 2 +- po/fi.po| 2 +- po/fr.po| 2 +- po/gl.po| 2 +- po/he.po| 2 +- po/hu.po| 2 +- po/it.po| 2 +- po/ko_KR.po | 2 +- po/lt.po| 2 +- po/nl.po| 2 +- po/pl.po| 2 +- po/ps.po| 2 +- po/pt.po| 2 +- po/ru.po| 2 +- po/sr.po| 2 +- po/tr.po| 2 +- po/ur.po| 2 +- po/yi.po| 2 +- po/zh_CN.po | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/po/ar.po b/po/ar.po index a437f57..44ec54d 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" diff --git a/po/az_IR.po b/po/az_IR.po index a09cff0..3ed3f5d 100644 --- a/po/az_IR.po +++ b/po/az_IR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2010-12-26 10:05+0200\n" "Last-Translator: Tom Hacohen \n" "Language-Team: General\n" diff --git a/po/ca.po b/po/ca.po index 5ae809e..dba7579 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Elementary\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2015-02-10 09:34+\n" "Last-Translator: JoanColl \n" "Language-Team: Catalan\n" diff --git a/po/cs.po b/po/cs.po index 93aefaf..6365749 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2014-05-22 22:44+0200\n" "Last-Translator: Tomáš Čech \n" "Language-Team: Czech \n" diff --git a/po/de.po b/po/de.po index aa0cddc..5cdf765 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary 0.7.0.57309\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2011-02-25 20:22+0100\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German\n" diff --git a/po/el.po b/po/el.po index 122ac73..6caae95 100644 --- a/po/el.po +++ b/po/el.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2012-12-19 15:58+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" diff --git a/po/eo.po b/po/eo.po index 9a0d660..b52f56d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2013-11-05 18:59+\n" "Last-Translator: Eliovir \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 5c4828e..0ca03c3 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2015-05-03 18:19+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Enlightenment Team\n" diff --git a/po/fa.po b/po/fa.po index ee1a990..544cf42 100644 --- a/po/fa.po +++ b/po/fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: elementary\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-01 01:13+0900\n" +"POT-Creation-Date: 2015-12-08 00:37+0900\n" "PO-Revision-Date: 2010-12-26
[EGIT] [tools/eflete] master 24/28: groupedit: delete not actual code
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ae62247b089b3375a82e6d8d5d81cb35ad1c0876 commit ae62247b089b3375a82e6d8d5d81cb35ad1c0876 Author: Vyacheslav ReutskiyDate: Fri Dec 4 16:41:08 2015 +0200 groupedit: delete not actual code Change-Id: I38c51efde5b81c707145e6b6adac7f5c3a7e8ff9 --- src/bin/ui/workspace/groupedit.c | 120 +++-- src/bin/ui/workspace/groupedit.h | 25 - src/bin/ui/workspace/groupedit_calc.c| 173 --- src/bin/ui/workspace/groupedit_private.h | 28 + src/bin/ui/workspace/workspace.c | 1 - 5 files changed, 14 insertions(+), 333 deletions(-) diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c index 1638e78..b5f58aa 100644 --- a/src/bin/ui/workspace/groupedit.c +++ b/src/bin/ui/workspace/groupedit.c @@ -40,11 +40,6 @@ _unselect_part(void *data, if (ev->button != 1) return; if (!sd->selected) return; - if (sd->separated) - { -if (!sd->selected) return; -_selected_item_return_to_place(sd); - } evas_object_smart_callback_call(o, SIGNAL_GROUPEDIT_PART_UNSELECTED, (void *)sd->selected->part); sd->selected = NULL; @@ -67,11 +62,9 @@ _groupedit_smart_add(Evas_Object *o) _unselect_part, o); priv->obj = o; - priv->zoom_factor = 1.0; priv->parts = NULL; priv->separated = false; priv->selected = NULL; - priv->to_select = NULL; evas_object_smart_member_add(priv->event, o); } @@ -81,13 +74,10 @@ _groupedit_smart_del(Evas_Object *o) { WS_GROUPEDIT_DATA_GET(o, sd) - groupedit_bg_unset(o); - _parts_list_free(sd); evas_object_smart_member_del(sd->group->edit_object); - evas_object_smart_member_del(sd->edit_obj_clipper); + evas_object_smart_member_del(sd->clipper); evas_object_hide(sd->group->edit_object); - evas_object_del(sd->edit_obj_clipper); _groupedit_parent_sc->del(o); } @@ -122,7 +112,6 @@ _groupedit_smart_move(Evas_Object *o, Evas_Coord y) { Evas_Coord ox, oy; - Evas_Object *bg; WS_GROUPEDIT_DATA_GET(o, sd) _groupedit_parent_sc->move(o, x, y); @@ -130,17 +119,7 @@ _groupedit_smart_move(Evas_Object *o, evas_object_geometry_get(o, , , NULL, NULL); if ((ox == x) && (oy == y)) return; - if (sd->separated) - { -bg = evas_object_image_source_get(sd->bg); -evas_object_geometry_get(bg, , , NULL, NULL); -evas_object_move(sd->bg, ox, oy); -if (sd->selected) - { - evas_object_geometry_get(sd->selected->item, , , NULL, NULL); - evas_object_move(sd->clipper, ox, oy); - } - } + evas_object_smart_changed(o); } static void @@ -241,11 +220,10 @@ groupedit_add(Evas_Object *parent, Group *group) /* hide the editing object by using clipper (clipper is small, it's size is 0,0) * with such clipper object invisible and calculate geometry. */ evas_object_show(sd->group->edit_object); - - sd->edit_obj_clipper = evas_object_rectangle_add(sd->e); - evas_object_clip_set(sd->group->edit_object, sd->edit_obj_clipper); - evas_object_smart_member_add(sd->edit_obj_clipper, obj); - evas_object_show(sd->edit_obj_clipper); + sd->clipper = evas_object_rectangle_add(sd->e); + evas_object_clip_set(sd->group->edit_object, sd->clipper); + evas_object_smart_member_add(sd->clipper, obj); + evas_object_show(sd->clipper); return obj; } @@ -396,9 +374,10 @@ groupedit_part_object_area_visible_get(Evas_Object *obj) } Eina_Bool -groupedit_edit_object_parts_separated(Evas_Object *obj, - Eina_Bool separated) +groupedit_edit_object_parts_separated(Evas_Object *obj __UNUSED__, + Eina_Bool separated __UNUSED__) { +#if 0 int w, h, count; WS_GROUPEDIT_DATA_GET(obj, sd); @@ -433,6 +412,7 @@ groupedit_edit_object_parts_separated(Evas_Object *obj, evas_object_smart_callback_call(obj, SIG_PART_SEPARETE_CLOSE, NULL); _selected_item_return_to_place(sd); } +#endif /* */ return true; } @@ -453,23 +433,13 @@ groupedit_edit_object_part_select(Evas_Object *obj, const char *part) { gp = _parts_list_find(sd->parts, part); assert(gp != NULL); +sd->selected = gp; } else gp = NULL; if (sd->selected && sd->selected->current_item) elm_object_signal_emit(sd->selected->current_item->layout, "border,part_item,hilight,off", "eflete"); - - if (!sd->separated) sd->selected = gp; - else - { -if (!part) _selected_item_return_to_place(sd); -else - { - if (gp) sd->to_select = gp; - _select_item_move_to_top(sd); - } - } } TODO("remove this from public API and use callback
[EGIT] [tools/eflete] master 21/28: Merge "workspace: add API for soft and hard groupedit update"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=fc42f9d2625f721655845a83ef825035df2d7794 commit fc42f9d2625f721655845a83ef825035df2d7794 Merge: 6675e43 b375faf Author: Gerrit UserDate: Mon Dec 7 11:51:22 2015 +0200 Merge "workspace: add API for soft and hard groupedit update" src/bin/ui/workspace/groupedit.c | 15 +++ src/bin/ui/workspace/groupedit.h | 20 src/bin/ui/workspace/workspace.c | 25 + 3 files changed, 60 insertions(+) --
[EGIT] [tools/eflete] master 10/28: layout: remove unused layouts
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=6f1054dd5d77f3354f09ca54b4aa059aefa469b7 commit 6f1054dd5d77f3354f09ca54b4aa059aefa469b7 Author: Vitalii VorobiovDate: Fri Dec 4 14:35:18 2015 +0200 layout: remove unused layouts --- data/themes/default/widgets/layout.edc | 1429 1 file changed, 1429 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index 4b37090..0ed4de8 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -647,1435 +647,6 @@ group { name: "elm/layout/navigator/default"; } } -group { name: "elm/layout/wizard/import_edj"; - images { - image: "separator-vertical.png" COMP; - image: "separator-horizontal.png" COMP; - } - parts { - part { name: "separator"; - type: IMAGE; - description { state: "default" 0.0; -min: 2 0; -max: 2 -1; -image { - normal: "separator-vertical.png"; - middle: DEFAULT; -} - } - } - part { name: "area.project_info"; - type: SPACER; - description { state: "default" 0.0; -rel2 { - relative: 0.0 1.0; - offset: -7 -1; - to_x: "separator"; -} - } - } - part { name: "label.name"; - type: TEXT; - scale: 1; - description { state: "default" 0.0; -align: 0.0 0.5; -color_class: "main"; -rel1 { - to_x: "area.project_info"; - to_y: "swallow.name"; -} -rel2 { - relative: 0.3 1.0; - to_x: "area.project_info"; - to_y: "swallow.name"; -} -text { - font: "PT"; - size: 12; - align: 0.0 0.5; -} - } - } - part { name: "swallow.name"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; -align: 0.5 0.0; -fixed: 1 1; -min: 0 19; -max: -1 19; -rel1 { - relative: 0.3 0.0; - to: "area.project_info"; -} -rel2 { - to: "area.project_info"; -} - } - } - part { name: "label.path"; - type: TEXT; - scale: 1; - description { state: "default" 0.0; -align: 0.0 0.5; -color_class: "main"; -rel1 { - to_x: "area.project_info"; - to_y: "swallow.path"; -} -rel2 { - relative: 0.3 1.0; - to_x: "area.project_info"; - to_y: "swallow.path"; -} -text { - font: "PT"; - size: 12; - align: 0.0 0.5; -} - } - } - part { name: "swallow.path"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; -align: 0.5 0.0; -min: 0 20; -max: -1 20; -rel1 { - relative: 0.3 1.0; - offset: 0 6; - to_x: "area.project_info"; - to_y: "swallow.name"; -} -rel2 { - to_x: "area.project_info"; -} - } - } - part { name: "label.edj"; - type: TEXT; - scale: 1; - description { state: "default" 0.0; -align: 0.0 0.5; -color_class: "main"; -rel1 { - to_x: "area.project_info"; - to_y: "swallow.edj"; -} -rel2 { - relative: 0.3 1.0; - to_x: "area.project_info"; - to_y: "swallow.edj"; -} -text { - font: "PT"; - size: 12; - align: 0.0 0.5; -} - } - } - part { name: "swallow.edj"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; -align: 0.5 0.0; -min: 0 20; -max: -1 20; -rel1 { - relative: 0.3 1.0; - offset: 0 6; - to_x: "area.project_info"; - to_y: "swallow.path"; -} -rel2 { - to: "area.project_info"; -} - } - } - part { name: "area.project_details"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; -align: 0.0 0.0; -rel1 { - relative: 1.0 0.0; - offset: 6 0; - to_x: "separator"; -} - } - } - part { name: "label.meta_version"; -
[EGIT] [tools/eflete] master 19/28: Merge "workspace: don't recalc on scrolling"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=09a9178d8900ff4cafaa59ad2240e497f09d4eec commit 09a9178d8900ff4cafaa59ad2240e497f09d4eec Merge: f618bde cc4a6c7 Author: Gerrit UserDate: Mon Dec 7 11:39:54 2015 +0200 Merge "workspace: don't recalc on scrolling" src/bin/ui/workspace/workspace.c | 2 -- 1 file changed, 2 deletions(-) --
[EGIT] [tools/eflete] master 28/28: Merge branch 'master' from internal eflete repo
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=79f26c016e026b5719521fe5630df007893911c9 commit 79f26c016e026b5719521fe5630df007893911c9 Merge: a503b8b 5c70962 Author: Vyacheslav ReutskiyDate: Mon Dec 7 15:56:57 2015 +0200 Merge branch 'master' from internal eflete repo data/themes/default/widgets/layout.edc| 1429 - src/bin/editor/editor_macro.h | 79 ++ src/bin/editor/editor_part.c |2 +- src/bin/editor/editor_states.c|9 +- src/bin/ui/editors/style_editor.c | 133 ++- src/bin/ui/group_navigator.c | 121 ++- src/bin/ui/group_navigator.h |8 + src/bin/ui/project_navigator.c|2 +- src/bin/ui/property_group.c |3 +- src/bin/ui/workspace/groupedit.c | 149 +-- src/bin/ui/workspace/groupedit.h | 53 +- src/bin/ui/workspace/groupedit_calc.c | 177 +--- src/bin/ui/workspace/groupedit_private.h | 28 +- src/bin/ui/workspace/workspace.c | 50 +- tests/Makefile.am |2 - tests/test_groupedit/groupedit_bg_set.c | 119 --- tests/test_groupedit/groupedit_bg_unset.c | 83 -- tests/test_groupedit/test_groupedit.c |5 - tests/test_groupedit/test_groupedit.h |5 - 19 files changed, 430 insertions(+), 2027 deletions(-) --
[EGIT] [tools/eflete] master 12/28: Merge "group_navigator: add new part item dialog"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=d65aa68842e936c601166566851be9da8a432ad0 commit d65aa68842e936c601166566851be9da8a432ad0 Merge: 92e01ea 693c5e0 Author: Gerrit UserDate: Mon Dec 7 11:24:06 2015 +0200 Merge "group_navigator: add new part item dialog" src/bin/ui/group_navigator.c | 105 ++- 1 file changed, 95 insertions(+), 10 deletions(-) --
[EGIT] [tools/eflete] master 15/28: Merge "property_group: hide popup when same picture (which is already set) was selected"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=25792dbabf4abb52e84b591153733d80bd0042a9 commit 25792dbabf4abb52e84b591153733d80bd0042a9 Merge: aa0d5d3 8af4fb2 Author: Gerrit UserDate: Mon Dec 7 11:27:35 2015 +0200 Merge "property_group: hide popup when same picture (which is already set) was selected" src/bin/ui/property_group.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --
[EGIT] [tools/eflete] master 25/28: group_navigator: emit signal of changed part visibility
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=3e8746e39fa84731a06ae1a054dc6cf659c4144f commit 3e8746e39fa84731a06ae1a054dc6cf659c4144f Author: Vyacheslav ReutskiyDate: Mon Dec 7 10:51:29 2015 +0200 group_navigator: emit signal of changed part visibility Change-Id: I50f27bbeb8ee5714f3bd0a03f6a99f2c843738c9 --- src/bin/ui/group_navigator.c | 15 --- src/bin/ui/group_navigator.h | 8 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c index a3cf1b6..62ecb27 100644 --- a/src/bin/ui/group_navigator.c +++ b/src/bin/ui/group_navigator.c @@ -139,16 +139,17 @@ _item_label_get(void *data, static void _on_eye_clicked(void *data, -Evas_Object *obj __UNUSED__, +Evas_Object *obj, void *event_data __UNUSED__) { Part_ *part = data; + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); assert(part != NULL); + assert(pl != NULL); part->visible = !part->visible; - - TODO("Add signal here"); + evas_object_smart_callback_call(pl->layout, SIGNAL_GROUP_NAVIGATOR_PART_VISIBLE_CHANGED, (void *)part); } static Evas_Object * @@ -163,12 +164,11 @@ _part_content_get(void *data, if (!strcmp(part, "elm.swallow.icon")) { +Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); content = elm_check_add(obj); -if (_part->visible) - elm_check_state_set(content, true); -else - elm_check_state_set(content, false); +elm_check_state_set(content, _part->visible); elm_object_style_set(content, "eye"); +evas_object_data_set(content, GROUP_NAVIGATOR_DATA, pl); evas_object_smart_callback_add(content, "changed", _on_eye_clicked, _part); } @@ -1164,6 +1164,7 @@ group_navigator_add(Group *group) evas_object_smart_callback_add(pl->genlist, "expanded", _expanded_cb, pl); evas_object_smart_callback_add(pl->genlist, "contracted", _contracted_cb, pl); evas_object_smart_callback_add(pl->genlist, "selected", _selected_cb, pl); + evas_object_data_set(pl->genlist, GROUP_NAVIGATOR_DATA, pl); EINA_LIST_FOREACH(group->parts, l, part) { diff --git a/src/bin/ui/group_navigator.h b/src/bin/ui/group_navigator.h index 40f3fd9..967136e 100644 --- a/src/bin/ui/group_navigator.h +++ b/src/bin/ui/group_navigator.h @@ -46,6 +46,14 @@ #define SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED "SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED" /** + * emited when part visibility is changed. + * eventinfo - pointer to Part_ structure + * + * @ingroup Partlist + */ +#define SIGNAL_GROUP_NAVIGATOR_PART_VISIBLE_CHANGED "SIGNAL_GROUP_NAVIGATOR_PART_VISIBLE_CHANGE" + +/** * @ingroup Partlist */ Evas_Object * --
[EGIT] [tools/eflete] master 16/28: Merge "layout: remove unused layouts"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=b177a05f5c62d3797b39f26d1bf402ec974960fc commit b177a05f5c62d3797b39f26d1bf402ec974960fc Merge: 25792db 6f1054d Author: Gerrit UserDate: Mon Dec 7 11:28:01 2015 +0200 Merge "layout: remove unused layouts" data/themes/default/widgets/layout.edc | 1429 1 file changed, 1429 deletions(-) --
[EGIT] [tools/eflete] master 14/28: Merge "project_navigator: fix crash after click delete layout 2 times"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=aa0d5d3330b182b48cb165eab3ab38d3ec9e7b64 commit aa0d5d3330b182b48cb165eab3ab38d3ec9e7b64 Merge: a5a5f46 4806e77 Author: Gerrit UserDate: Mon Dec 7 11:26:46 2015 +0200 Merge "project_navigator: fix crash after click delete layout 2 times" src/bin/ui/project_navigator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[EGIT] [tools/eflete] master 18/28: Merge "groupedit: unset the source part from proxy when set 'None'"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=f618bde3572bc75e82d0673220d9aef6197c0a40 commit f618bde3572bc75e82d0673220d9aef6197c0a40 Merge: 9459087 bda97ff Author: Gerrit UserDate: Mon Dec 7 11:39:20 2015 +0200 Merge "groupedit: unset the source part from proxy when set 'None'" src/bin/ui/workspace/groupedit_calc.c | 1 + 1 file changed, 1 insertion(+) --
[EGIT] [tools/eflete] master 06/28: editor: do save after changes align or padding for container
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=58649dc842b9f74b7004e63ff7a3a23a00f3c5a0 commit 58649dc842b9f74b7004e63ff7a3a23a00f3c5a0 Author: Vyacheslav ReutskiyDate: Thu Dec 3 14:42:45 2015 +0200 editor: do save after changes align or padding for container Need to do the save for editing object, because edje edit not recalculate the box and table after change attributes align or padding. Change-Id: Ia9159e79e5bddb034ad1515ef1cc7076c0299830 --- src/bin/editor/editor_macro.h | 79 ++ src/bin/editor/editor_states.c | 9 +++-- 2 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/bin/editor/editor_macro.h b/src/bin/editor/editor_macro.h index 805a963..8f1e012 100644 --- a/src/bin/editor/editor_macro.h +++ b/src/bin/editor/editor_macro.h @@ -510,3 +510,82 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, ); \ return true; \ } + +TODO("delete macro _SAVE after fix issue in the edje_edit") +#define EDITOR_STATE_INT_SAVE(FUNC, ATTRIBUTE) \ +Eina_Bool \ +editor_state_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool merge, \ +const char *part_name, const char *state_name, double state_val, int new_val) \ +{ \ + Diff *diff; \ + Attribute attribute = ATTRIBUTE; \ + assert(edit_object != NULL); \ + assert(part_name != NULL); \ + assert(state_name != NULL); \ + if (change) \ + { \ +int old_value = edje_edit_state_## FUNC ##_get(edit_object, part_name, state_name, state_val); \ +diff = mem_calloc(1, sizeof(Diff)); \ +diff->redo.type = FUNCTION_TYPE_STRING_STRING_DOUBLE_INT; \ +diff->redo.function = editor_state_## FUNC ##_set; \ +diff->redo.args.type_ssdi.s1 = eina_stringshare_add(part_name); \ +diff->redo.args.type_ssdi.s2 = eina_stringshare_add(state_name); \ +diff->redo.args.type_ssdi.d3 = state_val; \ +diff->redo.args.type_ssdi.i4 = new_val; \ +diff->undo.type = FUNCTION_TYPE_STRING_STRING_DOUBLE_INT; \ +diff->undo.function = editor_state_## FUNC ##_set; \ +diff->undo.args.type_ssdi.s1 = eina_stringshare_add(part_name); \ +diff->undo.args.type_ssdi.s2 = eina_stringshare_add(state_name); \ +diff->undo.args.type_ssdi.d3 = state_val; \ +diff->undo.args.type_ssdi.i4 = old_value; \ +if (merge) \ + change_diff_merge_add(change, diff); \ +else \ + change_diff_add(change, diff); \ + } \ + if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name, state_val, new_val)) \ + return false; \ + editor_save(edit_object); \ + _editor_project_changed(); \ + if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, ); \ + return true; \ +} + +#define EDITOR_STATE_DOUBLE_SAVE(FUNC, ATTRIBUTE) \ +Eina_Bool \ +editor_state_## FUNC ##_set(Evas_Object *edit_object, Change *change, Eina_Bool merge, \ +const char *part_name, const char *state_name, double state_val, double new_val) \ +{ \ + Diff *diff; \ + Attribute attribute = ATTRIBUTE; \ + assert(edit_object != NULL); \ + assert(part_name != NULL); \ + assert(state_name != NULL); \ + if (change) \ + { \ +double old_value = edje_edit_state_## FUNC ##_get(edit_object, part_name, state_name, state_val); \ +diff = mem_calloc(1, sizeof(Diff)); \ +diff->redo.type = FUNCTION_TYPE_STRING_STRING_DOUBLE_DOUBLE; \ +diff->redo.function = editor_state_## FUNC ##_set; \ +diff->redo.args.type_ssdd.s1 = eina_stringshare_add(part_name); \ +diff->redo.args.type_ssdd.s2 = eina_stringshare_add(state_name); \ +diff->redo.args.type_ssdd.d3 = state_val; \ +diff->redo.args.type_ssdd.d4 = new_val; \ +diff->undo.type = FUNCTION_TYPE_STRING_STRING_DOUBLE_DOUBLE; \ +diff->undo.function = editor_state_## FUNC ##_set; \ +diff->undo.args.type_ssdd.s1 = eina_stringshare_add(part_name); \ +diff->undo.args.type_ssdd.s2 = eina_stringshare_add(state_name); \ +diff->undo.args.type_ssdd.d3 = state_val; \ +diff->undo.args.type_ssdd.d4 = old_value; \ +if (merge) \ + change_diff_merge_add(change, diff); \ +else \ + change_diff_add(change, diff); \ + } \ + if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name, state_val, new_val)) \ + return false; \ + editor_save(edit_object); \ + _editor_project_changed(); \ + if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, ); \ + return true; \ +} diff --git a/src/bin/editor/editor_states.c
[EGIT] [tools/eflete] master 23/28: group_navigator: homogeneous is cool
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=8f7d342398915073ec1523e2c64434ac2a8d740e commit 8f7d342398915073ec1523e2c64434ac2a8d740e Author: Vyacheslav ReutskiyDate: Thu Dec 3 16:30:07 2015 +0200 group_navigator: homogeneous is cool Genlist calculate the scrolbar size very fast if homogeneous is enabled. Change-Id: I2716d624ff9bf7cee81c9eed1b43e046ee119d74 --- src/bin/ui/group_navigator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c index 07e2362..a3cf1b6 100644 --- a/src/bin/ui/group_navigator.c +++ b/src/bin/ui/group_navigator.c @@ -1153,6 +1153,7 @@ group_navigator_add(Group *group) pl->genlist = elm_genlist_add(pl->layout); + elm_genlist_homogeneous_set(pl->layout, true); elm_scroller_policy_set(pl->genlist, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); evas_object_show(pl->genlist); elm_object_content_set(pl->layout, pl->genlist); --
[EGIT] [tools/eflete] master 08/28: property_group: hide popup when same picture (which is already set) was selected
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=8af4fb21fcdfa396a851e3a0f3d9dc7b6bcd22da commit 8af4fb21fcdfa396a851e3a0f3d9dc7b6bcd22da Author: Vitalii VorobiovDate: Fri Dec 4 12:57:04 2015 +0200 property_group: hide popup when same picture (which is already set) was selected --- src/bin/ui/property_group.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c index b606c7b..44a3e3a 100644 --- a/src/bin/ui/property_group.c +++ b/src/bin/ui/property_group.c @@ -2861,7 +2861,7 @@ _on_image_editor_done(void *data, selected = eina_list_data_get(list_selected); - if (strcmp(value, selected) == 0) return false; + if (strcmp(value, selected) == 0) return true; elm_entry_entry_set(pd->attributes.state_image.image, selected); Eina_Stringshare *msg = eina_stringshare_printf(_("image changes to %s"), selected); @@ -2956,7 +2956,6 @@ _add_tween_image(void *data, assert(pd != NULL); - TODO("Make it multiple selection here please") popup_gengrid_image_helper(NULL, obj, _on_image_editor_tween_done, --
[EGIT] [tools/eflete] master 13/28: Merge "editor: update edj before changing new part"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=a5a5f46cd596cfc00a2d36d491648e2fef2ea9bb commit a5a5f46cd596cfc00a2d36d491648e2fef2ea9bb Merge: d65aa68 af8ee82 Author: Gerrit UserDate: Mon Dec 7 11:25:50 2015 +0200 Merge "editor: update edj before changing new part" src/bin/editor/editor_part.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[EGIT] [tools/eflete] master 01/28: groupedit: unset the source part from proxy when set 'None'
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=bda97ffa9a7260edf392ba7edbcc118e4fd96ce3 commit bda97ffa9a7260edf392ba7edbcc118e4fd96ce3 Author: Vyacheslav ReutskiyDate: Thu Dec 3 08:40:07 2015 +0200 groupedit: unset the source part from proxy when set 'None' Change-Id: Ifb22f4f086a8c015c60778e3344cd7c255f5436d --- src/bin/ui/workspace/groupedit_calc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/workspace/groupedit_calc.c b/src/bin/ui/workspace/groupedit_calc.c index 42e2ea5..638d05e 100644 --- a/src/bin/ui/workspace/groupedit_calc.c +++ b/src/bin/ui/workspace/groupedit_calc.c @@ -1129,6 +1129,7 @@ _proxy_param_update(Groupedit_Part *gp, Evas_Object *edit_obj) } else { +evas_object_image_source_set(gp->proxy_part, NULL); elm_object_signal_emit(gp->layout, "border,proxy", "eflete"); } } --
[EGIT] [tools/eflete] master 22/28: Merge "editor: do save after changes align or padding for container"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=49f9eef68ea5f875dd2b9b6953df4b073c1b0f20 commit 49f9eef68ea5f875dd2b9b6953df4b073c1b0f20 Merge: fc42f9d 58649dc Author: Gerrit UserDate: Mon Dec 7 11:51:34 2015 +0200 Merge "editor: do save after changes align or padding for container" src/bin/editor/editor_macro.h | 79 ++ src/bin/editor/editor_states.c | 9 +++-- 2 files changed, 83 insertions(+), 5 deletions(-) --
[EGIT] [tools/eflete] master 07/28: project_navigator: fix crash after click delete layout 2 times
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=4806e7708e4353752d849229c185558808bce573 commit 4806e7708e4353752d849229c185558808bce573 Author: Vitalii VorobiovDate: Fri Dec 4 12:50:46 2015 +0200 project_navigator: fix crash after click delete layout 2 times Fix #48157 --- src/bin/ui/project_navigator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c index dde50df..9e2354e 100644 --- a/src/bin/ui/project_navigator.c +++ b/src/bin/ui/project_navigator.c @@ -575,7 +575,6 @@ _btn_del_group_cb(void *data __UNUSED__, NULL, NULL, BTN_OK|BTN_CANCEL, NULL, NULL); if (BTN_CANCEL == btn_res) return; _folder_del(elm_object_item_data_get(glit)); -return; } else { @@ -600,6 +599,7 @@ _btn_del_group_cb(void *data __UNUSED__, editor_group_del(ap.project->global_object, tmp); eina_stringshare_del(tmp); } + elm_object_disabled_set(project_navigator.btn_del, true); } static void --
[EGIT] [tools/eflete] master 04/28: workspace: add API for soft and hard groupedit update
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=b375fafeb6aa3fbe4dcf6a1f87323ed4be399a13 commit b375fafeb6aa3fbe4dcf6a1f87323ed4be399a13 Author: Vyacheslav ReutskiyDate: Thu Dec 3 12:48:26 2015 +0200 workspace: add API for soft and hard groupedit update Soft update defined for update parts view without calculation, and hard update - calculate part geomentry and update them. Change-Id: I9d9c8d558c533dcf0ffe88bbc4fed40c34fbe8a5 --- src/bin/ui/workspace/groupedit.c | 15 +++ src/bin/ui/workspace/groupedit.h | 20 src/bin/ui/workspace/workspace.c | 25 + 3 files changed, 60 insertions(+) diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c index 5cda0f2..1638e78 100644 --- a/src/bin/ui/workspace/groupedit.c +++ b/src/bin/ui/workspace/groupedit.c @@ -262,6 +262,21 @@ groupedit_edit_object_recalc_all(Evas_Object *obj) return true; } +void +groupedit_soft_update(Evas_Object *obj) +{ + WS_GROUPEDIT_DATA_GET(obj, sd); + evas_object_smart_changed(sd->obj); +} + +void +groupedit_hard_update(Evas_Object *obj) +{ + WS_GROUPEDIT_DATA_GET(obj, sd); + sd->manual_calc = true; + evas_object_smart_changed(sd->obj); +} + Evas_Object * groupedit_edit_object_part_draw_get(Evas_Object *obj, const char *part) { diff --git a/src/bin/ui/workspace/groupedit.h b/src/bin/ui/workspace/groupedit.h index 869b604..014156b 100644 --- a/src/bin/ui/workspace/groupedit.h +++ b/src/bin/ui/workspace/groupedit.h @@ -106,6 +106,26 @@ Eina_Bool groupedit_edit_object_recalc_all(Evas_Object *obj); /** + * Update the parts attributes, without recalculation. + * + * @paramaram obj The groupedit object. + * + * @ingroup Groupedit + */ +void +groupedit_soft_update(Evas_Object *obj); + +/** + * Update the parts attributes, and recalculate them. + * + * @paramaram obj The groupedit object. + * + * @ingroup Groupedit + */ +void +groupedit_hard_update(Evas_Object *obj); + +/** * Get the part object, which geometry corresponds to Edje part geometry from * editable object. * diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 5d2a378..f55ae8e 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -1640,6 +1640,31 @@ workspace_edit_object_recalc(Evas_Object *obj) return groupedit_edit_object_recalc_all(sd->groupedit); } +void +workspace_edit_object_hard_update(Evas_Object *obj) +{ + WS_DATA_GET(obj, sd); + assert(sd->groupedit != NULL); + + Evas_Coord min_w, max_w, min_h, max_h; + min_w = edje_edit_group_min_w_get(sd->group->edit_object); + min_h = edje_edit_group_min_h_get(sd->group->edit_object); + max_w = edje_edit_group_max_w_get(sd->group->edit_object); + max_h = edje_edit_group_max_h_get(sd->group->edit_object); + container_min_size_set(sd->container.obj, min_w, min_h); + container_max_size_set(sd->container.obj, max_w, max_h); + + groupedit_hard_update(sd->groupedit); +} + +void +workspace_edit_object_soft_update(Evas_Object *obj) +{ + WS_DATA_GET(obj, sd); + assert(sd->groupedit != NULL); + groupedit_soft_update(sd->groupedit); +} + Eina_Bool workspace_edit_object_part_add(Evas_Object *obj, Part_ *part) { --
[EGIT] [tools/eflete] master 20/28: Merge "groupedit: reset the flag after calculation"
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=6675e4360831ee5a998f3ddf6ec4f7f1dfc07a47 commit 6675e4360831ee5a998f3ddf6ec4f7f1dfc07a47 Merge: 09a9178 6a9d9bf Author: Gerrit UserDate: Mon Dec 7 11:42:50 2015 +0200 Merge "groupedit: reset the flag after calculation" src/bin/ui/workspace/groupedit_calc.c | 1 + 1 file changed, 1 insertion(+) --
[EGIT] [tools/eflete] master 02/28: workspace: don't recalc on scrolling
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=cc4a6c7f5242355287079b119d04693399efad4c commit cc4a6c7f5242355287079b119d04693399efad4c Author: Vyacheslav ReutskiyDate: Thu Dec 3 10:43:05 2015 +0200 workspace: don't recalc on scrolling Change-Id: Iab00203bb0f1ee8ecb9890ae83a25f1c0b7f65e5 --- src/bin/ui/workspace/workspace.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 9fefc4b..5d2a378 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -596,8 +596,6 @@ _sc_smart_move_cb(void *data, if ((groupedit_edit_object_parts_separated_is(sd->groupedit)) && (sd->scroll_flag < 2)) evas_object_smart_callback_call(sd->scroller, "vbar,drag", NULL); - else - groupedit_edit_object_recalc_all(sd->groupedit); sd->scroll_flag = 0; evas_object_geometry_get(object_area, _x, _y, _w, _h); --
[EGIT] [tools/eflete] master 03/28: groupedit: reset the flag after calculation
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=6a9d9bf63702e90c6d02c8f7eacee43e6593d314 commit 6a9d9bf63702e90c6d02c8f7eacee43e6593d314 Author: Vyacheslav ReutskiyDate: Thu Dec 3 12:12:49 2015 +0200 groupedit: reset the flag after calculation Change-Id: Iee0e98778b18f637a09091a81a02c8b25dbb0740 --- src/bin/ui/workspace/groupedit_calc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/ui/workspace/groupedit_calc.c b/src/bin/ui/workspace/groupedit_calc.c index 638d05e..e22ecd5 100644 --- a/src/bin/ui/workspace/groupedit_calc.c +++ b/src/bin/ui/workspace/groupedit_calc.c @@ -1267,6 +1267,7 @@ _parts_stack_layout(Evas_Object *o __UNUSED__, _part_object_area_calc(sd, gp); _part_calc(sd, gp); _part_update(sd, gp); +sd->manual_calc = false; evas_object_resize(gp->draw, gp->geom.w, gp->geom.h); evas_object_move(gp->draw, gp->geom.x, gp->geom.y); --
[EGIT] [core/efl] master 01/01: evas-wayland-egl: Fix the unnecessary renewal of the engine window.
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=face34767f16ed76a15124fe08ea3bfbff3193f9 commit face34767f16ed76a15124fe08ea3bfbff3193f9 Author: Seunghun LeeDate: Mon Dec 7 10:06:21 2015 -0500 evas-wayland-egl: Fix the unnecessary renewal of the engine window. Summary: As we do not set the ob->info->info.win variable anymore inside Ecore_Evas (old code that was removed), we can omment out the line. This line was causing unnecessary renewal of the engine window (thus causing flickering when rotation was applied). @fix Test Plan: Rotate or Resize the window on wayland-egl. Reviewers: gwanglim, devilhorns Reviewed By: devilhorns Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3407 --- src/modules/evas/engines/wayland_egl/evas_engine.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index 9c199db..629547e 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -677,7 +677,11 @@ eng_setup(Evas *evas, void *info) ob->info = inf; if ((ob->info->info.display != ob->disp) || (ob->info->info.surface != ob->surface) || - (ob->info->info.win != ob->win) || + /* FIXME: comment out below line. + * since there is no place set the info->info.win for now, + * it causes renew the window unnecessarily. + */ + /* (ob->info->info.win != ob->win) || */ (ob->info->info.depth != ob->depth) || (ob->info->info.screen != ob->screen) || (ob->info->info.destination_alpha != ob->alpha)) --
[EGIT] [tools/eflete] master 11/28: editor: update edj before changing new part
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=af8ee82bde44885df0fdc72d7869c30dac211741 commit af8ee82bde44885df0fdc72d7869c30dac211741 Author: Andrii KroitorDate: Mon Dec 7 10:49:03 2015 +0200 editor: update edj before changing new part --- src/bin/editor/editor_part.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/editor/editor_part.c b/src/bin/editor/editor_part.c index adaffd2..f47a5b6 100644 --- a/src/bin/editor/editor_part.c +++ b/src/bin/editor/editor_part.c @@ -624,13 +624,13 @@ editor_part_add(Evas_Object *edit_object, Change *change, Eina_Bool merge __UNUS return false; editor_save(edit_object); + _editor_project_changed(); /* fix incorrect default values */ TODO("Fix edje_edit") if (type == EDJE_PART_TYPE_BOX) edje_edit_state_box_layout_set(edit_object, part_name, "default", 0.0, "horizontal"); - _editor_project_changed(); event_info = eina_stringshare_add(part_name); if (!_editor_signals_blocked) evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_PART_ADDED, (void *)event_info); eina_stringshare_del(event_info); --
[EGIT] [core/efl] efl-1.15 02/02: po: Update po files.
seoz pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=469915d4a3edd9b50d345d01ec23a5193e2da938 commit 469915d4a3edd9b50d345d01ec23a5193e2da938 Author: Daniel Juyung SeoDate: Tue Dec 8 00:50:27 2015 +0900 po: Update po files. --- po/ca.po| 2 +- po/cs.po| 2 +- po/de.po| 2 +- po/el.po| 2 +- po/eo.po| 2 +- po/es.po| 2 +- po/fi.po| 2 +- po/fr.po| 2 +- po/gl.po| 2 +- po/hu.po| 2 +- po/it.po| 2 +- po/ja.po| 2 +- po/ko.po| 2 +- po/lt.po| 2 +- po/nl.po| 2 +- po/pl.po| 2 +- po/pt.po| 2 +- po/ru.po| 2 +- po/sl.po| 2 +- po/sr.po| 2 +- po/tr.po| 2 +- po/zh_CN.po | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/po/ca.po b/po/ca.po index fd565e7..8f92097 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2014-05-26 21:11+\n" "Last-Translator: joancoll \n" "Language-Team: Catalan\n" diff --git a/po/cs.po b/po/cs.po index 58adf8b..d1243ce 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2014-05-22 21:29+0200\n" "Last-Translator: Tomáš Čech \n" "Language-Team: Czech \n" diff --git a/po/de.po b/po/de.po index a02e89b..3bc5cfe 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" diff --git a/po/el.po b/po/el.po index 2d75514..8b4aae2 100644 --- a/po/el.po +++ b/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2012-12-01 18:26+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" diff --git a/po/eo.po b/po/eo.po index 32b27c4..c728a91 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2014-02-13 06:52+\n" "Last-Translator: Eliovir \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 94d966d..b2b574e 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: EFL\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2015-05-03 18:09+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Enlightenment Team\n" diff --git a/po/fi.po b/po/fi.po index 03d4106..34de5b9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2014-08-31 14:20+\n" "Last-Translator: Kai Huuhko \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 332afe1..3610f0c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-02-04 18:08+0900\n" +"POT-Creation-Date: 2015-12-08 00:18+0900\n" "PO-Revision-Date: 2014-05-25 20:08+\n" "Last-Translator: Eliovir \n" "Language-Team: Enlightenment French Team \n" "Language-Team: http://trasno.net/ \n" diff
[EGIT] [core/efl] master 01/01: Evas textblock: fix evas_textblock_cursor_line_set
herdsman pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1d48dd90b295e902697a37a1db7ce7f117b72c45 commit 1d48dd90b295e902697a37a1db7ce7f117b72c45 Author: Daniel HirtDate: Mon Dec 7 17:23:24 2015 +0200 Evas textblock: fix evas_textblock_cursor_line_set The line_set function should set the cursor to the first logical position in the line. We can't use the first text position of the first item in the line, due to BiDi considerations (the line may be reordered). I've split evas_textblock_cursor_line_char_first to avoid code duplication, as it already handles these cases. @fix --- src/lib/evas/canvas/evas_object_textblock.c | 62 +++-- src/tests/evas/evas_test_textblock.c| 19 + 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 51d244d..84e0483 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -8348,6 +8348,33 @@ evas_textblock_cursor_paragraph_char_last(Evas_Textblock_Cursor *cur) } +static void +_cursor_line_first_char_get(Evas_Object_Textblock_Line *ln, +Evas_Textblock_Cursor *cur, +Evas_Textblock_Data *o) +{ + if (ln->items) + { +Evas_Object_Textblock_Item *it; +size_t pos; +pos = ln->items->text_pos; +EINA_INLIST_FOREACH(EINA_INLIST_GET(ln->items)->next, it) + { + if (it->text_pos < pos) + { + pos = it->text_pos; + } + } +cur->pos = pos; +cur->node = ln->items->text_node; + } + else + { +cur->pos = 0; +cur->node = o->text_nodes; + } +} + EAPI void evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur) { @@ -8362,26 +8389,12 @@ evas_textblock_cursor_line_char_first(Evas_Textblock_Cursor *cur) _relayout_if_needed(cur->obj, o); + /* We don't actually need 'it', but it needs to be non NULL */ _find_layout_item_match(cur, , ); if (!ln) return; - if (ln->items) - { -Evas_Object_Textblock_Item *i; -it = ln->items; -EINA_INLIST_FOREACH(ln->items, i) - { - if (it->text_pos > i->text_pos) - { - it = i; - } - } - } - if (it) - { -cur->pos = it->text_pos; -cur->node = it->text_node; - } + + _cursor_line_first_char_get(ln, cur, o); } EAPI void @@ -8928,7 +8941,6 @@ EAPI Eina_Bool evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) { Evas_Object_Textblock_Line *ln; - Evas_Object_Textblock_Item *it; if (!cur) return EINA_FALSE; Evas_Object_Protected_Data *obj = eo_data_scope_get(cur->obj, EVAS_OBJECT_CLASS); @@ -8940,17 +8952,9 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) ln = _find_layout_line_num(cur->obj, line); if (!ln) return EINA_FALSE; - it = (Evas_Object_Textblock_Item *)ln->items; - if (it) - { -cur->pos = it->text_pos; -cur->node = it->text_node; - } - else - { -cur->pos = 0; -cur->node = o->text_nodes; - } + + _cursor_line_first_char_get(ln, cur, o); + return EINA_TRUE; } diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index b529fcb..853cefd 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -918,6 +918,25 @@ START_TEST(evas_textblock_cursor) #endif } + /* Line set with BiDi text */ + { +size_t pos; + +evas_object_textblock_text_markup_set(tb, + "שלום עולם hello world" + "שלום עולם hello world" + "hello world שלום עולם"); +evas_textblock_cursor_line_set(cur, 0); +pos = evas_textblock_cursor_pos_get(cur); +ck_assert_int_eq(pos, 0); +evas_textblock_cursor_line_set(cur, 1); +pos = evas_textblock_cursor_pos_get(cur); +ck_assert_int_eq(pos, 22); +evas_textblock_cursor_line_set(cur, 2); +pos = evas_textblock_cursor_pos_get(cur); +ck_assert_int_eq(pos, 44); + } + END_TB_TEST(); } END_TEST --
[EGIT] [core/efl] master 01/01: Evas GL: Fix build for bigendian
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7a0103d01fe1cf45bf61fd5d60c608269be37484 commit 7a0103d01fe1cf45bf61fd5d60c608269be37484 Author: Jean-Philippe ANDREDate: Tue Dec 8 01:03:40 2015 +0900 Evas GL: Fix build for bigendian Fixes T2918 --- src/modules/evas/engines/gl_common/evas_gl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c index 53f045b..dc2449d 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_shader.c +++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c @@ -11,7 +11,7 @@ #define I(p) ((int)(intptr_t)p) #ifdef WORDS_BIGENDIAN -# define BASEFLAG SHADER_FLAG_BIGENDIAN; +# define BASEFLAG SHADER_FLAG_BIGENDIAN #else # define BASEFLAG 0 #endif --
[EGIT] [core/efl] efl-1.15 01/02: release: Update NEWS and bump version for 1.15.3 release
seoz pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=3fc97fd09ea2cb18c17df774640f329d34cec412 commit 3fc97fd09ea2cb18c17df774640f329d34cec412 Author: Daniel Juyung SeoDate: Mon Dec 7 23:38:02 2015 +0900 release: Update NEWS and bump version for 1.15.3 release --- NEWS | 6 ++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a1d8820..98b18e0 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,12 @@ Fixes: * doc/eldbus: fix parameter in document * edje_cc: Fix inheritance of "no_render" flag * eldbus - make method calls less crasy since libdbus likes to abort + * Evas filters: Fix crash with async sw rendering + * Ecore_xcb_keymap: Fix memory leak in _ecore_xcb_keymap_finilize + * Ecore exe win32: Fix double-free errors. (T2675) + * Eina: fix eina_file_current_directory_get() + * Eina: fix memory leak in eina_file_open() + * edje: initialize map.zoom values to fix old *.edj compatibility issues. Changes since 1.14.0: - diff --git a/configure.ac b/configure.ac index c34191c..f536377 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -EFL_VERSION([1], [15], [2], [release]) +EFL_VERSION([1], [15], [3], [release]) AC_INIT([efl], [efl_version], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.60]) --
[EGIT] [tools/enventor] master 01/01: enventor: Fix to move scroller bar to correct position for find function
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=2e541e722ab4c2256790ea114c3a8f8db7673b12 commit 2e541e722ab4c2256790ea114c3a8f8db7673b12 Author: Jaehyun ChoDate: Mon Dec 7 17:17:29 2015 +0900 enventor: Fix to move scroller bar to correct position for find function enventor creates a scroller instead of using entry's scroller for text editor. This causes that the scroller bar moves to incorrect position when a word is selected by find function. To resolve this problem, set entry's cursor position before setting entry's select region. --- src/lib/enventor_smart.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index f186dc2..8d64804 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -536,6 +536,7 @@ _enventor_object_select_region_set(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd, int start, int end) { edit_selection_clear(pd->ed); + elm_entry_cursor_pos_set(edit_entry_get(pd->ed), start); elm_entry_select_region_set(edit_entry_get(pd->ed), start, end); } --
[EGIT] [core/efl] master 04/04: eina: Updated test case to test more scenario.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=05cfb0604c35ced76abedef01d6a660efa94b606 commit 05cfb0604c35ced76abedef01d6a660efa94b606 Author: Srivardhan HebbarDate: Mon Dec 7 19:22:47 2015 +0900 eina: Updated test case to test more scenario. Summary: The test cases which I took from wikipedia didn't have the characters '/' and '+' in the encoded string. So added test case testing these. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3405 --- src/tests/eina/eina_test_str.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tests/eina/eina_test_str.c b/src/tests/eina/eina_test_str.c index b49a9e0..03f254c 100644 --- a/src/tests/eina/eina_test_str.c +++ b/src/tests/eina/eina_test_str.c @@ -383,7 +383,10 @@ START_TEST(str_base64_encode) { "leasure.", "bGVhc3VyZS4=", 8 }, { "easure.", "ZWFzdXJlLg==", 7 }, { "asure.", "YXN1cmUu", 6 }, - { "sure.", "c3VyZS4=", 5 } + { "sure.", "c3VyZS4=", 5 }, + /* The following 2 cases are manually generated for '-' and '/' testing*/ + { "aabc123!?", "YWFiYzEyMyE/", 9 }, + { "abc123!?$*&()'-=@~", "YWJjMTIzIT8kKiYoKSctPUB+", 18 } }; unsigned int i; --
[EGIT] [core/efl] master 03/04: eina: Adding example for base64 decode function.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1f31a714de107a94b0f827acfbf28418f24ad741 commit 1f31a714de107a94b0f827acfbf28418f24ad741 Author: Srivardhan HebbarDate: Mon Dec 7 19:00:39 2015 +0900 eina: Adding example for base64 decode function. Summary: Depends on D3381 Signed-off-by: Srivardhan Hebbar Differential Revision: https://phab.enlightenment.org/D3383 PS: arc patch failed so manually applying this patch --- src/examples/eina/eina_str_01.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/examples/eina/eina_str_01.c b/src/examples/eina/eina_str_01.c index ce30ebd..028be37 100644 --- a/src/examples/eina/eina_str_01.c +++ b/src/examples/eina/eina_str_01.c @@ -18,6 +18,8 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) time_t curr_time; struct tm *info; char *b64; + unsigned char *decoded; + int decoded_len; eina_init(); @@ -71,7 +73,10 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) b64 = eina_str_base64_encode((unsigned char *)"Enlightenment", 9); printf("%s\n", b64); + decoded = eina_str_base64_decode(b64, _len); + printf("decoded string: %s, decoded_len: %d\n", decoded, decoded_len); free(b64); + free(decoded); eina_shutdown(); --
[EGIT] [core/enlightenment] master 01/10: e backlight - avoid seg when comp is shut down and backlight updated
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=47f26b5b088c7c5be7e77e33e8b03e82b5e78b3c commit 47f26b5b088c7c5be7e77e33e8b03e82b5e78b3c Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:39:01 2015 +0900 e backlight - avoid seg when comp is shut down and backlight updated if comp is already shut down, then backlight can't do shutdown things assuming comp is around, thus handle null e_comp. this fixes segv's waiting to happen as backlight is shut down after comp and thus e_comp is a garbage pointer of course @fix --- src/bin/e_backlight.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c index 89552e3..c90e2ef 100644 --- a/src/bin/e_backlight.c +++ b/src/bin/e_backlight.c @@ -210,6 +210,7 @@ _e_backlight_update(void) Ecore_X_Randr_Output *out; int i, num = 0; + if (!e_comp) return; root = e_comp->root; // try randr if (root && xbl_avail) @@ -278,6 +279,7 @@ _e_backlight_set(double val) int num = 0, i; char *name; +if (!e_comp) return; root = e_comp->root; out = ecore_x_randr_window_outputs_get(root, ); if ((out) && (num > 0)) --
[EGIT] [core/enlightenment] master 07/10: e comp randr support - fix leak of randr info
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3c1588efa253ea512b8359716c86e35f512b2770 commit 3c1588efa253ea512b8359716c86e35f512b2770 Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:51:41 2015 +0900 e comp randr support - fix leak of randr info this fixes case where randr info is not freed @fix --- src/bin/e_comp_x_randr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c index 0c73629..eb238cf 100644 --- a/src/bin/e_comp_x_randr.c +++ b/src/bin/e_comp_x_randr.c @@ -536,6 +536,7 @@ e_comp_x_randr_config_apply(void) ecore_x_randr_crtc_info_free(info); break; } + ecore_x_randr_crtc_info_free(info); } } } --
[EGIT] [core/enlightenment] master 09/10: e randr - slicken up fade to use sinusoidal interpolation
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=58d5c6d3f6a63cd301620a4e9a7506a4bf41d00a commit 58d5c6d3f6a63cd301620a4e9a7506a4bf41d00a Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 20:00:14 2015 +0900 e randr - slicken up fade to use sinusoidal interpolation @feature --- src/bin/e_randr2.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c index 7bb428f..b1e46e8 100644 --- a/src/bin/e_randr2.c +++ b/src/bin/e_randr2.c @@ -219,10 +219,13 @@ static Eina_Bool _cb_fade_animator(void *data EINA_UNUSED) { double t = ecore_loop_time_get() - _start_time; + const double duration = 0.5; int v; - t = t / 0.5; if (t < 0.0) t = 0.0; + t = t / duration; + if (t > 1.0) t = 1.0; + t = ecore_animator_pos_map(t, ECORE_POS_MAP_SINUSOIDAL, 0.0, 0.0); v = _target_from + ((_target_to - _target_from) * t); if (t >= 1.0) v = _target_to; evas_object_color_set(_fade_obj, 0, 0, 0, v); @@ -230,7 +233,7 @@ _cb_fade_animator(void *data EINA_UNUSED) { if (_target_to == 255) { - _apply_delay = ecore_timer_add(3.0, _cb_delay_timer, NULL); + _apply_delay = ecore_timer_add(5.0, _cb_delay_timer, NULL); _do_apply(); _screen_check_unconfigured(e_randr2, e_randr2_cfg); } --
[EGIT] [bindings/python/python-efl] master 01/01: Add test/example for Genlist tree
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=8e7616c1b39733f675590d942cb2d098f4c5a40c commit 8e7616c1b39733f675590d942cb2d098f4c5a40c Author: Dave AndreoliDate: Mon Dec 7 12:20:49 2015 +0100 Add test/example for Genlist tree --- examples/elementary/test.py | 1 + examples/elementary/test_genlist_tree.py | 97 2 files changed, 98 insertions(+) diff --git a/examples/elementary/test.py b/examples/elementary/test.py index e1a4e00..486a5fb 100755 --- a/examples/elementary/test.py +++ b/examples/elementary/test.py @@ -172,6 +172,7 @@ items = [ ("Lists - Genlist", [ ("Genlist 1", "test_genlist_1", "test_genlist_1"), ("Genlist 2", "test_genlist_2", "test_genlist_2"), +("Genlist Tree", "test_genlist_tree", "test_genlist_tree"), ("Genlist Group", "test_genlist_group", "test_genlist_group"), ("Genlist Sorted", "test_genlist_sorted", "test_genlist_sorted"), ("Genlist Iteration", "test_genlist_iteration", "test_genlist_iteration"), diff --git a/examples/elementary/test_genlist_tree.py b/examples/elementary/test_genlist_tree.py new file mode 100644 index 000..c7af141 --- /dev/null +++ b/examples/elementary/test_genlist_tree.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python +# encoding: utf-8 + +import os + +from efl.evas import EXPAND_BOTH, FILL_BOTH, EXPAND_HORIZ, FILL_HORIZ +from efl import elementary as elm +from efl.elementary import StandardWindow, Box, Check, Icon, Frame, \ +Genlist, GenlistItemClass, ELM_GENLIST_ITEM_TREE + + +script_path = os.path.dirname(os.path.abspath(__file__)) +img_path = os.path.join(script_path, "images") + + +class MyItemClass(GenlistItemClass): +def __init__(self): +GenlistItemClass.__init__(self, item_style="tree_effect") + +def text_get(self, obj, part, item_data): +return "Item # %i" % item_data + +def content_get(self, obj, part, item_data): +if part == 'elm.swallow.icon': +ic = Icon(obj, file=os.path.join(img_path, "logo_small.png")) +return ic + +itc = MyItemClass() + + +# list callbacks +def list_expand_request_cb(gl, gli): +gli.expanded = True + +def list_contract_request_cb(gl, gli): +gli.expanded = False + +def list_expanded_cb(gl, gli): +start = gli.data * 10 +for i in range(start, start + 30): +gl.item_append(itc, i, gli, flags=ELM_GENLIST_ITEM_TREE) + +def list_contracted_cb(gl, gli): +gli.subitems_clear() + + +def test_genlist_tree(parent): +win = StandardWindow("Genlist", "Genlist Tree", + size=(320, 320), autodel=True) + +# vertical box + options frame +box = Box(win, size_hint_expand=EXPAND_BOTH) +win.resize_object_add(box) +box.show() + +fr = Frame(win, text='Genlist Tree Options', + size_hint_expand=EXPAND_HORIZ, size_hint_fill=FILL_HORIZ) +box.pack_end(fr) +fr.show() + +hbox = Box(win, horizontal=True, homogeneous=True, + size_hint_expand=EXPAND_HORIZ, size_hint_fill=FILL_HORIZ) +fr.content = hbox +hbox.show() + +# Genlist +gl = Genlist(win, size_hint_weight=EXPAND_BOTH, size_hint_align=FILL_BOTH) +gl.callback_expand_request_add(list_expand_request_cb) +gl.callback_contract_request_add(list_contract_request_cb) +gl.callback_expanded_add(list_expanded_cb) +gl.callback_contracted_add(list_contracted_cb) +box.pack_end(gl) +gl.show() + +gl.item_append(itc, 1, flags=ELM_GENLIST_ITEM_TREE) +gl.item_append(itc, 2, flags=ELM_GENLIST_ITEM_TREE) +gl.item_append(itc, 3) + +# option buttons +ck = Check(win, text='Tree Effect') +ck.callback_changed_add(lambda c: setattr(gl, "tree_effect_enabled", c.state)) +hbox.pack_end(ck) +ck.show() + +ck = Check(win, text='Homogeneous') +ck.callback_changed_add(lambda c: setattr(gl, "homogeneous", c.state)) +hbox.pack_end(ck) +ck.show() + +# show the window +win.show() + + +if __name__ == "__main__": +elm.policy_set(elm.ELM_POLICY_QUIT, elm.ELM_POLICY_QUIT_LAST_WINDOW_CLOSED) +test_genlist_tree(None) +elm.run() --
[EGIT] [core/enlightenment] master 02/10: e comp - set e_comp to null on shutdown so others dont access junk
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bc8cfec3568e7dcc23adfae596ecb8652430f445 commit bc8cfec3568e7dcc23adfae596ecb8652430f445 Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:40:59 2015 +0900 e comp - set e_comp to null on shutdown so others dont access junk e backlight was accessing e_comp implicitly during shutdown and comp is shut down before backlight (that is correct as comp relies on backlight). this fixes that @fix --- src/bin/e_comp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index ce2d1e5..451d640 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1358,6 +1358,7 @@ e_comp_shutdown(void) e_object_del(E_OBJECT(ec)); } e_object_del(E_OBJECT(e_comp)); + e_comp = NULL; E_FREE_LIST(handlers, ecore_event_handler_del); E_FREE_LIST(actions, e_object_del); E_FREE_LIST(hooks, e_client_hook_del); --
[EGIT] [core/enlightenment] master 08/10: e randr2 - remove auto-clone and now make randr dialog come up instead
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f63f6518006bdcfcd7da97f236d73592104f22ba commit f63f6518006bdcfcd7da97f236d73592104f22ba Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:58:58 2015 +0900 e randr2 - remove auto-clone and now make randr dialog come up instead some odd things happen with auto-clone, so give the user manual intervention automatically with the randr conf dilaog coming up on an unconfigured screen being detected. @fix --- src/bin/e_randr2.c | 77 +- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c index a2880c2..7bb428f 100644 --- a/src/bin/e_randr2.c +++ b/src/bin/e_randr2.c @@ -168,6 +168,32 @@ _screen_closed(E_Randr2_Screen *s) } static void +_screen_check_unconfigured(E_Randr2 *r, E_Config_Randr2 *cfg) +{ + Eina_List *l; + E_Randr2_Screen *s; + E_Config_Randr2_Screen *cs; + + printf("RRR: check for unconfigured screens\n"); + EINA_LIST_FOREACH(r->screens, l, s) + { +cs = NULL; +printf("RRR: looking at %s ...\n", s->info.name); +if ((!_screen_closed(s)) && (s->info.connected)) + { + cs = e_randr2_config_screen_find(s, cfg); + if (!cs) + { + printf("RRR: unconfig display on: %s\n", s->info.name); + e_configure_registry_call("screen/screen_setup", +NULL, s->info.name); + return; + } + } + } +} + +static void _animated_apply_abort(void) { if (_apply_delay) ecore_timer_del(_apply_delay); @@ -206,6 +232,7 @@ _cb_fade_animator(void *data EINA_UNUSED) { _apply_delay = ecore_timer_add(3.0, _cb_delay_timer, NULL); _do_apply(); + _screen_check_unconfigured(e_randr2, e_randr2_cfg); } else { @@ -412,9 +439,9 @@ _config_really_apply(E_Randr2_Screen *s, E_Config_Randr2_Screen *cs) static void _config_apply(E_Randr2 *r, E_Config_Randr2 *cfg) { - Eina_List *l, *l2; - E_Randr2_Screen *s, *s2; - E_Config_Randr2_Screen *cs, *cs2; + Eina_List *l; + E_Randr2_Screen *s; + E_Config_Randr2_Screen *cs; if ((!r) || (!cfg)) return; EINA_LIST_FOREACH(r->screens, l, s) @@ -430,50 +457,6 @@ _config_apply(E_Randr2 *r, E_Config_Randr2 *cfg) printf("RRR: ... priority = %i\n", cs->priority); _config_really_apply(s, cs); } -else if ((!cs) && (!_screen_closed(s))) - { - printf("RRR: ... no config found...\n"); - cs2 = NULL; - if (s->info.connected) - { - EINA_LIST_FOREACH(r->screens, l2, s2) -{ - if (s2 == s) continue; - if (s2->info.is_lid) - { -cs2 = e_randr2_config_screen_find(s2, cfg); -if (cs2) break; - } -} - if (!cs2) -{ - EINA_LIST_FOREACH(r->screens, l2, s2) - { -if (s2 == s) continue; -if (s2->info.connected) - { - cs2 = e_randr2_config_screen_find(s2, cfg); - if (cs2) break; - } - } -} - } - if (cs2) - { - printf("RRR: ... enabled - fallback clone\n"); - _config_really_apply(s, cs2); - free(s->config.relative.to); - s->config.relative.to = strdup(cs2->id); - printf("RRR: ... clone = %s\n", s->config.relative.to); - s->config.relative.mode = E_RANDR2_RELATIVE_CLONE; - s->config.relative.align = 0.0; - } - else - { - printf("RRR: ... disabled\n"); - _config_really_apply(s, NULL); - } - } else { printf("RRR: ... disabled\n"); --
[EGIT] [core/enlightenment] master 05/10: e exec - fix missing ref and unref for instance event
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f88ed7c7fbccc76eb8a17e7dd7b99204f191022e commit f88ed7c7fbccc76eb8a17e7dd7b99204f191022e Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:47:07 2015 +0900 e exec - fix missing ref and unref for instance event this fixes a crash on shutdown when freeing up stuff because an exec instance wasnt ref++'d and ref--'d when adding an event on the event queue that pointed to it. @fix --- src/bin/e_exec.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index b251f35..6f58491 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -660,6 +660,7 @@ _e_exec_instance_free(E_Exec_Instance *inst) if (!inst->deleted) { inst->deleted = 1; +inst->ref++; ecore_event_add(E_EVENT_EXEC_DEL, inst, _e_exec_cb_exec_del_free, inst); return; } @@ -712,7 +713,10 @@ _e_exec_cb_exec_new_free(void *data, void *ev EINA_UNUSED) static void _e_exec_cb_exec_del_free(void *data, void *ev EINA_UNUSED) { - _e_exec_instance_free(data); + E_Exec_Instance *inst = data; + + inst->ref--; + _e_exec_instance_free(inst); } static Eina_Bool --
[EGIT] [core/enlightenment] master 03/10: e zone - handle null e_comp if comp is already shut down
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bb3701702a2e44fa5303a154638787743e5495bf commit bb3701702a2e44fa5303a154638787743e5495bf Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:42:28 2015 +0900 e zone - handle null e_comp if comp is already shut down this came from backlight shutdown that got current zone... and getting zone relied on e_comp being valid. @fix --- src/bin/e_zone.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 00600e6..4f19d63 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -400,6 +400,7 @@ e_zone_current_get(void) Eina_List *l = NULL; E_Zone *zone; + if (!e_comp) return NULL; if (!starting) { int x, y; --
[EGIT] [core/efl] master 01/04: Evas GL: Detect GLES 3 support for OpenGL
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c4de3caee9daf2ccc0736d79e38c3e6627021f07 commit c4de3caee9daf2ccc0736d79e38c3e6627021f07 Author: Jean-Philippe AndreDate: Mon Dec 7 17:27:45 2015 +0900 Evas GL: Detect GLES 3 support for OpenGL As @zmike mentionned in T2396 there is an extension string declaring full support for GLES 3 when using OpenGL. Note: I can't really test myself since I have recent drivers. Hopefully this is correct. Fixes T2396 --- src/modules/evas/engines/gl_common/evas_gl_context.c | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c index 440d345..04de885 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_context.c +++ b/src/modules/evas/engines/gl_common/evas_gl_context.c @@ -481,8 +481,16 @@ _evas_gl_common_version_check(int *gles_ver) /* Map GL to GLES version: Refer http://en.wikipedia.org/wiki/OpenGL_ES */ if ((major >= 4) && (minor >= 3)) *gles_ver = 3; +else if ((major > 3) || ((major == 3) && (minor >= 3))) /* >= 3.3 */ + { + const char *exts = (const char *) glGetString(GL_EXTENSIONS); + if (exts && strstr(exts, "GL_ARB_ES3_compatibility")) + *gles_ver = 3; + else + *gles_ver = 2; + } else - *gles_ver = 2; + *gles_ver = 2; /* emulated support */ return 1; } --
[EGIT] [core/efl] master 02/04: eina: Adding API for base64 decode.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7d84c19bec7482a9f470c29ffa9390cb5b38adc7 commit 7d84c19bec7482a9f470c29ffa9390cb5b38adc7 Author: Srivardhan HebbarDate: Mon Dec 7 18:41:53 2015 +0900 eina: Adding API for base64 decode. Summary: Added eina_str_base64_decode API. Signed-off-by: Srivardhan Hebbar Reviewers: cedric, jpeg Reviewed By: jpeg Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D3381 @feature --- src/lib/eina/eina_str.c | 76 + src/lib/eina/eina_str.h | 13 + 2 files changed, 89 insertions(+) diff --git a/src/lib/eina/eina_str.c b/src/lib/eina/eina_str.c index 4ff23e9..8685297 100644 --- a/src/lib/eina/eina_str.c +++ b/src/lib/eina/eina_str.c @@ -299,6 +299,11 @@ eina_str_split_full_helper(const char *str, return str_array; } +static inline Eina_Bool is_base64(unsigned char c) +{ + return (isalnum(c) || (c == '+') || (c == '/')); +} + /** * @endcond */ @@ -779,3 +784,74 @@ eina_str_base64_encode(const unsigned char *src, unsigned int len) return dest; } + +EAPI +unsigned char *eina_str_base64_decode(const char * src, int *decoded_str_len) +{ + unsigned char inarr[4], outarr[3]; + int i = 0, j = 0, k = 0, l = 0; + int len; + unsigned char *dest; + + if (!src) + goto error; + + len = strlen(src); + /* The encoded string length should be a multiple of 4. Else it is not a +* valid encoded string. +*/ + if (len % 4) + goto error; + + /* This is the max size the destination string can have. +*/ + dest = (unsigned char *)malloc(sizeof(unsigned char) * ((len * 3 / 4) + 1)); + if (!dest) + goto error; + + while (len-- && ( src[k] != '=') && is_base64(src[k])) + { + inarr[i++] = src[k++]; + if (i ==4) + { + for (i = 0; i <4; i++) + inarr[i] = strchr(base64_table,(int) inarr[i]) - base64_table; + + outarr[0] = (inarr[0] << 2) + ((inarr[1] & 0x30) >> 4); + outarr[1] = ((inarr[1] & 0xf) << 4) + ((inarr[2] & 0x3c) >> 2); + outarr[2] = ((inarr[2] & 0x3) << 6) + inarr[3]; + + for (i = 0; (i < 3); i++) + dest[l++] = outarr[i]; + i = 0; + } + } + + if (i) + { + for (j = i; j <4; j++) + inarr[j] = 0; + + for (j = 0; j <4; j++) + inarr[j] = strchr(base64_table, (int) inarr[j]) - base64_table; + + outarr[0] = (inarr[0] << 2) + ((inarr[1] & 0x30) >> 4); + outarr[1] = ((inarr[1] & 0xf) << 4) + ((inarr[2] & 0x3c) >> 2); + outarr[2] = ((inarr[2] & 0x3) << 6) + inarr[3]; + + for (j = 0; (j < i - 1); j++) + dest[l++] = outarr[j]; + } + + /* This is to prevent the applications from crashing. */ + dest[l] = '\0'; + + if (decoded_str_len) + *decoded_str_len = l; + return dest; + +error: + if (decoded_str_len) + *decoded_str_len = 0; + return NULL; +} diff --git a/src/lib/eina/eina_str.h b/src/lib/eina/eina_str.h index c47ddb4..3caba1f 100644 --- a/src/lib/eina/eina_str.h +++ b/src/lib/eina/eina_str.h @@ -395,6 +395,19 @@ EAPI char *eina_strftime(const char *format, const struct tm *tm); */ EAPI char *eina_str_base64_encode(const unsigned char *src, unsigned int len); +/** + * @brief base64 decoding function. + * @param src The string to be decoded. + * @param decoded_str_len The length of the decoded string. + * @return the base64 decoded string. + * + * This will create a NULL terminated string which is base64 decode of the src. + * The caller has to free the returned string using free(). + * + * @since 1.17.0 + */ +EAPI unsigned char * eina_str_base64_decode(const char * src, int *decoded_str_len); + #include "eina_inline_str.x" /** --
[EGIT] [core/efl] master 01/01: efl - ecore-x xrandr - fix memleaks of properties fetched
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dadc1451e7f53d64b9b848d18c4c2514d791c53e commit dadc1451e7f53d64b9b848d18c4c2514d791c53e Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:34:53 2015 +0900 efl - ecore-x xrandr - fix memleaks of properties fetched while doing some debugging, ifound we have been leaking these xrandr properites that were malloced in certain cases. this fixes these leaks. @fix --- src/lib/ecore_x/xlib/ecore_x_randr.c | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_x/xlib/ecore_x_randr.c b/src/lib/ecore_x/xlib/ecore_x_randr.c index 484e86e..551e125 100644 --- a/src/lib/ecore_x/xlib/ecore_x_randr.c +++ b/src/lib/ecore_x/xlib/ecore_x_randr.c @@ -2669,6 +2669,7 @@ ecore_x_randr_output_backlight_level_get(Ecore_X_Window root EINA_UNUSED, Ecore_ if ((!prop) || (items == 0)) { +free(prop); /* check legacy backlight property * * FIXME: NB: Not sure what randr version we need for the legacy @@ -2684,6 +2685,7 @@ ecore_x_randr_output_backlight_level_get(Ecore_X_Window root EINA_UNUSED, Ecore_ /* safety check */ if ((!prop) || (type != XA_INTEGER) || (items != 1) || (format != 32)) { +free(prop); WRN("Backlight property is not supported on this server or driver"); return -1; } @@ -2788,7 +2790,7 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root EINA_UNUSED, Ecore_X_Randr_Out { #ifdef ECORE_XRANDR Atom edid = None, type = None; - unsigned char *prop; + unsigned char *prop = NULL; int format = 0; unsigned long nitems = 0, bytes = 0; @@ -2813,10 +2815,12 @@ ecore_x_randr_output_edid_get(Ecore_X_Window root EINA_UNUSED, Ecore_X_Randr_Out { if (length) *length = nitems; memcpy(ret, prop, (nitems * sizeof(unsigned char))); + free(prop); return ret; } } } + free(prop); #endif return NULL; } @@ -2863,7 +2867,7 @@ ecore_x_randr_output_wired_clones_get(Ecore_X_Window root EINA_UNUSED, Ecore_X_R { #ifdef ECORE_XRANDR Atom clones = None, type = None; - unsigned char *prop; + unsigned char *prop = NULL; int format = 0; unsigned long nitems = 0, bytes = 0; @@ -2893,10 +2897,12 @@ ecore_x_randr_output_wired_clones_get(Ecore_X_Window root EINA_UNUSED, Ecore_X_R { if (num) *num = nitems; memcpy(ret, prop, (nitems * sizeof(Ecore_X_Randr_Output))); + free(prop); return ret; } } } + free(prop); #endif return NULL; } @@ -2933,6 +2939,7 @@ ecore_x_randr_output_signal_formats_get(Ecore_X_Window root EINA_UNUSED, Ecore_X False, False, AnyPropertyType, , , , , )) { +free(prop); printf("Signal Format property not supported.\n"); return NULL; } @@ -3001,6 +3008,7 @@ ecore_x_randr_output_signal_properties_get(Ecore_X_Window root EINA_UNUSED, Ecor False, False, AnyPropertyType, , , , , )) { +free(prop); printf("Signal Properties property not supported.\n"); return NULL; } @@ -3068,13 +3076,17 @@ ecore_x_randr_output_connector_number_get(Ecore_X_Window root EINA_UNUSED, Ecore False, False, AnyPropertyType, , , , , )) { +free(prop); printf("ConnectionNumber property not supported.\n"); return -1; } /* safety check */ if ((type != XA_INTEGER) || (items != 1) || (format != 32)) - return -1; + { +free(prop); +return -1; + } val = *((int *)prop); free(prop); @@ -3113,12 +3125,16 @@ ecore_x_randr_output_connector_type_get(Ecore_X_Window root EINA_UNUSED, Ecore_X if (XRRGetOutputProperty(_ecore_x_disp, output, connector_type, 0, 100, False, False, AnyPropertyType, , , , , ) != Success) - return -1; + { +free(prop); +return -1; + } if ((!prop) || (items == 0)) { Atom conn; +free(prop); /* NB: some butthead drivers (*cough* nouveau *cough*) do not * implement randr properly. They are not using the connector type * property of randr, but rather a "subconnector" property */ @@ -3130,6 +3146,7 @@ ecore_x_randr_output_connector_type_get(Ecore_X_Window root EINA_UNUSED, Ecore_X if ((!prop) || (items == 0)) { +free(prop); WRN("ConnectorType Property not supported."); return -1; } --
[EGIT] [core/enlightenment] master 06/10: e randr - fix silent free of data behind randr's back
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=de269f4711f2bb3338280879b24e13209e659f14 commit de269f4711f2bb3338280879b24e13209e659f14 Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:50:00 2015 +0900 e randr - fix silent free of data behind randr's back this fixes a bizarrre issue that valgrind reported that has the strings we malloc and fill somehow being freed by xlib. totally didn't make sense. either way, a workaround here is to strdup them immediately and free the tmp copy and oddly the bug doesn't happen. this is very odd. @fix --- src/bin/e_comp_x_randr.c | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c index b526b24..0c73629 100644 --- a/src/bin/e_comp_x_randr.c +++ b/src/bin/e_comp_x_randr.c @@ -55,7 +55,13 @@ _output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o) if (!edid) return NULL; name = ecore_x_randr_edid_display_name_get(edid, len); free(edid); - return name; + if (name) + { +char *name2 = strdup(name); +free(name); +return name2; + } + return NULL; } static Ecore_X_Randr_Edid_Display_Interface_Type @@ -76,7 +82,12 @@ _output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output o) { // get the output name - like connector (hdmi-0, dp1, dvi-0-1 etc.) char *name = ecore_x_randr_output_name_get(root, o, NULL); - if (name) return name; + if (name) + { +char *name2 = strdup(name); +free(name); +return name2; + } return _output_screen_get(root, o); } --
[EGIT] [core/enlightenment] master 04/10: e randr - feature fix that allows config to jump to specific screen
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ecca33310d2d23444e7c3a7ff6d4296ee36b4baa commit ecca33310d2d23444e7c3a7ff6d4296ee36b4baa Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 19:44:46 2015 +0900 e randr - feature fix that allows config to jump to specific screen as part of another fix for having e just pop up the screen config dialog when a new screen is detected that isn't configured, allow config dialog for randr to get screen output name via input params @fix --- src/modules/conf_randr/e_int_config_randr2.c | 34 +--- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c index ac9ea88..6104867 100644 --- a/src/modules/conf_randr/e_int_config_randr2.c +++ b/src/modules/conf_randr/e_int_config_randr2.c @@ -5,6 +5,7 @@ /* local structures */ struct _E_Config_Dialog_Data { + char *params; E_Config_Dialog *cfd; Eina_List *screen_items; Eina_List *screen_items2; @@ -49,7 +50,7 @@ static int _basic_check(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfd /* public functions */ E_Config_Dialog * -e_int_config_randr2(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) +e_int_config_randr2(Evas_Object *parent EINA_UNUSED, const char *params) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -69,7 +70,7 @@ e_int_config_randr2(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNU cfd = e_config_dialog_new(NULL, _("Screen Setup"), "E", "screen/screen_setup", "preferences-system-screen-resolution", - 0, v, NULL); + 0, v, (void *)params); return cfd; } @@ -80,7 +81,8 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED) E_Config_Dialog_Data *cfdata; if (!(cfdata = E_NEW(E_Config_Dialog_Data, 1))) return NULL; - cfdata->restore = e_randr2_cfg->restore; + cfdata->params = strdup(cfd->data); + if (cfd->data) cfdata->restore = e_randr2_cfg->restore; cfdata->hotplug = !e_randr2_cfg->ignore_hotplug_events; cfdata->acpi = !e_randr2_cfg->ignore_acpi_events; return cfdata; @@ -98,6 +100,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) eina_stringshare_del(cs->rel_to); free(cs); } + free(cfdata->params); eina_list_free(cfdata->screen_items); eina_list_free(cfdata->screen_items2); EINA_LIST_FREE(cfdata->freelist, dt) free(dt); @@ -572,12 +575,27 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data it = elm_hoversel_item_add(o, s->info.name, NULL, ELM_ICON_NONE, _cb_screen_select, cfdata); - if (!first) + if (cfdata->params) { - first = s; - first_cfg = cs; - cfdata->screen = i; - elm_object_text_set(o, s->info.name); + if ((s->info.name) && + (!strcmp(s->info.name, cfdata->params)) && + (!first)) + { +first = s; +first_cfg = cs; +cfdata->screen = i; +elm_object_text_set(o, s->info.name); + } +} + else +{ + if (!first) + { +first = s; +first_cfg = cs; +cfdata->screen = i; +elm_object_text_set(o, s->info.name); + } } cfdata->screen_items = eina_list_append(cfdata->screen_items, it); i++; --
[EGIT] [website/www-content] master 19/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ab6a87bb83e324ab50556a922027ab1907775dda commit ab6a87bb83e324ab50556a922027ab1907775dda Author: Lauro MouraDate: Wed Dec 2 13:52:21 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index e3c102e..1366d40 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -1,5 +1,7 @@ = Javascript binding API - Eina Logging = +[[api:javascript:eina|Back to the JS Eina page]] + The Eina framework provides a comprehensive system to manage logging events in your application. For example, it can group message in domains, assign different levels to the messages. There's also the possibility of intercepting the log messages, allowing further processing. The main workhorse is ''efl.log_print''. It will call the function defined in ''efl.log_print_cb_set'', defaulting to a function that will print to the stderr. You can pass many options to ''log_print'' to control the output. --
[EGIT] [website/www-content] master 30/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e287a58297c31fa9ef73e1729423265919165357 commit e287a58297c31fa9ef73e1729423265919165357 Author: Lauro MouraDate: Fri Dec 4 06:53:27 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 029421c..bfa6e05 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -496,7 +496,7 @@ function mycallback(domain, color, level, filename function, line, message) { } efl.setLogPrintCb(callback); -efl.logCritical("Kaboom"); // Calls mycallback if efl.LOG_LEVEL_CRITICAL is a triggering level. +efl.logWarning("Kaboom"); // Calls mycallback if efl.LOG_LEVEL_WARN is a triggering level. === unregisterLogDomain(domainId) === --
[EGIT] [website/www-content] master 25/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=468140867323ac08e8e9a538f5fca7b7d3ba2bd9 commit 468140867323ac08e8e9a538f5fca7b7d3ba2bd9 Author: Lauro MouraDate: Thu Dec 3 11:50:31 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index c64c529..d4f9f00 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -63,8 +63,8 @@ A number of environment variables affect the behavior of the log module. These a * ''EINA_LOG_COLOR_DISABLE'' - If true, color printing is disabled. See ''efl.setLogColorDisable''. * ''EINA_LOG_FILE_DISABLE'' - If true, filename in the messages is disabled. See ''efl.setLogFileDisable''. * ''EINA_LOG_FUNCTION_DISABLE'' - If true, function name in the messages is disabled. See ''efl.setLogFunctionDisable''. - * ''EINA_LOG_LEVEL'' - - * ''EINA_LOG_LEVELS'' - + * ''EINA_LOG_LEVEL'' - The least severe level that will trigger log events to be shown. Can be overriden in ''efl.setLogLevel''. + * ''EINA_LOG_LEVELS'' - Works like ''EINA_LOG_LEVEL'', but on a per-domain basis. Can be overriden for each domain in ''efl.setLogDomainLevel'' and ''efl.setLogDomainRegisteredLevel''. Functions --
[EGIT] [website/www-content] master 08/40: Wiki page freebsd-start changed with summary [] by Christopher Petrik
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=637eb46cb69bab9b381af6ccc015f13df6d54fcd commit 637eb46cb69bab9b381af6ccc015f13df6d54fcd Author: Christopher PetrikDate: Tue Dec 1 01:40:14 2015 -0800 Wiki page freebsd-start changed with summary [] by Christopher Petrik --- pages/distros/freebsd-start.txt | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pages/distros/freebsd-start.txt b/pages/distros/freebsd-start.txt index f61a9c0..efc99d0 100644 --- a/pages/distros/freebsd-start.txt +++ b/pages/distros/freebsd-start.txt @@ -1,4 +1,3 @@ -{{http://grid.bsdjunk.com/~chris/images/logo-full-thumb.png}}{{http://grid.bsdjunk.com/~chris/images/icon-enlightenment.png}} ~~Title: EFL on FreeBSD~~ FreeBSD and E/EFL @@ -13,10 +12,10 @@ Enlightenment and EFL are available for multiple versions of FreeBSD: Enlightenment on FreeBSD only has the latest release version currently this is: ^ Name ^ Version ^ Submited Update ^ -| Enlightenment | 0.19.7 | Latest | -| EFL | 1.15.0 | Latest | -| Elementary | 1.15.0 | Latest| -| Terminology | 0.8.8 | Latest | +| Enlightenment | 0.19.13 | Latest | +| EFL | 1.16.0 | Latest | +| Elementary | 1.16.0 | Latest| +| Terminology | 0.9.1 | Latest | Installation The way to install Enlightenment is the same between those distributions, --
[EGIT] [website/www-content] master 36/40: Wiki page value changed with summary [created] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=abb6e0c536e07eb9e9c865bfc60e900ea51347f6 commit abb6e0c536e07eb9e9c865bfc60e900ea51347f6 Author: Lauro MouraDate: Fri Dec 4 14:11:12 2015 -0800 Wiki page value changed with summary [created] by Lauro Moura --- pages/api/javascript/eina/value.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/pages/api/javascript/eina/value.txt b/pages/api/javascript/eina/value.txt new file mode 100644 index 000..316650f --- /dev/null +++ b/pages/api/javascript/eina/value.txt @@ -0,0 +1,6 @@ +== Javascript binding API - Generic value storage == + +[[api::javascript::eina|Back to the JS Eina page]] + +Eina provides a way to abstract the storage of generic values in an extensible and efficient way, aimed at simple data types. + --
[EGIT] [website/www-content] master 06/40: Wiki page containers changed with summary [Methods now in alphabetical order] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=34a88264b984bfd8abc55e45153618c12d63c290 commit 34a88264b984bfd8abc55e45153618c12d63c290 Author: Lauro MouraDate: Mon Nov 30 14:54:35 2015 -0800 Wiki page containers changed with summary [Methods now in alphabetical order] by Lauro Moura --- pages/api/javascript/eina/containers.txt | 164 +++ 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt index 39b7d53..866baf9 100644 --- a/pages/api/javascript/eina/containers.txt +++ b/pages/api/javascript/eina/containers.txt @@ -30,36 +30,21 @@ The constructor functions receive the name of the type that will be stored on th The methods and operations below are supported for both types of sequences. -=== push(value) === +=== concat(container) === Syntax -var size = obj.push(item) +var new_container = objA.concat(objC); -Works like the Javascript ''Array.push(item)'', appending the item to the end of the sequence. For lists, a new node is created at the end. For Arrays, the item is set to the end of the array, and it may grow as needed. - -The method returns the size of the container after adding the new element. - -Usage example: - - -var mylist = new efl.List("int"); -mylist.push(3); -var myarray = new efl.Array("string"); -var new_size = myarray.push("Foobar"); - +Concatenates two containers returning the result as a new container object. It performs a shallow copy of the container. Object **references** are copied (i.e. changes in the object will appear in both containers) and basic types are copied. -Although Javascript is weak typed, the binding functions are rather strong typed, doing minimal type conversions, like int to floats. Trying to push an element of a different type from the one provided in the constructor will raise TypeError. - -var obj = new efl.List("float"); -obj.push("44"); // CRASH - +The concatenation operation will work only on the same type of containers (e.g. lists of ints with lists of ints). Wrong arguments will raise TypeError. -=== container[index] === +=== getter: container[index] === Syntax @@ -80,38 +65,62 @@ mylist[0] // Gets the first element. Trying to access an element with an index out of bounds will return ''undefined''. -=== container[index] = value === +=== indexOf(target) === Syntax -obj[index] = value; -var v = (obj[index] = value); +var index = obj.indexOf(target); -Works like Javascript indexed setter method. It sets the value at the given index to the given value, //generally// not changing the container size (see note below). On success, the operation returns the value recently set. +Searches for ''target'' in the container and returns the index if found. If not found, return -1. + +Example usage: - -Trying to set a value at an index equal or larger than the size of the container will extend the container up to that index and fill value up to the last one with ''undefined'', and setting the given value in the last position. -var obj = new efl.List("int"); -obj[42] = 42; // Obj now has 42 undefined's leading up to 42 in the last position. +// obj = [100, 42, 55, 42] +var idx = obj.indexOf(42); // idx = 1 +var idx2 = obj.indexOf(1000); // idx2 = -1 - -Usage example: +=== lastIndexOf(target) === + +Syntax -var obj = new efl.List("int"); -obj.push(3) // [3] -obj.push(2) // [3,2] -obj[0] = 42; // [42, 2] +var index = obj.lastIndexOf(target); - -As with pushing elements, trying to push an element of a different type from the one given to the constructor will raise TypeError. +Searches backwards for ''target'', returning its index if found, or -1 otherwise. + +Example code: + + +// obj = [100, 42, 55, 42] +var idx = obj.lastIndexOf(42) // idx = 3 +var idx2 = obj.lastIndexOf(0) // idx2 = -1 + + +=== length property === + +Syntax + + +obj.length + + +Returns the number of elements on this container. + + +In pure Javascript Arrays, assigning a number smaller than the size of the container to the length property will delete elements from the container. This behavior is **not** present on eina Arrays or Lists. Trying to assign a number to length will have no effect. +Example usage: + + +var last = obj[obj.length - 1] + + === pop() === Syntax @@ -132,48 +141,65 @@ var value = obj.pop(); // value now is 5 and obj is [1,2,3,4] Trying to pop an item from an empty list will return undefined and leave the list empty. -=== length property === +=== push(value) === Syntax -obj.length +var size = obj.push(item) -Returns the number of elements on this container. +Works like the Javascript ''Array.push(item)'', appending the item to the end of the sequence. For lists, a new node is created at the end. For Arrays, the item is set to the
[EGIT] [website/www-content] master 21/40: Wiki page eina changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=6d9471760bb7766e8ee493a902013a0ec8ffd06b commit 6d9471760bb7766e8ee493a902013a0ec8ffd06b Author: Lauro MouraDate: Wed Dec 2 13:53:40 2015 -0800 Wiki page eina changed with summary [] by Lauro Moura --- pages/api/javascript/eina.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/api/javascript/eina.txt b/pages/api/javascript/eina.txt index 7319b7c..eec8d00 100644 --- a/pages/api/javascript/eina.txt +++ b/pages/api/javascript/eina.txt @@ -1,5 +1,7 @@ == Javascript binding API - Eina - Data types and tools == +[[api:javascript|Back to the JS EFL page]] + The Eina library provides a number of data types and tools targeted at working with the remainder of the EFL framework although they can be used on their own. For example, Lists and Arrays can be used both to send collections of objects to a native function or get the result of a native function. Or someone can use just the logging facilities. = Data types = --
[EGIT] [website/www-content] master 28/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c2424f02389a9d2bb9ef12738dc9cedb75450f47 commit c2424f02389a9d2bb9ef12738dc9cedb75450f47 Author: Lauro MouraDate: Fri Dec 4 06:49:18 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 56 +++ 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 3b8e323..0caa50a 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -325,6 +325,12 @@ Syntax var domainId = efl.registerLogDomain(domainname, color); +Parameters + + * domainname - A string with the name of the new domain + * color - A string with a color description according to [[http://misc.flogisoft.com/bash/tip_colors_and_formatting|VT]] specs. Usually one of the ''efl.COLOR_*'' constants. + + Registers a new domain with name ''name'' and color ''color''. The returned id will be used to reference the domain on the other log functions. If a negative number is returned, a log event occurred. Example usage @@ -333,7 +339,7 @@ Example usage var myid = efl.registerLogDomain("mydomain", efl.COLOR_CYAN); -=== setLogAbortOnCritical(...) === +=== setLogAbortOnCritical(boolvar) === Syntax @@ -341,23 +347,27 @@ Syntax efl.setLogAbortOnCritical(boolvar); +Parameters + + * boolvar - Flag indicating if the program should terminate if a message of the configured level occurs. + Sets whether the program should terminate upon a logging event with a level at least of the same severity of ''efl.getLogAbortOnCriticalLevel''. Upon initializaton, it takes the value from the environment variable ''EINA_LOG_ABORT''. -=== setLogAbortOnCriticalLevel(boolvar) === +=== setLogAbortOnCriticalLevel(level) === Syntax -efl.setLogAbortOnCritical(boolvar); +efl.setLogAbortOnCritical(level); Parameters - - + * level - An integer with the target level. Usually one of the ''efl.LOG_LEVEL_*'' constants. Sets the minimal message level the program should check if it should abort. Messages less severe than ''level'' are ignored for this check. @@ -373,6 +383,10 @@ Syntax efl.setLogColorDisable(boolvar); +Parameters + + * boolvar - Flag indicating if the color should be disabled. + Sets whether the colored logging should be disabled or not. === setLogDomainLevel(domainname, level) === @@ -383,6 +397,11 @@ Syntax efl.setLogDomainLevel(name, level); +Parameters + + * name - The name of the target domain. + * level - An integer with the target level. Usually one of the ''efl.LOG_LEVEL_*'' constants. + Sets the trigger level for a given domain with name ''name''. It works like setting the environment variable ''EINA_LOG_LEVELS=:''. If the domain name was not registered before, it is marked as a pending set and is applied upon registration. @@ -395,6 +414,11 @@ Syntax efl.setLogDomainRegisteredLevel(name, level); +Parameters + + * name - The name of a previously registered domain. + * level - An integer with the target level. Usually one of the ''efl.LOG_LEVEL_*'' constants. + Sets the trigger level for a given domain with name ''name''. It's a much faster version of ''efl.setLogDomainLevel'', requiring a previously registered domain. === setLogFileDisable(bool) === @@ -405,7 +429,11 @@ Syntax efl.setLogFileDisable(boolvar); -Sets whether the file name logging should be disabled or not. +Parameters + + * boolvar - Flag indicating if the filename should be disabled. + +Sets whether the filename logging should be disabled or not. === setLogFunctionDisable(enable) === @@ -415,6 +443,10 @@ Syntax efl.setLogFunctionDisable(boolvar); +Parameters + + * boolvar - Flag indicating if the function name should be disabled. + Sets whether the function name logging should be disabled or not. === setLogLevel(level) === @@ -425,6 +457,10 @@ Syntax efl.setLogLevel(level); +Parameters + + * level - An integer with the target level. Usually one of the ''efl.LOG_LEVEL_*'' constants. + Sets the default level for log events. Messages less severe (higher numerical value) that ''level'' will be ignored. @@ -440,6 +476,10 @@ function callback(){...} efl.setLogPrintCb(callback); +Parameters + + * callback - A function receiving the following arguments, in order: The domain name (string), the color (string), the level (integer), the file name (string), the function (string), the line number (integer) and the log message (string). + Sets the callback that will be called whenever a log command would be executed, i.e., above or equal to the current log level, is called. It receives as arguments the domain, output color, level, filename, function and line number of the call,
[EGIT] [website/www-content] master 10/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c42fc77485f3cac4613713bac86e0d19af09cfec commit c42fc77485f3cac4613713bac86e0d19af09cfec Author: Lauro MouraDate: Wed Dec 2 08:16:34 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 42 +++ 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index d3c7a2f..a1741f0 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -20,6 +20,8 @@ The log levels are ranked according to their usual severity. Critical errors can * ''efl.LOG_LEVEL_INFO'' * ''efl.LOG_LEVEL_DBG'' +The levels are also ordered numerically, with the most severe (CRITICAL) being the smallest value and the least severe (DBG) the largest value. + === State === The states are used in ''efl.logTiming'' to indicate transitions in phases for a given domain. @@ -35,13 +37,45 @@ By default, Eina offers a global domain to be used by the application. Functions -=== checkLogLevel(...) === +=== checkLogLevel(level) === + +Syntax + + +var willBeLogged = efl.checkLogLevel(level); + + +Checks whether the given log level will be logged or ignored. The ''level'' argument must be one of the given log level constants (see above). + +=== getLogAbortOnCritical() === + +Syntax + + +var willAbortOnCritical = efl.getLogAbortOnCritical(); + + +Returns ''true'' if events with level equal or smaller to ''efl.getLogAbortOnCriticalLevel()'' should abort the program. + +=== getLogAbortOnCriticalLevel() === + +Syntax + + +var abortLevel = efl.getLogAbortOnCriticalLevel(); + + +Returns the largest level that will trigger the program termination upon happening. Events most severe than the value returned also trigger termination. + +=== getLogColorDisable() === -=== getLogAbortOnCritical(...) === +Syntax -=== getLogAbortOnCriticalLevel(...) === + +var colorDisabled = efl.getLogColorDisable(); + -=== getLogColorDisable(...) === +Determines whether colors are disabled in the log messages. === getLogDomainLevel(...) === --
[EGIT] [website/www-content] master 20/40: Wiki page containers changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=3babd1aa429b19be3b5a1d3ee7816680553563e8 commit 3babd1aa429b19be3b5a1d3ee7816680553563e8 Author: Lauro MouraDate: Wed Dec 2 13:53:03 2015 -0800 Wiki page containers changed with summary [] by Lauro Moura --- pages/api/javascript/eina/containers.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt index d39698b..ac0d5ca 100644 --- a/pages/api/javascript/eina/containers.txt +++ b/pages/api/javascript/eina/containers.txt @@ -1,5 +1,7 @@ == Javascript binding API - Eina Containers == +[[api::javascript::eina|Back to the JS Eina page]] + Currently, two data types are available: Lists and Arrays. Both represent a sequence of items and aim to have a similar interface to the native [[https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Array|Javascript Arrays]] for the most common operations like push/pop and indexed get/set. One important limitation is that when you create an Eina collection you must pass the type of object that will be stored. This is required to allow the binding do the correct conversion between Javascript types and C/C++ types due to the former's static nature. --
[EGIT] [website/www-content] master 40/40: Wiki page docs changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c04749a93cd8ed113f5d8f7ee923653bb2b5b05d commit c04749a93cd8ed113f5d8f7ee923653bb2b5b05d Author: RasterDate: Mon Dec 7 03:54:48 2015 -0800 Wiki page docs changed with summary [] by Raster --- pages/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/docs.txt b/pages/docs.txt index 6e8f79a..718cce0 100644 --- a/pages/docs.txt +++ b/pages/docs.txt @@ -22,7 +22,7 @@ course you can use stable packages for your distribution as well. * [[distros/opensuse-start|EFL on OpenSUSE]] * [[distros/yocto-start|EFL on Yocto]] -=== Working with EFL and code === +=== Working with EFL and Code === * [[docs/c/start|A basic primer on C]] * [[docs/efl/start|Get started with EFL]] --
[EGIT] [website/www-content] master 18/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=88be9956b859f1494ca86fa2a1ae7fcbe79013be commit 88be9956b859f1494ca86fa2a1ae7fcbe79013be Author: Lauro MouraDate: Wed Dec 2 13:37:34 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 60 +-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index ea5c20e..e3c102e 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -54,7 +54,7 @@ The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_form Environment Variables -A number of environment variables. +A number of environment variables affect the behavior of the log module. (WIP) Functions @@ -66,6 +66,14 @@ Syntax var willBeLogged = efl.checkLogLevel(level); +Parameters + + * level - An integer (usually one of the level constants) representing the target log level. + +Return value + + * boolean - True if the level is an active log level. + Checks whether the given log level will be logged or ignored. The ''level'' argument must be one of the given log level constants (see above). === getLogAbortOnCritical() === @@ -76,6 +84,10 @@ Syntax var willAbortOnCritical = efl.getLogAbortOnCritical(); +Return value + + * boolean - True if will abort on critical. + Returns ''true'' if events with level equal or smaller to ''efl.getLogAbortOnCriticalLevel()'' should abort the program. === getLogAbortOnCriticalLevel() === @@ -86,7 +98,11 @@ Syntax var abortLevel = efl.getLogAbortOnCriticalLevel(); -Returns the largest level that will trigger the program termination upon happening. Events most severe than the value returned also trigger termination. +Return type + + * integer - The least severe level that will trigger termination. + +Returns the least severe (smaller numerically) level that will trigger the program termination upon happening. Events most severe than the value returned also trigger termination. === getLogColorDisable() === @@ -96,6 +112,10 @@ Syntax var colorDisabled = efl.getLogColorDisable(); +Return type + + * boolean - True if color logging is disabled. + Determines whether colors are disabled in the log messages. === getLogDomainLevel(domain) === @@ -106,6 +126,14 @@ Syntax var level = efl.getLogDomainLevel(domain); +Parameters + + * domain - A string with the name of the target level. + +Return type + + * integer - The level associated to the given domain. + Gets the domain level given its name. If the domain was not yet registered through ''efl.registerLogDomain'' but is pending after a previous ''efl.setLogDomainLevel'' call or the environment variable ''EINA_LOG_LEVELS'', the respective value is returned. If nothing else was found, the default level from ''efl.getLogLevel'' is returned. === getLogDomainRegisteredLevel(name) === @@ -116,6 +144,14 @@ Syntax var level = efl.getLogDomainRegisteredLevel(domain); +Parameters + + * domain - A string with the name of the target level. + +Return type + + * integer - The level associated to the given domain. + Gets the level for the given domain. Works much faster than ''efl.getLogDomainLevel'' but relies on the domain being previously registered with ''efl.registerLogDomain''. === getLogFileDisable() === @@ -126,6 +162,10 @@ Syntax var isFileDisabled = efl.getLogFileDisabled(); +Return type + + * boolean - True if the filename in the log is disabled. + Returns whether the originating file name is disabled from log messages. === getLogFunctionDisable() === @@ -136,6 +176,10 @@ Syntax var isFunctionDisabled = efl.getLogFunctionDisabled(); +Return type + + * boolean - True if the function name is disabled in logging messages. + Returns whether the originating function name is disabled from log messages. === getLogLevel() === @@ -146,6 +190,10 @@ Syntax var default_level = efl.getLogLevel(); +Return type + + * integer - The default level of the logging system. Usually one of the ''efl.LOG_LEVEL*'' constants. + Returns the default log level. Messages above this level will be ignored by ''efl.logPrint''. === logCritical(message) === @@ -156,6 +204,10 @@ Syntax efl.logCritical(message); +Parameters + + * message - The string to be logged. + Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_CRITICAL'' to the global domain. === logDebug(message) === @@ -166,6 +218,10 @@ Syntax efl.logDebug(message); +Parameters + + * message - The string to be logged. + Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_DBG'' to the global domain. === logError(message) === --
[EGIT] [website/www-content] master 05/40: Wiki page containers changed with summary [Added index of] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e71d7ab0a05baad8a7c68bed14e626fb08226618 commit e71d7ab0a05baad8a7c68bed14e626fb08226618 Author: Lauro MouraDate: Mon Nov 30 14:05:45 2015 -0800 Wiki page containers changed with summary [Added index of] by Lauro Moura --- pages/api/javascript/eina/containers.txt | 36 1 file changed, 36 insertions(+) diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt index ababf6d..39b7d53 100644 --- a/pages/api/javascript/eina/containers.txt +++ b/pages/api/javascript/eina/containers.txt @@ -196,4 +196,40 @@ Example usage: var same = obj.slice() // All elements from obj are in the returned container. var other = obj.slice(1); // Everything but the first element. var another = obj.slice (4, 10); // From the fifth element to the tenth. + + +=== indexOf(target) === + +Syntax + + +var index = obj.indexOf(target); + + +Searches for ''target'' in the container and returns the index if found. If not found, return -1. + +Example usage: + + +// obj = [100, 42, 55, 42] +var idx = obj.indexOf(42); // idx = 1 +var idx2 = obj.indexOf(1000); // idx2 = -1 + + +=== lastIndexOf(target) === + +Syntax + + +var index = obj.lastIndexOf(target); + + +Searches backwards for ''target'', returning its index if found, or -1 otherwise. + +Example code: + + +// obj = [100, 42, 55, 42] +var idx = obj.lastIndexOf(42) // idx = 3 +var idx2 = obj.lastIndexOf(0) // idx2 = -1 \ No newline at end of file --
[EGIT] [website/www-content] master 35/40: Wiki page containers changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=395a7c9e14a737f1d18ea58a6a35e05dfa445e84 commit 395a7c9e14a737f1d18ea58a6a35e05dfa445e84 Author: Lauro MouraDate: Fri Dec 4 11:58:00 2015 -0800 Wiki page containers changed with summary [] by Lauro Moura --- pages/api/javascript/eina/containers.txt | 80 +++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt index ac0d5ca..b534d44 100644 --- a/pages/api/javascript/eina/containers.txt +++ b/pages/api/javascript/eina/containers.txt @@ -21,6 +21,14 @@ new efl.List(typename); new efl.Array(typename); +Parameters + + * typename - A string with the type of the contained items for this container. + +Return type + + * Array/List - A newly created container, empty. + The constructor functions receive the name of the type that will be stored on the container. The following types are supported using the respective type name: * Integers - "int" @@ -40,6 +48,14 @@ Syntax var new_container = objA.concat(objC); +Parameters + + * container - A container of the same type of the callee container, including the contained type. + +Return type + + * Array/List - A container of the same type of the callee. + Concatenates two containers returning the result as a new container object. @@ -58,6 +74,14 @@ Syntax var myvar = obj[index]; +Parameters + + * index - An integer with the 0-based index desired. + +Return type + + * T or ''undefined'' - When calling on a container wrapping items of type T. ''undefined'' if no object on that index. + Works like Javascript Array ''[]'' operators. The items are 0-indexed, with the first element at index 0 and the last element with index equal to the number of elements of the sequence minus 1. Usage example: @@ -79,6 +103,14 @@ Syntax var index = obj.indexOf(target); +Parameters + + * target - An object/item to search for. + +Return type + + * integer - The index of the item in the container. -1 if not found. + Searches for ''target'' in the container and returns the index if found. If not found, return -1. Example usage: @@ -97,6 +129,14 @@ Syntax var index = obj.lastIndexOf(target); +Parameters + + * target - An object/item to search for. + +Return type + + * integer - The last index of the item in the container. -1 if not found. + Searches backwards for ''target'', returning its index if found, or -1 otherwise. Example code: @@ -115,6 +155,10 @@ Syntax obj.length +Return type + + * integer - The number of elements on this container. + Returns the number of elements on this container. @@ -135,6 +179,10 @@ Syntax var value = obj.pop(); +Return type + + * T or ''undefined'' - For containers wrapping items of type T. ''undefined'' if it was an empty space or the container was empty. + Behaves like Javascript ''Array.pop()'', removing the last element of the list and returning it. Example code: @@ -155,6 +203,14 @@ Syntax var size = obj.push(item) +Parameters + + * item - An object/item to append to the container. + +Return type + + * integer - The size of the container after pushing. + Works like the Javascript ''Array.push(item)'', appending the item to the end of the sequence. For lists, a new node is created at the end. For Arrays, the item is set to the end of the array, and it may grow as needed. The method returns the size of the container after adding the new element. @@ -185,6 +241,15 @@ obj[index] = value; var v = (obj[index] = value); +Parameters + + * index - An integer with the target slot on the container. + * value - An object/item to be set to the target position. + +Return type + + * object - The same object that was assigned (''value''). + Works like Javascript indexed setter method. It sets the value at the given index to the given value, //generally// not changing the container size (see note below). On success, the operation returns the value recently set. @@ -218,7 +283,16 @@ var y = obj.slice(startIndex); var z = obj.slice(startIndex, endIndex); -The slice method retrieves portions of the container. The first argument is the index to start the slice operation (default is 0, beginning of the list) and the second argument indicates the index where the extraction should stop, not including it (defaults to the container size). +Parameters + + * begin - An integer with the index of the start of the slice. + * end - An integer with the index of the end of the slice. + +Return type + + * container - A container of the same type of the callee. + +The slice method retrieves portions of the container. The first argument is the index to start the slice operation (default is 0, beginning of the list) and the second argument indicates the index
[EGIT] [website/www-content] master 23/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=97cf0f563c2a1d2e7e1c3af3cb50092520039706 commit 97cf0f563c2a1d2e7e1c3af3cb50092520039706 Author: Lauro MouraDate: Thu Dec 3 08:05:26 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index e650f48..203077b 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -56,7 +56,7 @@ The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_form Environment Variables -A number of environment variables affect the behavior of the log module. (WIP) +A number of environment variables affect the behavior of the log module. Functions @@ -291,9 +291,9 @@ Parameters * domainId - The id of the target domain * state - State indicating if we are starting or stopping a phase. - * phase - The phase of the name to be used in the log. + * phase - The name of the phase. -Starts or stop the timing of a phase. +Starts or stop the timing of a phase. If given ''efl.LOG_STATE_START'', it assumes the previously started phase has stopped. === logWarning(message) === --
[EGIT] [website/www-content] master 31/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b9d195a02c40f5b49779003c0e8245390e5b9eec commit b9d195a02c40f5b49779003c0e8245390e5b9eec Author: Lauro MouraDate: Fri Dec 4 06:54:05 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index bfa6e05..55fc9ad 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -472,7 +472,7 @@ Upon initialization, the default level is set to the value from the environment Syntax -function callback(name, color, level, file, function, line, message){...} +function callback(name, color, level, file, func, line, message){...} efl.setLogPrintCb(callback); --
[EGIT] [website/www-content] master 01/40: Wiki page containers changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=82329b71f8f7040380ebf12265bc51f73b88317a commit 82329b71f8f7040380ebf12265bc51f73b88317a Author: Lauro MouraDate: Mon Nov 30 12:01:27 2015 -0800 Wiki page containers changed with summary [] by Lauro Moura --- pages/api/javascript/eina/containers.txt | 25 ++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt index ba786b5..cde5521 100644 --- a/pages/api/javascript/eina/containers.txt +++ b/pages/api/javascript/eina/containers.txt @@ -170,8 +170,27 @@ Syntax var new_container = objA.concat(objC); -Concatenates two containers returning the result as a new container object. +Concatenates two containers returning the result as a new container object. It performs a shallow copy of the container. Object **references** are copied (i.e. changes in the object will appear in both containers) and basic types are copied. -The concatenation operation will work only on the same type of containers (e.g. lists of ints with lists of ints). - \ No newline at end of file +The concatenation operation will work only on the same type of containers (e.g. lists of ints with lists of ints). Wrong arguments will raise TypeError. + + +=== slice([begin,[end]]) === + +Syntax + + +var x = obj.slice(); +var y = obj.slice(startIndex); +var z = obj.slice(startIndex, endIndex); + + +The slice method retrieves portions of the container. The first argument is the index to start the slice operation (default is 0, beginning of the list) and the second argument indicates the index where the extraction should stop, not including it (defaults to the container size). + +It also performs a shallow copy like concat(). + +Example usage: + + + \ No newline at end of file --
[EGIT] [website/www-content] master 12/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ed09316649014e56d3137d98cd41d8b2b58116d5 commit ed09316649014e56d3137d98cd41d8b2b58116d5 Author: Lauro MouraDate: Wed Dec 2 11:07:50 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 27 +++ 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 5e92631..af49922 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -80,12 +80,12 @@ var colorDisabled = efl.getLogColorDisable(); Determines whether colors are disabled in the log messages. -=== getLogDomainLevel(domainname) === +=== getLogDomainLevel(domain) === Syntax -var level = efl.getLogDomainLevel(domainname); +var level = efl.getLogDomainLevel(domain); Gets the domain level given its name. If the domain was not yet registered through ''efl.registerLogDomain'' but is pending after a previous ''efl.setLogDomainLevel'' call or the environment variable ''EINA_LOG_LEVELS'', the respective value is returned. If nothing else was found, the default level from ''efl.getLogLevel'' is returned. @@ -95,7 +95,7 @@ Gets the domain level given its name. If the domain was not yet registered throu Syntax -var level = efl.getLogDomainRegisteredLevel(domainname); +var level = efl.getLogDomainRegisteredLevel(domain); Gets the level for the given domain. Works much faster than ''efl.getLogDomainLevel'' but relies on the domain being previously registered with ''efl.registerLogDomain''. @@ -228,7 +228,7 @@ function callback(){...} efl.setLogPrintCb(callback); -Sets the callback that will be called whenever a log command that would be executed, i.e., above or equal to the current log level. It receives as arguments the domain, output color, level, filename, function and line number of the call, and finally the message. It allows further customization of the output. +Sets the callback that will be called whenever a log command would be executed, i.e., above or equal to the current log level, is called. It receives as arguments the domain, output color, level, filename, function and line number of the call, and finally the message. It allows further customization of the output. If not set, EFL defaults the output to the standard error output, like this: @@ -236,4 +236,23 @@ If not set, EFL defaults the output to the standard error output, like this: ''CRI<30206>: /home/user/dev/myapp/main.js:254 () MessageFrom logPrint'' +Example usage + + +function mycallback(domain, color, level, filename function, line, message) { +// Save log to file, print, etc. +} + +efl.setLogPrintCb(callback); +efl.logCritical("Kaboom"); // Calls mycallback if efl.LOG_LEVEL_CRITICAL is a triggering level. + + === unregisterLogDomain(...) === + +Syntax + + +efl.unregisterDomain(domain); + + +Forgets about a logging domain registered from ''efl.registerLogDomain''. \ No newline at end of file --
[EGIT] [website/www-content] master 24/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b44dcfb6f2738bd47111cda83ce256c027908799 commit b44dcfb6f2738bd47111cda83ce256c027908799 Author: Lauro MouraDate: Thu Dec 3 11:27:11 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 203077b..c64c529 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -56,7 +56,15 @@ The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_form Environment Variables -A number of environment variables affect the behavior of the log module. +A number of environment variables affect the behavior of the log module. These are: + + * ''EINA_LOG_ABORT'' - If true, messages with severity of at least the same of the level returned from ''efl.getLogAbortOnCriticalLevel'' or in ''EINA_LOG_ABORT_LEVEL'' will trigger program termination. Can be overriden through ''efl.setLogAbortOnCritical''. + * ''EINA_LOG_ABORT_LEVEL'' - The least severe level that can trigger program termination. Can be overriden through ''efl.setLogAbortOnCriticalLevel''. + * ''EINA_LOG_COLOR_DISABLE'' - If true, color printing is disabled. See ''efl.setLogColorDisable''. + * ''EINA_LOG_FILE_DISABLE'' - If true, filename in the messages is disabled. See ''efl.setLogFileDisable''. + * ''EINA_LOG_FUNCTION_DISABLE'' - If true, function name in the messages is disabled. See ''efl.setLogFunctionDisable''. + * ''EINA_LOG_LEVEL'' - + * ''EINA_LOG_LEVELS'' - Functions --
[EGIT] [website/www-content] master 29/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=00e7081dd5fc5d48cdb8b4eb13e8b1283ee8466a commit 00e7081dd5fc5d48cdb8b4eb13e8b1283ee8466a Author: Lauro MouraDate: Fri Dec 4 06:52:11 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 0caa50a..029421c 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -472,7 +472,7 @@ Upon initialization, the default level is set to the value from the environment Syntax -function callback(){...} +function callback(name, color, level, file, function, line, message){...} efl.setLogPrintCb(callback); --
[EGIT] [website/www-content] master 07/40: Wiki page containers changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=18cee0066e841d97ce2b98ed2a29e7acd504d69e commit 18cee0066e841d97ce2b98ed2a29e7acd504d69e Author: Lauro MouraDate: Mon Nov 30 15:19:10 2015 -0800 Wiki page containers changed with summary [] by Lauro Moura --- pages/api/javascript/eina/containers.txt | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pages/api/javascript/eina/containers.txt b/pages/api/javascript/eina/containers.txt index 866baf9..d39698b 100644 --- a/pages/api/javascript/eina/containers.txt +++ b/pages/api/javascript/eina/containers.txt @@ -1,10 +1,10 @@ == Javascript binding API - Eina Containers == -Currently, two data types are available: Lists and Arrays. Both represent a sequence of items and aim to have a similar interface to the native for the most common operations, like push/pop and indexed get/set. +Currently, two data types are available: Lists and Arrays. Both represent a sequence of items and aim to have a similar interface to the native [[https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Array|Javascript Arrays]] for the most common operations like push/pop and indexed get/set. One important limitation is that when you create an Eina collection you must pass the type of object that will be stored. This is required to allow the binding do the correct conversion between Javascript types and C/C++ types due to the former's static nature. -Besides the constructor function, they differ in the way the items are stored underneath. ''efl.List'' are doubly-linked lists, with relatively fast insert/delete operations in the middle of the collection while ''efl.Array'' objects are contiguous memory arrays, with fast data access (compared to Lists) but costly to insert or delete items in the middle of the collection. +Besides the constructor function, they differ in the way the items are stored underneath. ''efl.List'' are doubly-linked lists, with relatively fast insert/delete operations while ''efl.Array'' objects are contiguous memory regions, with fast data access (compared to Lists) but allowing to insert or delete items only at the extremities of the container. Apart from the constructors, both containers have the exact same API. @@ -38,7 +38,11 @@ Syntax var new_container = objA.concat(objC); -Concatenates two containers returning the result as a new container object. It performs a shallow copy of the container. Object **references** are copied (i.e. changes in the object will appear in both containers) and basic types are copied. +Concatenates two containers returning the result as a new container object. + + +It performs a shallow copy of the container. Object **references** are copied (i.e. changes in the object will appear in both containers) and basic types are copied. + The concatenation operation will work only on the same type of containers (e.g. lists of ints with lists of ints). Wrong arguments will raise TypeError. --
[EGIT] [website/www-content] master 39/40: Wiki page about changed with summary [stick "in" together] by benaryorg
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ff0eae0db94ac4be7ea573cbeab99cd0b63eada1 commit ff0eae0db94ac4be7ea573cbeab99cd0b63eada1 Author: benaryorgDate: Mon Dec 7 03:05:07 2015 -0800 Wiki page about changed with summary [stick "in" together] by benaryorg --- pages/about.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/about.txt b/pages/about.txt index 4243bfe..f1fb856 100644 --- a/pages/about.txt +++ b/pages/about.txt @@ -177,8 +177,8 @@ See [[about-rage|the Rage page]] for more details. EDI is a development environment designed for and built using the EFL. Our aim is to create a new, native development environment for Linux that makes getting up and running easier than ever before. With so much happening on Linux -both on the desktop and on mobile we want to help more developers get involved i -n the exciting future of open source development. +both on the desktop and on mobile we want to help more developers get involved +in the exciting future of open source development. See [[about-edi|the EDI page]] for more details. --
[EGIT] [website/www-content] master 33/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=cbcdf73f8122049166648cd061d2928d2552c356 commit cbcdf73f8122049166648cd061d2928d2552c356 Author: Lauro MouraDate: Fri Dec 4 10:39:39 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index fb69ad8..b995c8f 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -6,8 +6,6 @@ The Eina framework provides a comprehensive system to manage logging events in y The main workhorse is ''efl.log_print''. It will call the function defined in ''efl.log_print_cb_set'', defaulting to a function that will print to the stderr. You can pass many options to ''log_print'' to control the output. -Log domains are used to group messages, like messages from different modules, different features, etc. You can filter domains by means of log levels through ''efl.log_domain_level_set''. By default, the only domain available is ''efl.LOG_DOMAIN_GLOBAL''. They are represented by a name that you pass to ''efl.registerLogDomain'' and an id (integer) that it returns. - Levels customize the amount of actual output that will be produced and can be used to abort the execution if a given level message appears. Constants @@ -33,6 +31,8 @@ The states are used in ''efl.logTiming'' to indicate transitions in phases for a === Domain === +Log domains are used to group messages, like messages from different modules, different features, etc. You can filter domains by means of log levels through ''efl.log_domain_level_set''. They are represented by a name that you pass to ''efl.registerLogDomain'' and an id (integer) that it returns. + By default, Eina offers a global domain to be used by the application. * ''efl.LOG_DOMAIN_GLOBAL'' --
[EGIT] [website/www-content] master 32/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f83f47edc3634f389544034400165817766d8461 commit f83f47edc3634f389544034400165817766d8461 Author: Lauro MouraDate: Fri Dec 4 06:54:58 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 55fc9ad..fb69ad8 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -491,7 +491,7 @@ If not set, EFL defaults the output to the standard error output, like this: Example usage -function mycallback(domain, color, level, filename function, line, message) { +function mycallback(domain, color, level, file, func, line, message) { // Save log to file, print, etc. } --
[EGIT] [website/www-content] master 27/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=51ae3315de5c109f8f3635ac3f80322e918356d6 commit 51ae3315de5c109f8f3635ac3f80322e918356d6 Author: Lauro MouraDate: Thu Dec 3 13:18:37 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 6cf00f5..3b8e323 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -14,7 +14,7 @@ Levels customize the amount of actual output that will be produced and can be us === Levels === -The log levels are ranked according to their usual severity. Critical errors can be configured to abort the application while debug messages are usually required only in development or triaging. In descending order of priority: +The log levels are ranked according to their usual severity. For example, critical errors can be configured to abort the application while debug messages are usually required only in development or triaging bugs. In descending order of severity: * ''efl.LOG_LEVEL_CRITICAL'' * ''efl.LOG_LEVEL_ERR'' @@ -58,7 +58,7 @@ The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_form A number of environment variables affect the behavior of the log module. These are: - * ''EINA_LOG_ABORT'' - If true, messages with severity of at least the same of the level returned from ''efl.getLogAbortOnCriticalLevel'' or in ''EINA_LOG_ABORT_LEVEL'' will trigger program termination. Can be overriden through ''efl.setLogAbortOnCritical''. + * ''EINA_LOG_ABORT'' - If true, messages with severity of at least the level returned from ''efl.getLogAbortOnCriticalLevel'' or in the environment variable ''EINA_LOG_ABORT_LEVEL'' will trigger program termination. Can be overriden through ''efl.setLogAbortOnCritical''. * ''EINA_LOG_ABORT_LEVEL'' - The least severe level that can trigger program termination. Can be overriden through ''efl.setLogAbortOnCriticalLevel''. * ''EINA_LOG_COLOR_DISABLE'' - If true, color printing is disabled. See ''efl.setLogColorDisable''. * ''EINA_LOG_FILE_DISABLE'' - If true, filename in the messages is disabled. See ''efl.setLogFileDisable''. --
[EGIT] [website/www-content] master 22/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=15ac7732b0f19fae8361b7adfc506341fad967cc commit 15ac7732b0f19fae8361b7adfc506341fad967cc Author: Lauro MouraDate: Wed Dec 2 14:03:18 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 25 - 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 1366d40..e650f48 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -39,7 +39,7 @@ By default, Eina offers a global domain to be used by the application. === Colors === -The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_formatting|terminal colors format]] to specify the color of the message. Currently, the following constants are exported as shortcuts: +The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_formatting|terminal colors format]] to specify the color of the message. Currently, the following string constants are exported as shortcuts: * ''efl.COLOR_LIGHTRED'' * ''efl.COLOR_RED'' @@ -210,7 +210,7 @@ Parameters * message - The string to be logged. -Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_CRITICAL'' to the global domain. +Helper wrapper around ''efl.logPrint'' that prints a message with ''efl.LOG_LEVEL_CRITICAL'' to the global domain. === logDebug(message) === @@ -224,7 +224,7 @@ Parameters * message - The string to be logged. -Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_DBG'' to the global domain. +Helper wrapper around ''efl.logPrint'' that prints a message with ''efl.LOG_LEVEL_DBG'' to the global domain. === logError(message) === @@ -234,7 +234,11 @@ Syntax efl.logError(message); -Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_ERR'' to the global domain. +Parameters + + * message - The String to be logged. + +Helper wrapper around ''efl.logPrint'' that prints a message with ''efl.LOG_LEVEL_ERR'' to the global domain. === logInfo(message) === @@ -244,7 +248,11 @@ Syntax efl.logInfo(message); -Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_INFO'' to the global domain. +Parameters + + * message - The string to be logged. + +Helper wrapper around ''efl.logPrint'' that prints a message with ''efl.LOG_LEVEL_INFO'' to the global domain. === logPrint(domain, level, message) === @@ -254,6 +262,12 @@ Syntax efl.logPrint(domain, level, message) +Parameters + + * domain - The id (integer) of the target domain. + * level - The severity level (integer) of the event. Usually one of the ''efl.LOG_LEVEL_*'' constants. + * message - The string to be logged. + Prints the string ''message'' related ''domain'' with severity ''level''. If ''level'' is of a lower severity (higher numerical value) than the value from ''efl.getLogLevel'', the call is ignored. For the global domain, you can use the helper functions ''efl.logCritical'', ''efl.logInfo'' and related. @@ -279,6 +293,7 @@ Parameters * state - State indicating if we are starting or stopping a phase. * phase - The phase of the name to be used in the log. +Starts or stop the timing of a phase. === logWarning(message) === --
[EGIT] [website/www-content] master 16/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=ad9caccce4a5c8f29fb9dbc150a720a86bb9d449 commit ad9caccce4a5c8f29fb9dbc150a720a86bb9d449 Author: Lauro MouraDate: Wed Dec 2 13:11:19 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 42 ++- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index d4bc85b..5b84378 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -4,7 +4,7 @@ The Eina framework provides a comprehensive system to manage logging events in y The main workhorse is ''efl.log_print''. It will call the function defined in ''efl.log_print_cb_set'', defaulting to a function that will print to the stderr. You can pass many options to ''log_print'' to control the output. -Log domains are used to group messages, like messages from different modules, different features, etc. You can filter domains by means of log levels through ''efl.log_domain_level_set''. By default, the only domain available is ''efl.LOG_DOMAIN_GLOBAL''. They are represented by a name that you pass to ''efl.registerDomain'' and an id (integer) that it returns. +Log domains are used to group messages, like messages from different modules, different features, etc. You can filter domains by means of log levels through ''efl.log_domain_level_set''. By default, the only domain available is ''efl.LOG_DOMAIN_GLOBAL''. They are represented by a name that you pass to ''efl.registerLogDomain'' and an id (integer) that it returns. Levels customize the amount of actual output that will be produced and can be used to abort the execution if a given level message appears. @@ -219,7 +219,21 @@ efl.logWarning(message); Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_WARN'' to the global domain. -=== registerLogDomain(...) === +=== registerLogDomain(name, color) === + +Syntax + + +var domainId = efl.registerLogDomain(domainname, color); + + +Registers a new domain with name ''name'' and color ''color''. The returned id will be used to reference the domain on the other log functions. If a negative number is returned, a log event occurred. + +Example usage + + +var myid = efl.registerLogDomain("mydomain", efl.COLOR_CYAN); + === setLogAbortOnCritical(...) === @@ -229,7 +243,7 @@ Syntax efl.setLogAbortOnCritical(boolvar); -Sets whether the program should terminate upon a logging event with level at least of the same severity of ''efl.getLogAbortOnCriticalLevel''. +Sets whether the program should terminate upon a logging event with a level at least of the same severity of ''efl.getLogAbortOnCriticalLevel''. Upon initializaton, it takes the value from the environment variable ''EINA_LOG_ABORT''. @@ -259,9 +273,27 @@ efl.setLogColorDisable(boolvar); Sets whether the colored logging should be disabled or not. -=== setLogDomainLevel(...) === +=== setLogDomainLevel(domainname, level) === + +Syntax + + +efl.setLogDomainLevel(name, level); + + +Sets the trigger level for a given domain with name ''name''. It works like setting the environment variable ''EINA_LOG_LEVELS=:''. + +If the domain name was not registered before, it is marked as a pending set and is applied upon registration. + +=== setLogDomainRegisteredLevel(domainname, level) === + +Syntax + + +efl.setLogDomainRegisteredLevel(name, level); + -=== setLogDomainRegisteredLevel(...) === +Sets the trigger level for a given domain with name ''name''. It's a much faster version of ''efl.setLogDomainLevel'', requiring a previously registered domain. === setLogFileDisable(bool) === --
[EGIT] [website/www-content] master 26/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=95100664c7f9919a749af2a61e4c66a9ec303478 commit 95100664c7f9919a749af2a61e4c66a9ec303478 Author: Lauro MouraDate: Thu Dec 3 12:29:56 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index d4f9f00..6cf00f5 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -347,7 +347,7 @@ Sets whether the program should terminate upon a logging event with a level at l Upon initializaton, it takes the value from the environment variable ''EINA_LOG_ABORT''. -=== setLogAbortOnCriticalLevel(...) === +=== setLogAbortOnCriticalLevel(boolvar) === Syntax @@ -355,6 +355,10 @@ Syntax efl.setLogAbortOnCritical(boolvar); +Parameters + + - + Sets the minimal message level the program should check if it should abort. Messages less severe than ''level'' are ignored for this check. --
[EGIT] [website/www-content] master 11/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=a00962c33440904a42c662f236d917c167e843cb commit a00962c33440904a42c662f236d917c167e843cb Author: Lauro MouraDate: Wed Dec 2 11:00:38 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 100 +++--- 1 file changed, 92 insertions(+), 8 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index a1741f0..5e92631 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -35,6 +35,9 @@ By default, Eina offers a global domain to be used by the application. * ''efl.LOG_DOMAIN_GLOBAL'' + Environment Variables + + Functions === checkLogLevel(level) === @@ -77,24 +80,96 @@ var colorDisabled = efl.getLogColorDisable(); Determines whether colors are disabled in the log messages. -=== getLogDomainLevel(...) === +=== getLogDomainLevel(domainname) === + +Syntax + + +var level = efl.getLogDomainLevel(domainname); + + +Gets the domain level given its name. If the domain was not yet registered through ''efl.registerLogDomain'' but is pending after a previous ''efl.setLogDomainLevel'' call or the environment variable ''EINA_LOG_LEVELS'', the respective value is returned. If nothing else was found, the default level from ''efl.getLogLevel'' is returned. + +=== getLogDomainRegisteredLevel(name) === + +Syntax + + +var level = efl.getLogDomainRegisteredLevel(domainname); + + +Gets the level for the given domain. Works much faster than ''efl.getLogDomainLevel'' but relies on the domain being previously registered with ''efl.registerLogDomain''. + +=== getLogFileDisable() === -=== getLogDomainRegisteredLevel(...) === +Syntax + + +var isFileDisabled = efl.getLogFileDisabled(); + + +Returns whether the originating file name is disabled from log messages. + +=== getLogFunctionDisable() === + +Syntax -=== getLogFileDisable(...) === + +var isFunctionDisabled = efl.getLogFunctionDisabled(); + + +Returns whether the originating function name is disabled from log messages. + +=== getLogLevel() === -=== getLogFunctionDisable(...) === +Syntax + + +var default_level = efl.getLogLevel(); + -=== getLogLevel(...) === +Returns the default log level. Messages above this level will be ignored by ''efl.logPrint''. === logCritical(message) === +Syntax + + +efl.logCritical(message); + + +Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_CRITICAL'' to the global domain. + === logDebug(message) === +Syntax + + +efl.logDebug(message); + + +Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_DBG'' to the global domain. + === logError(message) === +Syntax + + +efl.logError(message); + + +Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_ERR'' to the global domain. + === logInfo(message) === +Syntax + + +efl.logInfo(message); + + +Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_INFO'' to the global domain. + === logPrint(domain, level, message) === Syntax @@ -103,19 +178,28 @@ Syntax efl.logPrint(domain, level, message) -Prints ''message'' related ''domain'' with severity ''level''. +Prints the string ''message'' related ''domain'' with severity ''level''. If ''level'' is of a lower severity (higher numerical value) than the value from ''efl.getLogLevel'', the call is ignored. + +For the global domain, you can use the helper functions ''efl.logCritical'', ''efl.logInfo'' and related. Example usage: - +efl.logPrint(efl.LOG_DOMAIN_GLOBAL, efl.LOG_LEVEL_WARN, "Warning. Exclamation point. Warning."); +efl.logPrint(mydomain, efl.LOG_LEVEL_INFO, "Information. We want information."); === logTiming(...) === === logWarning(message) === -Lorem ipsum... +Syntax + + +efl.logWarning(message); + + +Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_WARN'' to the global domain. === registerLogDomain(...) === --
[EGIT] [website/www-content] master 37/40: Wiki page value changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f510d3d1e607fd9573f3f01454096c0d4cf210f9 commit f510d3d1e607fd9573f3f01454096c0d4cf210f9 Author: Lauro MouraDate: Fri Dec 4 14:47:43 2015 -0800 Wiki page value changed with summary [] by Lauro Moura --- pages/api/javascript/eina/value.txt | 23 +++ 1 file changed, 23 insertions(+) diff --git a/pages/api/javascript/eina/value.txt b/pages/api/javascript/eina/value.txt index 316650f..1fba0d0 100644 --- a/pages/api/javascript/eina/value.txt +++ b/pages/api/javascript/eina/value.txt @@ -4,3 +4,26 @@ Eina provides a way to abstract the storage of generic values in an extensible and efficient way, aimed at simple data types. + Constructors and methods + +=== Constructor === + +Syntax + + +var obj = new efl.value(value); + + +Parameters + + * value - The value to be wrapped. + +Return type + + * Value instance - The newly created wrapper. + +Creates a new value wrapper. It can be passed to the native functions and back. + +=== get() === + +Syntax \ No newline at end of file --
[EGIT] [website/www-content] master 14/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=9ca4719c94e471dd43cefdabbd5d1353d861c830 commit 9ca4719c94e471dd43cefdabbd5d1353d861c830 Author: Lauro MouraDate: Wed Dec 2 12:00:00 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index a33e68f..2a98e6f 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -37,7 +37,20 @@ By default, Eina offers a global domain to be used by the application. === Colors === - +The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_formatting|terminal colors format]] to specify the color of the message. Currently, the following constants are exported as shortcuts: + + * ''efl.COLOR_LIGHTRED'' + * ''efl.COLOR_RED'' + * ''efl.COLOR_LIGHTBLUE'' + * ''efl.COLOR_BLUE'' + * ''efl.COLOR_GREEN'' + * ''efl.COLOR_YELLOW'' + * ''efl.COLOR_ORANGE'' + * ''efl.COLOR_WHITE'' + * ''efl.COLOR_LIGHTCYAN'' + * ''efl.COLOR_CYAN'' + * ''efl.COLOR_RESET'' + * ''efl.COLOR_HIGH'' Environment Variables --
[EGIT] [website/www-content] master 17/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=19f86de324ec28227a416589850dc2232c7825c2 commit 19f86de324ec28227a416589850dc2232c7825c2 Author: Lauro MouraDate: Wed Dec 2 13:20:00 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 5b84378..ea5c20e 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -207,7 +207,20 @@ efl.logPrint(efl.LOG_DOMAIN_GLOBAL, efl.LOG_LEVEL_WARN, "Warning. Exclamation po efl.logPrint(mydomain, efl.LOG_LEVEL_INFO, "Information. We want information."); -=== logTiming(...) === +=== logTiming(domain, state, phase) === + +Syntax + + +efl.logTiming(domainId, state, phase); + + +Parameters + + * domainId - The id of the target domain + * state - State indicating if we are starting or stopping a phase. + * phase - The phase of the name to be used in the log. + === logWarning(message) === @@ -217,6 +230,10 @@ Syntax efl.logWarning(message); +Parameters + + * message - String to be print. + Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVEL_WARN'' to the global domain. === registerLogDomain(name, color) === --
[EGIT] [website/www-content] master 15/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=211dab95545407dcc856685e69f3564a929bde6b commit 211dab95545407dcc856685e69f3564a929bde6b Author: Lauro MouraDate: Wed Dec 2 12:16:26 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 68 --- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index 2a98e6f..d4bc85b 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -223,19 +223,79 @@ Helper wrapper around ''efl.logPrint'' what prints a message with ''efl.LOG_LEVE === setLogAbortOnCritical(...) === +Syntax + + +efl.setLogAbortOnCritical(boolvar); + + +Sets whether the program should terminate upon a logging event with level at least of the same severity of ''efl.getLogAbortOnCriticalLevel''. + + +Upon initializaton, it takes the value from the environment variable ''EINA_LOG_ABORT''. + + === setLogAbortOnCriticalLevel(...) === -=== setLogColorDisable(...) === +Syntax + + +efl.setLogAbortOnCritical(boolvar); + + +Sets the minimal message level the program should check if it should abort. Messages less severe than ''level'' are ignored for this check. + + +Upon initializaton, it takes the value from the environment variable ''EINA_LOG_ABORT_LEVEL''. + + +=== setLogColorDisable(bool) === + +Syntax + + +efl.setLogColorDisable(boolvar); + + +Sets whether the colored logging should be disabled or not. === setLogDomainLevel(...) === === setLogDomainRegisteredLevel(...) === -=== setLogFileDisable(...) === +=== setLogFileDisable(bool) === + +Syntax + + +efl.setLogFileDisable(boolvar); + + +Sets whether the file name logging should be disabled or not. + +=== setLogFunctionDisable(enable) === + +Syntax + + +efl.setLogFunctionDisable(boolvar); + + +Sets whether the function name logging should be disabled or not. -=== setLogFunctionDisable(...) === +=== setLogLevel(level) === -=== setLogLevel(...) === +Syntax + + +efl.setLogLevel(level); + + +Sets the default level for log events. Messages less severe (higher numerical value) that ''level'' will be ignored. + + +Upon initialization, the default level is set to the value from the environment variable ''EINA_LOG_LEVEL''. + === setLogPrintCb(callback) === --
[EGIT] [website/www-content] master 02/40: Wiki page start-release changed with summary [E20] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=d31cc9dcc970e3d9097e17d77e3c23512893d0f7 commit d31cc9dcc970e3d9097e17d77e3c23512893d0f7 Author: Mike BlumenkrantzDate: Mon Nov 30 12:50:16 2015 -0800 Wiki page start-release changed with summary [E20] by Mike Blumenkrantz --- pages/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/start-release.txt b/pages/start-release.txt index 5ce7676..5694072 100644 --- a/pages/start-release.txt +++ b/pages/start-release.txt @@ -1,3 +1,3 @@ -EFL 1.16.0 and Enlightenment 0.19.13 are out - go to our [[download]] page. +EFL 1.16.0 and Enlightenment 0.20 are out - go to our [[download]] page. --
[EGIT] [website/www-content] master 34/40: Wiki page logging changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1d473be235404b746c94d327a53e901085c32ee0 commit 1d473be235404b746c94d327a53e901085c32ee0 Author: Lauro MouraDate: Fri Dec 4 11:06:02 2015 -0800 Wiki page logging changed with summary [] by Lauro Moura --- pages/api/javascript/eina/logging.txt | 35 --- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pages/api/javascript/eina/logging.txt b/pages/api/javascript/eina/logging.txt index b995c8f..72b0743 100644 --- a/pages/api/javascript/eina/logging.txt +++ b/pages/api/javascript/eina/logging.txt @@ -6,13 +6,11 @@ The Eina framework provides a comprehensive system to manage logging events in y The main workhorse is ''efl.log_print''. It will call the function defined in ''efl.log_print_cb_set'', defaulting to a function that will print to the stderr. You can pass many options to ''log_print'' to control the output. -Levels customize the amount of actual output that will be produced and can be used to abort the execution if a given level message appears. - Constants === Levels === -The log levels are ranked according to their usual severity. For example, critical errors can be configured to abort the application while debug messages are usually required only in development or triaging bugs. In descending order of severity: +The log levels are ranked according to their usual severity. For example, critical errors can be configured to abort the application while debug messages are usually required only in development or when triaging bugs. In descending order of severity: * ''efl.LOG_LEVEL_CRITICAL'' * ''efl.LOG_LEVEL_ERR'' @@ -39,7 +37,7 @@ By default, Eina offers a global domain to be used by the application. === Colors === -The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_formatting|terminal colors format]] to specify the color of the message. Currently, the following string constants are exported as shortcuts: +The logging system uses the [[http://misc.flogisoft.com/bash/tip_colors_and_formatting|terminal colors format]] to specify a color for a given domain. With the default callback, only the domain name is shown with the given color. Currently, the following string constants are exported as shortcuts: * ''efl.COLOR_LIGHTRED'' * ''efl.COLOR_RED'' @@ -64,7 +62,7 @@ A number of environment variables affect the behavior of the log module. These a * ''EINA_LOG_FILE_DISABLE'' - If true, filename in the messages is disabled. See ''efl.setLogFileDisable''. * ''EINA_LOG_FUNCTION_DISABLE'' - If true, function name in the messages is disabled. See ''efl.setLogFunctionDisable''. * ''EINA_LOG_LEVEL'' - The least severe level that will trigger log events to be shown. Can be overriden in ''efl.setLogLevel''. - * ''EINA_LOG_LEVELS'' - Works like ''EINA_LOG_LEVEL'', but on a per-domain basis. Can be overriden for each domain in ''efl.setLogDomainLevel'' and ''efl.setLogDomainRegisteredLevel''. + * ''EINA_LOG_LEVELS'' - Works like ''EINA_LOG_LEVEL'', but on a per-domain basis. It take values as '':''. Can be overriden for each domain in ''efl.setLogDomainLevel'' and ''efl.setLogDomainRegisteredLevel''. Functions @@ -78,13 +76,13 @@ var willBeLogged = efl.checkLogLevel(level); Parameters - * level - An integer (usually one of the level constants) representing the target log level. + * level - An integer representing the target log level. Usually one of the ''efl.LOG_LEVEL_*'' constants. Return value - * boolean - True if the level is an active log level. + * boolean - True if the level is triggering log level. -Checks whether the given log level will be logged or ignored. The ''level'' argument must be one of the given log level constants (see above). +Checks whether the given log level will be logged or ignored. === getLogAbortOnCritical() === @@ -96,7 +94,7 @@ var willAbortOnCritical = efl.getLogAbortOnCritical(); Return value - * boolean - True if will abort on critical. + * boolean - True if will abort upon triggering a critical level. Returns ''true'' if events with level equal or smaller to ''efl.getLogAbortOnCriticalLevel()'' should abort the program. @@ -110,9 +108,9 @@ var abortLevel = efl.getLogAbortOnCriticalLevel(); Return type - * integer - The least severe level that will trigger termination. + * integer - The least severe level that will trigger termination. Usually one of the ''efl.LOG_LEVEL_*'' constants. -Returns the least severe (smaller numerically) level that will trigger the program termination upon happening. Events most severe than the value returned also trigger termination. +Returns the least severe (largest numerically) level that will trigger the program termination upon happening. Events most
[EGIT] [website/www-content] master 03/40: Wiki page download-latest changed with summary [E20] by Mike Blumenkrantz
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b7c1d77de6e2ea35e5d9c133b51476f5f4cd56ba commit b7c1d77de6e2ea35e5d9c133b51476f5f4cd56ba Author: Mike BlumenkrantzDate: Mon Nov 30 12:50:50 2015 -0800 Wiki page download-latest changed with summary [E20] by Mike Blumenkrantz --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index eec87f8..a3f8375 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -5,7 +5,7 @@ emotion_generic_players_v = 1.16.0 evas_generic_loaders_v= 1.16.0 python_efl_v = 1.16.0 -enlightenment_v = 0.19.13 +enlightenment_v = 0.20.0 terminology_v = 0.9.1 rage_v= 0.1.4 econnman_v= 1.1 --
[EGIT] [admin/devs] master 01/01: restore apache user for dev so wiki can commit to git back-end again. it seems to have been broken since about nov 27 and can't figure out why/where/what.
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a9dd4c6000a7ef75ee2bda23d778e639f4211d4d commit a9dd4c6000a7ef75ee2bda23d778e639f4211d4d Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 20:58:38 2015 +0900 restore apache user for dev so wiki can commit to git back-end again. it seems to have been broken since about nov 27 and can't figure out why/where/what. get this working again. --- developers/apache/id_rsa.pub | 1 + developers/apache/info.txt | 7 +++ 2 files changed, 8 insertions(+) diff --git a/developers/apache/id_rsa.pub b/developers/apache/id_rsa.pub new file mode 100644 index 000..927718c --- /dev/null +++ b/developers/apache/id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAACAQC65Ndvm9TPNMVnWN+MLy8eAb9sHlhB933Sy2eKkzU+hgUGZz2VU4CZz09R0YWnAsc6OEtvTWVFhUC32wQVf4sPJBBwpTUbxR9G1D9FCtVOXUda2fi7wyx4ZmZevavbTR96asiLJ9xegV+F/15DWcV0RTCUv185UUFgA6AVCWZ3tVd4W1WKLgjUhBqPad6ds0lRvMuXzj203EKbr1Iv+65aEa1zGxC1hfCsqEKndraxA9zAXPlofpP6zm53f7WpsEhUKOS4JlLt/YF0mbq4dvVIssSgzfnUQqYbrsNmOGqmi/cTDOyRovKOSn7XtrPSHItPLIFWJpyxitZThAjQKz/l2xicGgOFz/LHUHZMp+rx0FQ4szfkQKbIk7oEcNOHPKqjPsYQCNNqfIlTKNSFAW3qgBr3gapBLD26x9NSbEKOzA8YdolhjWou0bLLRxK2I0fJLN+t [...] diff --git a/developers/apache/info.txt b/developers/apache/info.txt new file mode 100644 index 000..c5a5e3b --- /dev/null +++ b/developers/apache/info.txt @@ -0,0 +1,7 @@ +Login:apache +IRC Nick: N/A +Cloak:N/A +Name: Wiki Web Bot +WWW: http://www.enlightenment.org +E-Mail: n...@anlightenment.org +Managing: www-content --
[EGIT] [admin/devs] master 01/01: ok devs - remove apache again and do this some other way
raster pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=3608a076d38d8fd58131bf2b3f988ca26715ad14 commit 3608a076d38d8fd58131bf2b3f988ca26715ad14 Author: Carsten Haitzler (Rasterman)Date: Mon Dec 7 21:09:07 2015 +0900 ok devs - remove apache again and do this some other way --- developers/apache/id_rsa.pub | 1 - developers/apache/info.txt | 7 --- 2 files changed, 8 deletions(-) diff --git a/developers/apache/id_rsa.pub b/developers/apache/id_rsa.pub deleted file mode 100644 index 927718c..000 --- a/developers/apache/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EDAQABAAACAQC65Ndvm9TPNMVnWN+MLy8eAb9sHlhB933Sy2eKkzU+hgUGZz2VU4CZz09R0YWnAsc6OEtvTWVFhUC32wQVf4sPJBBwpTUbxR9G1D9FCtVOXUda2fi7wyx4ZmZevavbTR96asiLJ9xegV+F/15DWcV0RTCUv185UUFgA6AVCWZ3tVd4W1WKLgjUhBqPad6ds0lRvMuXzj203EKbr1Iv+65aEa1zGxC1hfCsqEKndraxA9zAXPlofpP6zm53f7WpsEhUKOS4JlLt/YF0mbq4dvVIssSgzfnUQqYbrsNmOGqmi/cTDOyRovKOSn7XtrPSHItPLIFWJpyxitZThAjQKz/l2xicGgOFz/LHUHZMp+rx0FQ4szfkQKbIk7oEcNOHPKqjPsYQCNNqfIlTKNSFAW3qgBr3gapBLD26x9NSbEKOzA8YdolhjWou0bLLRxK2I0fJLN+t [...] diff --git a/developers/apache/info.txt b/developers/apache/info.txt deleted file mode 100644 index c5a5e3b..000 --- a/developers/apache/info.txt +++ /dev/null @@ -1,7 +0,0 @@ -Login:apache -IRC Nick: N/A -Cloak:N/A -Name: Wiki Web Bot -WWW: http://www.enlightenment.org -E-Mail: n...@anlightenment.org -Managing: www-content --
[EGIT] [core/efl] master 01/01: edje_cc: Fix parsing including file path in EDC on Windows.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a05171d39ffcb945fc7e4f4862d8ac89a181f143 commit a05171d39ffcb945fc7e4f4862d8ac89a181f143 Author: Jaehyun ChoDate: Tue Dec 8 11:01:11 2015 +0900 edje_cc: Fix parsing including file path in EDC on Windows. On Windows, including file path in EDC has not been parsed correctly because '\' has not been used for path separator. This commit fixes edje_cc complie to use '\' as path separator on Windows. --- src/bin/edje/edje_cc_parse.c | 4 src/bin/edje/edje_cc_sources.c | 30 -- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c index 5f405df..4fa97eb 100644 --- a/src/bin/edje/edje_cc_parse.c +++ b/src/bin/edje/edje_cc_parse.c @@ -925,6 +925,10 @@ compile(void) strncpy(inc, file_in, 4000); inc[4001] = 0; p = strrchr(inc, '/'); +#ifdef _WIN32 + char *p_backslash = strrchr(inc, '\\'); + if (p_backslash > p) p = p_backslash; +#endif if (!p) strcpy(inc, "./"); else *p = 0; fd = eina_file_mkstemp("edje_cc.edc-tmp-XX", ); diff --git a/src/bin/edje/edje_cc_sources.c b/src/bin/edje/edje_cc_sources.c index 734fbfe..47f7665 100644 --- a/src/bin/edje/edje_cc_sources.c +++ b/src/bin/edje/edje_cc_sources.c @@ -153,12 +153,23 @@ source_fetch_file(const char *fil, const char *filname) /* get the directory of the current file * if we haven't already done so */ -if ((!dir) && (strrchr(fil, '/'))) +if (!dir) { - dir = mem_strdup(fil); - slash = strrchr(dir, '/'); - *slash = '\0'; - dir_len = strlen(dir); + if (strrchr(fil, '/')) + { + dir = mem_strdup(fil); + slash = strrchr(dir, '/'); + } +#ifdef _WIN32 + if (strrchr(fil, '\\')) + { + if (!dir) dir = mem_strdup(fil); + char *backslash = strrchr(dir, '\\'); + if (backslash > slash) slash = backslash; + } +#endif + if (slash) *slash = '\0'; + if (dir) dir_len = strlen(dir); } l = pp - p + dir_len + 1; @@ -211,7 +222,14 @@ source_fetch(void) { snprintf(buf, sizeof (buf), "%s", ptr + 1); } - +#ifdef _WIN32 + char *ptr_backslash = strrchr(file_in, '\\'); + if (ptr_backslash) + { +if (ptr_backslash > ptr) + snprintf(buf, sizeof (buf), "%s", ptr_backslash + 1); + } +#endif source_fetch_file(file_in, buf[0] ? buf : file_in); } --
[EGIT] [website/www-content] master 01/01: Wiki page value changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=a696cc125e58aa3956d86bec09ad32a0f9fe7410 commit a696cc125e58aa3956d86bec09ad32a0f9fe7410 Author: Lauro MouraDate: Mon Dec 7 11:34:05 2015 -0800 Wiki page value changed with summary [] by Lauro Moura --- pages/api/javascript/eina/value.txt | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pages/api/javascript/eina/value.txt b/pages/api/javascript/eina/value.txt index 1fba0d0..5ed7da4 100644 --- a/pages/api/javascript/eina/value.txt +++ b/pages/api/javascript/eina/value.txt @@ -24,6 +24,28 @@ Return type Creates a new value wrapper. It can be passed to the native functions and back. +Example usage + + +var myvalue = efl.value(42); + + === get() === -Syntax \ No newline at end of file +Syntax + + +var unwrapped = valueobj.get(); + + +Unwraps a value and retrieve its contents. + +=== set(value) === + +Syntax + + +valueobj.set(somevalue); + + +Replaces the wrapped value with the given value. \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page value changed with summary [] by Lauro Moura
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=19389d7b44dfdd1ba192d55dddb108b19d23aa50 commit 19389d7b44dfdd1ba192d55dddb108b19d23aa50 Author: Lauro MouraDate: Mon Dec 7 11:54:13 2015 -0800 Wiki page value changed with summary [] by Lauro Moura --- pages/api/javascript/eina/value.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/api/javascript/eina/value.txt b/pages/api/javascript/eina/value.txt index 5ed7da4..9c10315 100644 --- a/pages/api/javascript/eina/value.txt +++ b/pages/api/javascript/eina/value.txt @@ -16,7 +16,7 @@ var obj = new efl.value(value); Parameters - * value - The value to be wrapped. + * value - The value to be wrapped. Currently, numerical and string types are supported. Return type @@ -27,7 +27,7 @@ Creates a new value wrapper. It can be passed to the native functions and back. Example usage -var myvalue = efl.value(42); +var myvalue = new efl.value(42); === get() === @@ -48,4 +48,4 @@ Syntax valueobj.set(somevalue); -Replaces the wrapped value with the given value. \ No newline at end of file +Replaces the wrapped value with the given value. You can set any of the supported values, there's no restriction on the value being of the type set on at the time of instantiation. \ No newline at end of file --
[EGIT] [core/elementary] master 01/01: elementary: Update ecore wayland window geometry
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=2a85a53d142a44ac55a5ee7e838ea0f35e5a5b56 commit 2a85a53d142a44ac55a5ee7e838ea0f35e5a5b56 Author: Chris MichaelDate: Mon Dec 7 15:34:19 2015 -0500 elementary: Update ecore wayland window geometry As Elementary handles the window border theme, we can more accurately set ecore_wl2 window geometry from here. The window geometry is defined as the "visible bounds" from the user's perspective, so the values we set here should come from the theme. @fix ref T2919 Signed-off-by: Chris Michael --- src/lib/elm_win.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 3fbe2bf..1f982c8 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1267,16 +1267,14 @@ _elm_win_opaque_update(Elm_Win_Data *sd) { ecore_evas_geometry_get(sd->ee, NULL, NULL, , ); ecore_wl2_window_opaque_region_set(sd->wl.win, 0, 0, ow, oh); -/* TODO */ -/* ecore_wl_window_update_location(sd->wl.win, 0, 0); */ +ecore_wl2_window_geometry_set(sd->wl.win, 0, 0, ow, oh); return; } edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque", , , , ); ecore_wl2_window_opaque_region_set(sd->wl.win, ox, oy, ow, oh); - /* TODO */ - /* ecore_wl_window_update_location(sd->wl.win, ox, oy); */ + ecore_wl2_window_geometry_set(sd->wl.win, ox, oy, ow, oh); } #endif --
[EGIT] [core/efl] master 02/05: ecore-wl2: Fix issue of cleanup function always removing from client display hash
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7469261d2ff65cf3a418deaf7cd73d9a0f69 commit 7469261d2ff65cf3a418deaf7cd73d9a0f69 Author: Chris MichaelDate: Mon Dec 7 12:18:28 2015 -0500 ecore-wl2: Fix issue of cleanup function always removing from client display hash As the cleanup function is a generic helper to cleanup things in the Ecore_Wl2_Display structure, we cannot always just explicitly the display from the client_displays hash. The removal from the appropriate hashes should be done by the calling function(s) (ecore_wl2_display_disconnect for clients, and ecore_wl2_display_destroy for servers) @fix Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_display.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 6f5abfb..ceb6f10 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -358,11 +358,6 @@ _ecore_wl2_display_cleanup(Ecore_Wl2_Display *ewd) if (ewd->wl.registry) wl_registry_destroy(ewd->wl.registry); wl_display_flush(ewd->wl.display); - - /* remove this client display from hash */ - eina_hash_del_by_key(_client_displays, ewd->name); - - free(ewd->name); } Ecore_Wl2_Window * @@ -650,6 +645,11 @@ ecore_wl2_display_disconnect(Ecore_Wl2_Display *display) if (display->refs <= 0) { wl_display_disconnect(display->wl.display); + +/* remove this client display from hash */ +eina_hash_del_by_key(_client_displays, display->name); + +free(display->name); free(display); } } @@ -662,6 +662,11 @@ ecore_wl2_display_destroy(Ecore_Wl2_Display *display) if (display->refs <= 0) { wl_display_destroy(display->wl.display); + +/* remove this client display from hash */ +eina_hash_del_by_key(_server_displays, display->name); + +free(display->name); free(display); } } --
[EGIT] [core/efl] master 01/05: ecore-wl2: Fix formatting and remove extra blank line
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=33d0c8cdcfedd271b68008adc2a883139b5bb8bd commit 33d0c8cdcfedd271b68008adc2a883139b5bb8bd Author: Chris MichaelDate: Mon Dec 7 11:30:53 2015 -0500 ecore-wl2: Fix formatting and remove extra blank line NB: no functional changes Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_window.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index e4cbf6e..0556b8a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -221,7 +221,8 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) if ((window->display->wl.xdg_shell) && (!window->xdg_surface)) { window->xdg_surface = - xdg_shell_get_xdg_surface(window->display->wl.xdg_shell, window->surface); + xdg_shell_get_xdg_surface(window->display->wl.xdg_shell, +window->surface); if (!window->xdg_surface) goto surf_err; if (window->title) @@ -229,7 +230,6 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) if (window->class) xdg_surface_set_app_id(window->xdg_surface, window->class); - xdg_surface_set_user_data(window->xdg_surface, window); xdg_surface_add_listener(window->xdg_surface, &_xdg_surface_listener, window); @@ -240,7 +240,8 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) else if ((window->display->wl.wl_shell) && (!window->wl_shell_surface)) { window->wl_shell_surface = - wl_shell_get_shell_surface(window->display->wl.wl_shell, window->surface); + wl_shell_get_shell_surface(window->display->wl.wl_shell, + window->surface); if (!window->wl_shell_surface) goto surf_err; if (window->title) @@ -252,7 +253,9 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) &_wl_shell_surface_listener, window); _ecore_wl2_window_type_set(window); } + return; + surf_err: ERR("Failed to create surface for window: %m"); } --
[EGIT] [core/efl] master 03/05: evas: Fix definition of framespace in canvas eo file
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ef3ef643c2645c8536f7d97fc19ed555995972d0 commit ef3ef643c2645c8536f7d97fc19ed555995972d0 Author: Chris MichaelDate: Mon Dec 7 12:54:21 2015 -0500 evas: Fix definition of framespace in canvas eo file The definition of 'framespace' in the canvas eo file is incorrect. Framespace is the space occupied by the window frame within the canvas viewport @fix Signed-off-by: Chris Michael --- src/lib/evas/canvas/evas_canvas.eo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 760b7ea..1b72fed 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -11,8 +11,8 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface) given evas. The framespace size is used in the Wayland engines to denote - space where the output is not drawn. This is mainly used in - ecore_evas to draw borders. + space in the viewport which is occupied by the window + frame. This is mainly used in ecore_evas to draw borders. The units used for $w and $h depend on the engine used by the evas. --
[EGIT] [core/efl] master 05/05: ecore-evas-wayland: Don't set window geometry in ecore_evas
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=32eb2d32c4c57d46f8a51fc51bc85e0cc296da10 commit 32eb2d32c4c57d46f8a51fc51bc85e0cc296da10 Author: Chris MichaelDate: Mon Dec 7 15:32:58 2015 -0500 ecore-evas-wayland: Don't set window geometry in ecore_evas As we do not have the proper values for window geometry to be setting it here, remove calls to set window geometry. We can more accurately determine the window geometry from inside Elementary as it handles the theme for the window borders. @fix ref T2919 Signed-off-by: Chris Michael --- .../ecore_evas/engines/wayland/ecore_evas_wayland_common.c| 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 0a36eec..f0f5f92 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -649,14 +649,6 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h) if (wdata->frame) evas_object_resize(wdata->frame, w, h); -if (wdata->win) - { - if (ECORE_EVAS_PORTRAIT(ee)) - ecore_wl2_window_geometry_set(wdata->win, 0, 0, w, h); - else - ecore_wl2_window_geometry_set(wdata->win, 0, 0, h, w); - } - if (ee->func.fn_resize) ee->func.fn_resize(ee); } } @@ -1190,8 +1182,7 @@ _ecore_evas_wl_common_border_update(Ecore_Evas *ee) Ecore_Evas_Engine_Wl_Data *wdata; wdata = ee->engine.data; - if (!wdata->frame) - return; + if (!wdata->frame) return; if ((ee->prop.borderless) || (ee->prop.fullscreen)) { --
[EGIT] [core/efl] master 04/05: ecore-wl2: rewrite maximize/fullscreen set functions for consistency
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=880a76a75b6f31bca143ee2f4ab3a7cc59ff5cb2 commit 880a76a75b6f31bca143ee2f4ab3a7cc59ff5cb2 Author: Chris MichaelDate: Mon Dec 7 14:39:29 2015 -0500 ecore-wl2: rewrite maximize/fullscreen set functions for consistency * sanitize boolean params * enforce window state flag setting * use window flag instead of window type for state @fix ref T2919 Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_window.c | 24 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 0556b8a..93a53e6 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -612,11 +612,17 @@ ecore_wl2_window_maximized_get(Ecore_Wl2_Window *window) EAPI void ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized) { + Eina_Bool prev; + EINA_SAFETY_ON_NULL_RETURN(window); - if (window->maximized == maximized) return; + prev = window->maximized; + maximized = !!maximized; + if (prev == maximized) return; + + window->maximized = maximized; - if (window->type == ECORE_WL2_WINDOW_TYPE_TOPLEVEL) + if (maximized) { window->saved = window->geometry; @@ -627,7 +633,7 @@ ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized) window->type = ECORE_WL2_WINDOW_TYPE_MAXIMIZED; } - else if (window->type == ECORE_WL2_WINDOW_TYPE_MAXIMIZED) + else { if (window->xdg_surface) xdg_surface_unset_maximized(window->xdg_surface); @@ -639,8 +645,6 @@ ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized) _ecore_wl2_window_configure_send(window, window->saved.w, window->saved.h, 0); } - - window->maximized = maximized; } EAPI Eina_Bool @@ -654,9 +658,15 @@ ecore_wl2_window_fullscreen_get(Ecore_Wl2_Window *window) EAPI void ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen) { + Eina_Bool prev; + EINA_SAFETY_ON_NULL_RETURN(window); - if (window->fullscreen == fullscreen) return; + prev = window->fullscreen; + fullscreen = !!fullscreen; + if (prev == fullscreen) return; + + window->fullscreen = fullscreen; if (fullscreen) { @@ -683,8 +693,6 @@ ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen) _ecore_wl2_window_configure_send(window, window->saved.w, window->saved.h, 0); } - - window->fullscreen = fullscreen; } EAPI int --