Re: [E-devel] The image tearing issue when slide the screen
Hi Carsten,
Thanks for your reply. You are saying "drm can be vsynced and tear-free even if
it is configured without gl-drm", right?
But from source code in src/modules/ecore_evas/engines/drm/ecore_evas_drm.c, it
seems only enabling vsync with option BUILD_ECORE_EVAS_GL_DRM, how can we
build efl to enable vsync without gl-drm package:
#ifdef BUILD_ECORE_EVAS_GL_DRM
if (tinfo && gl)
{
char *num;
Evas_Engine_Info_GL_Drm *einfo = tinfo;
einfo->info.vsync = EINA_TRUE;
num = getenv("EVAS_DRM_VSYNC");
if ((num) && (!atoi(num)))
einfo->info.vsync = EINA_FALSE;
einfo->info.dev = edata->dev;
einfo->info.bpp = edata->bpp;
einfo->info.depth = edata->depth;
einfo->info.format = edata->format;
einfo->info.rotation = ee->rotation;
einfo->info.output = edata->output;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
ERR("evas_engine_info_set() for engine '%s' failed", ee->driver);
goto eng_err;
}
}
else
#endif
Looking forward to your reply, thanks.
At 2019-09-23 22:13:11, "Carsten Haitzler" wrote:
>On Mon, 23 Sep 2019 14:02:09 +0800 (CST) Jing said:
>
>> Hi Carsten,
>> Thanks for your reply. Correction: Actually, we didn't use X11 and only use
>> frame buffer, based on our flash and memory performance considering, we are
>> using a light configuration, here is our configuration for your reference.
>> Our system do support basic drm, but vsync needs gl_drm(we didn't have gl
>> accelerate), do you have any simple option to avoid tear issue or
>> implemented a simple ping pong buffer mechanism.
>
>there's gl_drm that needs gl accel an also just drm which is software rendered,
>but uses kms/drm to display buffers. this will be vsynced and tear-free. the fb
>backend will tear because of the reasons i already gave in the previous mail.
>:)
>
>> --with-tests=none --disable-systemd --disable-doc --disable-cxx-bindings
>> --enable-fb --disable-cocoa --disable-poppler --disable-spectre
>> --disable-libraw --disable-xcf --disable-libmount --disable-audio
>> --disable-avahi --disable-pulseaudio --disable-xinput2 --disable-xim
>> --disable-scim --disable-ibus --disable-elua --without-glib --with-x11=none
>> --with-opengl=none --without-x --without-mount --without-umount
>> --without-eject --disable-image-loader-bmp --disable-image-loader-dds
>> --disable-image-loader-tgv --disable-image-loader-xpm
>> --disable-image-loader-webp --disable-image-loader-wbmp
>> --disable-image-loader-tiff --disable-image-loader-tga
>> --disable-image-loader-psd --disable-image-loader-pmaps
>> --disable-image-loader-jp2k --disable-image-loader-ico
>> --disable-image-loader-gif --disable-gstreamer1 --disable-xinput22
>> --disable-librsvg --disable-vg-loader-svg --disable-vg-loader-eet
>> --with-crypto=none --disable-doc --disable-v4l2 --disable-libvlc
>> --with-net-control=none --disable-libeeze --disable-gesture
>> --disable-xpresent --disable-cserve --disable-always-build-examples
>> --with-profile=dev --disable-physics --disable-valgrind
>> --disable-quick-launch
>>
>>
>> Looking forward to your reply, thanks.
>>
>> At 2019-09-21 15:53:12, "Carsten Haitzler" wrote:
>> >On Sat, 21 Sep 2019 13:47:40 +0800 (CST) Jing said:
>> >
>> >> I use efl-1.21.1(define the image/rect in edc file) to develop in linux
>> >> environment. Using X11 and framebuffer. Looking forward to your reply，
>> >> thanks.
>> >
>> >what framebuffer engine/rendering path? in x11 what rendering engine? what
>> >windowmanager/compositor?
>> >
>> >tl;dr; short version: this stuff is complicated and crosses lots of software
>> >boundaries (protocols, kernel vs xserver vs client vs multiple toolkits vs
>> >compositor etc.). i'll cover some of those details below s you didn't tell
>> >me
>> >everything above.
>> >
>> >if you are using the fb engine for framebuffer rendering, then it has no
>> >vsync or double buffering support. it's built on the old /dev/fb interface
>> >and mmaps the existing fb and renders to cpu local memory then copies stuff
>> >to the framebuffer. thus it will tear at times. that's life with fbcon as it
>> >doesn't have buffer swapping semantics (it could allocated double-height
>> >buffers and do panning... but it still has no ability to explicitly vsync
>> >this so will still lead to tearing). that's why there is a drm engine...
>> >thus sues drm/kms as the framebuffer interface which does have
>> >swapping/atomic/vsync semantics and will then not tear. this is the engine
>> >that e uses as a wayland compositor (well drm or gl_drm depending if you
>> >have gl accel on or not).
>> >
>> >with software rendering in x11, no mechanism exists to explicitly avoid
>> >tearing for clients (ignoring the double buffer extension in x which
>> >doesn't actually provide SWAPPING mechanics and leads to worse performance
>> >anyway. it at best does copies from the
[EGIT] [core/efl] master 01/01: evas: fix memory leak with Efl.Canvas.Vg
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=29beda7f4f365425656e3340ea2da592d00fb52c
commit 29beda7f4f365425656e3340ea2da592d00fb52c
Author: Cedric Bail
Date: Fri Sep 27 14:19:38 2019 +0900
evas: fix memory leak with Efl.Canvas.Vg
Summary:
It is not correct to change the parent and hope that refcount will work
for you. The parent chain is a decision made by the user, not something
a widget can touch. Only ref count are to be used when given an outside
object. As things where not triggering destruction, there was also no
point where the image buffer would be getting to zero and be freed. This
commit also fix this.
Reviewers: Hermet, zmike
Reviewed By: Hermet
Subscribers: #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10169
---
src/lib/evas/canvas/efl_canvas_vg_object.c | 22 +-
src/lib/evas/canvas/efl_canvas_vg_object.eo | 2 +-
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c
b/src/lib/evas/canvas/efl_canvas_vg_object.c
index 1f8e05189b..0c8e50bed3 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -145,7 +145,7 @@ _efl_canvas_vg_object_root_node_set(Eo *eo_obj,
Efl_Canvas_Vg_Object_Data *pd, E
if (pd->user_entry && pd->user_entry->root)
{
efl_canvas_vg_node_vg_obj_set(pd->user_entry->root, NULL, NULL);
-efl_parent_set(pd->user_entry->root, NULL);
+efl_replace(>user_entry->root, NULL);
}
if (root_node)
@@ -160,10 +160,8 @@ _efl_canvas_vg_object_root_node_set(Eo *eo_obj,
Efl_Canvas_Vg_Object_Data *pd, E
}
}
pd->user_entry->w = pd->user_entry->h = 0;
-pd->user_entry->root = root_node;
-// set the parent so that vg canvas can render it.
-efl_parent_set(pd->user_entry->root, pd->root);
+efl_replace(>user_entry->root, root_node);
efl_canvas_vg_node_vg_obj_set(root_node, eo_obj, pd);
}
else if (pd->user_entry)
@@ -333,8 +331,9 @@ _cleanup_reference(void *data, const Efl_Event *event
EINA_UNUSED)
}
EOLIAN static void
-_efl_canvas_vg_object_efl_object_destructor(Eo *eo_obj,
Efl_Canvas_Vg_Object_Data *pd)
+_efl_canvas_vg_object_efl_object_invalidate(Eo *eo_obj,
Efl_Canvas_Vg_Object_Data *pd)
{
+ Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
Evas *e = evas_object_evas_get(eo_obj);
efl_event_callback_del(e, EFL_CANVAS_SCENE_EVENT_RENDER_POST,
_cleanup_reference, pd);
@@ -343,11 +342,17 @@ _efl_canvas_vg_object_efl_object_destructor(Eo *eo_obj,
Efl_Canvas_Vg_Object_Dat
efl_unref(pd->root);
pd->root = NULL;
- if (pd->user_entry) free(pd->user_entry);
+ if (pd->user_entry)
+ {
+Vg_User_Entry *user_entry = pd->user_entry;
+
+ENFN->ector_surface_cache_drop(ENC, user_entry->root);
+free(pd->user_entry);
+ }
pd->user_entry = NULL;
evas_cache_vg_entry_del(pd->vg_entry);
- efl_destructor(efl_super(eo_obj, MY_CLASS));
+ efl_invalidate(efl_super(eo_obj, MY_CLASS));
}
EOLIAN static Eo *
@@ -364,7 +369,7 @@ _efl_canvas_vg_object_efl_object_constructor(Eo *eo_obj,
Efl_Canvas_Vg_Object_Da
/* default root node */
pd->obj = obj;
- pd->root = efl_add_ref(EFL_CANVAS_VG_CONTAINER_CLASS, NULL);
+ pd->root = efl_add_ref(EFL_CANVAS_VG_CONTAINER_CLASS, eo_obj);
eina_array_step_set(>cleanup, sizeof(pd->cleanup), 8);
@@ -375,7 +380,6 @@ static Efl_Object *
_efl_canvas_vg_object_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Object_Data
*pd)
{
Evas *e = evas_object_evas_get(obj);
- efl_parent_set(pd->root, obj);
// TODO: If we start to have to many Evas_Object_VG per canvas, it may be
nice
// to actually have one event per canvas and one array per canvas to.
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.eo
b/src/lib/evas/canvas/efl_canvas_vg_object.eo
index e414f1aaa7..2213c232ae 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.eo
@@ -78,7 +78,7 @@ class @beta Efl.Canvas.Vg.Object extends Efl.Canvas.Object
implements Efl.File,
implements {
Efl.Object.constructor;
Efl.Object.finalize;
- Efl.Object.destructor;
+ Efl.Object.invalidate;
Efl.File.load;
Efl.File.unload;
Efl.File.file { set; }
--
[EGIT] [core/efl] master 01/01: theme: remove efl.track.slider and efl.track2.slider from efl_ui_slider
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=04a2b7a048f793c6e3c285558785dab7dee63a13
commit 04a2b7a048f793c6e3c285558785dab7dee63a13
Author: Jaehyun Cho
Date: Thu Sep 26 23:21:48 2019 -0400
theme: remove efl.track.slider and efl.track2.slider from efl_ui_slider
Summary:
efl_ui_slider does not support popup which shows the current value.
Therefore, efl.track.slider and efl.track2.slider swallows which set the
popup size and position are not required in efl_ui_slider.
Reviewers: zmike, woohyun
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10216
---
data/elementary/themes/edc/efl/slider.edc | 44 ---
1 file changed, 44 deletions(-)
diff --git a/data/elementary/themes/edc/efl/slider.edc
b/data/elementary/themes/edc/efl/slider.edc
index d23ac5ae9b..369ef2dadd 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -2,7 +2,6 @@
Group: efl/slider/horizontal (@since 1.23)
Part Rectangle: efl.dragable.slider
Part Swallow: efl.bar
-Part Swallow: efl.track.slider
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,inverted,off
@@ -10,7 +9,6 @@ Group: efl/slider/horizontal (@since 1.23)
Group: efl/slider/vertical (@since 1.23)
Part Rectangle: efl.dragable.slider
Part Swallow: efl.bar
-Part Swallow: efl.track.slider
Signal: efl,state,disabled
Signal: efl,state,enabled
Signal: efl,state,inverted,off
@@ -185,13 +183,6 @@ group { "efl/slider/horizontal";
color: 0 0 0 0;
}
}
- part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
-max: 0 0;
-rel1.to: "efl.dragable.slider";
-rel2.to: "efl.dragable.slider";
- }
- }
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -421,13 +412,6 @@ group { "efl/slider/vertical";
color: 0 0 0 0;
}
}
- part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
-max: 0 0;
-rel1.to: "efl.dragable.slider";
-rel2.to: "efl.dragable.slider";
- }
- }
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -662,13 +646,6 @@ group { "efl/slider_interval/horizontal";
color: 0 0 0 0;
}
}
- part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
-max: 0 0;
-rel1.to: "efl.dragable.slider";
-rel2.to: "efl.dragable.slider";
- }
- }
part { name: "efl.dragable2.slider"; type: RECT;
nomouse;
scale: 1;
@@ -715,13 +692,6 @@ group { "efl/slider_interval/horizontal";
color: 0 0 0 0;
}
}
- part { name: "efl.track2.slider"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
-max: 0 0;
-rel1.to: "efl.dragable2.slider";
-rel2.to: "efl.dragable2.slider";
- }
- }
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
@@ -944,13 +914,6 @@ group { "efl/slider_interval/vertical";
color: 0 0 0 0;
}
}
- part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
-max: 0 0;
-rel1.to: "efl.dragable.slider";
-rel2.to: "efl.dragable.slider";
- }
- }
part { name: "efl.dragable2.slider"; type: RECT;
nomouse;
scale: 1;
@@ -997,13 +960,6 @@ group { "efl/slider_interval/vertical";
color: 0 0 0 0;
}
}
- part { name: "efl.track2.slider"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
-max: 0 0;
-rel1.to: "efl.dragable2.slider";
-rel2.to: "efl.dragable2.slider";
- }
- }
part { name: "event"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
--
Re: [E-devel] the efl do not compile on Windows
On Thu, Sep 26, 2019 at 1:59 PM Vincent Torri wrote: > the compilation fails on 32 bits, but not on 64 bits > > This may be related to https://phab.enlightenment.org/T8276 Could you try get a backtrace with line numbers? I couldn't manage to reproduce the error on a Fedora 32bit VM. > Vincent > > On Thu, Sep 26, 2019 at 4:13 PM Al Poole wrote: > > > > The C++ bindings seems to be enabled now by default. > > > > When disabling them, EFL will buil. > > > > I noticed the build breaks on FreeBSD. Unfortunately I have no time to be > > able assist anymore than this. > > > > On Thu, Sep 26, 2019 at 2:22 PM Vincent Torri > > wrote: > > > > > hello > > > > > > today, before going to work, i quickly launched a compilation of the > > > git cloned yesterday and there was a compilation failure related to > > > c++. I'll launch a new compilation in a few hours at home and tell you > > > what the problem is > > > > > > Vincent > > > > > > > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Lauro Moura Expertise Solutions "lauromoura" on FreeNode ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 07/10: efl_ui/scroll_manager: fix null derefs
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4a3b4e3b4a0dbee31e89730b88148beec0d25985
commit 4a3b4e3b4a0dbee31e89730b88148beec0d25985
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:59:49 2019 -0400
efl_ui/scroll_manager: fix null derefs
Summary:
CID 1405811, 1405804
Depends on D10208
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10209
---
src/lib/elementary/efl_ui_scroll_manager.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c
b/src/lib/elementary/efl_ui_scroll_manager.c
index c210752d5b..3d332e94fb 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -610,8 +610,8 @@ _efl_ui_scroll_manager_efl_ui_scrollbar_bar_mode_get(const
Eo *obj EINA_UNUSED,
Efl_Ui_Scrollbar_Mode
*hmode,
Efl_Ui_Scrollbar_Mode
*vmode)
{
-*hmode = sd->hbar_mode;
-*vmode = sd->vbar_mode;
+if (hmode) *hmode = sd->hbar_mode;
+if (vmode) *vmode = sd->vbar_mode;
}
/* returns TRUE when we need to move the scroller, FALSE otherwise.
--
[EGIT] [core/efl] master 06/10: efl_ui/table: handle case where table has no items
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f7befea043c047c9c438700451e84f7c28923648
commit f7befea043c047c9c438700451e84f7c28923648
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:59:43 2019 -0400
efl_ui/table: handle case where table has no items
Summary:
CID 1399086
Depends on D10207
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10208
---
src/lib/elementary/efl_ui_table_layout.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/lib/elementary/efl_ui_table_layout.c
b/src/lib/elementary/efl_ui_table_layout.c
index a0307f52e0..4be616f78b 100644
--- a/src/lib/elementary/efl_ui_table_layout.c
+++ b/src/lib/elementary/efl_ui_table_layout.c
@@ -120,6 +120,11 @@ _efl_ui_table_homogeneous_cell_init(Table_Calc
*table_calc, Eina_Bool axis)
prev_cell = _calc[i];
}
+ if (!index)
+ {
+memset(table_calc, 0, sizeof(Table_Calc));
+return;
+ }
if (prev_cell)
prev_cell->next = count;
--
[EGIT] [core/efl] master 09/10: eio/dir: fix null deref
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=64799b32a155daf8bfaa001fb6faf437134699b4
commit 64799b32a155daf8bfaa001fb6faf437134699b4
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:59:59 2019 -0400
eio/dir: fix null deref
Summary:
above cases may fail, causing target to be null
CID 1399103
Depends on D10210
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10211
---
src/lib/eio/eio_dir.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lib/eio/eio_dir.c b/src/lib/eio/eio_dir.c
index 0ae68befde..076d337764 100644
--- a/src/lib/eio/eio_dir.c
+++ b/src/lib/eio/eio_dir.c
@@ -274,7 +274,7 @@ _eio_dir_link(Ecore_Thread *thread, Eio_Dir_Copy *order,
/* recreate all links */
EINA_LIST_FOREACH(order->links, l, ln)
{
-ssize_t length;
+ssize_t length = -1;
eina_strbuf_reset(oldpath);
@@ -299,7 +299,8 @@ _eio_dir_link(Ecore_Thread *thread, Eio_Dir_Copy *order,
}
/* read link target */
-length = readlink(ln, target, bsz);
+if (target)
+ length = readlink(ln, target, bsz);
if (length < 0)
goto on_error;
--
[EGIT] [core/efl] master 05/10: ecore_evas/convert: fix div by zero
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b2165b89217829bf7350b3fa69e320128228a265
commit b2165b89217829bf7350b3fa69e320128228a265
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:59:38 2019 -0400
ecore_evas/convert: fix div by zero
Summary:
if one is 0, the printf line will divide by it
CID 1403900
Depends on D10206
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10207
---
src/bin/ecore_evas/ecore_evas_convert.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c
b/src/bin/ecore_evas/ecore_evas_convert.c
index 2cddad1052..4ec1cabbf1 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -58,7 +58,7 @@ _save_do(void *data EINA_UNUSED)
const char *output = job.output;
job.ret = 0;
- if (width || height)
+ if (width && height)
{
Eina_Slstr *str;
--
[EGIT] [core/efl] master 08/10: efl_ui/image fix null derefs
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a50bd311abf725cfe7cfe85b1c387efad7ee11c3
commit a50bd311abf725cfe7cfe85b1c387efad7ee11c3
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:59:54 2019 -0400
efl_ui/image fix null derefs
Summary:
CID 1405781, 1405780
Depends on D10209
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10210
---
src/lib/elementary/efl_ui_image.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elementary/efl_ui_image.c
b/src/lib/elementary/efl_ui_image.c
index 64c81247b8..050f05e00f 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1489,8 +1489,8 @@ _efl_ui_image_efl_gfx_image_stretch_region_get(const Eo
*obj EINA_UNUSED, Efl_Ui
{
if (pd->edje)
{
-*horizontal = NULL;
-*vertical = NULL;
+if (horizontal) *horizontal = NULL;
+if (vertical) *vertical = NULL;
}
else
{
--
[EGIT] [core/efl] master 02/10: tests/strbuf: call va_end for varargs
zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2584adae0850fa5f8a269d64d4fdcce376015c5a commit 2584adae0850fa5f8a269d64d4fdcce376015c5a Author: Mike Blumenkrantz Date: Thu Sep 26 17:59:24 2019 -0400 tests/strbuf: call va_end for varargs Summary: CID 1400792 Reviewers: brunobelo Reviewed By: brunobelo Subscribers: brunobelo, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10204 --- src/tests/eina/eina_test_strbuf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/eina/eina_test_strbuf.c b/src/tests/eina/eina_test_strbuf.c index 67f304451d..88ffc7ff14 100644 --- a/src/tests/eina/eina_test_strbuf.c +++ b/src/tests/eina/eina_test_strbuf.c @@ -562,6 +562,7 @@ test_prepend(Eina_Strbuf *buf, ...) va_start(ap, buf); str = test_prepend_vprintf(buf, "%s %s %s %s", ap); + va_end(ap); return str; } --
[EGIT] [core/efl] master 03/10: eina/list: move dead code inside corresponding #ifdef
zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cd97c2a0b7a78cd12762ffbcaa35235a6c2b04d3 commit cd97c2a0b7a78cd12762ffbcaa35235a6c2b04d3 Author: Mike Blumenkrantz Date: Thu Sep 26 17:59:29 2019 -0400 eina/list: move dead code inside corresponding #ifdef Summary: this is debug code CID 1404753, 1404745 Depends on D10204 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10205 --- src/lib/eina/eina_list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eina/eina_list.c b/src/lib/eina/eina_list.c index a9857bf897..844e387293 100644 --- a/src/lib/eina/eina_list.c +++ b/src/lib/eina/eina_list.c @@ -609,9 +609,9 @@ eina_list_append(Eina_List *list, const void *data) return list; #ifdef EINA_LIST_MAGIC on_error: -#endif _eina_list_mempool_list_free(new_l); return NULL; +#endif } EAPI Eina_List * @@ -640,9 +640,9 @@ eina_list_prepend(Eina_List *list, const void *data) #ifdef EINA_LIST_MAGIC on_error: -#endif _eina_list_mempool_list_free(new_l); return NULL; +#endif } EAPI Eina_List * --
[EGIT] [core/efl] master 10/10: evas/object; fix null deref
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6443120eb37873ab6fe3c0d3dc5c54cc6fba3255
commit 6443120eb37873ab6fe3c0d3dc5c54cc6fba3255
Author: Mike Blumenkrantz
Date: Thu Sep 26 18:00:05 2019 -0400
evas/object; fix null deref
Summary:
_efl_canvas_object_clipper_prev_reset() derefs obj->cur
CID 1396985
Depends on D10211
Reviewers: cedric
Reviewed By: cedric
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10212
---
src/lib/evas/canvas/evas_object_main.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index abd8a2d5e2..b6732eb9f8 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1133,8 +1133,13 @@ _efl_canvas_object_efl_object_invalidate(Eo *eo_obj,
Evas_Object_Protected_Data
}
}
- if (obj->cur && obj->cur->clipper) evas_object_clip_unset(eo_obj);
- if (obj->prev) _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE);
+ if (obj->cur)
+ {
+if (obj->cur->clipper)
+ evas_object_clip_unset(eo_obj);
+if (obj->prev)
+ _efl_canvas_object_clipper_prev_reset(obj, EINA_FALSE);
+ }
if (obj->map) evas_object_map_set(eo_obj, NULL);
--
[EGIT] [core/efl] master 01/10: epp: remove extra variable passed in format specifier
zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b5ee2f128f230bafe871a148bc3853d55d2b9ef2 commit b5ee2f128f230bafe871a148bc3853d55d2b9ef2 Author: Mike Blumenkrantz Date: Thu Sep 26 17:59:19 2019 -0400 epp: remove extra variable passed in format specifier Summary: CID 1402674 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10203 --- src/bin/edje/epp/cpplib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edje/epp/cpplib.c b/src/bin/edje/epp/cpplib.c index 75befb5345..ff211de8b4 100644 --- a/src/bin/edje/epp/cpplib.c +++ b/src/bin/edje/epp/cpplib.c @@ -7481,7 +7481,7 @@ cpp_error_from_errno(cpp_reader * pfile, const char *name) if (ip) cpp_file_line_for_message(pfile, ip->nominal_fname, ip->lineno, -1); - cpp_message(pfile, 1, "%s: %s", name, my_strerror(errno), NULL); + cpp_message(pfile, 1, "%s: %s", name, my_strerror(errno)); } void --
[EGIT] [core/efl] master 04/10: tests/eina: outdent code
zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=88da46d3f60eda86adf2123743187236f814f867 commit 88da46d3f60eda86adf2123743187236f814f867 Author: Mike Blumenkrantz Date: Thu Sep 26 17:59:34 2019 -0400 tests/eina: outdent code Summary: this is a very important coverity issue. CID 1400838 Depends on D10205 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10206 --- src/tests/eina/eina_test_str.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/eina/eina_test_str.c b/src/tests/eina/eina_test_str.c index f92c1f260a..d461448c9c 100644 --- a/src/tests/eina/eina_test_str.c +++ b/src/tests/eina/eina_test_str.c @@ -173,9 +173,9 @@ EFL_START_TEST(str_split) fail_if(elements != 3); for (elements = 0; elements < 3 - 1; elements++) fail_if(strcmp(result[elements], "match") != 0); - fail_if(result[3]); -free(result[0]); -free(result); + fail_if(result[3]); + free(result[0]); + free(result); str = malloc(sizeof(char) * 1024); str[0] = 0; --
[EGIT] [core/efl] master 01/01: eolian_cxx: Possible infinite loop, if called.
lauromoura pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7ba4f00f57e117d05234d36568602ad73659069b
commit 7ba4f00f57e117d05234d36568602ad73659069b
Author: Bruno da Silva Belo
Date: Thu Sep 26 18:48:20 2019 -0300
eolian_cxx: Possible infinite loop, if called.
Reviewers: lauromoura, felipealmeida
Reviewed By: lauromoura
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10200
---
src/lib/eolian_cxx/grammar/klass_def.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eolian_cxx/grammar/klass_def.hpp
b/src/lib/eolian_cxx/grammar/klass_def.hpp
index d9c50e1df3..81f40d3ba5 100644
--- a/src/lib/eolian_cxx/grammar/klass_def.hpp
+++ b/src/lib/eolian_cxx/grammar/klass_def.hpp
@@ -635,7 +635,7 @@ struct expression_def
}
friend inline bool operator!=(expression_def const& lhs, expression_def
const& rhs)
{
-return lhs != rhs;
+return !(lhs == rhs);
}
expression_def(Eolian_Expression const* expression) :
value(::eolian_expression_eval(expression, EOLIAN_MASK_ALL))
--
[EGIT] [apps/terminology] terminology-1.2 01/01: themes - fix new error checks in edje_cc
billiob pushed a commit to branch terminology-1.2.
http://git.enlightenment.org/apps/terminology.git/commit/?id=a38eedd36d8d58d11a29ad7886978f7fdf410eef
commit a38eedd36d8d58d11a29ad7886978f7fdf410eef
Author: Carsten Haitzler (Rasterman)
Date: Fri Jan 18 18:12:45 2019 +
themes - fix new error checks in edje_cc
where parts/states etc. dont exist.
---
data/themes/mild.edc| 4
data/themes/nyanology/nyanology.edc | 31 +--
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index 4a51c4b..a75cba0 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -1208,7 +1208,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@@ -1223,7 +1222,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@@ -1238,7 +1236,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@@ -1253,7 +1250,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
-target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
diff --git a/data/themes/nyanology/nyanology.edc
b/data/themes/nyanology/nyanology.edc
index bc06124..5b07a77 100644
--- a/data/themes/nyanology/nyanology.edc
+++ b/data/themes/nyanology/nyanology.edc
@@ -95,6 +95,15 @@ collections {
description { state: "oneline" 0.0;
visible: 0;
}
+description { state: "disjoint" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "topfull" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "bottomfull" 0.0;
+ inherit: "default" 0.0;
+}
}
part { name: "middle_clip"; type: RECT;
mouse_events: 0;
@@ -110,6 +119,15 @@ collections {
rel2.to: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
}
+description { state: "disjoint" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "topfull" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "bottomfull" 0.0;
+ inherit: "default" 0.0;
+}
}
part { name: "bottom_clip"; type: RECT;
mouse_events: 0;
@@ -118,10 +136,19 @@ collections {
rel1.relative: 0.0 0.0;
rel2.to_x: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
-}
-description { state: "oneline" 0.0;
+ }
+ description { state: "oneline" 0.0;
visible: 0;
}
+description { state: "disjoint" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "topfull" 0.0;
+ inherit: "default" 0.0;
+}
+description { state: "bottomfull" 0.0;
+ inherit: "default" 0.0;
+}
}
// the outline around the selection...
--
[EGIT] [apps/terminology] terminology-1.2 01/01: build - new meson git added in as a keyword, so avoid it
billiob pushed a commit to branch terminology-1.2.
http://git.enlightenment.org/apps/terminology.git/commit/?id=33ff0d8d8320d362effc6b0aed3596a53f2e7bb8
commit 33ff0d8d8320d362effc6b0aed3596a53f2e7bb8
Author: Carsten Haitzler (Rasterman)
Date: Thu Oct 18 12:43:37 2018 +0100
build - new meson git added in as a keyword, so avoid it
use input instead of in, and output instead of out to avoid the new
keyword and be consistent.
---
data/themes/meson.build | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/themes/meson.build b/data/themes/meson.build
index 4eeaa68..5331bd4 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -22,16 +22,16 @@ edje_install_dir = join_paths(get_option('datadir'),
meson.project_name(), 'themes')
foreach to_compile: edje_to_compile
- out = to_compile[0] + '.edj'
- in = to_compile[0] + '.edc'
- edj_targets += [custom_target(out,
+ output = to_compile[0] + '.edj'
+ input = to_compile[0] + '.edc'
+ edj_targets += [custom_target(output,
install:true,
install_dir: edje_install_dir,
depend_files: files(to_compile[1]),
command: command,
-input: in,
-output: out)]
- edj_files += [join_paths(edje_install_dir, out)]
+input: input,
+output: output)]
+ edj_files += [join_paths(edje_install_dir, output)]
endforeach
subdir('nyanology')
--
[EGIT] [enlightenment/modules/penguins] master 01/01: Fix penguins after recent e-module api change
davemds pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/penguins.git/commit/?id=bec991619a663f37293c81a10d3166a9bbc6d1e8 commit bec991619a663f37293c81a10d3166a9bbc6d1e8 Author: Dave Andreoli Date: Thu Sep 26 19:47:10 2019 +0200 Fix penguins after recent e-module api change --- src/e_mod_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 72c1c00..d70e145 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -29,7 +29,6 @@ e_modapi_init(E_Module *m) NULL, buf, e_int_config_penguins_module); penguins_mod = m; - e_module_delayed_set(m, 1); return penguins_init(m); } --
Re: [E-devel] the efl do not compile on Windows
the compilation fails on 32 bits, but not on 64 bits Vincent On Thu, Sep 26, 2019 at 4:13 PM Al Poole wrote: > > The C++ bindings seems to be enabled now by default. > > When disabling them, EFL will buil. > > I noticed the build breaks on FreeBSD. Unfortunately I have no time to be > able assist anymore than this. > > On Thu, Sep 26, 2019 at 2:22 PM Vincent Torri > wrote: > > > hello > > > > today, before going to work, i quickly launched a compilation of the > > git cloned yesterday and there was a compilation failure related to > > c++. I'll launch a new compilation in a few hours at home and tell you > > what the problem is > > > > Vincent > > > > > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Enlightenment DR 0.23.1 Release
This is a bugfix and stability release for Enlightenment 0.23. * Fixed mixer notifications when volume didn't actually change * Fixed build with newest EFL which does not still implicitly include libuuid CFLAGS in efl-wl CFLAGS * Fixed move/resize triggered by key bindings to work again * Fixed NULL access on move begin that crashed. Please see https://www.enlightenment.org/news/e0.23.1_release for more. -- - Codito, ergo sum - "I code, therefore I am" -- Carsten Haitzler - ras...@rasterman.com ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [website/www] master 01/01: update e and efl versions on update data
raster pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=1f4bdc5c4bbb03a5ef9e328aae647e123a3878ef commit 1f4bdc5c4bbb03a5ef9e328aae647e123a3878ef Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 17:29:27 2019 +0100 update e and efl versions on update data --- public_html/update.php | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/public_html/update.php b/public_html/update.php index 05e900dc..b487e641 100644 --- a/public_html/update.php +++ b/public_html/update.php @@ -3,23 +3,23 @@ # list of "apps" and "latest versions" $apps = array ( - "enlightenment"=> "0.23.0", - "eina" => "1.22.3", - "eet" => "1.22.3", - "evas" => "1.22.3", - "ecore"=> "1.22.3", - "embryo" => "1.22.3", - "edje" => "1.22.3", - "eeze" => "1.22.3", - "e_dbus" => "1.22.3", - "efreet" => "1.22.3", - "expedite" => "1.22.3", - "evas_generic_loaders" => "1.22.3", - "evil" => "1.22.3", - "elementary" => "1.22.3", - "eio" => "1.22.3", - "ethumb" => "1.22.3", - "emotion" => "1.22.3" + "enlightenment"=> "0.23.1", + "eina" => "1.22.5", + "eet" => "1.22.5", + "evas" => "1.22.5", + "ecore"=> "1.22.5", + "embryo" => "1.22.5", + "edje" => "1.22.5", + "eeze" => "1.22.5", + "e_dbus" => "1.22.5", + "efreet" => "1.22.5", + "expedite" => "1.22.5", + "evas_generic_loaders" => "1.22.5", + "evil" => "1.22.5", + "elementary" => "1.22.5", + "eio" => "1.22.5", + "ethumb" => "1.22.5", + "emotion" => "1.22.5" ); # --
[EGIT] [website/www-content] master 02/03: more version updates for 0.23
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=71197370c706dce7711939277f83cdc41601498b commit 71197370c706dce7711939277f83cdc41601498b Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 17:26:07 2019 +0100 more version updates for 0.23 --- pages/about-enlightenment.md.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about-enlightenment.md.txt b/pages/about-enlightenment.md.txt index e7637533a..cf0428ef0 100644 --- a/pages/about-enlightenment.md.txt +++ b/pages/about-enlightenment.md.txt @@ -7,7 +7,7 @@  -Enlightenment (0.23.0) (a.k.a E23) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. +Enlightenment (0.23.1) (a.k.a E23) is the next generation of graphical desktop shell from the Enlightenment project. It resembles a traditional UNIX/X1 style desktop by design but has a range of add-ons, as well as a different core design philosophy. Enlightenment manages windows and files. It's a compositor and is also capable of launching applications, handling the user interface and even system settings. --
[EGIT] [website/www-content] master 01/03: update latest e version
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=3fff92d9fba31e137b3b8dd8d4f11ec3de739ca8 commit 3fff92d9fba31e137b3b8dd8d4f11ec3de739ca8 Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 17:25:01 2019 +0100 update latest e version --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index a22bc97ce..db397054a 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -2,7 +2,7 @@ efl_v = 1.22.5 python_efl_v = 1.22.0 -enlightenment_v = 0.23.0 +enlightenment_v = 0.23.1 terminology_v = 1.5.0 rage_v= 0.3.1 econnman_v= 1.1 --
[EGIT] [website/www-content] master 03/03: update more e versions
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=5e2502acd04b1cfbb8c1da6c3d6c0e37fd4a1df9 commit 5e2502acd04b1cfbb8c1da6c3d6c0e37fd4a1df9 Author: Carsten Haitzler (Rasterman) Date: Thu Sep 26 17:28:18 2019 +0100 update more e versions --- pages/incl/start-release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/incl/start-release.txt b/pages/incl/start-release.txt index 17092a071..9d45d234e 100644 --- a/pages/incl/start-release.txt +++ b/pages/incl/start-release.txt @@ -1,3 +1,3 @@ -[[https://www.enlightenment.org/news/efl-1.22.5|EFL 1.22.5]] and [[https://www.enlightenment.org/news/e23_release|Enlightenment 0.23.0]] are out - go to our [[/download]] page. +[[https://www.enlightenment.org/news/efl-1.22.5|EFL 1.22.5]] and [[https://www.enlightenment.org/news/e0.23.1_release|Enlightenment 0.23.1]] are out - go to our [[/download]] page. --
[EGIT] [website/www-content] master 01/01: news - e 0.23.1
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=22025658267b8d97aa4038e25e3591d1115bfea2
commit 22025658267b8d97aa4038e25e3591d1115bfea2
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 26 17:22:10 2019 +0100
news - e 0.23.1
---
pages/news/e0.23.1_release.txt | 19 +++
1 file changed, 19 insertions(+)
diff --git a/pages/news/e0.23.1_release.txt b/pages/news/e0.23.1_release.txt
new file mode 100644
index 0..7fc421759
--- /dev/null
+++ b/pages/news/e0.23.1_release.txt
@@ -0,0 +1,19 @@
+=== Enlightenment DR 0.23.1 Release ===
+ * //2019-09-26 by Carsten Haitzler//
+
+This is a bugfix and stability release for Enlightenment 0.23.
+
+== Changes ==
+
+ * Fixed mixer notifications when volume didn't actually change
+ * Fixed build with newest EFL which does not still implicitly include
libuuid CFLAGS in efl-wl CFLAGS
+ * Fixed move/resize triggered by key bindings to work again
+ * Fixed NULL access on move begin that crashed.
+
+== Download ==
+
+^ ** LINK ** ^ ** SHA256 ** ^
+| [[
http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.23.1.tar.xz
| Enlightenment DR 0.23.1 XZ]] |
''e530590c09b560679621f4531d55c242cfafe8523309e0ae88fb267e00f52c34'' |
+
+{{:blank.png?nolink&100|}}
+~~DISCUSSIONS~~
--
[EGIT] [core/enlightenment] enlightenment-0.23 01/01: release 0.23.1
raster pushed a commit to branch enlightenment-0.23.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0e0141484a4b1098a35de991ed4fcda437df6161
commit 0e0141484a4b1098a35de991ed4fcda437df6161
Author: Carsten Haitzler (Rasterman)
Date: Thu Sep 26 16:40:54 2019 +0100
release 0.23.1
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index db7500d61..3858feb28 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
# project
project('enlightenment', 'c',
-version: '0.23.0',
+version: '0.23.1',
license: 'BSD 2 clause',
default_options: [ 'buildtype=release', 'c_std=gnu99',
'warning_level=2' ],
meson_version : '>= 0.47.0')
--
[EGIT] [core/efl] master 02/07: efl_ui/layout: fix shadow warning
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6f6407729e8cb6da3813ac6ee1b4be8045bb5f89
commit 6f6407729e8cb6da3813ac6ee1b4be8045bb5f89
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:03:32 2019 +0200
efl_ui/layout: fix shadow warning
Summary:
a variable with the same name is declared above
Depends on D10192
Reviewers: segfaultxavi
Reviewed By: segfaultxavi
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10193
---
src/lib/elementary/efl_ui_layout.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_layout.c
b/src/lib/elementary/efl_ui_layout.c
index 6d58277e72..d25e86ccb2 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -570,8 +570,8 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
efl_gfx_hint_size_min_set(obj, EINA_SIZE2D(0, 0));
else
{
-const char *version = edje_object_data_get(wd->resize_obj, "version");
-if (!version)
+const char *theme_version = edje_object_data_get(wd->resize_obj,
"version");
+if (!theme_version)
{
ERR("Widget(%p) with type '%s' is not providing a version in its
theme!", obj,
efl_class_name_get(efl_class_get(obj)));
@@ -580,7 +580,7 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
else
{
errno = 0;
- sd->version = strtoul(version, NULL, 10);
+ sd->version = strtoul(theme_version, NULL, 10);
if (errno)
{
ERR("Widget(%p) with type '%s' is not providing a valid
version in its theme!", obj,
--
[EGIT] [core/efl] master 03/07: efl_ui/layout: improve error message when theme version parsing fails
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5256b9476d12c8057532de45a1500a3290649c7d
commit 5256b9476d12c8057532de45a1500a3290649c7d
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:03:38 2019 +0200
efl_ui/layout: improve error message when theme version parsing fails
Summary:
be very explicit here so that users can immediately know how to resolve
the issue
Depends on D10193
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10194
---
src/lib/elementary/efl_ui_layout.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/lib/elementary/efl_ui_layout.c
b/src/lib/elementary/efl_ui_layout.c
index d25e86ccb2..5719d23c9f 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -575,6 +575,8 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
{
ERR("Widget(%p) with type '%s' is not providing a version in its
theme!", obj,
efl_class_name_get(efl_class_get(obj)));
+ ERR("Group '%s' should have data.item: \"version\" \"%d%d\";",
+ efl_file_key_get(wd->resize_obj), EFL_VERSION_MAJOR,
EFL_VERSION_MINOR);
return EFL_UI_THEME_APPLY_ERROR_VERSION;
}
else
@@ -585,6 +587,8 @@ _efl_ui_layout_base_efl_ui_widget_theme_apply(Eo *obj,
Efl_Ui_Layout_Data *sd)
{
ERR("Widget(%p) with type '%s' is not providing a valid
version in its theme!", obj,
efl_class_name_get(efl_class_get(obj)));
+ ERR("Group '%s' should have data.item: \"version\"
\"%d%d\";",
+ efl_file_key_get(wd->resize_obj), EFL_VERSION_MAJOR,
EFL_VERSION_MINOR);
sd->version = 0;
return EFL_UI_THEME_APPLY_ERROR_VERSION;
}
--
[EGIT] [core/efl] master 01/07: efl_ui/layout: use better check for determining whether to defer signals
xartigas pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a21dacbad6c6fef31df5f1bd3655d511902af9d2 commit a21dacbad6c6fef31df5f1bd3655d511902af9d2 Author: Mike Blumenkrantz Date: Thu Sep 26 17:03:28 2019 +0200 efl_ui/layout: use better check for determining whether to defer signals Summary: a layout (not layout_base) should not defer signals. theme groups loaded by a layout widget can be anything, and are not subject to the versioning requirements that efl widgets have Depends on D10055 Reviewers: cedric Reviewed By: cedric Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10192 --- src/lib/elementary/efl_ui_layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 98f76e1749..6d58277e72 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -264,7 +264,7 @@ _signals_emit(Efl_Ui_Layout_Data *sd, use = buf2; snprintf(buf, sizeof(buf), "efl,state,%s,%s", type, set ? "set" : "unset"); snprintf(buf2, sizeof(buf2), "efl,%s,%s", type, set ? "set" : "unset"); -if (efl_finalized_get(sd->obj)) +if (efl_isa(sd->obj, EFL_UI_LAYOUT_CLASS) || efl_finalized_get(sd->obj)) efl_layout_signal_emit(sd->obj, use, "efl"); else _defer_version_signal(sd, eina_stringshare_add(buf), eina_stringshare_add(buf2), 123); --
[EGIT] [core/efl] master 07/07: efl_ui/item_clickable: mark beta again
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=68b1cfe5d67f8a2d91f908754c543c1767beca1e
commit 68b1cfe5d67f8a2d91f908754c543c1767beca1e
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:05:02 2019 +0200
efl_ui/item_clickable: mark beta again
Summary:
this isn't strictly necessary at the moment
Depends on D10197
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10199
---
src/lib/elementary/efl_ui_item_clickable.eo | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_item_clickable.eo
b/src/lib/elementary/efl_ui_item_clickable.eo
index db73d79d88..ab81979e14 100644
--- a/src/lib/elementary/efl_ui_item_clickable.eo
+++ b/src/lib/elementary/efl_ui_item_clickable.eo
@@ -1,18 +1,18 @@
import efl_input_clickable;
-struct Efl.Ui.Item_Clickable_Clicked {
+struct @beta Efl.Ui.Item_Clickable_Clicked {
[[A struct that expresses a click in item of container widget.]]
clicked: Efl.Input.Clickable_Clicked; [[The input clicked event data.]]
item: Efl.Ui.Item; [[The clicked item.]]
}
-struct Efl.Ui.Item_Clickable_Pressed {
+struct @beta Efl.Ui.Item_Clickable_Pressed {
[[A struct that expresses a press or unpress in item of container widget.]]
button: int; [[The button which was pressed or unpressed.]]
item: Efl.Ui.Item; [[The corresponding item.]]
}
-interface Efl.Ui.Item_Clickable
+interface @beta Efl.Ui.Item_Clickable
{
[[Shared sets of events between @Efl.Ui.Collection and
@Efl.Ui.Collection_View.]]
event_c_prefix: efl_ui;
--
[EGIT] [core/efl] master 05/07: theme: remove efl_ui_slider "disabled" styles
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=253e7d51db121c503ddab6a78b0d6039446be459
commit 253e7d51db121c503ddab6a78b0d6039446be459
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:03:48 2019 +0200
theme: remove efl_ui_slider "disabled" styles
Summary:
these should be handled in the regular theme group, no idea why they
existed
Depends on D10195
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10196
---
data/elementary/themes/edc/efl/slider.edc | 4
1 file changed, 4 deletions(-)
diff --git a/data/elementary/themes/edc/efl/slider.edc
b/data/elementary/themes/edc/efl/slider.edc
index d29fd6359b..d058280f55 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -1,6 +1,5 @@
group { "efl/slider/horizontal";
data.item: "version" "123";
- alias: "efl/slider/horizontal:disabled";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
images.image: "slider_run_base_light_horiz.png" COMP;
@@ -237,7 +236,6 @@ group { "efl/slider/horizontal";
group { "efl/slider/vertical";
data.item: "version" "123";
- alias: "efl/slider/vertical:disabled";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;
images.image: "slider_run_base_light_vert.png" COMP;
@@ -476,7 +474,6 @@ group { "efl/slider/vertical";
group { "efl/slider_interval/horizontal";
data.item: "version" "123";
- alias: "efl/slider/horizontal:disabled";
images.image: "slider_run_base_horiz.png" COMP;
images.image: "slider_run_bevel_horiz.png" COMP;
images.image: "slider_run_base_light_horiz.png" COMP;
@@ -759,7 +756,6 @@ group { "efl/slider_interval/horizontal";
group { "efl/slider_interval/vertical";
data.item: "version" "123";
- alias: "efl/slider/vertical:disabled";
images.image: "slider_run_base_vert.png" COMP;
images.image: "slider_run_bevel_vert.png" COMP;
images.image: "slider_run_base_light_vert.png" COMP;
--
[EGIT] [core/efl] master 04/07: tests/check: add port of check widget mouse testing for efl_ui_check
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2d206757ed78b385606134e7addeb9618c44372b
commit 2d206757ed78b385606134e7addeb9618c44372b
Author: Mike Blumenkrantz
Date: Thu Sep 26 17:03:43 2019 +0200
tests/check: add port of check widget mouse testing for efl_ui_check
Summary:
coverage++
Depends on D10194
Reviewers: bu5hm4n
Reviewed By: bu5hm4n
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10195
---
src/tests/elementary/efl_ui_test_check.c | 26 ++
1 file changed, 26 insertions(+)
diff --git a/src/tests/elementary/efl_ui_test_check.c
b/src/tests/elementary/efl_ui_test_check.c
index 232bc7cae5..a013f93f10 100644
--- a/src/tests/elementary/efl_ui_test_check.c
+++ b/src/tests/elementary/efl_ui_test_check.c
@@ -70,6 +70,31 @@ EFL_START_TEST(check_selection_events)
}
EFL_END_TEST
+
+EFL_START_TEST(efl_ui_test_check_callbacks)
+{
+ int called = 0;
+ int i;
+
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
+
+ efl_text_set(check, "TEST TEST TEST");
+ efl_event_callback_add(check, EFL_UI_EVENT_SELECTED_CHANGED,
(void*)event_callback_single_call_int_data, );
+
+ efl_gfx_entity_size_set(check, EINA_SIZE2D(200, 100));
+ get_me_to_those_events(check);
+
+ for (i = 0; i < 4; i++)
+ {
+called = 0;
+click_object(check);
+ecore_main_loop_iterate();
+ck_assert_int_eq(efl_ui_selectable_selected_get(check), !(i % 2));
+ck_assert_int_eq(called, 1);
+ }
+}
+EFL_END_TEST
+
void efl_ui_test_check(TCase *tc)
{
tcase_add_checked_fixture(tc, check_setup, NULL);
@@ -77,4 +102,5 @@ void efl_ui_test_check(TCase *tc)
tcase_add_test(tc, check_text);
tcase_add_test(tc, check_content);
tcase_add_test(tc, check_selection_events);
+ tcase_add_test(tc, efl_ui_test_check_callbacks);
}
--
[EGIT] [core/efl] master 01/01: eolian: better error message for const on strings
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=79aa86df5a1c1abb022862e3e61745fea598fc94
commit 79aa86df5a1c1abb022862e3e61745fea598fc94
Author: Daniel Kolesa
Date: Thu Sep 26 17:33:24 2019 +0200
eolian: better error message for const on strings
---
src/lib/eolian/database_validate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eolian/database_validate.c
b/src/lib/eolian/database_validate.c
index b80d418a3e..c1de7ec11a 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -288,7 +288,7 @@ _validate_type(Validate_State *vals, Eolian_Type *tp,
Eina_Bool by_ref,
case KW_string:
case KW_mstring:
case KW_stringshare:
- _eo_parser_log(>base, "string types cannot be const");
+ _eo_parser_log(>base, "spurious explicit const on string
type");
return EINA_FALSE;
default:
{
--
[EGIT] [core/efl] master 04/05: ecore-x: add internal function for selecting just properties of root window
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2f7b359183a2dd7631c669583d0038fe840bc929
commit 2f7b359183a2dd7631c669583d0038fe840bc929
Author: Mike Blumenkrantz
Date: Thu Sep 26 11:23:12 2019 -0400
ecore-x: add internal function for selecting just properties of root window
Summary:
this is just a shortcut for watching properties in the case where no wm is
active in the process
Depends on D10012
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10013
---
src/lib/ecore_x/ecore_x.c | 11 +++
src/lib/ecore_x/ecore_x_private.h | 20
2 files changed, 31 insertions(+)
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index 8503addacd..924b416ebb 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -1431,6 +1431,17 @@ ecore_x_window_sniff(Ecore_X_Window win)
if (_ecore_xlib_sync) ecore_x_sync();
}
+/* this is internal-only for now */
+EAPI void
+ecore_x_window_root_properties_select(void)
+{
+ LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (_ecore_x_window_manage_succeeded) return;
+ EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
+ XSelectInput(_ecore_x_disp, ecore_x_window_root_first_get(),
PropertyChangeMask);
+ if (_ecore_xlib_sync) ecore_x_sync();
+}
+
EAPI void
ecore_x_window_client_sniff(Ecore_X_Window win)
{
diff --git a/src/lib/ecore_x/ecore_x_private.h
b/src/lib/ecore_x/ecore_x_private.h
index 7374a0d9ee..ce81efe3d6 100644
--- a/src/lib/ecore_x/ecore_x_private.h
+++ b/src/lib/ecore_x/ecore_x_private.h
@@ -406,4 +406,24 @@ int _ecore_x_shutdown(void);
#define LOGFN(fl, ln, fn)
#endif /* ifdef LOGFNS */
+
+
+#ifdef EAPI
+# undef EAPI
+#endif // ifdef EAPI
+
+#ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# else // if __GNUC__ >= 4
+# define EAPI
+# endif // if __GNUC__ >= 4
+#else // ifdef __GNUC__
+# define EAPI
+#endif // ifdef __GNUC__
+EAPI void ecore_x_window_root_properties_select(void);
+#undef EAPI
+#define EAPI
+
+
#endif /* ifndef _ECORE_X_PRIVATE_H */
--
[EGIT] [core/efl] master 03/05: ecore-x: track whether ecore-x is internally "managing" the root window
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2bc6754d395ca645ce29359dab3be757edb28064
commit 2bc6754d395ca645ce29359dab3be757edb28064
Author: Mike Blumenkrantz
Date: Thu Sep 26 11:23:01 2019 -0400
ecore-x: track whether ecore-x is internally "managing" the root window
Summary:
when ecore_x_window_manage is called, this is probably only for the case of
managing the root window, i.e., running a window manager. store this state
internally so that we can avoid calling additional XSelectInput later and
fucking up the expected eventing
Depends on D9899
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: devilhorns, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10012
---
src/lib/ecore_x/ecore_x.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index 500ef19f65..8503addacd 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -779,7 +779,7 @@ ecore_x_init_from_display(Ecore_X_Display *display)
eina_shutdown();
return --_ecore_x_init_count;
}
-
+static Eina_Bool _ecore_x_window_manage_succeeded = EINA_FALSE;
int
_ecore_x_shutdown(void)
{
@@ -855,6 +855,7 @@ _ecore_x_shutdown(void)
free(_ecore_x_event_handlers);
_ecore_x_fd_handler_handle = NULL;
_ecore_x_event_handlers = NULL;
+ _ecore_x_window_manage_succeeded = EINA_FALSE;
_ecore_x_events_shutdown();
_ecore_x_input_shutdown();
_ecore_x_selection_shutdown();
@@ -1347,13 +1348,12 @@ ecore_x_window_root_first_get(void)
static void _ecore_x_window_manage_error(void *data);
-static int _ecore_x_window_manage_failed = 0;
static void
_ecore_x_window_manage_error(void *data EINA_UNUSED)
{
if ((ecore_x_error_request_get() == X_ChangeWindowAttributes) &&
(ecore_x_error_code_get() == BadAccess))
- _ecore_x_window_manage_failed = 1;
+ _ecore_x_window_manage_succeeded = EINA_FALSE;
}
EAPI Eina_Bool
@@ -1367,7 +1367,7 @@ ecore_x_window_manage(Ecore_X_Window win)
return EINA_FALSE;
ecore_x_sync();
- _ecore_x_window_manage_failed = 0;
+ _ecore_x_window_manage_succeeded = EINA_TRUE;
ecore_x_error_handler_set(_ecore_x_window_manage_error, NULL);
XSelectInput(_ecore_x_disp, win,
EnterWindowMask |
@@ -1382,9 +1382,8 @@ ecore_x_window_manage(Ecore_X_Window win)
att.your_event_mask);
ecore_x_sync();
ecore_x_error_handler_set(NULL, NULL);
- if (_ecore_x_window_manage_failed)
+ if (!_ecore_x_window_manage_succeeded)
{
-_ecore_x_window_manage_failed = 0;
return EINA_FALSE;
}
--
[EGIT] [core/efl] master 01/05: ecore-x: fix null derefs in window prop code
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9d16a44334f845d8053602c30d28bd4cb600046d
commit 9d16a44334f845d8053602c30d28bd4cb600046d
Author: Mike Blumenkrantz
Date: Thu Sep 26 11:22:32 2019 -0400
ecore-x: fix null derefs in window prop code
Summary:
handle cases where null params could be passed and cause crashes
@fix
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9899
---
src/lib/ecore_x/ecore_x_window_prop.c | 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/lib/ecore_x/ecore_x_window_prop.c
b/src/lib/ecore_x/ecore_x_window_prop.c
index 043e50e391..ac23a50877 100644
--- a/src/lib/ecore_x/ecore_x_window_prop.c
+++ b/src/lib/ecore_x/ecore_x_window_prop.c
@@ -81,8 +81,9 @@ ecore_x_window_prop_card32_get(Ecore_X_Window win,
if (num_ret < len)
len = num_ret;
-for (i = 0; i < len; i++)
- val[i] = ((unsigned long *)prop_ret)[i];
+if (val)
+ for (i = 0; i < len; i++)
+val[i] = ((unsigned long *)prop_ret)[i];
num = len;
}
@@ -112,7 +113,7 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win,
int num;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- *plst = NULL;
+ if (plst) *plst = NULL;
prop_ret = NULL;
if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fff, False,
XA_CARDINAL, _ret, _ret, _ret,
@@ -123,7 +124,7 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win,
num = -1;
else if ((num_ret == 0) || (!prop_ret))
num = 0;
- else
+ else if (plst)
{
val = malloc(num_ret * sizeof(unsigned int));
if (!val)
@@ -136,6 +137,8 @@ ecore_x_window_prop_card32_list_get(Ecore_X_Window win,
num = num_ret;
*plst = val;
}
+ else
+ num = num_ret;
if (_ecore_xlib_sync) ecore_x_sync();
if (prop_ret)
@@ -214,8 +217,9 @@ ecore_x_window_prop_xid_get(Ecore_X_Window win,
if (num_ret < len)
len = num_ret;
-for (i = 0; i < len; i++)
- lst[i] = ((unsigned long *)prop_ret)[i];
+if (lst)
+ for (i = 0; i < len; i++)
+lst[i] = ((unsigned long *)prop_ret)[i];
num = len;
}
@@ -249,7 +253,7 @@ ecore_x_window_prop_xid_list_get(Ecore_X_Window win,
Eina_Bool success;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- *val = NULL;
+ if (val) *val = NULL;
prop_ret = NULL;
success = (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fff,
False,
type, _ret, _ret, _ret,
@@ -261,7 +265,7 @@ ecore_x_window_prop_xid_list_get(Ecore_X_Window win,
num = -1;
else if (num_ret == 0 || !prop_ret)
num = 0;
- else
+ else if (val)
{
alst = malloc(num_ret * sizeof(Ecore_X_ID));
for (i = 0; i < num_ret; i++)
@@ -269,6 +273,8 @@ ecore_x_window_prop_xid_list_get(Ecore_X_Window win,
num = num_ret;
*val = alst;
}
+ else
+ num = num_ret;
if (prop_ret)
XFree(prop_ret);
--
[EGIT] [core/efl] master 02/05: ecore-evas/x: detect and track wm existence, apply visibility correctly
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fddc27ed4041d792f4933110d7e6c14f1cac2bca
commit fddc27ed4041d792f4933110d7e6c14f1cac2bca
Author: Mike Blumenkrantz
Date: Thu Sep 26 11:22:44 2019 -0400
ecore-evas/x: detect and track wm existence, apply visibility correctly
Summary:
this attempts to monitor the _NET_SUPPORTING_WM_CHECK atom to verify whether
a wm exists, and bypasses waiting for a configure event from a nonexistent
wm
if the screen is not currently managed
fix T7838
Depends on D10014
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: devilhorns, thierry1970, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7838
Differential Revision: https://phab.enlightenment.org/D9900
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 590831760e..97e5fb2d10 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -69,6 +69,8 @@ static const char *interface_gl_x11_name = "gl_x11";
#endif
static const int interface_gl_x11_version = 1;
+static Eina_Bool wm_exists;
+
typedef struct _Ecore_Evas_Engine_Data_X11 Ecore_Evas_Engine_Data_X11;
struct _Ecore_Evas_Engine_Data_X11 {
@@ -809,6 +811,11 @@ _ecore_evas_x_event_property_change(void *data
EINA_UNUSED, int type EINA_UNUSED
int state_change = 0;
e = event;
+ if (e->win == ecore_x_window_root_first_get())
+ {
+if (e->atom == ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK)
+ wm_exists =
!ecore_x_window_prop_window_get(ecore_x_window_root_first_get(),
ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK, NULL, 0);
+ }
ee = ecore_event_window_match(e->win);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on
event */
edata = ee->engine.data;
@@ -1000,7 +1007,7 @@ _ecore_evas_x_event_visibility_change(void *data
EINA_UNUSED, int type EINA_UNUS
if (e->fully_obscured)
{
/* FIXME: round trip */
-if (!ecore_x_screen_is_composited(edata->screen_num))
+if ((!wm_exists) || (!ecore_x_screen_is_composited(edata->screen_num)))
ee->draw_block = !edata->configured;
}
else if (ee->draw_block)
@@ -1543,14 +1550,14 @@ _ecore_evas_x_event_window_configure(void *data
EINA_UNUSED, int type EINA_UNUSE
if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
edata = ee->engine.data;
if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
- if ((e->from_wm) || (ee->prop.override))
+ if ((!wm_exists) || (e->from_wm) || (ee->prop.override))
{
if (!edata->configured)
{
if (edata->fully_obscured)
{
/* FIXME: round trip */
- if (!ecore_x_screen_is_composited(edata->screen_num))
+ if ((!wm_exists) ||
(!ecore_x_screen_is_composited(edata->screen_num)))
ee->draw_block = EINA_FALSE;
}
else
@@ -1902,11 +1909,16 @@ _ecore_evas_x_layer_update(Ecore_Evas *ee)
/* FIXME: Set gnome layer */
}
+EAPI void ecore_x_window_root_properties_select(void);
+
static int
_ecore_evas_x_init(void)
{
_ecore_evas_init_count++;
if (_ecore_evas_init_count > 1) return _ecore_evas_init_count;
+
+ ecore_x_window_root_properties_select();
+ wm_exists =
!ecore_x_window_prop_window_get(ecore_x_window_root_first_get(),
ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK, NULL, 0);
ecore_evas_event_handlers[0] =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN,
_ecore_evas_x_event_mouse_in, NULL);
@@ -4100,6 +4112,7 @@ ecore_evas_software_x11_new_internal(const char
*disp_name, Ecore_X_Window paren
ee->engine.func->fn_render = _ecore_evas_x_render;
ee->draw_block = EINA_TRUE;
+ if (!wm_exists) edata->configured = 1;
ecore_x_input_multi_select(ee->prop.window);
ecore_evas_done(ee, EINA_FALSE);
@@ -4314,6 +4327,7 @@ ecore_evas_software_x11_pixmap_new_internal(const char
*disp_name, Ecore_X_Windo
_ecore_evas_register(ee);
ee->draw_block = EINA_FALSE;
+ if (!wm_exists) edata->configured = 1;
/* ecore_x_input_multi_select(ee->prop.window); */
/* ecore_event_window_register(ee->prop.window, ee, ee->evas, */
@@ -4533,6 +4547,7 @@ ecore_evas_gl_x11_options_new_internal(const char
*disp_name, Ecore_X_Window par
_ecore_evas_x_aux_hints_update(ee);
ee->draw_block = 1;
+ if (!wm_exists) edata->configured = 1;
ee->engine.func->fn_render = _ecore_evas_x_render;
ecore_x_input_multi_select(ee->prop.window);
@@ -4721,6 +4736,7 @@ ecore_evas_gl_x11_pixmap_new_internal(const char
*disp_name, Ecore_X_Window
[EGIT] [core/efl] master 05/05: ecore-x: protect against accidentally "un-managing" the root window
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d2d4fcce48504a317d99e06fddc9db5cdbd7c67a
commit d2d4fcce48504a317d99e06fddc9db5cdbd7c67a
Author: Mike Blumenkrantz
Date: Thu Sep 26 11:23:24 2019 -0400
ecore-x: protect against accidentally "un-managing" the root window
Summary:
block calls to XSelectInput with the root window if the root window is
currently being "managed" in-process in order to avoid breaking the
running wm
Depends on D10013
Reviewers: devilhorns
Reviewed By: devilhorns
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10014
---
src/lib/ecore_x/ecore_x.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index 924b416ebb..a32f42f641 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -1394,6 +1394,7 @@ EAPI void
ecore_x_window_container_manage(Ecore_X_Window win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (_ecore_x_window_manage_succeeded && (win ==
ecore_x_window_root_first_get())) return;
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
XSelectInput(_ecore_x_disp, win,
SubstructureRedirectMask |
@@ -1406,6 +1407,7 @@ ecore_x_window_client_manage(Ecore_X_Window win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
+ if (_ecore_x_window_manage_succeeded && (win ==
ecore_x_window_root_first_get())) return;
XSelectInput(_ecore_x_disp, win,
PropertyChangeMask |
// ResizeRedirectMask |
@@ -1425,6 +1427,7 @@ ecore_x_window_sniff(Ecore_X_Window win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
+ if (_ecore_x_window_manage_succeeded && (win ==
ecore_x_window_root_first_get())) return;
XSelectInput(_ecore_x_disp, win,
PropertyChangeMask |
SubstructureNotifyMask);
@@ -1446,6 +1449,7 @@ EAPI void
ecore_x_window_client_sniff(Ecore_X_Window win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (_ecore_x_window_manage_succeeded && (win ==
ecore_x_window_root_first_get())) return;
EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
XSelectInput(_ecore_x_disp, win,
PropertyChangeMask |
--
[EGIT] [core/efl] master 01/01: efl_mono: remove spurious const
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f37c996ad42f2cd1fda5f21b056d7ef84ef84bdf
commit f37c996ad42f2cd1fda5f21b056d7ef84ef84bdf
Author: Daniel Kolesa
Date: Thu Sep 26 17:17:05 2019 +0200
efl_mono: remove spurious const
---
src/tests/efl_mono/dummy_test_object.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/efl_mono/dummy_test_object.eo
b/src/tests/efl_mono/dummy_test_object.eo
index 44a7c97464..6daf07f1a7 100644
--- a/src/tests/efl_mono/dummy_test_object.eo
+++ b/src/tests/efl_mono/dummy_test_object.eo
@@ -1668,7 +1668,7 @@ class Dummy.Test_Object extends Efl.Object implements
Dummy.Test_Iface {
Dummy.Test_Iface.call_method_protected;
}
events {
- evt,with,string @hot: const(string);
+ evt,with,string @hot: string;
evt,with,bool: bool;
evt,with,int @hot: int;
evt,with,uint @hot: uint;
--
[EGIT] [core/efl] master 01/02: efl_ui : stablized Efl.Ui.View
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33512079cd362812d2bb704cd55600e0bfd25034
commit 33512079cd362812d2bb704cd55600e0bfd25034
Author: SangHyeon Jade Lee
Date: Thu Sep 26 11:05:47 2019 -0400
efl_ui : stablized Efl.Ui.View
Summary:
Efl.Ui.View is base infrastructure interface of MVVM.
fixes T7578
Reviewers: zmike, cedric, segfaultxavi, bu5hm4n
Reviewed By: cedric
Subscribers: #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7578
Differential Revision: https://phab.enlightenment.org/D10188
---
src/lib/efl/interfaces/efl_ui_view.eo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_ui_view.eo
b/src/lib/efl/interfaces/efl_ui_view.eo
index 56026a0ed2..4146939de8 100644
--- a/src/lib/efl/interfaces/efl_ui_view.eo
+++ b/src/lib/efl/interfaces/efl_ui_view.eo
@@ -1,10 +1,10 @@
-struct @beta Efl.Model_Changed_Event {
+struct Efl.Model_Changed_Event {
[[Every time the model is changed on the object.]]
current: Efl.Model; [[The newly set model.]]
previous: Efl.Model; [[The previously set model.]]
}
-interface @beta Efl.Ui.View
+interface Efl.Ui.View
{
[[Efl UI view interface]]
methods {
--
[EGIT] [core/efl] master 02/02: efl_core : stabilized Efl.Generic_Model
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d4c4d8f0f4bd114a8e60c30d72967bc27897f92d
commit d4c4d8f0f4bd114a8e60c30d72967bc27897f92d
Author: SangHyeon Jade Lee
Date: Thu Sep 26 11:06:15 2019 -0400
efl_core : stabilized Efl.Generic_Model
Summary:
stabilzed Efl.Generic_Model
depends on D10188
Reviewers: cedric, zmike, segfaultxavi
Reviewed By: cedric
Subscribers: #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10189
---
src/lib/ecore/efl_generic_model.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore/efl_generic_model.eo
b/src/lib/ecore/efl_generic_model.eo
index bb67dafbc5..4509027a17 100644
--- a/src/lib/ecore/efl_generic_model.eo
+++ b/src/lib/ecore/efl_generic_model.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Generic_Model extends Efl.Loop_Model
+class Efl.Generic_Model extends Efl.Loop_Model
{
[[
Generic model that allows any property to be manually set.
--
[EGIT] [core/efl] master 01/01: eolian: rename param direction enum and fields for consistency
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b0ee540ec9a52824c79f42bff4fc6e06e0492f96
commit b0ee540ec9a52824c79f42bff4fc6e06e0492f96
Author: Daniel Kolesa
Date: Thu Sep 26 16:56:13 2019 +0200
eolian: rename param direction enum and fields for consistency
---
src/bin/eolian/docs.c| 6 +++---
src/bin/eolian/headers.c | 4 ++--
src/bin/eolian/sources.c | 12 ++--
src/bin/eolian_js/main.cc| 14 +++---
src/bindings/luajit/eolian.lua | 12 ++--
src/lib/eolian/Eolian.h | 12 ++--
src/lib/eolian/database_function_parameter_api.c | 4 ++--
src/lib/eolian/eo_parser.c | 14 +++---
src/lib/eolian/eolian_database.h | 2 +-
src/lib/eolian_cxx/grammar/klass_def.hpp | 10 +-
src/scripts/gendoc/doc_macros.include| 6 +++---
src/scripts/pyolian/eolian.py| 4 ++--
src/scripts/pyolian/eolian_lib.py| 2 +-
src/scripts/pyolian/generator.py | 2 +-
src/scripts/pyolian/test_eolian.py | 2 +-
src/tests/eolian/eolian_parsing.c| 18 +-
16 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/src/bin/eolian/docs.c b/src/bin/eolian/docs.c
index 6b016eb4ee..31a80a28b6 100644
--- a/src/bin/eolian/docs.c
+++ b/src/bin/eolian/docs.c
@@ -623,17 +623,17 @@ eo_gen_docs_func_gen(const Eolian_State *state, const
Eolian_Function *fid,
const Eolian_Documentation *adoc =
eolian_parameter_documentation_get(par);
curl = _indent_line(buf, indent);
-Eolian_Parameter_Dir dir = EOLIAN_OUT_PARAM;
+Eolian_Parameter_Direction dir = EOLIAN_PARAMETER_OUT;
if (!force_out)
dir = eolian_parameter_direction_get(par);
switch (dir)
{
- case EOLIAN_OUT_PARAM:
+ case EOLIAN_PARAMETER_OUT:
eina_strbuf_append(buf, " * @param[out] ");
curl += sizeof(" * @param[out] ") - 1;
break;
- case EOLIAN_INOUT_PARAM:
+ case EOLIAN_PARAMETER_INOUT:
eina_strbuf_append(buf, " * @param[in,out] ");
curl += sizeof(" * @param[in,out] ") - 1;
break;
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 0973038d88..3a84e0ac0b 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -2,11 +2,11 @@
#include "docs.h"
static const char *
-_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Dir pdir)
+_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir)
{
if (ftype == EOLIAN_PROP_GET)
return "*";
- if ((pdir == EOLIAN_OUT_PARAM) || (pdir == EOLIAN_INOUT_PARAM))
+ if ((pdir == EOLIAN_PARAMETER_OUT) || (pdir == EOLIAN_PARAMETER_INOUT))
return "*";
return "";
}
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index 37a8ef05c8..58be274e4f 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -9,11 +9,11 @@ static Eina_Hash *_funcs_params_init_get = NULL;
static Eina_Hash *_funcs_params_init_set = NULL;
static const char *
-_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Dir pdir)
+_get_add_star(Eolian_Function_Type ftype, Eolian_Parameter_Direction pdir)
{
if (ftype == EOLIAN_PROP_GET)
return "*";
- if ((pdir == EOLIAN_OUT_PARAM) || (pdir == EOLIAN_INOUT_PARAM))
+ if ((pdir == EOLIAN_PARAMETER_OUT) || (pdir == EOLIAN_PARAMETER_INOUT))
return "*";
return "";
}
@@ -307,7 +307,7 @@ _gen_function_param_fallback(Eina_Iterator *itr,
Eina_Strbuf *fallback_free_owne
inner_type = eolian_type_base_type_get(type);
//check if they should be freed or just ignored
-if (!eolian_parameter_is_move(pr) ||
eolian_parameter_direction_get(pr) == EOLIAN_OUT_PARAM)
+if (!eolian_parameter_is_move(pr) ||
eolian_parameter_direction_get(pr) == EOLIAN_PARAMETER_OUT)
{
eina_strbuf_append_printf(fallback_free_ownership, "
(void)%s;\n", eolian_parameter_name_get(pr));
continue;
@@ -317,7 +317,7 @@ _gen_function_param_fallback(Eina_Iterator *itr,
Eina_Strbuf *fallback_free_owne
eina_strbuf_reset(param_call);
-if (eolian_parameter_direction_get(pr) == EOLIAN_INOUT_PARAM)
+if (eolian_parameter_direction_get(pr) == EOLIAN_PARAMETER_INOUT)
eina_strbuf_append_char(param_call, '*');
eina_strbuf_append(param_call, eolian_parameter_name_get(pr));
@@ -638,7 +638,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function
*fid,
Eolian_Function_Parameter *pr;
EINA_ITERATOR_FOREACH(itr, pr)
{
- Eolian_Parameter_Dir pd = eolian_parameter_direction_get(pr);
+
[EGIT] [core/efl] master 02/03: eolian: rename event_prefix to event_c_prefix for consistency
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6d93dc4cbf4847d33a921a939b3d8b7f65fffa89
commit 6d93dc4cbf4847d33a921a939b3d8b7f65fffa89
Author: Daniel Kolesa
Date: Thu Sep 26 16:39:56 2019 +0200
eolian: rename event_prefix to event_c_prefix for consistency
---
src/bindings/luajit/eolian.lua | 6 +++---
src/lib/ecore_audio/ecore_audio_in.eo | 2 +-
src/lib/ecore_audio/ecore_audio_out_pulse.eo | 2 +-
src/lib/ecore_audio/ecore_audio_out_wasapi.eo | 2 +-
src/lib/edje/efl_canvas_layout.eo | 2 +-
src/lib/edje/efl_layout_calc.eo| 2 +-
src/lib/efl/interfaces/efl_container.eo| 2 +-
src/lib/efl/interfaces/efl_gfx_hint.eo | 2 +-
src/lib/efl/interfaces/efl_gfx_stack.eo| 2 +-
src/lib/efl/interfaces/efl_ui_container_selectable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_draggable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_scrollable.eo| 2 +-
src/lib/efl/interfaces/efl_ui_text_selectable.eo | 2 +-
src/lib/efl/interfaces/efl_ui_zoom.eo | 2 +-
src/lib/elementary/efl_ui_animation_view.eo| 2 +-
src/lib/elementary/efl_ui_image.eo | 2 +-
src/lib/elementary/efl_ui_item_clickable.eo| 2 +-
src/lib/elementary/efl_ui_panes.eo | 2 +-
src/lib/elementary/efl_ui_scroll_manager.eo| 2 +-
src/lib/elementary/efl_ui_selectable.eo| 2 +-
src/lib/elementary/efl_ui_widget.eo| 2 +-
src/lib/elementary/efl_ui_widget_scrollable_content.eo | 2 +-
src/lib/eolian/Eolian.h| 4 ++--
src/lib/eolian/database_class_api.c| 2 +-
src/lib/eolian/eo_lexer.h | 2 +-
src/lib/eolian/eo_parser.c | 6 +++---
src/lib/evas/canvas/efl_input_clickable.eo | 2 +-
src/lib/evas/canvas/efl_input_interface.eo | 2 +-
src/lib/evas/gesture/efl_gesture_events.eo | 2 +-
src/scripts/pyolian/eolian.py | 4 ++--
src/scripts/pyolian/eolian_lib.py | 6 +++---
src/scripts/pyolian/test_eolian.py | 2 +-
src/tests/eolian/data/events.eo| 2 +-
src/tests/eolian/eolian_parsing.c | 2 +-
34 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 1c2f6e38b4..bcb71d7678 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -340,7 +340,7 @@ ffi.cdef [[
Eolian_Class_Type eolian_class_type_get(const Eolian_Class *klass);
const Eolian_Documentation *eolian_class_documentation_get(const
Eolian_Class *klass);
const char *eolian_class_c_prefix_get(const Eolian_Class *klass);
-const char *eolian_class_event_prefix_get(const Eolian_Class *klass);
+const char *eolian_class_event_c_prefix_get(const Eolian_Class *klass);
const char *eolian_class_data_type_get(const Eolian_Class *klass);
const Eolian_Class *eolian_class_parent_get(const Eolian_Class *klass);
Eina_Iterator *eolian_class_requires_get(const Eolian_Class *klass);
@@ -1445,8 +1445,8 @@ M.Class = ffi.metatype("Eolian_Class", {
return ffi.string(v)
end,
-event_prefix_get = function(self)
-local v = eolian.eolian_class_event_prefix_get(self)
+event_c_prefix_get = function(self)
+local v = eolian.eolian_class_event_c_prefix_get(self)
if v == nil then
return self:c_prefix_get()
end
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo
b/src/lib/ecore_audio/ecore_audio_in.eo
index f8c1fdbebb..d65ffba0f8 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -2,7 +2,7 @@ class @beta Ecore.Audio.In extends Ecore.Audio
{
[[Ecore Audio input object.]]
c_prefix: ecore_audio_obj_in;
- event_prefix: ecore_audio_in;
+ event_c_prefix: ecore_audio_in;
data: Ecore_Audio_Input;
methods {
@property speed {
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index d065d2d776..c794375a3b 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -2,7 +2,7 @@ class @beta Ecore.Audio.Out.Pulse extends Ecore.Audio.Out
{
[[Ecore audio ouput for PulseAudio.]]
c_prefix: ecore_audio_obj_out_pulse;
- event_prefix: ecore_audio_out_pulse;
+ event_c_prefix: ecore_audio_out_pulse;
implements {
Efl.Object.constructor;
Efl.Object.destructor;
diff --git a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
index 2f19880b20..8b560be63d 100644
---
[EGIT] [core/efl] master 03/03: eolian: loosen the requirements on API (don't return stringshare)
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cdff7852e03840fddb28e6ac451be80cfd877b94
commit cdff7852e03840fddb28e6ac451be80cfd877b94
Author: Daniel Kolesa
Date: Thu Sep 26 16:41:31 2019 +0200
eolian: loosen the requirements on API (don't return stringshare)
---
src/lib/eolian/Eolian.h | 16
src/lib/eolian/database_class_api.c | 6 +++---
src/lib/eolian/database_type_api.c | 4 ++--
src/lib/eolian/eolian_database.c| 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 4594f4b181..e76ac6fa84 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -1507,7 +1507,7 @@ EAPI const Eolian_Documentation
*eolian_class_documentation_get(const Eolian_Cla
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare* eolian_class_c_prefix_get(const Eolian_Class *klass);
+EAPI const char *eolian_class_c_prefix_get(const Eolian_Class *klass);
/*
* @brief Returns the C event prefix of a class
@@ -1517,7 +1517,7 @@ EAPI Eina_Stringshare* eolian_class_c_prefix_get(const
Eolian_Class *klass);
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare* eolian_class_event_c_prefix_get(const Eolian_Class
*klass);
+EAPI const char *eolian_class_event_c_prefix_get(const Eolian_Class *klass);
/*
* @brief Returns the data type of a class
@@ -1527,7 +1527,7 @@ EAPI Eina_Stringshare*
eolian_class_event_c_prefix_get(const Eolian_Class *klass
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_class_data_type_get(const Eolian_Class *klass);
+EAPI const char *eolian_class_data_type_get(const Eolian_Class *klass);
/*
* @brief Get the parent class of a class
@@ -2735,7 +2735,7 @@ eolian_typedecl_namespaces_get(const Eolian_Typedecl *tp)
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_typedecl_free_func_get(const Eolian_Typedecl
*tp);
+EAPI const char *eolian_typedecl_free_func_get(const Eolian_Typedecl *tp);
/*
* @brief Get the function object for this function pointer type.
@@ -3284,7 +3284,7 @@ EAPI Eina_Bool eolian_error_is_extern(const Eolian_Error
*err);
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_documentation_summary_get(const
Eolian_Documentation *doc);
+EAPI const char *eolian_documentation_summary_get(const Eolian_Documentation
*doc);
/*
* @brief Get the description of the documentation.
@@ -3297,7 +3297,7 @@ EAPI Eina_Stringshare
*eolian_documentation_summary_get(const Eolian_Documentati
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_documentation_description_get(const
Eolian_Documentation *doc);
+EAPI const char *eolian_documentation_description_get(const
Eolian_Documentation *doc);
/*
* @brief Get the "since" tag of the documentation.
@@ -3310,7 +3310,7 @@ EAPI Eina_Stringshare
*eolian_documentation_description_get(const Eolian_Documen
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_documentation_since_get(const
Eolian_Documentation *doc);
+EAPI const char *eolian_documentation_since_get(const Eolian_Documentation
*doc);
/*
* @brief Split a documentation string into individual paragraphs.
@@ -3409,7 +3409,7 @@ EAPI Eolian_Object_Type
eolian_doc_token_ref_resolve(const Eolian_Doc_Token *tok
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_typedecl_enum_legacy_prefix_get(const
Eolian_Typedecl *tp);
+EAPI const char *eolian_typedecl_enum_legacy_prefix_get(const Eolian_Typedecl
*tp);
/*
* @brief Get whether the given type is a reference.
diff --git a/src/lib/eolian/database_class_api.c
b/src/lib/eolian/database_class_api.c
index 943f561d5e..971c0bacb1 100644
--- a/src/lib/eolian/database_class_api.c
+++ b/src/lib/eolian/database_class_api.c
@@ -20,21 +20,21 @@ eolian_class_documentation_get(const Eolian_Class *cl)
return cl->doc;
}
-EAPI Eina_Stringshare*
+EAPI const char *
eolian_class_c_prefix_get(const Eolian_Class *cl)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
return cl->c_prefix;
}
-EAPI Eina_Stringshare*
+EAPI const char *
eolian_class_event_c_prefix_get(const Eolian_Class *cl)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
return cl->ev_prefix;
}
-EAPI Eina_Stringshare*
+EAPI const char *
eolian_class_data_type_get(const Eolian_Class *cl)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
diff --git a/src/lib/eolian/database_type_api.c
b/src/lib/eolian/database_type_api.c
index 675d5471d4..b5507fd504 100644
--- a/src/lib/eolian/database_type_api.c
+++ b/src/lib/eolian/database_type_api.c
@@ -148,7 +148,7 @@ eolian_typedecl_enum_field_value_get(const
Eolian_Enum_Type_Field *fl, Eina_Bool
return fl->value;
}
-EAPI Eina_Stringshare *
+EAPI const char *
eolian_typedecl_enum_legacy_prefix_get(const Eolian_Typedecl *tp)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(tp, NULL);
@@ -285,7 +285,7 @@ eolian_typedecl_c_type_get(const Eolian_Typedecl *tp)
return ret;
}
-EAPI Eina_Stringshare *
+EAPI
[EGIT] [core/efl] master 01/03: eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7e10d96d27c207a005e872a5d6ec786759dd83ea
commit 7e10d96d27c207a005e872a5d6ec786759dd83ea
Author: Daniel Kolesa
Date: Thu Sep 26 16:26:10 2019 +0200
eolian: move EOLIAN_TYPE_BUILTIN_HASH into beta section
---
src/bindings/luajit/eolian.lua | 26 +-
src/lib/eolian/Eolian.h| 4 ++--
src/lib/eolian/eo_lexer.c | 4 ++--
src/lib/eolian/eo_lexer.h | 3 ++-
src/lib/eolian/eo_parser.c | 2 +-
src/scripts/pyolian/eolian.py | 21 ++---
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 8671fc5c2a..1c2f6e38b4 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -157,7 +157,6 @@ ffi.cdef [[
EOLIAN_TYPE_BUILTIN_ARRAY,
EOLIAN_TYPE_BUILTIN_FUTURE,
EOLIAN_TYPE_BUILTIN_ITERATOR,
-EOLIAN_TYPE_BUILTIN_HASH,
EOLIAN_TYPE_BUILTIN_LIST,
EOLIAN_TYPE_BUILTIN_ANY_VALUE,
@@ -169,6 +168,7 @@ ffi.cdef [[
EOLIAN_TYPE_BUILTIN_STRINGSHARE,
EOLIAN_TYPE_BUILTIN_STRBUF,
+EOLIAN_TYPE_BUILTIN_HASH,
EOLIAN_TYPE_BUILTIN_VOID_PTR
} Eolian_Type_Builtin_Type;
@@ -932,18 +932,18 @@ M.type_builtin_type = {
ARRAY = 35,
FUTURE= 36,
ITERATOR = 37,
- HASH = 38,
- LIST = 39,
-
- ANY_VALUE = 40,
- ANY_VALUE_REF = 41,
- BINBUF= 42,
- EVENT = 43,
- MSTRING = 44,
- STRING= 45,
- STRINGSHARE = 46,
- STRBUF= 47,
-
+ LIST = 38,
+
+ ANY_VALUE = 39,
+ ANY_VALUE_REF = 40,
+ BINBUF= 41,
+ EVENT = 42,
+ MSTRING = 43,
+ STRING= 44,
+ STRINGSHARE = 45,
+ STRBUF= 46,
+
+ HASH = 47,
VOID_PTR = 48
}
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 33e571c491..311ea9016a 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -336,7 +336,6 @@ typedef enum
EOLIAN_TYPE_BUILTIN_ARRAY,
EOLIAN_TYPE_BUILTIN_FUTURE,
EOLIAN_TYPE_BUILTIN_ITERATOR,
- EOLIAN_TYPE_BUILTIN_HASH, /* FIXME: beta */
EOLIAN_TYPE_BUILTIN_LIST,
EOLIAN_TYPE_BUILTIN_ANY_VALUE,
@@ -348,7 +347,8 @@ typedef enum
EOLIAN_TYPE_BUILTIN_STRINGSHARE,
EOLIAN_TYPE_BUILTIN_STRBUF,
-#ifdef EOLIAN_BETA_API_SUPPORT
+#ifdef EFL_BETA_API_SUPPORT
+ EOLIAN_TYPE_BUILTIN_HASH,
EOLIAN_TYPE_BUILTIN_VOID_PTR
#endif
} Eolian_Type_Builtin_Type;
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 165c8340f2..ed165ee793 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -76,13 +76,13 @@ static const char * const ctypes[] =
"void",
"Eina_Accessor *", "Eina_Array *", "Eina_Future *", "Eina_Iterator *",
- "Eina_Hash *", "Eina_List *",
+ "Eina_List *",
"Eina_Value", "Eina_Value *", "Eina_Binbuf *", "Efl_Event *",
"char *", "const char *", "Eina_Stringshare *", "Eina_Strbuf *",
+ "Eina_Hash *",
"void *",
- "Eina_Free_Cb",
"function",
};
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 706acb028e..e7f61a7a21 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -59,10 +59,11 @@ enum Tokens
\
KW(void), \
\
-KW(accessor), KW(array), KW(future), KW(iterator), KW(hash), KW(list), \
+KW(accessor), KW(array), KW(future), KW(iterator), KW(list), \
KW(any_value), KW(any_value_ref), KW(binbuf), KW(event), \
KW(mstring), KW(string), KW(stringshare), KW(strbuf), \
\
+KW(hash), \
KW(void_ptr), \
KW(function), \
KW(__undefined_type), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 72f5ad2f27..a721e73b37 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -765,7 +765,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ptr,
Eina_Bool allow_const)
def->base.c_name = eina_stringshare_ref(def->base.name);
eo_lexer_get(ls);
if ((tpid >= KW_accessor && tpid <= KW_list) ||
- (tpid >= KW_slice && tpid <= KW_rw_slice))
+ (tpid >= KW_slice && tpid <= KW_rw_slice) || (tpid ==
KW_hash))
{
int bline = ls->line_number, bcol = ls->column;
check_next(ls, '<');
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 23ebd22c66..04d2dcb8a9 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -126,21 +126,20 @@ class Eolian_Type_Builtin_Type(IntEnum):
ARRAY = 35
FUTURE = 36
ITERATOR = 37
-HASH = 38
-LIST = 39
+LIST = 38
-ANY_VALUE = 40
-ANY_VALUE_REF = 41
-BINBUF = 42
-EVENT = 43
+ANY_VALUE = 39
+ANY_VALUE_REF = 40
+BINBUF = 41
+EVENT = 42
-
[EGIT] [core/efl] master 01/01: efl_ui/item_clickable: fix event info for press events
bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f5a4fd89d9935fd77afab7bad446477d101e35da
commit f5a4fd89d9935fd77afab7bad446477d101e35da
Author: Mike Blumenkrantz
Date: Thu Sep 26 10:15:24 2019 -0400
efl_ui/item_clickable: fix event info for press events
this is just a button and not the full clickable struct
Reviewed-by: Marcel Hollerbach
Differential Revision: https://phab.enlightenment.org/D10198
---
src/lib/elementary/efl_ui_collection.c | 18 ++---
src/lib/elementary/efl_ui_collection_view.c | 39 +++--
src/lib/elementary/efl_ui_item_clickable.eo | 12 ++---
3 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/src/lib/elementary/efl_ui_collection.c
b/src/lib/elementary/efl_ui_collection.c
index a281997974..6c3c5fe226 100644
--- a/src/lib/elementary/efl_ui_collection.c
+++ b/src/lib/elementary/efl_ui_collection.c
@@ -632,13 +632,25 @@ _redirect_cb(void *data, const Efl_Event *ev)
\
efl_event_callback_call(obj, Item_Desc, _clicked); \
}
+#define REDIRECT_EVT_PRESS(Desc, Item_Desc) \
+ if (Desc == ev->desc)\
+ { \
+Efl_Ui_Item_Clickable_Pressed item_pressed; \
+int *button = ev->info;\
+\
+item_pressed.button = *button;\
+item_pressed.item = ev->object; \
+\
+efl_event_callback_call(obj, Item_Desc, _pressed); \
+ }
- REDIRECT_EVT(EFL_INPUT_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
- REDIRECT_EVT(EFL_INPUT_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
- REDIRECT_EVT(EFL_INPUT_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED);
+ REDIRECT_EVT_PRESS(EFL_INPUT_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
+ REDIRECT_EVT_PRESS(EFL_INPUT_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
+ REDIRECT_EVT_PRESS(EFL_INPUT_EVENT_LONGPRESSED,
EFL_UI_EVENT_ITEM_LONGPRESSED);
REDIRECT_EVT(EFL_INPUT_EVENT_CLICKED_ANY, EFL_UI_EVENT_ITEM_CLICKED_ANY);
REDIRECT_EVT(EFL_INPUT_EVENT_CLICKED, EFL_UI_EVENT_ITEM_CLICKED);
#undef REDIRECT_EVT
+#undef REDIRECT_EVT_PRESS
}
EFL_CALLBACKS_ARRAY_DEFINE(active_item,
diff --git a/src/lib/elementary/efl_ui_collection_view.c
b/src/lib/elementary/efl_ui_collection_view.c
index 400e80e7be..8640bdae40 100644
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -183,23 +183,36 @@ _redirect_item_cb(void *data, const Efl_Event *ev)
{
Eo *obj = data;
-#define REDIRECT_EVT(Desc, Item_Desc) \
- if (Desc == ev->desc)\
- { \
-Efl_Ui_Item_Clickable_Clicked item_clicked; \
-Efl_Input_Clickable_Clicked *clicked = ev->info;\
-\
-item_clicked.clicked = *clicked;\
-item_clicked.item = ev->object; \
-\
-efl_event_callback_call(obj, Item_Desc, _clicked); \
+#define REDIRECT_EVT(Desc, Item_Desc) \
+ if (Desc == ev->desc)\
+ { \
+Efl_Ui_Item_Clickable_Clicked item_clicked; \
+Efl_Input_Clickable_Clicked *clicked = ev->info;\
+\
+item_clicked.clicked = *clicked;\
+item_clicked.item = ev->object; \
+\
+efl_event_callback_call(obj, Item_Desc, _clicked); \
}
- REDIRECT_EVT(EFL_INPUT_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
- REDIRECT_EVT(EFL_INPUT_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
- REDIRECT_EVT(EFL_INPUT_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED);
+#define REDIRECT_EVT_PRESS(Desc, Item_Desc) \
+ if (Desc == ev->desc)\
+ { \
+Efl_Ui_Item_Clickable_Pressed item_pressed; \
+int *button = ev->info;\
+\
+item_pressed.button = *button;\
+item_pressed.item = ev->object;
[EGIT] [core/efl] master 01/01: eolian: stricter checks for const() validity
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a95870286e45cc2c86736566b7d066feba8e56f8
commit a95870286e45cc2c86736566b7d066feba8e56f8
Author: Daniel Kolesa
Date: Thu Sep 26 15:58:17 2019 +0200
eolian: stricter checks for const() validity
---
src/lib/ecore/efl_loop.eo | 2 +-
src/lib/eolian/database_expr.c | 2 +-
src/lib/eolian/database_type.c | 7 ++--
src/lib/eolian/database_validate.c | 70 +-
src/lib/eolian/eo_parser.c | 36 +++-
src/lib/eolian/eolian_database.h | 2 +-
6 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 0f17c311da..4f800a63b7 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -3,7 +3,7 @@ struct Efl.Loop_Arguments {
@since 1.22
]]
- argv: const(array); [[Array with loop arguments]]
+ argv: const(array); [[Array with loop arguments]]
initialization: bool; [[Set to $true when the program should initialize its
internal state.
This happens once per process instance.]]
}
diff --git a/src/lib/eolian/database_expr.c b/src/lib/eolian/database_expr.c
index 978f281a8f..38794a2f3c 100644
--- a/src/lib/eolian/database_expr.c
+++ b/src/lib/eolian/database_expr.c
@@ -613,7 +613,7 @@ database_expr_eval_type(const Eolian_Unit *unit,
Eolian_Expression *expr,
return database_expr_eval(unit, expr, EOLIAN_MASK_NULL, cb, data);
case EOLIAN_TYPE_REGULAR:
{
- if (database_type_is_ownable(unit, type, EINA_FALSE))
+ if (database_type_is_ownable(unit, type, EINA_FALSE, NULL))
return database_expr_eval(unit, expr, EOLIAN_MASK_NULL, cb,
data);
int kw = eo_lexer_keyword_str_to_id(type->base.name);
if (!kw || kw < KW_byte || kw >= KW_void)
diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c
index 52973fb453..53d531cc54 100644
--- a/src/lib/eolian/database_type.c
+++ b/src/lib/eolian/database_type.c
@@ -63,8 +63,9 @@ database_enum_add(Eolian_Unit *unit, Eolian_Typedecl *tp)
}
Eina_Bool
-database_type_is_ownable(const Eolian_Unit *unit, const Eolian_Type *tp,
Eina_Bool allow_void)
+database_type_is_ownable(const Eolian_Unit *unit, const Eolian_Type *tp,
Eina_Bool allow_void, const Eolian_Type **otp)
{
+ if (otp) *otp = tp;
if (tp->is_ptr)
return EINA_TRUE;
if (tp->type == EOLIAN_TYPE_REGULAR)
@@ -79,7 +80,7 @@ database_type_is_ownable(const Eolian_Unit *unit, const
Eolian_Type *tp, Eina_Bo
if (tpp->type == EOLIAN_TYPEDECL_FUNCTION_POINTER)
return EINA_TRUE;
if (tpp->type == EOLIAN_TYPEDECL_ALIAS)
- return database_type_is_ownable(unit, tpp->base_type,
allow_void);
+ return database_type_is_ownable(unit, tpp->base_type,
allow_void, otp);
return EINA_FALSE;
}
return (ct[strlen(ct) - 1] == '*');
@@ -107,7 +108,7 @@ database_type_to_str(const Eolian_Type *tp,
|| tp->type == EOLIAN_TYPE_CLASS
|| tp->type == EOLIAN_TYPE_VOID)
&& tp->is_const
- && ((ctype != EOLIAN_C_TYPE_RETURN) || by_ref ||
database_type_is_ownable(NULL, tp, EINA_FALSE)))
+ && ((ctype != EOLIAN_C_TYPE_RETURN) || by_ref ||
database_type_is_ownable(NULL, tp, EINA_FALSE, NULL)))
{
eina_strbuf_append(buf, "const ");
}
diff --git a/src/lib/eolian/database_validate.c
b/src/lib/eolian/database_validate.c
index 87d51ac2e1..b80d418a3e 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -103,9 +103,11 @@ _validate_doc(Eolian_Documentation *doc)
return _validate(>base);
}
-static Eina_Bool _validate_type(Validate_State *vals, Eolian_Type *tp);
+static Eina_Bool _validate_type(Validate_State *vals, Eolian_Type *tp,
+Eina_Bool by_ref, Eina_Bool is_ret);
static Eina_Bool _validate_type_by_ref(Validate_State *vals, Eolian_Type *tp,
- Eina_Bool by_ref, Eina_Bool move);
+ Eina_Bool by_ref, Eina_Bool move,
+ Eina_Bool is_ret);
static Eina_Bool _validate_expr(Eolian_Expression *expr,
const Eolian_Type *tp,
Eolian_Expression_Mask msk,
@@ -124,7 +126,8 @@ static Eina_Bool
_sf_map_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED,
const Eolian_Struct_Type_Field *sf, Cb_Ret *sc)
{
- sc->succ = _validate_type_by_ref(sc->vals, sf->type, sf->by_ref, sf->move);
+ sc->succ = _validate_type_by_ref(sc->vals, sf->type, sf->by_ref,
+sf->move, EINA_FALSE);
if (!sc->succ)
return EINA_FALSE;
@@ -166,7 +169,7 @@ _validate_typedecl(Validate_State *vals,
Re: [E-devel] the efl do not compile on Windows
The C++ bindings seems to be enabled now by default. When disabling them, EFL will buil. I noticed the build breaks on FreeBSD. Unfortunately I have no time to be able assist anymore than this. On Thu, Sep 26, 2019 at 2:22 PM Vincent Torri wrote: > hello > > today, before going to work, i quickly launched a compilation of the > git cloned yesterday and there was a compilation failure related to > c++. I'll launch a new compilation in a few hours at home and tell you > what the problem is > > Vincent > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/03: efl_ui_win: add validation check to return legacy default value
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ddb28ccdf1ff077a5e2bed0c37f515d6e0f13623
commit ddb28ccdf1ff077a5e2bed0c37f515d6e0f13623
Author: WooHyun Jung
Date: Thu Sep 26 08:59:28 2019 -0400
efl_ui_win: add validation check to return legacy default value
Summary:
elm_win_type_get needs to return ELM_WIN_UNKNOWN when
invalid object comes.
Reviewers: zmike, bu5hm4n, segfaultxavi
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10187
---
src/lib/elementary/efl_ui_win.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 72a9239a26..2461e1e9e6 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -9392,6 +9392,10 @@ elm_win_name_get(const Evas_Object *obj)
EAPI Elm_Win_Type
elm_win_type_get(const Evas_Object *obj)
{
+ if (!(efl_isa(obj, EFL_UI_WIN_CLASS) ||
+ efl_isa(obj, EFL_UI_WIN_LEGACY_CLASS) ||
+ efl_isa(obj, EFL_UI_WIN_INLINED_CLASS))) return ELM_WIN_UNKNOWN;
+
return _efl_ui_win_type_to_elm_win_type(efl_ui_win_type_get(obj));
}
--
[EGIT] [core/efl] master 02/03: edje_legacy: add validation check to return legacy default value
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3bdd50e4126757632d9a651fa7ecc8e035c79b63
commit 3bdd50e4126757632d9a651fa7ecc8e035c79b63
Author: WooHyun Jung
Date: Thu Sep 26 08:59:31 2019 -0400
edje_legacy: add validation check to return legacy default value
Summary:
When invalid object comes, the return value should be
EINA_FALSE.
Reviewers: zmike, bu5hm4n, segfaultxavi
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10185
---
src/lib/edje/edje_legacy.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index a93ed061a6..a72b951058 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1208,6 +1208,7 @@ edje_object_play_set(Evas_Object *obj, Eina_Bool play)
EAPI Eina_Bool
edje_object_play_get(const Evas_Object *obj)
{
+ if (!efl_isa(obj, EFL_CANVAS_LAYOUT_CLASS)) return EINA_FALSE;
return !efl_player_paused_get(obj);
}
--
[EGIT] [core/efl] master 03/03: efl_ui_image: fix a wrong return value of legacy API
zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=23bbf2bf3ae7c45d08e02ba23e0ced69c99f65c6
commit 23bbf2bf3ae7c45d08e02ba23e0ced69c99f65c6
Author: WooHyun Jung
Date: Thu Sep 26 09:00:09 2019 -0400
efl_ui_image: fix a wrong return value of legacy API
Summary:
elm_image_animated_play_get needs to return opposite
value of animated_PAUSED_get.
Reviewers: zmike, segfaultxavi, bu5hm4n
Reviewed By: zmike, segfaultxavi
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10186
---
src/lib/elementary/efl_ui_image.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/efl_ui_image.c
b/src/lib/elementary/efl_ui_image.c
index f732d44add..64c81247b8 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1911,7 +1911,7 @@ elm_image_animated_play_get(const Elm_Image *obj)
{
Efl_Ui_Image_Data *sd = efl_data_scope_get(obj, MY_CLASS);
if (!sd) return EINA_FALSE;
- return _efl_ui_image_animated_paused_get_internal(obj, sd);
+ return !_efl_ui_image_animated_paused_get_internal(obj, sd);
}
EOLIAN static Eina_Bool
--
[E-devel] the efl do not compile on Windows
hello today, before going to work, i quickly launched a compilation of the git cloned yesterday and there was a compilation failure related to c++. I'll launch a new compilation in a few hours at home and tell you what the problem is Vincent ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: efl: mark selectable stable
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8197fee189457aba01ae35dea5451731be003065
commit 8197fee189457aba01ae35dea5451731be003065
Author: Marcel Hollerbach
Date: Thu Sep 26 12:49:20 2019 +0200
efl: mark selectable stable
Summary:
fixes T7871
fixes T7852
This also works arround a eolian issue where composites do not mark the
inherited API from the composites as implemented.
Reviewers: SanghyeonLee, cedric, segfaultxavi, zmike
Reviewed By: segfaultxavi
Subscribers: SanghyeonLee, cedric
Tags: #efl
Maniphest Tasks: T7871, T7852
Differential Revision: https://phab.enlightenment.org/D10184
---
src/lib/elementary/efl_ui_collection_view.eo | 4 +---
src/lib/elementary/efl_ui_selectable.eo| 2 +-
src/lib/elementary/efl_ui_single_selectable.eo | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/lib/elementary/efl_ui_collection_view.eo
b/src/lib/elementary/efl_ui_collection_view.eo
index 9278cd04c7..4bbbf97922 100644
--- a/src/lib/elementary/efl_ui_collection_view.eo
+++ b/src/lib/elementary/efl_ui_collection_view.eo
@@ -1,11 +1,9 @@
class Efl.Ui.Collection_View extends Efl.Ui.Layout_Base implements
Efl.Ui.Layout_Orientable,
-Efl.Ui.Selectable,
-Efl.Ui.Multi_Selectable_Async,
Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget_Focus_Manager,
Efl.Ui.Item_Clickable
-composites Efl.Ui.Scrollable, Efl.Ui.Scrollbar,
Efl.Ui.Multi_Selectable_Async
+composites Efl.Ui.Scrollable, Efl.Ui.Scrollbar,
Efl.Ui.Multi_Selectable_Async, Efl.Ui.Single_Selectable
{
[[This widget displays a list of items in an arrangement controlled by an
external @.position_manager
object. By using different @.position_manager objects this widget can
show unidimensional lists or
diff --git a/src/lib/elementary/efl_ui_selectable.eo
b/src/lib/elementary/efl_ui_selectable.eo
index 553d12e90a..fe9468e594 100644
--- a/src/lib/elementary/efl_ui_selectable.eo
+++ b/src/lib/elementary/efl_ui_selectable.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Ui.Selectable {
+interface Efl.Ui.Selectable {
[[Selectable interface for UI objects
An object implementing this interface can be selected.
diff --git a/src/lib/elementary/efl_ui_single_selectable.eo
b/src/lib/elementary/efl_ui_single_selectable.eo
index 457bf6cc5d..9d96d607d0 100644
--- a/src/lib/elementary/efl_ui_single_selectable.eo
+++ b/src/lib/elementary/efl_ui_single_selectable.eo
@@ -1,4 +1,4 @@
-interface @beta Efl.Ui.Single_Selectable {
+interface Efl.Ui.Single_Selectable {
[[Interface for getting access to a single selected item in the implementor.
The implementor is free to allow a specific number of selectables being
selected or not.
--
[EGIT] [core/efl] master 01/01: efl_ui_*selectable: unify these APIs with the same c_prefix
sanghyeonlee pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1df17abba575f70b1f26fb50b972a1c8f37d2d27
commit 1df17abba575f70b1f26fb50b972a1c8f37d2d27
Author: Marcel Hollerbach
Date: Thu Sep 26 18:16:24 2019 +0900
efl_ui_*selectable: unify these APIs with the same c_prefix
Summary:
with this commit that api for single and multi selectable shares the
same prefix, which makes sense in c as we do not really differ between
those two types there anyway.
ref T7871
Reviewers: SanghyeonLee, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7871
Differential Revision: https://phab.enlightenment.org/D10183
---
src/bin/elementary/test_part_bg.c | 6 +-
src/bin/elementary/test_ui_collection.c| 6 +-
src/bin/elementary/test_ui_collection_view.c | 4 +-
src/bin/elementary/test_ui_radio.c | 6 +-
src/examples/elementary/efl_ui_list_example_1.c| 8 +-
.../elementary/efl_ui_list_view_example_3.c| 4 +-
src/lib/elementary/efl_ui_collection.c | 4 +-
src/lib/elementary/efl_ui_collection_view.c| 6 +-
src/lib/elementary/efl_ui_item.c | 4 +-
src/lib/elementary/efl_ui_multi_selectable.eo | 2 +-
src/lib/elementary/efl_ui_radio_box.c | 2 +-
src/lib/elementary/efl_ui_radio_group_impl.c | 2 +-
src/lib/elementary/efl_ui_select_model.c | 2 +-
src/lib/elementary/efl_ui_single_selectable.eo | 1 +
src/lib/elementary/efl_ui_tab_bar.c| 2 +-
src/lib/elementary/efl_ui_tab_pager.c | 2 +-
src/tests/elementary/efl_ui_test_radio_group.c | 28 +++
.../elementary/spec/efl_test_multi_selectable.c| 98 +++---
.../elementary/spec/efl_test_single_selectable.c | 14 ++--
19 files changed, 101 insertions(+), 100 deletions(-)
diff --git a/src/bin/elementary/test_part_bg.c
b/src/bin/elementary/test_part_bg.c
index da50aae206..3f3c9db14a 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -15,7 +15,7 @@ _reset_cb(void *data, const Efl_Event *ev EINA_UNUSED)
Efl_Ui_Radio_Group *radio = data;
Evas_Object *target;
- radio = efl_ui_single_selectable_last_selected_get(radio);
+ radio = efl_ui_selectable_last_selected_get(radio);
target = evas_object_data_get(radio, "data");
efl_gfx_color_set(efl_part(target, "background"), 0, 0, 0, 0);
@@ -29,7 +29,7 @@ _color_cb(void *data, const Efl_Event *ev EINA_UNUSED)
Evas_Object *target;
static Eina_Bool i;
- radio = efl_ui_single_selectable_last_selected_get(radio);
+ radio = efl_ui_selectable_last_selected_get(radio);
target = evas_object_data_get(radio, "data");
i ^= EINA_TRUE;
efl_gfx_color_set(efl_part(target, "background"), (i) ? 255 : 0, (i) ? 0 :
255, 0, 255);
@@ -43,7 +43,7 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
Efl_Gfx_Image_Scale_Method type;
char buf[PATH_MAX];
- radio = efl_ui_single_selectable_last_selected_get(radio);
+ radio = efl_ui_selectable_last_selected_get(radio);
target = evas_object_data_get(radio, "data");
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg",
elm_app_data_dir_get());
diff --git a/src/bin/elementary/test_ui_collection.c
b/src/bin/elementary/test_ui_collection.c
index f407a6988a..3d1b34e3cd 100644
--- a/src/bin/elementary/test_ui_collection.c
+++ b/src/bin/elementary/test_ui_collection.c
@@ -7,13 +7,13 @@
static void
_all_select(void *data, const Efl_Event *ev EINA_UNUSED)
{
- efl_ui_all_select(data);
+ efl_ui_selectable_all_select(data);
}
static void
_all_unselect(void *data, const Efl_Event *ev EINA_UNUSED)
{
- efl_ui_all_unselect(data);
+ efl_ui_selectable_all_unselect(data);
}
static void
@@ -167,7 +167,7 @@ _select_value_cb(void *data, const Efl_Event *ev)
{
Efl_Ui_Collection *c = data;
- efl_ui_select_mode_set(c,
efl_ui_radio_group_selected_value_get(ev->object));
+ efl_ui_selectable_select_mode_set(c,
efl_ui_radio_group_selected_value_get(ev->object));
}
void create_item_container_ui(const Efl_Class *collection_class, const
Efl_Class *item, const char *name)
diff --git a/src/bin/elementary/test_ui_collection_view.c
b/src/bin/elementary/test_ui_collection_view.c
index 4a3f2f7b7c..ba34d320b5 100644
--- a/src/bin/elementary/test_ui_collection_view.c
+++ b/src/bin/elementary/test_ui_collection_view.c
@@ -46,7 +46,7 @@ _item_constructing(void *data EINA_UNUSED, const Efl_Event
*ev)
static void
_item_select(void *data, const Efl_Event *ev)
{
- Efl_Ui_Widget *w = efl_ui_single_selectable_last_selected_get(ev->object);
+ Efl_Ui_Widget *w = efl_ui_selectable_last_selected_get(ev->object);
Efl_Model *m = efl_ui_view_model_get(w);
if (m) efl_ui_view_model_set(data,
[EGIT] [core/efl] master 01/01: efl_ui : add document comment on efl_ui_item_clickable event data
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a4f5da0fb22a0dbc688abe32d87dabd15a72e560
commit a4f5da0fb22a0dbc688abe32d87dabd15a72e560
Author: SangHyeon Jade Lee
Date: Thu Sep 26 10:38:37 2019 +0200
efl_ui : add document comment on efl_ui_item_clickable event data
Summary: Add document comment on Efl_Ui_Item_Clickable.Clickable_Clicked.
Reviewers: cedric, zmike, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10181
---
src/lib/elementary/efl_ui_item_clickable.eo | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/lib/elementary/efl_ui_item_clickable.eo
b/src/lib/elementary/efl_ui_item_clickable.eo
index 5f92a5fbce..a8bc7ea15b 100644
--- a/src/lib/elementary/efl_ui_item_clickable.eo
+++ b/src/lib/elementary/efl_ui_item_clickable.eo
@@ -1,8 +1,9 @@
import efl_input_clickable;
struct Efl.Ui.Item_Clickable_Clicked {
- clicked: Efl.Input.Clickable_Clicked;
- item: Efl.Ui.Item;
+ [[A struct that expresses a click in item of container widget.]]
+ clicked: Efl.Input.Clickable_Clicked; [[The input clicked event data.]]
+ item: Efl.Ui.Item; [[The clicked item.]]
}
interface Efl.Ui.Item_Clickable
@@ -10,10 +11,10 @@ interface Efl.Ui.Item_Clickable
[[Shared sets of events between @Efl.Ui.Collection and
@Efl.Ui.Collection_View.]]
event_prefix: efl_ui;
events {
- item,pressed : Efl.Ui.Item_Clickable_Clicked; [[A $press event occurred
over an item.]]
- item,unpressed : Efl.Ui.Item_Clickable_Clicked; [[An $unpress event
occurred over an item.]]
+ item,pressed : Efl.Ui.Item_Clickable_Clicked; [[A $pressed event
occurred over an item.]]
+ item,unpressed : Efl.Ui.Item_Clickable_Clicked; [[An $unpressed event
occurred over an item.]]
item,longpressed : Efl.Ui.Item_Clickable_Clicked; [[A $longpressed event
occurred over an item.]]
item,clicked : Efl.Ui.Item_Clickable_Clicked; [[A $clicked event
occurred over an item.]]
- item,clicked,any : Efl.Ui.Item_Clickable_Clicked; [[A $clicked,any event
occurred over an item.]]
+ item,clicked,any : Efl.Ui.Item_Clickable_Clicked; [[A $[clicked,any]
event occurred over an item.]]
}
-}
\ No newline at end of file
+}
--
