[EGIT] [core/efl] master 01/01: ecore-evas-wayland-egl: Add support for custom Ecore_Wl animator
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bce8a822682ca73358e7a351a14f41d74acf9cb7
commit bce8a822682ca73358e7a351a14f41d74acf9cb7
Author: Chris Michael
Date: Mon Oct 5 13:53:36 2015 -0400
ecore-evas-wayland-egl: Add support for custom Ecore_Wl animator
Summary: This adds support for ecore_wl to handle ecore animators and
thus the egl engine can receive frame callbacks now.
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 7afdcd6..2414e2f 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -192,7 +192,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name,
unsigned int parent,
/* NB: Disabled for right now as it causes textgrid (terminology)
* to not draw text anymore */
/* if (getenv("ECORE_EVAS_FORCE_SYNC_RENDER")) */
- /* ee->can_async_render = 0; */
+ ee->can_async_render = 0;
/* else */
/* ee->can_async_render = 1; */
@@ -250,6 +250,8 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name,
unsigned int parent,
goto err;
}
+ ecore_wl_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM);
+
ecore_evas_callback_pre_free_set(ee, _ecore_evas_wl_common_pre_free);
if (ee->prop.draw_frame)
--
[EGIT] [core/efl] master 01/01: ecore-wayland: Don't use custom animator when in server mode
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=571c67c6a574de664ff811f3d6e9ddace9474e9c
commit 571c67c6a574de664ff811f3d6e9ddace9474e9c
Author: Chris Michael
Date: Mon Oct 5 16:11:52 2015 -0400
ecore-wayland: Don't use custom animator when in server mode
Signed-off-by: Chris Michael
Reviewed-by: @zmike
necessary to avoid breaking the compositor canvas animator
---
src/lib/ecore_wayland/ecore_wl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index b9ad854..d777fb3 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -447,6 +447,8 @@ ecore_wl_animator_source_set(Ecore_Animator_Source source)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ if (_ecore_wl_server_mode) return EINA_FALSE;
+
/* FIXME: check existing source. If custom, disable anim_callbacks */
/* based on the animator source we are using, setup or destroy callbacks */
--
[EGIT] [core/efl] master 01/01: ecore-evas-gl-drm: Disable async rendering for EGL
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=49442d56153680a01c6f3d0944b2086c369449c7
commit 49442d56153680a01c6f3d0944b2086c369449c7
Author: Chris Michael
Date: Tue Oct 6 09:39:36 2015 -0400
ecore-evas-gl-drm: Disable async rendering for EGL
Summary: Disable async rendering for EGL engine as EGL is sync only.
This fixes gl_drm engine to work (in my tests) using ecore_evas
example apps.
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 60be68e..21d706c 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -419,9 +419,10 @@ ecore_evas_gl_drm_new_internal(const char *device,
unsigned int parent EINA_UNUS
ee->prop.withdrawn = EINA_TRUE;
ee->alpha = EINA_FALSE;
- ee->can_async_render = 1;
- if (getenv("ECORE_EVAS_FORCE_SYNC_RENDER"))
- ee->can_async_render = 0;
+ /* NB: Disable async rendering for egl. Not Applicable as EGL is sync only
*/
+ ee->can_async_render = 0;
+ /* if (getenv("ECORE_EVAS_FORCE_SYNC_RENDER")) */
+ /* ee->can_async_render = 0; */
/* try to initialize evas */
ee->evas = evas_new();
--
[EGIT] [core/efl] master 01/01: evas-wayland-shm: Fix to add support for MERGE_MODE Smart
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bf1eef174bb596cbab291f823c9f3644e1dc4bb3
commit bf1eef174bb596cbab291f823c9f3644e1dc4bb3
Author: Chris Michael
Date: Wed Oct 7 11:00:46 2015 -0400
evas-wayland-shm: Fix to add support for MERGE_MODE Smart
Summary: Seems we were never setting any merge_mode for the
wayland-shm engine. This fix implements setting merge_mode
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_shm/evas_engine.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c
b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 66913b8..de4ea9e 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -27,6 +27,8 @@ _render_engine_swapbuf_setup(int w, int h, unsigned int
rotation, unsigned int d
{
Render_Engine *re;
Outbuf *ob;
+ Render_Engine_Merge_Mode merge_mode = MERGE_SMART;
+ const char *s;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -52,6 +54,19 @@ _render_engine_swapbuf_setup(int w, int h, unsigned int
rotation, unsigned int d
re->outbuf_reconfigure = _evas_outbuf_reconfigure;
+ s = getenv("EVAS_WAYLAND_PARTIAL_MERGE");
+ if (s)
+ {
+if ((!strcmp(s, "bounding")) || (!strcmp(s, "b")))
+ merge_mode = MERGE_BOUNDING;
+else if ((!strcmp(s, "full")) || (!strcmp(s, "f")))
+ merge_mode = MERGE_FULL;
+else if ((!strcmp(s, "smart")) || (!strcmp(s, "s")))
+ merge_mode = MERGE_SMART;
+ }
+
+ evas_render_engine_software_generic_merge_mode_set(&re->generic,
merge_mode);
+
/* return allocated render engine */
return re;
--
[EGIT] [core/efl] master 01/02: evas-wayland-shm: Don't leak rectangles during flush
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dd8ec36962e5407c0f1dd0ef1ed4a8d521c0534a
commit dd8ec36962e5407c0f1dd0ef1ed4a8d521c0534a
Author: Chris Michael
Date: Thu Oct 8 13:35:07 2015 -0400
evas-wayland-shm: Don't leak rectangles during flush
Summary: As we loop the regions of the output buffer and accumulate
changes to post, we should be freeing the rectangles when we are done
with them.
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_shm/evas_outbuf.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 484da13..89c0474 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -160,7 +160,10 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects
EINA_UNUSED, Evas_Render_Mode
/* loop the buffer regions and assign to result */
EINA_ARRAY_ITER_NEXT(&ob->priv.onebuf_regions, i, rect, it)
- result[i] = *rect;
+ {
+ result[i] = *rect;
+ evas_rectangle_free(rect);
+ }
_evas_shm_surface_post(ob->surface, result, n);
--
[EGIT] [core/efl] master 02/02: ecore-evas-wayland-shm: Check for fullscreen and override windows when processing updates
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=295bfd7df6498462389fe1c20ac6e0cfcec1944c
commit 295bfd7df6498462389fe1c20ac6e0cfcec1944c
Author: Chris Michael
Date: Thu Oct 8 13:37:30 2015 -0400
ecore-evas-wayland-shm: Check for fullscreen and override windows when
processing updates
Summary: When processing render updates, we should be checking if the
Ecore_Evas "should be visible" property is set.
@fix
Signed-off-by: Chris Michael
---
.../engines/wayland/ecore_evas_wayland_common.c| 24 --
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 3495a22..9b3eccb 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -58,23 +58,15 @@ _ecore_evas_wl_common_render_updates_process(Ecore_Evas
*ee, Eina_List *updates)
{
int rend = 0;
- if ((ee->visible) && (updates))
+ if (((ee->visible) && (ee->draw_ok)) ||
+ ((ee->should_be_visible) && (ee->prop.fullscreen)) ||
+ ((ee->should_be_visible) && (ee->prop.override)))
{
-/* Eina_List *l = NULL; */
-/* Eina_Rectangle *r; */
-/* Ecore_Evas_Engine_Wl_Data *wdata; */
-
-/* if (!(wdata = ee->engine.data)) return 0; */
-
-/* EINA_LIST_FOREACH(updates, l, r) */
-/* ecore_wl_window_damage(wdata->win, */
-/* r->x, r->y, r->w, r->h); */
-
-/* ecore_wl_window_commit(wdata->win); */
-/* ecore_wl_flush(); */
-
-_ecore_evas_idle_timeout_update(ee);
-rend = 1;
+if (updates)
+ {
+ _ecore_evas_idle_timeout_update(ee);
+ rend = 1;
+ }
}
else
evas_norender(ee->evas);
--
[EGIT] [core/efl] master 01/01: evas-wayland-shm: Fix silly typo
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=37718b2cf65f230514f54e69e21d11dc72eea068
commit 37718b2cf65f230514f54e69e21d11dc72eea068
Author: Chris Michael
Date: Thu Oct 8 15:15:00 2015 -0400
evas-wayland-shm: Fix silly typo
Summary: OOpppss, this should be eina_rectangle_free
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_shm/evas_outbuf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 89c0474..59f1a35 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -162,7 +162,7 @@ _evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects
EINA_UNUSED, Evas_Render_Mode
EINA_ARRAY_ITER_NEXT(&ob->priv.onebuf_regions, i, rect, it)
{
result[i] = *rect;
- evas_rectangle_free(rect);
+ eina_rectangle_free(rect);
}
_evas_shm_surface_post(ob->surface, result, n);
--
[EGIT] [core/enlightenment] master 01/01: enlightenment: Update wayland readme
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fe1eabe4ad93dd34ad49382e53090c13c353ec6c commit fe1eabe4ad93dd34ad49382e53090c13c353ec6c Author: Chris Michael Date: Thu Oct 8 15:28:55 2015 -0400 enlightenment: Update wayland readme Signed-off-by: Chris Michael --- README.wayland | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.wayland b/README.wayland index 863241a..53e9ee7 100644 --- a/README.wayland +++ b/README.wayland @@ -83,8 +83,6 @@ Known Issues - Requires new EFL release * Nested compositors (wl_wl output) cannot create internal windows - Requires new EFL release -* DRM output lacks hardware acceleration - - Requires new EFL release * Window close animations will not play for most Wayland clients - Requires upstream Wayland protocol additions * Window closing occasionally leads to crash --
[EGIT] [core/efl] master 01/01: ecore-evas-wayland: Set ee->draw_ok appropriately based on visibility
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=210c6b9b7cb0d938a3734e635edfdfc4de472003 commit 210c6b9b7cb0d938a3734e635edfdfc4de472003 Author: Chris Michael Date: Thu Oct 8 16:04:50 2015 -0400 ecore-evas-wayland: Set ee->draw_ok appropriately based on visibility Summary: A previous code change to the common code which processes updates is relying on having the ecore_evas->draw_ok flag set in order to process updates. This change makes sure that ee->draw_ok is in sync with canvas visibility. @fix Signed-off-by: Chris Michael --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 3 +++ src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 2414e2f..1ba7542 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -362,6 +362,8 @@ _ecore_evas_wl_show(Ecore_Evas *ee) if (ee->visible) return; ee->visible = 1; + ee->should_be_visible = 1; + ee->draw_ok = EINA_TRUE; if (ee->func.fn_show) ee->func.fn_show(ee); } @@ -397,6 +399,7 @@ _ecore_evas_wl_hide(Ecore_Evas *ee) if (!ee->visible) return; ee->visible = 0; ee->should_be_visible = 0; + ee->draw_ok = EINA_FALSE; if (ee->func.fn_hide) ee->func.fn_hide(ee); } diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index d9b2894..bf3f5fb 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -357,6 +357,8 @@ _ecore_evas_wl_show(Ecore_Evas *ee) if (ee->visible) return; ee->visible = 1; + ee->should_be_visible = 1; + ee->draw_ok = EINA_TRUE; if (ee->func.fn_show) ee->func.fn_show(ee); } @@ -392,6 +394,7 @@ _ecore_evas_wl_hide(Ecore_Evas *ee) if (!ee->visible) return; ee->visible = 0; ee->should_be_visible = 0; + ee->draw_ok = EINA_FALSE; if (ee->func.fn_hide) ee->func.fn_hide(ee); } --
[EGIT] [core/efl] master 02/02: ecore-wayland: Comment out unused functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2a2a7e54b9e6e7a8be29ea95255b8ba960cd4b85
commit 2a2a7e54b9e6e7a8be29ea95255b8ba960cd4b85
Author: Chris Michael
Date: Fri Oct 9 08:55:26 2015 -0400
ecore-wayland: Comment out unused functions
Summary: As we do not listen for surface enter/leave events, we do not
need these functions so comment them out.
Thanks to Tom for the report :)
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_window.c | 30 --
1 file changed, 30 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 1c97b45..d934e63 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -10,8 +10,6 @@
static void _ecore_wl_window_cb_ping(void *data EINA_UNUSED, struct
wl_shell_surface *shell_surface, unsigned int serial);
static void _ecore_wl_window_cb_configure(void *data, struct wl_shell_surface
*shell_surface EINA_UNUSED, unsigned int edges, int w, int h);
static void _ecore_wl_window_cb_popup_done(void *data, struct wl_shell_surface
*shell_surface EINA_UNUSED);
-static void _ecore_wl_window_cb_surface_enter(void *data, struct wl_surface
*surface, struct wl_output *output EINA_UNUSED);
-static void _ecore_wl_window_cb_surface_leave(void *data, struct wl_surface
*surface, struct wl_output *output EINA_UNUSED);
static void _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int
h, int edges);
static char *_ecore_wl_window_id_str_get(unsigned int win_id);
static void _ecore_xdg_handle_surface_configure(void *data, struct xdg_surface
*xdg_surface, int32_t width, int32_t height,struct wl_array *states, uint32_t
serial);
@@ -23,12 +21,6 @@ static void _ecore_session_recovery_uuid(void *data, struct
session_recovery *se
static Eina_Hash *_windows = NULL;
/* wayland listeners */
-static const struct wl_surface_listener _ecore_wl_surface_listener =
-{
- _ecore_wl_window_cb_surface_enter,
- _ecore_wl_window_cb_surface_leave
-};
-
static const struct wl_shell_surface_listener _ecore_wl_shell_surface_listener
=
{
_ecore_wl_window_cb_ping,
@@ -1081,28 +1073,6 @@ _ecore_session_recovery_uuid(void *data EINA_UNUSED,
struct session_recovery *se
}
static void
-_ecore_wl_window_cb_surface_enter(void *data, struct wl_surface *surface,
struct wl_output *output EINA_UNUSED)
-{
- Ecore_Wl_Window *win;
-
- LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
- if (!surface) return;
- if (!(win = data)) return;
-}
-
-static void
-_ecore_wl_window_cb_surface_leave(void *data, struct wl_surface *surface,
struct wl_output *output EINA_UNUSED)
-{
- Ecore_Wl_Window *win;
-
- LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
- if (!surface) return;
- if (!(win = data)) return;
-}
-
-static void
_ecore_wl_window_configure_send(Ecore_Wl_Window *win, int w, int h, int edges)
{
Ecore_Wl_Event_Window_Configure *ev;
--
[EGIT] [core/efl] master 01/02: ecore-wayland: Comment out unused functions for session listener
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ff9703efc3f437144a59c92e8e275a53847559e2
commit ff9703efc3f437144a59c92e8e275a53847559e2
Author: Chris Michael
Date: Fri Oct 9 08:54:41 2015 -0400
ecore-wayland: Comment out unused functions for session listener
Summary: As session listener is currently disabled in Ecore_Wayland,
we don't need these functions defined so comment them out.
Thanks to Tom for the report :)
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index d777fb3..5d1e0e0 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -77,16 +77,16 @@ static const struct xdg_shell_listener xdg_shell_listener =
xdg_shell_ping,
};
-static void
-_ecore_wl_uuid_receive(void *data EINA_UNUSED, struct session_recovery
*session_recovery EINA_UNUSED, const char *uuid)
-{
- DBG("UUID assigned from compositor: %s", uuid);
-}
-
-static const struct session_recovery_listener
_ecore_wl_session_recovery_listener =
-{
- _ecore_wl_uuid_receive,
-};
+/* static void */
+/* _ecore_wl_uuid_receive(void *data EINA_UNUSED, struct session_recovery
*session_recovery EINA_UNUSED, const char *uuid) */
+/* { */
+/*DBG("UUID assigned from compositor: %s", uuid); */
+/* } */
+
+/* static const struct session_recovery_listener
_ecore_wl_session_recovery_listener = */
+/* { */
+/*_ecore_wl_uuid_receive, */
+/* }; */
/* external variables */
int _ecore_wl_log_dom = -1;
--
[EGIT] [core/efl] master 02/03: ecore-evas-wayland: Don't resize ecore_wl window to include frame size
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6b943ffa7079d0e24a1287224e5aec99037cd62a
commit 6b943ffa7079d0e24a1287224e5aec99037cd62a
Author: Chris Michael
Date: Mon Oct 12 10:58:00 2015 -0400
ecore-evas-wayland: Don't resize ecore_wl window to include frame size
Summary: ecore_wl_window_resize adjusts the internal representation of
the window size so this should not include the "framespace" also. This
fixes an issue where xdg surface would be getting an incorrect window
geometry which included framespace.
@fix
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 9 ++---
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 9 ++---
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 1ba7542..71c7e02 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -334,7 +334,6 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
{
ecore_wl_window_show(wdata->win);
ecore_wl_window_alpha_set(wdata->win, ee->alpha);
-ecore_wl_window_update_size(wdata->win, ee->w + fw, ee->h + fh);
einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
if (einfo)
@@ -496,16 +495,12 @@ _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int
location)
wdata = ee->engine.data;
if (wdata->win)
{
-int fw, fh;
-
_ecore_evas_wayland_egl_resize_edge_set(ee, location);
-evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
-
if (ECORE_EVAS_PORTRAIT(ee))
- ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
+ ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
else
- ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
+ ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
}
}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index bf3f5fb..19940ca 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -329,7 +329,6 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
{
ecore_wl_window_show(wdata->win);
ecore_wl_window_alpha_set(wdata->win, ee->alpha);
-ecore_wl_window_update_size(wdata->win, ee->w + fw, ee->h + fh);
einfo = (Evas_Engine_Info_Wayland_Shm *)evas_engine_info_get(ee->evas);
if (einfo)
@@ -489,16 +488,12 @@ _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int
location)
wdata = ee->engine.data;
if (wdata->win)
{
-int fw, fh;
-
_ecore_evas_wayland_shm_resize_edge_set(ee, location);
-evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
-
if (ECORE_EVAS_PORTRAIT(ee))
- ecore_wl_window_resize(wdata->win, ee->w + fw, ee->h + fh, location);
+ ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
else
- ecore_wl_window_resize(wdata->win, ee->w + fh, ee->h + fw, location);
+ ecore_wl_window_resize(wdata->win, ee->w, ee->h, location);
}
}
--
[EGIT] [core/elementary] master 01/01: elementary: Fix calling ecore_evas_wayland_move with improper values
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8959a9a8bb0b855eea2b5061a46452f285c74ef3
commit 8959a9a8bb0b855eea2b5061a46452f285c74ef3
Author: Chris Michael
Date: Mon Oct 12 11:02:50 2015 -0400
elementary: Fix calling ecore_evas_wayland_move with improper values
Summary: As ecore_evas_wayland_move ends up updating the location of
the ecore_wl_window, we should be calling move with the proper
geometry as this ends up updating the internal ecore_wl_window
geometry (which in turn sends to xdg_surface_set_window_geometry).
This is part of a fix where xdg_surface_set_window_geometry was
getting sent inproper values.
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_win.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 65388e3..6250cf9 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2619,6 +2619,8 @@ _elm_win_frame_cb_move_start(void *data,
const char *sig EINA_UNUSED,
const char *source)
{
+ int ox, oy;
+
ELM_WIN_DATA_GET(data, sd);
if (!sd) return;
@@ -2638,7 +2640,9 @@ _elm_win_frame_cb_move_start(void *data,
* position. The new position will get updated automatically when
* the move is finished */
- ecore_evas_wayland_move(sd->ee, sd->screen.x, sd->screen.y);
+ edje_object_part_geometry_get(sd->frame_obj, "elm.spacer.opaque",
+ &ox, &oy, NULL, NULL);
+ ecore_evas_wayland_move(sd->ee, ox, oy);
}
static void
--
[EGIT] [core/efl] master 03/03: ecore-evas-wayland: Fix common window configure callback to not adjust for framespace
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dbebfc505a2e0de5c70c328ab5250e49630dbc02
commit dbebfc505a2e0de5c70c328ab5250e49630dbc02
Author: Chris Michael
Date: Mon Oct 12 10:59:33 2015 -0400
ecore-evas-wayland: Fix common window configure callback to not adjust
for framespace
Summary: As we have already adjusted for framespace in various code
leading up to a configure callback, don't adjust for it here. This
fixes an issue where xdg surface window geometry would get incorrect
values which were including framespace. The values of the
xdg_surface_set_window_geometry should be Just the geometry of the
visible window.
@fix
Signed-off-by: Chris Michael
---
.../engines/wayland/ecore_evas_wayland_common.c| 27 +++---
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 9b3eccb..a081f47 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -191,27 +191,6 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
if (nw < 1) nw = 1;
if (nh < 1) nh = 1;
- if (ee->prop.fullscreen)
- {
-if ((nw <= 1) || (nh <= 1))
- evas_output_size_get(ee->evas, &nw, &nh);
- }
- else
- {
-evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
- }
-
- if (ECORE_EVAS_PORTRAIT(ee))
- {
-nw -= fw;
-nh -= fh;
- }
- else
- {
-nw -= fh;
-nh -= fw;
- }
-
if (prev_full != ee->prop.fullscreen)
_ecore_evas_wl_common_border_update(ee);
@@ -620,6 +599,9 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
}
}
+ if (wdata->win)
+ ecore_wl_window_update_size(wdata->win, ee->req.w, ee->req.h);
+
evas_output_size_get(ee->evas, &ow, &oh);
if ((ow != w) || (oh != h))
{
@@ -651,9 +633,6 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
if (wdata->frame)
evas_object_resize(wdata->frame, w, h);
-if (wdata->win)
- ecore_wl_window_update_size(wdata->win, w, h);
-
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
}
--
[EGIT] [core/efl] master 01/03: ecore-wl: Don't update window size during ecore_wl_window_resize function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6263fcc716df45761e30cfd9a3b02f3e3b0b160f
commit 6263fcc716df45761e30cfd9a3b02f3e3b0b160f
Author: Chris Michael
Date: Mon Oct 12 10:55:50 2015 -0400
ecore-wl: Don't update window size during ecore_wl_window_resize
function
Summary: As we call ecore_wl_window_update_size from various places
when needed, don't call it inside the resize function. This addresses
an issue where sizes for the Ecore_Wl_Window may be out of sync
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_window.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index d934e63..6f6d9ee 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -194,8 +194,6 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w, int h,
int location)
input = win->keyboard_device;
- ecore_wl_window_update_size(win, w, h);
-
if ((!input) && (win->parent))
{
if (!(input = win->parent->keyboard_device))
@@ -594,6 +592,7 @@ ecore_wl_window_update_size(Ecore_Wl_Window *win, int w,
int h)
win->saved.w = w;
win->saved.h = h;
}
+
if (win->xdg_surface)
xdg_surface_set_window_geometry(win->xdg_surface,
win->allocation.x, win->allocation.y,
@@ -608,6 +607,7 @@ ecore_wl_window_update_location(Ecore_Wl_Window *win, int
x, int y)
if (!win) return;
win->allocation.x = x;
win->allocation.y = y;
+
if (win->xdg_surface)
xdg_surface_set_window_geometry(win->xdg_surface,
win->allocation.x, win->allocation.y,
@@ -1087,6 +1087,7 @@ _ecore_wl_window_configure_send(Ecore_Wl_Window *win, int
w, int h, int edges)
ev->w = w;
ev->h = h;
ev->edges = edges;
+
ecore_event_add(ECORE_WL_EVENT_WINDOW_CONFIGURE, ev, NULL, NULL);
}
--
[EGIT] [core/efl] master 01/01: ecore-evas-wayland: Trap for subsequent resize events
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b71410972e28ce0394369804c9d6a1710fc06df4 commit b71410972e28ce0394369804c9d6a1710fc06df4 Author: Chris Michael Date: Mon Oct 12 14:06:48 2015 -0400 ecore-evas-wayland: Trap for subsequent resize events Summary: If we have already resized this ecore_evas to be what we want, then there is no point in running the below resize code as we should already be at the requested size. Add a test at the beginning to see if we have already set these values @fix Signed-off-by: Chris Michael --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index a081f47..379dcb1 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -168,7 +168,6 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_ Ecore_Evas_Engine_Wl_Data *wdata; Ecore_Wl_Event_Window_Configure *ev; int nw = 0, nh = 0; - int fw = 0, fh = 0; Eina_Bool prev_max, prev_full; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -476,6 +475,8 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h) if (w < 1) w = 1; if (h < 1) h = 1; + if ((ee->req.w == w) && (ee->req.h == h)) return; + ee->req.w = w; ee->req.h = h; orig_w = w; --
[EGIT] [core/efl] master 01/01: ecore-wl: Add missing EINA_UNUSED for unused function paramaters
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2f2bfec8104ee635d706be5d70aed771e7127dc1
commit 2f2bfec8104ee635d706be5d70aed771e7127dc1
Author: Chris Michael
Date: Tue Oct 13 15:14:12 2015 -0400
ecore-wl: Add missing EINA_UNUSED for unused function paramaters
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 6f6d9ee..8250e78 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -184,7 +184,7 @@ ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y)
}
EAPI void
-ecore_wl_window_resize(Ecore_Wl_Window *win, int w, int h, int location)
+ecore_wl_window_resize(Ecore_Wl_Window *win, int w EINA_UNUSED, int h
EINA_UNUSED, int location)
{
Ecore_Wl_Input *input;
--
[EGIT] [core/efl] master 01/01: eina: Include for getuid and geteuid functions
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=29e87eb667c3934aa908ec08969522a27cd8399c commit 29e87eb667c3934aa908ec08969522a27cd8399c Author: Chris Michael Date: Tue Oct 13 15:17:51 2015 -0400 eina: Include for getuid and geteuid functions Summary: If we do not include unistd.h, we end up with implicit declaration warnings when compiling @fix Signed-off-by: Chris Michael --- src/lib/eina/eina_util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/eina/eina_util.c b/src/lib/eina/eina_util.c index b1d05ae..ad31475 100644 --- a/src/lib/eina/eina_util.c +++ b/src/lib/eina/eina_util.c @@ -21,6 +21,7 @@ #endif #include +#include #ifdef _WIN32 # include #endif --
[EGIT] [core/efl] master 03/04: ecore-evas-wayland-egl: Fix clang warning about extra parentheses
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=febae611a7a0952b06bdf07f92f40b533f20b992 commit febae611a7a0952b06bdf07f92f40b533f20b992 Author: Chris Michael Date: Wed Oct 14 09:39:52 2015 -0400 ecore-evas-wayland-egl: Fix clang warning about extra parentheses @fix Signed-off-by: Chris Michael --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 71c7e02..7d95606 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -413,7 +413,7 @@ _ecore_evas_wayland_egl_alpha_do(Ecore_Evas *ee, int alpha) LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ee) return; - if ((ee->alpha == alpha)) return; + if (ee->alpha == alpha) return; ee->alpha = alpha; wdata = ee->engine.data; @@ -453,7 +453,7 @@ _ecore_evas_wayland_egl_transparent_do(Ecore_Evas *ee, int transparent) LOGFN(__FILE__, __LINE__, __FUNCTION__); if (!ee) return; - if ((ee->transparent == transparent)) return; + if (ee->transparent == transparent) return; ee->transparent = transparent; wdata = ee->engine.data; --
[EGIT] [core/efl] master 04/04: edje_edit: Fix clang warning of unused variables
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=897132245f4c4d7663575618237c5fe927d1309d commit 897132245f4c4d7663575618237c5fe927d1309d Author: Chris Michael Date: Wed Oct 14 09:43:12 2015 -0400 edje_edit: Fix clang warning of unused variables Summary: clang reports that these static variables are not being used anywhere (and grep confirms this), so remove them. @fix Signed-off-by: Chris Michael --- src/lib/edje/edje_edit.c | 4 1 file changed, 4 deletions(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 4cedfee..8d09e45 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -22,10 +22,6 @@ #define MY_CLASS EDJE_EDIT_CLASS -static const char EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED_STR[] = "Current group cannot be deleted"; -static const char EDJE_EDIT_ERROR_GROUP_REFERENCED_STR[] = "Group still in use"; -static const char EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST_STR[] = "Group does not exist"; - EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED = 0; EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_REFERENCED = 0; EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0; --
[EGIT] [core/efl] master 01/04: evas: Fix clang warning for missing field 'async' in default_state
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3fb78e137b74181ebc011fe5d6a1d167f2e63c52
commit 3fb78e137b74181ebc011fe5d6a1d167f2e63c52
Author: Chris Michael
Date: Wed Oct 14 09:28:47 2015 -0400
evas: Fix clang warning for missing field 'async' in default_state
Evas_Object_Filter_Data has a bool for 'async' at the end of the
struct. This field was missing from the initialization of
'default_state'
@fix
Signed-off-by: Chris Michael
---
src/lib/evas/canvas/evas_object_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 7338e31..de5e83d 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -33,7 +33,7 @@ static const Evas_Object_Protected_State default_state = {
1.0, 0, EVAS_RENDER_BLEND, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE,
EINA_FALSE, EINA_FALSE, EINA_FALSE
};
static const Evas_Object_Filter_Data default_filter = {
- NULL, NULL, NULL, NULL, NULL, NULL, { { "default", 0.0 }, { "default", 0.0
}, 0.0 }, EINA_FALSE, EINA_FALSE
+ NULL, NULL, NULL, NULL, NULL, NULL, { { "default", 0.0 }, { "default", 0.0
}, 0.0 }, EINA_FALSE, EINA_FALSE, EINA_TRUE
};
const void * const evas_object_filter_cow_default = &default_filter;
static const Evas_Object_Mask_Data default_mask = {
--
[EGIT] [core/efl] master 02/04: ecore-drm: Add missing field initializers for vt_mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a2c1faef70e4e6b01190fee7750a5c9b15b70d5b
commit a2c1faef70e4e6b01190fee7750a5c9b15b70d5b
Author: Chris Michael
Date: Wed Oct 14 09:37:20 2015 -0400
ecore-drm: Add missing field initializers for vt_mode
Summary: clang reports missing field initializers for usage of vt_mode
structure, so add the missing initializers
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_logind.c | 4 ++--
src/lib/ecore_drm/ecore_drm_tty.c| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_logind.c
b/src/lib/ecore_drm/ecore_drm_logind.c
index 1b64d0a..833e945 100644
--- a/src/lib/ecore_drm/ecore_drm_logind.c
+++ b/src/lib/ecore_drm/ecore_drm_logind.c
@@ -29,7 +29,7 @@ _ecore_drm_logind_vt_setup(Ecore_Drm_Device *dev)
{
struct stat st;
char buff[64];
- struct vt_mode vtmode = { 0 };
+ struct vt_mode vtmode = { 0, 0, SIGUSR1, SIGUSR2, 0 };
snprintf(buff, sizeof(buff), "/dev/tty%d", dev->vt);
buff[sizeof(buff) - 1] = 0;
@@ -260,7 +260,7 @@ _ecore_drm_logind_disconnect(Ecore_Drm_Device *dev)
void
_ecore_drm_logind_restore(Ecore_Drm_Device *dev)
{
- struct vt_mode vtmode = { 0 };
+ struct vt_mode vtmode = { 0, 0, SIGUSR1, SIGUSR2, 0 };
if ((!dev) || (dev->tty.fd < 0)) return;
diff --git a/src/lib/ecore_drm/ecore_drm_tty.c
b/src/lib/ecore_drm/ecore_drm_tty.c
index 3c58539..40a0019 100644
--- a/src/lib/ecore_drm/ecore_drm_tty.c
+++ b/src/lib/ecore_drm/ecore_drm_tty.c
@@ -52,7 +52,7 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev)
{
struct stat st;
int kmode;
- struct vt_mode vtmode = { 0 };
+ struct vt_mode vtmode = { 0, 0, SIGUSR1, SIGUSR2, 0 };
if ((fstat(dev->tty.fd, &st) == -1) ||
(major(st.st_rdev) != TTY_MAJOR) || (minor(st.st_rdev) == 0))
@@ -200,7 +200,7 @@ static void
_ecore_drm_tty_restore(Ecore_Drm_Device *dev)
{
int fd = dev->tty.fd;
- struct vt_mode mode = { 0 };
+ struct vt_mode mode = { 0, 0, SIGUSR1, SIGUSR2, 0 };
if (fd < 0) return;
--
[EGIT] [core/elementary] master 07/10: elementary: Remove unused function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=97fba0166b4bea2ab9b51d5145d79b836c95a03a
commit 97fba0166b4bea2ab9b51d5145d79b836c95a03a
Author: Chris Michael
Date: Wed Oct 14 10:01:15 2015 -0400
elementary: Remove unused function
Summary: clang reports _icon_size_min_get as being an unused function,
so remove
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_photo.c | 10 --
1 file changed, 10 deletions(-)
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index fc214da..e91149b 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -217,16 +217,6 @@ _mouse_up(void *data,
eo_do(data,
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
}
-static inline int
-_icon_size_min_get(Evas_Object *icon)
-{
- int size;
-
- elm_image_object_size_get(icon, &size, NULL);
-
- return (size < 32) ? 32 : size;
-}
-
static void
_elm_photo_internal_image_follow(Evas_Object *obj)
{
--
[EGIT] [core/elementary] master 02/10: elementary: Remove unused static variable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=12fd260c04efd1243509ad6c654c265e67ee6e99
commit 12fd260c04efd1243509ad6c654c265e67ee6e99
Author: Chris Michael
Date: Wed Oct 14 09:52:14 2015 -0400
elementary: Remove unused static variable
Summary: clang reports ELM_APP_SERVER_VIEW_PROPS_ENTRY as being an
unused variable, so remove.
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_app_server_eet.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lib/elm_app_server_eet.c b/src/lib/elm_app_server_eet.c
index 15e124a..905916a 100644
--- a/src/lib/elm_app_server_eet.c
+++ b/src/lib/elm_app_server_eet.c
@@ -14,7 +14,6 @@ struct _Elm_App_Server_Views_Eet {
const char *__eet_filename;
};
-static const char ELM_APP_SERVER_VIEW_PROPS_ENTRY[] =
"elm_app_server_view_props";
static const char ELM_APP_SERVER_VIEWS_EET_ENTRY[] =
"elm_app_server_views_eet";
static Eet_Data_Descriptor *_elm_app_server_view_props_descriptor = NULL;
--
[EGIT] [core/elementary] master 09/10: elementary: Remove unused static variable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=208d187ebd429568199c4209c672c273698a260e
commit 208d187ebd429568199c4209c672c273698a260e
Author: Chris Michael
Date: Wed Oct 14 10:03:03 2015 -0400
elementary: Remove unused static variable
Summary: clang reports SIG_THEME_CHANGED as being an unused static
variable, so remove
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_win.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 6250cf9..c07b7fb 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -245,7 +245,6 @@ static const char SIG_INDICATOR_PROP_CHANGED[] =
"indicator,prop,changed";
static const char SIG_ROTATION_CHANGED[] = "rotation,changed";
static const char SIG_PROFILE_CHANGED[] = "profile,changed";
static const char SIG_WM_ROTATION_CHANGED[] = "wm,rotation,changed";
-static const char SIG_THEME_CHANGED[] = "theme,changed";
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_DELETE_REQUEST, ""},
--
[EGIT] [core/elementary] master 10/10: elementary: Remove unused static variable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f4c7406047aff4723c73ebac80ac39a5eb687165
commit f4c7406047aff4723c73ebac80ac39a5eb687165
Author: Chris Michael
Date: Wed Oct 14 10:04:03 2015 -0400
elementary: Remove unused static variable
Summary: clang reports _list_focus_objects as being an unused static
variable, so remove
@fix
Signed-off-by: Chris Michael
---
src/bin/test_list.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bin/test_list.c b/src/bin/test_list.c
index 95d7aa6..7c9a27e 100644
--- a/src/bin/test_list.c
+++ b/src/bin/test_list.c
@@ -1230,7 +1230,6 @@ test_list7(void*data EINA_UNUSED,
evas_object_show(win);
}
-static const unsigned _list_focus_objects = 5;
static const char *_list_focus_names[] = {"None", "Square", "Button", "Check",
"Box"};
static const int _list_focus_combo[] = { 1, 0, 2, 33, 43, 44, 10, 30, 22, 11,
10, -1 };
--
[EGIT] [core/elementary] master 01/10: elementary: Remove unused static variable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=194016d7ce8c24b901c2b43bcd86f7291ed9c9ee
commit 194016d7ce8c24b901c2b43bcd86f7291ed9c9ee
Author: Chris Michael
Date: Wed Oct 14 09:51:09 2015 -0400
elementary: Remove unused static variable
Summary: clang reports SIG_CLICKED as being unused so remove the
variable
@fix
Signed-off-by: Chris Michael
---
src/lib/elc_naviframe.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 673a694..6dba6e5 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -39,8 +39,6 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{NULL, NULL}
};
-static const char SIG_CLICKED[] = "clicked";
-
static Eina_Bool _on_item_back_btn_clicked(void *data,
Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED);
--
[EGIT] [core/elementary] master 04/10: elementary: Fix passing wrong parameter
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4a60d944a096ebe36e2a25d36e009e42e3e0c007 commit 4a60d944a096ebe36e2a25d36e009e42e3e0c007 Author: Chris Michael Date: Wed Oct 14 09:58:20 2015 -0400 elementary: Fix passing wrong parameter Summary: clang reports passing EINA_FALSE here is being treated as an Eo object, so pass NULL instead @fix Signed-off-by: Chris Michael --- src/lib/elm_atspi_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c index 86042e1..2ced50d 100644 --- a/src/lib/elm_atspi_bridge.c +++ b/src/lib/elm_atspi_bridge.c @@ -2805,7 +2805,7 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis if (max == 0 || count < max) count = _collection_sort_order_canonical(rule, list, count, max, -obj, idx + 1, EINA_TRUE, EINA_FALSE, EINA_TRUE, traverse); +obj, idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); return count; } --
[EGIT] [core/elementary] master 05/10: elementary: Remove unused variable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f74dfe8e3b0388d76e44a7d5e3aa3430b58a1fa4
commit f74dfe8e3b0388d76e44a7d5e3aa3430b58a1fa4
Author: Chris Michael
Date: Wed Oct 14 09:59:30 2015 -0400
elementary: Remove unused variable
Summary: clang reports SIG_LANG_CHANGED as being unused here, so remove
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_glview.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index 51af23b..1cc4174 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -16,7 +16,6 @@
static const char SIG_FOCUSED[] = "focused";
static const char SIG_UNFOCUSED[] = "unfocused";
-static const char SIG_LANG_CHANGED[] = "language,changed";
/* smart callbacks coming from elm glview objects: */
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
--
[EGIT] [core/elementary] master 03/10: elementary: Fix passing wrong parameter
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=8904083074944d87365e2447e18d16ac18e53e05 commit 8904083074944d87365e2447e18d16ac18e53e05 Author: Chris Michael Date: Wed Oct 14 09:57:14 2015 -0400 elementary: Fix passing wrong parameter Summary: clang reports passing EINA_FALSE here is being treated as an Eo object, so pass NULL instead @fix Signed-off-by: Chris Michael --- src/lib/elm_atspi_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c index b405655..86042e1 100644 --- a/src/lib/elm_atspi_bridge.c +++ b/src/lib/elm_atspi_bridge.c @@ -2799,7 +2799,7 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis parent = elm_interface_atspi_accessible_parent_get(), idx = elm_interface_atspi_accessible_index_in_parent_get()); count = _collection_sort_order_canonical(rule, list, count, max, parent, - idx + 1, EINA_TRUE, EINA_FALSE, EINA_TRUE, traverse); + idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); obj = parent; } --
[EGIT] [core/elementary] master 06/10: elementary: Remove unused static varible
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3e2a867c4bbcadeed8d06707f2bb0948be03b0a7
commit 3e2a867c4bbcadeed8d06707f2bb0948be03b0a7
Author: Chris Michael
Date: Wed Oct 14 10:00:28 2015 -0400
elementary: Remove unused static varible
Summary: clang reports _smart_callbacks as being an unused static
variable, so remove
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_notify.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 2b2b82e..3ed66d6 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -17,11 +17,6 @@
static const char SIG_BLOCK_CLICKED[] = "block,clicked";
static const char SIG_TIMEOUT[] = "timeout";
-static const Evas_Smart_Cb_Description _smart_callbacks[] = {
- {SIG_BLOCK_CLICKED, ""},
- {SIG_TIMEOUT, ""},
- {NULL, NULL}
-};
static void
_notify_theme_apply(Evas_Object *obj)
--
[EGIT] [core/elementary] master 08/10: elementary: Remove unused variables
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=30a1bbb2689555a8c5c269fba4666c1705f5f831
commit 30a1bbb2689555a8c5c269fba4666c1705f5f831
Author: Chris Michael
Date: Wed Oct 14 10:01:58 2015 -0400
elementary: Remove unused variables
Summary: clang reports SIG_BLOCK_CLICKED and SIG_TIMEOUT as being
unused variables, so remove
@fix
Signed-off-by: Chris Michael
---
src/lib/elm_notify.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 3ed66d6..82f98d3 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -15,9 +15,6 @@
#define MY_CLASS_NAME "Elm_Notify"
#define MY_CLASS_NAME_LEGACY "elm_notify"
-static const char SIG_BLOCK_CLICKED[] = "block,clicked";
-static const char SIG_TIMEOUT[] = "timeout";
-
static void
_notify_theme_apply(Evas_Object *obj)
{
--
[EGIT] [core/enlightenment] master 01/08: enlightenment: Add missing EINA_UNUSED for unused function paramaters
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=dc4eb9ca0dd37c0d9bd899b0fb6280aa122072e3
commit dc4eb9ca0dd37c0d9bd899b0fb6280aa122072e3
Author: Chris Michael
Date: Wed Oct 14 10:14:16 2015 -0400
enlightenment: Add missing EINA_UNUSED for unused function paramaters
Signed-off-by: Chris Michael
---
src/modules/bluez4/agent.c | 2 +-
src/modules/bluez4/e_mod_main.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/modules/bluez4/agent.c b/src/modules/bluez4/agent.c
index b232ad8..854c15a 100644
--- a/src/modules/bluez4/agent.c
+++ b/src/modules/bluez4/agent.c
@@ -91,7 +91,7 @@ _reject(void *data EINA_UNUSED, E_Dialog *dialog)
}
static void
-_close(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_close(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
E_Dialog *dialog = data;
_reject(NULL, dialog);
diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c
index 2871505..4b51486 100644
--- a/src/modules/bluez4/e_mod_main.c
+++ b/src/modules/bluez4/e_mod_main.c
@@ -75,7 +75,7 @@ _ebluez4_search_dialog_del(Instance *inst)
}
static void
-_ebluez4_cb_search_dialog_del(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_ebluez4_cb_search_dialog_del(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dialog = data;
_ebluez4_search_dialog_del(dialog->data);
@@ -133,7 +133,7 @@ _ebluez4_cb_search(void *data, E_Menu *m EINA_UNUSED,
E_Menu_Item *mi EINA_UNUSE
}
static void
-_ebluez4_cb_adap_settings_dialog_del(void *data, Evas *e, Evas_Object *obj,
void *event_info)
+_ebluez4_cb_adap_settings_dialog_del(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dialog = data;
ebluez4_adapter_settings_del(dialog);
@@ -235,7 +235,7 @@ _ebluez4_adap_list_dialog_del(Instance *inst)
}
static void
-_ebluez4_cb_adap_list_dialog_del(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_ebluez4_cb_adap_list_dialog_del(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
E_Dialog *dialog = data;
_ebluez4_adap_list_dialog_del(dialog->data);
--
[EGIT] [core/enlightenment] master 03/08: enlightenment: Add missing EINA_UNUSED for unused function paramaters
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4acd72c64a49d2cde481011137e1472962b043b3
commit 4acd72c64a49d2cde481011137e1472962b043b3
Author: Chris Michael
Date: Wed Oct 14 10:17:22 2015 -0400
enlightenment: Add missing EINA_UNUSED for unused function paramaters
Signed-off-by: Chris Michael
---
src/modules/music-control/ui.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c
index c61b6c2..570e0a2 100644
--- a/src/modules/music-control/ui.c
+++ b/src/modules/music-control/ui.c
@@ -233,7 +233,7 @@ _cfg_data_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata)
}
static void
-_cb_menu_cfg(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
+_cb_menu_cfg(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
E_Config_Dialog_View *v;
--
[EGIT] [core/enlightenment] master 07/08: enlightenment: Use 'fabs' to get absolute value of floating point types
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d72af795ad33a43c8a9f05df4974d8fb2160b08e
commit d72af795ad33a43c8a9f05df4974d8fb2160b08e
Author: Chris Michael
Date: Wed Oct 14 10:28:38 2015 -0400
enlightenment: Use 'fabs' to get absolute value of floating point types
Signed-off-by: Chris Michael
---
src/bin/e_comp_x_randr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index 73ff806..b526b24 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -399,7 +399,7 @@ _mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s,
Ecore_X_Randr_Output
diff =
(100 * abs(s->config.mode.w - minfo->width)) +
(100 * abs(s->config.mode.h - minfo->height)) +
- abs((100 * s->config.mode.refresh) - (100 * refresh));
+ fabs((100 * s->config.mode.refresh) - (100 * refresh));
if (diff < distance)
{
mode = modes[i];
--
[EGIT] [core/enlightenment] master 06/08: enlightenment: Fix E_CONFIG_LIMIT to use the proper min & max values
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2814066c39aada30369a0cda04960eb87fdb4521
commit 2814066c39aada30369a0cda04960eb87fdb4521
Author: Chris Michael
Date: Wed Oct 14 10:22:19 2015 -0400
enlightenment: Fix E_CONFIG_LIMIT to use the proper min & max values
e_config->backlight.idle_dim is actually an unsigned char in the
structure, so use a 0 & 1 for min & max
Signed-off-by: Chris Michael
---
src/bin/e_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 9a308a3..74fe11e 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1502,7 +1502,7 @@ e_config_load(void)
E_CONFIG_LIMIT(e_config->backlight.normal, 0.05, 1.0);
E_CONFIG_LIMIT(e_config->backlight.dim, 0.05, 1.0);
- E_CONFIG_LIMIT(e_config->backlight.idle_dim, 0.05, 1.0);
+ E_CONFIG_LIMIT(e_config->backlight.idle_dim, 0, 1);
if (!e_config->icon_theme)
e_config->icon_theme = eina_stringshare_add("hicolor"); // FDO default
--
[EGIT] [core/enlightenment] master 04/08: enlightenment: Add missing field initializers for Evas_Point
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a6661a20666049b9c1909b9c0f68e9115056d309
commit a6661a20666049b9c1909b9c0f68e9115056d309
Author: Chris Michael
Date: Wed Oct 14 10:18:04 2015 -0400
enlightenment: Add missing field initializers for Evas_Point
Signed-off-by: Chris Michael
---
src/modules/teamwork/e_mod_tw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index f54cfee..e622984 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -50,7 +50,7 @@ static Ecore_Idler *media_cleaner[2] = {NULL};
static Eina_List *handlers = NULL;
static Media_Cache_List *tw_cache_list[2] = {NULL};
-static Evas_Point last_coords = {0};
+static Evas_Point last_coords = {0, 0};
static uint64_t tw_win = 0;
--
[EGIT] [core/enlightenment] master 02/08: enlightenment: Add missing EINA_UNUSED for unused function parameters
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fbc9b89d595ee89e577c376d5d61ad48113f9277
commit fbc9b89d595ee89e577c376d5d61ad48113f9277
Author: Chris Michael
Date: Wed Oct 14 10:16:25 2015 -0400
enlightenment: Add missing EINA_UNUSED for unused function parameters
Signed-off-by: Chris Michael
---
src/modules/connman/e_mod_config.c | 2 +-
src/modules/connman/e_mod_main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/connman/e_mod_config.c
b/src/modules/connman/e_mod_config.c
index 78f13c6..20193cd 100644
--- a/src/modules/connman/e_mod_config.c
+++ b/src/modules/connman/e_mod_config.c
@@ -50,7 +50,7 @@ _create_data(E_Config_Dialog *dialog)
}
E_Config_Dialog *
-e_connman_config_dialog_new(Evas_Object *parent,
+e_connman_config_dialog_new(Evas_Object *parent EINA_UNUSED,
E_Connman_Module_Context *ctxt)
{
E_Config_Dialog *dialog;
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 2f420ea..39395b4 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -578,7 +578,7 @@ static const E_Gadcon_Client_Class _gc_class =
E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, _e_connman_Name };
static E_Config_Dialog *
-_econnman_config(Evas_Object *parent, const char *params EINA_UNUSED)
+_econnman_config(Evas_Object *parent EINA_UNUSED, const char *params
EINA_UNUSED)
{
E_Connman_Module_Context *ctxt;
--
[EGIT] [core/enlightenment] master 08/08: enlightenment: #if 0 out an unused variable
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e856f7acbbe6d813b3247905f617595509d7c42a commit e856f7acbbe6d813b3247905f617595509d7c42a Author: Chris Michael Date: Wed Oct 14 10:30:33 2015 -0400 enlightenment: #if 0 out an unused variable NB: The function which actually uses this variable is also #if 0'd out Signed-off-by: Chris Michael --- src/bin/e_xsettings.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c index 1e3f729..87bd062 100644 --- a/src/bin/e_xsettings.c +++ b/src/bin/e_xsettings.c @@ -68,7 +68,9 @@ static Eina_Bool reset = EINA_FALSE; static const char _setting_icon_theme_name[] = "Net/IconThemeName"; static const char _setting_theme_name[] = "Net/ThemeName"; static const char _setting_font_name[] = "Gtk/FontName"; +#if 0 static const char _setting_xft_dpi[] = "Xft/DPI"; +#endif static const char *_setting_theme = NULL; static void _e_xsettings_done_cb(void *data, Eio_File *handler, const Eina_Stat *stat); --
[EGIT] [core/enlightenment] master 05/08: enlightenment: Add missing field initializers for Eina_Rectangle
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=59ffe3bed27c98aac069c4dee893a1fa748844a9
commit 59ffe3bed27c98aac069c4dee893a1fa748844a9
Author: Chris Michael
Date: Wed Oct 14 10:19:43 2015 -0400
enlightenment: Add missing field initializers for Eina_Rectangle
Signed-off-by: Chris Michael
---
src/bin/e_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 136449e..08fae40 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -49,7 +49,7 @@ static Eina_List *handlers = NULL;
static Ecore_Event_Handler *action_handler_key = NULL;
static Ecore_Event_Handler *action_handler_mouse = NULL;
static Ecore_Timer *action_timer = NULL;
-static Eina_Rectangle action_orig = {0};
+static Eina_Rectangle action_orig = {0, 0, 0, 0};
static E_Client_Layout_Cb _e_client_layout_cb = NULL;
--
[EGIT] [core/enlightenment] master 01/01: enlightenment: Use 'fabs' to compute absolute value of floating point types
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2cd6fcc3a938d398e8b16a5444b14f7fda9279a6
commit 2cd6fcc3a938d398e8b16a5444b14f7fda9279a6
Author: Chris Michael
Date: Wed Oct 14 10:38:14 2015 -0400
enlightenment: Use 'fabs' to compute absolute value of floating point
types
Signed-off-by: Chris Michael
---
src/modules/wl_drm/e_mod_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index d6d8c79..7a9f6aa 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -108,7 +108,7 @@ _e_mod_drm_mode_screen_find(E_Randr2_Screen *s,
Ecore_Drm_Output *output)
{
diff = (100 * abs(s->config.mode.w - mode->width)) +
(100 * abs(s->config.mode.h - mode->height)) +
- abs((100 * s->config.mode.refresh) - (100 * mode->refresh));
+ fabs((100 * s->config.mode.refresh) - (100 * mode->refresh));
if (diff < distance)
{
m = mode;
--
[EGIT] [core/elementary] master 01/01: elementary: Fix genlist example to not free data until After it has been removed from the list
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2cee55b72d00c3b8993661a1676fa77d50818720
commit 2cee55b72d00c3b8993661a1676fa77d50818720
Author: Chris Michael
Date: Wed Oct 14 10:52:03 2015 -0400
elementary: Fix genlist example to not free data until After it has
been removed from the list
@fix CID1327342
Signed-off-by: Chris Michael
---
src/examples/genlist_example_05.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/examples/genlist_example_05.c
b/src/examples/genlist_example_05.c
index f77762e..d36503c 100644
--- a/src/examples/genlist_example_05.c
+++ b/src/examples/genlist_example_05.c
@@ -223,12 +223,14 @@ _del_item_cb(void *data, Evas_Object *o, void *event_info)
elm_genlist_item_subitems_clear(glit);
elm_object_item_del(glit);
- _clear_list(d);
+ if (glit_parent)
+ {
+pdata = elm_object_item_data_get(glit_parent);
+pdata->children = eina_list_remove(pdata->children, d);
+ }
- if (!glit_parent) return;
+ _clear_list(d);
- pdata = elm_object_item_data_get(glit_parent);
- pdata->children = eina_list_remove(pdata->children, d);
elm_genlist_item_update(glit_parent);
}
--
[EGIT] [core/enlightenment] master 01/01: enlightenment: Make sure we have a zone before calling _bgpreview_viewport_update
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d74273f7324c2d32e0710e02dd28f17a7396be55
commit d74273f7324c2d32e0710e02dd28f17a7396be55
Author: Chris Michael
Date: Wed Oct 14 10:59:31 2015 -0400
enlightenment: Make sure we have a zone before calling
_bgpreview_viewport_update
@fix CID1324753
Signed-off-by: Chris Michael
---
src/bin/e_widget_bgpreview.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c
index 79932b8..c4dbb20 100644
--- a/src/bin/e_widget_bgpreview.c
+++ b/src/bin/e_widget_bgpreview.c
@@ -324,11 +324,13 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
((ev->desk_x < 0) || (dd->x == ev->desk_x)) &&
((ev->desk_y < 0) || (dd->y == ev->desk_y)))
{
+E_Zone *zone;
const char *bgfile;
+zone = e_comp_zone_number_get(dd->zone);
bgfile = e_bg_file_get(dd->zone, dd->x, dd->y);
edje_object_file_set(dd->thumb, bgfile, "e/desktop/background");
-_bgpreview_viewport_update(dd->thumb,
e_comp_zone_number_get(dd->zone), dd->x, dd->y);
+if (zone) _bgpreview_viewport_update(dd->thumb, zone, dd->x, dd->y);
eina_stringshare_del(bgfile);
}
--
[EGIT] [core/efl] master 02/02: ecore-evas-wayland: Don't use custom animators for frame callbacks
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e7211c15172ea4ffcb2ec270337d20c47bcfdbcd commit e7211c15172ea4ffcb2ec270337d20c47bcfdbcd Author: Chris Michael Date: Wed Oct 14 14:56:17 2015 -0400 ecore-evas-wayland: Don't use custom animators for frame callbacks Summary: As we now have per-window timer-based animators in ecore_wayland for frame callbacks, we no longer should be using Custom animators to handle surface frame callbacks @fix Signed-off-by: Chris Michael --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 2 +- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 7d95606..367546d 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -250,7 +250,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, goto err; } - ecore_wl_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); + /* ecore_wl_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); */ ecore_evas_callback_pre_free_set(ee, _ecore_evas_wl_common_pre_free); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index 19940ca..4d3af44 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -245,7 +245,7 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, goto err; } - ecore_wl_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); + /* ecore_wl_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); */ ecore_evas_callback_pre_free_set(ee, _ecore_evas_wl_common_pre_free); --
[EGIT] [core/efl] master 01/02: ecore-wayland: Redo window animators to not use Custom source animators
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bd83d4c03ab9f6f6ae225976b9595a1dfde61237
commit bd83d4c03ab9f6f6ae225976b9595a1dfde61237
Author: Chris Michael
Date: Wed Oct 14 14:54:54 2015 -0400
ecore-wayland: Redo window animators to not use Custom source animators
Summary: This moves window animators (for frame callbacks) to not use
a custom animator source but rather use a timer-based source. This
also moves animators to be per-window based (in that an animator is
created per-window).
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_private.h | 2 ++
src/lib/ecore_wayland/ecore_wl_window.c | 52
2 files changed, 54 insertions(+)
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h
b/src/lib/ecore_wayland/ecore_wl_private.h
index 3493472..872409f 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -157,6 +157,7 @@ struct _Ecore_Wl_Window
Eina_Bool alpha : 1;
Eina_Bool transparent : 1;
Eina_Bool has_buffer : 1;
+ Eina_Bool visible : 1;
Ecore_Wl_Window_Type type;
Ecore_Wl_Window_Buffer_Type buffer_type;
@@ -164,6 +165,7 @@ struct _Ecore_Wl_Window
Ecore_Wl_Input *pointer_device;
Ecore_Wl_Input *keyboard_device;
+ Ecore_Animator *animator;
Eina_Bool anim_pending : 1;
struct wl_callback *anim_callback;
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 8250e78..9f60e88 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -16,6 +16,7 @@ static void _ecore_xdg_handle_surface_configure(void *data,
struct xdg_surface *
static void _ecore_xdg_handle_surface_delete(void *data, struct xdg_surface
*xdg_surface);
static void _ecore_xdg_handle_popup_done(void *data, struct xdg_popup
*xdg_popup);
static void _ecore_session_recovery_uuid(void *data, struct session_recovery
*session_recovery, const char *uuid);
+static void _anim_cb_animate(void *data, struct wl_callback *callback,
uint32_t serial EINA_UNUSED);
/* local variables */
static Eina_Hash *_windows = NULL;
@@ -44,6 +45,44 @@ static const struct session_recovery_listener
_ecore_session_recovery_listener =
_ecore_session_recovery_uuid,
};
+static const struct wl_callback_listener _anim_listener =
+{
+ _anim_cb_animate
+};
+
+static void
+_anim_cb_animate(void *data, struct wl_callback *callback, uint32_t serial
EINA_UNUSED)
+{
+ Ecore_Wl_Window *win;
+
+ win = data;
+ if (!win) return;
+
+ if ((win->anim_callback) && (callback != win->anim_callback)) return;
+
+ wl_callback_destroy(callback);
+ win->anim_callback = NULL;
+}
+
+static Eina_Bool
+_ecore_wl_window_cb_animate(void *data)
+{
+ Ecore_Wl_Window *win;
+
+ win = data;
+ if (!win->visible) return ECORE_CALLBACK_CANCEL;
+
+ if (!win->anim_callback)
+ {
+win->anim_callback = wl_surface_frame(win->surface);
+wl_callback_add_listener(win->anim_callback, &_anim_listener, win);
+ }
+
+ wl_surface_commit(win->surface);
+
+ return ECORE_CALLBACK_RENEW;
+}
+
/* internal functions */
void
_ecore_wl_window_init(void)
@@ -405,6 +444,11 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
default:
break;
}
+
+ win->visible = EINA_TRUE;
+
+ if (!win->animator)
+ win->animator = ecore_animator_add(_ecore_wl_window_cb_animate, win);
}
EAPI void
@@ -414,6 +458,14 @@ ecore_wl_window_hide(Ecore_Wl_Window *win)
if (!win) return;
+ win->visible = EINA_FALSE;
+
+ if (win->anim_callback) wl_callback_destroy(win->anim_callback);
+ win->anim_callback = NULL;
+
+ if (win->animator) ecore_animator_del(win->animator);
+ win->animator = NULL;
+
if (win->xdg_surface) xdg_surface_destroy(win->xdg_surface);
win->xdg_surface = NULL;
--
[EGIT] [core/enlightenment] master 01/01: Fix e_menu trying to swallow an object from a different canvas
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7b79e03937b1a5fda9e0c6aa5bbaeced0d35cf98 commit 7b79e03937b1a5fda9e0c6aa5bbaeced0d35cf98 Author: Chris Michael Date: Wed Oct 21 10:26:18 2015 -0400 Fix e_menu trying to swallow an object from a different canvas _e_menu_realize was trying to swallow the menu->container_object into the menu->bg_object, but the menu->bg_object was being created on the compositor canvas, and the container object was being created on the e_comp->elm_win. With recent EFL changes, this causes an abort inside Evas. To fix this, set the menu->evas to be the Evas from the e_comp->elm_win. Signed-off-by: Chris Michael --- src/bin/e_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index e6f81be..6410b0e 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -1608,7 +1608,7 @@ _e_menu_realize(E_Menu *m) if (m->parent_item && m->parent_item->menu) m->zone = m->parent_item->menu->zone; if (!m->zone) return; //menu not ready! - m->evas = e_comp->evas; + m->evas = evas_object_evas_get(e_comp->elm); evas_event_freeze(m->evas); o = edje_object_add(m->evas); --
[EGIT] [core/efl] master 01/02: ecore-evas-wayland: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=329832bb801210b37e94c6419dfba1f01b1acabb
commit 329832bb801210b37e94c6419dfba1f01b1acabb
Author: Chris Michael
Date: Wed Oct 21 09:09:18 2015 -0400
ecore-evas-wayland: Fix formatting
NB: No functional changes
Signed-off-by: Chris Michael
---
.../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index e924271..2da6c1b 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -737,7 +737,8 @@ _border_size_eval(Evas_Object *obj EINA_UNUSED,
EE_Wl_Smart_Data *sd)
/* bottom border */
if (sd->border[1])
{
-evas_object_move(sd->border[1], sd->x, sd->y + sd->h -
sd->border_size[1]);
+evas_object_move(sd->border[1], sd->x,
+ sd->y + sd->h - sd->border_size[1]);
evas_object_resize(sd->border[1], sd->w, sd->border_size[1]);
}
@@ -1073,7 +1074,9 @@ _ecore_evas_object_cursor_del(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj
void
_ecore_evas_wl_common_object_cursor_unset(Ecore_Evas *ee)
{
- evas_object_event_callback_del_full(ee->prop.cursor.object,
EVAS_CALLBACK_DEL, _ecore_evas_object_cursor_del, ee);
+ evas_object_event_callback_del_full(ee->prop.cursor.object,
+ EVAS_CALLBACK_DEL,
+ _ecore_evas_object_cursor_del, ee);
}
void
@@ -1282,7 +1285,8 @@ _ecore_evas_wl_common_render_pre(void *data, Evas *evas
EINA_UNUSED, void *event
Ecore_Evas_Engine_Wl_Data *wdata;
wdata = ee->engine.data;
- wdata->anim_callback =
wl_surface_frame(ecore_wl_window_surface_get(wdata->win));
+ wdata->anim_callback =
+ wl_surface_frame(ecore_wl_window_surface_get(wdata->win));
wl_callback_add_listener(wdata->anim_callback, &_anim_listener, ee);
ecore_evas_manual_render_set(ee, 1);
}
--
[EGIT] [core/efl] master 02/02: ecore-drm: Don't exit tty setup if tty is already in graphics mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4ef8750733086d000d63ff10ae28f945c5fa6e64
commit 4ef8750733086d000d63ff10ae28f945c5fa6e64
Author: Chris Michael
Date: Fri Oct 30 09:08:41 2015 -0400
ecore-drm: Don't exit tty setup if tty is already in graphics mode
Summary: If we go to setup a tty and it is already in graphics mode,
then there is no need to exit with a failed setup here. Instead, we
can actually continue to setup the tty.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_tty.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_tty.c
b/src/lib/ecore_drm/ecore_drm_tty.c
index 40a0019..bf05786 100644
--- a/src/lib/ecore_drm/ecore_drm_tty.c
+++ b/src/lib/ecore_drm/ecore_drm_tty.c
@@ -68,10 +68,7 @@ _ecore_drm_tty_setup(Ecore_Drm_Device *dev)
}
if (kmode != KD_TEXT)
- {
-WRN("Virtual Terminal already in KD_GRAPHICS mode");
-return EINA_FALSE;
- }
+ WRN("Virtual Terminal already in KD_GRAPHICS mode");
if (ioctl(dev->tty.fd, VT_ACTIVATE, minor(st.st_rdev)) < 0)
{
--
[EGIT] [core/efl] master 01/02: evas-gl-drm: Move definition of Render_Engine out to header
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5746f792afaa07d270b5ae27d7212b10a9f1acd5
commit 5746f792afaa07d270b5ae27d7212b10a9f1acd5
Author: Chris Michael
Date: Fri Oct 30 14:47:20 2015 -0400
evas-gl-drm: Move definition of Render_Engine out to header
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/gl_drm/evas_engine.c | 6 --
src/modules/evas/engines/gl_drm/evas_engine.h | 6 ++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 8f3524b..85acd2d 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -28,12 +28,6 @@ static Eina_Bool initted = EINA_FALSE;
static int gl_wins = 0;
/* local structures */
-typedef struct _Render_Engine Render_Engine;
-struct _Render_Engine
-{
- Render_Engine_GL_Generic generic;
-};
-
typedef struct _Native Native;
struct _Native
{
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h
b/src/modules/evas/engines/gl_drm/evas_engine.h
index e2bc8a6..740c305 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -60,6 +60,12 @@ extern Evas_GL_Common_Buffer_Dump_Call
glsym_evas_gl_common_buffer_dump;
extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_lock;
extern Evas_GL_Preload_Render_Call glsym_evas_gl_preload_render_unlock;
+typedef struct _Render_Engine Render_Engine;
+struct _Render_Engine
+{
+ Render_Engine_GL_Generic generic;
+};
+
struct _Context_3D
{
EGLDisplay display;
--
[EGIT] [core/efl] master 02/02: evas-gl-drm: Resize gbm surface when canvas size changes
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b1bbe1f47c9ee23134a9b15aff08a932350048b6
commit b1bbe1f47c9ee23134a9b15aff08a932350048b6
Author: Chris Michael
Date: Fri Oct 30 14:49:01 2015 -0400
evas-gl-drm: Resize gbm surface when canvas size changes
Summary: When we are told to resize the canvas, we should also be
resizing the gbm_surface. This should fix the issue of wl_drm module
in E not working when the canvas gets resized (WFM now)
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/gl_drm/evas_outbuf.c | 50 ++-
1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c
b/src/modules/evas/engines/gl_drm/evas_outbuf.c
index 2b1dcbc..ca4f3e1 100644
--- a/src/modules/evas/engines/gl_drm/evas_outbuf.c
+++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c
@@ -538,28 +538,46 @@ evas_outbuf_unsurf(Outbuf *ob)
void
evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth)
{
+ Evas_Public_Data *epd;
+ Evas_Engine_Info_GL_Drm *einfo;
+ Render_Engine *re;
+ struct gbm_surface *osurface;
+ Outbuf *nob;
+
if (depth == OUTBUF_DEPTH_INHERIT) depth = ob->depth;
- /* check for changes */
- /* if ((ob->w == w) && (ob->h == h) && */
- /* (ob->destination_alpha == ob->info->info.destination_alpha) && */
- /* ((int)ob->rotation == rot) && (ob->depth == depth)) */
- /* return; */
+ epd = eo_data_scope_get(ob->evas, EVAS_CANVAS_CLASS);
+ EINA_SAFETY_ON_NULL_RETURN(epd);
- ob->w = w;
- ob->h = h;
- ob->depth = depth;
- ob->rotation = rot;
+ re = epd->engine.data.output;
+ EINA_SAFETY_ON_NULL_RETURN(re);
- /* _evas_outbuf_gbm_surface_destroy(ob); */
+ einfo = ob->info;
+ osurface = ob->surface;
- /* if ((ob->rotation == 0) || (ob->rotation == 180)) */
- /* _evas_outbuf_gbm_surface_create(ob, w, h); */
- /* else if ((ob->rotation == 90) || (ob->rotation == 270)) */
- /* _evas_outbuf_gbm_surface_create(ob, h, w); */
+ if ((ob->rotation == 0) || (ob->rotation == 180))
+ nob = evas_outbuf_new(einfo, w, h, ob->swap_mode);
+ else
+ nob = evas_outbuf_new(einfo, h, w, ob->swap_mode);
- evas_outbuf_use(ob);
- glsym_evas_gl_common_context_resize(ob->gl_context, w, h, rot);
+ if (!nob)
+ {
+ERR("Could not create new Outbuf");
+return;
+ }
+
+ re->generic.software.ob->gl_context->references++;
+
+ evas_outbuf_free(ob);
+ re->generic.software.ob = NULL;
+
+ evas_outbuf_use(nob);
+
+ evas_render_engine_software_generic_update(&re->generic.software, nob, w,
h);
+
+ re->generic.software.ob->gl_context->references--;
+
+ glsym_evas_gl_common_context_resize(nob->gl_context, w, h, rot);
}
Render_Engine_Swap_Mode
--
[EGIT] [core/efl] master 01/01: ecore-evas-wl: Ignore step size when maximizing
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=60f5b43debcb2c7e71afe150da68d8889fe86fe5
commit 60f5b43debcb2c7e71afe150da68d8889fe86fe5
Author: Chris Michael
Date: Fri Oct 30 15:12:41 2015 -0400
ecore-evas-wl: Ignore step size when maximizing
Summary; This fixes an issue where maximizing efl/elm apps in Weston
and in Enlightenment would cause extra space to be left around the
window.
@fix
Signed-off-by: Chris Michael
---
.../engines/wayland/ecore_evas_wayland_common.c| 37 --
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 2da6c1b..634343b 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -554,25 +554,28 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
w = h * ee->prop.aspect;
}
-/* calc new size using base size & step size */
-if (ee->prop.step.w > 0)
+if (!ee->prop.maximized)
{
- if (ee->prop.base.w >= 0)
- w = (ee->prop.base.w +
-(((w - ee->prop.base.w) / ee->prop.step.w) *
-ee->prop.step.w));
- else
- w = (minw + (((w - minw) / ee->prop.step.w) * ee->prop.step.w));
- }
+ /* calc new size using base size & step size */
+ if (ee->prop.step.w > 0)
+ {
+ if (ee->prop.base.w >= 0)
+w = (ee->prop.base.w +
+ (((w - ee->prop.base.w) / ee->prop.step.w) *
+ ee->prop.step.w));
+ else
+w = (minw + (((w - minw) / ee->prop.step.w) *
ee->prop.step.w));
+ }
-if (ee->prop.step.h > 0)
- {
- if (ee->prop.base.h >= 0)
- h = (ee->prop.base.h +
-(((h - ee->prop.base.h) / ee->prop.step.h) *
-ee->prop.step.h));
- else
- h = (minh + (((h - minh) / ee->prop.step.h) * ee->prop.step.h));
+ if (ee->prop.step.h > 0)
+ {
+ if (ee->prop.base.h >= 0)
+h = (ee->prop.base.h +
+ (((h - ee->prop.base.h) / ee->prop.step.h) *
+ ee->prop.step.h));
+ else
+h = (minh + (((h - minh) / ee->prop.step.h) *
ee->prop.step.h));
+ }
}
if ((maxw > 0) && (w > maxw))
--
[EGIT] [core/efl] master 01/01: ecore-drm: Add some debug printing for driver details
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=34415c05bd3222dc3ab76d82fdf2ca78b9c60c61
commit 34415c05bd3222dc3ab76d82fdf2ca78b9c60c61
Author: Chris Michael
Date: Fri Oct 30 16:00:32 2015 -0400
ecore-drm: Add some debug printing for driver details
Summary: In efforts to debug some non-working drm issues for people,
it would be helpful to know what drivers and versions they are using.
This commit just adds some debug printing for that information
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_device.c | 13 +
1 file changed, 13 insertions(+)
diff --git a/src/lib/ecore_drm/ecore_drm_device.c
b/src/lib/ecore_drm/ecore_drm_device.c
index 774234e..1e7c5f8 100644
--- a/src/lib/ecore_drm/ecore_drm_device.c
+++ b/src/lib/ecore_drm/ecore_drm_device.c
@@ -273,6 +273,7 @@ ecore_drm_device_open(Ecore_Drm_Device *dev)
{
uint64_t caps;
int events = 0;
+ drmVersionPtr ver;
/* check for valid device */
if ((!dev) || (!dev->drm.name)) return EINA_FALSE;
@@ -284,6 +285,18 @@ ecore_drm_device_open(Ecore_Drm_Device *dev)
DBG("Opened Device %s : %d", dev->drm.name, dev->drm.fd);
+ ver = drmGetVersion(dev->drm.fd);
+ if (ver)
+ {
+DBG("\tDriver Name: %s", ver->name);
+DBG("\tDriver Date: %s", ver->date);
+DBG("\tDriver Description: %s", ver->desc);
+DBG("\tDriver Version: %d.%d.%d",
+ver->version_major, ver->version_minor,
+ver->version_patchlevel);
+drmFreeVersion(ver);
+ }
+
/* set client capabilities to 'universal planes' so drm core will expose
* the full universal plane list (including primary & cursor planes) */
drmSetClientCap(dev->drm.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
--
[EGIT] [core/efl] master 01/02: ecore-evas-drm: Use GBM_FORMAT_XRGB8888 when creating new canvas
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=444926923fde111d66b4342a3af48b6972a2dffc commit 444926923fde111d66b4342a3af48b6972a2dffc Author: Chris Michael Date: Mon Nov 2 09:25:40 2015 -0500 ecore-evas-drm: Use GBM_FORMAT_XRGB when creating new canvas Summary: With linux kernels >= 4.2.x, we need to use GBM_FORMAT_XRGB when creating a new canvas else we end up with a format mismatch when trying to add the framebuffer @fix Signed-off-by: Chris Michael --- src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c index 21d706c..9bd3087 100644 --- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c +++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c @@ -341,7 +341,7 @@ ecore_evas_gl_drm_new_internal(const char *device, unsigned int parent EINA_UNUS Ecore_Evas_Interface_Drm *iface; Ecore_Evas_Engine_Drm_Data *edata; int method; - uint32_t format = GBM_FORMAT_ARGB; + uint32_t format = GBM_FORMAT_XRGB; uint32_t flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; char *num; --
[EGIT] [core/efl] master 02/02: evas-gl-drm: Fix issue of gl_drm engine not working
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0c9011d9e0bd23ef6f8b7137328e461dbf9a0e0a commit 0c9011d9e0bd23ef6f8b7137328e461dbf9a0e0a Author: Chris Michael Date: Mon Nov 2 09:27:56 2015 -0500 evas-gl-drm: Fix issue of gl_drm engine not working Summary: With linux kernels >= 4.2.x, the gl_drm engine was not functional. This is due to the egl config returning an improper config which did not match the expected pixel format. This commit fixes that issue and gl_drm evas engine works again. Should fix ticket T2807 @fix Signed-off-by: Chris Michael --- src/modules/evas/engines/gl_drm/evas_outbuf.c | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c b/src/modules/evas/engines/gl_drm/evas_outbuf.c index ca4f3e1..cde72b1 100644 --- a/src/modules/evas/engines/gl_drm/evas_outbuf.c +++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c @@ -191,24 +191,18 @@ _evas_outbuf_egl_setup(Outbuf *ob) ctx_attr[1] = 2; ctx_attr[2] = EGL_NONE; - cfg_attr[n++] = EGL_BUFFER_SIZE; - cfg_attr[n++] = 32; - cfg_attr[n++] = EGL_DEPTH_SIZE; - cfg_attr[n++] = EGL_DONT_CARE; - cfg_attr[n++] = EGL_STENCIL_SIZE; - cfg_attr[n++] = EGL_DONT_CARE; cfg_attr[n++] = EGL_RENDERABLE_TYPE; cfg_attr[n++] = EGL_OPENGL_ES2_BIT; cfg_attr[n++] = EGL_SURFACE_TYPE; cfg_attr[n++] = EGL_WINDOW_BIT; -#if 0 + cfg_attr[n++] = EGL_RED_SIZE; cfg_attr[n++] = 1; cfg_attr[n++] = EGL_GREEN_SIZE; cfg_attr[n++] = 1; cfg_attr[n++] = EGL_BLUE_SIZE; cfg_attr[n++] = 1; -#endif + cfg_attr[n++] = EGL_ALPHA_SIZE; if (ob->destination_alpha) cfg_attr[n++] = 1; --
[EGIT] [core/efl] master 01/01: evas-wayland-egl: Fix missing support for EVAS_NATIVE_SURFACE_WL
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1dbecbb6764bdd6f477b5cc6624e791a52cfe1d5
commit 1dbecbb6764bdd6f477b5cc6624e791a52cfe1d5
Author: Chris Michael
Date: Mon Nov 2 16:08:27 2015 -0500
evas-wayland-egl: Fix missing support for EVAS_NATIVE_SURFACE_WL
Summary: Support for using EVAS_NATIVE_SURFACE_WL was missing/incomplete in
the
wayland_egl engine. This commit addresses that issue so that now the
wayland_egl engine can support both EVAS_NATIVE_SURFACE_OPENGL and
EVAS_NATIVE_SURFACE_WL.
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_egl/evas_engine.c | 174 +++--
1 file changed, 160 insertions(+), 14 deletions(-)
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 70ed760..c4d2db2 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -33,6 +33,7 @@ typedef struct _Native Native;
struct _Native
{
Evas_Native_Surface ns;
+ struct wl_buffer *wl_buf;
void *egl_surface;
};
@@ -75,6 +76,7 @@ void (*glsym_eglDestroyImage) (EGLDisplay a, void *b) = NULL;
void (*glsym_glEGLImageTargetTexture2DOES) (int a, void *b) = NULL;
unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const
EGLint *d, EGLint c) = NULL;
unsigned int (*glsym_eglSetDamageRegionKHR) (EGLDisplay a, EGLSurface b,
EGLint *c, EGLint d) = NULL;
+unsigned int (*glsym_eglQueryWaylandBufferWL)(EGLDisplay a, struct wl_resource
*b, EGLint c, EGLint *d) = NULL;
/* local variables */
static Eina_Bool initted = EINA_FALSE;
@@ -171,6 +173,9 @@ gl_symbols(void)
FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR",
glsym_func_uint);
+ FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL",
+ glsym_func_uint);
+
done = EINA_TRUE;
}
@@ -797,7 +802,21 @@ _native_cb_bind(void *data EINA_UNUSED, void *image)
if (!(img = image)) return;
if (!(n = img->native.data)) return;
- if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
+ if (n->ns.type == EVAS_NATIVE_SURFACE_WL)
+ {
+if (n->egl_surface)
+ {
+ if (glsym_glEGLImageTargetTexture2DOES)
+ {
+ glsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D,
n->egl_surface);
+ if (eglGetError() != EGL_SUCCESS)
+ERR("glEGLImageTargetTexture2DOES() failed.");
+ }
+ else
+ ERR("Try glEGLImageTargetTexture2DOES on EGL with no support");
+ }
+ }
+ else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, n->ns.data.opengl.texture_id);
}
@@ -812,7 +831,11 @@ _native_cb_unbind(void *data EINA_UNUSED, void *image)
if (!(img = image)) return;
if (!(n = img->native.data)) return;
- if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
+ if (n->ns.type == EVAS_NATIVE_SURFACE_WL)
+ {
+//glBindTexture(GL_TEXTURE_2D, 0); //really need?
+ }
+ else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
glBindTexture(GL_TEXTURE_2D, 0);
}
@@ -826,13 +849,30 @@ _native_cb_free(void *data, void *image)
Evas_GL_Image *img;
Native *n;
uint32_t texid;
+ void *wlid;
if (!(re = (Render_Engine *)data)) return;
if (!(img = image)) return;
if (!(n = img->native.data)) return;
if (!(ob = eng_get_ob(re))) return;
- if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
+ if (n->ns.type == EVAS_NATIVE_SURFACE_WL)
+ {
+wlid = (void*)n->wl_buf;
+eina_hash_del(ob->gl_context->shared->native_wl_hash, &wlid, img);
+if (n->egl_surface)
+ {
+ if (glsym_eglDestroyImage)
+ {
+ glsym_eglDestroyImage(ob->egl_disp, n->egl_surface);
+ if (eglGetError() != EGL_SUCCESS)
+ERR("eglDestroyImage() failed.");
+ }
+ else
+ ERR("Try eglDestroyImage on EGL with no support");
+ }
+ }
+ else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL)
{
texid = n->ns.data.opengl.texture_id;
eina_hash_del(ob->gl_context->shared->native_tex_hash, &texid, img);
@@ -857,6 +897,7 @@ eng_image_native_set(void *data, void *image, void *native)
Evas_GL_Image *img, *img2;
unsigned int tex = 0, fbo = 0;
uint32_t texid;
+ void *wlid, *wl_buf = NULL;
if (!(re = (Render_Engine *)data)) return NULL;
if (!(ob = eng_get_ob(re))) return NULL;
@@ -878,18 +919,33 @@ eng_image_native_set(void *data, void *image, void
*native)
return NULL;
}
- if ((ns) && (ns->type == EVAS_NATIVE_SURFACE_OPENGL))
+ if (ns)
{
-tex = ns->data.opengl.texture_id;
-fbo = ns->data.opengl.framebuffer_id;
-if (img->nativ
[EGIT] [core/efl] master 01/01: evas-wayland-egl: Add missing include header for gl_common
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=24691068312daa4948db5fd8bbfb60c199c22059 commit 24691068312daa4948db5fd8bbfb60c199c22059 Author: Chris Michael Date: Mon Nov 2 16:15:21 2015 -0500 evas-wayland-egl: Add missing include header for gl_common @fix Signed-off-by: Chris Michael --- src/modules/evas/engines/wayland_egl/evas_engine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c index c4d2db2..3b44b07 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.c +++ b/src/modules/evas/engines/wayland_egl/evas_engine.c @@ -1,5 +1,6 @@ #include "evas_common_private.h" #include "evas_engine.h" +#include "../gl_common/evas_gl_define.h" #ifdef HAVE_DLSYM # include --
[EGIT] [core/efl] master 01/01: evas-gl-drm: Set Outbuf vsync according to engine
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f55d0a3d0740aa2673e9b13f9341c8665389c201 commit f55d0a3d0740aa2673e9b13f9341c8665389c201 Author: Chris Michael Date: Wed Nov 4 09:24:18 2015 -0500 evas-gl-drm: Set Outbuf vsync according to engine The engine setup code already checks if we are disabling vsync (defaults to on), so we should be setting the Outbuf vsync according to what the engine info has @fix Signed-off-by: Chris Michael --- src/modules/evas/engines/gl_drm/evas_outbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c b/src/modules/evas/engines/gl_drm/evas_outbuf.c index cde72b1..a421b64 100644 --- a/src/modules/evas/engines/gl_drm/evas_outbuf.c +++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c @@ -379,7 +379,7 @@ evas_outbuf_new(Evas_Engine_Info_GL_Drm *info, int w, int h, Render_Engine_Swap_ ob->depth = info->info.depth; ob->rotation = info->info.rotation; ob->destination_alpha = info->info.destination_alpha; - /* ob->vsync = info->info.vsync; */ + ob->vsync = info->info.vsync; ob->swap_mode = swap_mode; ob->priv.num = 2; --
[EGIT] [core/efl] master 02/02: ecore-evas-gl-drm: Don't create software dumb buffers when using gl
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b8ebd5b35621c66fd3759d4a2c952c0524331e78
commit b8ebd5b35621c66fd3759d4a2c952c0524331e78
Author: Chris Michael
Date: Wed Nov 4 09:43:35 2015 -0500
ecore-evas-gl-drm: Don't create software dumb buffers when using gl
Summary: If we are rendering using gl_drm, then we don't need to be
creating extra software dumb buffers.
@fix
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 7 ---
1 file changed, 7 deletions(-)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 9bd3087..f7cfc55 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -355,12 +355,6 @@ ecore_evas_gl_drm_new_internal(const char *device,
unsigned int parent EINA_UNUS
/* try to init drm */
if (_ecore_evas_drm_init(device) < 1) return NULL;
- if (!ecore_drm_device_software_setup(dev))
- {
-ERR("Could not setup device for software");
-goto soft_err;
- }
-
/* try to load gl libary, gbm libary */
/* Typically, gbm loads the dri driver However some versions of Mesa
* do not have libglapi symbols linked in the driver. Because of this,
@@ -501,7 +495,6 @@ ecore_evas_gl_drm_new_internal(const char *device, unsigned
int parent EINA_UNUS
eng_err:
ecore_evas_free(ee);
-soft_err:
ee_err:
_ecore_evas_drm_shutdown();
return NULL;
--
[EGIT] [core/efl] master 01/02: ecore-drm: Don't always check fb size against dumb buffer
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=49d9b3d3032d8c6e98fa364d1d428dd7b85a1535
commit 49d9b3d3032d8c6e98fa364d1d428dd7b85a1535
Author: Chris Michael
Date: Wed Nov 4 09:40:54 2015 -0500
ecore-drm: Don't always check fb size against dumb buffer
Summary: If we are running using gl_drm, then we don't need to create
software dumb buffers on the drm device. Since we may not have the
dumb buffers (only used in software rendering), then we should not
always be checking the framebuffer size against the dumb buffer size.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_fb.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index 69c6107..7805167 100644
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -176,11 +176,14 @@ ecore_drm_fb_set(Ecore_Drm_Device *dev, Ecore_Drm_Fb *fb)
EINA_SAFETY_ON_NULL_RETURN(dev);
EINA_SAFETY_ON_NULL_RETURN(fb);
- if ((fb->w != dev->dumb[0]->w) || (fb->h != dev->dumb[0]->h))
+ if (dev->dumb[0])
{
-/* we need to copy from fb to dev->dumb */
-WRN("Trying to set a Framebuffer of improper size !!");
-return;
+if ((fb->w != dev->dumb[0]->w) || (fb->h != dev->dumb[0]->h))
+ {
+ /* we need to copy from fb to dev->dumb */
+ WRN("Trying to set a Framebuffer of improper size !!");
+ return;
+ }
}
if (!dev->next) dev->next = fb;
--
[EGIT] [core/efl] master 02/02: evas-gl-drm: Implement eglSetDamageRegionKHR
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=962059dd0a4121ba93c3cb7179173d628b37f8f7
commit 962059dd0a4121ba93c3cb7179173d628b37f8f7
Author: Chris Michael
Date: Wed Nov 4 11:20:39 2015 -0500
evas-gl-drm: Implement eglSetDamageRegionKHR
Summary: In efforts to reduce tearing in the gl_drm engine, implement
support for eglSetDamageRegionKHR to mark parts of a surface as being
damaged.
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/gl_drm/evas_outbuf.c | 132 +-
1 file changed, 85 insertions(+), 47 deletions(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c
b/src/modules/evas/engines/gl_drm/evas_outbuf.c
index a421b64..8c93988 100644
--- a/src/modules/evas/engines/gl_drm/evas_outbuf.c
+++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c
@@ -1,4 +1,5 @@
#include "evas_engine.h"
+#include "../gl_common/evas_gl_define.h"
/* local variables */
static Outbuf *_evas_gl_drm_window = NULL;
@@ -379,7 +380,7 @@ evas_outbuf_new(Evas_Engine_Info_GL_Drm *info, int w, int
h, Render_Engine_Swap_
ob->depth = info->info.depth;
ob->rotation = info->info.rotation;
ob->destination_alpha = info->info.destination_alpha;
- ob->vsync = info->info.vsync;
+ /* ob->vsync = info->info.vsync; */
ob->swap_mode = swap_mode;
ob->priv.num = 2;
@@ -390,8 +391,8 @@ evas_outbuf_new(Evas_Engine_Info_GL_Drm *info, int w, int
h, Render_Engine_Swap_
else if (ob->priv.num > 4) ob->priv.num = 4;
}
- if ((num = getenv("EVAS_GL_DRM_VSYNC")))
- ob->vsync = atoi(num);
+ /* if ((num = getenv("EVAS_GL_DRM_VSYNC"))) */
+ /* ob->vsync = atoi(num); */
if ((ob->rotation == 0) || (ob->rotation == 180))
_evas_outbuf_gbm_surface_create(ob, w, h);
@@ -648,6 +649,58 @@ evas_outbuf_update_region_first_rect(Outbuf *ob)
return EINA_FALSE;
}
+static void
+_glcoords_convert(int *result, Outbuf *ob, int x, int y, int w, int h)
+{
+ switch (ob->rotation)
+ {
+ case 0:
+result[0] = x;
+result[1] = ob->gl_context->h - (y + h);
+result[2] = w;
+result[3] = h;
+break;
+ case 90:
+result[0] = y;
+result[1] = x;
+result[2] = h;
+result[3] = w;
+break;
+ case 180:
+result[0] = ob->gl_context->w - (x + w);
+result[1] = y;
+result[2] = w;
+result[3] = h;
+break;
+ case 270:
+result[0] = ob->gl_context->h - (y + h);
+result[1] = ob->gl_context->w - (x + w);
+result[2] = h;
+result[3] = w;
+break;
+ default:
+result[0] = x;
+result[1] = ob->gl_context->h - (y + h);
+result[2] = w;
+result[3] = h;
+break;
+ }
+}
+
+static void
+_damage_rect_set(Outbuf *ob, int x, int y, int w, int h)
+{
+ int rects[4];
+
+ if ((x == 0) && (y == 0) &&
+ (((w == ob->gl_context->w) && (h == ob->gl_context->h)) ||
+ ((h == ob->gl_context->w) && (w == ob->gl_context->h
+ return;
+
+ _glcoords_convert(rects, ob, x, y, w, h);
+ glsym_eglSetDamageRegionKHR(ob->egl.disp, ob->egl.surface[0], rects, 1);
+}
+
void *
evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int w, int h, int *cx
EINA_UNUSED, int *cy EINA_UNUSED, int *cw EINA_UNUSED, int *ch EINA_UNUSED)
{
@@ -660,6 +713,9 @@ evas_outbuf_update_region_new(Outbuf *ob, int x, int y, int
w, int h, int *cx EI
ob->gl_context->master_clip.y = y;
ob->gl_context->master_clip.w = w;
ob->gl_context->master_clip.h = h;
+
+if (glsym_eglSetDamageRegionKHR)
+ _damage_rect_set(ob, x, y, w, h);
}
return ob->gl_context->def_surface;
@@ -682,7 +738,7 @@ evas_outbuf_update_region_free(Outbuf *ob EINA_UNUSED,
RGBA_Image *update EINA_U
}
void
-evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects EINA_UNUSED,
Evas_Render_Mode render_mode)
+evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects, Evas_Render_Mode
render_mode)
{
if (render_mode == EVAS_RENDER_MODE_ASYNC_INIT) goto end;
@@ -703,9 +759,8 @@ evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects
EINA_UNUSED, Evas_Render_Mode
if (ob->info->callback.pre_swap)
ob->info->callback.pre_swap(ob->info->callback.data, ob->evas);
-// TODO: Check eglSwapBuffersWithDamage for gl_drm and apply
-#if 0
- if ((glsym_eglSwapBuffersWithDamage) && (ob->swap_mode != MODE_FULL))
+ if ((glsym_eglSwapBuffersWithDamage) && (rects) &&
+ (ob->swap_mode != MODE_FULL))
{
EGLint num = 0, *result = NULL, i = 0;
Tilebuf_Rect *r;
@@ -717,43 +772,7 @@ evas_outbuf_flush(Outbuf *ob, Tilebuf_Rect *rects
EINA_UNUSED, Evas_Render_Mode
result = alloca(sizeof(EGLint) * 4 * num);
EINA_INLIST_FOREACH(EINA_INLIST_GET(rects), r)
{
- int gw, gh;
-
- gw = ob->gl_context->w;
-
[EGIT] [core/efl] master 01/02: evas-gl-drm: Find symlink for eglSetDamageRegionKHR
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b2785f01c52ed7f6919c76ffe2bacfaf98bedeaf
commit b2785f01c52ed7f6919c76ffe2bacfaf98bedeaf
Author: Chris Michael
Date: Wed Nov 4 11:18:25 2015 -0500
evas-gl-drm: Find symlink for eglSetDamageRegionKHR
In efforts to reduce tearing in the gl_drm engine, find and link to
the eglSetDamageRegionKHR function so we can mark damaged regions of a
surface
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/gl_drm/evas_engine.c | 17 +++--
src/modules/evas/engines/gl_drm/evas_engine.h | 1 +
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index bfa9d58..145c5df 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -77,9 +77,10 @@ glsym_func_void_ptr glsym_evas_gl_common_current_context_get
= NULL;
_eng_fn (*glsym_eglGetProcAddress)(const char *a) = NULL;
void *(*glsym_eglCreateImage)(EGLDisplay a, EGLContext b, EGLenum c,
EGLClientBuffer d, const int *e) = NULL;
void (*glsym_eglDestroyImage)(EGLDisplay a, void *b) = NULL;
-void (*glsym_glEGLImageTargetTexture2DOES)(int a, void *b) = NULL;
+void (*glsym_glEGLImageTargetTexture2DOES)(int a, void *b) = NULL;
unsigned int (*glsym_eglSwapBuffersWithDamage)(EGLDisplay a, void *b, const
EGLint *d, EGLint c) = NULL;
unsigned int (*glsym_eglQueryWaylandBufferWL)(EGLDisplay a, struct wl_resource
*b, EGLint c, EGLint *d) = NULL;
+unsigned int (*glsym_eglSetDamageRegionKHR)(EGLDisplay a, EGLSurface b, EGLint
*c, EGLint d) = NULL;
/* local function prototypes */
static void gl_symbols(void);
@@ -229,6 +230,9 @@ gl_symbols(void)
FINDSYM(glsym_eglSwapBuffersWithDamage, "eglSwapBuffersWithDamage",
glsym_func_uint);
+ FINDSYM(glsym_eglSetDamageRegionKHR, "eglSetDamageRegionKHR",
+ glsym_func_uint);
+
FINDSYM(glsym_eglQueryWaylandBufferWL, "eglQueryWaylandBufferWL",
glsym_func_uint);
@@ -253,8 +257,17 @@ gl_extn_veto(Render_Engine *re)
{
_extn_have_buffer_age = 0;
glsym_eglSwapBuffersWithDamage = NULL;
+ glsym_eglSetDamageRegionKHR = NULL;
+ }
+if (!strstr(str, "EGL_EXT_buffer_age"))
+ {
+ if (!strstr(str, "EGL_KHR_partial_update"))
+ _extn_have_buffer_age = 0;
}
-if (!strstr(str, "EGL_EXT_buffer_age")) _extn_have_buffer_age = 0;
+
+if (!strstr(str, "EGL_KHR_partial_update"))
+ glsym_eglSetDamageRegionKHR = NULL;
+
if (!strstr(str, "EGL_EXT_swap_buffers_with_damage"))
glsym_eglSwapBuffersWithDamage = NULL;
}
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h
b/src/modules/evas/engines/gl_drm/evas_engine.h
index 740c305..1ef0e7c 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -142,5 +142,6 @@ _re_wincheck(Outbuf *ob)
}
extern unsigned int (*glsym_eglSwapBuffersWithDamage)(EGLDisplay a, void *b,
const EGLint *d, EGLint c);
+extern unsigned int (*glsym_eglSetDamageRegionKHR)(EGLDisplay a, EGLSurface b,
EGLint *c, EGLint d);
#endif
--
[EGIT] [core/efl] master 01/01: ecore-drm: Check return value of drmHandleEvent and cleanup
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f77ba645d58d8a544c0723b3ebc8f8668d7cdd59
commit f77ba645d58d8a544c0723b3ebc8f8668d7cdd59
Author: Chris Michael
Date: Wed Nov 4 12:44:29 2015 -0500
ecore-drm: Check return value of drmHandleEvent and cleanup
Summary: drmHandleEvent will return 0 on success, or -1 on error. We
should trap for the error case so that we can cleanup any allocated
callback structures.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_fb.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index 7805167..68c7e94 100644
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -257,5 +257,15 @@ ecore_drm_fb_send(Ecore_Drm_Device *dev, Ecore_Drm_Fb *fb,
Ecore_Drm_Pageflip_Cb
}
while (fb->pending_flip)
- drmHandleEvent(dev->drm.fd, &dev->drm_ctx);
+ {
+int ret = 0;
+
+ret = drmHandleEvent(dev->drm.fd, &dev->drm_ctx);
+if (ret < 0)
+ {
+ ERR("drmHandleEvent Failed: %m");
+ free(cb);
+ break;
+ }
+ }
}
--
[EGIT] [core/efl] master 02/02: ecore-drm: Fix issue of hanging in read()
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ff8b141f87d350c134356c38a924f4eb4fe1ea23 commit ff8b141f87d350c134356c38a924f4eb4fe1ea23 Author: Chris Michael Date: Thu Nov 5 08:59:37 2015 -0500 ecore-drm: Fix issue of hanging in read() Summary: As we already call drmHandleEvent when we pageflip, we don't need to be using an fd handler to catch them. This should fix T2791 @fix Signed-off-by: Chris Michael --- src/lib/ecore_drm/ecore_drm_device.c | 7 --- 1 file changed, 7 deletions(-) diff --git a/src/lib/ecore_drm/ecore_drm_device.c b/src/lib/ecore_drm/ecore_drm_device.c index 1e7c5f8..1285614 100644 --- a/src/lib/ecore_drm/ecore_drm_device.c +++ b/src/lib/ecore_drm/ecore_drm_device.c @@ -340,10 +340,6 @@ ecore_drm_device_open(Ecore_Drm_Device *dev) eeze_udev_watch_add(EEZE_UDEV_TYPE_DRM, events, _ecore_drm_device_cb_output_event, dev); - dev->drm.hdlr = - ecore_main_fd_handler_add(dev->drm.fd, ECORE_FD_READ, - _ecore_drm_device_cb_event, dev, NULL, NULL); - /* dev->drm.idler = */ /* ecore_idle_enterer_add(_ecore_drm_device_cb_idle, dev); */ @@ -362,9 +358,6 @@ ecore_drm_device_close(Ecore_Drm_Device *dev) /* close xkb context */ if (dev->xkb_ctx) xkb_context_unref(dev->xkb_ctx); - if (dev->drm.hdlr) ecore_main_fd_handler_del(dev->drm.hdlr); - dev->drm.hdlr = NULL; - _ecore_drm_launcher_device_close(dev->drm.name, dev->drm.fd); /* reset device fd */ --
[EGIT] [core/efl] master 01/02: ecore-drm: Fix issue of duplicate page flips
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ae7a243c99c071a92582fda0a2dfdd27e3a39e1b
commit ae7a243c99c071a92582fda0a2dfdd27e3a39e1b
Author: Chris Michael
Date: Thu Nov 5 08:58:46 2015 -0500
ecore-drm: Fix issue of duplicate page flips
Summary: If we already have a pending pageflip scheduled for a given
framebuffer, don't reschedule another one. This also includes a minor
fix when mmap'ing the framebuffer (previously was also mapped
PROT_READ).
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_fb.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index 68c7e94..385d3ea 100644
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -98,9 +98,8 @@ ecore_drm_fb_create(Ecore_Drm_Device *dev, int width, int
height)
goto map_err;
}
- fb->mmap =
- mmap(0, fb->size, PROT_WRITE | PROT_READ, MAP_SHARED,
- dev->drm.fd, marg.offset);
+ fb->mmap =
+ mmap(0, fb->size, PROT_WRITE, MAP_SHARED, dev->drm.fd, marg.offset);
if (fb->mmap == MAP_FAILED)
{
ERR("Could not mmap framebuffer space: %m");
@@ -231,6 +230,8 @@ ecore_drm_fb_send(Ecore_Drm_Device *dev, Ecore_Drm_Fb *fb,
Ecore_Drm_Pageflip_Cb
if (eina_list_count(dev->outputs) < 1) return;
+ if (fb->pending_flip) return;
+
if (!(cb = calloc(1, sizeof(Ecore_Drm_Pageflip_Callback
return;
--
[EGIT] [core/efl] master 01/01: ecore-drm: Remove unused function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ebf6d95ed6de6f90481cc09a5d18f16251c01b76
commit ebf6d95ed6de6f90481cc09a5d18f16251c01b76
Author: Chris Michael
Date: Thu Nov 5 09:37:48 2015 -0500
ecore-drm: Remove unused function
As we no longer have an fd handler to listen on the drm fd, we don't
need this function anymore
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_device.c | 14 --
1 file changed, 14 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_device.c
b/src/lib/ecore_drm/ecore_drm_device.c
index 1285614..3e70d24 100644
--- a/src/lib/ecore_drm/ecore_drm_device.c
+++ b/src/lib/ecore_drm/ecore_drm_device.c
@@ -75,20 +75,6 @@ _ecore_drm_device_cb_vblank(int fd EINA_UNUSED, unsigned int
frame EINA_UNUSED,
if (!output->pending_flip) _ecore_drm_output_frame_finish(output);
}
-static Eina_Bool
-_ecore_drm_device_cb_event(void *data, Ecore_Fd_Handler *hdlr EINA_UNUSED)
-{
- Ecore_Drm_Device *dev;
-
- if (!(dev = data)) return ECORE_CALLBACK_RENEW;
-
- /* DBG("Drm Device Event"); */
-
- drmHandleEvent(dev->drm.fd, &dev->drm_ctx);
-
- return ECORE_CALLBACK_RENEW;
-}
-
#if 0
static Eina_Bool
_ecore_drm_device_cb_idle(void *data)
--
[EGIT] [core/efl] master 01/01: efl: Fix configure help message for cserve
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e83fae696056fb3e4b08484224cf215faa6274a5
commit e83fae696056fb3e4b08484224cf215faa6274a5
Author: Chris Michael
Date: Thu Nov 12 12:39:45 2015 -0500
efl: Fix configure help message for cserve
By default, cserve2 is disabled. The configure help message for
cserve2 was incorrect in that is said cserve2 was enabled by default.
@fix
Signed-off-by: Chris Michael
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index f0980ad..7ebd753 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2120,7 +2120,7 @@ AC_CHECK_LIB([m], [lround],
# Evas cserve2
AC_ARG_ENABLE([cserve],
- [AS_HELP_STRING([--enable-cserve],[enable shared cache server (cserve2).
@<:@default=enabled@:>@])],
+ [AS_HELP_STRING([--enable-cserve],[enable shared cache server (cserve2).
@<:@default=disabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
want_evas_cserve2="yes"
--
[EGIT] [core/efl] master 01/01: efl: Fix configure help message for multisense
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e6e104ee731e3b5856fe36ee11908f64ab5c49cf
commit e6e104ee731e3b5856fe36ee11908f64ab5c49cf
Author: Chris Michael
Date: Thu Nov 12 12:42:16 2015 -0500
efl: Fix configure help message for multisense
By default, multisense is disabled. The configure help message for
multisense was incorrect because it stated that multisense was enabled
by default
@fix
Signed-off-by: Chris Michael
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7ebd753..2b19fa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4216,7 +4216,7 @@ EFL_LIB_START([Edje])
### Default values
AC_ARG_ENABLE([multisense],
- [AS_HELP_STRING([--enable-multisense],[Enable multisense support.
@<:@default=enabled@:>@])],
+ [AS_HELP_STRING([--enable-multisense],[Enable multisense support.
@<:@default=disabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
want_multisense="yes"
--
[EGIT] [core/efl] master 01/01: ector: Add missing EINA_UNUSED for unused function parameter
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=41db18ffda927ce3b86e19b13dd27af7ab6922fb
commit 41db18ffda927ce3b86e19b13dd27af7ab6922fb
Author: Chris Michael
Date: Tue Nov 17 08:58:58 2015 -0500
ector: Add missing EINA_UNUSED for unused function parameter
Signed-off-by: Chris Michael
---
src/lib/ector/cairo/ector_renderer_cairo_shape.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 2c7a93e..5f6f1b4 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -67,7 +67,7 @@ struct _Ector_Renderer_Cairo_Shape_Data
};
static Eina_Bool
-_ector_renderer_cairo_shape_path_changed(void *data, Eo *obj, const
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+_ector_renderer_cairo_shape_path_changed(void *data, Eo *obj EINA_UNUSED,
const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ector_Renderer_Cairo_Shape_Data *pd = data;
--
[EGIT] [core/efl] master 02/03: evas-software-x11: Fix formatting
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2f0349f697451626cdce5fa8a3f20aa5c618436e
commit 2f0349f697451626cdce5fa8a3f20aa5c618436e
Author: Chris Michael
Date: Tue Nov 17 09:06:51 2015 -0500
evas-software-x11: Fix formatting
NB: No functional changes
Signed-off-by: Chris Michael
---
src/modules/evas/engines/software_x11/evas_xlib_dri_image.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
b/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
index d76e356..527f1f9 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
@@ -563,8 +563,8 @@ evas_xlib_image_dri_native_set(void *data, void *image,
void *native)
int idum;
unsigned int uidum, depth = 0;
- if(!ns || ns->type != EVAS_NATIVE_SURFACE_X11)
- return EINA_FALSE;
+ if (!ns || ns->type != EVAS_NATIVE_SURFACE_X11)
+ return EINA_FALSE;
d = ob->priv.x11.xlib.disp;
vis = ns->data.x11.visual;
@@ -579,16 +579,16 @@ evas_xlib_image_dri_native_set(void *data, void *image,
void *native)
exim = evas_xlib_image_dri_new(w, h, vis, depth);
if (!exim)
- {
+ {
ERR("evas_xlib_image_dri_new failed.");
return EINA_FALSE;
- }
+ }
exim->draw = (Drawable)ns->data.x11.pixmap;
n = calloc(1, sizeof(DRI_Native));
if (!n)
- return EINA_FALSE;
+ return EINA_FALSE;
memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
n->pixmap = pm;
--
[EGIT] [core/efl] master 01/03: evas-gl: Remove extra parentheses
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a043f8d04d8a9646da5e0f546d0c40980dc7d068
commit a043f8d04d8a9646da5e0f546d0c40980dc7d068
Author: Chris Michael
Date: Tue Nov 17 09:03:53 2015 -0500
evas-gl: Remove extra parentheses
clang warns of equality comparison with extraneous parentheses in
these cases. Remove the extra parens as they are not needed anyway
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/gl_common/evas_gl_api.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c
b/src/modules/evas/engines/gl_common/evas_gl_api.c
index e469fb3..42e6c7e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -953,7 +953,7 @@ _evgl_glGetFloatv(GLenum pname, GLfloat* params)
}
}
// If it hasn't been initialized yet, return img object size
- if ((pname == GL_SCISSOR_BOX) )//|| (pname == GL_VIEWPORT))
+ if (pname == GL_SCISSOR_BOX) //|| (pname == GL_VIEWPORT))
{
params[0] = (GLfloat)0.0;
params[1] = (GLfloat)0.0;
@@ -1149,7 +1149,7 @@ _evgl_glGetIntegerv(GLenum pname, GLint* params)
}
}
// If it hasn't been initialized yet, return img object size
- if ((pname == GL_SCISSOR_BOX) )//|| (pname == GL_VIEWPORT))
+ if (pname == GL_SCISSOR_BOX) //|| (pname == GL_VIEWPORT))
{
params[0] = 0;
params[1] = 0;
--
[EGIT] [core/efl] master 03/03: evas-software-x11: Fix returning NULL pointer
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=59ffefb9c1aa187435341d75f5811971ab917b2d
commit 59ffefb9c1aa187435341d75f5811971ab917b2d
Author: Chris Michael
Date: Tue Nov 17 09:07:45 2015 -0500
evas-software-x11: Fix returning NULL pointer
evas_xlib_image_dri_native_set should be returning a pointer to an
RGBA_Image on success, or NULL on failure. Returning EINA_FALSE here
leads to an expression which evaluates to zero being treated as a null
pointer constant
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/software_x11/evas_xlib_dri_image.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
b/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
index 527f1f9..2c1c72c 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
@@ -564,12 +564,12 @@ evas_xlib_image_dri_native_set(void *data, void *image,
void *native)
unsigned int uidum, depth = 0;
if (!ns || ns->type != EVAS_NATIVE_SURFACE_X11)
- return EINA_FALSE;
+ return NULL;
d = ob->priv.x11.xlib.disp;
vis = ns->data.x11.visual;
pm = ns->data.x11.pixmap;
- if (!pm) return EINA_FALSE;
+ if (!pm) return NULL;
XGetGeometry(d, pm, &wdum, &idum, &idum, &uidum, &uidum, &uidum, &depth);
@@ -581,14 +581,14 @@ evas_xlib_image_dri_native_set(void *data, void *image,
void *native)
if (!exim)
{
ERR("evas_xlib_image_dri_new failed.");
-return EINA_FALSE;
+return NULL;
}
exim->draw = (Drawable)ns->data.x11.pixmap;
n = calloc(1, sizeof(DRI_Native));
if (!n)
- return EINA_FALSE;
+ return NULL;
memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
n->pixmap = pm;
@@ -601,7 +601,7 @@ evas_xlib_image_dri_native_set(void *data, void *image,
void *native)
im->native.func.free = _native_free_cb;
if (evas_xlib_image_dri_init(exim, d)) evas_xlib_image_get_buffers(im);
- else return EINA_FALSE;
+ else return NULL;
return im;
}
--
[EGIT] [core/efl] master 01/01: evas-software-x11: Fix resource leak
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e29da3ca694d62f9c0049e1d8d65f8f95e6bf455
commit e29da3ca694d62f9c0049e1d8d65f8f95e6bf455
Author: Chris Michael
Date: Tue Nov 17 10:00:19 2015 -0500
evas-software-x11: Fix resource leak
If we end up leaving evas_xlib_image_dri_native_set due to a failure
to allocate memory, we should free the previously allocated
Evas_DRI_Image so that we don't leak
NB: Fixes Coverity CID1339782
@fix
Signed-off-by: Chris Michael
---
src/modules/evas/engines/software_x11/evas_xlib_dri_image.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
b/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
index 2c1c72c..0c0a0ab 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_dri_image.c
@@ -588,7 +588,10 @@ evas_xlib_image_dri_native_set(void *data, void *image,
void *native)
n = calloc(1, sizeof(DRI_Native));
if (!n)
- return NULL;
+ {
+evas_xlib_image_dri_free(exim);
+return NULL;
+ }
memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface));
n->pixmap = pm;
--
[EGIT] [core/efl] master 01/01: ector: Fix incorrect expression
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e04146f7dec24fa1769519b57fc996a1ddd33af5 commit e04146f7dec24fa1769519b57fc996a1ddd33af5 Author: Chris Michael Date: Tue Nov 17 10:06:55 2015 -0500 ector: Fix incorrect expression Coverity reports that 'obj' is written twice with the same value here., so fix this with a proper call to eo_do_super_ret NB: Fixes Coverity CID1339786 @fix Signed-off-by: Chris Michael --- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index 5f6f1b4..2672be5 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -259,7 +259,7 @@ _ector_renderer_cairo_shape_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Sh USE(obj, cairo_path_destroy, NULL); USE(obj, cairo_move_to, NULL); - obj = eo_do_super_ret(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj, obj = eo_constructor()); + obj = eo_do_super_ret(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, obj, eo_constructor()); if (!obj) return NULL; pd->shape = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_SHAPE_MIXIN, obj); --
[EGIT] [core/efl] master 01/01: ecore-evas-wl: Fix issue of improper window geometry
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d34ad18f3081dc4f887dd869639fd3e72d3bbc11
commit d34ad18f3081dc4f887dd869639fd3e72d3bbc11
Author: Chris Michael
Date: Tue Nov 17 13:51:19 2015 -0500
ecore-evas-wl: Fix issue of improper window geometry
This fixes an issue where maximizing a window would set improper xdg
surface window geometry. We receive window configure sizes based on
xdg surface window geometry, so we need to subtract framespace there
or else window size grows when maximizing/unmaximizing multiple times.
This also adjusts the call to xdg_surface_set_window_geometry to
account for framespace (Fixes T2842).
@fix
Signed-off-by: Chris Michael
---
.../engines/wayland/ecore_evas_wayland_common.c | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index ef0e7e1..5027cce 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -168,6 +168,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl_Event_Window_Configure *ev;
int nw = 0, nh = 0;
+ int fw = 0, fh = 0;
Eina_Bool prev_max, prev_full;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -190,6 +191,18 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
if (nw < 1) nw = 1;
if (nh < 1) nh = 1;
+ evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
+ if (ECORE_EVAS_PORTRAIT(ee))
+ {
+nw -= fw;
+nh -= fh;
+ }
+ else
+ {
+nw -= fh;
+nh -= fw;
+ }
+
if (prev_full != ee->prop.fullscreen)
_ecore_evas_wl_common_border_update(ee);
@@ -636,8 +649,9 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
+
if (wdata->win)
- ecore_wl_window_update_size(wdata->win, ee->req.w, ee->req.h);
+ ecore_wl_window_update_size(wdata->win, w, h);
}
void
--
[EGIT] [core/efl] master 03/03: ecore-wayland: Make ecore_wl_window_maximized_get return proper values
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=eacd4cc6f674dde0f43f9eb4a14be8a40980e285 commit eacd4cc6f674dde0f43f9eb4a14be8a40980e285 Author: Chris Michael Date: Tue Nov 17 15:57:45 2015 -0500 ecore-wayland: Make ecore_wl_window_maximized_get return proper values This brings ecore_wl_window_maximized_get more inline with ecore_wl_fullscreen_get function in that it will now check either the window maximized state, or the window type, to determine if a window is actually maximized @fix Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl_window.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 9751fa2..a261d78 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -490,10 +490,7 @@ ecore_wl_window_maximized_get(Ecore_Wl_Window *win) if (!win) return EINA_FALSE; - if (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED) - return EINA_TRUE; - - return EINA_FALSE; + return win->maximized || (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED); } EAPI void --
[EGIT] [core/efl] master 01/03: ecore-drm: Don't send mouse_move event too early
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0210051a40beb2d53789ced8b6c97671ea99ef2b
commit 0210051a40beb2d53789ced8b6c97671ea99ef2b
Author: Chris Michael
Date: Tue Nov 17 15:54:34 2015 -0500
ecore-drm: Don't send mouse_move event too early
We cannot be sending an ecore_event for mouse move here as it is too
early in the startup process for that too happen. Raising the event
here never gets caught because the ecore_evas has not yet registered
for ecore_input listening.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_evdev.c | 32
1 file changed, 32 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c
b/src/lib/ecore_drm/ecore_drm_evdev.c
index fe38302..69b398f 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -80,40 +80,8 @@ _device_output_set(Ecore_Drm_Evdev *edev)
if (libinput_device_has_capability(edev->device,
LIBINPUT_DEVICE_CAP_POINTER))
{
-Ecore_Drm_Input *pointer_input;
-Ecore_Event_Mouse_Move *ev;
-
edev->mouse.dx = edev->output->current_mode->width / 2;
edev->mouse.dy = edev->output->current_mode->height / 2;
-
-/* send a fake motion event to let other know the initial pos of mouse
*/
-if (!(pointer_input = edev->seat->input)) return;
-if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move return;
-
-ev->window = (Ecore_Window)pointer_input->dev->window;
-ev->event_window = (Ecore_Window)pointer_input->dev->window;
-ev->root_window = (Ecore_Window)pointer_input->dev->window;
-
-_device_modifiers_update(edev);
-ev->modifiers = edev->xkb.modifiers;
-ev->same_screen = 1;
-
-ev->x = edev->mouse.dx;
-ev->y = edev->mouse.dy;
-ev->root.x = ev->x;
-ev->root.y = ev->y;
-ev->multi.device = edev->mt_slot;
-ev->multi.radius = 1;
-ev->multi.radius_x = 1;
-ev->multi.radius_y = 1;
-ev->multi.pressure = 1.0;
-ev->multi.angle = 0.0;
-ev->multi.x = ev->x;
-ev->multi.y = ev->y;
-ev->multi.root.x = ev->x;
-ev->multi.root.y = ev->y;
-
-ecore_event_add(ECORE_EVENT_MOUSE_MOVE, ev, NULL, NULL);
}
}
--
[EGIT] [core/efl] master 02/03: ecore-evas-drm: Send fake mouse_move event after registering
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=85b04c188a7375ae77d3806d4c13468d480d2449
commit 85b04c188a7375ae77d3806d4c13468d480d2449
Author: Chris Michael
Date: Tue Nov 17 15:55:41 2015 -0500
ecore-evas-drm: Send fake mouse_move event after registering
This fixes an issue where ecore_drm was sending an initial mouse_move
event too early in the startup process. Instead, we will send the
event from Ecore_Evas after it has been registered with Ecore_Input.
This is done here to address and Fix T2854.
@fix
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index a806cc0..9652144 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -322,6 +322,25 @@ ecore_evas_drm_new_internal(const char *device, unsigned
int parent EINA_UNUSED,
(Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
(Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
+ /* NB: Send a fake mouse move event so that E-Wl gets an updated
+* pointer position, else we end up with buggers (ref: T2854) */
+ {
+Ecore_Event_Mouse_Move *ev;
+
+ev = calloc(1, sizeof(Ecore_Event_Mouse_Move));
+ev->window = ee->prop.window;
+ev->event_window = ee->prop.window;
+ev->root_window = ee->prop.window;
+ev->same_screen = 1;
+
+ecore_drm_device_pointer_xy_get(dev, &ev->x, &ev->y);
+
+ev->root.x = ev->x;
+ev->root.y = ev->y;
+
+ecore_event_evas_mouse_move(NULL, ECORE_EVENT_MOUSE_MOVE, ev);
+ }
+
return ee;
eng_err:
--
[EGIT] [core/efl] efl-1.16 03/04: ecore-evas-drm: Send fake mouse_move event after registering
discomfitor pushed a commit to branch efl-1.16.
http://git.enlightenment.org/core/efl.git/commit/?id=ecb00445baf5ce876ad87e763bf8b095c460b1a0
commit ecb00445baf5ce876ad87e763bf8b095c460b1a0
Author: Chris Michael
Date: Tue Nov 17 15:55:41 2015 -0500
ecore-evas-drm: Send fake mouse_move event after registering
This fixes an issue where ecore_drm was sending an initial mouse_move
event too early in the startup process. Instead, we will send the
event from Ecore_Evas after it has been registered with Ecore_Input.
This is done here to address and Fix T2854.
@fix
Signed-off-by: Chris Michael
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index a806cc0..9652144 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -322,6 +322,25 @@ ecore_evas_drm_new_internal(const char *device, unsigned
int parent EINA_UNUSED,
(Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
(Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
+ /* NB: Send a fake mouse move event so that E-Wl gets an updated
+* pointer position, else we end up with buggers (ref: T2854) */
+ {
+Ecore_Event_Mouse_Move *ev;
+
+ev = calloc(1, sizeof(Ecore_Event_Mouse_Move));
+ev->window = ee->prop.window;
+ev->event_window = ee->prop.window;
+ev->root_window = ee->prop.window;
+ev->same_screen = 1;
+
+ecore_drm_device_pointer_xy_get(dev, &ev->x, &ev->y);
+
+ev->root.x = ev->x;
+ev->root.y = ev->y;
+
+ecore_event_evas_mouse_move(NULL, ECORE_EVENT_MOUSE_MOVE, ev);
+ }
+
return ee;
eng_err:
--
[EGIT] [core/efl] efl-1.16 01/04: ecore-evas-wl: Fix issue of improper window geometry
discomfitor pushed a commit to branch efl-1.16.
http://git.enlightenment.org/core/efl.git/commit/?id=f73e1fea16bb8ac9e5f43c57c29ac0fb80cb1353
commit f73e1fea16bb8ac9e5f43c57c29ac0fb80cb1353
Author: Chris Michael
Date: Tue Nov 17 13:51:19 2015 -0500
ecore-evas-wl: Fix issue of improper window geometry
This fixes an issue where maximizing a window would set improper xdg
surface window geometry. We receive window configure sizes based on
xdg surface window geometry, so we need to subtract framespace there
or else window size grows when maximizing/unmaximizing multiple times.
This also adjusts the call to xdg_surface_set_window_geometry to
account for framespace (Fixes T2842).
@fix
Signed-off-by: Chris Michael
---
.../engines/wayland/ecore_evas_wayland_common.c | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index ef0e7e1..5027cce 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -168,6 +168,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Wl_Event_Window_Configure *ev;
int nw = 0, nh = 0;
+ int fw = 0, fh = 0;
Eina_Bool prev_max, prev_full;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -190,6 +191,18 @@ _ecore_evas_wl_common_cb_window_configure(void *data
EINA_UNUSED, int type EINA_
if (nw < 1) nw = 1;
if (nh < 1) nh = 1;
+ evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
+ if (ECORE_EVAS_PORTRAIT(ee))
+ {
+nw -= fw;
+nh -= fh;
+ }
+ else
+ {
+nw -= fh;
+nh -= fw;
+ }
+
if (prev_full != ee->prop.fullscreen)
_ecore_evas_wl_common_border_update(ee);
@@ -636,8 +649,9 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
if (ee->func.fn_resize) ee->func.fn_resize(ee);
}
+
if (wdata->win)
- ecore_wl_window_update_size(wdata->win, ee->req.w, ee->req.h);
+ ecore_wl_window_update_size(wdata->win, w, h);
}
void
--
[EGIT] [core/efl] efl-1.16 02/04: ecore-drm: Don't send mouse_move event too early
discomfitor pushed a commit to branch efl-1.16.
http://git.enlightenment.org/core/efl.git/commit/?id=3c1cfca3b26990d07613c75c6de0add7b218790c
commit 3c1cfca3b26990d07613c75c6de0add7b218790c
Author: Chris Michael
Date: Tue Nov 17 15:54:34 2015 -0500
ecore-drm: Don't send mouse_move event too early
We cannot be sending an ecore_event for mouse move here as it is too
early in the startup process for that too happen. Raising the event
here never gets caught because the ecore_evas has not yet registered
for ecore_input listening.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_evdev.c | 32
1 file changed, 32 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c
b/src/lib/ecore_drm/ecore_drm_evdev.c
index fe38302..69b398f 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -80,40 +80,8 @@ _device_output_set(Ecore_Drm_Evdev *edev)
if (libinput_device_has_capability(edev->device,
LIBINPUT_DEVICE_CAP_POINTER))
{
-Ecore_Drm_Input *pointer_input;
-Ecore_Event_Mouse_Move *ev;
-
edev->mouse.dx = edev->output->current_mode->width / 2;
edev->mouse.dy = edev->output->current_mode->height / 2;
-
-/* send a fake motion event to let other know the initial pos of mouse
*/
-if (!(pointer_input = edev->seat->input)) return;
-if (!(ev = calloc(1, sizeof(Ecore_Event_Mouse_Move return;
-
-ev->window = (Ecore_Window)pointer_input->dev->window;
-ev->event_window = (Ecore_Window)pointer_input->dev->window;
-ev->root_window = (Ecore_Window)pointer_input->dev->window;
-
-_device_modifiers_update(edev);
-ev->modifiers = edev->xkb.modifiers;
-ev->same_screen = 1;
-
-ev->x = edev->mouse.dx;
-ev->y = edev->mouse.dy;
-ev->root.x = ev->x;
-ev->root.y = ev->y;
-ev->multi.device = edev->mt_slot;
-ev->multi.radius = 1;
-ev->multi.radius_x = 1;
-ev->multi.radius_y = 1;
-ev->multi.pressure = 1.0;
-ev->multi.angle = 0.0;
-ev->multi.x = ev->x;
-ev->multi.y = ev->y;
-ev->multi.root.x = ev->x;
-ev->multi.root.y = ev->y;
-
-ecore_event_add(ECORE_EVENT_MOUSE_MOVE, ev, NULL, NULL);
}
}
--
[EGIT] [core/efl] efl-1.16 04/04: ecore-wayland: Make ecore_wl_window_maximized_get return proper values
discomfitor pushed a commit to branch efl-1.16. http://git.enlightenment.org/core/efl.git/commit/?id=c1876763ee3b732adebe72a105b7cfb02d724d71 commit c1876763ee3b732adebe72a105b7cfb02d724d71 Author: Chris Michael Date: Tue Nov 17 15:57:45 2015 -0500 ecore-wayland: Make ecore_wl_window_maximized_get return proper values This brings ecore_wl_window_maximized_get more inline with ecore_wl_fullscreen_get function in that it will now check either the window maximized state, or the window type, to determine if a window is actually maximized @fix Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl_window.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 9751fa2..a261d78 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -490,10 +490,7 @@ ecore_wl_window_maximized_get(Ecore_Wl_Window *win) if (!win) return EINA_FALSE; - if (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED) - return EINA_TRUE; - - return EINA_FALSE; + return win->maximized || (win->type == ECORE_WL_WINDOW_TYPE_MAXIMIZED); } EAPI void --
[EGIT] [core/efl] master 01/01: evas-gl_drm: Remove set but unused variable
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9a542d0dcc7450a235090a680444043fabcdd243 commit 9a542d0dcc7450a235090a680444043fabcdd243 Author: Chris Michael Date: Tue Nov 17 16:07:14 2015 -0500 evas-gl_drm: Remove set but unused variable Variable 'osurface' is not actually being used inside the code here, so remove it. @fix Signed-off-by: Chris Michael --- src/modules/evas/engines/gl_drm/evas_outbuf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/evas/engines/gl_drm/evas_outbuf.c b/src/modules/evas/engines/gl_drm/evas_outbuf.c index 8c93988..084e8d9 100644 --- a/src/modules/evas/engines/gl_drm/evas_outbuf.c +++ b/src/modules/evas/engines/gl_drm/evas_outbuf.c @@ -536,7 +536,6 @@ evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth) Evas_Public_Data *epd; Evas_Engine_Info_GL_Drm *einfo; Render_Engine *re; - struct gbm_surface *osurface; Outbuf *nob; if (depth == OUTBUF_DEPTH_INHERIT) depth = ob->depth; @@ -548,7 +547,6 @@ evas_outbuf_reconfigure(Outbuf *ob, int w, int h, int rot, Outbuf_Depth depth) EINA_SAFETY_ON_NULL_RETURN(re); einfo = ob->info; - osurface = ob->surface; if ((ob->rotation == 0) || (ob->rotation == 180)) nob = evas_outbuf_new(einfo, w, h, ob->swap_mode); --
[EGIT] [core/efl] master 01/01: ecore-wayland: Add EINA_SAFETY checks to window functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=35b4794c4afd1c2ffc865a90068b26d36e72def9
commit 35b4794c4afd1c2ffc865a90068b26d36e72def9
Author: Chris Michael
Date: Wed Nov 18 12:19:17 2015 -0500
ecore-wayland: Add EINA_SAFETY checks to window functions
This adds EINA_SAFETY returns for all public facing ecore_wl_window
functions.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_window.c | 93 -
1 file changed, 58 insertions(+), 35 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 40c833e..389cebc 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -237,7 +237,7 @@ ecore_wl_window_free(Ecore_Wl_Window *win)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
eina_hash_del(_windows, _ecore_wl_window_id_str_get(win->id), win);
@@ -286,7 +286,7 @@ ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
input = win->keyboard_device;
ecore_wl_window_update_location(win, x, y);
@@ -315,7 +315,7 @@ ecore_wl_window_resize(Ecore_Wl_Window *win, int w
EINA_UNUSED, int h EINA_UNUSE
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
input = win->keyboard_device;
@@ -342,7 +342,8 @@ ecore_wl_window_damage(Ecore_Wl_Window *win, int x, int y,
int w, int h)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
+
if (win->surface) wl_surface_damage(win->surface, x, y, w, h);
}
@@ -351,7 +352,7 @@ ecore_wl_window_commit(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
if ((win->surface))// && (win->has_buffer))
wl_surface_commit(win->surface);
@@ -362,7 +363,7 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct
wl_buffer *buffer, in
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
switch (win->buffer_type)
{
@@ -391,7 +392,8 @@ ecore_wl_window_surface_create(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return NULL;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(win, NULL);
+
if (win->surface) return win->surface;
if (_ecore_wl_disp->wl.session_recovery)
session_recovery_add_listener(_ecore_wl_disp->wl.session_recovery,
&_ecore_session_recovery_listener, win);
@@ -418,7 +420,7 @@ ecore_wl_window_hide(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
if (win->xdg_surface) xdg_surface_destroy(win->xdg_surface);
win->xdg_surface = NULL;
@@ -438,7 +440,8 @@ ecore_wl_window_raise(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
+
/* FIXME: This should raise the xdg surface also */
if (win->shell_surface)
wl_shell_surface_set_toplevel(win->shell_surface);
@@ -482,7 +485,7 @@ ecore_wl_window_maximized_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return EINA_FALSE;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
return win->maximized;
}
@@ -530,7 +533,7 @@ ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return EINA_FALSE;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
return win->fullscreen;
}
@@ -540,7 +543,8 @@ ecore_wl_window_transparent_set(Ecore_Wl_Window *win,
Eina_Bool transparent)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
+
win->transparent = transparent;
if (!win->transparent)
ecore_wl_window_opaque_region_set(win, win->opaque.x, win->opaque.y,
@@ -554,7 +558,7 @@ ecore_wl_window_alpha_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return EINA_FALSE;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
return win->alpha;
}
@@ -564,7 +568,8 @@ ecore_wl_window_alpha_set(Ecore_Wl_Window *win, Eina_Bool
alpha)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return;
+ EINA_SAFETY_ON_NULL_RETURN(win);
+
win->alpha = alpha;
if (!win->alpha)
ecore_wl_window_opaque_region_set(win, win->opaque.x, win->opaque.y,
@@ -578,7 +583,7 @@ ecore_wl_window_transparent_get(Ecore_Wl_Window *win)
{
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- if (!win) return EINA_FALSE;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(win, EINA_FALSE);
return win->transparent;
}
@@ -588,7 +593,8 @@ eco
[EGIT] [core/efl] master 01/02: ecore-wayland: Fix iconified functions for consistency
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4534c4aec3aa518b5723b483694c78a30a07ee46
commit 4534c4aec3aa518b5723b483694c78a30a07ee46
Author: Chris Michael
Date: Wed Nov 18 12:54:00 2015 -0500
ecore-wayland: Fix iconified functions for consistency
* sanitize bool params
* enforce window state flag setting
* correctly detect window state using window flag
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_window.c | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 389cebc..95ff881 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -745,6 +745,7 @@ ecore_wl_window_parent_set(Ecore_Wl_Window *win,
Ecore_Wl_Window *parent)
EAPI void
ecore_wl_window_iconified_set(Ecore_Wl_Window *win, Eina_Bool iconified)
{
+ Eina_Bool prev;
struct wl_array states;
uint32_t *s;
@@ -752,13 +753,14 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win,
Eina_Bool iconified)
EINA_SAFETY_ON_NULL_RETURN(win);
+ prev = win->minimized;
+ iconified = !!iconified;
+ if (prev == iconified) return;
+
if (iconified)
{
if (win->xdg_surface)
- {
- xdg_surface_set_minimized(win->xdg_surface);
- win->minimized = iconified;
- }
+ xdg_surface_set_minimized(win->xdg_surface);
else if (win->shell_surface)
{
/* TODO: handle case of iconifying a wl_shell surface */
@@ -768,7 +770,6 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win,
Eina_Bool iconified)
{
if (win->xdg_surface)
{
- win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
wl_array_init(&states);
s = wl_array_add(&states, sizeof(*s));
*s = XDG_SURFACE_STATE_ACTIVATED;
@@ -776,12 +777,12 @@ ecore_wl_window_iconified_set(Ecore_Wl_Window *win,
Eina_Bool iconified)
wl_array_release(&states);
}
else if (win->shell_surface)
- {
- wl_shell_surface_set_toplevel(win->shell_surface);
- win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
- _ecore_wl_window_configure_send(win, win->saved.w, win->saved.h,
0);
- }
+ wl_shell_surface_set_toplevel(win->shell_surface);
+
+win->type = ECORE_WL_WINDOW_TYPE_TOPLEVEL;
}
+
+ win->minimized = iconified;
}
EAPI Eina_Bool
--
[EGIT] [core/efl] master 02/02: ecore-wayland: Reduce overhead for maximize/fullscreen set functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2ebef8010e51fd2dd6a38f30dac42debc20a1e80
commit 2ebef8010e51fd2dd6a38f30dac42debc20a1e80
Author: Chris Michael
Date: Wed Nov 18 12:56:12 2015 -0500
ecore-wayland: Reduce overhead for maximize/fullscreen set functions
This patch just gets the state flags directly from the window rather
than calling "get" functions to return the same parameter.
@fix
Signed-off-by: Chris Michael
---
src/lib/ecore_wayland/ecore_wl_window.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c
b/src/lib/ecore_wayland/ecore_wl_window.c
index 95ff881..982dfd5 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -455,10 +455,9 @@ ecore_wl_window_maximized_set(Ecore_Wl_Window *win,
Eina_Bool maximized)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
EINA_SAFETY_ON_NULL_RETURN(win);
- prev = ecore_wl_window_maximized_get(win);
+ prev = win->maximized;
maximized = !!maximized;
-
if (prev == maximized) return;
if (maximized)
@@ -499,11 +498,10 @@ ecore_wl_window_fullscreen_set(Ecore_Wl_Window *win,
Eina_Bool fullscreen)
EINA_SAFETY_ON_NULL_RETURN(win);
- prev = ecore_wl_window_fullscreen_get(win);
-
+ prev = win->fullscreen;
fullscreen = !!fullscreen;
-
if (prev == fullscreen) return;
+
if (fullscreen)
{
win->type = ECORE_WL_WINDOW_TYPE_FULLSCREEN;
--
[EGIT] [core/enlightenment] master 02/02: Fix invalid compositor type check in e_dpms_force_update
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ebf1318b0d9a16d989161d9acda0d78164b531cf commit ebf1318b0d9a16d989161d9acda0d78164b531cf Author: Chris Michael Date: Mon Nov 23 10:00:36 2015 -0500 Fix invalid compositor type check in e_dpms_force_update Signed-off-by: Chris Michael --- src/bin/e_dpms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c index 537bddb..718b555 100644 --- a/src/bin/e_dpms.c +++ b/src/bin/e_dpms.c @@ -98,7 +98,7 @@ e_dpms_force_update(void) off += OFF; } #ifndef HAVE_WAYLAND_ONLY - if (!e_comp->comp_type == E_PIXMAP_TYPE_X) return; + if (e_comp->comp_type != E_PIXMAP_TYPE_X) return; ecore_x_dpms_timeouts_set(standby + 10, suspend + 10, off + 10); ecore_x_dpms_timeouts_set(standby, suspend, off); #endif --
[EGIT] [core/enlightenment] master 01/02: Fix formatting and remove extra blank line
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=eff826b4e320c90329c5ebb42d2776c78cb803c3
commit eff826b4e320c90329c5ebb42d2776c78cb803c3
Author: Chris Michael
Date: Mon Nov 23 09:48:58 2015 -0500
Fix formatting and remove extra blank line
Signed-off-by: Chris Michael
---
src/bin/e_dpms.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index 8186464..537bddb 100644
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -34,8 +34,8 @@ e_dpms_update(void)
enabled = ((e_config->screensaver_enable) &&
(!e_config->mode.presentation) &&
- ((!e_util_fullscreen_current_any()) &&
(!e_config->no_dpms_on_fullscreen))
- );
+ ((!e_util_fullscreen_current_any()) &&
+ (!e_config->no_dpms_on_fullscreen)));
if (_e_dpms_enabled != enabled)
{
_e_dpms_enabled = enabled;
@@ -220,8 +220,10 @@ e_dpms_init(void)
#ifdef HAVE_WAYLAND
if (e_comp->comp_type != E_PIXMAP_TYPE_X)
{
-E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON,
_e_dpms_screensaver_on, NULL);
-E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF_PRE,
_e_dpms_screensaver_off, NULL);
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON,
+ _e_dpms_screensaver_on, NULL);
+E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_OFF_PRE,
+ _e_dpms_screensaver_off, NULL);
}
#endif
@@ -281,4 +283,3 @@ e_dpms_shutdown(void)
return 1;
}
-
--
[EGIT] [core/efl] master 01/01: evas-3d: Fix missing field initializers
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=886c20a43b75256f7895328af2edf40c284f0b4f
commit 886c20a43b75256f7895328af2edf40c284f0b4f
Author: Chris Michael
Date: Mon Nov 30 09:15:53 2015 -0500
evas-3d: Fix missing field initializers
Clang spits warnings here about missing field initializers for
Evas_Vec3 (missing y and z fields), so we will explicitly initialize
them to 0 (matching the x field).
@fix
Signed-off-by: Chris Michael
---
src/lib/evas/include/evas_3d_utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/include/evas_3d_utils.h
b/src/lib/evas/include/evas_3d_utils.h
index c29f24f..10192cc 100644
--- a/src/lib/evas/include/evas_3d_utils.h
+++ b/src/lib/evas/include/evas_3d_utils.h
@@ -1578,7 +1578,7 @@ convex_hull_vertex_set(Evas_Triangle3 *el, unsigned short
int *vertex_count, flo
unsigned short int **index, unsigned int k, int *leader,
int coord)
{
int color_coords, normal_coords;
- Evas_Vec3 vect = {0};
+ Evas_Vec3 vect = {0, 0, 0};
switch (coord)
{
case 0:
--
[EGIT] [core/elementary] master 01/01: elementary: Fix test_colorclass function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=110aa7768289d7a9cc4ddd7be0298c98451d3663
commit 110aa7768289d7a9cc4ddd7be0298c98451d3663
Author: Chris Michael
Date: Mon Nov 30 09:45:12 2015 -0500
elementary: Fix test_colorclass function
The test_colorclass function (and prototype) were incorrect in that
they did not have the proper function parameters defined. This lead to
a warning when building elementary tests.
@fix
Signed-off-by: Chris Michael
---
src/bin/test.c| 2 +-
src/bin/test_colorclass.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/test.c b/src/bin/test.c
index ddd1c4e..c1539d5 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -268,7 +268,7 @@ void test_win_dialog(void *data, Evas_Object *obj, void
*event_info);
void test_box_disable(void *data, Evas_Object *obj, void *event_info);
void test_layout_disable(void *data, Evas_Object *obj, void *event_info);
-void test_colorclass(void);
+void test_colorclass(void *data, Evas_Object *obj, void *event_info);
Evas_Object *win, *tbx; // TODO: refactoring
void *tt;
diff --git a/src/bin/test_colorclass.c b/src/bin/test_colorclass.c
index d110d23..8764065 100644
--- a/src/bin/test_colorclass.c
+++ b/src/bin/test_colorclass.c
@@ -5,7 +5,7 @@
void
-test_colorclass()
+test_colorclass(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *win, *cc;
--
[EGIT] [core/efl] master 186/262: ecore-wl2: Adjust keyboard repeat delay and rate
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=89c973eba816359cb59dd88fac80826be46fcd41 commit 89c973eba816359cb59dd88fac80826be46fcd41 Author: Chris Michael Date: Wed Oct 7 09:22:05 2015 -0400 ecore-wl2: Adjust keyboard repeat delay and rate Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c index 6ea1166..711d249 100644 --- a/src/lib/ecore_wl2/ecore_wl2_input.c +++ b/src/lib/ecore_wl2/ecore_wl2_input.c @@ -892,8 +892,8 @@ _keyboard_cb_repeat_setup(void *data, struct wl_keyboard *keyboard EINA_UNUSED, } input->repeat.enabled = EINA_TRUE; - input->repeat.rate = (rate / 1000); - input->repeat.delay = (delay / 100); + input->repeat.rate = (rate / 1); + input->repeat.delay = (delay / 1000); } static const struct wl_keyboard_listener _keyboard_listener = --
[EGIT] [core/efl] master 173/262: ecore-wl2: Start on preliminary subsurface support
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=434fbd6fb94acf728056009f316b261f950a83fb
commit 434fbd6fb94acf728056009f316b261f950a83fb
Author: Chris Michael
Date: Thu Oct 1 12:22:32 2015 -0400
ecore-wl2: Start on preliminary subsurface support
Signed-off-by: Chris Michael
---
src/Makefile_Ecore_Wl2.am | 1 +
src/lib/ecore_wl2/Ecore_Wl2.h | 19 +-
src/lib/ecore_wl2/ecore_wl2_private.h | 4 +-
src/lib/ecore_wl2/ecore_wl2_subsurf.c | 71 +++
src/lib/ecore_wl2/ecore_wl2_window.c | 13 ---
5 files changed, 101 insertions(+), 7 deletions(-)
diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am
index 462e8aa..0dc3dec 100644
--- a/src/Makefile_Ecore_Wl2.am
+++ b/src/Makefile_Ecore_Wl2.am
@@ -12,6 +12,7 @@ lib/ecore_wl2/subsurface-client-protocol.h \
lib/ecore_wl2/subsurface-protocol.c \
lib/ecore_wl2/xdg-shell-client-protocol.h \
lib/ecore_wl2/xdg-shell-protocol.c \
+lib/ecore_wl2/ecore_wl2_subsurf.c \
lib/ecore_wl2/ecore_wl2_dnd.c \
lib/ecore_wl2/ecore_wl2_window.c \
lib/ecore_wl2/ecore_wl2_input.c \
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 0ebaaa8..d2fbae5 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -28,7 +28,7 @@
/* extern "C" { */
/* # endif */
-typedef struct _Ecore_Wl2_Subsurf Ecore_Wl2_Subsurf;
+typedef struct _Ecore_Wl2_Subsurface Ecore_Wl2_Subsurface;
# ifndef _ECORE_WL2_WINDOW_PREDEF
typedef struct _Ecore_Wl2_Window Ecore_Wl2_Window;
@@ -164,6 +164,7 @@ EAPI extern int ECORE_WL2_EVENT_WINDOW_CONFIGURE;
* @li @ref Ecore_Wl2_Init_Group
* @li @ref Ecore_Wl2_Display_Group
* @li @ref Ecore_Wl2_Window_Group
+ * @li @ref Ecore_Wl2_Subsurface_Group
*/
/**
@@ -573,6 +574,22 @@ EAPI Eina_Bool
ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input);
/* TODO: doxy */
EAPI void ecore_wl2_input_ungrab(Ecore_Wl2_Input *input);
+/**
+ * Create and return a new subsurface.
+ *
+ * Create a new surface (and subsurface interface), with the parent surface
+ * being the one associated with the given @param win.
+ *
+ * The @param win must be visible, otherwise there will be no surface created
+ * for it yet.
+ *
+ * @return the allocated and initialized Ecore_Wl2_Subsurface object, or
+ * NULL on failure
+ *
+ * @ingroup Ecore_Wl2_Subsurface_Group
+ */
+EAPI Ecore_Wl2_Subsurface *ecore_wl2_subsurface_new(Ecore_Wl2_Window *window);
+
/* # ifdef __cplusplus */
/* } */
/* # endif */
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 34af1e0..4adf17f 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -114,7 +114,7 @@ struct _Ecore_Wl2_Window
Eina_Rectangle geometry;
Eina_Rectangle opaque;
- Eina_Rectangle input;
+ Eina_Rectangle input_rect;
Ecore_Wl2_Window_Type type;
@@ -267,4 +267,6 @@ void _ecore_wl2_dnd_drop(Ecore_Wl2_Input *input);
void _ecore_wl2_dnd_selection(Ecore_Wl2_Input *input, struct wl_data_offer
*offer);
void _ecore_wl2_dnd_del(Ecore_Wl2_Dnd_Source *source);
+void _ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf);
+
#endif
diff --git a/src/lib/ecore_wl2/ecore_wl2_subsurf.c
b/src/lib/ecore_wl2/ecore_wl2_subsurf.c
new file mode 100644
index 000..90a9343
--- /dev/null
+++ b/src/lib/ecore_wl2/ecore_wl2_subsurf.c
@@ -0,0 +1,71 @@
+#ifdef HAVE_CONFIG_H
+# include
+#endif
+
+#include "ecore_wl2_private.h"
+
+void
+_ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf)
+{
+ Ecore_Wl2_Window *parent;
+
+ if (subsurf->wl.subsurface) wl_subsurface_destroy(subsurf->wl.subsurface);
+ if (subsurf->wl.surface) wl_surface_destroy(subsurf->wl.surface);
+
+ parent = subsurf->parent;
+ if (parent)
+ {
+parent->subsurfs =
+ eina_inlist_remove(parent->subsurfs, EINA_INLIST_GET(subsurf));
+ }
+
+ free(subsurf);
+}
+
+EAPI Ecore_Wl2_Subsurface *
+ecore_wl2_subsurface_new(Ecore_Wl2_Window *window)
+{
+ Ecore_Wl2_Display *display;
+ Ecore_Wl2_Subsurface *subsurf;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(window->surface, NULL);
+
+ display = window->display;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(display->wl.compositor, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(display->wl.subcompositor, NULL);
+
+ subsurf = calloc(1, sizeof(Ecore_Wl2_Subsurface));
+ if (!subsurf) return NULL;
+
+ subsurf->parent = window;
+
+ subsurf->wl.surface = wl_compositor_create_surface(display->wl.compositor);
+ if (!subsurf->wl.surface)
+ {
+ERR("Failed to create surface: %m");
+goto surf_err;
+ }
+
+ subsurf->wl.subsurface =
+ wl_subcompositor_get_subsurface(display->wl.subcompositor,
+ subsurf->wl.surface, window->surface);
+ if (!subsurf->wl.subsurface)
+ {
+ERR("Could not create subsurface: %m");
+
[EGIT] [core/efl] master 189/262: ecore-wl2: Set WAYLAND_DISPLAY env variable when we create a display
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fbfe60751d63ce63e499c169186b387a1b91bcf9
commit fbfe60751d63ce63e499c169186b387a1b91bcf9
Author: Chris Michael
Date: Thu Oct 8 14:13:05 2015 -0400
ecore-wl2: Set WAYLAND_DISPLAY env variable when we create a display
Signed-off-by: Chris Michael
---
src/lib/ecore_wl2/ecore_wl2_display.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index bf4aed1..7c610f5 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -368,6 +368,8 @@ ecore_wl2_display_create(const char *name)
}
}
+ setenv("WAYLAND_DISPLAY", ewd->name, 1);
+
loop = wl_display_get_event_loop(ewd->wl.display);
ewd->fd_hdl =
--
[EGIT] [core/efl] master 21/262: ecore-wl2: Call wl_event_loop_dispatch with a 0 timeout
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=963b1da5f14cd08df79a0ae3905781633017abc1 commit 963b1da5f14cd08df79a0ae3905781633017abc1 Author: Chris Michael Date: Thu Aug 20 09:41:39 2015 -0400 ecore-wl2: Call wl_event_loop_dispatch with a 0 timeout Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 9002769..a0310ab 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -140,7 +140,7 @@ _cb_create_data(void *data, Ecore_Fd_Handler *hdl) } loop = wl_display_get_event_loop(ewd->wl.display); - wl_event_loop_dispatch(loop, -1); + wl_event_loop_dispatch(loop, 0); wl_display_flush_clients(ewd->wl.display); return ECORE_CALLBACK_RENEW; --
[EGIT] [core/efl] master 20/262: ecore-wl2: Add support for binding various wayland interfaces
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=54a034550339e6531a6c02428c4dca94f711726f
commit 54a034550339e6531a6c02428c4dca94f711726f
Author: Chris Michael
Date: Wed Aug 19 13:48:19 2015 -0400
ecore-wl2: Add support for binding various wayland interfaces
Signed-off-by: Chris Michael
---
src/lib/ecore_wl2/ecore_wl2_display.c | 34 ++
src/lib/ecore_wl2/ecore_wl2_private.h | 9 +
2 files changed, 43 insertions(+)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 4102f19..9002769 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -43,6 +43,40 @@ _cb_global_add(void *data, struct wl_registry *registry,
unsigned int id, const
}
}
+ if (!strcmp(interface, "wl_compositor"))
+ {
+ewd->wl.compositor =
+ wl_registry_bind(registry, id, &wl_compositor_interface, 3);
+ }
+ else if (!strcmp(interface, "wl_subcompositor"))
+ {
+ewd->wl.subcompositor =
+ wl_registry_bind(registry, id, &wl_subcompositor_interface, 1);
+ }
+ else if (!strcmp(interface, "wl_shm"))
+ {
+ewd->wl.shm =
+ wl_registry_bind(registry, id, &wl_shm_interface, 1);
+ }
+ else if (!strcmp(interface, "wl_data_device_manager"))
+ {
+ewd->wl.data_device_manager =
+ wl_registry_bind(registry, id, &wl_data_device_manager_interface, 1);
+ }
+ else if (!strcmp(interface, "wl_shell"))
+ {
+ewd->wl.wl_shell =
+ wl_registry_bind(registry, id, &wl_shell_interface, 1);
+ }
+ else if ((!strcmp(interface, "xdg_shell")) &&
+(!getenv("EFL_WAYLAND_DONT_USE_XDG_SHELL")))
+ {
+ewd->wl.xdg_shell =
+ wl_registry_bind(registry, id, &xdg_shell_interface, 1);
+xdg_shell_use_unstable_version(ewd->wl.xdg_shell, XDG_VERSION);
+/* TODO: Add listener */
+ }
+
/* allocate space for event structure */
ev = calloc(1, sizeof(Ecore_Wl2_Event_Global));
if (!ev) return;
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h
b/src/lib/ecore_wl2/ecore_wl2_private.h
index edae5c3..f06 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -4,6 +4,9 @@
# include "Ecore_Wl2.h"
# include "Ecore_Input.h"
+# include "xdg-shell-client-protocol.h"
+# define XDG_VERSION 5
+
extern int _ecore_wl2_log_dom;
# ifdef ECORE_WL2_DEFAULT_LOG_COLOR
@@ -44,6 +47,12 @@ struct _Ecore_Wl2_Display
{
struct wl_display *display;
struct wl_registry *registry;
+struct wl_compositor *compositor;
+struct wl_subcompositor *subcompositor;
+struct wl_data_device_manager *data_device_manager;
+struct wl_shm *shm;
+struct wl_shell *wl_shell;
+struct xdg_shell *xdg_shell;
} wl;
Ecore_Fd_Handler *fd_hdl;
--
[EGIT] [core/efl] master 09/262: ecore-wl2: Add start of doxygen infrastructure
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2065766bb508b7c019dea19f60b398bc7faa726b commit 2065766bb508b7c019dea19f60b398bc7faa726b Author: Chris Michael Date: Tue Aug 18 10:57:32 2015 -0400 ecore-wl2: Add start of doxygen infrastructure Signed-off-by: Chris Michael --- src/lib/ecore_wl2/Ecore_Wl2.h | 39 +++ 1 file changed, 39 insertions(+) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 7a25863..ef33164 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -32,7 +32,46 @@ typedef struct _Ecore_Wl_Window Ecore_Wl_Window; EAPI extern int ECORE_WL2_EVENT_GLOBAL_ADDED; EAPI extern int ECORE_WL2_EVENT_GLOBAL_REMOVED; +/** + * @file + * @brief Ecore functions for dealing with the Wayland display protocol + * + * @defgroup Ecore_Wl2_Group Ecore_Wl2 - Wayland integration + * @ingroup Ecore + * + * Ecore_Wl2 provides a wrapper and convenience functions for using the + * Wayland protocol in implementing a window system. Function groups for + * this part of the library include the following: + * + * @li @ref Ecore_Wl2_Init_Group + * @li @ref Ecore_Wl2_Display_Group + */ + +/** + * @defgroup Ecore_Wl2_Init_Group Wayland Library Init and Shutdown Functions + * @ingroup Ecore_Wl2_Group + * + * Functions that start and shutdown the Ecore Wl2 Library. + */ + +/** + * Initialize the Ecore_Wl2 library + * + * @return The number of times the library has been initialized without being + * shutdown. 0 is returned if an error occurs. + * + * @ingroup Ecore_Wl2_Init_Group + */ EAPI int ecore_wl2_init(void); + +/** + * Shutdown the Ecore_Wl2 Library + * + * @return The number of times the library has been initialized without + * being shutdown. + * + * @ingroup Ecore_Wl2_Init_Group + */ EAPI int ecore_wl2_shutdown(void); /* # ifdef __cplusplus */ --
[EGIT] [core/efl] master 08/262: ecore-wl2: Add API function for ecore_wl2_shutdown
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b085e688d59af619a800e22202c413af4e19c6e3
commit b085e688d59af619a800e22202c413af4e19c6e3
Author: Chris Michael
Date: Tue Aug 18 10:15:01 2015 -0400
ecore-wl2: Add API function for ecore_wl2_shutdown
Signed-off-by: Chris Michael
---
src/lib/ecore_wl2/ecore_wl2.c | 31 +++
1 file changed, 31 insertions(+)
diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c
index 8943f81..5b643fb 100644
--- a/src/lib/ecore_wl2/ecore_wl2.c
+++ b/src/lib/ecore_wl2/ecore_wl2.c
@@ -66,3 +66,34 @@ eina_err:
eina_shutdown();
return --_ecore_wl2_init_count;
}
+
+EAPI int
+ecore_wl2_shutdown(void)
+{
+ if (_ecore_wl2_init_count < 1)
+ {
+ERR("Ecore_Wl2 shutdown called without Ecore_Wl2 Init");
+return 0;
+ }
+
+ if (--_ecore_wl2_init_count != 0) return _ecore_wl2_init_count;
+
+ /* reset events */
+ ECORE_WL2_EVENT_GLOBAL_ADDED = 0;
+ ECORE_WL2_EVENT_GLOBAL_REMOVED = 0;
+
+ /* shutdown Ecore_Event */
+ ecore_event_shutdown();
+
+ /* shutdown Ecore */
+ ecore_shutdown();
+
+ /* unregister logging domain */
+ eina_log_domain_unregister(_ecore_wl2_log_dom);
+ _ecore_wl2_log_dom = -1;
+
+ /* shutdown eina */
+ eina_shutdown();
+
+ return _ecore_wl2_init_count;
+}
--
[EGIT] [core/efl] master 01/262: ecore-wayland: Add support for using timer based animators if in server mode
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=518531ea0052b5196d20b7c93bd01825f5f4711f commit 518531ea0052b5196d20b7c93bd01825f5f4711f Author: Chris Michael Date: Mon Oct 5 16:32:11 2015 -0400 ecore-wayland: Add support for using timer based animators if in server mode Summary: For E internal windows, we cannot use custom animator sources due to Other animators using a timer-based solution. For this case, when running in "server mode" for internal windows we will default to a timer based animator solution. Signed-off-by: Chris Michael --- src/lib/ecore_wayland/ecore_wl_window.c | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index 982dfd5..d61d781 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -226,7 +226,11 @@ ecore_wl_window_new(Ecore_Wl_Window *parent, int x, int y, int w, int h, int buf win->title = NULL; win->class_name = NULL; + if (_ecore_wl_server_mode) + win->animator = ecore_animator_add(_ecore_wl_window_cb_animate, win); + eina_hash_add(_windows, _ecore_wl_window_id_str_get(win->id), win); + return win; } --
[EGIT] [core/efl] master 25/262: ecore-wl2: Add API function for servers to destroy a wayland display
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a079b102243a059d7b3b7b6be70f7dacae0663cf
commit a079b102243a059d7b3b7b6be70f7dacae0663cf
Author: Chris Michael
Date: Thu Aug 20 10:22:03 2015 -0400
ecore-wl2: Add API function for servers to destroy a wayland display
Signed-off-by: Chris Michael
---
src/lib/ecore_wl2/Ecore_Wl2.h | 12
src/lib/ecore_wl2/ecore_wl2_display.c | 7 +++
2 files changed, 19 insertions(+)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 0ae3f8d..d54d4bb 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -115,6 +115,18 @@ EAPI int ecore_wl2_shutdown(void);
EAPI Ecore_Wl2_Display *ecore_wl2_display_create(const char *name);
/**
+ * Destroy an existing Wayland display
+ *
+ * @brief This function is typically used by servers to terminate an
+ * existing Wayland display.
+ *
+ * @param display The display to terminate
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ */
+EAPI void ecore_wl2_display_destroy(Ecore_Wl2_Display *display);
+
+/**
* Connect to an existing Wayland display
*
* @brief This function is typically used by clients to connect to an
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index ca5292d..f372d70 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -293,3 +293,10 @@ ecore_wl2_display_disconnect(Ecore_Wl2_Display *display)
EINA_SAFETY_ON_NULL_RETURN(display);
wl_display_disconnect(display->wl.display);
}
+
+EAPI void
+ecore_wl2_display_destroy(Ecore_Wl2_Display *display)
+{
+ EINA_SAFETY_ON_NULL_RETURN(display);
+ wl_display_destroy(display->wl.display);
+}
--
[EGIT] [core/efl] master 10/262: ecore-wl2: Link to wayland-server for ecore_wl2 library
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7d855cff3018fac7ef4e0826ace701e77453d1cf commit 7d855cff3018fac7ef4e0826ace701e77453d1cf Author: Chris Michael Date: Tue Aug 18 11:55:24 2015 -0400 ecore-wl2: Link to wayland-server for ecore_wl2 library Signed-off-by: Chris Michael --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 95fbef4..d899ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -3046,7 +3046,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eo]) EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eina]) EFL_DEPEND_PKG([ECORE_WL2], [WAYLAND], - [wayland-client >= 1.8.0 wayland-cursor >= 1.8.0 xkbcommon >= 0.5.0]) + [wayland-server >= 1.8.0 wayland-client >= 1.8.0 wayland-cursor >= 1.8.0 xkbcommon >= 0.5.0]) EFL_EVAL_PKGS([ECORE_WL2]) --
[EGIT] [core/efl] master 24/262: ecore-wl2: Add API function for clients to disconnect from a Wayland display
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5e3a9860aa541ced77da5e9e9cebc1535384a7b8
commit 5e3a9860aa541ced77da5e9e9cebc1535384a7b8
Author: Chris Michael
Date: Thu Aug 20 10:15:07 2015 -0400
ecore-wl2: Add API function for clients to disconnect from a Wayland display
Signed-off-by: Chris Michael
---
src/lib/ecore_wl2/Ecore_Wl2.h | 12
src/lib/ecore_wl2/ecore_wl2_display.c | 7 +++
2 files changed, 19 insertions(+)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 97fa3c6..0ae3f8d 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -130,6 +130,18 @@ EAPI Ecore_Wl2_Display *ecore_wl2_display_create(const
char *name);
EAPI Ecore_Wl2_Display *ecore_wl2_display_connect(const char *name);
/**
+ * Disconnect an existing Wayland display
+ *
+ * @brief This function is typically used by clients to disconnect from an
+ * existing Wayland display.
+ *
+ * @param display The display to disconnect from
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ */
+EAPI void ecore_wl2_display_disconnect(Ecore_Wl2_Display *display);
+
+/**
* Retrieve the existing Wayland display
*
* @param display The Ecore_Wl2_Display for which to retrieve the existing
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 366077b..ca5292d 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -286,3 +286,10 @@ ecore_wl2_display_shm_get(Ecore_Wl2_Display *display)
EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
return display->wl.shm;
}
+
+EAPI void
+ecore_wl2_display_disconnect(Ecore_Wl2_Display *display)
+{
+ EINA_SAFETY_ON_NULL_RETURN(display);
+ wl_display_disconnect(display->wl.display);
+}
--
