[EGIT] [core/efl] master 01/02: Eo: Fix a potentially dangerous lack of {}.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d85029a5c0a8605c0654b517310639a3a1b04a46
commit d85029a5c0a8605c0654b517310639a3a1b04a46
Author: Tom Hacohen t...@stosb.com
Date: Thu Jun 18 13:44:51 2015 +0100
Eo: Fix a potentially dangerous lack of {}.
You should always use curly brackets. Especially when the inside statement
has its own curlys. This can be confusing and has already lead to bugs in
many projects.
---
src/lib/eo/eo.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index c143a4a..1a18287 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -722,12 +722,14 @@ _eo_api_desc_get(const void *api_func, const _Eo_Class
*klass, const _Eo_Class *
* function name itself. Slow, but this should rarely happen.
*/
for (unsigned int i = 0; i cur_klass-desc-ops.count; i++)
- if (api_name !strcmp(api_name, op_descs[i].api_name))
- {
-if (op_descs[i].api_func == NULL || op_descs[i].api_func
== ((void (*)())-1))
- break;
-return op_descs[i];
- }
+ {
+ if (api_name !strcmp(api_name, op_descs[i].api_name))
+{
+ if (op_descs[i].api_func == NULL ||
op_descs[i].api_func == ((void (*)())-1))
+ break;
+ return op_descs[i];
+}
+ }
#endif
}
}
--
[EGIT] [core/elementary] master 01/01: elm confiug - remove now useless x11 property handling - donr by files
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ac874ffe6254d85bd0a5c05d99c8fa573d04d9d5
commit ac874ffe6254d85bd0a5c05d99c8fa573d04d9d5
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu Jun 18 20:12:04 2015 +0900
elm confiug - remove now useless x11 property handling - donr by files
follow on from b1c5de0b9aa67b9d5cc4722e9462830beb3af37b,
aa7f859da10ce007a7b945a8703e70161c96146d
---
src/lib/elm_config.c | 117 +--
1 file changed, 1 insertion(+), 116 deletions(-)
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index b4920ab..b823346 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -125,61 +125,6 @@ static void_color_overlays_cancel(void);
#define ELM_CONFIG_LIST(edd, type, member, eddtype) \
EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
-#ifdef HAVE_ELEMENTARY_X
-static Ecore_Event_Handler *_prop_change_handler = NULL;
-static Ecore_Timer *_prop_change_delay_timer = NULL;
-static Ecore_X_Window _config_win = 0;
-#define ATOM_COUNT 3
-static Ecore_X_Atom _atom[ATOM_COUNT];
-static const char *_atom_names[ATOM_COUNT] =
-{
- ELM_PROFILE,
- ELM_CONFIG,
- ELM_CONFIG_WIN
-};
-#define ATOM_E_PROFILE0
-#define ATOM_E_CONFIG 1
-#define ATOM_E_CONFIG_WIN 2
-
-static Eina_Bool
-_prop_change_delay_cb(void *data EINA_UNUSED)
-{
- char *s;
-
- if (!getenv(ELM_PROFILE))
- {
-s = ecore_x_window_prop_string_get(_config_win, _atom[ATOM_E_PROFILE]);
-if (s)
- {
- free(_elm_profile);
- _elm_profile = s;
- }
- }
- _config_get();
- _prop_change_delay_timer = NULL;
-
- return ECORE_CALLBACK_CANCEL;
-}
-
-static Eina_Bool
-_prop_change(void *data EINA_UNUSED,
- int ev_type EINA_UNUSED,
- void *ev)
-{
- Ecore_X_Event_Window_Property *event = ev;
-
- if (event-win == _config_win)
- {
-if (event-atom == _atom[ATOM_E_PROFILE])
- {
- ecore_timer_del(_prop_change_delay_timer);
- _prop_change_delay_timer = ecore_timer_add(0.1,
_prop_change_delay_cb, NULL);
- }
- }
- return ECORE_CALLBACK_PASS_ON;
-}
-#endif
-
static void
_elm_font_overlays_del_free(void)
{
@@ -3118,12 +3063,6 @@ EAPI void
elm_config_all_flush(void)
{
FILE *f;
-
-#ifdef HAVE_ELEMENTARY_X
- if (ecore_x_display_get())
- ecore_x_window_prop_string_set(_config_win, _atom[ATOM_E_PROFILE],
-_elm_profile);
-#endif
char buf[PATH_MAX];
_elm_config_user_dir_snprintf(buf, sizeof(buf), config/%s/flush,
@@ -3187,7 +3126,6 @@ void
_elm_config_sub_shutdown(void)
{
#ifdef HAVE_ELEMENTARY_X
- ELM_SAFE_FREE(_prop_change_delay_timer, ecore_timer_del);
if (ecore_x_display_get()) ecore_x_shutdown();
#endif
ELM_SAFE_FREE(_eio_monitor, eio_monitor_del);
@@ -3251,59 +3189,9 @@ _elm_config_sub_init(void)
else /* No $DISPLAY */
init_x = EINA_FALSE;
}
-
if (init_x)
{
-if (ecore_x_init(NULL))
- {
- Ecore_X_Window win = 0, win2 = 0, root;
-
- if (!ecore_x_screen_is_composited(0))
- _elm_config-compositing = 0;
- ecore_x_atoms_get(_atom_names, ATOM_COUNT, _atom);
- root = ecore_x_window_root_first_get();
- if (ecore_x_window_prop_window_get(root,
-_atom[ATOM_E_CONFIG_WIN],
-win, 1) == 1)
- {
- if (ecore_x_window_prop_window_get(win,
- _atom[ATOM_E_CONFIG_WIN],
- win2, 1) == 1)
-{
- if (win2 == win) _config_win = win;
-}
- }
- if (_config_win == 0)
- _config_win = ecore_x_window_permanent_new
- (root, _atom[ATOM_E_CONFIG_WIN]);
-
- ecore_x_event_mask_set(_config_win,
-ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
- _prop_change_handler = ecore_event_handler_add
- (ECORE_X_EVENT_WINDOW_PROPERTY, _prop_change, NULL);
- if (!getenv(ELM_PROFILE))
- {
- char *s;
-
- s = ecore_x_window_prop_string_get(_config_win,
- _atom[ATOM_E_PROFILE]);
- if (s)
-{
- int changed = 0;
-
- if (_elm_profile)
- {
-if (strcmp(_elm_profile, s)) changed = 1;
-free(_elm_profile);
- }
- _elm_profile = s;
- if
[EGIT] [core/efl] master 02/03: evas-render2: Fix Coverity CID1306141: Dereference null return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ac6a91864439d346ce72cfedca93e69c8ecdb1ac
commit ac6a91864439d346ce72cfedca93e69c8ecdb1ac
Author: Chris Michael cp.mich...@samsung.com
Date: Thu Jun 18 10:24:40 2015 -0400
evas-render2: Fix Coverity CID1306141: Dereference null return value
Summary: Coverity reports that eina_thread_queue_wait was returning
NULL and thus msg variable being used here causes dereferencing a null
pointer.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/evas/canvas/render2/evas_render2_th_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/render2/evas_render2_th_main.c
b/src/lib/evas/canvas/render2/evas_render2_th_main.c
index c462d87..54b3428 100644
--- a/src/lib/evas/canvas/render2/evas_render2_th_main.c
+++ b/src/lib/evas/canvas/render2/evas_render2_th_main.c
@@ -247,7 +247,8 @@ _evas_render2_th_main(void *data EINA_UNUSED, Eina_Thread
thread EINA_UNUSED)
for (;;)
{
msg = eina_thread_queue_wait(_th_main_queue, ref);
-_evas_render2_th_main_do(msg-eo_e, msg-e);
+if (msg)
+ _evas_render2_th_main_do(msg-eo_e, msg-e);
eina_thread_queue_wait_done(_th_main_queue, ref);
}
return NULL;
--
[EGIT] [core/efl] master 03/03: edje: Fix Coverity CID1299026 and CID1299027: Explicit null dereference
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=38698de56402c460b203f242d58f86a0d19bd144
commit 38698de56402c460b203f242d58f86a0d19bd144
Author: Chris Michael cp.mich...@samsung.com
Date: Thu Jun 18 10:29:06 2015 -0400
edje: Fix Coverity CID1299026 and CID1299027: Explicit null dereference
Summary: Coverity reports that this potentially is passing a NULL
pointer to strcmp. As the GETSTR macro Can possible return NULL we
should be checking that return before passing it to strcmp.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/edje/edje_embryo.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/edje/edje_embryo.c b/src/lib/edje/edje_embryo.c
index f3a7400..e05cb0c 100644
--- a/src/lib/edje/edje_embryo.c
+++ b/src/lib/edje/edje_embryo.c
@@ -1100,7 +1100,7 @@ _edje_embryo_fn_set_state_anim(Embryo_Program *ep,
Embryo_Cell *params)
if (HASNPARAMS(6))
{
GETSTR(tmp, params[6]);
- if (!strcmp(tmp, CURRENT))
+ if ((tmp) (!strcmp(tmp, CURRENT)))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
}
@@ -1110,7 +1110,7 @@ _edje_embryo_fn_set_state_anim(Embryo_Program *ep,
Embryo_Cell *params)
if (HASNPARAMS(7))
{
GETSTR(tmp, params[7]);
- if (!strcmp(tmp, CURRENT))
+ if ((tmp) (!strcmp(tmp, CURRENT)))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
else if (HASNPARAMS(5))
@@ -1126,7 +1126,7 @@ _edje_embryo_fn_set_state_anim(Embryo_Program *ep,
Embryo_Cell *params)
if (HASNPARAMS(8))
{
GETSTR(tmp, params[8]);
- if (!strcmp(tmp, CURRENT))
+ if ((tmp) (!strcmp(tmp, CURRENT)))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
else if (HASNPARAMS(5))
@@ -1142,7 +1142,7 @@ _edje_embryo_fn_set_state_anim(Embryo_Program *ep,
Embryo_Cell *params)
if (HASNPARAMS(12))
{
GETSTR(tmp, params[8]);
- if (!strcmp(tmp, CURRENT))
+ if ((tmp) (!strcmp(tmp, CURRENT)))
anim_type |= EDJE_TWEEN_MODE_OPT_FROM_CURRENT;
}
else if (HASNPARAMS(5))
--
[EGIT] [core/efl] master 01/03: ecore-input-evas: Fix Coverity CID1306803 (logically dead code)
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b35e10760323b3cc933892a1e593d6a50af2f1d4
commit b35e10760323b3cc933892a1e593d6a50af2f1d4
Author: Chris Michael cp.mich...@samsung.com
Date: Thu Jun 18 10:20:07 2015 -0400
ecore-input-evas: Fix Coverity CID1306803 (logically dead code)
Summary: This cleans up the _ecore_event_evas_mouse_button function.
Coverity was reporting that the state tests in the 'if' function could
not be be reached due to eel variable being null. This moves the if
(!eel) check to run before the state tests.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_input_evas/ecore_input_evas.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c
b/src/lib/ecore_input_evas/ecore_input_evas.c
index 938217c..b9b3082 100644
--- a/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/src/lib/ecore_input_evas/ecore_input_evas.c
@@ -459,14 +459,17 @@ _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button
*e, Ecore_Event_Press pr
{
//ECORE_UP or ECORE_CANCEL
eel = _ecore_event_evas_lookup(e-multi.device, e-buttons,
EINA_FALSE);
+if (!eel)
+ {
+ WRN(ButtonEvent has no history.);
+ return ECORE_CALLBACK_PASS_ON;
+ }
-if ((!eel) || (eel-state == ECORE_INPUT_UP) || (eel-state ==
ECORE_INPUT_CANCEL))
+if ((eel-state == ECORE_INPUT_UP) ||
+(eel-state == ECORE_INPUT_CANCEL))
{
-if (!eel)
- WRN(ButtonEvent has no history.);
-else
- WRN(ButtonEvent has wrong history. Last state=%d, eel-state);
-return ECORE_CALLBACK_PASS_ON;
+ WRN(ButtonEvent has wrong history. Last state=%d, eel-state);
+ return ECORE_CALLBACK_PASS_ON;
}
}
--
[EGIT] [core/efl] master 01/01: evas-gl-drm: Cleanup compiler warnings when building gl_drm engine
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4e6b06dfd75f5a711d9eb61d6432bbaa220c1bfe
commit 4e6b06dfd75f5a711d9eb61d6432bbaa220c1bfe
Author: Chris Michael cp.mich...@samsung.com
Date: Thu Jun 18 09:59:29 2015 -0400
evas-gl-drm: Cleanup compiler warnings when building gl_drm engine
Summary: This cleans up nasty compiler warnings when building the
gl_drm engine. If we do not define EGL_EGLEXT_PROTOTYPES then we end
up with implicit declaration warnings
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/modules/evas/engines/gl_drm/evas_engine.h | 2 ++
src/modules/evas/engines/gl_drm/evas_outbuf.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h
b/src/modules/evas/engines/gl_drm/evas_engine.h
index d4395e7..9578a7b 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -7,7 +7,9 @@
# include Evas.h
# include Evas_Engine_GL_Drm.h
+# define EGL_EGLEXT_PROTOTYPES
# define GL_GLEXT_PROTOTYPES
+
# include EGL/egl.h
# include EGL/eglext.h
# include EGL/eglmesaext.h
diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c
b/src/modules/evas/engines/gl_drm/evas_outbuf.c
index 9e251d1..2c41a2a 100644
--- a/src/modules/evas/engines/gl_drm/evas_outbuf.c
+++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c
@@ -246,7 +246,7 @@ _evas_outbuf_egl_setup(Outbuf *ob)
DBG(Config Format: %d, format);
DBG(OB Format: %d, ob-info-info.format);
-if (format == ob-info-info.format)
+if (format == (int)ob-info-info.format)
{
ob-egl.config = cfgs[i];
break;
--
[EGIT] [core/efl] master 01/01: efl_gfx_gradient: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4b0b8960b628fe9fdbe285de1978fc96f61c30a0
commit 4b0b8960b628fe9fdbe285de1978fc96f61c30a0
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jun 18 16:28:33 2015 +0100
efl_gfx_gradient: convert docs
---
src/lib/efl/interfaces/efl_gfx_gradient_base.eo | 24 +--
src/lib/efl/interfaces/efl_gfx_gradient_linear.eo | 24 ---
2 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
b/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
index 8e43978..a530397 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
@@ -5,33 +5,27 @@ interface Efl.Gfx.Gradient.Base
methods {
@property stop {
set {
-/*@
- Set the list of color stops for the gradient
-*/
+[[Set the list of color stops for the gradient]]
}
get {
-/*@
- get the list of color stops.
-*/
+[[Get the list of color stops.]]
}
values {
-colors: const(Efl_Gfx_Gradient_Stop) *; /*@ color stops list*/
-length: uint; /*@ length of the list */
+colors: const(Efl_Gfx_Gradient_Stop) *; [[color stops list]]
+length: uint; [[length of the list]]
}
}
@property spread {
set {
-/*@
- Specifies the spread method that should be used for this
gradient.
-*/
+[[Specifies the spread method that should be used for this
gradient.]]
}
get {
-/*@
- Returns the spread method use by this gradient. The default is
EFL_GFX_GRADIENT_SPREAD_PAD.
-*/
+[[Returns the spread method use by this gradient. The default is
+ EFL_GFX_GRADIENT_SPREAD_PAD.
+]]
}
values {
-s: Efl_Gfx_Gradient_Spread; /*@ spread type to be used */
+s: Efl_Gfx_Gradient_Spread; [[spread type to be used]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
index 4192567..c3f6bfd 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
@@ -4,34 +4,26 @@ interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient.Base)
methods {
@property start {
set {
-/*@
- Sets the start point of this linear gradient.
-*/
+[[Sets the start point of this linear gradient.]]
}
get {
-/*@
- Gets the start point of this linear gradient.
-*/
+[[Gets the start point of this linear gradient.]]
}
values {
-x: double; /*@ x co-ordinate of start point */
-y: double; /*@ y co-ordinate of start point */
+x: double; [[x co-ordinate of start point]]
+y: double; [[y co-ordinate of start point]]
}
}
@property end {
set {
-/*@
- Sets the end point of this linear gradient.
-*/
+[[Sets the end point of this linear gradient.]]
}
get {
-/*@
- Gets the end point of this linear gradient.
-*/
+[[Gets the end point of this linear gradient.]]
}
values {
-x: double; /*@ x co-ordinate of end point */
-y: double; /*@ y co-ordinate of end point */
+x: double; [[x co-ordinate of end point]]
+y: double; [[y co-ordinate of end point]]
}
}
}
--
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-buildorder changed with summary [created] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=086516f18b23ac5ee62773eff25dfb72956307bc commit 086516f18b23ac5ee62773eff25dfb72956307bc Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:25:05 2015 -0700 Wiki page docs-efl-buildorder changed with summary [created] by Raster --- pages/docs-efl-buildorder.txt | 4 1 file changed, 4 insertions(+) diff --git a/pages/docs-efl-buildorder.txt b/pages/docs-efl-buildorder.txt new file mode 100644 index 000..5bfdc40 --- /dev/null +++ b/pages/docs-efl-buildorder.txt @@ -0,0 +1,4 @@ + * efl + * emotion_generic_players + * evas_generic_loaders + * elementary --
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-buildenv 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=823a24f094b503ea39e1d140ff74eb7fff4b1a3c commit 823a24f094b503ea39e1d140ff74eb7fff4b1a3c Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:46:15 2015 -0700 Wiki page docs-efl-buildenv changed with summary [] by Raster --- pages/docs-efl-buildenv.txt | 20 1 file changed, 20 insertions(+) diff --git a/pages/docs-efl-buildenv.txt b/pages/docs-efl-buildenv.txt index 22afda5..d5a9156 100644 --- a/pages/docs-efl-buildenv.txt +++ b/pages/docs-efl-buildenv.txt @@ -6,6 +6,26 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH /code +Below choose one of the following ''CFLAGS'' to use. To ensure your code is compiled with decent optimzations you should also set this up in your environment: + +code bash +export CFLAGS=-O3 -ffast-math -march=native +/code + +Note that if you wish to compile for older architectures than your current system, please look up the compiler documentation and replace ''-march=native'' with something appropriate. + +If you wish decently optimized code that is still debuggable (but that optimizations may still make a little hard to debug) you can do: + +code bash +export CFLAGS=-O2 -ffast-math -march=native -g +/code + +If you want a really debuggable piece of code where optimizations mess with little to nothing at all use: + +code bash +export CFLAGS=-O -g -ffast-math -march=native +/code + Runtime Library Linking Note the ''LD_LIBRARY_PATH'' environment variable is set. You can ensure the system always supports ''/usr/local/lib'' by editing ''/etc/ld.so.conf'' or adding a file to ''/etc/ld.so.conf.d'' and simply have a line in either file that says: --
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-buildorder 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=09f35394683367858a8189cfc5bf4fd6af7ea88c commit 09f35394683367858a8189cfc5bf4fd6af7ea88c Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:26:47 2015 -0700 Wiki page docs-efl-buildorder changed with summary [] by Raster --- pages/docs-efl-buildorder.txt | 7 +++ 1 file changed, 7 insertions(+) diff --git a/pages/docs-efl-buildorder.txt b/pages/docs-efl-buildorder.txt index 5bfdc40..ab80d54 100644 --- a/pages/docs-efl-buildorder.txt +++ b/pages/docs-efl-buildorder.txt @@ -2,3 +2,10 @@ * emotion_generic_players * evas_generic_loaders * elementary + +Then any further applications or tools (in any order now) such as: + + * enlightenment + * terminology + * rage + * etc. --
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-deps-git 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=f5f3e8f139566298ce75c175c85fce8199bfffe5 commit f5f3e8f139566298ce75c175c85fce8199bfffe5 Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:20:59 2015 -0700 Wiki page docs-efl-deps-git changed with summary [] by Raster --- pages/docs-efl-deps-git.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/docs-efl-deps-git.txt b/pages/docs-efl-deps-git.txt index fda6a1d..657d78b 100644 --- a/pages/docs-efl-deps-git.txt +++ b/pages/docs-efl-deps-git.txt @@ -1,6 +1,6 @@ * git - * autoconf 2.59 or better - * automake 1.10 or better + * autoconf //(2.59 or better)// + * automake //(1.10 or better)// * autopoint * libtool * gettext --
[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=0e6975367bc870e1fb5d05713dda1811a69cb01d commit 0e6975367bc870e1fb5d05713dda1811a69cb01d Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:02:00 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 bc8680c..da35eb1 100644 --- a/pages/docs.txt +++ b/pages/docs.txt @@ -10,8 +10,8 @@ course you can use stable packages for your distribution as well. === Getting EFL === - * [[docs-efl-start|Get EFL installed]] - * [[distros/ubuntu-start|EFL on ubuntu]] + * [[docs-efl-start|Get EFL installed from source]] + * [[distros/ubuntu-start|EFL on Ubuntu (packages and source)]] * [[docs/c/start|A basic primer on C]] * [[docs/efl/start|Get started with EFL]] * [[docs/efl/advanced/start|Advanced EFL Topics]] --
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-buildenv changed with summary [created] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=5e1153252177b7b4064f3be0f7f3960c7b5fe18f commit 5e1153252177b7b4064f3be0f7f3960c7b5fe18f Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:37:01 2015 -0700 Wiki page docs-efl-buildenv changed with summary [created] by Raster --- pages/docs-efl-buildenv.txt | 17 + 1 file changed, 17 insertions(+) diff --git a/pages/docs-efl-buildenv.txt b/pages/docs-efl-buildenv.txt new file mode 100644 index 000..22afda5 --- /dev/null +++ b/pages/docs-efl-buildenv.txt @@ -0,0 +1,17 @@ +You will want to ensure the default prefix ''/usr/local'' is available to build tools. If you know what you are doing, you can change the prefix, but this here shall assume you do not, and the above prefix is used. These environment variables are used during build, so you may want to make them more permanent. + +code bash +export PATH=/usr/local/bin:$PATH +export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH +export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH +/code + + Runtime Library Linking + +Note the ''LD_LIBRARY_PATH'' environment variable is set. You can ensure the system always supports ''/usr/local/lib'' by editing ''/etc/ld.so.conf'' or adding a file to ''/etc/ld.so.conf.d'' and simply have a line in either file that says: + +code bash +/usr/local/lib +/code + +And remember to run ''sudo ldconfig'' tool every time you install a library to ensure caches are updated. --
[EGIT] [website/www-content] master 01/01: Wiki page ubuntu-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=0ff0c8aa54b821a3c070f9166b57ccde6b336c19 commit 0ff0c8aa54b821a3c070f9166b57ccde6b336c19 Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:07:00 2015 -0700 Wiki page ubuntu-start changed with summary [] by Raster --- pages/distros/ubuntu-start.txt | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/distros/ubuntu-start.txt b/pages/distros/ubuntu-start.txt index a78d388..a06d1be 100644 --- a/pages/distros/ubuntu-start.txt +++ b/pages/distros/ubuntu-start.txt @@ -1,5 +1,5 @@ -~~Title: Ubuntu~~ - Ubuntu +~~Title: EFL on Ubuntu~~ + Packages The available version of the official package is outdated, a better way is to install e19 from a PPA repository: @@ -26,6 +26,8 @@ sudo apt-get update sudo apt-get install libelementary1 /code + Compiling from source + If you want to install enlightenment, elementary or EFL from sources, make sure the following dependencies are installed: @@ -51,5 +53,4 @@ libxext-dev libxkbfile-dev libxtst-dev libxcb1-dev libxcb-shape0-dev \ libxcb-keysyms1-dev libbullet-dev vlc libvlc-dev autoconf libtool /code -Then go to [[../docs-efl-start|Get EFL installed]] tutorial, to install -Enlightenment from sources. +Then go to [[../docs-efl-start]], to install Enlightenment from source. \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-debug changed with summary [created] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=557ad64cf9037166bbe5cf91adba0168064dc5d1 commit 557ad64cf9037166bbe5cf91adba0168064dc5d1 Author: Raster ras...@rasterman.com Date: Thu Jun 18 20:25:38 2015 -0700 Wiki page docs-efl-debug changed with summary [created] by Raster --- pages/docs-efl-debug.txt | 278 +++ 1 file changed, 278 insertions(+) diff --git a/pages/docs-efl-debug.txt b/pages/docs-efl-debug.txt new file mode 100644 index 000..e0bec06 --- /dev/null +++ b/pages/docs-efl-debug.txt @@ -0,0 +1,278 @@ +~~Title: Debugging~~ + Compilation + +Remember to build EFL, Enlightenment etc. with debugging compile flags. [[docs-efl-start]] has a section on this for your build environment. Remember to have ''-g'' as a ''CFLAGS'' option to ensure binaries and libraries have all the debug information they need. If you didn't build with debugging, simply build again with these flags correctly set and debugging can begin. + + EFL Logs + +Sometimes you will see logs as follows: + +code bash +CRI10094:elementary elm_toolbar.c:1453 _elm_toolbar_elm_widget_theme_apply() Failed to set layout! +*** Backtrace *** +/usr/local/lib/libeina.so.1 0x7f8c2fc0be86 0x7f8c2fbea000 +/usr/local/lib/libeina.so.1 0x7f8c2fc0d1a9 0x7f8c2fbea000 +/usr/local/lib/libelementary.so.1 0x7f8c3028c87d 0x7f8c30072000 +/usr/local/lib/libelementary.so.1 0x7f8c302aa086 0x7f8c30072000 +/usr/local/lib/libelementary.so.1 0x7f8c30288d58 0x7f8c30072000 +/usr/local/lib/libelementary.so.1 0x7f8c3028618c 0x7f8c30072000 +/usr/local/lib/libelementary.so.1 0x7f8c3028f087 0x7f8c30072000 +/usr/local/bin/terminology 0x416d58 0x40 +/usr/local/lib/libevas.so.1 0x7f8c2f3daca6 0x7f8c2f34a000 +/usr/local/lib/libeo.so.1 0x7f8c2e5ed37b 0x7f8c2e5e +/usr/local/lib/libeo.so.1 0x7f8c2e5ebbcb 0x7f8c2e5e +/usr/local/lib/libevas.so.1 0x7f8c2f3dceaa 0x7f8c2f34a000 +/usr/local/lib/libedje.so.1 0x7f8c2e87d5e1 0x7f8c2e7f8000 +/usr/local/lib/libedje.so.1 0x7f8c2e8837a7 0x7f8c2e7f8000 +/usr/local/lib/libedje.so.1 0x7f8c2e87e90f 0x7f8c2e7f8000 +/usr/local/lib/libedje.so.1 0x7f8c2e87eab7 0x7f8c2e7f8000 +/usr/local/lib/libecore.so.10x7f8c2f122d0b 0x7f8c2f11 +/usr/local/lib/libecore.so.10x7f8c2f11d775 0x7f8c2f11 +/usr/local/lib/libecore.so.10x7f8c2f1251f8 0x7f8c2f11 +/usr/local/lib/libecore.so.10x7f8c2f1253d7 0x7f8c2f11 +/usr/local/bin/terminology 0x4138b7 0x40 +/usr/local/bin/terminology 0x40c74c 0x40 +/usr/lib/libc.so.6 0x7f8c2c675800 0x7f8c2c655000 +/code + +This is EFL logging a critical error. There are various levels of error, critical, error, warning and debug are the main ones, but by default you should normally only see ''CRI'' and ''ERR''. Following this log line which gives source file where the complaining is being printed and the line number is a full backtrace. This is not generally human readable because making it so is relatively costly, so it is not done at runtime. But we provide a utility to make this far nicer for humans. Th [...] + +code bash +cat mybacktrace.txt +# copy and paste the above lines following *** Backtrace *** that start with file paths +# now hit CTRL+D to end input +cat mybacktrace.txt | eina_btlog +/code + +And you should end up with a colorized log as below that humans can easily use. This is the log a developer wants to identify the full path used to trigger the issue, with functions called from bottom to top of the stack (newest functions called are at the top of this log), with file paths and line numbers, and even binary files these come from. + +code bash +/usr/local/lib/libeina.so.1 | /home/raster/C/efl/src/lib/eina/eina_log.c : 1875 @ eina_log_print_cb_stderr() +/usr/local/lib/libeina.so.1 | /home/raster/C/efl/src/lib/eina/eina_log.c : 1272 @ eina_log_print_unlocked() +/usr/local/lib/libelementary.so.1 | /home/raster/C/elementary/src/lib/elm_toolbar.c: 1453 @ _elm_toolbar_elm_widget_theme_apply() +/usr/local/lib/libelementary.so.1 | /home/raster/C/elementary/src/lib/elm_widget.eo.c : 451 @ elm_obj_widget_theme_apply() +/usr/local/lib/libelementary.so.1 | /home/raster/C/elementary/src/lib/elm_toolbar.c: 2949 @ _elm_toolbar_icon_size_set() +/usr/local/lib/libelementary.so.1 | /home/raster/C/elementary/src/lib/elm_toolbar.eo.c : 56 @ elm_obj_toolbar_icon_size_set() +/usr/local/lib/libelementary.so.1 | /home/raster/C/elementary/src/lib/elm_toolbar.eo.c : 354 @ elm_toolbar_icon_size_set() +/usr/local/bin/terminology| /home/raster/C/terminology/src/bin/options.c: 156 @ options_toggle() +/usr/local/lib/libevas.so.1 | /home/raster/C/efl/src/lib/evas/canvas/evas_object_smart.c : 67 @
[EGIT] [website/www-content] master 01/01: Wiki page docs-efl-deps-src changed with summary [created] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0316469321ff0f00330c616e04cbff703bc26f58 commit 0316469321ff0f00330c616e04cbff703bc26f58 Author: Raster ras...@rasterman.com Date: Thu Jun 18 19:13:42 2015 -0700 Wiki page docs-efl-deps-src changed with summary [created] by Raster --- pages/docs-efl-deps-src.txt | 42 ++ 1 file changed, 42 insertions(+) diff --git a/pages/docs-efl-deps-src.txt b/pages/docs-efl-deps-src.txt new file mode 100644 index 000..4d711e7 --- /dev/null +++ b/pages/docs-efl-deps-src.txt @@ -0,0 +1,42 @@ + * gcc or clang + * make + * check + * libpam + * freetype //(2.3 or better)// + * libpng + * libjpeg + * zlib + * libdbus + * luajit + * libx11 + * libxcursor + * libxrender + * libxrandr + * libxfixes + * libxdamage + * libxcomposite + * libxss + * libxp + * libxext + * libxinerama + * libxkbfile + * libxtst + * libxcb + * libxcb-shape + * libxcb-keysyms1 + * libpulse + * libsndfile + * libudev //(for eeze udev support)// + * libblkid libmount **OR** libutil-linux + * libgstreamer //(1.0 or better)// + * vlc //(for emotion_generic_players)// + * libtiff + * giflib + * curl + * openssl + * opengl //(mesa or vendor supplied desktop OpenGL or OpenGL-ES2)// + * libspectre //(for evas_generic_loaders)// + * poppler //(for evas_generic_loaders)// + * librsvg //(for evas_generic_loaders)// + * libraw //(for evas_generic_laoders)// + * libxine //(for emotion xine back-end support - optional)// --
[EGIT] [e16/e16] master 01/01: Require render version 0.11 before using XRenderCreateSolidFill().
kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16.git/commit/?id=4c8af1fda8adc5aeec1f6a81e8e48333e84c30c1
commit 4c8af1fda8adc5aeec1f6a81e8e48333e84c30c1
Author: Kim Woelders k...@woelders.dk
Date: Thu Jun 18 17:33:18 2015 +0200
Require render version 0.11 before using XRenderCreateSolidFill().
Apparently use of XRenderCreateSolidFill() may trigger high Xorg cpu
usage (seen on Xorg 1.7.7 with render 0.10, driver unknown).
Exact reason unknown, maybe a driver problem.
Requiring render version = 0.11 may just be a random way to avoid
some brokenness in older Xorgs.
---
src/x.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/x.c b/src/x.c
index 9e80bad..b13e98c 100644
--- a/src/x.c
+++ b/src/x.c
@@ -2103,8 +2103,11 @@ EPictureCreateSolid(EX_Window xwin, int argb, unsigned
int a, unsigned int rgb)
c.green = (unsigned short)(_G(rgb) * 0x101);
c.blue = (unsigned short)(_B(rgb) * 0x101);
-#if RENDER_VERSION = VERS(0, 10)
- if (ExtVersion(XEXT_RENDER) = VERS(0, 10))
+#if RENDER_VERSION = VERS(0, 11)
+ /* Version 0.10 should be good but apparently sometimes isn't
+* (or is it some broken driver?).
+* Anyway, let's require 0.11 and avoid some trouble. */
+ if (ExtVersion(XEXT_RENDER) = VERS(0, 11))
{
pict = XRenderCreateSolidFill(dpy, c);
}
--
[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=b90686bce9b87684bdf3148d81cb6522ec05af54
commit b90686bce9b87684bdf3148d81cb6522ec05af54
Author: Raster ras...@rasterman.com
Date: Wed Jun 17 23:03:30 2015 -0700
Wiki page start changed with summary [] by Raster
---
pages/docs/c/start.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/docs/c/start.txt b/pages/docs/c/start.txt
index 7456794..6f7d398 100644
--- a/pages/docs/c/start.txt
+++ b/pages/docs/c/start.txt
@@ -495,7 +495,7 @@ Generally you allocate memory with functions such as
''malloc()'', ''calloc()'',
The memory of your process, other than memory used to store the
code/instructions loaded from disk, is primarily made up of 2 elements. The
[[http://en.wikipedia.org/wiki/Call_stack|stack]] and the
[[http://en.wikipedia.org/wiki/Memory_management|heap]]. Your memory space will
generally look something as follows, often with the stack high up in memory (at
high addresses) and pieces of code from the process and libraries mapped in
from disk, as well as heap space being allocated there too [...]
-{{ memstackheap.svg?nolink |Complete memory space diagram }}
+{{ memheapstack.svg?nolink |Complete memory space diagram }}
The stack is managed for you mostly by the compiler and runtime. As the
application runs, every time a function is called, a new blob of memory is
pushed at the top of the stack (conceptually stacks grow.. thus the top is
where the newest item(s) are on the stack, but often the stack grows down in
memory, so to push you subtract values from the top of the stack and to pop,
you add again). This memory contains the parameters passed to each function,
and will contain return values from [...]
--
[EGIT] [core/efl] master 01/01: efl_model_base: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c93de19e227928288f2d64298ec8348373e0a8b5
commit c93de19e227928288f2d64298ec8348373e0a8b5
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jun 18 11:01:12 2015 +0100
efl_model_base: convert docs
---
src/lib/efl/interfaces/efl_model_base.eo | 344 +++
1 file changed, 162 insertions(+), 182 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_model_base.eo
b/src/lib/efl/interfaces/efl_model_base.eo
index 40abf00..288ef3f 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -30,129 +30,85 @@ interface Efl.Model.Base ()
methods {
@property load_status {
get {
-/*@
- Get a load emodel current status.
+ [[Get a load emodel current status.
- @return: @c Efl_Model_Load_Status
+ By convention this means get the current model status.
+ Possible values are defined Efl_Model_Load_Status enumerator.
- By convention this means get the current model status.
- Possible values are defined Efl_Model_Load_Status enumerator.
+ See also @Efl_Model_Load_Status, @efl_model_load
- @see Efl_Model_Load_Status
- @see efl_model_load
-
- @since 1.14 */
- return: Efl.Model.Load_Status;
+ @since 1.14
+ ]]
+ return: Efl.Model.Load_Status;
}
}
@property properties {
get {
-/*@
-Get properties from model.
+ [[Get properties from model.
- @return: @c Efl_Model_Load_Status
+ properties_get is due to provide callers a way the fetch the
+ current properties implemented/used by the model. The event
+ EFL_MODEL_EVENT_PROPERTIES_CHANGE will be raised to notify
+ listeners of any modifications in the properties.
-properties_get is due to provide callers a way the fetch the
current
-properties implemented/used by the model.
-The event EFL_MODEL_EVENT_PROPERTIES_CHANGE will be raised to
notify listeners
-of any modifications in the properties.
+ See also @EFL_MODEL_EVENT_PROPERTIES_CHANGE.
-@see EFL_MODEL_EVENT_PROPERTIES_CHANGE
-@since 1.14 */
-
-return: Efl.Model.Load_Status;
+ @since 1.14
+ ]]
+ return: Efl.Model.Load_Status;
}
values {
- properties: const(arrayconst(char*)*); /*@ array of current
properties */
+ properties: const(arrayconst(char*)*); [[array of current
properties]]
}
}
@property property {
set {
-/*@
-Set a property value of a given property name.
-
-@return: @c EINA_TRUE, on success, @c EINA_FALSE in readonly
property or error
+ [[Set a property value of a given property name.
-The caller must ensure to call at least efl_model_prop_list
before being
-able to see/set properties.
-This function sets a new property value into given property
name. Once
-the operation is completed the concrete implementation should
raise
-EFL_MODEL_EVENT_PROPERTIES_CHANGE event in order to notify
listeners of the
-new value of the property.
+ The caller must ensure to call at least efl_model_prop_list
+ before being able to see/set properties. This function sets
+ a new property value into given property name. Once the
+ operation is completed the concrete implementation should
+ raise EFL_MODEL_EVENT_PROPERTIES_CHANGE event in order to
+ notify listeners of the new value of the property.
-If the model doesn't have the property then there are two
possibilities,
-either raise an error or create the new property in model
+ If the model doesn't have the property then there are two
+ possibilities, either raise an error or create the new
+ property in model
-@see efl_model_property_get
-@see EFL_MODEL_EVENT_PROPERTIES_CHANGE
-@since 1.14 */
+ See @efl_model_property_get,
@EFL_MODEL_EVENT_PROPERTIES_CHANGE
-return: Efl.Model.Load_Status;
+ @since 1.14
+ ]]
+ return: Efl.Model.Load_Status;
}
get {
-/*@
-Retrieve the value of a given property name.
-
-
[EGIT] [core/efl] master 01/01: efl_control,efl_text: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2d31628d85f72f7187e5d262a33f7986273e1831
commit 2d31628d85f72f7187e5d262a33f7986273e1831
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jun 18 11:21:43 2015 +0100
efl_control,efl_text: convert docs
---
src/lib/efl/interfaces/efl_control.eo | 8
src/lib/efl/interfaces/efl_text.eo| 20 +---
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_control.eo
b/src/lib/efl/interfaces/efl_control.eo
index 863cc11..ec587f6 100644
--- a/src/lib/efl/interfaces/efl_control.eo
+++ b/src/lib/efl/interfaces/efl_control.eo
@@ -4,23 +4,23 @@ interface Efl.Control {
legacy_prefix: null;
methods {
@property priority {
- /*@ Control the priority of the object. */
+ [[Control the priority of the object.]]
set {
}
get {
}
values {
- priority: int; /*@ The priority of the object */
+ priority: int; [[The priority of the object]]
}
}
@property suspend {
- /*@ Controls whether the object is suspended or not. */
+ [[Controls whether the object is suspended or not.]]
set {
}
get {
}
values {
- suspend: bool; /*@ Controls whether the object is suspended
or not. */
+ suspend: bool; [[Controls whether the object is suspended or
not.]]
}
}
}
diff --git a/src/lib/efl/interfaces/efl_text.eo
b/src/lib/efl/interfaces/efl_text.eo
index 73ba6bf..b8f2d58 100644
--- a/src/lib/efl/interfaces/efl_text.eo
+++ b/src/lib/efl/interfaces/efl_text.eo
@@ -3,24 +3,22 @@ interface Efl.Text {
methods {
@property text {
set {
-/*@
-Sets the text string to be displayed by the given text object.
+[[Sets the text string to be displayed by the given text object.
-@see evas_object_text_text_get() */
+ See also @evas_object_text_text_get.
+]]
}
get {
-/*@
-Retrieves the text string currently being displayed by the given
-text object.
+[[Retrieves the text string currently being displayed by the given
+ text object.
-@return The text string currently being displayed on it.
+ Do not free() the return value.
-@note Do not free() the return value.
-
-@see evas_object_text_text_set() */
+ See also @evas_object_text_text_set.
+]]
}
values {
-text: const(char)*; /*@ Text string to display on it. */
+text: const(char)*; [[Text string to display on it.]]
}
}
}
--
[EGIT] [core/efl] master 01/01: eina: add eina_simple_xml example.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ca0e51a2c649a7b21303d5fd48bad2f9e08cbb7c
commit ca0e51a2c649a7b21303d5fd48bad2f9e08cbb7c
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu Jun 18 19:50:00 2015 +0900
eina: add eina_simple_xml example.
This example just prints tag and it's attributes in xml file.
But this example intended for the scenario,
if the attributes have the or characters inside of the string.
---
src/examples/eina/eina_simple_xml_parser_02.c | 73 +++
src/examples/eina/exia.xml| 5 ++
2 files changed, 78 insertions(+)
diff --git a/src/examples/eina/eina_simple_xml_parser_02.c
b/src/examples/eina/eina_simple_xml_parser_02.c
new file mode 100644
index 000..0d8269a
--- /dev/null
+++ b/src/examples/eina/eina_simple_xml_parser_02.c
@@ -0,0 +1,73 @@
+//Compile with:
+//gcc -Wall -o eina_simple_xml_parser_02 eina_simple_xml_parser_02.c
`pkg-config --cflags --libs eina`
+
+#include Eina.h
+#include stdio.h
+#include string.h
+
+
+static Eina_Bool
+_xml_attribute_parse_cb(void *data, const char *key, const char *value)
+{
+ printf(attributes, key = %s, value = %s\n, key, value);
+ return EINA_TRUE;
+}
+
+static Eina_Bool
+_xml_tag_parse_cb(void *data, Eina_Simple_XML_Type type, const char *content,
+ unsigned offset EINA_UNUSED, unsigned int length)
+{
+ if (length = 0) return EINA_FALSE;
+
+ if (type == EINA_SIMPLE_XML_OPEN)
+ {
+//Print tag
+if (!strncmp(Group, content, strlen(Group)))
+ printf(tag = Group\n);
+else if (!strncmp(Label, content, strlen(Label)))
+ printf(tag = Label\n);
+
+//Print attributes
+const char *tags = eina_simple_xml_tag_attributes_find(content,
length);
+eina_simple_xml_attributes_parse(tags, length - (tags - content),
+ _xml_attribute_parse_cb, NULL);
+ }
+
+ return EINA_TRUE;
+}
+
+int
+main(void)
+{
+ FILE *file;
+ long size;
+
+ eina_init();
+
+ //1. Open XML File
+ file = fopen(exia.xml, rb);
+
+ if (!file) return 0;
+
+ fseek(file, 0, SEEK_END);
+ size = ftell(file);
+ fseek(file, 0, SEEK_SET);
+
+ //2. Read XML File
+ char *buffer = malloc(size);
+ if (!buffer)
+ {
+fclose(file);
+return 0;
+ }
+
+ fread(buffer, 1, size, file);
+
+ //3. Start Parsing XML
+ eina_simple_xml_parse(buffer, size, EINA_FALSE, _xml_tag_parse_cb, NULL);
+
+ fclose(file);
+ free(buffer);
+
+ return 0;
+}
diff --git a/src/examples/eina/exia.xml b/src/examples/eina/exia.xml
new file mode 100644
index 000..f5ae55b
--- /dev/null
+++ b/src/examples/eina/exia.xml
@@ -0,0 +1,5 @@
+?xml version=1.0 encoding=UTF-8?
+Group xmlns=http://www.enlightenment.org/docs;
+ Label text=0 is bigger than3? (0 3 ?)
+ /Label
+/Group
--
[EGIT] [core/efl] master 01/01: eina/simple_xml_parser: don't parse the , in the attribute string.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d72aa3fecbf9899884fbdb125cdc58ca93792cbb
commit d72aa3fecbf9899884fbdb125cdc58ca93792cbb
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu Jun 18 19:51:06 2015 +0900
eina/simple_xml_parser: don't parse the , in the attribute string.
The tag identifier should not be inside of the string ~.
Previous logic doesn't care that scenario,
the parser context can be corrupted and it will be no more useful.
@fix
---
src/lib/eina/eina_simple_xml_parser.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_simple_xml_parser.c
b/src/lib/eina/eina_simple_xml_parser.c
index 13dd5ee..d19e217 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -136,9 +136,16 @@ _eina_simple_xml_tag_start_find(const char *itr, const
char *itr_end)
static inline const char *
_eina_simple_xml_tag_end_find(const char *itr, const char *itr_end)
{
+ Eina_Bool inside_quote = EINA_FALSE;
for (; itr itr_end; itr++)
- if ((*itr == '') || (*itr == '')) /* consider also ends a tag */
- return itr;
+ {
+if (*itr == '') inside_quote = !inside_quote;
+if (!inside_quote)
+ {
+ if ((*itr == '') || (*itr == '')) /* consider also ends a tag
*/
+ return itr;
+ }
+ }
return NULL;
}
--
[EGIT] [core/efl] efl-1.14 01/01: eina/simple_xml_parser: don't parse the , in the attribute string.
hermet pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=14b744b90e2e74d607bf8b74abecc3c1c37979b8
commit 14b744b90e2e74d607bf8b74abecc3c1c37979b8
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu Jun 18 19:51:06 2015 +0900
eina/simple_xml_parser: don't parse the , in the attribute string.
The tag identifier should not be inside of the string ~.
Previous logic doesn't care that scenario,
the parser context can be corrupted and it will be no more useful.
@fix
---
src/lib/eina/eina_simple_xml_parser.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_simple_xml_parser.c
b/src/lib/eina/eina_simple_xml_parser.c
index 13dd5ee..d19e217 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -136,9 +136,16 @@ _eina_simple_xml_tag_start_find(const char *itr, const
char *itr_end)
static inline const char *
_eina_simple_xml_tag_end_find(const char *itr, const char *itr_end)
{
+ Eina_Bool inside_quote = EINA_FALSE;
for (; itr itr_end; itr++)
- if ((*itr == '') || (*itr == '')) /* consider also ends a tag */
- return itr;
+ {
+if (*itr == '') inside_quote = !inside_quote;
+if (!inside_quote)
+ {
+ if ((*itr == '') || (*itr == '')) /* consider also ends a tag
*/
+ return itr;
+ }
+ }
return NULL;
}
--
