[EGIT] [core/efl] master 01/01: ecore-drm: Fix segfault if sending output event and output has no current mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=eaf2b91a3db1d03e779de224a007813c1be4d7dc
commit eaf2b91a3db1d03e779de224a007813c1be4d7dc
Author: Chris Michael cp.mich...@samsung.com
Date: Thu May 14 08:36:57 2015 -0400
ecore-drm: Fix segfault if sending output event and output has no current
mode
Summary: This fixes a segfault which could happen if we enable an
output before setting the output current mode. Now we test for an
output having a current_mode, and if not we use the crtc size when
sending the output event.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_output.c | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index 276b74f..3c2c04c 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -42,13 +42,23 @@ _ecore_drm_output_event_send(const Ecore_Drm_Output
*output, Eina_Bool plug)
if (!(e = calloc(1, sizeof(Ecore_Drm_Event_Output return;
e-plug = plug;
e-id = output-crtc_id;
- e-w = output-current_mode-width;
- e-h = output-current_mode-height;
+
+ if (output-current_mode)
+ {
+e-w = output-current_mode-width;
+e-h = output-current_mode-height;
+e-refresh = output-current_mode-refresh;
+ }
+ else if (output-crtc)
+ {
+e-w = output-crtc-width;
+e-h = output-crtc-height;
+ }
+
e-x = output-x;
e-y = output-y;
e-phys_width = output-phys_width;
e-phys_height = output-phys_height;
- e-refresh = output-current_mode-refresh;
e-subpixel_order = output-subpixel;
e-make = eina_stringshare_ref(output-make);
e-model = eina_stringshare_ref(output-model);
--
[EGIT] [core/enlightenment] master 01/01: wl-drm: Don't enable/disable an output until after we have set the current mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=40b877f527b2a43d711c4acf073f3a62cf9bc9e1
commit 40b877f527b2a43d711c4acf073f3a62cf9bc9e1
Author: Chris Michael cp.mich...@samsung.com
Date: Thu May 14 08:38:13 2015 -0400
wl-drm: Don't enable/disable an output until after we have set the current
mode
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/modules/wl_drm/e_mod_main.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index cba2b20..668fe43 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -546,13 +546,11 @@ _drm_randr_apply(void)
if (s-config.enabled)
{
printf(\tDRM RRR: Enabled\n);
- ecore_drm_output_enable(out);
mode = _e_mod_drm_mode_screen_find(s, out);
}
else
{
printf(\tDRM RRR: Disabled\n);
- ecore_drm_output_disable(out);
}
if (s-config.priority top_priority)
@@ -586,6 +584,11 @@ _drm_randr_apply(void)
if (s-config.priority == top_priority)
ecore_drm_output_primary_set(out);
+ if (s-config.enabled)
+ecore_drm_output_enable(out);
+ else
+ecore_drm_output_disable(out);
+
printf(\tDRM RRR: Mode\n);
printf(\t\tDRM RRR: Geom: %d %d\n,
s-config.mode.w, s-config.mode.h);
--
[EGIT] [core/elementary] master 01/01: genlist: fix to return item style correctly.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=685cfef7d9f887008061bd394d47d1b309b91e80
commit 685cfef7d9f887008061bd394d47d1b309b91e80
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu May 14 22:21:05 2015 +0900
genlist: fix to return item style correctly.
Since the genlist items can be unrealized,
they own the tooltip strings in their item field.
Also, the tooltip string should be returned with it.
@fix
---
src/lib/elm_genlist.c | 6 ++
src/lib/elm_genlist_item.eo | 1 +
2 files changed, 7 insertions(+)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index c41115f..18dcee4 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -7037,6 +7037,12 @@ elm_genlist_item_tooltip_style_get(const Elm_Object_Item
*it)
return eo_do_ret(it, ret, elm_wdg_item_tooltip_style_get());
}
+EOLIAN static const char *
+_elm_genlist_item_elm_widget_item_tooltip_style_get(Eo *eo_it EINA_UNUSED,
Elm_Gen_Item *it)
+{
+ return it-tooltip.style;
+}
+
EAPI Eina_Bool
elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item,
Eina_Bool disable)
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index 3291847..9e2c4db 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -498,6 +498,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
Elm.Widget_Item.part_content.get;
Elm.Widget_Item.tooltip_text_set;
Elm.Widget_Item.tooltip_style.set;
+ Elm.Widget_Item.tooltip_style.get;
Elm.Widget_Item.tooltip_window_mode.set;
Elm.Widget_Item.tooltip_content_cb_set;
Elm.Widget_Item.tooltip_unset;
--
[EGIT] [core/efl] master 01/01: ecore-drm: Ignore output enabled flag when setting output mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=066ca5ffdd0955ce6a1c759dfda18da0c1dcae4f
commit 066ca5ffdd0955ce6a1c759dfda18da0c1dcae4f
Author: Chris Michael cp.mich...@samsung.com
Date: Thu May 14 09:17:02 2015 -0400
ecore-drm: Ignore output enabled flag when setting output mode
Summary: We really do not need to check the enable flag here because
if we are setting a valid mode, then we will be enabled anyway
NB: This makes it actually possible to Enable/Disable outputs in the
RandR config dialog of E-Wl ;)
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_output.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index 3c2c04c..e1b0b15 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -1441,7 +1441,7 @@ ecore_drm_output_mode_set(Ecore_Drm_Output *output,
Ecore_Drm_Output_Mode *mode,
output-y = y;
output-current_mode = mode;
- if ((mode) (output-enabled))
+ if (mode)
{
if (dev-current)
buffer = dev-current-id;
--
[EGIT] [core/efl] master 01/01: ecore_evas_wayland: prevent duplicated shutdown of ecore_wl
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2cf0ed49ce19ab72d2b00ee87aa84f2a14b0317e commit 2cf0ed49ce19ab72d2b00ee87aa84f2a14b0317e Author: MinJeong Kim minjjj@samsung.com Date: Thu May 14 07:54:16 2015 -0400 ecore_evas_wayland: prevent duplicated shutdown of ecore_wl Summary: When the ecore_evas of wayland_egl/shm is freed with ecore_evas_free(), ecore_wl_shutdown() is called by _ecore_evas_wl_common_free(). so ecore_wl_shutdown() after ecore_evas_free() has to be skipped. @fix Reviewers: devilhorns, raster, zmike, gwanglim Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2503 --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 1 + src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 4cd115c..7afdcd6 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -275,6 +275,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, err: ecore_evas_free(ee); + return NULL; ee_err: ecore_wl_shutdown(); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index ce0d334..fb8a308 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -269,6 +269,8 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, err: ecore_evas_free(ee); + return NULL; + ee_err: ecore_wl_shutdown(); return NULL; --
[EGIT] [core/efl] master 09/19: eina: add crosss platforme API to retrieve tmp and home directories from environment.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dbc6cbb953674217f4741330287d3d062a673151
commit dbc6cbb953674217f4741330287d3d062a673151
Author: Vincent Torri vincent.to...@gmail.com
Date: Thu May 14 07:40:33 2015 +0200
eina: add crosss platforme API to retrieve tmp and home directories from
environment.
@feature
No tests added as it is highly dependent on the system and it would make
little sens.
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/Makefile_Eina.am | 4 ++-
src/lib/eina/Eina.h | 1 +
src/lib/eina/eina_util.c | 79
src/lib/eina/eina_util.h | 46
4 files changed, 129 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 18e3f44..3a181b6 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -89,7 +89,8 @@ lib/eina/eina_thread_queue.h \
lib/eina/eina_matrix.h \
lib/eina/eina_quad.h \
lib/eina/eina_crc.h \
-lib/eina/eina_evlog.h
+lib/eina/eina_evlog.h \
+lib/eina/eina_util.h
lib_eina_libeina_la_SOURCES = \
lib/eina/eina_abi.c \
@@ -150,6 +151,7 @@ lib/eina/eina_tmpstr.c \
lib/eina/eina_unicode.c \
lib/eina/eina_ustrbuf.c \
lib/eina/eina_ustringshare.c \
+lib/eina/eina_util.c \
lib/eina/eina_value.c \
lib/eina/eina_value_util.c \
lib/eina/eina_xattr.c \
diff --git a/src/lib/eina/Eina.h b/src/lib/eina/Eina.h
index c05ab9a..c35820a 100644
--- a/src/lib/eina/Eina.h
+++ b/src/lib/eina/Eina.h
@@ -265,6 +265,7 @@ extern C {
#include eina_matrix.h
#include eina_crc.h
#include eina_evlog.h
+#include eina_util.h
#undef EAPI
#define EAPI
diff --git a/src/lib/eina/eina_util.c b/src/lib/eina/eina_util.c
new file mode 100644
index 000..55b5bd5
--- /dev/null
+++ b/src/lib/eina/eina_util.c
@@ -0,0 +1,79 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2015 Vincent Torri
+ *
+ * This library 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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 library;
+ * if not, see http://www.gnu.org/licenses/.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include stdlib.h
+
+#include eina_config.h
+#include eina_private.h
+#include eina_tmpstr.h
+
+/**
+ * Local *
+
**/
+
+
+/**
+ * Global *
+
**/
+
+
+/**
+ * API *
+
**/
+
+EAPI Eina_Tmpstr *
+eina_environment_home_get(void)
+{
+#ifdef _WIN32
+ char *home;
+
+ home = getenv(USERPROFILE);
+ if (!home) home = getenv(WINDIR);
+ if (!home) home = C:\\;
+
+ return eina_tmpstr_add(home);
+#else
+ return eina_tmpstr_add(getenv(HOME));
+#endif
+}
+
+EAPI Eina_Tmpstr *
+eina_environment_tmp_get(void)
+{
+ char *tmp;
+
+#ifdef _WIN32
+ tmp = getenv(TMP);
+ if (!tmp) tmp = getenv(TEMP);
+ if (!tmp) tmp = getenv(USERPROFILE);
+ if (!tmp) tmp = getenv(WINDIR);
+ if (!tmp) tmp = C:\\;
+
+ return eina_tmpstr_add(tmp);
+#else
+ tmp = getenv(TMPDIR);
+ if (!tmp) tmp = getenv(XDG_RUNTIME_DIR);
+ if (!tmp) tmp = /tmp;
+
+ return eina_tmpstr_add(tmp);
+#endif
+}
diff --git a/src/lib/eina/eina_util.h b/src/lib/eina/eina_util.h
new file mode 100644
index 000..3677cc4
--- /dev/null
+++ b/src/lib/eina/eina_util.h
@@ -0,0 +1,46 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2015 Vincent Torri
+ *
+ * This library 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
[EGIT] [core/efl] efl-1.14 01/01: edje: fix back edje_watch.
cedric pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=226abd92f705d0e545e9da1070a13b23c73eb003
commit 226abd92f705d0e545e9da1070a13b23c73eb003
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 19:00:04 2015 +0200
edje: fix back edje_watch.
@fix
Thanks Thanatermesis for reporting the issue.
---
src/bin/edje/edje_watch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/edje/edje_watch.c b/src/bin/edje/edje_watch.c
index 73e2f15..3156ca5 100644
--- a/src/bin/edje/edje_watch.c
+++ b/src/bin/edje/edje_watch.c
@@ -53,7 +53,7 @@ read_watch_file(const char *file)
}
else
{
- path = eina_stringshare_add_length(ln-start, ln-length - 1);
+ path = eina_stringshare_add_length(ln-start, ln-length);
}
if (do_append)
r = eina_list_append(r, eio_monitor_add(path));
--
[EGIT] [core/efl] master 03/19: efreet: lower error message to warning.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=493a2b3ab46dd9a115cb4607ccc52d4cb953be47
commit 493a2b3ab46dd9a115cb4607ccc52d4cb953be47
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 11:55:30 2015 +0200
efreet: lower error message to warning.
---
src/lib/efreet/efreet_cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index 2742545..2200ee2 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -1131,7 +1131,7 @@ on_send_register(void *data EINA_UNUSED, const
Eldbus_Message *msg, Eldbus_Pendi
{
Efreet_Event_Cache_Update *ev = NULL;
-ERR(%s %s, errname, errmsg);
+WRN(%s %s, errname, errmsg);
ev = NEW(Efreet_Event_Cache_Update, 1);
if (ev)
--
[EGIT] [core/efl] master 02/02: eina: fix eina_inarray_search to do linear search
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=756ed9ccbabc202027ab2c15f25f48483e800b86
commit 756ed9ccbabc202027ab2c15f25f48483e800b86
Author: Vivek Ellur vivek.el...@samsung.com
Date: Thu May 14 19:37:06 2015 +0200
eina: fix eina_inarray_search to do linear search
Summary:
Currently eina_inarray_search was using binary search to search elements
which would not work on unsorted array so modified it to work as linear
search.
There is already a function eina_inarray_search_sorted to work on sorted
array.
Signed-off-by: Vivek Ellur vivek.el...@samsung.com
Reviewers: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2501
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/lib/eina/eina_inarray.c | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/lib/eina/eina_inarray.c b/src/lib/eina/eina_inarray.c
index 2d52e6f..a216f02 100644
--- a/src/lib/eina/eina_inarray.c
+++ b/src/lib/eina/eina_inarray.c
@@ -150,12 +150,23 @@ _eina_inarray_get(const Eina_Inarray *array, unsigned int
position)
static int
_eina_inarray_search(const Eina_Inarray *array, const void *data,
Eina_Compare_Cb compare)
{
- const unsigned char *start, *found;
- start = array-members;
- found = bsearch(data, start, array-len, array-member_size, compare);
- if (!found)
+ unsigned int found, pos=-1;
+ void *p;
+
+ if (array-len == 0)
+ return -1;
+
+ for (pos = 0; pos array-len; ++pos)
+ {
+p = _eina_inarray_get(array, pos);
+found = compare(data, p);
+if (found == 0)
+ break;
+ }
+ if (pos array-len)
+ return pos;
+ else
return -1;
- return (found - start) / array-member_size;
}
static unsigned int
--
[EGIT] [core/efl] master 01/02: eina: add test cases for various eina_inarray functions
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c3a644acff12751891ef0ee78c1bba5106c7d9a4
commit c3a644acff12751891ef0ee78c1bba5106c7d9a4
Author: Vivek Ellur vivek.el...@samsung.com
Date: Thu May 14 19:36:25 2015 +0200
eina: add test cases for various eina_inarray functions
Summary:
Added test cases for eina_inarray_search, eina_inarray_search_sorted,
eina_inarray_foreach_remove and other functions
Signed-off-by: Vivek Ellur vivek.el...@samsung.com
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2504
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/tests/eina/eina_test_inarray.c | 105 +
1 file changed, 105 insertions(+)
diff --git a/src/tests/eina/eina_test_inarray.c
b/src/tests/eina/eina_test_inarray.c
index 5139770..e54a5cf 100644
--- a/src/tests/eina/eina_test_inarray.c
+++ b/src/tests/eina/eina_test_inarray.c
@@ -389,6 +389,110 @@ START_TEST(eina_inarray_test_itr)
}
END_TEST
+int
+cmp(const void *a, const void *b)
+{
+ return *(int *)a - *(int *)b;
+}
+
+int
+compare(const void *a, const void *b)
+{
+ return *(int *)a *(int *)b;
+}
+
+static Eina_Bool
+match_cb(const void *array EINA_UNUSED, void *p, void *user_data)
+{
+ int *member = p;
+ int *i = user_data;
+
+ if (*i == *member)
+ return EINA_TRUE;
+ else
+ return EINA_FALSE;
+}
+
+START_TEST(eina_inarray_test_search)
+{
+ Eina_Inarray *iarr;
+ int i, ret, temp=92, ret1;
+ int arr[] = {91, 95, 97, 93, 92, 94};
+ int arr_size = sizeof(arr)/sizeof(arr[0]);
+ unsigned int curr_len;
+ Eina_Bool rval;
+
+ eina_init();
+
+ iarr = eina_inarray_new(sizeof(int), 0);
+
+ //search in empty array
+ ret = eina_inarray_search(iarr, temp, cmp);
+ fail_if(ret != -1);
+
+ //search in single element array
+ temp = 91;
+ eina_inarray_push(iarr, arr[0]);
+ ret = eina_inarray_search(iarr, temp, cmp);
+ fail_if(ret != 0);
+
+ temp = 92;
+ ret = eina_inarray_search(iarr, temp, cmp);
+ fail_if(ret != -1);
+
+ for (i = 1; i arr_size; ++i)
+ {
+ret = eina_inarray_push(iarr, arr[i]);
+fail_unless(ret == i);
+ }
+ temp = 92;
+ ret = eina_inarray_search(iarr, temp, cmp);
+ fail_if(ret != 4);
+
+ temp = 100;
+ ret = eina_inarray_search(iarr, temp, cmp);
+ fail_if(ret != -1);
+
+ rval = eina_inarray_replace_at(iarr, 3, temp);
+ fail_if(rval != EINA_TRUE);
+ ret = eina_inarray_search(iarr, temp, cmp);
+ fail_if(ret != 3);
+
+ rval = eina_inarray_replace_at(iarr, arr_size+1, temp);
+ fail_if(rval != EINA_FALSE);
+
+ ret = eina_inarray_remove(iarr, temp);
+ fail_if(ret != 3);
+
+ temp = 101;
+ ret = eina_inarray_remove(iarr, temp);
+ fail_if(ret != -1);
+
+ eina_inarray_sort(iarr, compare);
+
+ temp = 92;
+ ret = eina_inarray_search(iarr, temp, cmp);
+ ret1 = eina_inarray_search_sorted(iarr, temp, cmp);
+ fail_if(ret != ret1);
+
+ temp = 100;
+ ret = eina_inarray_search(iarr, temp, cmp);
+ ret1 = eina_inarray_search_sorted(iarr, temp, cmp);
+ fail_if(ret != ret1);
+
+ temp = 105;
+ ret = eina_inarray_push(iarr, temp);
+ ret = eina_inarray_push(iarr, temp);
+ ret = eina_inarray_push(iarr, temp);
+ curr_len = iarr-len;
+ rval = eina_inarray_foreach_remove(iarr, match_cb, temp);
+ fail_if(iarr-len != curr_len-3);
+
+ eina_inarray_free(iarr);
+ eina_shutdown();
+}
+END_TEST
+
void
eina_test_inarray(TCase *tc)
{
@@ -398,4 +502,5 @@ eina_test_inarray(TCase *tc)
tcase_add_test(tc, eina_inarray_test_sort);
tcase_add_test(tc, eina_inarray_test_reverse);
tcase_add_test(tc, eina_inarray_test_itr);
+ tcase_add_test(tc, eina_inarray_test_search);
}
--
[EGIT] [bindings/python/python-efl] master 01/01: Doc for SegmentControlItem
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=92c05e801a7fa05caacb11a33ddd52c79d2e36cb commit 92c05e801a7fa05caacb11a33ddd52c79d2e36cb Author: Dave Andreoli d...@gurumeditation.it Date: Thu May 14 20:46:42 2015 +0200 Doc for SegmentControlItem --- doc/elementary/segment_control.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/elementary/segment_control.rst b/doc/elementary/segment_control.rst index f507a1d..988f874 100644 --- a/doc/elementary/segment_control.rst +++ b/doc/elementary/segment_control.rst @@ -48,3 +48,4 @@ Inheritance diagram .. autoclass:: SegmentControl +.. autoclass:: SegmentControlItem --
[EGIT] [core/efl] master 16/19: ecore_con: use portable environment lookup.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=94eaaf889b92d3dd3897488ba141108b4369268f
commit 94eaaf889b92d3dd3897488ba141108b4369268f
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 18:40:47 2015 +0200
ecore_con: use portable environment lookup.
---
src/lib/ecore_con/ecore_con_local.c | 21 ++---
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/lib/ecore_con/ecore_con_local.c
b/src/lib/ecore_con/ecore_con_local.c
index dc9a78e..2c5ca87 100644
--- a/src/lib/ecore_con/ecore_con_local.c
+++ b/src/lib/ecore_con/ecore_con_local.c
@@ -37,20 +37,11 @@
static int _ecore_con_local_init_count = 0;
-static inline const char *_ecore_con_get_tmpdir()
-{
- const char *tmpdir = /tmp;
- const char *dir = getenv(TMPDIR);
-
- if (!dir) return tmpdir;
- return dir;
-}
-
static const char *_ecore_con_local_path_get()
{
const char *homedir = getenv(XDG_RUNTIME_DIR);
- if (!homedir) homedir = getenv(HOME);
- if (!homedir) homedir = _ecore_con_get_tmpdir();
+ if (!homedir) homedir = eina_environment_home_get();
+ if (!homedir) homedir = eina_environment_tmp_get();
return homedir;
}
@@ -124,7 +115,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
}
else
{
- homedir = _ecore_con_get_tmpdir();
+ homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), %s/.ecore_service|%s,
homedir, svr-name);
}
@@ -135,7 +126,7 @@ ecore_con_local_connect(Ecore_Con_Server *obj,
snprintf(buf, sizeof(buf), %s|%i, svr-name, svr-port);
else
{
- homedir = _ecore_con_get_tmpdir();
+ homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), %s/.ecore_service|%s|%i,
homedir, svr-name, svr-port);
}
@@ -285,7 +276,7 @@ ecore_con_local_listen(
}
else
{
- homedir = _ecore_con_get_tmpdir();
+ homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), %s/.ecore_service|%s,
homedir, svr-name);
}
@@ -296,7 +287,7 @@ ecore_con_local_listen(
snprintf(buf, sizeof(buf), %s|%i, svr-name, svr-port);
else
{
- homedir = _ecore_con_get_tmpdir();
+ homedir = eina_environment_tmp_get();
snprintf(buf, sizeof(buf), %s/.ecore_service|%s|%i,
homedir, svr-name, svr-port);
}
--
[EGIT] [core/efl] master 02/19: edje: support translation on static strings in edc.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dca95fb45af216068b5476f7110639cb3715b96b
commit dca95fb45af216068b5476f7110639cb3715b96b
Author: katpavalli katpag...@samsung.com
Date: Wed May 13 18:08:04 2015 +0200
edje: support translation on static strings in edc.
Summary:
Internationalisation of the static text specified as part of the edc is
implemented.
Problem: Static text when specified in the edc, remains unchanged when
the system language is changed.
Solution: Language support is provided even for the static strings in
the edc.
Test Plan:
Test code to test this implementation is done as part of
efl/src/examples/edje/edje-text.c and efl/src/examples/edje/text.edc
Compile the code with the below command
edje_cc -md dir path/efl/src/examples/edje/ text.edc gcc -o
edje-text edje-text.c `pkg-config --libs --cflags ecore-evas edje evas ecore`
./edje-text
1) change the language of the system using the command
export LANGUAGE=hi
./edje.text
Not the text Loading gets displayed in hindi language
2) change the language of the system using the command
export LANGUAGE=ta
./edje.text
Not the text Loading gets displayed in tamil language
3) change the language of the system using the command
export LANGUAGE=en
./edje.text
Not the text Loading gets displayed in english language
As the number of .mo files in the /edje folder can be increased, those many
languages can be supported
Reviewers: cedric, shilpasingh
Reviewed By: shilpasingh
Subscribers: cedric, rajeshps, govi, poornima.srinivasan
Differential Revision: https://phab.enlightenment.org/D2336
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
AUTHORS| 1 +
src/bin/edje/edje_cc.c | 7 ++
src/bin/edje/edje_cc.h | 1 +
src/bin/edje/edje_cc_handlers.c| 149 +
src/bin/edje/edje_cc_out.c | 114 +
src/examples/edje/Makefile.am | 4 +-
src/examples/edje/edje-text.c | 23 -
src/examples/edje/en_IN/domain_name.mo | Bin 0 - 75 bytes
src/examples/edje/hi_IN/domain_name.mo | Bin 0 - 101 bytes
src/examples/edje/ta_IN/domain_name.mo | Bin 0 - 86 bytes
src/examples/edje/text.edc | 78 -
src/lib/edje/Edje_Common.h | 14 +++-
src/lib/edje/edje_data.c | 20 +
src/lib/edje/edje_embryo.c | 2 +
src/lib/edje/edje_load.c | 99 ++
src/lib/edje/edje_main.c | 27 +-
src/lib/edje/edje_private.h| 28 +++
src/lib/edje/edje_text.c | 61 --
src/lib/edje/edje_util.c | 63 ++
19 files changed, 672 insertions(+), 19 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 46cb69b..e9f793f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -321,6 +321,7 @@ Vorobiov Vitalii vi.vorob...@samsung.com
m.biliavskyi m.biliavs...@samsung.com
Vyacheslav Reutskiy v.reuts...@samsung.com
Kumar Navneet k.navn...@samsung.com
+Katpagavalli Anantharaj katpagava...@gmail.com
Emotion
---
diff --git a/src/bin/edje/edje_cc.c b/src/bin/edje/edje_cc.c
index 45b4105..690ba23 100644
--- a/src/bin/edje/edje_cc.c
+++ b/src/bin/edje/edje_cc.c
@@ -13,6 +13,7 @@ static void main_help(void);
Eina_Prefix *pfx = NULL;
Eina_List *snd_dirs = NULL;
+Eina_List *mo_dirs = NULL;
Eina_List *vibration_dirs = NULL;
Eina_List *img_dirs = NULL;
Eina_List *fnt_dirs = NULL;
@@ -98,6 +99,7 @@ main_help(void)
-sd sound/directory Add a directory to look in for relative path
sounds samples\n
-vd vibration/directory Add a directory to look in for relative path
vibration samples\n
-dd data/directory Add a directory to look in for relative path
data.file entries\n
+ -md mo/directory Add a directory to look in for relative path
mo files\n
-td temp/directory Directory to store temporary files\n
-l license Specify the license of a theme (file with
license text)\n
-a authors Specify AUTHORS (file with list of authors)\n
@@ -210,6 +212,11 @@ main(int argc, char **argv)
i++;
snd_dirs = eina_list_append(snd_dirs, argv[i]);
}
+else if ((!strcmp(argv[i], -md) || !strcmp(argv[i], --mo_dir))
(i (argc - 1)))
+ {
+ i++;
+ mo_dirs = eina_list_append(mo_dirs, argv[i]);
+ }
else if ((!strcmp(argv[i], -vd) || !strcmp(argv[i],
--vibration_dir)) (i (argc - 1)))
{
i++;
diff --git a/src/bin/edje/edje_cc.h b/src/bin/edje/edje_cc.h
index
[EGIT] [core/efl] master 05/19: eina, efl: add copyright notice.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a75155d8ba7133a5faeac42b8a293a263235c4d8 commit a75155d8ba7133a5faeac42b8a293a263235c4d8 Author: Vincent Torri vincent.to...@gmail.com Date: Thu May 14 08:41:11 2015 +0200 eina, efl: add copyright notice. Signed-off-by: Cedric BAIL ced...@osg.samsung.com --- src/bin/efl/efl_debug.c | 18 ++ src/bin/efl/efl_debug_common.c| 18 ++ src/bin/efl/efl_debug_common.h| 18 ++ src/bin/efl/efl_debugd.c | 18 ++ src/bin/eina/eina_btlog.c | 18 ++ src/lib/eina/eina_debug.c | 18 ++ src/lib/eina/eina_debug.h | 18 ++ src/lib/eina/eina_debug_bt.c | 18 ++ src/lib/eina/eina_debug_bt_file.c | 18 ++ src/lib/eina/eina_debug_chunk.c | 18 ++ src/lib/eina/eina_debug_monitor.c | 18 ++ src/lib/eina/eina_debug_proto.c | 18 ++ src/lib/eina/eina_debug_thread.c | 18 ++ src/lib/eina/eina_evlog.c | 18 ++ src/lib/eina/eina_evlog.h | 18 ++ 15 files changed, 270 insertions(+) diff --git a/src/bin/efl/efl_debug.c b/src/bin/efl/efl_debug.c index 6a65178..3af1ea5 100644 --- a/src/bin/efl/efl_debug.c +++ b/src/bin/efl/efl_debug.c @@ -1,3 +1,21 @@ +/* EINA - EFL data type library + * Copyright (C) 2015 Carsten Haitzler + * + * This library 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; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 library; + * if not, see http://www.gnu.org/licenses/. + */ + #include efl_debug_common.h static unsigned char *buf; diff --git a/src/bin/efl/efl_debug_common.c b/src/bin/efl/efl_debug_common.c index 82587d2..1ef2967 100644 --- a/src/bin/efl/efl_debug_common.c +++ b/src/bin/efl/efl_debug_common.c @@ -1,3 +1,21 @@ +/* EINA - EFL data type library + * Copyright (C) 2015 Carsten Haitzler + * + * This library 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; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 library; + * if not, see http://www.gnu.org/licenses/. + */ + #include efl_debug_common.h void diff --git a/src/bin/efl/efl_debug_common.h b/src/bin/efl/efl_debug_common.h index 46f859c..dc6190e 100644 --- a/src/bin/efl/efl_debug_common.h +++ b/src/bin/efl/efl_debug_common.h @@ -1,3 +1,21 @@ +/* EINA - EFL data type library + * Copyright (C) 2015 Carsten Haitzler + * + * This library 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; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 library; + * if not, see http://www.gnu.org/licenses/. + */ + #ifndef EFL_DEBUG_COMMON_H #define EFL_DEBUG_COMMON_H 1 diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c index c1c00b1..a46d423 100644 --- a/src/bin/efl/efl_debugd.c +++ b/src/bin/efl/efl_debugd.c @@ -1,3 +1,21 @@ +/* EINA - EFL data type library + * Copyright (C) 2015 Carsten Haitzler + * + * This library 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; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or
[EGIT] [core/efl] master 01/19: edje: use efreet for cache directory get.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a312e304bf181777aa8190f4281ebdac49a827a5
commit a312e304bf181777aa8190f4281ebdac49a827a5
Author: Cedric BAIL ced...@osg.samsung.com
Date: Wed May 13 17:14:09 2015 +0200
edje: use efreet for cache directory get.
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index ab76615..9b0e8ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4231,6 +4231,7 @@ EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore-imf-evas])
EFL_INTERNAL_DEPEND_PKG([EDJE], [embryo])
EFL_INTERNAL_DEPEND_PKG([EDJE], [eio])
EFL_INTERNAL_DEPEND_PKG([EDJE], [emile])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [efreet])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_physics}], [ephysics])
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EDJE], [${want_multisense}], [ecore-audio])
--
[EGIT] [core/efl] master 06/19: ecore_avahi: fix definition of EAPI on Windows.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fa7d7c85db730d0550e1eb41fd362bb5cc0df457 commit fa7d7c85db730d0550e1eb41fd362bb5cc0df457 Author: Vincent Torri vincent.to...@gmail.com Date: Thu May 14 09:14:59 2015 +0200 ecore_avahi: fix definition of EAPI on Windows. Signed-off-by: Cedric BAIL ced...@osg.samsung.com --- src/lib/ecore_avahi/Ecore_Avahi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_avahi/Ecore_Avahi.h b/src/lib/ecore_avahi/Ecore_Avahi.h index 1ba7443..460ef80 100644 --- a/src/lib/ecore_avahi/Ecore_Avahi.h +++ b/src/lib/ecore_avahi/Ecore_Avahi.h @@ -12,7 +12,7 @@ #endif #ifdef _WIN32 -# ifdef EFL_ECORE_BUILD +# ifdef EFL_ECORE_AVAHI_BUILD # ifdef DLL_EXPORT # define EAPI __declspec(dllexport) # else --
[EGIT] [core/efl] master 10/19: ecore_con: it doesn't make sense to get port on local protocol.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9c571f01f7af8db1df238daa3136bf639247ac55
commit 9c571f01f7af8db1df238daa3136bf639247ac55
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 18:19:57 2015 +0200
ecore_con: it doesn't make sense to get port on local protocol.
---
src/lib/ecore_con/ecore_con.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 3e6ad7a..dee26e1 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -955,6 +955,15 @@ ecore_con_client_ip_get(const Ecore_Con *obj)
EOLIAN static int
_ecore_con_client_ecore_con_base_port_get(Eo *obj EINA_UNUSED,
Ecore_Con_Client_Data *cl)
{
+ Ecore_Con_Server_Data *sd = eo_data_scope_get(cl-host_server,
ECORE_CON_SERVER_CLASS);
+
+ if (sd-type != ECORE_CON_REMOTE_TCP
+ sd-type != ECORE_CON_REMOTE_MCAST
+ sd-type != ECORE_CON_REMOTE_UDP
+ sd-type != ECORE_CON_REMOTE_BROADCAST
+ sd-type != ECORE_CON_REMOTE_NODELAY)
+ return -1;
+
if (cl-client_addr-sa_family == AF_INET)
return ((struct sockaddr_in *)cl-client_addr)-sin_port;
#ifdef HAVE_IPV6
--
[EGIT] [core/efl] master 04/19: autotools: cleanup Makefile_Eina.am.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=44d151c4da7652124fd30f95bc3efd86c4c6710a commit 44d151c4da7652124fd30f95bc3efd86c4c6710a Author: Vincent Torri vincent.to...@gmail.com Date: Thu May 14 08:33:46 2015 +0200 autotools: cleanup Makefile_Eina.am. Signed-off-by: Cedric BAIL ced...@osg.samsung.com --- src/Makefile_Eina.am | 26 +++--- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am index 0fb2061..18e3f44 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -102,15 +102,16 @@ lib/eina/eina_convert.c \ lib/eina/eina_counter.c \ lib/eina/eina_cow.c \ lib/eina/eina_cpu.c \ -lib/eina/eina_debug.h \ +lib/eina/eina_crc.c \ lib/eina/eina_debug.c \ -lib/eina/eina_debug_chunk.c \ lib/eina/eina_debug_bt.c \ lib/eina/eina_debug_bt_file.c \ -lib/eina/eina_debug_thread.c \ +lib/eina/eina_debug_chunk.c \ lib/eina/eina_debug_monitor.c \ lib/eina/eina_debug_proto.c \ +lib/eina/eina_debug_thread.c \ lib/eina/eina_error.c \ +lib/eina/eina_evlog.c \ lib/eina/eina_file_common.h \ lib/eina/eina_file_common.c \ lib/eina/eina_fp.c \ @@ -124,11 +125,13 @@ lib/eina/eina_list.c \ lib/eina/eina_log.c \ lib/eina/eina_magic.c \ lib/eina/eina_main.c \ +lib/eina/eina_matrix.c \ lib/eina/eina_matrixsparse.c \ lib/eina/eina_mempool.c \ lib/eina/eina_mmap.c \ lib/eina/eina_module.c \ lib/eina/eina_prefix.c \ +lib/eina/eina_quad.c \ lib/eina/eina_quadtree.c \ lib/eina/eina_rbtree.c \ lib/eina/eina_rectangle.c \ @@ -140,8 +143,9 @@ lib/eina/eina_str.c \ lib/eina/eina_strbuf.c \ lib/eina/eina_strbuf_common.c \ lib/eina/eina_stringshare.c \ -lib/eina/eina_tiler.c \ lib/eina/eina_thread.c \ +lib/eina/eina_thread_queue.c \ +lib/eina/eina_tiler.c \ lib/eina/eina_tmpstr.c \ lib/eina/eina_unicode.c \ lib/eina/eina_ustrbuf.c \ @@ -149,18 +153,10 @@ lib/eina/eina_ustringshare.c \ lib/eina/eina_value.c \ lib/eina/eina_value_util.c \ lib/eina/eina_xattr.c \ -lib/eina/eina_share_common.h \ +lib/eina/eina_debug.h \ lib/eina/eina_private.h \ -lib/eina/eina_strbuf_common.h \ -lib/eina/eina_thread_queue.c \ -lib/eina/eina_matrix.c \ -lib/eina/eina_quad.c \ -lib/eina/eina_crc.c \ -lib/eina/eina_evlog.c - -# Will be back for developper after 1.2 -# lib/eina/eina_model.c \ -# lib/eina/eina_object.c +lib/eina/eina_share_common.h \ +lib/eina/eina_strbuf_common.h if HAVE_WIN32 lib_eina_libeina_la_SOURCES += lib/eina/eina_file_win32.c --
[EGIT] [core/efl] master 15/19: ethumb: use portable environment lookup.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9e2f846830475cbe851630f69af1d4dda2088b5c
commit 9e2f846830475cbe851630f69af1d4dda2088b5c
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 18:40:28 2015 +0200
ethumb: use portable environment lookup.
---
src/lib/ethumb/ethumb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index 20b7b7d..7d21b0c 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -259,7 +259,7 @@ ethumb_init(void)
if (getuid() == geteuid())
#endif
{
-home = getenv(HOME);
+home = eina_environment_home_get();
snprintf(buf, sizeof(buf), %s/.thumbnails, home);
}
#if defined(HAVE_GETUID) defined(HAVE_GETEUID)
@@ -713,7 +713,7 @@ _ethumb_build_absolute_path(const char *path, char
buf[PATH_MAX])
if (getuid() == geteuid())
#endif
{
- const char *home = getenv(HOME);
+ const char *home = eina_environment_home_get();
if (!home) return NULL;
strncpy(p, home, PATH_MAX - 1);
p[PATH_MAX - 1] = 0;
--
[EGIT] [core/efl] master 17/19: ecore_file: use portable environment lookup.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=241d0d3e18dbb6163153561c0a4097f86d8e6463
commit 241d0d3e18dbb6163153561c0a4097f86d8e6463
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 18:41:17 2015 +0200
ecore_file: use portable environment lookup.
---
src/lib/ecore_file/ecore_file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index dc105db..7a4a16c 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -869,7 +869,7 @@ ecore_file_app_exe_get(const char *app)
p = app;
if ((p[0] == '~') (p[1] == '/'))
{
-const char *home = getenv(HOME);
+const char *home = eina_environment_home_get();
if (home) eina_strbuf_append(buf, home);
p++;
}
--
[EGIT] [core/efl] master 01/01: evas-drm: Mark framebuffer as dirty before sending
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9cc25bf3c2f7affe6c959bce0d63322cd99b5a57 commit 9cc25bf3c2f7affe6c959bce0d63322cd99b5a57 Author: Chris Michael cp.mich...@samsung.com Date: Thu May 14 11:49:51 2015 -0400 evas-drm: Mark framebuffer as dirty before sending Summary: We should be marking the framebuffer dirty regions Before we send the pageflip to the kernel so that the kernel can properly optimize drawing dirty regions before scheduling a pageflip. NB: Slightly optimizes evas drm rendering a bit more. Thanks to Daniel Stone for the help :) @fix Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/modules/evas/engines/drm/evas_outbuf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/evas/engines/drm/evas_outbuf.c b/src/modules/evas/engines/drm/evas_outbuf.c index cfe1b3e..3530087 100644 --- a/src/modules/evas/engines/drm/evas_outbuf.c +++ b/src/modules/evas/engines/drm/evas_outbuf.c @@ -32,12 +32,12 @@ _evas_outbuf_buffer_swap(Outbuf *ob, Eina_Rectangle *rects, unsigned int count) buff = ob-priv.buffer[ob-priv.curr]; - /* if this buffer is not valid, we need to set it */ - ecore_drm_fb_set(ob-info-info.dev, buff); - /* mark the fb as dirty */ ecore_drm_fb_dirty(buff, rects, count); + /* if this buffer is not valid, we need to set it */ + ecore_drm_fb_set(ob-info-info.dev, buff); + /* send this buffer to the crtc */ ecore_drm_fb_send(ob-info-info.dev, buff, _evas_outbuf_cb_pageflip, ob); } --
[EGIT] [website/www-content] master 01/01: Wiki page start 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=32cadc8c1c1408a5563ba4d150c071a469f9b10f commit 32cadc8c1c1408a5563ba4d150c071a469f9b10f Author: Raster ras...@rasterman.com Date: Thu May 14 07:55:24 2015 -0700 Wiki page start changed with summary [] by Raster --- pages/docs/c/start.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/docs/c/start.txt b/pages/docs/c/start.txt index e5feabc..e1b25b3 100644 --- a/pages/docs/c/start.txt +++ b/pages/docs/c/start.txt @@ -341,6 +341,8 @@ The ''while'' loop simple checks the statement in the braces following the while The ''do while'' loop is just like ''while'' But the test statement is executed at the end of each loop, not at the start, so you are guaranteed that the inner scope code of the loop will execute at least once before a test. + Pre-processor and Macros + Memory --
[EGIT] [core/elementary] master 01/01: elementary: use portable way to get tmp and home environment.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=58686474d6f2d85e34b021cf2a2a1dba4ef34a8c
commit 58686474d6f2d85e34b021cf2a2a1dba4ef34a8c
Author: Cedric BAIL ced...@osg.samsung.com
Date: Thu May 14 21:26:44 2015 +0200
elementary: use portable way to get tmp and home environment.
---
src/bin/test_fileselector.c | 12 +---
src/bin/test_map.c | 2 +-
src/bin/test_panel.c| 12 +---
src/lib/elm_config.c| 2 +-
src/lib/elm_theme.c | 11 +--
5 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c
index a0bd61d..eade901 100644
--- a/src/bin/test_fileselector.c
+++ b/src/bin/test_fileselector.c
@@ -518,9 +518,6 @@ test_fileselector(void *data EINA_UNUSED,
{
Evas_Object *win, *fs, *box, *vbox, *sep;
char * home_env;
-#ifdef _WIN32
- char win_home_env[PATH_MAX];
-#endif
/* Set the locale according to the system pref.
* If you don't do so the file selector will order the files list in
@@ -552,14 +549,7 @@ test_fileselector(void *data EINA_UNUSED,
/* make the file list a tree with dir expandable in place */
elm_fileselector_expandable_set(fs, EINA_FALSE);
/* start the fileselector in the home dir */
- home_env = getenv(HOME);
-#ifdef _WIN32
- if (!home_env)
- {
- snprintf(win_home_env, sizeof(win_home_env), %s%s,
getenv(HOMEDRIVE), getenv(HOMEPATH));
- home_env = strdup(win_home_env);
- }
-#endif
+ home_env = eina_environment_home_get();
elm_fileselector_path_set(fs, home_env);
/* provides suggested name (just for showing) */
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index c032e66..91bd732 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -547,7 +547,7 @@ _track_add(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSE
fs = elm_fileselector_add(fs_win);
elm_fileselector_is_save_set(fs, EINA_TRUE);
elm_fileselector_expandable_set(fs, EINA_FALSE);
- path = getenv(HOME);
+ path = eina_environment_home_get();
//if HOME is not available, set current dir. path
if (!path)
path = .;
diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c
index 36cd3c2..2a63d43 100644
--- a/src/bin/test_panel.c
+++ b/src/bin/test_panel.c
@@ -92,21 +92,11 @@ _fill_list(Evas_Object *obj, Elm_Genlist_Item_Class *itc)
Eina_List *l;
char *real;
char *home_env = NULL;
-#ifdef _WIN32
- char win_home_env[PATH_MAX];
-#endif
unsigned int x = 0;
if (!dirs)
{
-home_env = getenv(HOME);
-#ifdef _WIN32
-if(!home_env)
- {
- snprintf(win_home_env, sizeof(win_home_env), %s%s,
getenv(HOMEDRIVE), getenv(HOMEPATH));
- home_env = strdup(win_home_env);
- }
-#endif
+home_env = eina_environment_home_get();
if (!home_env) return;
if (!(d = opendir(home_env))) return;
while ((de = readdir(d)) (x LIST_ITEM_MAX))
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 1ea9036..fce54ee 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -722,7 +722,7 @@ _elm_config_user_dir_snprintf(char *dst,
else
#endif
{
- home = getenv(HOME);
+ home = eina_environment_home_get();
if (!home) home = /;
#ifdef DOXDG
user_dir_len = eina_str_join_len
diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c
index 67cea3e..134dc00 100644
--- a/src/lib/elm_theme.c
+++ b/src/lib/elm_theme.c
@@ -66,7 +66,7 @@ _elm_theme_file_item_add(Elm_Theme_Files *files, const char
*item, Eina_Bool pre
Eina_File *f = NULL;
const char *home;
- home = getenv(HOME) ? getenv(HOME) : ;
+ home = eina_environment_home_get();
buf = eina_strbuf_new();
if ((item[0] == '/') ||
@@ -682,7 +682,7 @@ elm_theme_list_item_path_get(const char *f, Eina_Bool
*in_search_path)
if (!home)
{
-home = getenv(HOME);
+home = eina_environment_home_get();
if (!home) home = ;
}
@@ -761,7 +761,7 @@ elm_theme_name_available_list_new(void)
if (!home)
{
-home = getenv(HOME);
+home = eina_environment_home_get();
if (!home) home = ;
}
@@ -937,12 +937,11 @@ elm_theme_user_dir_get(void)
{
static char *path = NULL;
char buf[PATH_MAX];
+ const char *home;
if (path) return path;
- char *home = getenv(HOME);
- if (!home) home = ;
-
+ home = eina_environment_home_get();
snprintf(buf, sizeof(buf), %s/ELEMENTARY_BASE_DIR/themes, home);
path = strdup(buf);
--
[EGIT] [core/elementary] master 01/01: Elm_Notify: adding elm_object_part_text_set/get functionality
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d53075eadd5e616c224e0a522f7f026f22c15493
commit d53075eadd5e616c224e0a522f7f026f22c15493
Author: Vitalii Vorobiov vi.vorob...@samsung.com
Date: Fri May 15 11:02:47 2015 +0900
Elm_Notify: adding elm_object_part_text_set/get functionality
Summary:
Currently elm_notify doesn't allow to set or get text if
user's style contain some text parts and he need to set text into them.
Reviewers: cedric, seoz
Subscribers: raster, stefan_schmidt, reutskiy.v.v
Differential Revision: https://phab.enlightenment.org/D1333
---
src/lib/elm_notify.c | 12
src/lib/elm_notify.eo | 2 ++
2 files changed, 14 insertions(+)
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index c48d41b..4c44fb6 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -163,6 +163,18 @@ _elm_notify_elm_widget_theme_apply(Eo *obj,
Elm_Notify_Data *sd)
return EINA_TRUE;
}
+EOLIAN static void
+_elm_notify_elm_widget_part_text_set(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd,
const char *part, const char *label)
+{
+ edje_object_part_text_set(sd-notify, part, label);
+}
+
+EOLIAN static const char*
+_elm_notify_elm_widget_part_text_get(Eo *obj EINA_UNUSED, Elm_Notify_Data *sd,
const char *part)
+{
+ return edje_object_part_text_get(sd-notify, part);
+}
+
static void
_calc(Evas_Object *obj)
{
diff --git a/src/lib/elm_notify.eo b/src/lib/elm_notify.eo
index 2275545..3eb35dc 100644
--- a/src/lib/elm_notify.eo
+++ b/src/lib/elm_notify.eo
@@ -99,6 +99,8 @@ class Elm.Notify (Elm.Container)
Elm.Widget.focus_next_manager_is;
Elm.Widget.focus_next;
Elm.Widget.sub_object_del;
+ Elm_Widget.part_text.set;
+ Elm_Widget.part_text.get;
Elm.Container.content_get;
Elm.Container.content_set;
Elm.Container.content_unset;
--
[EGIT] [core/elementary] master 01/01: elm notify patch submit - rebase lost my fix? fix now in extra commit
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=087115ffe82005688341c31d4c8dca799c76f190 commit 087115ffe82005688341c31d4c8dca799c76f190 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri May 15 11:26:47 2015 +0900 elm notify patch submit - rebase lost my fix? fix now in extra commit somehow a git rebase lost a fix. i don't know how. put back. --- src/lib/elm_notify.eo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_notify.eo b/src/lib/elm_notify.eo index 3eb35dc..5361fa5 100644 --- a/src/lib/elm_notify.eo +++ b/src/lib/elm_notify.eo @@ -99,8 +99,8 @@ class Elm.Notify (Elm.Container) Elm.Widget.focus_next_manager_is; Elm.Widget.focus_next; Elm.Widget.sub_object_del; - Elm_Widget.part_text.set; - Elm_Widget.part_text.get; + Elm.Widget.part_text.set; + Elm.Widget.part_text.get; Elm.Container.content_get; Elm.Container.content_set; Elm.Container.content_unset; --
[EGIT] [core/efl] master 01/01: eina - add comment on evlog api stability etc.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=df999265b0025ab94d8c2263d7d1a0a405f60e01
commit df999265b0025ab94d8c2263d7d1a0a405f60e01
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Fri May 15 11:32:04 2015 +0900
eina - add comment on evlog api stability etc.
---
src/lib/eina/eina_evlog.h | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/lib/eina/eina_evlog.h b/src/lib/eina/eina_evlog.h
index 1932190..f3fd82b 100644
--- a/src/lib/eina/eina_evlog.h
+++ b/src/lib/eina/eina_evlog.h
@@ -23,7 +23,10 @@
* @addtogroup Eina_Evlog Event Log Debugging
* @ingroup Eina
*
- * @brief These functions are use internally by EFL in general for profiling
+ * @brief These functions are use internally by EFL in general for profiling.
+ * This API is not considered stable or intended for use outside of EFL
+ * itself at this stage, so do not use this unless you wish to keep up. The
+ * format of debug logs may and likely will change as this feature matures.
*
* @{
*
--
[EGIT] [core/elementary] master 01/01: eo: fix according to latest eolian changes
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=60fb80b217540f982965b01b6ed9a9787e3baff7
commit 60fb80b217540f982965b01b6ed9a9787e3baff7
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu May 14 11:27:32 2015 +0100
eo: fix according to latest eolian changes
---
src/lib/elm_calendar.eo | 2 +-
src/lib/elm_colorselector.eo | 2 +-
src/lib/elm_ctxpopup.eo | 2 +-
src/lib/elm_diskselector.eo | 2 +-
src/lib/elm_flipselector.eo | 2 +-
src/lib/elm_interface_fileselector.eo | 2 +-
src/lib/elm_widget.eo | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo
index 59b7a2b..bd28c4c 100644
--- a/src/lib/elm_calendar.eo
+++ b/src/lib/elm_calendar.eo
@@ -245,7 +245,7 @@ class Elm.Calendar (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
@see elm_calendar_marks_clear()
@ingroup Calendar */
-return: const(list)*;
+return: const(listElm.Calendar.Mark*)*;
}
}
selected_time_set {
diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo
index 493500b..9bb3b6e 100644
--- a/src/lib/elm_colorselector.eo
+++ b/src/lib/elm_colorselector.eo
@@ -82,7 +82,7 @@ class Elm.Colorselector (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
@since 1.9
@ingroup Colorselector */
-return: const(list)*;
+return: const(listElm.Object.Item*)*;
}
}
@property palette_selected_item {
diff --git a/src/lib/elm_ctxpopup.eo b/src/lib/elm_ctxpopup.eo
index e24afaa..83f829b 100644
--- a/src/lib/elm_ctxpopup.eo
+++ b/src/lib/elm_ctxpopup.eo
@@ -145,7 +145,7 @@ class Elm.Ctxpopup (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
call to this function when changes happen.
@ingroup Ctxpopup */
-return: const(list)*;
+return: const(listElm.Object.Item*)*;
}
}
@property first_item {
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 85bd6ed..dc41a9d 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -130,7 +130,7 @@ class Elm.Diskselector (Elm.Widget,
Elm_Interface_Scrollable,
@see elm_diskselector_clear()
@ingroup Diskselector */
-return: const(list)*;
+return: const(listElm.Object.Item*)*;
}
}
@property last_item {
diff --git a/src/lib/elm_flipselector.eo b/src/lib/elm_flipselector.eo
index 9ef7de1..aca9b77 100644
--- a/src/lib/elm_flipselector.eo
+++ b/src/lib/elm_flipselector.eo
@@ -63,7 +63,7 @@ class Elm.Flipselector (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
call to this function when changes happen.
@ingroup Flipselector */
-return: const(list)*;
+return: const(listElm.Object.Item*)*;
}
}
@property first_item {
diff --git a/src/lib/elm_interface_fileselector.eo
b/src/lib/elm_interface_fileselector.eo
index b5b714e..7a812cd 100644
--- a/src/lib/elm_interface_fileselector.eo
+++ b/src/lib/elm_interface_fileselector.eo
@@ -120,7 +120,7 @@ interface Elm_Interface_Fileselector ()
/*@ Get a list of selected paths in the fileselector. */
}
values {
-const(list)* ret;
+const(listconst(char)*)* ret;
}
}
@property current_name {
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 664ec08..75bc7d9 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -615,7 +615,7 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
return: bool;
params {
@in const(Evas_Object)* base;
-@in const(list)* items;
+@in const(listEo.Base*)* items;
@in list_data_get_func_type list_data_get;
@in double degree;
@out Evas_Object *direction;
@@ -720,7 +720,7 @@ abstract Elm.Widget (Evas.Object_Smart,
Elm_Interface_Atspi_Accessible, Elm_Inte
/*@ No description supplied by the EAPI. */
return: bool;
params {
-@in const(list)* items;
+@in const(listEo.Base*)* items;
@in list_data_get_func_type list_data_get;
@in Elm_Focus_Direction dir;
@out Evas_Object *next;
--
[EGIT] [core/efl] master 01/01: efl_model_base: fix enum/struct syntax in comment
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8b8c78b638d20281f8f4bf57e8485c1d9fd7820e
commit 8b8c78b638d20281f8f4bf57e8485c1d9fd7820e
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu May 14 11:30:20 2015 +0100
efl_model_base: fix enum/struct syntax in comment
---
src/lib/efl/interfaces/efl_model_base.eo | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_model_base.eo
b/src/lib/efl/interfaces/efl_model_base.eo
index d95e7d3..f9893a3 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -1,21 +1,21 @@
/*
- * type Efl_Model_Load_Status: enum _Efl_Model_Load_Status
+ * enum Efl_Model_Load_Status
* {
- *EFL_MODEL_LOAD_STATUS_ERROR = 0, /*@ Error in Load Model *
- *EFL_MODEL_LOAD_STATUS_LOADING_PROPERTIES = (1 0), /*@ properties load
in progress *
- *EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN = (1 1), /*@ children load
in progress *
- *EFL_MODEL_LOAD_STATUS_LOADING = (1 0) | (1 1), /*@ children and
properties load in progress *
+ *error = 0, /*@ Error in Load Model *
+ *properties = (1 0), /*@ properties load in progress *
+ *children = (1 1), /*@ children load in progress *
+ *loading= (1 0) | (1 1), /*@ children and properties load in
progress *
*
- *EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES = (1 2), /*@ Model as ready
to fetch properties *
- *EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN = (1 3), /*@ Model as ready
to fetch children *
- *EFL_MODEL_LOAD_STATUS_LOADED = (1 2) | (1 3), /*@ Model as ready
to fetch properties and children *
+ *loaded_properties = (1 2), /*@ Model as ready to fetch properties *
+ *loaded_children = (1 3), /*@ Model as ready to fetch children *
+ *loaded = (1 2) | (1 3), /*@ Model as ready to fetch properties and
children *
*
- *EFL_MODEL_LOAD_STATUS_UNLOADING = (1 4), /*@ Model Unload in progress
*
- *EFL_MODEL_LOAD_STATUS_UNLOADED = (1 5) /*@ Model Unloaded *
+ *unloading = (1 4), /*@ Model Unload in progress *
+ *unloaded = (1 5) /*@ Model Unloaded *
* }
*
*
- * type Efl_Model_Property_Event: struct _Efl_Model_Property_Event
+ * struct Efl_Model_Property_Event
* {
* changed_properties: Eina_Array* const(char)*; /*@ List of changed
properties *
* invalidated_properties: Eina_Array* const(char)*; /*@ Removed properties
identified by name *
--
[EGIT] [core/elementary] master 01/01: elm - tests - fix const warnings with new eina home get func
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ecd2a8248f12714b254e13f21a04b483fcdea8c1
commit ecd2a8248f12714b254e13f21a04b483fcdea8c1
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Fri May 15 12:36:45 2015 +0900
elm - tests - fix const warnings with new eina home get func
---
src/bin/test_fileselector.c | 2 +-
src/bin/test_map.c | 2 +-
src/bin/test_panel.c| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c
index eade901..3568fcd 100644
--- a/src/bin/test_fileselector.c
+++ b/src/bin/test_fileselector.c
@@ -517,7 +517,7 @@ test_fileselector(void *data EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Evas_Object *win, *fs, *box, *vbox, *sep;
- char * home_env;
+ const char * home_env;
/* Set the locale according to the system pref.
* If you don't do so the file selector will order the files list in
diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index 91bd732..69f03a9 100644
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -534,7 +534,7 @@ static void
_track_add(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Evas_Object *fs, *vbox, *hbox, *sep;
- char *path = NULL;
+ const char *path = NULL;
fs_win = elm_win_util_standard_add(fileselector, File Selector);
elm_win_autodel_set(fs_win, EINA_TRUE);
diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c
index 2a63d43..9c8d4eb 100644
--- a/src/bin/test_panel.c
+++ b/src/bin/test_panel.c
@@ -91,7 +91,7 @@ _fill_list(Evas_Object *obj, Elm_Genlist_Item_Class *itc)
struct dirent *de;
Eina_List *l;
char *real;
- char *home_env = NULL;
+ const char *home_env = NULL;
unsigned int x = 0;
if (!dirs)
--
