[EGIT] [core/efl] master 01/01: evas_object_textblock: fix dereference before null check
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=344f17a03de8799b5b6008f11008bb079a8fac67
commit 344f17a03de8799b5b6008f11008bb079a8fac67
Author: MinJeong Kim minjjj@samsung.com
Date: Thu May 21 08:48:56 2015 +0100
evas_object_textblock: fix dereference before null check
Summary:
Fix coverity CID 1270031 Dereference before null check
@fix
Reviewers: devilhorns, zmike, raster, tasn
Reviewed By: tasn
Subscribers: tasn, cedric
Differential Revision: https://phab.enlightenment.org/D2522
---
src/lib/evas/canvas/evas_object_textblock.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index a2d7079..6cf2648 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7163,9 +7163,9 @@ evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
EAPI Eina_Bool
evas_textblock_cursor_is_format(const Evas_Textblock_Cursor *cur)
{
+ if ((!cur) || (!cur-node)) return EINA_FALSE;
Evas_Object_Protected_Data *obj = eo_data_scope_get(cur-obj,
EVAS_OBJECT_CLASS);
evas_object_async_block(obj);
- if (!cur || !cur-node) return EINA_FALSE;
return (_evas_textblock_cursor_node_format_at_pos_get(cur)) ?
EINA_TRUE : EINA_FALSE;
}
--
[EGIT] [core/efl] master 01/01: evas shader generation - add comments to indicate to commit the files
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b2c9899d8ae6d7cf6cf290ece56ce1d237901b6b
commit b2c9899d8ae6d7cf6cf290ece56ce1d237901b6b
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu May 21 17:13:25 2015 +0900
evas shader generation - add comments to indicate to commit the files
so you know the files should change when you make and shf files are
updated, add notes to the .x files generated to indicate they should
be committed back to the repo so it is clear
---
src/modules/evas/engines/gl_common/shader/evas_gl_enum.x | 1 +
src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x | 1 +
src/modules/evas/engines/gl_common/shader/gen_shaders.sh | 4 +++-
src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x | 1 +
src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh| 4 +++-
5 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
b/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
index e30184e..fef7a70 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_enum.x
@@ -1,4 +1,5 @@
/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
+/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
typedef enum {
SHADER_RECT,
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
index d1a3cc6..f78119b 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -1,4 +1,5 @@
/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
+/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
#include ../evas_gl_private.h
diff --git a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
index 7b0f741..1e606e3 100755
--- a/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
+++ b/src/modules/evas/engines/gl_common/shader/gen_shaders.sh
@@ -58,7 +58,8 @@ IFS=$'\n' SHADERS=(`cat ${DIR}/shaders.txt`)
IFS=$OIFS
# Write header
-printf /* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n\n ${OUTPUT}
+printf /* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n ${OUTPUT}
+printf /* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */\n\n ${OUTPUT}
# Including private for hilights and stuff :)
printf #include \../evas_gl_private.h\\n\n ${OUTPUT}
@@ -173,6 +174,7 @@ static const struct {
printf ${shaders_source}};\n\n ${OUTPUT}
printf /* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
+/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
typedef enum {
${shaders_enum} SHADER_LAST
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index 4185c44..d4bd7eb 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -1,4 +1,5 @@
/* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */
+/* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */
static const char vertex_color_vert_glsl[] =
#ifdef GL_ES\n
diff --git a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
index 6637dd9..ee94b26 100755
--- a/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
+++ b/src/modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh
@@ -22,7 +22,9 @@ vert_shaders_source=
frag_shaders_source=
# Write header
-printf /* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n\n
+printf /* DO NOT MODIFY THIS FILE AS IT IS AUTO-GENERATED */\n
+printf /* IF IT IS CHANGED PLEASE COMMIT THE CHANGES */\n\n
+
for shd in ${SHADERS} ; do
lname=`basename ${shd} .shd`
--
[EGIT] [core/efl] master 01/01: update shaders
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ce7a6e710643069c895aed1d2dd9a1417389a742
commit ce7a6e710643069c895aed1d2dd9a1417389a742
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Thu May 21 17:03:24 2015 +0900
update shaders
---
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 585 ++---
1 file changed, 498 insertions(+), 87 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
index 7685aa8..4185c44 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader_3d/evas_gl_3d_shaders.x
@@ -54,9 +54,56 @@ static const char vertex_color_frag_glsl[] =
uniform float uFogFactor;\n
uniform vec4 uFogColor;\n
#endif //FOG_ENABLED\n
+ #ifdef GL_ES\n
+ uniform int uAlphaTestComparison;\n
+ uniform float uAlphaTestRefValue;\n
+ #endif //GL_ES\n
void main()\n
{\n
+ #ifdef ALPHA_TEST_ENABLED\n
+ #ifdef GL_ES\n
+ /*uAlphaTestComparison is value of the Evas_3D_Comparison type*/\n
+ const float p = 100.0;\n
+ float acolor = floor(vColor.a * p);\n
+ float refvalue = floor(uAlphaTestRefValue * p);\n
+ if (uAlphaTestComparison == 0) discard;\n
+ else if (uAlphaTestComparison == 1)\n
+{\n
+ if (acolor refvalue) gl_FragColor = vColor;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 2)\n
+{\n
+ if (acolor == refvalue) gl_FragColor = vColor;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 3)\n
+{\n
+ if (acolor = refvalue) gl_FragColor = vColor;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 4)\n
+{\n
+ if (acolor refvalue) gl_FragColor = vColor;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 5)\n
+{\n
+ if (acolor != refvalue) gl_FragColor = vColor;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 6)\n
+{\n
+ if (acolor = refvalue) gl_FragColor = vColor;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 7) ;\n
+ #else\n
gl_FragColor = vColor;\n
+ #endif //GL_ES\n
+ #else\n
+ gl_FragColor = vColor;\n
+ #endif //ALPHA_TEST_ENABLED\n
\n
#ifdef FOG_ENABLED\n
float z = gl_FragCoord.z / gl_FragCoord.w;\n
@@ -129,17 +176,21 @@ static const char diffuse_frag_glsl[] =
#ifdef DIFFUSE_TEXTURE\n
uniform sampler2D uTextureDiffuse0;\n
uniform mat3 uTextureMatrixTransformDiffuse0;\n
- vec3 Tex0CoordDiffuse = \n
+ vec3 Tex0CoordDiffuse =\n
vec3(vTexCoord, 1.0) * uTextureMatrixTransformDiffuse0;\n
#endif //DIFFUSE_TEXTURE\n
#ifdef DIFFUSE_TEXTURE_BLEND\n
uniform sampler2D uTextureDiffuse1;\n
uniform float uTextureDiffuseWeight;\n
uniform mat3 uTextureMatrixTransformDiffuse1;\n
- vec3 Tex1CoordDiffuse = \n
+ vec3 Tex1CoordDiffuse =\n
vec3(vTexCoord, 1.0) * uTextureMatrixTransformDiffuse1;\n
#endif //DIFFUSE_TEXTURE_BLEND\n
#endif //DIFFUSE\n
+ #ifdef GL_ES\n
+ uniform int uAlphaTestComparison;\n
+ uniform float uAlphaTestRefValue;\n
+ #endif //GL_ES\n
void main() {\n
vec4 color;\n
\n
@@ -154,7 +205,50 @@ static const char diffuse_frag_glsl[] =
color = uMaterialDiffuse;\n
#endif //DIFFUSE_TEXTURE\n
#endif //DIFFUSE_TEXTURE_BLEND\n
+ #ifdef ALPHA_TEST_ENABLED\n
+ #ifdef GL_ES\n
+ /*uAlphaTestComparison is value of the Evas_3D_Comparison type*/\n
+ const float p = 100.0;\n
+ float acolor = floor(color.a * p);\n
+ float refvalue = floor(uAlphaTestRefValue * p);\n
+ if (uAlphaTestComparison == 0) discard;\n
+ else if (uAlphaTestComparison == 1)\n
+{\n
+ if (acolor refvalue) gl_FragColor = color;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 2)\n
+{\n
+ if (acolor == refvalue) gl_FragColor = color;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 3)\n
+{\n
+ if (acolor = refvalue) gl_FragColor = color;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 4)\n
+{\n
+ if (acolor refvalue) gl_FragColor = color;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 5)\n
+{\n
+ if (acolor != refvalue) gl_FragColor = color;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 6)\n
+{\n
+ if (acolor = refvalue) gl_FragColor = color;\n
+ else discard;\n
+}\n
+ else if (uAlphaTestComparison == 7) ;\n
+ #else\n
+ gl_FragColor =
[EGIT] [core/efl] master 01/01: Fix Eolian Cxx generator
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1941dae69589cac6aaf1c57a87c0eec8e95b8ef7
commit 1941dae69589cac6aaf1c57a87c0eec8e95b8ef7
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Thu May 21 09:38:34 2015 +0300
Fix Eolian Cxx generator
Compilation was failing due to the changes in the Eolian library. The
generator has not been updated.
This patch fixes the compilation but not the tests that I let to my
lovely q66.
---
src/bin/eolian_cxx/convert.cc | 11 +++
src/bin/eolian_cxx/eolian_wrappers.hh | 54 +--
2 files changed, 7 insertions(+), 58 deletions(-)
diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 4f92b97..0b75183 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -99,7 +99,7 @@ _convert_eolian_parameters(Eina_Iterator *parameters,
(static_castconst Eolian_Function_Parameter*(curr));
list.push_back
({
- parameter_type(*id, func_type),
+ parameter_type(*id),
parameter_name(*id)
});
}
@@ -146,12 +146,12 @@ _convert_property_set_to_function(Eolian_Class const
klass,
function_name(prop_) + _set,
function_impl(prop_) + _set,
function_return_type(prop_, eolian_cxx::setter),
- _convert_eolian_parameters(::eolian_function_parameters_get(prop_),
+ _convert_eolian_parameters(::eolian_property_values_get(prop_,
EOLIAN_PROP_SET),
eolian_cxx::setter),
convert_comments_function(klass, prop_, eolian_cxx::setter)
};
efl::eolian::parameters_container_type keys =
- _convert_eolian_parameters(::eolian_property_keys_get(prop_),
+ _convert_eolian_parameters(::eolian_property_keys_get(prop_,
EOLIAN_PROP_SET),
eolian_cxx::setter);
if (!keys.empty())
{
@@ -175,7 +175,8 @@ _convert_property_get_to_function(Eolian_Class const klass,
function_name(prop_) + _get,
function_impl(prop_) + _get,
function_return_type(prop_, eolian_cxx::getter),
- _convert_eolian_parameters(prop_, eolian_cxx::getter),
+ _convert_eolian_parameters(::eolian_property_values_get(prop_,
EOLIAN_PROP_GET),
+ eolian_cxx::getter),
convert_comments_function(klass, prop_, eolian_cxx::getter)
};
@@ -202,7 +203,7 @@ _convert_property_get_to_function(Eolian_Class const klass,
});
}
efl::eolian::parameters_container_type keys =
- _convert_eolian_parameters(::eolian_property_keys_get(prop_),
+ _convert_eolian_parameters(::eolian_property_keys_get(prop_,
EOLIAN_PROP_GET),
eolian_cxx::getter);
if (!keys.empty())
{
diff --git a/src/bin/eolian_cxx/eolian_wrappers.hh
b/src/bin/eolian_cxx/eolian_wrappers.hh
index 0dd9890..9e7ba07 100644
--- a/src/bin/eolian_cxx/eolian_wrappers.hh
+++ b/src/bin/eolian_cxx/eolian_wrappers.hh
@@ -328,42 +328,8 @@ parameter_is_out(Eolian_Function_Parameter const
parameter)
return direction == EOLIAN_OUT_PARAM || direction == EOLIAN_INOUT_PARAM;
}
-inline bool
-parameter_is_const(Eolian_Function_Parameter const parameter,
- Eolian_Function_Type func_type)
-{
- return ::eolian_parameter_const_attribute_get
- (parameter, property_is_getter(func_type));
-}
-
-inline bool
-parameter_is_const(Eolian_Function_Parameter const parameter,
- getter_t func_type)
-{
- return ::eolian_parameter_const_attribute_get
- (parameter, property_is_getter(func_type.value));
-}
-
-inline bool
-parameter_is_const(Eolian_Function_Parameter const parameter,
- setter_t func_type)
-{
- return ::eolian_parameter_const_attribute_get
- (parameter, property_is_getter(func_type.value));
-}
-
-inline bool
-parameter_is_const(Eolian_Function_Parameter const parameter,
- Eolian_Function const func)
-{
- assert(function_op_type(func) != EOLIAN_PROPERTY);
- return ::eolian_parameter_const_attribute_get
- (parameter, property_is_getter(func));
-}
-
inline efl::eolian::eolian_type_instance
-parameter_type(Eolian_Function_Parameter const parameter,
- Eolian_Function_Type func_type = method_t::value)
+parameter_type(Eolian_Function_Parameter const parameter)
{
efl::eolian::eolian_type_instance type
(type_lookup(::eolian_parameter_type_get(parameter)));
@@ -375,29 +341,11 @@ parameter_type(Eolian_Function_Parameter const parameter,
type.is_out = true;
type.front().native += *;
}
- if (parameter_is_const(parameter, func_type))
- {
-type.front().native.insert(0, const );
-if (!type.front().binding.empty())
- type.front().binding.insert(0, const );
- }
type.is_optional = ::eolian_parameter_is_optional(parameter) ||
[EGIT] [core/efl] master 01/01: Fix warning on unused parameter
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c9d5479ff9f6f9a9e330109aea3b98c2bf030fce
commit c9d5479ff9f6f9a9e330109aea3b98c2bf030fce
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Thu May 21 10:22:40 2015 +0300
Fix warning on unused parameter
---
src/bin/eina/eina_btlog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/eina/eina_btlog.c b/src/bin/eina/eina_btlog.c
index 67b63e6..bd8ce93 100644
--- a/src/bin/eina/eina_btlog.c
+++ b/src/bin/eina/eina_btlog.c
@@ -159,7 +159,7 @@ bt_append(Eina_List *btl, const char *btline)
}
int
-main(int argc, char **argv)
+main(void)
{
Eina_List *btl = NULL, *l;
char buf[4096];
--
[EGIT] [core/elementary] master 01/01: Gengrid: Updated gengrid to select the last item.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5099f9eeec52ae71746ede0fd3ff375dc0e83aef
commit 5099f9eeec52ae71746ede0fd3ff375dc0e83aef
Author: Vaibhav Gupta g.vaibh...@samsung.com
Date: Thu May 21 18:02:00 2015 +0900
Gengrid: Updated gengrid to select the last item.
Summary:
Updated gengrid to move item selection in 'vertical' mode to the last
item, when currently selected item is not in the last row. As per the
original behaviour, on moving down from such an item, it takes the
focus out of the gengrid widget. Now it is updated to go to the last
item (in last row), and then on further pressing down, focus comes
out of gengrid.
This is something similar to what happens in other UI systems like in
Ubuntu and Windows, when pressing down on (n-1)th row, the last item
in the nth row gets focused.
Signed-off-by: Vaibhav Gupta g.vaibh...@samsung.com
Reviewers: Hermet, SanghyeonLee, raster
Reviewed By: raster
Subscribers: sachin.dev, singh.amitesh
Differential Revision: https://phab.enlightenment.org/D2418
---
src/lib/elm_gengrid.c | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index af7cec9..cb9aa78 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -1932,25 +1932,34 @@ static Eina_Bool
_item_single_select_down(Elm_Gengrid_Data *sd)
{
unsigned int i;
- Elm_Object_Item *eo_next;
+ unsigned int idx;
+ Elm_Object_Item *eo_next, *eo_orig;
if (!sd-selected)
eo_next = EO_OBJ(ELM_GEN_ITEM_FROM_INLIST(sd-items));
else
eo_next = sd-last_selected_item;
+ eo_orig = eo_next;
while (eo_next)
{
for (i = 0; i sd-nmax; i++)
{
eo_next = elm_gengrid_item_next_get(eo_next);
- if (!eo_next) return EINA_FALSE;
+ if (!eo_next) break;
}
-if (!elm_object_item_disabled_get(eo_next)) break;
+if (eo_next !elm_object_item_disabled_get(eo_next)) break;
}
- if (!eo_next) return EINA_FALSE;
+ if (!eo_next)
+ {
+idx = elm_gengrid_item_index_get(eo_orig);
+if ((idx == sd-item_count) || ((sd-item_count) % (sd-nmax) == 0))
+ return EINA_FALSE;
+else
+ eo_next = elm_gengrid_last_item_get(sd-obj);
+ }
_all_items_deselect(sd);
elm_gengrid_item_selected_set(eo_next, EINA_TRUE);
--
[EGIT] [core/elementary] master 01/01: fileselector button: correct window parent finding
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a91801a5c6c2b89e970d53817a9c8b42e2335518
commit a91801a5c6c2b89e970d53817a9c8b42e2335518
Author: Thiep Ha thie...@gmail.com
Date: Fri May 22 03:35:47 2015 +0900
fileselector button: correct window parent finding
Summary:
Fileselector button fails to run in inwin mode.
It is caused by incorrect window parent finding.
This patch corrects the window parent finding.
@fix
Test Plan:
run FileSelector Button, toggle Inwin mode option to on,
eo gives error and nothing is shown.
Reviewers: Hermet, seoz
Reviewed By: seoz
Differential Revision: https://phab.enlightenment.org/D2552
---
src/lib/elc_fileselector_button.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elc_fileselector_button.c
b/src/lib/elc_fileselector_button.c
index fb64c68..b62b684 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -103,7 +103,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
static Evas_Object *
_parent_win_get(Evas_Object *obj)
{
- while (eo_isa(obj, ELM_WIN_CLASS))
+ while (!eo_isa(obj, ELM_WIN_CLASS))
obj = elm_object_parent_widget_get(obj);
return obj;
--
[EGIT] [tools/edi] master 03/03: update intro docs for newer build requirements etc
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=45715c69e863be844b2873c84c62b909d7c98c75 commit 45715c69e863be844b2873c84c62b909d7c98c75 Author: Andy Williams a...@andywilliams.me Date: Thu May 21 14:04:44 2015 +0100 update intro docs for newer build requirements etc --- README| 19 +-- README.md | 13 +++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/README b/README index 88779f5..40eb3fd 100644 --- a/README +++ b/README @@ -1,7 +1,19 @@ EDI - The Enlightened IDE === -This is a project to create a complete IDE using EFL. +This is a project to create a complete IDE using the EFL. +It aims to lower the barrier to getting involved in Enlightenment development +and in creating apps based on the EFL suite. + +Requirements +--- + +autotools +EFL Elementary from git master (= 1.14.99) +libclang-dev (or llvm-clang-devel) + +Installation +--- Using autotools to install this software is the usual: @@ -9,7 +21,10 @@ Using autotools to install this software is the usual: # make # sudo make install -After that just launch +Usage +--- + +After installing just launch # edi diff --git a/README.md b/README.md index cb5ed2f..0fee85d 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,23 @@ and in creating apps based on the EFL suite.  -Please make sure you have the EFL and Elementary at least 1.8 installed before you build. +## Requirements + +autotools +EFL Elementary from git master (= 1.14.99) +libclang-dev (or llvm-clang-devel) + +## Installation + Using autotools to install this software is the usual: ./autogen.sh make sudo make install -After that just launch +## Usage + +After installing just launch edi --
[EGIT] [tools/edi] master 01/03: better crash fix - mimic standard free() method
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=cb33dbcfb05d325cd1c235e889c79adfe54d633a
commit cb33dbcfb05d325cd1c235e889c79adfe54d633a
Author: Andy Williams a...@andywilliams.me
Date: Thu May 21 13:58:51 2015 +0100
better crash fix - mimic standard free() method
---
src/bin/edi_config.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c
index 1ff66d7..5f17e91 100644
--- a/src/bin/edi_config.c
+++ b/src/bin/edi_config.c
@@ -123,6 +123,9 @@ _edi_project_config_cb_free(void)
{
Edi_Project_Config_Tab *tab;
+ if (!_edi_project_config)
+ return;
+
EINA_LIST_FREE(_edi_project_config-tabs, tab)
{
if (tab-path) eina_stringshare_del(tab-path);
@@ -257,8 +260,7 @@ Eina_Bool
_edi_config_shutdown(void)
{
_edi_config_cb_free();
- if (_edi_project_config)
- _edi_project_config_cb_free();
+ _edi_project_config_cb_free();
EDI_CONFIG_DD_FREE(_edi_cfg_proj_edd);
EDI_CONFIG_DD_FREE(_edi_cfg_mime_edd);
--
[EGIT] [core/efl] master 01/01: Eina cxx tests: Fix the failing tests.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7f932c8c143f5f30aaec3104859dce8957cc3b01
commit 7f932c8c143f5f30aaec3104859dce8957cc3b01
Author: Tom Hacohen t...@stosb.com
Date: Thu May 21 11:33:40 2015 +0100
Eina cxx tests: Fix the failing tests.
This broke following my eo_constructor() changes. This is weird though
as:
1. Eina doesn't depend on Eo.
2. It was casting the constructor for some reasons.
Anyhow, fixed now.
---
src/tests/eina_cxx/eina_cxx_test_ptrlist.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
index 9e5fa2b..1f6144d 100644
--- a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
@@ -16,10 +16,10 @@
const Eo_Class *simple_class_get(void);
#define MY_CLASS simple_class_get()
-static void
+static Eo *
_constructor(Eo *obj, void *class_data EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_constructor());
+ return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
}
static void
--
[EGIT] [core/efl] master 01/01: Eo: Fix typo in error message.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1d4c028034880cb7c591bd0ee2b48c74a4615ed4
commit 1d4c028034880cb7c591bd0ee2b48c74a4615ed4
Author: Tom Hacohen t...@stosb.com
Date: Thu May 21 10:52:26 2015 +0100
Eo: Fix typo in error message.
Thanjs to q66 for reporting.
---
src/lib/eo/eo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 766b7d3..588e74a 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -950,7 +950,7 @@ _eo_add_internal_end(Eo *eo_id)
if (EINA_UNLIKELY(!fptr-o.obj))
{
-ERR(Corrupt call stuck, shouldn't happen, please report!);
+ERR(Corrupt call stack, shouldn't happen, please report!);
return NULL;
}
--
[EGIT] [core/efl] master 01/01: ecore-drm: Remove call to set drm mode when creating an output
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8a4922132fceaa8a442b6a38d75c04d65f7c3870
commit 8a4922132fceaa8a442b6a38d75c04d65f7c3870
Author: Chris Michael cp.mich...@samsung.com
Date: Thu May 21 10:51:29 2015 -0400
ecore-drm: Remove call to set drm mode when creating an output
Summary: As it turns out, we don't need to make the call to set an
output mode during creation. The mode will end up getting set anyway
when we set the first buffer.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_output.c | 13 -
1 file changed, 13 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index c66a9da..d6573f3 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -498,19 +498,6 @@ _ecore_drm_output_create(Ecore_Drm_Device *dev, drmModeRes
*res, drmModeConnecto
output-current_mode-flags |= DRM_MODE_TYPE_DEFAULT;
- if (output-connected)
- {
-if (drmModeSetCrtc(output-dev-drm.fd, output-crtc_id,
- output-crtc-buffer_id, 0, 0,
- output-conn_id, 1, output-current_mode-info)
0)
- {
- ERR(Failed to set Mode %dx%d for Output %s: %m,
- output-current_mode-width, output-current_mode-height,
- output-name);
- goto err;
- }
- }
-
/* try to init backlight */
output-backlight =
_ecore_drm_output_backlight_init(output, conn-connector_type);
--
[EGIT] [core/elementary] master 01/01: test_genlist: Fix warnings while running Genlist Textblock.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b16ab94b37d1c06eea05e4b8c124ec1a2f1d0b07 commit b16ab94b37d1c06eea05e4b8c124ec1a2f1d0b07 Author: Amitesh Singh amitesh...@samsung.com Date: Fri May 22 03:42:24 2015 +0900 test_genlist: Fix warnings while running Genlist Textblock. Summary: 'Genlist Textblock' uses message style which does not have elm.swallow.icon part. Signed-off-by: Amitesh Singh amitesh...@samsung.com Test Plan: elementary_test -to Genlist Textblock Reviewers: raster, Hermet, JackDanielZ Subscribers: seoz, sachin.dev Differential Revision: https://phab.enlightenment.org/D2546 --- src/bin/test_genlist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 4cd90db..770905b 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -2287,7 +2287,6 @@ test_genlist12(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event api-itc1 = elm_genlist_item_class_new(); api-itc1-item_style = message; api-itc1-func.text_get = gl12_text_get; - api-itc1-func.content_get = gl_content_get; api-itc1-func.state_get = gl_state_get; api-itc1-func.del = NULL; --
[EGIT] [core/efl] master 01/01: eolian: remove unnecessary function
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=68b8d63e42a4ef47e3df344b79a81f7a9cf72721
commit 68b8d63e42a4ef47e3df344b79a81f7a9cf72721
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu May 21 16:37:30 2015 +0100
eolian: remove unnecessary function
---
src/lib/eolian/database_implement.c | 7 ---
src/lib/eolian/eolian_database.c| 4 ++--
src/lib/eolian/eolian_database.h| 1 -
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/lib/eolian/database_implement.c
b/src/lib/eolian/database_implement.c
index ff653d9..0e7e767 100644
--- a/src/lib/eolian/database_implement.c
+++ b/src/lib/eolian/database_implement.c
@@ -13,10 +13,3 @@ database_implement_del(Eolian_Implement *impl)
if (impl-full_name) eina_stringshare_del(impl-full_name);
free(impl);
}
-
-void
-database_implement_constructor_add(Eolian_Implement *impl, const Eolian_Class
*klass)
-{
- if (eolian_function_is_constructor(impl-foo_id, impl-klass))
- database_function_constructor_add((Eolian_Function*)impl-foo_id, klass);
-}
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 392dc82..a568aa5 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -298,8 +298,8 @@ impls:
eolian_implement_full_name_get(impl));
goto error;
}
-else
- database_implement_constructor_add(impl, class);
+else if (eolian_function_is_constructor(impl-foo_id, impl-klass))
+ database_function_constructor_add((Eolian_Function*)impl-foo_id,
class);
}
eina_iterator_free(itr);
itr = eolian_class_constructors_get(class);
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 8cd8cec..2d8d4d0 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -316,7 +316,6 @@ void database_parameter_del(Eolian_Function_Parameter
*pdesc);
/* implements */
void database_implement_del(Eolian_Implement *impl);
-void database_implement_constructor_add(Eolian_Implement *impl, const
Eolian_Class *klass);
/* constructors */
void database_constructor_del(Eolian_Constructor *ctor);
--
[EGIT] [core/enlightenment] master 01/01: fix focusing client on mouse events which trigger actions (with exceptions)
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=e70fcc565d356d42a4019d6b240627e141bf3c29
commit e70fcc565d356d42a4019d6b240627e141bf3c29
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu May 21 12:31:00 2015 -0400
fix focusing client on mouse events which trigger actions (with exceptions)
block focus events only if focus has changed to another client or the
current
client's layer-actual has been lowered
regression from 719b2baeba8133a021663e8281e6fd53662e8b16
---
src/bin/e_client.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index e70a280..76744e4 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2772,6 +2772,8 @@ E_API void
e_client_mouse_down(E_Client *ec, int button, Evas_Point *output,
E_Binding_Event_Mouse_Button *ev)
{
Eina_Bool did_act = EINA_FALSE;
+ E_Client *pfocus;
+ int player;
EINA_SAFETY_ON_NULL_RETURN(ec);
if (action_client || ec-iconic || e_client_util_ignored_get(ec)) return;
@@ -2793,6 +2795,8 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point
*output, E_Binding_Even
}
ec-mouse.current.mx = output-x;
ec-mouse.current.my = output-y;
+ pfocus = e_client_focused_get();
+ player = ec-layer;
if (!ec-cur_mouse_action)
{
ec-cur_mouse_action =
@@ -2808,7 +2812,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point
*output, E_Binding_Even
e_object_ref(E_OBJECT(ec-cur_mouse_action));
}
}
- if (!did_act)
+ if ((!did_act) || (((pfocus == e_client_focused_get()) || (ec ==
e_client_focused_get())) (ec-layer = player)))
e_focus_event_mouse_down(ec);
if ((button = 1) (button = 3))
{
--
