[EGIT] [core/elementary] master 01/02: Window: Set urgent flag only when not already set
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=72de26e9a367b9bff327192a473979d4fc3ca584
commit 72de26e9a367b9bff327192a473979d4fc3ca584
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Mon Jul 6 12:28:02 2015 +0900
Window: Set urgent flag only when not already set
cat binary_file_with_lots_of_BEL in terminology would slow down
everything because of the urgent flag (and talking to X).
---
src/lib/elm_win.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 05ed910..f52732e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -4451,6 +4451,8 @@ _elm_win_profile_get(Eo *obj EINA_UNUSED, Elm_Win_Data
*sd)
EOLIAN static void
_elm_win_urgent_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool urgent)
{
+ if (sd-urgent == urgent)
+ return;
sd-urgent = urgent;
TRAP(sd, urgent_set, urgent);
#ifdef HAVE_ELEMENTARY_X
--
[EGIT] [website/www-content] master 01/01: 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=5b4416dc35a4301bbad3dbc0ebc38a387be0ac53 commit 5b4416dc35a4301bbad3dbc0ebc38a387be0ac53 Author: Raster ras...@rasterman.com Date: Fri Jul 10 02:40:08 2015 -0700 Wiki page docs changed with summary [] by Raster --- pages/docs.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/docs.txt b/pages/docs.txt index 53114aa..c6fad00 100644 --- a/pages/docs.txt +++ b/pages/docs.txt @@ -56,8 +56,8 @@ improving our API references a lot. === Stable === - * [[http://docs.enlightenment.org/stable/efl|EFL]] - * [[http://docs.enlightenment.org/stable/elementary|Elementary]] + * [[http://docs.enlightenment.org/efl/1.15.0|EFL]] + * [[http://docs.enlightenment.org/elementary/1.15.0|Elementary]] === Development === --
[EGIT] [tools/enventor] master 01/01: text_setting: one more here code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=fedcfd3149cd09c2aceca134f08ff13df9d93d2d
commit fedcfd3149cd09c2aceca134f08ff13df9d93d2d
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 10 20:12:46 2015 +0900
text_setting: one more here code refactoring.
err is enough to use.
---
src/bin/text_setting.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index a6dd083..1deeda2 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -551,23 +551,23 @@ syntax_template_create(double font_scale)
text_setting_data *tsd = g_tsd;
char *syntax_template_str = NULL;
char *syntax_template_format = syntax_template_format_create();
- if (!syntax_template_format) goto syntax_template_create_err;
+ if (!syntax_template_format) goto err;
syntax_template_str = calloc(1, sizeof(char) * SYNTAX_TEMPLATE_MAX_LEN);
- if (!syntax_template_str) goto syntax_template_create_err;
+ if (!syntax_template_str) goto err;
syntax_template_set(syntax_template_str, syntax_template_format,
font_scale);
color_keyword *color_keyword_list;
color_keyword_list = color_keyword_list_create(syntax_template_str);
- if (!color_keyword_list) goto syntax_template_create_err;
+ if (!color_keyword_list) goto err;
tsd-syntax_template_str = syntax_template_str;
tsd-color_keyword_list = color_keyword_list;
return tsd-syntax_template_str;
-syntax_template_create_err:
+err:
EINA_LOG_ERR(Failed to allocate Memory!);
if (syntax_template_format)
{
--
[EGIT] [tools/enventor] master 01/01: text_setting: code refactoring.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c25eb038b3a596444981103feb748f9ef6b12da4 commit c25eb038b3a596444981103feb748f9ef6b12da4 Author: ChunEon Park her...@hermet.pe.kr Date: Fri Jul 10 20:10:37 2015 +0900 text_setting: code refactoring. err is enough to use. --- src/bin/text_setting.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index 8866728..a6dd083 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -524,10 +524,10 @@ syntax_template_format_create(void) } char *utf8 = eina_file_map_all(file, EINA_FILE_POPULATE); - if (!utf8) goto syntax_template_format_create_err; + if (!utf8) goto err; char *syntax_template_format = calloc(1, sizeof(char) * (strlen(utf8) + 1)); - if (!syntax_template_format) goto syntax_template_format_create_err; + if (!syntax_template_format) goto err; strcpy(syntax_template_format, utf8); tsd-syntax_template_format = syntax_template_format; @@ -536,7 +536,7 @@ syntax_template_format_create(void) return tsd-syntax_template_format; -syntax_template_format_create_err: +err: EINA_LOG_ERR(Failed to allocate Memory!); if (utf8) free(utf8); --
[EGIT] [tools/eflete] master 01/21: UTC: update groupedit test
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=eb80b2a7bd5752fd33a29f4033e72d4dd19f4f44
commit eb80b2a7bd5752fd33a29f4033e72d4dd19f4f44
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 10:37:26 2015 +0300
UTC: update groupedit test
---
tests/test_groupedit/groupedit_bg_set.c | 8
tests/test_groupedit/test_groupedit.c | 2 +-
tests/test_groupedit/test_groupedit.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/test_groupedit/groupedit_bg_set.c
b/tests/test_groupedit/groupedit_bg_set.c
index 54aa970..4aa20c2 100644
--- a/tests/test_groupedit/groupedit_bg_set.c
+++ b/tests/test_groupedit/groupedit_bg_set.c
@@ -76,7 +76,7 @@ END_TEST
* @{
* tr
* tdgroupedit_bg_set/td
- * tdgroupedit_bg_set_test_n1/td
+ * tdgroupedit_bg_set_test_p1/td
* td
* @precondition
* @step 1 initialize elementary library
@@ -88,11 +88,11 @@ END_TEST
* @step 3 check returned value
* /td
* td(Evas_Object *) groupedit, NULL/td
- * tdReturned value is EINA_FALSE/td
+ * tdReturned value is EINA_TRUE/td
* /tr
* @}
*/
-EFLETE_TEST(groupedit_bg_set_test_n1)
+EFLETE_TEST(groupedit_bg_set_test_p1)
{
Evas_Object *parent, *groupedit;
Eina_Bool res;
@@ -103,7 +103,7 @@ EFLETE_TEST(groupedit_bg_set_test_n1)
groupedit = groupedit_add(parent);
res = groupedit_bg_set(groupedit, NULL);
- ck_assert_msg(res == EINA_FALSE, Failed create groupedit object.);
+ ck_assert_msg(res != EINA_FALSE, Failed create groupedit object.);
evas_object_del(parent);
elm_shutdown();
diff --git a/tests/test_groupedit/test_groupedit.c
b/tests/test_groupedit/test_groupedit.c
index 4dd9c91..928a453 100644
--- a/tests/test_groupedit/test_groupedit.c
+++ b/tests/test_groupedit/test_groupedit.c
@@ -93,7 +93,7 @@ Suite* test_suite (void) {
//tcase_add_test(tcase, groupedit_edit_object_part_select_test_n2);
tcase_add_test(tcase, groupedit_bg_set_test_p);
- tcase_add_test(tcase, groupedit_bg_set_test_n1);
+ tcase_add_test(tcase, groupedit_bg_set_test_p1);
tcase_add_test(tcase, groupedit_bg_set_test_n2);
tcase_add_test(tcase, groupedit_bg_unset_test_p);
diff --git a/tests/test_groupedit/test_groupedit.h
b/tests/test_groupedit/test_groupedit.h
index 2969e12..c2c759b 100644
--- a/tests/test_groupedit/test_groupedit.h
+++ b/tests/test_groupedit/test_groupedit.h
@@ -127,7 +127,7 @@ void groupedit_edit_object_part_select_test_n1(int);
void groupedit_edit_object_part_select_test_n2(int);
void groupedit_bg_set_test_p(int);
-void groupedit_bg_set_test_n1(int);
+void groupedit_bg_set_test_p1(int);
void groupedit_bg_set_test_n2(int);
void groupedit_bg_unset_test_p(int);
--
[EGIT] [tools/eflete] master 10/21: remove GET_OBJ macro
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=4e262475b852cd78a5b0618661ca96ed5fe1c561
commit 4e262475b852cd78a5b0618661ca96ed5fe1c561
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 17:18:22 2015 +0300
remove GET_OBJ macro
---
src/bin/common/common_macro.h | 37 ---
src/bin/project_manager/project_manager.c | 9 +++-
src/bin/ui/editors/colorclass_manager.c | 8 ++-
src/bin/ui/editors/image_editor.c | 20 +
src/bin/ui/editors/sound_editor.c | 31 --
src/bin/ui/editors/style_editor.c | 20 +
6 files changed, 26 insertions(+), 99 deletions(-)
diff --git a/src/bin/common/common_macro.h b/src/bin/common/common_macro.h
index 1f516c7..055abdb 100644
--- a/src/bin/common/common_macro.h
+++ b/src/bin/common/common_macro.h
@@ -77,43 +77,6 @@ struct _Uns_List
elm_object_text_set(lb, date); \
}
-/* Getting first object from project. Needed to access top-level blocks */
-#define GET_OBJ(PROJECT, EDJE_OBJECT) \
- Eina_Inlist *_styles, *_classes, *_widgets = NULL; \
- Widget *_widget; \
- Class *_class; \
- Style *_style = NULL; \
- if (PROJECT-current_style) EDJE_OBJECT = PROJECT-current_style-obj; \
- else \
- { \
-_widgets = PROJECT-widgets; \
-if (!_widgets) EDJE_OBJECT = NULL; \
-else\
- { \
- _widget = EINA_INLIST_CONTAINER_GET(_widgets, Widget); \
- _classes = _widget-classes; \
- if (!_classes) EDJE_OBJECT = NULL; \
- else \
-{ \
-_class = EINA_INLIST_CONTAINER_GET(_classes, Class); \
-_styles = _class-styles; \
-if (!_styles) EDJE_OBJECT = NULL; \
-else\
- { \
- _style = EINA_INLIST_CONTAINER_GET(_styles, Style); \
- EDJE_OBJECT = _style-obj; \
- } \
-} \
- } \
-if ((!EDJE_OBJECT) (PROJECT-layouts)) \
- { \
-_style = EINA_INLIST_CONTAINER_GET(PROJECT-layouts, Style); \
-EDJE_OBJECT = _style-obj;\
- } \
-if (_style-isAlias) \
- EDJE_OBJECT = _style-main_group-obj; \
- }
-
#define GET_STYLE(PROJECT, STYLE) \
Eina_Inlist *_styles, *_classes, *_widgets = NULL; \
Widget *_widget; \
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index 6a5af54..c1f73fa 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -749,7 +749,7 @@ _project_save(void *data,
Evas_Object *edje_edit_obj;
worker = (Project_Thread *)data;
- GET_OBJ(worker-project, edje_edit_obj);
+ edje_edit_obj = worker-project-global_object;
PROGRESS_SEND(Saving...);
ecore_thread_main_loop_begin();
@@ -1362,8 +1362,7 @@ pm_project_source_code_export(Project *pro, const char
*dir_path)
int value = -1, k = 0;
const char *pos = NULL;
char str[100];
- Evas_Object *edje_edit_obj;
- GET_OBJ(pro, edje_edit_obj);
+ Evas_Object *edje_edit_obj = pro-global_object;
path = eina_stringshare_printf(%s/%s.edc, dir_path, pro-name);
f = fopen(path, w);
@@ -1512,15 +1511,13 @@ _develop_export(void *data,
Eina_Thread *thread __UNUSED__)
{
Project_Thread *worker;
- Evas_Object *edje_edit_obj;
worker = (Project_Thread *)data;
PROGRESS_SEND(_(Export edj...));
WORKER_LOCK_TAKE;
- GET_OBJ(worker-project, edje_edit_obj);
- edje_edit_save_all(edje_edit_obj);
+ edje_edit_save_all(worker-project-global_object);
eina_file_copy(worker-project-dev, worker-edj,
EINA_FILE_COPY_PERMISSION | EINA_FILE_COPY_XATTR,
NULL, NULL);
diff --git a/src/bin/ui/editors/colorclass_manager.c
b/src/bin/ui/editors/colorclass_manager.c
index e2e616b..df9a333 100644
--- a/src/bin/ui/editors/colorclass_manager.c
+++ b/src/bin/ui/editors/colorclass_manager.c
@@ -50,7 +50,6 @@ struct _Colorclasses_Manager
Evas_Object *mwin;
Evas_Object *layout;
Evas_Object *genlist;
- Evas_Object *edit_obj;
Evas_Object *edje_preview, *preview_layout;
Evas_Object *colorsel1, *colorsel2, *colorsel3;
Evas_Object *entry, *popup;
@@ -657,16 +656,13 @@ _colorclass_manager_init(Colorclasses_Manager *edit)
Eina_List *cclist = NULL;
Eina_List *l = NULL;
Colorclass_Item *it = NULL;
- Evas_Object *edje_edit_obj = NULL;
- GET_OBJ(edit-pr, edje_edit_obj);
- edit-edit_obj = edje_edit_obj;
- cclist = edje_edit_color_classes_list_get(edje_edit_obj);
+ cclist = edje_edit_color_classes_list_get(edit-pr-global_object);
EINA_LIST_FOREACH(cclist, l, ccname)
{
it = (Colorclass_Item *)mem_calloc(1, sizeof(Colorclass_Item));
-
[EGIT] [tools/eflete] master 02/21: project_manager: remove unneccesary mutex from pm_project_open
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3267beaec468dafe089675ef56a73de73dfa3721
commit 3267beaec468dafe089675ef56a73de73dfa3721
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 11:13:25 2015 +0300
project_manager: remove unneccesary mutex from pm_project_open
---
src/bin/project_manager/project_manager.c | 56 ---
1 file changed, 21 insertions(+), 35 deletions(-)
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index ec3b673..3764c87 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -623,30 +623,22 @@ Project *
pm_project_open(const char *path)
{
Eet_File *ef;
- Project *pro = NULL;
+ Project *project;
char *tmp;
int tmp_len;
- struct _Project_Lock
- {
- Project *project;
- Eina_Lock mutex;
- };
edje_file_cache_flush();
- struct _Project_Lock *pro_lock = mem_calloc(1, sizeof(struct
_Project_Lock));
- eina_lock_new(pro_lock-mutex);
_project_descriptor_init();
ef = eet_open(path, EET_FILE_MODE_READ_WRITE);
- if (!ef)
- goto error;
+ if (!ef) return NULL;
- pro_lock-project = eet_data_read(ef, eed_project, PROJECT_FILE_KEY);
+ project = eet_data_read(ef, eed_project, PROJECT_FILE_KEY);
_pm_project_descriptor_shutdown();
eet_close(ef);
- if (!pro_lock-project) goto error;
+ if (!project) return NULL;
- pro_lock-project-pro_path = eina_stringshare_add(path);
+ project-pro_path = eina_stringshare_add(path);
/* updating .dev file path */
tmp = strdup(path);
@@ -654,41 +646,35 @@ pm_project_open(const char *path)
tmp[tmp_len - 3] = 'd';
tmp[tmp_len - 2] = 'e';
tmp[tmp_len - 1] = 'v';
- eina_stringshare_replace(pro_lock-project-dev, tmp);
+ eina_stringshare_replace(project-dev, tmp);
free(tmp);
/* updating .edj file path */
tmp = strdup(path);
tmp[tmp_len - 3] = 'e';
tmp[tmp_len - 2] = 'd';
tmp[tmp_len - 1] = 'j';
- eina_stringshare_replace(pro_lock-project-saved_edj, tmp);
+ eina_stringshare_replace(project-saved_edj, tmp);
free(tmp);
/* checking for older project versions and upgrading them
version-by-version */
- if (pro_lock-project-version 2) /* upgrade to version 2 */
+ if (project-version 2) /* upgrade to version 2 */
{
WARN(_(Old project version. Project files were updated.));
-ecore_file_mv(pro_lock-project-dev, pro_lock-project-saved_edj);
-pro_lock-project-version = 2;
+ecore_file_mv(project-dev, project-saved_edj);
+project-version = 2;
}
TODO(Add crash recovery prompt here)
- _project_dev_file_create(pro_lock-project);
- pro_lock-project-mmap_file = eina_file_open(pro_lock-project-dev,
false);
- eina_lock_take(pro_lock-mutex);
-
- pro_lock-project-changed = false;
- pro_lock-project-close_request = false;
- pro_lock-project-widgets = wm_widgets_list_new(pro_lock-project-dev);
- pro_lock-project-layouts = wm_layouts_list_new(pro_lock-project-dev);
- pm_project_meta_data_get(pro_lock-project, pro_lock-project-name, NULL,
NULL, NULL, NULL);
- if (!pro_lock-project-name) pro_lock-project-name =
eina_stringshare_add(_(No title));
- eina_lock_release(pro_lock-mutex);
-
-error:
- eina_lock_free(pro_lock-mutex);
- pro = pro_lock-project;
- free(pro_lock);
- return pro;
+ _project_dev_file_create(project);
+ project-mmap_file = eina_file_open(project-dev, false);
+
+ project-changed = false;
+ project-close_request = false;
+ project-widgets = wm_widgets_list_new(project-dev);
+ project-layouts = wm_layouts_list_new(project-dev);
+ pm_project_meta_data_get(project, project-name, NULL, NULL, NULL, NULL);
+ if (!project-name) project-name = eina_stringshare_add(_(No title));
+
+ return project;
}
void
--
[EGIT] [tools/eflete] master 11/21: remove GET_STYL macro
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9d5e2cbb21696e1443530fbfdc1240dc6cc30989
commit 9d5e2cbb21696e1443530fbfdc1240dc6cc30989
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Thu Jul 9 11:21:12 2015 +0300
remove GET_STYL macro
---
src/bin/common/common_macro.h | 34 -
src/bin/ui/connector.c | 10 +++---
src/bin/ui/editors/colorclass_manager.c | 9 +++--
src/bin/ui/editors/image_editor.c | 17 +
4 files changed, 11 insertions(+), 59 deletions(-)
diff --git a/src/bin/common/common_macro.h b/src/bin/common/common_macro.h
index 055abdb..f851160 100644
--- a/src/bin/common/common_macro.h
+++ b/src/bin/common/common_macro.h
@@ -77,40 +77,6 @@ struct _Uns_List
elm_object_text_set(lb, date); \
}
-#define GET_STYLE(PROJECT, STYLE) \
- Eina_Inlist *_styles, *_classes, *_widgets = NULL; \
- Widget *_widget; \
- Class *_class; \
- Style *_style; \
- if (PROJECT-current_style) STYLE = PROJECT-current_style; \
- else \
- { \
- _widgets = PROJECT-widgets; \
- if (!_widgets) STYLE = NULL; \
- else\
- { \
-_widget = EINA_INLIST_CONTAINER_GET(_widgets, Widget); \
-_classes = _widget-classes; \
-if (!_classes) STYLE = NULL; \
-else \
-{ \
- _class = EINA_INLIST_CONTAINER_GET(_classes, Class); \
- _styles = _class-styles; \
- if (!_styles) STYLE = NULL; \
- else \
- { \
- _style = EINA_INLIST_CONTAINER_GET(_styles, Style); \
- STYLE = _style; \
- } \
-} \
- } \
- if ((!STYLE) (PROJECT-layouts)) \
- { \
-_style = EINA_INLIST_CONTAINER_GET(PROJECT-layouts, Style); \
-STYLE = _style;\
- } \
- }
-
#define ITEM_SEARCH_FUNC(_gen, _GEN_SCROLL, PART_NAME) \
static void \
_##_gen##_item_search(Evas_Object *obj, \
diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c
index a3d5e14..ca34273 100644
--- a/src/bin/ui/connector.c
+++ b/src/bin/ui/connector.c
@@ -370,7 +370,7 @@ _add_layout_cb(void *data,
App_Data *ap = app_data_get();
Style *layout = NULL;
Eina_Stringshare *name = NULL;
- Evas_Object *group_obj, *en;
+ Evas_Object *en;
widget_list = _widgetlist_current_genlist_get(ap, LAYOUT);
en = (Evas_Object *)data;
@@ -380,12 +380,8 @@ _add_layout_cb(void *data,
NOTIFY_WARNING(_(Please type layout name));
goto exit;
}
- GET_STYLE(ap-project, layout);
- /* Using aliased group, if the group we've found is alias. */
- group_obj = (layout-isAlias) ? layout-main_group-obj : layout-obj;
-
- if (edje_edit_group_exist(group_obj, name))
+ if (edje_edit_group_exist(ap-project-global_object, name))
{
NOTIFY_INFO(3, _(Failed to create new layout.));
ERR(Failed to create new layout: all avalaible names are existing);
@@ -393,7 +389,7 @@ _add_layout_cb(void *data,
return;
}
- if (!edje_edit_group_add(group_obj, name))
+ if (!edje_edit_group_add(ap-project-global_object, name))
{
NOTIFY_INFO(3, _(Failed to create new layout.));
ERR(Failed to create new layout: edje edit group add is failed);
diff --git a/src/bin/ui/editors/colorclass_manager.c
b/src/bin/ui/editors/colorclass_manager.c
index df9a333..b0a06c2 100644
--- a/src/bin/ui/editors/colorclass_manager.c
+++ b/src/bin/ui/editors/colorclass_manager.c
@@ -412,19 +412,16 @@ _on_btn_apply(void *data,
Uns_List *it = NULL;
Colorclass_Item *ccl_it = NULL;
- Style *style = NULL;
- GET_STYLE(edit-pr, style);
-
EINA_LIST_FOREACH(edit-unapplied_list, l, it)
{
ccl_it = (Colorclass_Item *)it-data;
if (it-act_type == ACTION_TYPE_DEL)
- edje_edit_color_class_del(style-obj, ccl_it-name);
+ edje_edit_color_class_del(edit-pr-global_object, ccl_it-name);
else
{
- edje_edit_color_class_add(style-obj,
eina_stringshare_add(ccl_it-name));
- edje_edit_color_class_colors_set(style-obj, ccl_it-name,
+ edje_edit_color_class_add(edit-pr-global_object,
eina_stringshare_add(ccl_it-name));
+ edje_edit_color_class_colors_set(edit-pr-global_object,
ccl_it-name,
ccl_it-r1, ccl_it-g1,
ccl_it-b1, ccl_it-a1,
ccl_it-r2, ccl_it-g2,
diff --git a/src/bin/ui/editors/image_editor.c
b/src/bin/ui/editors/image_editor.c
index b4012ff..713830a 100644
--- a/src/bin/ui/editors/image_editor.c
+++ b/src/bin/ui/editors/image_editor.c
@@ -596,7 +596,6 @@ _on_image_done(void *data,
Elm_Object_Item *item = NULL;
const Eina_List *images, *l;
const char *selected = event_info;
- Style *style = NULL;
Uns_List *image = NULL;
Image_Editor *img_edit =
[EGIT] [tools/eflete] master 09/21: widget_manager: remove isModify flag
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d073e232fa8be6065aa39b605ba3fbe29d25abc4
commit d073e232fa8be6065aa39b605ba3fbe29d25abc4
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 15:47:45 2015 +0300
widget_manager: remove isModify flag
---
src/bin/history/history.h| 1 -
src/bin/project_manager/widget_manager.c | 2 --
src/bin/project_manager/widget_manager.h | 1 -
src/bin/ui/connector.c | 5 -
src/bin/ui/dialogs/style_dialog.c| 1 -
src/bin/ui/editors/sound_editor.c| 22 --
6 files changed, 32 deletions(-)
diff --git a/src/bin/history/history.h b/src/bin/history/history.h
index d9d55ff..61696ed 100644
--- a/src/bin/history/history.h
+++ b/src/bin/history/history.h
@@ -306,7 +306,6 @@ history_module_del(Evas_Object *source);
* if (!edje_edit_part_name_set(style-obj, part-name, value)) return;
* project_changed();
* part-name = value;
- * style-isModify = true;
* history_diff_add(style-obj, PROPERTY, MODIFY, VAL_RENAME, old_value,
value,
*style-full_group_name, (void*)edje_edit_part_name_set,
*Rename, part-name, NULL, 0);
diff --git a/src/bin/project_manager/widget_manager.c
b/src/bin/project_manager/widget_manager.c
index 160d997..92b9b13 100644
--- a/src/bin/project_manager/widget_manager.c
+++ b/src/bin/project_manager/widget_manager.c
@@ -340,7 +340,6 @@ wm_style_add(const char* style_name, const char*
full_group_name,
style_edje-obj = NULL;
style_edje-parts = NULL;
style_edje-main_group = NULL;
- style_edje-isModify = false;
style_edje-isAlias = false;
style_edje-__type = style_type;
style_edje-parent = parent;
@@ -912,7 +911,6 @@ wm_style_parts_restack(Style *style, Eina_Stringshare
*part_name,
else
style-parts = eina_inlist_prepend_relative(style-parts, tmp_list,
tmp_prev);
- style-isModify = true;
return true;
}
diff --git a/src/bin/project_manager/widget_manager.h
b/src/bin/project_manager/widget_manager.h
index ef84b4e..714b09f 100644
--- a/src/bin/project_manager/widget_manager.h
+++ b/src/bin/project_manager/widget_manager.h
@@ -130,7 +130,6 @@ struct _Style
Eina_Stringshare *name; /** The name of style. */
Eina_Stringshare *full_group_name; /** The name of a block 'group' in
edc. */
Evas_Object *obj; /** Edje edit object, which loaded form theme file. */
-Eina_Bool isModify; /** Is it style modificated. */
/** is it Group an alias **/
Eina_Bool isAlias;
/** link to main group that is being aliased **/
diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c
index 4c5f83c..a3d5e14 100644
--- a/src/bin/ui/connector.c
+++ b/src/bin/ui/connector.c
@@ -403,7 +403,6 @@ _add_layout_cb(void *data,
pm_save_to_dev(ap-project, NULL, true);
layout = wm_style_add(name, name, LAYOUT, NULL);
- layout-isModify = true;
ap-project-layouts = eina_inlist_append(ap-project-layouts,
EINA_INLIST_GET(layout));
wm_style_data_load(layout, evas_object_evas_get(widget_list),
@@ -1047,9 +1046,6 @@ project_changed(Eina_Bool save)
pm_save_to_dev(ap-project, ap-project-current_style, save);
ap-project-changed = true;
ui_menu_disable_set(ap-menu, MENU_FILE_SAVE, false);
-
- if (ap-project-current_style)
- ap-project-current_style-isModify = true;
}
/**/
@@ -1714,7 +1710,6 @@ _selected_style_delete(Evas_Object *genlist, App_Data *ap)
wm_class_free(class_st);
}*/
- style_work-isModify = true;
project_changed(true);
ui_widget_list_class_data_reload(genlist, widget-classes);
diff --git a/src/bin/ui/dialogs/style_dialog.c
b/src/bin/ui/dialogs/style_dialog.c
index 002e087..1305752 100644
--- a/src/bin/ui/dialogs/style_dialog.c
+++ b/src/bin/ui/dialogs/style_dialog.c
@@ -269,7 +269,6 @@ _on_popup_btn_yes(void *data,
wm_style_data_load(style, evas_object_evas_get(ap-win),
ap-project-mmap_file);
_reload_classes(ap, dest_wdg-classes);
-style-isModify = true;
pm_save_to_dev(ap-project, style, true);
/* Selecting added style in genlist! */
diff --git a/src/bin/ui/editors/sound_editor.c
b/src/bin/ui/editors/sound_editor.c
index 141bcc8..d06c0f0 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -658,9 +658,6 @@ _on_ok_cb(void *data,
{
Evas_Object *edje_edit_obj;
Eina_List *l;
- Widget *widget;
- Class *class;
- Style *style;
Sound *snd;
Eina_Bool multiselect;
char *ei;
@@ -679,25 +676,6 @@ _on_ok_cb(void *data,
}
project_changed(true);
-if (edit-pr-layouts)
- {
- style = EINA_INLIST_CONTAINER_GET(edit-pr-layouts, Style);
- if (style)
-
[EGIT] [tools/eflete] master 06/21: project_manager: create global object on project open
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=de4c1f7e5fc6e5a1d331b5e3af9319fe4ab72afc commit de4c1f7e5fc6e5a1d331b5e3af9319fe4ab72afc Author: Andrii Kroitor an.kroi...@samsung.com Date: Wed Jul 8 15:31:55 2015 +0300 project_manager: create global object on project open --- src/bin/project_manager/project_manager.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/project_manager/project_manager.c b/src/bin/project_manager/project_manager.c index fde4661..2979d4f 100644 --- a/src/bin/project_manager/project_manager.c +++ b/src/bin/project_manager/project_manager.c @@ -422,6 +422,8 @@ _project_open_internal(Project *project) project-close_request = false; project-widgets = wm_widgets_list_new(project-dev); project-layouts = wm_layouts_list_new(project-dev); + project-global_object = edje_edit_object_add(evas_object_evas_get(app_data_get()-win)); + edje_object_mmap_set(project-global_object, project-mmap_file, EFLETE_INTERNAL_GROUP_NAME); } static void --
[EGIT] [tools/eflete] master 03/21: project_manager: move common project open code into internal function
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f907a7771b963965bc5cb5ed30ab5cb61ae3e688
commit f907a7771b963965bc5cb5ed30ab5cb61ae3e688
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 11:45:22 2015 +0300
project_manager: move common project open code into internal function
---
src/bin/project_manager/project_manager.c | 35 ++-
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index 3764c87..b602d6d 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -412,6 +412,18 @@ _project_linked_images_copy(Project_Thread *worker)
return true;
}
+static void
+_project_open_internal(Project *project)
+{
+ _project_dev_file_create(project);
+ project-mmap_file = eina_file_open(project-dev, false);
+
+ project-changed = false;
+ project-close_request = false;
+ project-widgets = wm_widgets_list_new(project-dev);
+ project-layouts = wm_layouts_list_new(project-dev);
+}
+
static void *
_project_import_edj(void *data,
Eina_Thread *thread __UNUSED__)
@@ -431,11 +443,8 @@ _project_import_edj(void *data,
PROGRESS_SEND(%s, _(Importing...));
_project_edj_file_copy(worker);
_copy_meta_data_to_pro(worker);
- _project_dev_file_create(worker-project);
WORKER_LOCK_TAKE;
- worker-project-mmap_file = eina_file_open(worker-project-dev, false);
- worker-project-widgets = wm_widgets_list_new(worker-project-dev);
- worker-project-layouts = wm_layouts_list_new(worker-project-dev);
+ _project_open_internal(worker-project);
WORKER_LOCK_RELEASE;
THREAD_TESTCANCEL;
WORKER_LOCK_TAKE;
@@ -553,14 +562,14 @@ _project_import_edc(void *data,
_project_edj_file_copy(worker);
ecore_file_recursive_rm(tmp_dirname);
eina_tmpstr_del(tmp_dirname);
- _project_linked_images_copy(worker);
_copy_meta_data_to_pro(worker);
- _project_dev_file_create(worker-project);
WORKER_LOCK_TAKE;
- worker-project-mmap_file = eina_file_open(worker-project-dev, false);
- worker-project-widgets = wm_widgets_list_new(worker-project-dev);
- worker-project-layouts = wm_layouts_list_new(worker-project-dev);
+ _project_open_internal(worker-project);
+ WORKER_LOCK_RELEASE;
+ THREAD_TESTCANCEL;
+ WORKER_LOCK_TAKE;
pm_project_resource_export(worker-project, NULL);
+ _project_linked_images_copy(worker);
edje_file_cache_flush();
WORKER_LOCK_RELEASE;
@@ -664,13 +673,9 @@ pm_project_open(const char *path)
project-version = 2;
}
TODO(Add crash recovery prompt here)
- _project_dev_file_create(project);
- project-mmap_file = eina_file_open(project-dev, false);
- project-changed = false;
- project-close_request = false;
- project-widgets = wm_widgets_list_new(project-dev);
- project-layouts = wm_layouts_list_new(project-dev);
+ _project_open_internal(project);
+
pm_project_meta_data_get(project, project-name, NULL, NULL, NULL, NULL);
if (!project-name) project-name = eina_stringshare_add(_(No title));
--
[EGIT] [tools/eflete] master 05/21: wizard_import_edc: change generated source for new project
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=6aa81048a216d01037381efdfdee88c6a344e43e
commit 6aa81048a216d01037381efdfdee88c6a344e43e
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 14:31:21 2015 +0300
wizard_import_edc: change generated source for new project
Always generate eflete internal group.
Default layout will be not added even if there are no widgets
---
src/bin/ui/wizard/wizard_import_edc.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/bin/ui/wizard/wizard_import_edc.c
b/src/bin/ui/wizard/wizard_import_edc.c
index 2dafee7..4e2f226 100644
--- a/src/bin/ui/wizard/wizard_import_edc.c
+++ b/src/bin/ui/wizard/wizard_import_edc.c
@@ -388,7 +388,6 @@ _edc_code_generate(Eina_Stringshare *path,
Wizard_Import_Edj_Win *wiew __UNUSED_
Eina_Strbuf *dep_edc = eina_strbuf_new();
int deps_count;
Widget_Item_Data *widget_item_data_iterator = widget_item_data;
- Eina_Bool are_widgets_included = false;
deps_count = _widgets_dependencies_setup(widget_item_data, dep_message);
if (deps_count)
@@ -403,6 +402,12 @@ _edc_code_generate(Eina_Stringshare *path,
Wizard_Import_Edj_Win *wiew __UNUSED_
eina_strbuf_free(dep_message);
eina_strbuf_append(edc, data.item: \version\ \110\;\n\n);
eina_strbuf_append(edc, collections {\n);
+
+ eina_strbuf_append(edc,group {\n);
+ eina_strbuf_append(edc, name: \ EFLETE_INTERNAL_GROUP_NAME
\;\n);
+ eina_strbuf_append(edc,}\n);
+
+ TODO(move fonts, colorclasses and macros to widgets where they are used);
eina_strbuf_append(edc,#include \fonts.edc\\n);
eina_strbuf_append(edc,#include \colorclasses.edc\\n);
eina_strbuf_append(edc,#include \macros.edc\\n);
@@ -411,7 +416,7 @@ _edc_code_generate(Eina_Stringshare *path,
Wizard_Import_Edj_Win *wiew __UNUSED_
_file_to_swap_copy(path, colorclasses);
_file_to_swap_copy(path, macros);
- are_widgets_included = _widgets_dependencies_generate(path, dep_edc);
+ _widgets_dependencies_generate(path, dep_edc);
eina_strbuf_append(edc, eina_strbuf_string_get(dep_edc));
eina_strbuf_free(dep_edc);
@@ -422,18 +427,10 @@ _edc_code_generate(Eina_Stringshare *path,
Wizard_Import_Edj_Win *wiew __UNUSED_
eina_strbuf_append_printf(edc,#include \%s.edc\\n,
widget_item_data_iterator-name);
_file_to_swap_copy(path, widget_item_data_iterator-name);
- are_widgets_included = true;
}
widget_item_data_iterator++;
}
- if (!are_widgets_included)
- {
-eina_strbuf_append(edc,group {\n);
-eina_strbuf_append(edc, name: \new/layout/0\;\n);
-eina_strbuf_append(edc,}\n);
- }
-
eina_strbuf_append(edc, }\n);
return edc;
}
--
[EGIT] [tools/eflete] master 18/21: UTC: add failed only report
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=b26611cae60e4bedbc30737efa727d7bef3fc784
commit b26611cae60e4bedbc30737efa727d7bef3fc784
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Fri Jul 10 12:25:34 2015 +0300
UTC: add failed only report
---
Makefile.am | 6 ++
tests/tests_report_generator.py | 9 ++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8399634..0019562 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,12 @@ report_failed:
echo Cleaning report files... rm -rf tests/*.log tests/html/*
*.tmp report.html
$(MAKE) $(AM_MAKEFLAGS) check || true
cd tests doxygen Doxyfile cd ..
+ ${top_srcdir}/tests/tests_report_generator.py -i -n -o report.html
${top_builddir}/tests/html/ ${top_builddir}/tests/
+
+report_failed_and_notfound:
+ echo Cleaning report files... rm -rf tests/*.log tests/html/*
*.tmp report.html
+ $(MAKE) $(AM_MAKEFLAGS) check || true
+ cd tests doxygen Doxyfile cd ..
${top_srcdir}/tests/tests_report_generator.py -i -o report.html
${top_builddir}/tests/html/ ${top_builddir}/tests/
report_debug:
diff --git a/tests/tests_report_generator.py b/tests/tests_report_generator.py
index 40df058..68e8786 100755
--- a/tests/tests_report_generator.py
+++ b/tests/tests_report_generator.py
@@ -54,7 +54,7 @@ def walk_dirs(prefix):
if html.endswith('.html'):
parse_doc(html)
-def gen_report(logs_dir, output_file, ignorepassed):
+def gen_report(logs_dir, output_file, ignorepassed, ignorenotfound):
with open(output_file, 'w') as out:
out.write('htmlbodytable border=1\n')
for tmp_file in os.listdir('.'):
@@ -76,6 +76,7 @@ def gen_report(logs_dir, output_file, ignorepassed):
try:
while i
len(tmp_lines):
passed_flag = False
+
found_flag = False
tmp_out
=
i = i +
1
test_id
= tmp_lines[i].split(/tdtd, 3)[1][:-1]
@@ -92,6 +93,7 @@ def gen_report(logs_dir, output_file, ignorepassed):
passed = 'td bgcolor=#00Result not found/td'
if test_id in lines[j]:
log_split = lines[j].split(':', 7)
+
found_flag = True;
if log_split[2] == 'P':
passed_flag = True
result = tmp_split[2]
@@ -111,7 +113,7 @@ def gen_report(logs_dir, output_file, ignorepassed):
tmp_out
= tmp_out + tmp_split[2] + '/tdtd'
tmp_out
= tmp_out + result + '/td'
tmp_out
= tmp_out + passed + '/tr'
- if not
passed_flag or not ignorepassed:
+ if (not
passed_flag or not ignorepassed) and (found_flag or not ignorenotfound):
out.write(tmp_out)
while
not '/tr' in tmp_lines[i]:
i = i + 1
@@ -131,6 +133,7 @@ def main():
parser.add_argument('log', help='path to the tests log directory')
parser.add_argument('-c', '--clean', action='store_true', help='removes
all *.tmp files from current directory before processing')
parser.add_argument('-i', '--ignorepassed', action='store_true',
help='do not add passed test to output')
+ parser.add_argument('-n', '--ignorenotfound', action='store_true',
help='do not add not found test to output')
parser.add_argument('-t', '--tmp', action='store_true', help='do not
remove
[EGIT] [tools/eflete] master 13/21: Property: multiplier min value should be 0
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=a997a7c9502544689e7b2cf43be6bfd528f37da0 commit a997a7c9502544689e7b2cf43be6bfd528f37da0 Author: Vyacheslav Reutskiy v.reuts...@samsung.com Date: Thu Jul 9 07:58:42 2015 +0300 Property: multiplier min value should be 0 @fix Change-Id: I3323707b848a89b2601ded0e175ebeca02aa4c08 --- src/bin/ui/blocks/ui_property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ui/blocks/ui_property.c b/src/bin/ui/blocks/ui_property.c index 0b8dfae..cb1c9e9 100644 --- a/src/bin/ui/blocks/ui_property.c +++ b/src/bin/ui/blocks/ui_property.c @@ -1371,7 +1371,7 @@ STATE_ATTR_2SPINNER(_(aspect ratio), state, aspect_min, aspect_max, state, 0, _(Normally width and height can be resized to any values independently), _(Normally width and height can be resized to any values independently), 100, double, VAL_DOUBLE) -STATE_ATTR_2SPINNER(_(multiplier), state, minmul_w, minmul_h, state, 1.0, .0, 0.1, %.1f, w:, , h:, , +STATE_ATTR_2SPINNER(_(multiplier), state, minmul_w, minmul_h, state, 0.0, .0, 0.1, %.1f, w:, , h:, , _(The minimal part width value multiplier for current state), _(The minimal part height value multiplier for current state), 1, double, VAL_DOUBLE) --
[EGIT] [tools/eflete] master 16/21: UTC: fix build
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=771a88e8682bc4827b40415a02afd62668ce3b25 commit 771a88e8682bc4827b40415a02afd62668ce3b25 Author: Andrii Kroitor an.kroi...@samsung.com Date: Fri Jul 10 10:38:13 2015 +0300 UTC: fix build --- tests/test_project_manager/pm_project_save.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_project_manager/pm_project_save.c b/tests/test_project_manager/pm_project_save.c index b93b596..4b1660e 100644 --- a/tests/test_project_manager/pm_project_save.c +++ b/tests/test_project_manager/pm_project_save.c @@ -91,7 +91,6 @@ EFLETE_TEST (pm_project_save_test_p) edje_edit_state_min_w_set(style-obj, part-name, default, 0.0, 10); } -style-isModify = true; } } } --
[EGIT] [tools/eflete] master 12/21: Property: don't unset the color_class on part color set
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=5f923eacdc2de88b5ac56f2d988ee5bf3cd8e5af commit 5f923eacdc2de88b5ac56f2d988ee5bf3cd8e5af Author: Vyacheslav Reutskiy v.reuts...@samsung.com Date: Wed Jul 8 15:07:49 2015 +0300 Property: don't unset the color_class on part color set Part color and color class color must be multiplayed, but not replaced. @fix Change-Id: I71857f7e121ea45038dcd2a7326247ae5c2906a4 --- src/bin/ui/blocks/property_macros.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/bin/ui/blocks/property_macros.h b/src/bin/ui/blocks/property_macros.h index cc742bc..c4e7474 100644 --- a/src/bin/ui/blocks/property_macros.h +++ b/src/bin/ui/blocks/property_macros.h @@ -1649,9 +1649,6 @@ _on_##MEMBER##_##VALUE##_change(void *data, \ r, g, b, a))\ return; \ evas_object_color_set(pd-MEMBER.VALUE##_obj, r*a/255, g*a/255, b*a/255, a); \ - edje_edit_state_color_class_set(pd-wm_style-obj, pd-wm_part-name, \ - pd-wm_part-curr_state, \ - pd-wm_part-curr_state_value, NULL); \ if ((r != old_r) || (g != old_g) || (b != old_b) || (a != old_a)) \ history_diff_add(pd-wm_style-obj, PROPERTY, MODIFY, VAL_FOUR, old_r, old_g, old_b, \ old_a, r, g, b, a, pd-wm_style-full_group_name, \ --
[EGIT] [tools/eflete] master 17/21: project_manager: add ecore_evas buffer to project
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=357092657231c9b54f85250b169f439dbad1e2a7
commit 357092657231c9b54f85250b169f439dbad1e2a7
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Fri Jul 10 12:08:45 2015 +0300
project_manager: add ecore_evas buffer to project
---
src/bin/project_manager/project_manager.c | 30 +++---
src/bin/project_manager/project_manager.h | 2 ++
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index c1f73fa..429b516 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -110,7 +110,8 @@ const char *top_levels[] = { collections,
}
static Eina_Bool
-_image_resources_export(Eina_List *images, Eina_Stringshare *destination,
+_image_resources_export(Project *project,
+Eina_List *images, Eina_Stringshare *destination,
Eina_Stringshare *source, Eina_Stringshare *dev,
Evas_Object *edje_edit);
@@ -338,7 +339,6 @@ _project_linked_images_copy(Project_Thread *worker)
Eina_List *list, *l;
Evas_Object *edje_edit_obj;
Evas *e;
- Ecore_Evas *ee;
const char *name;
const char *file_name;
Eina_Strbuf *strbuf_to = eina_strbuf_new();
@@ -347,14 +347,12 @@ _project_linked_images_copy(Project_Thread *worker)
Eina_Bool is_changed = false;
ecore_thread_main_loop_begin();
- ee = ecore_evas_buffer_new(0, 0);
- e = ecore_evas_get(ee);
+ e = ecore_evas_get(worker-project-ecore_evas);
list = edje_file_collection_list(worker-project-saved_edj);
edje_edit_obj = edje_edit_object_add(e);
if (!edje_object_file_set(edje_edit_obj, worker-project-saved_edj,
eina_list_data_get(list)))
{
evas_object_del(edje_edit_obj);
-ecore_evas_free(ee);
edje_file_collection_list_free(list);
ecore_thread_main_loop_end();
return false;
@@ -407,7 +405,6 @@ _project_linked_images_copy(Project_Thread *worker)
eina_strbuf_free(strbuf_from);
ecore_thread_main_loop_begin();
evas_object_del(edje_edit_obj);
- ecore_evas_free(ee);
ecore_thread_main_loop_end();
return true;
}
@@ -422,7 +419,8 @@ _project_open_internal(Project *project)
project-close_request = false;
project-widgets = wm_widgets_list_new(project-dev);
project-layouts = wm_layouts_list_new(project-dev);
- project-global_object =
edje_edit_object_add(evas_object_evas_get(app_data_get()-win));
+ project-ecore_evas = ecore_evas_buffer_new(0, 0);
+ project-global_object =
edje_edit_object_add(ecore_evas_get(project-ecore_evas));
edje_object_mmap_set(project-global_object, project-mmap_file,
EFLETE_INTERNAL_GROUP_NAME);
}
@@ -449,6 +447,7 @@ _project_special_group_add(Project *project)
}
edje_edit_string_list_free(list);
evas_object_del(edje_edit_obj);
+ ecore_evas_free(project-ecore_evas);
ecore_thread_main_loop_end();
}
@@ -766,7 +765,7 @@ _project_save(void *data,
/* saving */
dest = eina_stringshare_printf(%s/images, worker-project-develop_path);
- _image_resources_export(add_list, dest, NULL, worker-project-dev,
edje_edit_obj);
+ _image_resources_export(worker-project, add_list, dest, NULL,
worker-project-dev, edje_edit_obj);
edje_edit_string_list_free(add_list);
EINA_LIST_FREE(worker-project-nsimage_list, it)
free(it);
@@ -847,6 +846,9 @@ pm_project_close(Project *project)
wm_widgets_list_free(project-widgets);
wm_layouts_list_free(project-layouts);
+ evas_object_del(project-global_object);
+ ecore_evas_free(project-ecore_evas);
+
eina_file_close(project-mmap_file);
ecore_file_unlink(project-dev);
@@ -947,13 +949,13 @@ pm_project_meta_data_set(Project *project,
}
static Eina_Bool
-_image_resources_export(Eina_List *images, Eina_Stringshare *destination,
+_image_resources_export(Project *project,
+Eina_List *images, Eina_Stringshare *destination,
Eina_Stringshare *source, Eina_Stringshare *dev,
Evas_Object *edje_edit)
{
Eina_Stringshare *image_name, *source_file, *dest_file;
Eina_List *l;
- Ecore_Evas *ee;
Evas *e;
Evas_Object *im;
int id;
@@ -966,8 +968,7 @@ _image_resources_export(Eina_List *images, Eina_Stringshare
*destination,
ERR(Failed create path %s for export images, destination);
return false;
}
- ee = ecore_evas_buffer_new(0, 0);
- e = ecore_evas_get(ee);
+ e = ecore_evas_get(project-ecore_evas);
}
else return false;
EINA_LIST_FOREACH(images, l, image_name)
@@ -1011,7 +1012,6 @@ _image_resources_export(Eina_List *images,
Eina_Stringshare *destination,
eina_stringshare_del(dest_file);
}
ecore_thread_main_loop_begin();
- ecore_evas_free(ee);
[EGIT] [tools/eflete] master 14/21: widget_manager: hide special internal group from list
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=839c1470f5b50a0583cdd41302130d01720b4798
commit 839c1470f5b50a0583cdd41302130d01720b4798
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Thu Jul 9 11:56:44 2015 +0300
widget_manager: hide special internal group from list
---
src/bin/project_manager/widget_manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/project_manager/widget_manager.c
b/src/bin/project_manager/widget_manager.c
index 92b9b13..43eaf6f 100644
--- a/src/bin/project_manager/widget_manager.c
+++ b/src/bin/project_manager/widget_manager.c
@@ -650,7 +650,7 @@ wm_layouts_list_new(const char *file)
EINA_LIST_FOREACH(collection, l, group)
{
-if (!eina_str_has_prefix(group, prefix))
+if (!eina_str_has_prefix(group, prefix) strcmp(group,
EFLETE_INTERNAL_GROUP_NAME))
{
layout = wm_style_add(group, group, LAYOUT, NULL);
layouts = eina_inlist_append(layouts, EINA_INLIST_GET(layout));
--
[EGIT] [tools/eflete] master 04/21: project_manager: add special group for global actions
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f626ecc354245e63266237eeb20bc6a5655cee20
commit f626ecc354245e63266237eeb20bc6a5655cee20
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Wed Jul 8 14:16:38 2015 +0300
project_manager: add special group for global actions
Up Eflete project (.pro file) to 3.
---
src/bin/project_manager/project_manager.c | 36 +++
src/bin/project_manager/project_manager.h | 4 +++-
src/bin/project_manager/widget_manager.h | 1 +
3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index b602d6d..fde4661 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -424,6 +424,33 @@ _project_open_internal(Project *project)
project-layouts = wm_layouts_list_new(project-dev);
}
+static void
+_project_special_group_add(Project *project)
+{
+ Evas *e;
+ Evas_Object *edje_edit_obj;
+ Eina_List *list;
+
+ ecore_thread_main_loop_begin();
+
+ Ecore_Evas *ee = ecore_evas_buffer_new(0, 0);
+ e = ecore_evas_get(ee);
+ list = edje_file_collection_list(project-saved_edj);
+ edje_edit_obj = edje_edit_object_add(e);
+
+ edje_object_file_set(edje_edit_obj, project-saved_edj,
eina_list_data_get(list));
+
+ if (!edje_edit_group_exist(edje_edit_obj, EFLETE_INTERNAL_GROUP_NAME))
+ {
+edje_edit_group_add(edje_edit_obj, EFLETE_INTERNAL_GROUP_NAME);
+edje_edit_without_source_save(edje_edit_obj, false);
+ }
+ edje_edit_string_list_free(list);
+ evas_object_del(edje_edit_obj);
+
+ ecore_thread_main_loop_end();
+}
+
static void *
_project_import_edj(void *data,
Eina_Thread *thread __UNUSED__)
@@ -444,6 +471,7 @@ _project_import_edj(void *data,
_project_edj_file_copy(worker);
_copy_meta_data_to_pro(worker);
WORKER_LOCK_TAKE;
+ _project_special_group_add(worker-project);
_project_open_internal(worker-project);
WORKER_LOCK_RELEASE;
THREAD_TESTCANCEL;
@@ -564,6 +592,7 @@ _project_import_edc(void *data,
eina_tmpstr_del(tmp_dirname);
_copy_meta_data_to_pro(worker);
WORKER_LOCK_TAKE;
+ _project_special_group_add(worker-project);
_project_open_internal(worker-project);
WORKER_LOCK_RELEASE;
THREAD_TESTCANCEL;
@@ -672,6 +701,12 @@ pm_project_open(const char *path)
ecore_file_mv(project-dev, project-saved_edj);
project-version = 2;
}
+ if (project-version 3) /* upgrade to version 3 */
+ {
+WARN(_(Old project version. Project files were updated.));
+_project_special_group_add(project);
+project-version = 3;
+ }
TODO(Add crash recovery prompt here)
_project_open_internal(project);
@@ -1262,6 +1297,7 @@ pm_project_resource_export(Project *pro, const char*
dir_path)
ecore_thread_main_loop_begin();
Ecore_Evas *ee = ecore_evas_buffer_new(0, 0);
e = ecore_evas_get(ee);
+
list = edje_file_collection_list(pro-dev);
edje_edit_obj = edje_edit_object_add(e);
if (!edje_object_mmap_set(edje_edit_obj, pro-mmap_file,
eina_list_data_get(list)))
diff --git a/src/bin/project_manager/project_manager.h
b/src/bin/project_manager/project_manager.h
index fbb3284..705be29 100644
--- a/src/bin/project_manager/project_manager.h
+++ b/src/bin/project_manager/project_manager.h
@@ -43,7 +43,7 @@
#include Eet.h
/* don't forget to update on major changes */
-#define PROJECT_FILE_VERSION 2
+#define PROJECT_FILE_VERSION 3
typedef struct _Enventor_Data Enventor_Data;
@@ -67,6 +67,8 @@ struct _Project
Eina_Stringshare *pro_path;
/** this is worrking file, all changes are happened in this file. */
Eina_Stringshare *dev;
+ /** edje_edit_object for global operations */
+ Evas_Object *global_object;
/** this is saved file. */
Eina_Stringshare *saved_edj;
diff --git a/src/bin/project_manager/widget_manager.h
b/src/bin/project_manager/widget_manager.h
index 9dd9b38..ef84b4e 100644
--- a/src/bin/project_manager/widget_manager.h
+++ b/src/bin/project_manager/widget_manager.h
@@ -50,6 +50,7 @@
#include Edje_Edit.h
#include logger.h
+#define EFLETE_INTERNAL_GROUP_NAME___eflete_internal_group___
/**
* @enum _Type
* @ingroup WidgetManager
--
[EGIT] [tools/eflete] master 15/21: connector: allow to delete last group in the project
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=96f9b553d39459d7ed3f4e6b51bb11306c64e19a
commit 96f9b553d39459d7ed3f4e6b51bb11306c64e19a
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Thu Jul 9 12:07:57 2015 +0300
connector: allow to delete last group in the project
---
src/bin/ui/connector.c | 96 +++---
1 file changed, 5 insertions(+), 91 deletions(-)
diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c
index ca34273..643a1e7 100644
--- a/src/bin/ui/connector.c
+++ b/src/bin/ui/connector.c
@@ -1498,71 +1498,11 @@ _project_close_request(App_Data *ap, Eina_Bool changed)
}
/**/
-static Style *
-_style_with_another_object_get(Project *pro, Style *given_style)
-{
- Widget *widget = NULL;
- Class *class = NULL;
- Style *another_style = NULL;
- /* try to find layout. */
- EINA_INLIST_FOREACH(pro-layouts, another_style)
- {
-if (another_style-full_group_name == given_style-full_group_name)
- continue;
-if (!another_style-isAlias)
- return another_style;
- }
- /* try to find style */
- EINA_INLIST_FOREACH(pro-widgets, widget)
- {
-EINA_INLIST_FOREACH(widget-classes, class)
- {
- EINA_INLIST_FOREACH(class-styles, another_style)
-{
- if (another_style-full_group_name ==
given_style-full_group_name)
- continue;
- if (!another_style-isAlias)
- return another_style;
-}
- }
- }
- return NULL;
-}
-
-static Style *
-_style_from_another_class_with_another_object_get(Project *pro, Class
*given_class)
-{
- Widget *widget = NULL;
- Class *class = NULL;
- Style *another_style = NULL;
- /* try to find layout. */
- EINA_INLIST_FOREACH(pro-layouts, another_style)
- {
-if (!another_style-isAlias)
- return another_style;
- }
- /* try to find style */
- EINA_INLIST_FOREACH(pro-widgets, widget)
- {
-EINA_INLIST_FOREACH(widget-classes, class)
- {
- if (class-name != given_class-name)
- {
- EINA_INLIST_FOREACH(class-styles, another_style)
-return another_style;
- }
- }
- }
- return NULL;
-}
-
-
static Eina_Bool
_selected_layout_delete(Evas_Object *genlist, App_Data *ap)
{
Elm_Object_Item *item_to_del = elm_genlist_selected_item_get(genlist), *eoi;
Style *style = elm_object_item_data_get(item_to_del);;
- Style *style_work = NULL;
int i;
if (!item_to_del)
@@ -1583,17 +1523,9 @@ _selected_layout_delete(Evas_Object *genlist, App_Data
*ap)
i--;
}
- style_work = _style_with_another_object_get(ap-project, style);
-
- if (!style_work)
- {
-NOTIFY_INFO(3, _(Can not delete last layout));
-return false;
- }
-
- pm_save_to_dev(ap-project, style_work, true);
+ pm_save_to_dev(ap-project, NULL, true);
evas_object_del(style-obj);
- if (!edje_edit_group_del(style_work-obj, style-full_group_name))
+ if (!edje_edit_group_del(ap-project-global_object,
style-full_group_name))
{
NOTIFY_INFO(3, _(Failed to delete layout[%s]),
style-name);
@@ -1627,7 +1559,6 @@ _selected_style_delete(Evas_Object *genlist, App_Data *ap)
Class *class_st = NULL;
Style *style = NULL;
Style *alias_style = NULL;
- Style *style_work = NULL;
Elm_Object_Item *eoi = elm_genlist_selected_item_get(genlist);
Eina_List *l = NULL;
@@ -1649,17 +1580,6 @@ _selected_style_delete(Evas_Object *genlist, App_Data
*ap)
if (class_st-__type != CLASS) return false;
- if (style)
- style_work = _style_with_another_object_get(ap-project, style);
- else
- style_work =
_style_from_another_class_with_another_object_get(ap-project, class_st);
-
- if (!style_work)
- {
-ERR(Failed search style object from another class);
-return false;
- }
-
if (style) /* Deleting style */
{
Evas_Object *st_cur = style-obj;
@@ -1680,9 +1600,9 @@ _selected_style_delete(Evas_Object *genlist, App_Data *ap)
wm_style_free(alias_style);
}
/*Delete loaded object for unlock group in edj file*/
-pm_save_to_dev(ap-project, style_work, true);
+pm_save_to_dev(ap-project, NULL, true);
evas_object_del(style-obj);
-if (!edje_edit_group_del(style_work-obj, style-full_group_name))
+if (!edje_edit_group_del(ap-project-global_object,
style-full_group_name))
{
NOTIFY_INFO(3, _(Failed to delete style[%s]), style-name);
return false;
@@ -1699,7 +1619,7 @@ _selected_style_delete(Evas_Object *genlist, App_Data *ap)
EINA_INLIST_FOREACH_SAFE(class_st-styles, l,
[EGIT] [tools/eflete] master 20/21: UTC: fix project_manager tests
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=574c451eed529d7b9780c438de8b9f9e8a3e8013 commit 574c451eed529d7b9780c438de8b9f9e8a3e8013 Author: Andrii Kroitor an.kroi...@samsung.com Date: Fri Jul 10 15:45:32 2015 +0300 UTC: fix project_manager tests --- tests/edj_build/Makefile.am | 1 + tests/test_project_manager/pm_project_thread_cancel.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/edj_build/Makefile.am b/tests/edj_build/Makefile.am index 408073b..0839c88 100644 --- a/tests/edj_build/Makefile.am +++ b/tests/edj_build/Makefile.am @@ -87,6 +87,7 @@ check: Makefile $(builddir)/history_diff_add.edj \ $(builddir)/preference.edj \ $(builddir)/project_manager.edj \ + $(builddir)/project_thread_cancel.edj \ ;do cp $(builddir)/radio.edj $$i; done clean-local: rm -f *.edj diff --git a/tests/test_project_manager/pm_project_thread_cancel.c b/tests/test_project_manager/pm_project_thread_cancel.c index fe6b79e..cc4b46a 100644 --- a/tests/test_project_manager/pm_project_thread_cancel.c +++ b/tests/test_project_manager/pm_project_thread_cancel.c @@ -71,7 +71,7 @@ EFLETE_TEST (pm_project_thread_cancel_test_p) app_init(); res = EINA_FALSE; - thread = pm_project_import_edj(UTC, ., ./edj_build/test_project_manager.edj, + thread = pm_project_import_edj(UTC, ., ./edj_build/test_project_manager_thread_cancel.edj, NULL, _test_end_cb, NULL); pm_project_thread_cancel(thread); ecore_main_loop_begin(); --
[EGIT] [tools/eflete] master 19/21: UTC: fix ui_widget test
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=e7264a8b0fb2deb306d6bce44bba7ca8a47eb44b commit e7264a8b0fb2deb306d6bce44bba7ca8a47eb44b Author: Andrii Kroitor an.kroi...@samsung.com Date: Fri Jul 10 15:24:29 2015 +0300 UTC: fix ui_widget test --- tests/test_ui_widget_list/test_ui_widget_list.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_ui_widget_list/test_ui_widget_list.h b/tests/test_ui_widget_list/test_ui_widget_list.h index 8ef36e4..db68397 100644 --- a/tests/test_ui_widget_list/test_ui_widget_list.h +++ b/tests/test_ui_widget_list/test_ui_widget_list.h @@ -24,7 +24,7 @@ * @defgroup test_ui_widget_list */ -#define TEST_NAME widgtet_list +#define TEST_NAME widget_list void ui_widget_list_add_test_p(int); void ui_widget_list_add_test_n(int); --
[EGIT] [tools/enventor] master 01/01: indent: free memory correctly.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d5f66885ac3d9851abe394121f94eb7ed5f3d031
commit d5f66885ac3d9851abe394121f94eb7ed5f3d031
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 10 23:46:24 2015 +0900
indent: free memory correctly.
---
src/lib/indent.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/indent.c b/src/lib/indent.c
index c4bb087..de64bca 100644
--- a/src/lib/indent.c
+++ b/src/lib/indent.c
@@ -103,7 +103,11 @@ indent_insert_bracket_case(indent_data *id, Evas_Object
*entry, int cur_line)
}
int space = indent_space_get(id, entry);
- if (space == len) return;
+ if (space == len)
+ {
+free(utf8);
+return;
+ }
int i = 0;
if (len space)
--
[EGIT] [core/enlightenment] master 01/01: adjust layering of pointer and init splash
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=e92519f17168c362bf424090277b89eeb2b03dcb
commit e92519f17168c362bf424090277b89eeb2b03dcb
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Jul 10 14:21:50 2015 -0400
adjust layering of pointer and init splash
prevents cursor from getting stuck above screensaver fade
---
src/bin/e_init.c| 2 +-
src/bin/e_pointer.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index f009f13..3791a60 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -66,7 +66,7 @@ e_init_show(void)
evas_object_clip_set(o, zone-bg_clip_object);
evas_object_move(o, zone-x, zone-y);
evas_object_resize(o, zone-w, zone-h);
-evas_object_layer_set(o, E_LAYER_MAX);
+evas_object_layer_set(o, E_LAYER_MAX - 1000);
evas_object_show(o);
splash_objs = eina_list_append(splash_objs, o);
}
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index a6546ef..134950e 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -774,7 +774,7 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int
x, int y)
{
if (o == obj)
{
- ecore_evas_object_cursor_set(ptr-ee, obj, EVAS_LAYER_MAX, x, y);
+ ecore_evas_object_cursor_set(ptr-ee, obj, E_LAYER_MAX - 1, x, y);
return;
}
ec = e_comp_object_client_get(o);
@@ -788,10 +788,10 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj,
int x, int y)
ec = e_comp_object_client_get(obj);
if (ec)
ec-hidden = 1;
-ecore_evas_object_cursor_set(ptr-ee, obj, EVAS_LAYER_MAX, x, y);
+ecore_evas_object_cursor_set(ptr-ee, obj, E_LAYER_MAX - 1, x, y);
}
else
- ecore_evas_object_cursor_set(ptr-ee, ptr-o_ptr, EVAS_LAYER_MAX,
ptr-hot.x, ptr-hot.y);
+ ecore_evas_object_cursor_set(ptr-ee, ptr-o_ptr, E_LAYER_MAX - 1,
ptr-hot.x, ptr-hot.y);
}
E_API void
--
[EGIT] [core/enlightenment] master 01/01: add wayland client post-render references in the render loop
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=697e1beda3092dfc632bc954b03650c27b17c674
commit 697e1beda3092dfc632bc954b03650c27b17c674
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Jul 10 13:22:15 2015 -0400
add wayland client post-render references in the render loop
---
src/bin/e_comp.c| 2 +-
src/bin/e_comp_wl.c | 15 +++
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index c229002..2cf02b4 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -299,7 +299,7 @@ static Eina_Bool
_e_comp_client_update(E_Client *ec)
{
int pw, ph;
- Eina_Bool post = EINA_FALSE;
+ Eina_Bool post = !e_pixmap_is_x(ec-pixmap);
DBG(UPDATE [%p] pm = %p, ec, ec-pixmap);
if (e_object_is_del(E_OBJECT(ec))) return EINA_FALSE;
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 2fa8a56..700d159 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1771,12 +1771,7 @@ _e_comp_wl_subsurface_commit_from_cache(E_Client *ec)
e_comp_wl_buffer_reference(sdata-cached_buffer_ref, NULL);
- /* schedule repaint */
- if (e_pixmap_refresh(ec-pixmap))
- {
-e_comp-post_updates = eina_list_append(e_comp-post_updates, ec);
-e_object_ref(E_OBJECT(ec));
- }
+ e_pixmap_refresh(ec-pixmap);
}
static void
@@ -2802,12 +2797,8 @@ e_comp_wl_surface_commit(E_Client *ec)
_e_comp_wl_surface_state_commit(ec, ec-comp_data-pending);
ignored = ec-ignored;
- /* schedule repaint */
- if (e_pixmap_refresh(ec-pixmap))
- {
-e_comp-post_updates = eina_list_append(e_comp-post_updates, ec);
-e_object_ref(E_OBJECT(ec));
- }
+
+ e_pixmap_refresh(ec-pixmap);
if (!e_pixmap_usable_get(ec-pixmap))
{
--
[EGIT] [core/enlightenment] master 04/04: add function to fill in x11 cursor image on creation
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bec06b87037dd911b411405979d402cf807e5dfa
commit bec06b87037dd911b411405979d402cf807e5dfa
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Jul 10 13:04:12 2015 -0400
add function to fill in x11 cursor image on creation
xwayland compositing requires that we set up a root window cursor image
immediately since we'll be getting that cursor surface to display as soon
as the pointer goes out of an x11 client's window
---
src/bin/e_comp_x.c | 2 +-
src/bin/e_pointer.c | 10 ++
src/bin/e_pointer.h | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index b73cb99..9e02feb 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -5185,7 +5185,7 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h)
ecore_x_icccm_state_set(ecore_evas_window_get(e_comp-ee),
ECORE_X_WINDOW_STATE_HINT_NORMAL);
}
else
- e_comp-pointer-win = e_comp-root;
+ e_pointer_window_add(e_comp-pointer, e_comp-root);
_e_comp_x_manage_windows();
{
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 513b480..a6546ef 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -793,3 +793,13 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int
x, int y)
else
ecore_evas_object_cursor_set(ptr-ee, ptr-o_ptr, EVAS_LAYER_MAX,
ptr-hot.x, ptr-hot.y);
}
+
+E_API void
+e_pointer_window_add(E_Pointer *ptr, Ecore_Window win)
+{
+ char buf[1024];
+
+ ptr-win = win;
+ _e_pointer_theme_buf(ptr, buf);
+ _e_pointer_x11_setup(ptr, buf);
+}
diff --git a/src/bin/e_pointer.h b/src/bin/e_pointer.h
index 8aeed7f..91185a6 100644
--- a/src/bin/e_pointer.h
+++ b/src/bin/e_pointer.h
@@ -72,5 +72,6 @@ E_API void e_pointer_mode_push(void *obj, E_Pointer_Mode
mode);
E_API void e_pointer_mode_pop(void *obj, E_Pointer_Mode mode);
E_API void e_pointer_idler_before(void);
E_API void e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int
y);
+E_API void e_pointer_window_add(E_Pointer *ptr, Ecore_Window win);
# endif
#endif
--
[EGIT] [core/elementary] master 01/01: slider: remove useless code
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=93d480b64e1094bf37d6856cc9c640d5ffa83295
commit 93d480b64e1094bf37d6856cc9c640d5ffa83295
Author: Amitesh Singh amitesh...@samsung.com
Date: Fri Jul 10 21:17:59 2015 +0530
slider: remove useless code
---
src/lib/elm_slider.c | 4
1 file changed, 4 deletions(-)
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index cc14586..d81ed57 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -1039,10 +1039,6 @@ _elm_slider_min_max_set(Eo *obj, Elm_Slider_Data *sd,
double min, double max)
EOLIAN static void
_elm_slider_min_max_get(Eo *obj EINA_UNUSED, Elm_Slider_Data *sd, double *min,
double *max)
{
- if (min) *min = 0.0;
- if (max) *max = 0.0;
-
-
if (min) *min = sd-val_min;
if (max) *max = sd-val_max;
}
--
[EGIT] [core/enlightenment] master 01/04: disable netwm sync on x11 clients in wayland compositors
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c9d5053998d10f2ee97f7db031b2d2b24729f642
commit c9d5053998d10f2ee97f7db031b2d2b24729f642
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 9 19:32:51 2015 -0400
disable netwm sync on x11 clients in wayland compositors
this has no effect
---
src/bin/e_comp_x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index e528287..f6c88df 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -591,7 +591,7 @@ _e_comp_x_post_client_idler_cb(void *d EINA_UNUSED)
{
if (ec-post_resize)
{
- if (ec-netwm.sync.request)
+ if (ec-netwm.sync.request (e_comp-comp_type ==
E_PIXMAP_TYPE_X))
{
//INF(NETWM SYNC: %p, ec);
ec-netwm.sync.wait++;
@@ -2247,7 +2247,7 @@ _e_comp_x_mouse_move(void *d EINA_UNUSED, int t
EINA_UNUSED, Ecore_Event_Mouse_M
}
E_COMP_X_PIXMAP_CHECK ECORE_CALLBACK_RENEW;
if (_e_comp_x_client_data_get(ec)-deleted ||
e_client_util_ignored_get(ec)) return ECORE_CALLBACK_RENEW;
- if (e_client_util_resizing_get(ec)
+ if (e_client_util_resizing_get(ec) (e_comp-comp_type ==
E_PIXMAP_TYPE_X)
ec-netwm.sync.request
_e_comp_x_client_data_get(ec)-alarm
)
@@ -4480,7 +4480,7 @@ static void
_e_comp_x_hook_client_resize_begin(void *d EINA_UNUSED, E_Client *ec)
{
E_COMP_X_PIXMAP_CHECK;
- if (!ec-netwm.sync.request) return;
+ if ((!ec-netwm.sync.request) || (e_comp-comp_type != E_PIXMAP_TYPE_X))
return;
_e_comp_x_client_data_get(ec)-alarm =
ecore_x_sync_alarm_new(_e_comp_x_client_data_get(ec)-sync_counter);
eina_hash_add(alarm_hash, _e_comp_x_client_data_get(ec)-alarm, ec);
ec-netwm.sync.alarm = ec-netwm.sync.serial = 1;
--
[EGIT] [core/enlightenment] enlightenment-0.19 02/02: fix compile warning
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=276d9795347083618832236ad510c87ef70d commit 276d9795347083618832236ad510c87ef70d Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Fri Jul 10 13:11:42 2015 -0400 fix compile warning --- src/bin/e_grabinput.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index b40a742..6c154ee 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -1,7 +1,6 @@ #include e.h /* local subsystem functions */ -static Eina_Bool _e_grabinput_focus_check(void *data); static void _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method); static void _e_grabinput_focus(Ecore_Window win, E_Focus_Method method); --
[EGIT] [core/enlightenment] master 02/02: only register dnd xwindow with compositor canvas in x11 compositor mode
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=311f52409493733b4e9cb8893558597acfe87870
commit 311f52409493733b4e9cb8893558597acfe87870
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Jul 10 16:03:45 2015 -0400
only register dnd xwindow with compositor canvas in x11 compositor mode
registering it under wayland creates spurious mouse events
---
src/bin/e_dnd.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index fe4a993..78574af 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -280,8 +280,9 @@ e_drag_start(E_Drag *drag, int x, int y)
_drag_win = ecore_x_window_input_new(e_comp-win,
0, 0,
e_comp-w, e_comp-h);
-ecore_event_window_register(_drag_win, e_comp-ee, e_comp-evas,
- NULL, NULL, NULL, NULL);
+if (e_comp-comp_type == E_PIXMAP_TYPE_X)
+ ecore_event_window_register(_drag_win, e_comp-ee, e_comp-evas,
+NULL, NULL, NULL, NULL);
ecore_x_window_show(_drag_win);
}
#endif
@@ -1166,7 +1167,8 @@ _e_drag_free(E_Drag *drag)
#ifndef HAVE_WAYLAND_ONLY
if (e_comp_util_has_x())
{
-ecore_event_window_unregister(_drag_win);
+if (e_comp-comp_type == E_PIXMAP_TYPE_X)
+ ecore_event_window_unregister(_drag_win);
ecore_x_window_free(_drag_win);
ecore_x_window_shadow_tree_flush();
}
--
[EGIT] [core/enlightenment] master 01/02: fix xdnd in (x)wayland
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4a779ef03dd3f429582499b52d9f1bddf7d203a7
commit 4a779ef03dd3f429582499b52d9f1bddf7d203a7
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Jul 10 16:02:39 2015 -0400
fix xdnd in (x)wayland
this is a real thing, so don't abort immediately if it happens
---
src/bin/e_dnd.c | 47 ---
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index eb1dcac..fe4a993 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -108,7 +108,7 @@ e_dnd_init(void)
_type_text_x_moz_url = eina_stringshare_add(text/x-moz-url);
_type_enlightenment_x_file = eina_stringshare_add(enlightenment/x-file);
#ifndef HAVE_WAYLAND_ONLY
- if (e_comp-comp_type == E_PIXMAP_TYPE_X)
+ if (e_comp_util_has_x())
_text_atom = ecore_x_atom_get(text/plain);
#endif
@@ -207,7 +207,8 @@ e_drag_new(int x, int y,
_drag_list = eina_list_append(_drag_list, drag);
#ifndef HAVE_WAYLAND_ONLY
- ecore_x_window_shadow_tree_flush();
+ if (e_comp_util_has_x())
+ ecore_x_window_shadow_tree_flush();
#endif
_drag_win_root = e_comp-root;
@@ -274,18 +275,22 @@ e_drag_start(E_Drag *drag, int x, int y)
if (_drag_win) return 0;
#ifndef HAVE_WAYLAND_ONLY
- _drag_win = ecore_x_window_input_new(e_comp-win,
-0, 0,
-e_comp-w, e_comp-h);
- ecore_event_window_register(_drag_win, e_comp-ee, e_comp-evas,
- NULL, NULL, NULL, NULL);
- ecore_x_window_show(_drag_win);
+ if (e_comp_util_has_x())
+ {
+_drag_win = ecore_x_window_input_new(e_comp-win,
+ 0, 0,
+ e_comp-w, e_comp-h);
+ecore_event_window_register(_drag_win, e_comp-ee, e_comp-evas,
+ NULL, NULL, NULL, NULL);
+ecore_x_window_show(_drag_win);
+ }
#endif
_drag_win_root = e_comp-root;
- if (!e_grabinput_get(_drag_win, 1, _drag_win))
+ if (!e_grabinput_get(_drag_win, 0, _drag_win))
{
#ifndef HAVE_WAYLAND_ONLY
-ecore_x_window_free(_drag_win);
+if (e_comp_util_has_x())
+ ecore_x_window_free(_drag_win);
#endif
return 0;
}
@@ -294,6 +299,7 @@ e_drag_start(E_Drag *drag, int x, int y)
e_drag_object_set(drag, evas_object_rectangle_add(drag-evas));
evas_object_color_set(drag-object, 255, 0, 0, 255);
}
+ e_util_size_debug_set(drag-comp_object, 1);
evas_object_move(drag-comp_object, drag-x, drag-y);
evas_object_resize(drag-comp_object, drag-w, drag-h);
drag-visible = 1;
@@ -339,14 +345,14 @@ e_drag_xdnd_start(E_Drag *drag, int x, int y)
if (_drag_win) return 0;
#ifndef HAVE_WAYLAND_ONLY
- if (e_comp-comp_type != E_PIXMAP_TYPE_X) return 0;
+ if (!e_comp_util_has_x()) return 0;
_drag_win = ecore_x_window_input_new(e_comp-win,
0, 0,
e_comp-w, e_comp-h);
ecore_x_window_show(_drag_win);
#endif
- if (!e_grabinput_get(_drag_win, 1, _drag_win))
+ if (!e_grabinput_get(_drag_win, 0, _drag_win))
{
#ifndef HAVE_WAYLAND_ONLY
ecore_x_window_free(_drag_win);
@@ -411,7 +417,7 @@ e_drop_xds_update(Eina_Bool enable, const char *value)
int size;
size_t len;
- if (e_comp-comp_type != E_PIXMAP_TYPE_X) return;
+ if (!e_comp_util_has_x()) return;
enable = !!enable;
xwin = ecore_x_selection_owner_get(ECORE_X_ATOM_SELECTION_XDND);
@@ -524,7 +530,7 @@ e_drop_handler_del(E_Drop_Handler *handler)
E_API int
e_drop_xdnd_register_set(Ecore_Window win, int reg)
{
- if (e_comp-comp_type != E_PIXMAP_TYPE_X) return 0;
+ if (!e_comp_util_has_x()) return 0;
if (reg)
{
if (!eina_hash_find(_drop_win_hash, win))
@@ -996,14 +1002,13 @@ _e_drag_end(int x, int y)
evas_object_hide(_drag_current-comp_object);
e_grabinput_release(_drag_win, _drag_win);
+#ifndef HAVE_WAYLAND_ONLY
while (_drag_current-type == E_DRAG_XDND)
{
-#ifndef HAVE_WAYLAND_ONLY
if (!(dropped = ecore_x_dnd_drop()))
{
if (win == e_comp-ee_win) break;
}
-#endif
if (_drag_current-cb.finished)
_drag_current-cb.finished(_drag_current, dropped);
_drag_current-cb.finished = NULL;
@@ -1011,6 +1016,7 @@ _e_drag_end(int x, int y)
return;
}
+#endif
dropped = 0;
if (!_drag_current-data)
@@ -1158,9 +1164,12 @@ _e_drag_free(E_Drag *drag)
eina_stringshare_del(drag-types[i]);
free(drag);
#ifndef HAVE_WAYLAND_ONLY
- ecore_event_window_unregister(_drag_win);
- ecore_x_window_free(_drag_win);
- ecore_x_window_shadow_tree_flush();
+ if (e_comp_util_has_x())
+ {
+
[EGIT] [core/elementary] master 01/01: colorselector: fix compilation warnings.
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=64ee4422530f7c94a88f2b853653c6f90d7e5cd3
commit 64ee4422530f7c94a88f2b853653c6f90d7e5cd3
Author: Amitesh Singh amitesh...@samsung.com
Date: Fri Jul 10 20:47:24 2015 +0530
colorselector: fix compilation warnings.
---
src/lib/elm_colorselector.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index b536e45..7b0a2c2 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -817,7 +817,7 @@ _colorbar_arrow_set(Color_Bar_Data *cb_data, int mouse_x)
static void
_colorbar_down_cb(void *data,
- Evas *e,
+ Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info)
{
@@ -829,13 +829,12 @@ _colorbar_down_cb(void *data,
static void
_colorbar_move_cb(void *data,
- Evas *e,
+ Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info)
{
Evas_Event_Mouse_Move *ev = event_info;
Color_Bar_Data *cb_data = data;
- ELM_COLORSELECTOR_DATA_GET(cb_data-parent, sd);
if (!ev-buttons)
return;
--
[EGIT] [core/elementary] master 01/01: toolbar: Check return value of elm_layout_theme_set.
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9baca711689d3446c441249dfc213b1d494395f7
commit 9baca711689d3446c441249dfc213b1d494395f7
Author: Amitesh Singh amitesh...@samsung.com
Date: Fri Jul 10 20:54:23 2015 +0530
toolbar: Check return value of elm_layout_theme_set.
---
src/lib/elm_toolbar.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index cbff114..7849220 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1223,7 +1223,8 @@ _item_theme_hook(Evas_Object *obj,
if (!it-separator !it-object)
{
-elm_layout_theme_set(view, toolbar, item, style);
+if (!elm_layout_theme_set(view, toolbar, item, style))
+ CRI(Failed to set layout!);
if (it-selected)
{
elm_layout_signal_emit(view, elm,state,selected, elm);
@@ -1257,13 +1258,13 @@ _item_theme_hook(Evas_Object *obj,
{
if (!it-object)
{
- elm_layout_theme_set
- (view, toolbar, separator, style);
+ if (!elm_layout_theme_set(view, toolbar, separator, style))
+ CRI(Failed to set layout!);
}
else
{
- elm_layout_theme_set
- (view, toolbar, object, style);
+ if (!elm_layout_theme_set(view, toolbar, object, style))
+ CRI(Failed to set layout!);
elm_layout_content_set(view, elm.swallow.object, it-object);
}
}
@@ -2371,8 +2372,9 @@ _item_new(Evas_Object *obj,
evas_object_del(icon_obj);
}
- elm_layout_theme_set
- (VIEW(it), toolbar, item, elm_widget_style_get(obj));
+ if (!elm_layout_theme_set
+ (VIEW(it), toolbar, item, elm_widget_style_get(obj)))
+ CRI(Failed to set layout!);
elm_layout_signal_callback_add
(VIEW(it), elm,action,click, elm, _select_cb, it);
elm_layout_signal_callback_add
--
[EGIT] [core/enlightenment] master 01/01: delete render updates for xwayland clients upon triggering a client resize
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f3f29a0cf83412ae4f09fb1fbed065daca7c4047 commit f3f29a0cf83412ae4f09fb1fbed065daca7c4047 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Fri Jul 10 16:59:47 2015 -0400 delete render updates for xwayland clients upon triggering a client resize fixes frame dropping during resize --- src/bin/e_comp_x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 9e02feb..1e61492 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -931,8 +931,7 @@ _e_comp_x_evas_resize_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_i } ec-post_resize = 1; - if (e_pixmap_is_x(ec-pixmap)) - e_comp_object_render_update_del(ec-frame); + e_comp_object_render_update_del(ec-frame); _e_comp_x_post_client_idler_add(ec); } --
