Re: [E-devel] imlib2-1.12.2
Kim You continue to be an inspiration ! dh On 2/3/24 11:56, Kim Woelders wrote: imlib2-1.12.2: A number of loader/saver fixes: - PNG loader: Properly suppress messages from libpng - TIFF loader: Properly suppress messages from libtiff - Y4M loader: Various fixes - PNG saver: Avoid double-free on write errors - PNG saver: Avoid potential issues around setjmp/longjmp - JPG saver: Fix infinite loop in error path - savers: Fix error returns Source packages: https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.12.2/ /Kim ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: ecore_evas_drm: Remove hardcoded depth & bpp
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dc81e925c851c94526e8991be60a209e6d833f43
commit dc81e925c851c94526e8991be60a209e6d833f43
Author: Christopher Michael
Date: Fri Mar 25 08:13:33 2022 -0400
ecore_evas_drm: Remove hardcoded depth & bpp
As we have an ecore_drm2 function to get preferred depth & bpp, we
should be using that so remove hardcoded values and set the
edata->depth & bpp using the ecore_drm2 function
---
src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 6 --
1 file changed, 4 insertions(+), 2 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 b992915aaa..c024e6322c 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -173,6 +173,9 @@ _ecore_evas_drm_init(Ecore_Evas *ee,
Ecore_Evas_Engine_Drm_Data *edata, const ch
if (edata->output) ecore_drm2_output_user_data_set(edata->output, ee);
else WRN("Could not find output at %d %d", edata->x, edata->y);
+ ecore_drm2_device_preferred_depth_get(edata->dev,
+ &edata->depth, &edata->bpp);
+
ecore_event_evas_init();
if (!handlers)
{
@@ -1017,12 +1020,11 @@ _ecore_evas_new_internal(const char *device, int x, int
y, int w, int h, Eina_Bo
edata->once = EINA_TRUE;
edata->offset = 0.0;
}
+
edata->x = x;
edata->y = y;
edata->w = w;
edata->h = h;
- edata->depth = 24; // FIXME: Remove hardcode
- edata->bpp = 32; // FIXME: Remove hardcode
edata->format = DRM_FORMAT_XRGB;
if (_ecore_evas_drm_init(ee, edata, device) < 1)
--
[EGIT] [website/www-content] master 01/01: news: Fix link to proper tarball
devilhorns pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b053d6918a8b84e30e0a78e4378c4c21dbbb4e7e commit b053d6918a8b84e30e0a78e4378c4c21dbbb4e7e Author: Christopher Michael Date: Fri Feb 11 12:40:14 2022 -0500 news: Fix link to proper tarball --- pages/news/2022-02-10-enlightenment-0.25.3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/news/2022-02-10-enlightenment-0.25.3.txt b/pages/news/2022-02-10-enlightenment-0.25.3.txt index 8338d0fc5..8cff1a881 100644 --- a/pages/news/2022-02-10-enlightenment-0.25.3.txt +++ b/pages/news/2022-02-10-enlightenment-0.25.3.txt @@ -10,7 +10,7 @@ Hilights: * Fix ibar left/right emit for alignment | LINK | SHA256 | -| [[http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.25.2.tar.xz | enlightenment-0.25.3.tar.xz ]] | 37fd49ebb537216a18efe69d5c5511e118f9cdacb5652807769331707be4cff6 | +| [[http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.25.3.tar.xz | enlightenment-0.25.3.tar.xz ]] | 37fd49ebb537216a18efe69d5c5511e118f9cdacb5652807769331707be4cff6 | == Building and Dependencies == --
[EGIT] [core/efl] master 01/01: ecore_buffer: Remove duplicate function calls
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e3e53149502522b52a3b63cb603bf17fe18d24ab commit e3e53149502522b52a3b63cb603bf17fe18d24ab Author: Christopher Michael Date: Thu Feb 10 09:30:55 2022 -0500 ecore_buffer: Remove duplicate function calls As we already set these variables at the top of the function, there is no need to reget the xcb connection or generate the pixmap id. --- src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c index d3ab7031df..e255a2791f 100644 --- a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c +++ b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c @@ -331,11 +331,9 @@ _dri3_pixmap_from_fd(Ecore_X_Display *dpy, Ecore_X_Drawable draw, int width, int if (!dpy) return 0; - c = XGetXCBConnection(dpy); if (!c) return 0; - pixmap = xcb_generate_id(c); if (!pixmap) return 0; --
[EGIT] [core/enlightenment] v-0.25.0 13/28: e_about: Update copyright year
raster pushed a commit to branch v-0.25.0. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fdd31a87ee82e783604d5505797974da70568688 commit fdd31a87ee82e783604d5505797974da70568688 Author: Christopher Michael Date: Thu Jan 20 11:37:36 2022 -0500 e_about: Update copyright year --- src/bin/e_about.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_about.c b/src/bin/e_about.c index 79380ab99..b4a982cb9 100644 --- a/src/bin/e_about.c +++ b/src/bin/e_about.c @@ -23,7 +23,7 @@ e_about_new(void) snprintf (buf, sizeof(buf), "%s%s", _( - "Copyright © 2000-2021, by the Enlightenment " + "Copyright © 2000-2022, by the Enlightenment " "Development Team" "" "We hope you enjoy using this software as much as we enjoyed " --
[EGIT] [core/enlightenment] master 01/01: e_about: Update copyright year
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6d2b5e91445b16c32193c4e0319a793d9be599ef commit 6d2b5e91445b16c32193c4e0319a793d9be599ef Author: Christopher Michael Date: Thu Jan 20 11:37:36 2022 -0500 e_about: Update copyright year --- src/bin/e_about.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_about.c b/src/bin/e_about.c index 79380ab99..b4a982cb9 100644 --- a/src/bin/e_about.c +++ b/src/bin/e_about.c @@ -23,7 +23,7 @@ e_about_new(void) snprintf (buf, sizeof(buf), "%s%s", _( - "Copyright © 2000-2021, by the Enlightenment " + "Copyright © 2000-2022, by the Enlightenment " "Development Team" "" "We hope you enjoy using this software as much as we enjoyed " --
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: e focus - fix previous commit segv on no windows left
Love It !!!
On 1/6/22 19:11, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=61584a5f57c27d2a0835410088091d9dbbdfe57f
commit 61584a5f57c27d2a0835410088091d9dbbdfe57f
Author: Carsten Haitzler
Date: Fri Jan 7 00:10:13 2022 +
e focus - fix previous commit segv on no windows left
if window deleted is the focused on... oops - BOOM. not handled.
handle it. also revert x focus to root so bindings work.
fixes previous 2d86d75139c40e7365e34880b0e3b56f248b0e41
@fix
---
src/bin/e_client.c | 8
1 file changed, 8 insertions(+)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 85f5504a7..f3d01663b 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -459,6 +459,14 @@ e_client_revert_focus(E_Client *ec)
static void
_e_client_free(E_Client *ec)
{
+ if (focused == ec)
+ {
+focused = NULL;
+#ifndef HAVE_WAYLAND_ONLY
+if (e_comp->comp_type != E_PIXMAP_TYPE_WL)
+ ecore_x_window_focus(e_comp->root);
+#endif
+ }
if (ec->desk)
ec->desk->fullscreen_clients =
eina_list_remove(ec->desk->fullscreen_clients, ec);
if (ec->restore_zone_id)
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Enlightenment 0.25.1 small font issues
Agree with Carsten... dh On 1/5/22 14:51, Carsten Haitzler wrote: On Wed, 5 Jan 2022 06:13:21 -0800 Jose R R said: Niltze [Hello]- Just built EFL 1.26.1 / E 0.25.1 and (ugh!) at least two(2) applications do not render correctly: textadept 10.3 and Yandex Browser beta 21.11.3.954 beta (64-bit) for Linux. As a matter of fact, YB cannot even be resized with the mouse pointer placed at the edge or corners and dragged outwards. Try disabling the CSD decorations and use system ones (ie e's titlebar etc.). I might imagine it is suffering from the same bug chromium had with new CSD code that does really weird things with CSD GTK hints on start then removes them etc. leaving the window is a weird state. < http://www.enlightenment.org/ss/e-61d59ec2585370.20480341.jpg > Most of the applications display small letters for peripheral labels, such as menu, tab names, etc. Chromium browser opens at the same size as YB and although I can resize the window by dragging the edges and or corners, still the small letters are bothersome. < http://www.enlightenment.org/ss/e-61d5a3b1886327.98812052.jpg > Your fonts are huge. They actually seem wrong - they don't match in size to e's fonts. They are larger and should be smaller to match E's. At least for me they do match pixel-for-pixel - perhaps set your font settings in to to use Sans explicitly and apply to all apps: http://www.enlightenment.org/ss/e-61d5f44e8e4861.91846538.png Then you will get the same size and same pixels for your fonts... If this is too small - then it's too small in e AND too small in your apps and that is why scale settings exist - "make it bigger" options are right there. Advanced lets you set any scale you like. Basic mode has a few canned options for you. Any reason you didn't try the scale settings in E? I had not experienced these GUI issues in prior E versions. Another Because now E sets the xft.dpi and xsettings dpi values by default to make apps scale in-line with e's own scale settings. They match. That is the idea/point - for them to match. So fonts end up looking similar/the same with similar sizes. thing I noticed is in a double-decked multiple desktops is that pressing the pointer to the side, and/or up and down, does not take me to the next virtual desktop -- as in prior E versions those events succeed -- now I have to select the window with the pointer from the task bar by clicking. Everyone kept complaining to me they hate edge bindings that do this so I removed them by default. You can add your own edge bindings back to switch desktops when you go to the edge of a screen in the edge bindings config dialog. My eyes already hurt with such small letters by now. I will try to provide information on how I hacked the Debian packages as well as upload the packages themselves later -- if I do not go back to the previous E version to get some stuff done. Sorry to rain on your 'flat' parade, Raster. I tried, I really tried to like it, to get used to it, but Best Professional Regards. -- Jose R R http://metztli.it - Download Metztli Reiser4: Debian Bullseye w/ Linux 5.14.21 AMD64 - feats ZSTD compression https://sf.net/projects/metztli-reiser4/ - or SFRN 5.1.3, Metztli Reiser5 https://sf.net/projects/debian-reiser4/ --- Official current Reiser4 resources: https://reiser4.wiki.kernel.org/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore evas - wl - detect timestamsp too far in the past and complain
comment inline
On 12/10/21 05:56, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f6c99bd806f1a10dd37bad95355e62cebc1a0f2d
commit f6c99bd806f1a10dd37bad95355e62cebc1a0f2d
Author: Carsten Haitzler
Date: Fri Dec 10 10:54:32 2021 +
ecore evas - wl - detect timestamsp too far in the past and complain
this has all sorts of nasty side effects by rewinding time far too
much and thus causing timers to expire early and so on - these
timestamps are MEANT to be like a frame vsync time... they thus should
be like normally 0.02sec or so in the past or less... (0.008s on
average) so at 0.1 sec complain and ignore the old timestamp. weston
does this and sends us timestmaps 0.33sec in the past ... and its not
nice.
@fix
---
.../ecore_evas/engines/wayland/ecore_evas_wayland_common.c| 8
1 file changed, 8 insertions(+)
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 e9569f650d..5f354a1bd8 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
@@ -42,12 +42,20 @@ _anim_cb_tick(Ecore_Wl2_Window *win EINA_UNUSED, uint32_t
timestamp, void *data)
Ecore_Evas *ee = data;
Ecore_Evas_Engine_Wl_Data *edata;
double t;//, rt;
+ double tnow = ecore_time_get();
Not sure the above assignment would qualify as EFL lol ... Variables at
top and one line :P
That being said, Awesome fix Mate !! :) Thank You !!
dh
/* static double pt = 0.0, prt = 0.0; */
edata = ee->engine.data;
if (!edata->ticking) return;
t = ((double)timestamp / 1000.0);
+ if ((t - tnow) < -0.1)
+ {
+fprintf(stderr,
+"ecore_evas: _anim_cb_tick() -> tick too far in past - %1.5f sec
behind\n",
+tnow - t);
+t = tnow;
+ }
ecore_loop_time_set(t);
/* rt = ecore_time_get(); */
/* printf("ECORE_EVAS: wl client anim tick %p | %p - %1.5f @ %1.5f delt=%1.5f |
%1.5f\n", ee, edata, t, ecore_time_get(), t - pt, rt - prt); */
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: shot: Remove unused variables and unused function
No Worries Mate :)
dh
On 12/7/21 11:55, Carsten Haitzler wrote:
On Tue, 07 Dec 2021 06:04:22 -0800 Christopher Michael
said:
thanks - missed those. was part of a previous bit of code i wiped and
replaced :)
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b13a34cfeb1aadfb32951b3e5457dcab601c1ca7
commit b13a34cfeb1aadfb32951b3e5457dcab601c1ca7
Author: Christopher Michael
Date: Tue Dec 7 09:02:23 2021 -0500
shot: Remove unused variables and unused function
---
src/modules/shot/e_mod_preview.c | 18 --
1 file changed, 18 deletions(-)
diff --git a/src/modules/shot/e_mod_preview.c
b/src/modules/shot/e_mod_preview.c index c92642a2e..b72e6ceef 100644
--- a/src/modules/shot/e_mod_preview.c
+++ b/src/modules/shot/e_mod_preview.c
@@ -49,22 +49,6 @@ _quality_change_cb(void *data EINA_UNUSED, Evas_Object
*obj, void *event_info EI quality = elm_slider_value_get(obj);
}
-static int
-_scroller_child_fits(Evas_Object *o, Evas_Coord *smaller_w, Evas_Coord
*smaller_h) -{
- int ret = 0;
- Evas_Coord x = 0, y = 0, w = 0, h = 0, cw = 0, ch = 0;
-
- elm_scroller_child_size_get(o, &cw, &ch);
- elm_scroller_region_get(o, &x, &y, &w, &h);
- *smaller_w = *smaller_h = 0;
- if (cw <= w) ret |= 1;
- else *smaller_w = cw - w;
- if (ch <= h) ret |= 2;
- else *smaller_h = ch - h;
- return ret;
-}
-
void
preview_dialog_show(E_Zone *zone, E_Client *ec, const char *params, void
*dst, int sx, int sy, int sw, int sh)
@@ -162,10 +146,8 @@ preview_dialog_show(E_Zone *zone, E_Client *ec, const
char *params, void *dst, }
else
{
-Eina_Bool scroll_main_ok = EINA_FALSE, scroll_tools_ok = EINA_FALSE;
Evas_Coord maxw, maxh, minw, minh;
Evas_Object *sc_main, *sc_tool;
-int loops = 0;
elm_slider_value_set(o_sl, quality);
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: shot: Remove unused variables and unused function
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b13a34cfeb1aadfb32951b3e5457dcab601c1ca7
commit b13a34cfeb1aadfb32951b3e5457dcab601c1ca7
Author: Christopher Michael
Date: Tue Dec 7 09:02:23 2021 -0500
shot: Remove unused variables and unused function
---
src/modules/shot/e_mod_preview.c | 18 --
1 file changed, 18 deletions(-)
diff --git a/src/modules/shot/e_mod_preview.c b/src/modules/shot/e_mod_preview.c
index c92642a2e..b72e6ceef 100644
--- a/src/modules/shot/e_mod_preview.c
+++ b/src/modules/shot/e_mod_preview.c
@@ -49,22 +49,6 @@ _quality_change_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EI
quality = elm_slider_value_get(obj);
}
-static int
-_scroller_child_fits(Evas_Object *o, Evas_Coord *smaller_w, Evas_Coord
*smaller_h)
-{
- int ret = 0;
- Evas_Coord x = 0, y = 0, w = 0, h = 0, cw = 0, ch = 0;
-
- elm_scroller_child_size_get(o, &cw, &ch);
- elm_scroller_region_get(o, &x, &y, &w, &h);
- *smaller_w = *smaller_h = 0;
- if (cw <= w) ret |= 1;
- else *smaller_w = cw - w;
- if (ch <= h) ret |= 2;
- else *smaller_h = ch - h;
- return ret;
-}
-
void
preview_dialog_show(E_Zone *zone, E_Client *ec, const char *params, void *dst,
int sx, int sy, int sw, int sh)
@@ -162,10 +146,8 @@ preview_dialog_show(E_Zone *zone, E_Client *ec, const char
*params, void *dst,
}
else
{
-Eina_Bool scroll_main_ok = EINA_FALSE, scroll_tools_ok = EINA_FALSE;
Evas_Coord maxw, maxh, minw, minh;
Evas_Object *sc_main, *sc_tool;
-int loops = 0;
elm_slider_value_set(o_sl, quality);
--
[EGIT] [core/enlightenment] master 01/01: e_bindings: Minor formatting fixes
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=de1cd33e75655da45f6dad3c61c5e40eeb617cf7
commit de1cd33e75655da45f6dad3c61c5e40eeb617cf7
Author: Christopher Michael
Date: Sat Nov 6 13:16:16 2021 -0400
e_bindings: Minor formatting fixes
NB: No functional changes
---
src/bin/e_bindings.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 76658fde3..de71ecc9b 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -1667,7 +1667,6 @@ angle_accepted(double min, double max, double direction)
return EINA_FALSE;
}
-
E_API E_Action*
e_bindings_swipe_handle(E_Binding_Context ctxt, E_Object *obj, double
direction, double length, unsigned int fingers)
{
@@ -1683,17 +1682,17 @@ e_bindings_swipe_handle(E_Binding_Context ctxt,
E_Object *obj, double direction,
angle_accepted(binding->direction - binding->error,
binding->direction + binding->error, direction))
{
act = e_action_find(binding->action);
- if (!act) {
- ERR("Action %s cannot be found!", binding->action);
- return NULL;
- }
+ if (!act)
+ {
+ ERR("Action %s cannot be found!", binding->action);
+ return NULL;
+ }
act->func.go(obj, binding->params);
}
}
return act;
}
-
E_API Eina_Inarray*
e_bindings_swipe_find_candidates(E_Binding_Context ctxt, double direction,
double length, unsigned int fingers)
{
--
[EGIT] [core/efl] master 01/01: exactness: Fix compiler warning of uninitialized variable
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=57a5655f889a293adb11db09a4f35378aa29a9bb
commit 57a5655f889a293adb11db09a4f35378aa29a9bb
Author: Christopher Michael
Date: Tue Oct 5 10:27:45 2021 -0400
exactness: Fix compiler warning of uninitialized variable
Compiler is warning us here that ex_img has not been initialized after
being malloc'd, so let's initialize it
---
src/bin/exactness/player.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index 66506ba729..419a236018 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -209,6 +209,7 @@ _shot_do(Evas *e)
if (ex_img)
{
+ memset(ex_img, 0, sizeof(*ex_img));
_dest_unit->imgs = eina_list_append(_dest_unit->imgs,
ex_img);
_dest_unit->nb_shots++;
e_data = ex_img;
--
[EGIT] [core/efl] master 01/01: eina-test: Fix unchecked return value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3f1d183c06c78b22f4270d752e88e8dbaa89a015
commit 3f1d183c06c78b22f4270d752e88e8dbaa89a015
Author: Christopher Michael
Date: Tue Sep 21 10:35:34 2021 -0400
eina-test: Fix unchecked return value
Coverity CID1401015 complains about an unchecked return value here, so
let's check that fread actually succeeded (return > 0).
Fixes CID1401015
@fix
---
src/tests/eina/eina_test_simple_xml_parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tests/eina/eina_test_simple_xml_parser.c
b/src/tests/eina/eina_test_simple_xml_parser.c
index 34c8d69002..5f41d2b038 100644
--- a/src/tests/eina/eina_test_simple_xml_parser.c
+++ b/src/tests/eina/eina_test_simple_xml_parser.c
@@ -237,7 +237,7 @@
EFL_START_TEST(eina_simple_xml_parser_parse_with_custom_callback)
if (buf)
{
-if (fread(buf, 1, sz, f))
+if (fread(buf, 1, sz, f) > 0)
{
int parse_current_state =
simple_xml_parser_current_state_begin;
eina_simple_xml_parse(buf,
--
[EGIT] [core/efl] master 01/01: evas-pdf: Properly set return value before cleanup is called
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2c7b1a992c37b9919c0a32320e6eeccf659a3cf8
commit 2c7b1a992c37b9919c0a32320e6eeccf659a3cf8
Author: Christopher Michael
Date: Tue Sep 21 10:27:47 2021 -0400
evas-pdf: Properly set return value before cleanup is called
Coverity CID1437717 tells us that this code is unreachable
(obviously), so let's set the return value Before we go to cleanup.
Fixes CID1437717
@fix
---
src/generic/evas/pdf/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/generic/evas/pdf/main.cpp b/src/generic/evas/pdf/main.cpp
index 933bae5dd5..253b3f3ebf 100644
--- a/src/generic/evas/pdf/main.cpp
+++ b/src/generic/evas/pdf/main.cpp
@@ -348,8 +348,8 @@ main(int argc, char **argv)
D("poppler_file_init\n");
if (!poppler_init(file, page_num, size_w, size_h))
{
-goto cleanup;
ret = 1;
+goto cleanup;
}
D("poppler_file_init done\n");
--
[EGIT] [apps/terminology] master 01/01: terminology: Increase size of 'buf' to avoid possible truncated string
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=fc2d12a52f798c7a9aacbf026ec31c669c2738c6
commit fc2d12a52f798c7a9aacbf026ec31c669c2738c6
Author: Christopher Michael
Date: Tue Sep 21 10:18:04 2021 -0400
terminology: Increase size of 'buf' to avoid possible truncated string
Gcc warns during compile that the output may be truncated here:
../src/bin/options_colors.c:265:14: note: ‘snprintf’ output between 32
and 4127 bytes into a destination of size 4096
To fix this, let's just increase the size of 'buf' slightly.
---
src/bin/options_colors.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/options_colors.c b/src/bin/options_colors.c
index 5cb757c..1d347eb 100644
--- a/src/bin/options_colors.c
+++ b/src/bin/options_colors.c
@@ -255,7 +255,7 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
len = end - start;
if (len < sizeof(theme))
{
- char buf[4096];
+ char buf[4096 + 1024];
strncpy(theme, start, len);
theme[len] = '\0';
--
[EGIT] [core/efl] master 02/02: evas-rsvg: Update rsvg code to not use deprecated functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cbcf5bc64a90306c82f0eb99ae43b5f52c122f71
commit cbcf5bc64a90306c82f0eb99ae43b5f52c122f71
Author: Christopher Michael
Date: Tue Sep 21 09:35:34 2021 -0400
evas-rsvg: Update rsvg code to not use deprecated functions
A few of the functions used in this code have been deprecated in the
latest librsvg. This patch fixes the deprecated warnings by using
possible.
NB: As I am no cairo expert, someone may want to check that the proper
dimensions are used in read_svg_data function. I was not sure if this
should be using the 'scaled' dimensions or not.
---
src/generic/evas/rsvg/main.c | 23 +++
1 file changed, 23 insertions(+)
diff --git a/src/generic/evas/rsvg/main.c b/src/generic/evas/rsvg/main.c
index d13aa5..309539ccd2 100644
--- a/src/generic/evas/rsvg/main.c
+++ b/src/generic/evas/rsvg/main.c
@@ -98,9 +98,18 @@ static int
read_svg_header(int scale_down, double dpi, int size_w, int size_h)
{
rsvg_handle_set_dpi(rsvg, 75.0);
+
+#ifndef HAVE_SVG_2_36
rsvg_handle_get_dimensions(rsvg, &dim);
width = dim.width;
height = dim.height;
+#else
+ double owidth, oheight;
+
+ rsvg_handle_get_intrinsic_size_in_pixels(rsvg, &owidth, &oheight);
+ width = ceil(owidth);
+ height = ceil(oheight);
+#endif
if ((width < 1) || (height < 1)) return 0;
@@ -152,7 +161,21 @@ read_svg_data(void)
if (!cr) return 0;
cairo_scale(cr, (double) width / dim.em, (double) height / dim.ex);
+
+#ifndef HAVE_SVG_2_36
rsvg_handle_render_cairo(rsvg, cr);
+#else
+ RsvgRectangle vp =
+ {
+.x = 0,
+.y = 0,
+.width = width,
+.height = height,
+ };
+
+ rsvg_handle_render_document(rsvg, cr, &vp, NULL);
+#endif
+
cairo_surface_destroy(surface);
cairo_destroy(cr);
--
[EGIT] [core/efl] master 01/02: evas-rsvg: Minor formatting fixes
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=66dcdf6b70497df6270418c0f745cc3d17568e9b
commit 66dcdf6b70497df6270418c0f745cc3d17568e9b
Author: Christopher Michael
Date: Tue Sep 21 08:54:17 2021 -0400
evas-rsvg: Minor formatting fixes
---
src/generic/evas/rsvg/main.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/generic/evas/rsvg/main.c b/src/generic/evas/rsvg/main.c
index 1eaf2a32c7..d13aa5 100644
--- a/src/generic/evas/rsvg/main.c
+++ b/src/generic/evas/rsvg/main.c
@@ -23,7 +23,8 @@ static int width = 0;
static int height = 0;
static RsvgDimensionData dim;
-static inline Eina_Bool evas_image_load_file_is_svg(const char *file)
+static inline Eina_Bool
+evas_image_load_file_is_svg(const char *file)
{
int i, len = strlen(file);
Eina_Bool is_gz = EINA_FALSE;
@@ -158,7 +159,8 @@ read_svg_data(void)
return 1;
}
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
{
char *file;
int i;
@@ -236,6 +238,5 @@ int main(int argc, char **argv)
_svg_shutdown();
fflush(stdout);
return 0;
-
}
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: egl: silence warning of deprecated feature test.
Looks much cleaner now Netstar :D dh On 5/18/21 11:36 AM, Alastair Poole wrote: netstar pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=01f4e44fde5f36d60c6f9c53dbdb0c456b04f034 commit 01f4e44fde5f36d60c6f9c53dbdb0c456b04f034 Author: Alastair Poole Date: Tue May 18 16:34:44 2021 +0100 egl: silence warning of deprecated feature test. --- src/modules/evas/engines/gl_common/evas_gl_common.h | 4 ++-- src/modules/evas/engines/gl_drm/evas_engine.h | 4 ++-- src/modules/evas/engines/wayland_egl/evas_engine.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h index 14364ae9d3..6bfba60045 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -14,8 +14,8 @@ #define GL_GLEXT_PROTOTYPES -#if !defined(HAVE_ECORE_X_XLIB) && !defined(MESA_EGL_NO_X11_HEADERS) -# define MESA_EGL_NO_X11_HEADERS +#if !defined(HAVE_ECORE_X_XLIB) && !defined(EGL_NO_X11) +# define EGL_NO_X11 #endif #ifndef EVAS_GL_NO_HEADERS diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h b/src/modules/evas/engines/gl_drm/evas_engine.h index 9530cde17c..d21bd5e67d 100644 --- a/src/modules/evas/engines/gl_drm/evas_engine.h +++ b/src/modules/evas/engines/gl_drm/evas_engine.h @@ -15,8 +15,8 @@ # define EGL_EGLEXT_PROTOTYPES # define GL_GLEXT_PROTOTYPES -# if !defined(HAVE_ECORE_X_XLIB) && !defined(MESA_EGL_NO_X11_HEADERS) -# define MESA_EGL_NO_X11_HEADERS +# if !defined(HAVE_ECORE_X_XLIB) && !defined(EGL_NO_X11) +# define EGL_NO_X11 # endif # include diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h index 3171632583..53d15a4013 100644 --- a/src/modules/evas/engines/wayland_egl/evas_engine.h +++ b/src/modules/evas/engines/wayland_egl/evas_engine.h @@ -12,8 +12,8 @@ # define GL_GLEXT_PROTOTYPES -# if !defined(HAVE_ECORE_X_XLIB) && !defined(MESA_EGL_NO_X11_HEADERS) -# define MESA_EGL_NO_X11_HEADERS +# if !defined(HAVE_ECORE_X_XLIB) && !defined(EGL_NO_X11) +# define EGL_NO_X11 # endif # include ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: fps debug - slim code a bit and order events so they do go up and right
I Re tract the Statement
dh
On 5/16/21 11:19 PM, Christopher Michael wrote:
Why do we Re Get this here ???
dh
On 5/16/21 10:48 PM, Christopher Michael wrote:
+ int info[4] = { E_COMP_FRAME_EVENT_HANDLE_DAMAGE, 0, 0, 0 };
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: fps debug - slim code a bit and order events so they do go up and right
Why do we Re Get this here ???
dh
On 5/16/21 10:48 PM, Christopher Michael wrote:
+ int info[4] = { E_COMP_FRAME_EVENT_HANDLE_DAMAGE, 0, 0, 0 };
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: fps debug - slim code a bit and order events so they do go up and right
+10
dh
On 5/16/21 1:36 PM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=96e7e42fbb3ab4421e62cff9d49af3759f5ca44b
commit 96e7e42fbb3ab4421e62cff9d49af3759f5ca44b
Author: Carsten Haitzler (Rasterman)
Date: Sun May 16 18:36:30 2021 +0100
fps debug - slim code a bit and order events so they do go up and right
---
src/bin/e_comp.c| 51 +---
src/bin/e_comp_canvas.c | 69 ++---
2 files changed, 54 insertions(+), 66 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index fdaa8bebd..caec70e00 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -427,11 +427,11 @@ e_comp_frame_event_add(int info[4], double t)
E_API void
e_comp_client_frame_add(Evas_Object *obj EINA_UNUSED)
{
- int info[4] = { 0, 0, 0, 0 };
- double t = ecore_time_get();
-
- info[0] = E_COMP_FRAME_EVENT_CLIENT_DAMAGE;
- e_comp_frame_event_add(info, t);
+ if (conf->fps_show)
+ {
+int info[4] = { E_COMP_FRAME_EVENT_CLIENT_DAMAGE, 0, 0, 0 };
+e_comp_frame_event_add(info, ecore_time_get());
+ }
}
static inline void
@@ -604,13 +604,13 @@ e_comp_fps_update(void)
else if (info0 == E_COMP_FRAME_EVENT_RENDER_BEGIN)
_e_comp_fps_draw_point(pix, pixstride, pixw, 3,
0x4433, px);
else if (info0 == E_COMP_FRAME_EVENT_IDLE_ENTER)
-_e_comp_fps_draw_point(pix, pixstride, pixw, 4,
0xff994499, px);
- else if (info0 == E_COMP_FRAME_EVENT_IDLE_EXIT)
-_e_comp_fps_draw_point(pix, pixstride, pixw, 5,
0x88ff, px);
+_e_comp_fps_draw_point(pix, pixstride, pixw, 4,
0x88ff, px);
else if (info0 == E_COMP_FRAME_EVENT_HANDLE_DAMAGE)
-_e_comp_fps_draw_point(pix, pixstride, pixw, 6,
0xff44ff22, px);
+_e_comp_fps_draw_point(pix, pixstride, pixw, 5,
0xff44ff22, px);
else if (info0 == E_COMP_FRAME_EVENT_CLIENT_DAMAGE)
-_e_comp_fps_draw_point(pix, pixstride, pixw, 7,
0xff4466ff, px);
+_e_comp_fps_draw_point(pix, pixstride, pixw, 6,
0xff4466ff, px);
+ else if (info0 == E_COMP_FRAME_EVENT_IDLE_EXIT)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 7,
0xff994499, px);
}
for (t = 0.0; t < 10.0; t += (1.0 / 60.0))
{
@@ -662,37 +662,10 @@ _e_comp_cb_update(void)
_e_comp_fps_update();
if (conf->fps_show)
{
-double t = ecore_loop_time_get();
-int info[4] = { 0, 0, 0, 0 };
-
-info[0] = E_COMP_FRAME_EVENT_HANDLE_DAMAGE;
-e_comp_frame_event_add(info, t);
+int info[4] = { E_COMP_FRAME_EVENT_HANDLE_DAMAGE, 0, 0, 0 };
+e_comp_frame_event_add(info, ecore_loop_time_get());
e_comp_fps_update();
}
- /*
- if (doframeinfo == -1)
- {
- doframeinfo = 0;
- if (getenv("DFI")) doframeinfo = 1;
- }
- if (doframeinfo)
- {
- static double t0 = 0.0;
- double td, t;
-
- t = ecore_time_get();
- td = t - t0;
- if (td > 0.0)
- {
- int fps, i;
-
- fps = 1.0 / td;
- for (i = 0; i < fps; i+= 2) putchar('=');
- printf(" : %3.3f", 1.0 / td);
- }
- t0 = t;
- }
-*/
nocomp:
ec = _e_comp_fullscreen_check();
if (ec)
diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 0abd886e0..de53573bc 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -72,37 +72,45 @@ _e_comp_canvas_render_post_job(void *data EINA_UNUSED)
static void
_e_comp_canvas_render_track_pre(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- int info[4] = { 0, 0, 0, 0 };
-
- info[0] = E_COMP_FRAME_EVENT_RENDER_BEGIN;
- e_comp_frame_event_add(info, ecore_time_get());
+ E_Comp_Config *conf = e_comp_config_get();
+ if (conf->fps_show)
+ {
+int info[4] = { E_COMP_FRAME_EVENT_RENDER_BEGIN, 0, 0, 0 };
+e_comp_frame_event_add(info, ecore_time_get());
+ }
}
static void
_e_comp_canvas_render_track_post(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- int info[4] = { 0, 0, 0, 0 };
-
- info[0] = E_COMP_FRAME_EVENT_RENDER_END;
- e_comp_frame_event_add(info, ecore_time_get());
+ E_Comp_Config *conf = e_comp_config_get();
+ if (conf->fps_show)
+ {
+int info[4] = { E_COMP_FRAME_EVENT_RENDER_END, 0, 0, 0 };
+e_comp_frame_event_add(info, ecore_time_get());
+ }
}
static void
_e_comp_canvas_render_track_flush_pre(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, void *event_info EINA_UNUSED)
{
- int info[4] = { 0, 0, 0, 0 };
-
- info[0] = E_COMP_FRAME_EVENT_RENDER2_BEGIN;
- e_comp_frame_event_add(i
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: e - wl - fix re-adding wl listener twice to the same list
Thank You Raster Nobody listened back in the day . dh On 5/10/21 11:33 PM, Carsten Haitzler wrote: raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bc8a4f9a894f6a626a859b1e621822bff556a884 commit bc8a4f9a894f6a626a859b1e621822bff556a884 Author: Carsten Haitzler (Rasterman) Date: Tue May 11 03:32:54 2021 + e - wl - fix re-adding wl listener twice to the same list this causes calling the same cb multiple times and this causes mayhem. fix. --- src/bin/e_pixmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index 7a6d1cbe0..505536442 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -1011,6 +1011,8 @@ e_pixmap_image_refresh(E_Pixmap *cp) cp->held_buffer_destroy_listener.notify = _e_pixmap_cb_held_buffer_destroy; + if (cp->held_buffer_destroy_listener.link.next) + wl_list_remove(&cp->held_buffer_destroy_listener.link); wl_signal_add(&cp->held_buffer->destroy_signal, &cp->held_buffer_destroy_listener); return EINA_TRUE; ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: comp - fps debug - dont use null pixel ptrs for debug data
+1
On 3/12/21 11:10 AM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5b48077b19072457304814a14899c3c75c455f02
commit 5b48077b19072457304814a14899c3c75c455f02
Author: Carsten Haitzler (Rasterman)
Date: Fri Mar 12 16:09:56 2021 +
comp - fps debug - dont use null pixel ptrs for debug data
@fix
---
src/bin/e_comp.c | 70 +---
1 file changed, 36 insertions(+), 34 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 9b7f1842a..fbdc1e13e 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -570,43 +570,45 @@ e_comp_fps_update(void)
evas_object_image_alpha_set(e_comp->canvas->fps_gr, EINA_TRUE);
pixstride = evas_object_image_stride_get(e_comp->canvas->fps_gr);
pix = evas_object_image_data_get(e_comp->canvas->fps_gr, EINA_TRUE);
-
-memset(pix, 0, pixstride * pixh);
-
-// go backwards from newest to oldest
-start = e_comp->frame_event_now + E_COMP_FRAME_EVENT_COUNT - 1;
-end = e_comp->frame_event_now + E_COMP_FRAME_EVENT_COUNT ;
-for (i = start;;)
+if (pix)
{
- iind = i % E_COMP_FRAME_EVENT_COUNT;
- i--;
- if (iind == (end % E_COMP_FRAME_EVENT_COUNT)) break;
-
- info0 = e_comp->frame_events[iind].info[0];
- px = (t - e_comp->frame_events[iind].t) * pixscale;
- px = pixw - px - 1;
- if (px < 0) break;
- if (info0 == E_COMP_FRAME_EVENT_RENDER2_END)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 0, 0x, px);
- else if (info0 == E_COMP_FRAME_EVENT_RENDER2_BEGIN)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 1, 0xee88, px);
- else if (info0 == E_COMP_FRAME_EVENT_RENDER_END)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 2, 0x9944, px);
- else if (info0 == E_COMP_FRAME_EVENT_RENDER_BEGIN)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 3, 0x4433, px);
- else if (info0 == E_COMP_FRAME_EVENT_IDLE_ENTER)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 4, 0xff994499, px);
- else if (info0 == E_COMP_FRAME_EVENT_IDLE_EXIT)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 5, 0x88ff, px);
- else if (info0 == E_COMP_FRAME_EVENT_HANDLE_DAMAGE)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 6, 0xff44ff22, px);
- else if (info0 == E_COMP_FRAME_EVENT_CLIENT_DAMAGE)
- _e_comp_fps_draw_point(pix, pixstride, pixw, 7, 0xff4466ff, px);
+ memset(pix, 0, pixstride * pixh);
+
+ // go backwards from newest to oldest
+ start = e_comp->frame_event_now + E_COMP_FRAME_EVENT_COUNT - 1;
+ end = e_comp->frame_event_now + E_COMP_FRAME_EVENT_COUNT ;
+ for (i = start;;)
+ {
+ iind = i % E_COMP_FRAME_EVENT_COUNT;
+ i--;
+ if (iind == (end % E_COMP_FRAME_EVENT_COUNT)) break;
+
+ info0 = e_comp->frame_events[iind].info[0];
+ px = (t - e_comp->frame_events[iind].t) * pixscale;
+ px = pixw - px - 1;
+ if (px < 0) break;
+ if (info0 == E_COMP_FRAME_EVENT_RENDER2_END)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 0,
0x, px);
+ else if (info0 == E_COMP_FRAME_EVENT_RENDER2_BEGIN)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 1,
0xee88, px);
+ else if (info0 == E_COMP_FRAME_EVENT_RENDER_END)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 2,
0x9944, px);
+ else if (info0 == E_COMP_FRAME_EVENT_RENDER_BEGIN)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 3,
0x4433, px);
+ else if (info0 == E_COMP_FRAME_EVENT_IDLE_ENTER)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 4,
0xff994499, px);
+ else if (info0 == E_COMP_FRAME_EVENT_IDLE_EXIT)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 5,
0x88ff, px);
+ else if (info0 == E_COMP_FRAME_EVENT_HANDLE_DAMAGE)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 6,
0xff44ff22, px);
+ else if (info0 == E_COMP_FRAME_EVENT_CLIENT_DAMAGE)
+_e_comp_fps_draw_point(pix, pixstride, pixw, 7,
0xff4466ff, px);
+ }
+ evas_object_image_data_set(e_comp->canvas->fps_gr, pix);
+ evas_object_image_data_update_add(e_comp->canvas->fps_gr,
+ 0, 0, pixw, pixh);
}
-evas_object_image_data_set(e_comp->canvas->fps_gr, pix);
-evas_object_image_data_update_add(e
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: battery: WiP RFC.
Once per poller ...
dh
On 3/7/21 2:20 PM, Alastair Poole wrote:
netstar pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9ab00c598b34b76475ec1b06d0c7b79b9e87310c
commit 9ab00c598b34b76475ec1b06d0c7b79b9e87310c
Author: Alastair Poole
Date: Sun Mar 7 19:18:17 2021 +
battery: WiP RFC.
How many instances do we need? I'd argue one, or once one poller.
If this is a problem let me know...
---
src/modules/battery/e_mod_main.c | 93 +-
src/modules/battery/e_mod_sysctl.c | 4 +-
2 files changed, 74 insertions(+), 23 deletions(-)
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index d5408c574..5533f3893 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -31,9 +31,11 @@ typedef struct _Instance Instance;
typedef struct __Popup_Widgets
{
- Evas_Object *pb;
Evas_Object *fr;
Evas_Object *lb_state;
+ Evas_Object *pb_usage;
+ Evas_Object *lb_time;
+ Evas_Object *pb_health;
} _Popup_Widgets;
typedef struct __Popup_Data
@@ -203,6 +205,8 @@ _popup_usage_content_update_cb(void *data)
_Popup_Data *pd;
Eina_List *l;
Battery *bat;
+ char buf[128];
+ int hrs, mins, t = 0;
unsigned int i = 0;
pd = data;
@@ -219,13 +223,28 @@ _popup_usage_content_update_cb(void *data)
EINA_LIST_FOREACH(device_batteries, l, bat)
{
_Popup_Widgets *w = &pd->widgets[i++];
-elm_progressbar_value_set(w->pb, (double) bat->percent / 100.0);
+snprintf(buf, sizeof(buf), "%s (%s)", bat->vendor, bat->model);
+elm_object_text_set(w->fr, buf);
if ((battery_config->have_power) && (!bat->charging))
elm_object_text_set(w->lb_state, _("Charged"));
else if (bat->charging)
- elm_object_text_set(w->lb_state, _("Charging"));
+ {
+ t = bat->time_full;
+ elm_object_text_set(w->lb_state, _("Charging"));
+ }
else
- elm_object_text_set(w->lb_state, _("Discharging"));
+ {
+ t = bat->time_left;
+ elm_object_text_set(w->lb_state, _("Discharging"));
+ }
+hrs = (t / 3600);
+mins = ((t) / 60 - (hrs * 60));
+if (mins < 0) mins = 0;
+ snprintf(buf, sizeof(buf), "%i:%02i", hrs, mins);
+elm_object_text_set(w->lb_time, buf);
+elm_progressbar_value_set(w->pb_usage, (double) bat->percent / 100.0);
+elm_progressbar_value_set(w->pb_health,
+ ((double) bat->last_full_charge /
(bat->design_charge / 100)) / 100);
if (i == (pd->n_units - 1)) break;
}
@@ -235,7 +254,7 @@ _popup_usage_content_update_cb(void *data)
static Evas_Object *
_popup_usage_content_add(Evas_Object *parent, Instance *inst)
{
- Evas_Object *tb, *fr, *bx, *lb, *pb, *sep, *o;
+ Evas_Object *tb, *tb2, *fr, *lb, *pb, *sep, *rec;
_Popup_Data *pd;
unsigned int n;
@@ -252,40 +271,67 @@ _popup_usage_content_add(Evas_Object *parent, Instance *inst)
{
_Popup_Widgets *w = &pd->widgets[i];
-o = evas_object_rectangle_add(evas_object_evas_get(parent));
-evas_object_size_hint_min_set(o, ELM_SCALE_SIZE(160), 1);
-evas_object_size_hint_max_set(o, ELM_SCALE_SIZE(320), -1);
-elm_table_pack(tb, o, 0, i, 1, 1);
+rec = evas_object_rectangle_add(evas_object_evas_get(parent));
+evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(240), 1);
+evas_object_size_hint_max_set(rec, ELM_SCALE_SIZE(320), -1);
+elm_table_pack(tb, rec, 0, i, 1, 1);
w->fr = fr = elm_frame_add(parent);
E_FILL(fr); E_EXPAND(fr);
-elm_object_style_set(fr, "pad_small");
evas_object_show(fr);
elm_table_pack(tb, fr, 0, i++, 1, 1);
-bx = elm_box_add(parent);
-E_FILL(bx); E_EXPAND(bx);
-evas_object_show(bx);
-elm_object_content_set(fr, bx);
+tb2 = elm_table_add(parent);
+E_FILL(tb2); E_EXPAND(tb2);
+evas_object_show(tb2);
+elm_object_content_set(fr, tb2);
w->lb_state = lb = elm_label_add(parent);
E_ALIGN(lb, 0.5, 0.5);
+evas_object_show(lb);
+elm_table_pack(tb2, lb, 0, 0, 1, 1);
+rec = evas_object_rectangle_add(evas_object_evas_get(parent));
+evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(80), 1);
+elm_table_pack(tb2, rec, 0, 0, 1, 1);
+
+w->pb_usage = pb = elm_progressbar_add(parent);
+E_FILL(pb); E_EXPAND(pb);
+evas_object_show(pb);
+elm_progressbar_span_size_set(pb, 1.0);
+elm_table_pack(tb2, pb, 1, 0, 1, 1);
+
+lb = elm_label_add(parent);
+E_ALIGN(lb, 0.5, 0.5);
E_EXPAND(lb);
evas_object_show(lb);
-elm_box_pack_end(bx, lb);
+elm_object_text_set(
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: battery: fix sysctl battery update and naming.
These are good changes on the batt mod...
+1
dh
On 3/7/21 3:22 PM, Alastair Poole wrote:
netstar pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=39b7896df50c0a352da61ce74f55de8389b2f4a4
commit 39b7896df50c0a352da61ce74f55de8389b2f4a4
Author: Alastair Poole
Date: Sun Mar 7 20:21:12 2021 +
battery: fix sysctl battery update and naming.
---
src/modules/battery/e_mod_main.c | 30 +-
src/modules/battery/e_mod_sysctl.c | 28 +++-
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index fc3a83956..48ec0b2ed 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -73,6 +73,9 @@ static void _battery_cb_warning_popup_hide(void *data,
Evas *e, Evas_Object
static void _battery_warning_popup_destroy(Instance *inst);
static void _battery_warning_popup(Instance *inst, int time, double
percent);
+static void _battery_popup_usage_destroy(Instance *inst);
+static void _battery_popup_usage_new(Instance *inst);
+
static Eina_Bool _powersave_cb_config_update(void *data, int type, void
*event);
static E_Config_DD *conf_edd = NULL;
@@ -131,6 +134,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
e_object_del(E_OBJECT(inst->warning));
inst->popup_battery = NULL;
}
+ _battery_popup_usage_destroy(inst);
E_FREE(inst);
}
@@ -183,7 +187,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class)
}
static void
-_popup_usage_del(Instance *inst)
+_battery_popup_usage_destroy(Instance *inst)
{
if (inst->popup_timer) ecore_timer_del(inst->popup_timer);
E_FREE_FUNC(inst->popup, e_object_del);
@@ -193,13 +197,13 @@ _popup_usage_del(Instance *inst)
}
static void
-_popup_usage_del_cb(void *obj)
+_battery_popup_usage_destroy_cb(void *obj)
{
- _popup_usage_del(e_object_data_get(obj));
+ _battery_popup_usage_destroy(e_object_data_get(obj));
}
static Eina_Bool
-_popup_usage_content_update_cb(void *data)
+_battery_popup_usage_content_update_cb(void *data)
{
Instance *inst;
_Popup_Data *pd;
@@ -214,7 +218,7 @@ _popup_usage_content_update_cb(void *data)
if (!battery_config->have_battery)
{
-_popup_usage_del(inst);
+_battery_popup_usage_destroy(inst);
return ECORE_CALLBACK_CANCEL;
}
@@ -252,7 +256,7 @@ _popup_usage_content_update_cb(void *data)
}
static Evas_Object *
-_popup_usage_content_add(Evas_Object *parent, Instance *inst)
+_battery_popup_usage_content_add(Evas_Object *parent, Instance *inst)
{
Evas_Object *tb, *tb2, *fr, *lb, *pb, *sep, *rec;
_Popup_Data *pd;
@@ -333,22 +337,22 @@ _popup_usage_content_add(Evas_Object *parent, Instance
*inst)
elm_table_pack(tb2, sep, 0, 3, 2, 1);
}
- _popup_usage_content_update_cb(pd);
+ _battery_popup_usage_content_update_cb(pd);
if (battery_config->have_battery)
- inst->popup_timer = ecore_timer_add(10.0, _popup_usage_content_update_cb,
pd);
+ inst->popup_timer = ecore_timer_add(10.0,
_battery_popup_usage_content_update_cb, pd);
return tb;
}
static void
-_popup_usage_new(Instance *inst)
+_battery_popup_usage_new(Instance *inst)
{
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
- e_gadcon_popup_content_set(inst->popup,
_popup_usage_content_add(e_comp->elm, inst));
+ e_gadcon_popup_content_set(inst->popup,
_battery_popup_usage_content_add(e_comp->elm, inst));
e_gadcon_popup_show(inst->popup);
e_object_data_set(E_OBJECT(inst->popup),inst);
- E_OBJECT_DEL_SET(inst->popup, _popup_usage_del_cb);
+ E_OBJECT_DEL_SET(inst->popup, _battery_popup_usage_destroy_cb);
}
static void
@@ -394,9 +398,9 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj, void *event_info)
_battery_cb_warning_popup_hide(data, e, obj, event_info);
if (!inst->popup)
- _popup_usage_new(inst);
+ _battery_popup_usage_new(inst);
else
- _popup_usage_del(inst);
+ _battery_popup_usage_destroy(inst);
}
}
diff --git a/src/modules/battery/e_mod_sysctl.c b/src/modules/battery/e_mod_sysctl.c
index 38d69c7c6..b199d4ad6 100644
--- a/src/modules/battery/e_mod_sysctl.c
+++ b/src/modules/battery/e_mod_sysctl.c
@@ -16,19 +16,22 @@
# include
#endif
-static Eina_Bool _battery_sysctl_battery_update_poll(void *data EINA_UNUSED);
-static int _battery_sysctl_battery_update();
+static Eina_Bool _battery_sysctl_battery_update_poll(void *data EINA_UNUSED);
+static int _battery_sysctl_battery_update();
-extern Eina_List *device_batteries;
-extern Eina_List *device_ac_adapters;
-extern double init_time;
+extern Eina_List *device_batteries;
+extern Eina_List *device_ac_adapters;
+extern double init_time;
static A
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "ecore: Update to not use deprecated mallinfo"
Yea, an #ifdef in code, along with some version checking in meson, so we
can decide which mallinfo to use ...
I'll add a patch for that next week (no time this week sadly).
dh
On 2/18/21 5:01 AM, Carsten Haitzler wrote:
On Wed, 17 Feb 2021 07:53:25 -0800 Christopher Michael
said:
Actually dh - you were on the right path. I've also been seeing the "this is
deprecated" warnings in recent weeks or so... but it seems this has to become
an ifdef and compile-time check or so...
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1842d3997a88e22421eddeed49be50a0db08b7ce
commit 1842d3997a88e22421eddeed49be50a0db08b7ce
Author: Christopher Michael
Date: Wed Feb 17 10:52:20 2021 -0500
Revert "ecore: Update to not use deprecated mallinfo"
Reverting this, for now, because some distro's are still not
updated... This should probably use a malloc version check, but I
don't have time this week for a proper fix...
This reverts commit 17137316eeb728a30c3c14e4b3a2f1cd8765bbfc.
---
src/lib/ecore/ecore.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index c3ffaa4165..0d79b621b2 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -51,8 +51,8 @@ EAPI double _efl_startup_time = 0;
Global = Local;
static Eina_Bool _ecore_memory_statistic(void *data);
-static size_t _ecore_memory_max_total = 0;
-static size_t _ecore_memory_max_free = 0;
+static int _ecore_memory_max_total = 0;
+static int _ecore_memory_max_free = 0;
static pid_t _ecore_memory_pid = 0;
#ifdef HAVE_MALLOC_INFO
static FILE *_ecore_memory_statistic_file = NULL;
@@ -437,7 +437,7 @@ ecore_shutdown(void)
{
_ecore_memory_statistic(NULL);
- ERR("[%i] Memory MAX total: %lu, free: %lu",
+ ERR("[%i] Memory MAX total: %i, free: %i",
_ecore_memory_pid,
_ecore_memory_max_total,
_ecore_memory_max_free);
@@ -971,12 +971,12 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
static int frame = 0;
#endif
#ifdef HAVE_MALLINFO
- struct mallinfo2 mi;
- static size_t uordblks = 0;
- static size_t fordblks = 0;
+ struct mallinfo mi;
+ static int uordblks = 0;
+ static int fordblks = 0;
Eina_Bool changed = EINA_FALSE;
- mi = mallinfo2();
+ mi = mallinfo();
#define HAS_CHANGED(Global, Local) \
if (Global != Local) \
@@ -989,7 +989,7 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
HAS_CHANGED(fordblks, mi.fordblks);
if (changed)
- ERR("[%i] Memory total: %lu, free: %lu",
+ ERR("[%i] Memory total: %i, free: %i",
_ecore_memory_pid,
mi.uordblks,
mi.fordblks);
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: music control - respct powersave for polling for mpris provider
Thank you for making this easily readable !! :D
+1
dh
On 1/6/21 5:19 PM, Carsten Haitzler wrote:
Eina_Bool
music_control_dbus_init(E_Music_Control_Module_Context *ctxt, const char *bus)
{
@@ -584,6 +605,9 @@ e_modapi_init(E_Module *m)
if (ctxt->config->pause_on_desklock)
desklock_handler = ecore_event_handler_add(E_EVENT_DESKLOCK,
_desklock_cb, ctxt);
+ music_control_powersave_event_handler =
+ ecore_event_handler_add(E_EVENT_POWERSAVE_UPDATE,
+ _powersave_change_cb, ctxt);
return ctxt;
}
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/02: wl - remove some old versioning stuff that is not relevant anymore
Thank you !
Use the API that is there ...
dh
On 12/4/20 12:25 AM, Christopher Michael wrote:
+1
dh
On 12/1/20 9:29 PM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6d2c0d04e97f5afd47aed2aacf062b3c83e27db5
commit 6d2c0d04e97f5afd47aed2aacf062b3c83e27db5
Author: Carsten Haitzler (Rasterman)
Date: Tue Dec 1 21:21:17 2020 +
wl - remove some old versioning stuff that is not relevant anymore
we need latest efl anyway so... no point having this fluff
---
src/bin/e_alert_main.c | 2 -
src/bin/e_drm2.x | 145
src/modules/wl_drm/e_mod_main.c | 33 +++--
3 files changed, 8 insertions(+), 172 deletions(-)
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index e7f2cf21e..10db0a482 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -1,7 +1,5 @@
#include "config.h"
-//# include "e_drm2.x"
-
#include
#ifndef HAVE_WAYLAND_ONLY
# include
diff --git a/src/bin/e_drm2.x b/src/bin/e_drm2.x
deleted file mode 100644
index 097211d3e..0
--- a/src/bin/e_drm2.x
+++ /dev/null
@@ -1,145 +0,0 @@
-# include
-
-static int crude_hack_fd;
-static void *e_drm2_lib;
-
-void (*sym_ecore_drm2_output_crtc_size_get_120)(Ecore_Drm2_Output
*output, int *w, int *h);
-void (*sym_ecore_drm2_output_geometry_get_120)(Ecore_Drm2_Output
*output, int *x, int *y, int *w, int *h);
-void (*sym_ecore_drm2_output_resolution_get_120)(Ecore_Drm2_Output
*output, int *w, int *h, unsigned int *refresh);
-Ecore_Drm2_Device *(*sym_ecore_drm2_device_find_120)(const char
*seat, unsigned int tty);
-int (*sym_ecore_drm2_device_open_120)(Ecore_Drm2_Device *device);
-Ecore_Drm2_Device *(*sym_ecore_drm2_device_open_121)(const char
*seat, unsigned int tty);
-void (*sym_ecore_drm2_device_free_120)(Ecore_Drm2_Device *device);
-void (*sym_ecore_drm2_output_info_get_121)(Ecore_Drm2_Output
*output, int *x, int *y, int *w, int *h, unsigned int *refresh);
-Ecore_Drm2_Fb *(*sym_ecore_drm2_fb_create_120)(int fd, int width,
int height, int depth, int bpp, unsigned int format);
-Ecore_Drm2_Fb *(*sym_ecore_drm2_fb_create_121)(Ecore_Drm2_Device
*dev, int width, int height, int depth, int bpp, unsigned int format);
-int (*sym_ecore_drm2_output_rotation_get_122)(Ecore_Drm2_Output
*output);
-Eina_Bool
(*sym_ecore_drm2_output_rotation_set_122)(Ecore_Drm2_Output *output,
int rotation);
-
-#define E_DRM2_EFL_VERSION_MINIMUM(MAJ, MIN, MIC) \
- ((eina_version->major > MAJ) || (eina_version->minor > MIN) ||\
- ((eina_version->minor == MIN) && (eina_version->micro >= MIC)))
-
-static Eina_Bool
-e_drm2_compat_init(void)
-{
-#define EDRM2SYM(sym, ver) \
- sym_##sym##_##ver = dlsym(e_drm2_lib, #sym); \
- if (!sym_##sym##_##ver) \
- { \
- dlclose(e_drm2_lib); \
- e_drm2_lib = NULL; \
- return EINA_FALSE; \
- }
-
- e_drm2_lib = dlopen("libecore_drm2.so.1", RTLD_NOW | RTLD_LOCAL);
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 21, 99))
- {
- EDRM2SYM(ecore_drm2_output_rotation_get, 122);
- EDRM2SYM(ecore_drm2_output_rotation_set, 122);
- }
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- EDRM2SYM(ecore_drm2_device_open, 121);
- EDRM2SYM(ecore_drm2_output_info_get, 121);
- EDRM2SYM(ecore_drm2_fb_create, 121);
- return EINA_TRUE;
- }
-
- EDRM2SYM(ecore_drm2_output_crtc_size_get, 120);
- EDRM2SYM(ecore_drm2_output_geometry_get, 120);
- EDRM2SYM(ecore_drm2_output_resolution_get, 120);
- EDRM2SYM(ecore_drm2_device_find, 120);
- EDRM2SYM(ecore_drm2_device_open, 120);
- EDRM2SYM(ecore_drm2_device_free, 120);
- EDRM2SYM(ecore_drm2_fb_create, 120);
- return EINA_TRUE;
-
-#undef EDRM2SYM
-}
-
-static void
-e_drm2_compat_shutdown(void)
-{
- if (e_drm2_lib) dlclose(e_drm2_lib);
-}
-
-static inline Ecore_Drm2_Device *
-e_drm2_device_open(const char *seat, int vt)
-{
- Ecore_Drm2_Device *out;
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- return sym_ecore_drm2_device_open_121(seat, vt);
- }
-
- out = sym_ecore_drm2_device_find_120(seat, vt);
- if (!out) return NULL;
-
- crude_hack_fd = sym_ecore_drm2_device_open_120(out);
- if (crude_hack_fd < 0)
- {
- ecore_drm2_device_close(out);
- return NULL;
- }
- return out;
-}
-
-static inline void
-e_drm2_device_close(Ecore_Drm2_Device *device)
-{
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- ecore_drm2_device_close(device);
- return;
- }
- ecore_drm2_device_close(device);
- sym_ecore_drm2_device_free_120(device);
-}
-
-static inline void
-e_drm2_output_info_get(Ecore_Drm2_Output *op, int *x, int *y, int
*w, int *h, unsigned int *refresh)
-{
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- sym_ecore_drm2
Re: [E-devel] [EGIT] [core/enlightenment] master 01/02: wl - remove some old versioning stuff that is not relevant anymore
drm x compat for E ?? Why ?
On 12/4/20 12:25 AM, Christopher Michael wrote:
+1
dh
On 12/1/20 9:29 PM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6d2c0d04e97f5afd47aed2aacf062b3c83e27db5
commit 6d2c0d04e97f5afd47aed2aacf062b3c83e27db5
Author: Carsten Haitzler (Rasterman)
Date: Tue Dec 1 21:21:17 2020 +
wl - remove some old versioning stuff that is not relevant anymore
we need latest efl anyway so... no point having this fluff
---
src/bin/e_alert_main.c | 2 -
src/bin/e_drm2.x | 145
src/modules/wl_drm/e_mod_main.c | 33 +++--
3 files changed, 8 insertions(+), 172 deletions(-)
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index e7f2cf21e..10db0a482 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -1,7 +1,5 @@
#include "config.h"
-//# include "e_drm2.x"
-
#include
#ifndef HAVE_WAYLAND_ONLY
# include
diff --git a/src/bin/e_drm2.x b/src/bin/e_drm2.x
deleted file mode 100644
index 097211d3e..0
--- a/src/bin/e_drm2.x
+++ /dev/null
@@ -1,145 +0,0 @@
-# include
-
-static int crude_hack_fd;
-static void *e_drm2_lib;
-
-void (*sym_ecore_drm2_output_crtc_size_get_120)(Ecore_Drm2_Output
*output, int *w, int *h);
-void (*sym_ecore_drm2_output_geometry_get_120)(Ecore_Drm2_Output
*output, int *x, int *y, int *w, int *h);
-void (*sym_ecore_drm2_output_resolution_get_120)(Ecore_Drm2_Output
*output, int *w, int *h, unsigned int *refresh);
-Ecore_Drm2_Device *(*sym_ecore_drm2_device_find_120)(const char
*seat, unsigned int tty);
-int (*sym_ecore_drm2_device_open_120)(Ecore_Drm2_Device *device);
-Ecore_Drm2_Device *(*sym_ecore_drm2_device_open_121)(const char
*seat, unsigned int tty);
-void (*sym_ecore_drm2_device_free_120)(Ecore_Drm2_Device *device);
-void (*sym_ecore_drm2_output_info_get_121)(Ecore_Drm2_Output
*output, int *x, int *y, int *w, int *h, unsigned int *refresh);
-Ecore_Drm2_Fb *(*sym_ecore_drm2_fb_create_120)(int fd, int width,
int height, int depth, int bpp, unsigned int format);
-Ecore_Drm2_Fb *(*sym_ecore_drm2_fb_create_121)(Ecore_Drm2_Device
*dev, int width, int height, int depth, int bpp, unsigned int format);
-int (*sym_ecore_drm2_output_rotation_get_122)(Ecore_Drm2_Output
*output);
-Eina_Bool
(*sym_ecore_drm2_output_rotation_set_122)(Ecore_Drm2_Output *output,
int rotation);
-
-#define E_DRM2_EFL_VERSION_MINIMUM(MAJ, MIN, MIC) \
- ((eina_version->major > MAJ) || (eina_version->minor > MIN) ||\
- ((eina_version->minor == MIN) && (eina_version->micro >= MIC)))
-
-static Eina_Bool
-e_drm2_compat_init(void)
-{
-#define EDRM2SYM(sym, ver) \
- sym_##sym##_##ver = dlsym(e_drm2_lib, #sym); \
- if (!sym_##sym##_##ver) \
- { \
- dlclose(e_drm2_lib); \
- e_drm2_lib = NULL; \
- return EINA_FALSE; \
- }
-
- e_drm2_lib = dlopen("libecore_drm2.so.1", RTLD_NOW | RTLD_LOCAL);
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 21, 99))
- {
- EDRM2SYM(ecore_drm2_output_rotation_get, 122);
- EDRM2SYM(ecore_drm2_output_rotation_set, 122);
- }
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- EDRM2SYM(ecore_drm2_device_open, 121);
- EDRM2SYM(ecore_drm2_output_info_get, 121);
- EDRM2SYM(ecore_drm2_fb_create, 121);
- return EINA_TRUE;
- }
-
- EDRM2SYM(ecore_drm2_output_crtc_size_get, 120);
- EDRM2SYM(ecore_drm2_output_geometry_get, 120);
- EDRM2SYM(ecore_drm2_output_resolution_get, 120);
- EDRM2SYM(ecore_drm2_device_find, 120);
- EDRM2SYM(ecore_drm2_device_open, 120);
- EDRM2SYM(ecore_drm2_device_free, 120);
- EDRM2SYM(ecore_drm2_fb_create, 120);
- return EINA_TRUE;
-
-#undef EDRM2SYM
-}
-
-static void
-e_drm2_compat_shutdown(void)
-{
- if (e_drm2_lib) dlclose(e_drm2_lib);
-}
-
-static inline Ecore_Drm2_Device *
-e_drm2_device_open(const char *seat, int vt)
-{
- Ecore_Drm2_Device *out;
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- return sym_ecore_drm2_device_open_121(seat, vt);
- }
-
- out = sym_ecore_drm2_device_find_120(seat, vt);
- if (!out) return NULL;
-
- crude_hack_fd = sym_ecore_drm2_device_open_120(out);
- if (crude_hack_fd < 0)
- {
- ecore_drm2_device_close(out);
- return NULL;
- }
- return out;
-}
-
-static inline void
-e_drm2_device_close(Ecore_Drm2_Device *device)
-{
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- ecore_drm2_device_close(device);
- return;
- }
- ecore_drm2_device_close(device);
- sym_ecore_drm2_device_free_120(device);
-}
-
-static inline void
-e_drm2_output_info_get(Ecore_Drm2_Output *op, int *x, int *y, int
*w, int *h, unsigned int *refresh)
-{
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
- sym_ecore_drm2_output_info_get_121(op, x, y, w, h, refresh);
-
Re: [E-devel] [EGIT] [core/enlightenment] master 01/02: wl - remove some old versioning stuff that is not relevant anymore
+1
dh
On 12/1/20 9:29 PM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6d2c0d04e97f5afd47aed2aacf062b3c83e27db5
commit 6d2c0d04e97f5afd47aed2aacf062b3c83e27db5
Author: Carsten Haitzler (Rasterman)
Date: Tue Dec 1 21:21:17 2020 +
wl - remove some old versioning stuff that is not relevant anymore
we need latest efl anyway so... no point having this fluff
---
src/bin/e_alert_main.c | 2 -
src/bin/e_drm2.x| 145
src/modules/wl_drm/e_mod_main.c | 33 +++--
3 files changed, 8 insertions(+), 172 deletions(-)
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index e7f2cf21e..10db0a482 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -1,7 +1,5 @@
#include "config.h"
-//# include "e_drm2.x"
-
#include
#ifndef HAVE_WAYLAND_ONLY
# include
diff --git a/src/bin/e_drm2.x b/src/bin/e_drm2.x
deleted file mode 100644
index 097211d3e..0
--- a/src/bin/e_drm2.x
+++ /dev/null
@@ -1,145 +0,0 @@
-# include
-
-static int crude_hack_fd;
-static void *e_drm2_lib;
-
-void (*sym_ecore_drm2_output_crtc_size_get_120)(Ecore_Drm2_Output *output, int
*w, int *h);
-void (*sym_ecore_drm2_output_geometry_get_120)(Ecore_Drm2_Output *output, int
*x, int *y, int *w, int *h);
-void (*sym_ecore_drm2_output_resolution_get_120)(Ecore_Drm2_Output *output,
int *w, int *h, unsigned int *refresh);
-Ecore_Drm2_Device *(*sym_ecore_drm2_device_find_120)(const char *seat,
unsigned int tty);
-int (*sym_ecore_drm2_device_open_120)(Ecore_Drm2_Device *device);
-Ecore_Drm2_Device *(*sym_ecore_drm2_device_open_121)(const char *seat,
unsigned int tty);
-void (*sym_ecore_drm2_device_free_120)(Ecore_Drm2_Device *device);
-void (*sym_ecore_drm2_output_info_get_121)(Ecore_Drm2_Output *output, int *x,
int *y, int *w, int *h, unsigned int *refresh);
-Ecore_Drm2_Fb *(*sym_ecore_drm2_fb_create_120)(int fd, int width, int height,
int depth, int bpp, unsigned int format);
-Ecore_Drm2_Fb *(*sym_ecore_drm2_fb_create_121)(Ecore_Drm2_Device *dev, int
width, int height, int depth, int bpp, unsigned int format);
-int (*sym_ecore_drm2_output_rotation_get_122)(Ecore_Drm2_Output *output);
-Eina_Bool (*sym_ecore_drm2_output_rotation_set_122)(Ecore_Drm2_Output *output,
int rotation);
-
-#define E_DRM2_EFL_VERSION_MINIMUM(MAJ, MIN, MIC) \
- ((eina_version->major > MAJ) || (eina_version->minor > MIN) ||\
- ((eina_version->minor == MIN) && (eina_version->micro >= MIC)))
-
-static Eina_Bool
-e_drm2_compat_init(void)
-{
-#define EDRM2SYM(sym, ver) \
- sym_##sym##_##ver = dlsym(e_drm2_lib, #sym); \
- if (!sym_##sym##_##ver) \
- { \
-dlclose(e_drm2_lib); \
-e_drm2_lib = NULL; \
-return EINA_FALSE; \
- }
-
- e_drm2_lib = dlopen("libecore_drm2.so.1", RTLD_NOW | RTLD_LOCAL);
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 21, 99))
- {
-EDRM2SYM(ecore_drm2_output_rotation_get, 122);
-EDRM2SYM(ecore_drm2_output_rotation_set, 122);
- }
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
-EDRM2SYM(ecore_drm2_device_open, 121);
-EDRM2SYM(ecore_drm2_output_info_get, 121);
-EDRM2SYM(ecore_drm2_fb_create, 121);
-return EINA_TRUE;
- }
-
- EDRM2SYM(ecore_drm2_output_crtc_size_get, 120);
- EDRM2SYM(ecore_drm2_output_geometry_get, 120);
- EDRM2SYM(ecore_drm2_output_resolution_get, 120);
- EDRM2SYM(ecore_drm2_device_find, 120);
- EDRM2SYM(ecore_drm2_device_open, 120);
- EDRM2SYM(ecore_drm2_device_free, 120);
- EDRM2SYM(ecore_drm2_fb_create, 120);
- return EINA_TRUE;
-
-#undef EDRM2SYM
-}
-
-static void
-e_drm2_compat_shutdown(void)
-{
- if (e_drm2_lib) dlclose(e_drm2_lib);
-}
-
-static inline Ecore_Drm2_Device *
-e_drm2_device_open(const char *seat, int vt)
-{
- Ecore_Drm2_Device *out;
-
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
-return sym_ecore_drm2_device_open_121(seat, vt);
- }
-
- out = sym_ecore_drm2_device_find_120(seat, vt);
- if (!out) return NULL;
-
- crude_hack_fd = sym_ecore_drm2_device_open_120(out);
- if (crude_hack_fd < 0)
- {
-ecore_drm2_device_close(out);
-return NULL;
- }
- return out;
-}
-
-static inline void
-e_drm2_device_close(Ecore_Drm2_Device *device)
-{
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
-ecore_drm2_device_close(device);
-return;
- }
- ecore_drm2_device_close(device);
- sym_ecore_drm2_device_free_120(device);
-}
-
-static inline void
-e_drm2_output_info_get(Ecore_Drm2_Output *op, int *x, int *y, int *w, int *h,
unsigned int *refresh)
-{
- if (E_DRM2_EFL_VERSION_MINIMUM(1, 20, 99))
- {
-sym_ecore_drm2_output_info_get_121(op, x, y, w, h, refresh);
-return;
- }
- sym_ecore_drm2_output_geometry_get_120(op, x, y, w, h);
- sym_ecore_drm2_output_resolution_get_120(op, NULL, NULL, refresh);
Re: [E-devel] [EGIT] [apps/terminology] master 01/02: colorschemes: input files are JSON now
My first thought is ... WHY Json??...
dh
On 9/28/20 5:49 PM, Boris Faure wrote:
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=0dc4e1014f7010bd049e5650a942ef1127a1e7f6
commit 0dc4e1014f7010bd049e5650a942ef1127a1e7f6
Author: Boris Faure
Date: Mon Sep 28 23:24:07 2020 +0200
colorschemes: input files are JSON now
---
data/colorschemes/builder.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/colorschemes/builder.sh b/data/colorschemes/builder.sh
index 36994f6..1483e54 100755
--- a/data/colorschemes/builder.sh
+++ b/data/colorschemes/builder.sh
@@ -18,7 +18,7 @@ trap 'rm -f "$TMPFILE"' INT TERM HUP EXIT
for JSON in "$@"
do
# use the name, without extension as key in eet
- KEY=$(basename "$JSON" ".desc")
+ KEY=$(basename "$JSON" ".json")
DESC="${KEY}.desc"
$JSON2DESC "$JSON" "$DESC"
$EET -e "$TMP_EET" "$KEY" "$DESC" "$COMPRESS"
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: edje: efl: add new EFL_VERSION_1_26 define for new dev cycle
Let's not Forget about the 1.8/9 edje that was wrong,,,That warning
still there :(
1.271.28.
But I like this !! Stefan got my support!! :-D
You Stay Solid my friend !! Keep on coding
dh
On 9/22/20 2:28 PM, Stefan Schmidt wrote:
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=080dbdee51662d0fc79d4ee655f72b0cb5900b75
commit 080dbdee51662d0fc79d4ee655f72b0cb5900b75
Author: Stefan Schmidt
Date: Tue Sep 22 20:27:18 2020 +0200
edje: efl: add new EFL_VERSION_1_26 define for new dev cycle
Thios allows to mark edje file supported for specific versions.
---
src/bin/edje/edje_cc_parse.c | 4 +++-
src/lib/efl/Efl.h| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index a656fb6783..32d06350e3 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -32,6 +32,7 @@
#define EDJE_1_23_SUPPORTED " -DEFL_VERSION_1_23=1 "
#define EDJE_1_24_SUPPORTED " -DEFL_VERSION_1_24=1 "
#define EDJE_1_25_SUPPORTED " -DEFL_VERSION_1_25=1 "
+#define EDJE_1_26_SUPPORTED " -DEFL_VERSION_1_26=1 "
#define EDJE_CC_EFL_VERSION_SUPPORTED \
EDJE_1_18_SUPPORTED \
@@ -41,7 +42,8 @@
EDJE_1_22_SUPPORTED \
EDJE_1_23_SUPPORTED \
EDJE_1_24_SUPPORTED \
- EDJE_1_25_SUPPORTED
+ EDJE_1_25_SUPPORTED \
+ EDJE_1_26_SUPPORTED
static voidnew_object(void);
static voidnew_statement(void);
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index a4a369ed9f..480249fae5 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -54,6 +54,7 @@ extern "C" {
#define EFL_VERSION_1_23 1
#define EFL_VERSION_1_24 1
#define EFL_VERSION_1_25 1
+#define EFL_VERSION_1_26 1
/* Add here all the required ifdef for any @protected method */
#ifdef EFL_BUILD
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 14/14: ecore - efl thread - dont close invalid < 0 fd's
Again ... Doesn't anyone check returns ? Why have a function that Gives a Return but not use it ? Simple but missed... Thanks Old Man for doing Coverity stuffs ... dh On 9/19/20 7:23 PM, Carsten Haitzler wrote: raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=52b02055f45ccb32b55b39bb5b518403c55c86b6 commit 52b02055f45ccb32b55b39bb5b518403c55c86b6 Author: Carsten Haitzler (Rasterman) Date: Sun Sep 20 00:06:30 2020 +0100 ecore - efl thread - dont close invalid < 0 fd's fix CID 1396951 --- src/lib/ecore/efl_thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c index ab6fdab7a1..9fc6b8d882 100644 --- a/src/lib/ecore/efl_thread.c +++ b/src/lib/ecore/efl_thread.c @@ -826,8 +826,8 @@ _efl_thread_efl_task_run(Eo *obj, Efl_Thread_Data *pd) close(pd->fd.out); close(pd->ctrl.in); close(pd->ctrl.out); -close(thdat->fd.in); -close(thdat->fd.out); +if (thdat->fd.in >= 0) close(thdat->fd.in); +if (thdat->fd.out >= 0) close(thdat->fd.out); close(thdat->ctrl.in); close(thdat->ctrl.out); free(thdat); ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 13/14: ecore - efl exe - check returns of open and dup2 for stdin etc. fds
Something simple but was missed on commit ?
dh
On 9/19/20 7:23 PM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ca4b9393644f142cbe26cab6734f81f6d891b535
commit ca4b9393644f142cbe26cab6734f81f6d891b535
Author: Carsten Haitzler (Rasterman)
Date: Sat Sep 19 23:59:59 2020 +0100
ecore - efl exe - check returns of open and dup2 for stdin etc. fds
check returns - fix CID 1397002
---
src/lib/ecore/efl_exe.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore/efl_exe.c b/src/lib/ecore/efl_exe.c
index 03c52ab845..7239bcdf6f 100644
--- a/src/lib/ecore/efl_exe.c
+++ b/src/lib/ecore/efl_exe.c
@@ -537,13 +537,14 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_Data *pd)
{
// hide stdin
devnull = open("/dev/null", O_RDONLY);
-dup2(devnull, STDIN_FILENO);
+if (devnull < 0) _exit(1);
+if (dup2(devnull, STDIN_FILENO) < 0) _exit(1);
close(devnull);
}
else if ((td->flags & EFL_TASK_FLAGS_USE_STDIN))
{
// hook up stdin to the pipe going to the parent
-dup2(pipe_stdin[0], STDIN_FILENO);
+if (dup2(pipe_stdin[0], STDIN_FILENO) < 0) _exit(1);
close(pipe_stdin[0]);
}
@@ -552,13 +553,14 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_Data *pd)
{
// hide stdout
devnull = open("/dev/null", O_WRONLY);
-dup2(devnull, STDOUT_FILENO);
+if (devnull < 0) _exit(1);
+if (dup2(devnull, STDOUT_FILENO) < 0) _exit(1);
close(devnull);
}
else if ((td->flags & EFL_TASK_FLAGS_USE_STDOUT))
{
// hook up stdout to the pipe going to the parent
-dup2(pipe_stdout[1], STDOUT_FILENO);
+if (dup2(pipe_stdout[1], STDOUT_FILENO) < 0) _exit(1);
close(pipe_stdout[1]);
}
@@ -566,7 +568,8 @@ _efl_exe_efl_task_run(Eo *obj, Efl_Exe_Data *pd)
{
// hide stderr
devnull = open("/dev/null", O_WRONLY);
-dup2(devnull, STDERR_FILENO);
+if (devnull < 0) _exit(1);
+if (dup2(devnull, STDERR_FILENO) < 0) _exit(1);
close(devnull);
}
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Tests....
test_image.c.o In file included from ../src/tests/evas/evas_suite.h:4, from ../src/tests/evas/evas_test_image.c:14: ../src/tests/evas/evas_test_image.c: In function ‘evas_object_image_loader_orientation_fn’: ../src/tests/evas/evas_test_image.c:281:17: warning: too many arguments for format [-Wformat-extra-args] 281 | "Image orientation test failed: exif orientation flag: %s\n", res[i].desc); | ^~~~ ../src/tests/evas/evas_test_image.c: In function ‘evas_object_image_orient_fn’: ../src/tests/evas/evas_test_image.c:331:17: warning: too many arguments for format [-Wformat-extra-args] 331 | "Image orientation test failed: orient flag: %s\n", res[i].desc); | ^~ ../src/tests/evas/evas_test_image.c: In function ‘evas_object_image_partially_load_orientation_fn’: ../src/tests/evas/evas_test_image.c:621:17: warning: too many arguments for format [-Wformat-extra-args] 621 | "Image orientation partially load test failed: exif orientation flag: %s\n", res[i].desc); | ^~~ ../src/tests/evas/evas_test_image.c: In function ‘evas_object_image_map_unmap_fn’: ../src/tests/evas/evas_test_image.c:941:66: warning: too many arguments for format [-Wformat-extra-args] 941 | fail_if(orig[y*stride/4 + x] != dest[y*stride2/4+x], "pixels differ [1]"); | ^~~ ../src/tests/evas/evas_test_image.c:949:51: warning: too many arguments for format [-Wformat-extra-args] 949 | fail_if(dest[y*stride/4 + x] != c, "pixels differ [2]"); | ^~~ ../src/tests/evas/evas_test_image.c:958:51: warning: too many arguments for format [-Wformat-extra-args] 958 | fail_if(dest[y*stride/4 + x] != c, "pixels differ [2bis]"); | ^~ ../src/tests/evas/evas_test_image.c:965:58: warning: too many arguments for format [-Wformat-extra-args] 965 | fail_if(dest[y*stride/4 + x] != 0xFF00FF00, "pixels differ [3]"); | ^~~ ../src/tests/evas/evas_test_image.c:966:62: warning: too many arguments for format [-Wformat-extra-args] 966 | fail_if(dest[(y+1)*stride/4 + x] != 0x, "pixels differ [4]"); | ^~~ [2491/3825] Linking target src/tests/efreet/efreet_suite [2524/3825] Compiling C object src/tests/eio/eio_suite.p/efl_io_model_test_monitor_add.c.o In file included from ../src/tests/eio/eio_suite.h:4, from ../src/tests/eio/efl_io_model_test_monitor_add.c:13: ../src/tests/eio/efl_io_model_test_monitor_add.c: In function ‘efl_io_model_test_test_monitor_add_fn’: ../src/tests/eio/efl_io_model_test_monitor_add.c:175:24: warning: too many arguments for format [-Wformat-extra-args] 175 | fail_if(!filemodel, "ERROR: Cannot init model!\n"); | ^ [2525/3825] Compiling C object src/tests/eio/eio_suite.p/eio_test_file.c.o [2534/3825] Compiling C object src/tests/eio/eio_suite.p/efl_io_model_test_file.c.o In file included from ../src/tests/eio/eio_suite.h:4, from ../src/tests/eio/efl_io_model_test_file.c:13: ../src/tests/eio/efl_io_model_test_file.c: In function ‘efl_io_model_test_test_file_fn’: ../src/tests/eio/efl_io_model_test_file.c:171:24: warning: too many arguments for format [-Wformat-extra-args] 171 | fail_if(!filemodel, "ERROR: Cannot init model!\n"); | ^ [2535/3825] Generating eolian_gen_focus_manager_test.eo with a custom command --- WOW, It's like we forgot how to spell or something Can't use "format" apparently.,AAA dh On 8/23/20 8:50 PM, Christopher Michael wrote: How can Test Code like this pass when a string can't be formatted ?? Too many args ? How was this pushed with this many warnings ?? dh See the help page for details. [346/3825] Compiling C object src/tests/eina/eina_suite.p/eina_test_value.c.o In file included from ../src/tests/eina/eina_suite.h:22, from ../src/tests/eina/eina_test_value.c:29: ../src/tests/eina/eina_test_value.c: In function ‘eina_value_test_hash_fn’: ../src/tests/eina/eina_test_value.c:2348:42: warning: too many arguments for format [-Wformat-extra-args] 2348 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s' in '%s'", buf, str); | ^~~~ ../src/tests/eina/eina_test_value.c:2351:42: warning: too many arguments for format [-Wformat-extra-args] 2351 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s'
Re: [E-devel] [EGIT] [core/efl] feature/themes/flat 02/02: TH - moar icons
The old man is an ICON machine !!! ;-D
dh
On 8/23/20 4:10 PM, Carsten Haitzler wrote:
raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=96b5e7f77788b81adf1095c1ae3e83777ecb1a69
commit 96b5e7f77788b81adf1095c1ae3e83777ecb1a69
Author: Carsten Haitzler (Rasterman)
Date: Sun Aug 23 21:09:57 2020 +0100
TH - moar icons
---
data/elementary/themes/edc/O/icons.edc | 17 ---
data/elementary/themes/edc/icons.edc | 11 +-
data/elementary/themes/ic.edc | 15 ++-
data/elementary/themes/img/bookmark-new.svg| 93 +
data/elementary/themes/img/eject.svg | 84 +++
data/elementary/themes/img/globe.svg | 114
data/elementary/themes/img/ic/bookmark-new-015.png | Bin 0 -> 294 bytes
data/elementary/themes/img/ic/bookmark-new-030.png | Bin 0 -> 477 bytes
data/elementary/themes/img/ic/bookmark-new-060.png | Bin 0 -> 874 bytes
data/elementary/themes/img/ic/eject-015.png| Bin 0 -> 203 bytes
data/elementary/themes/img/ic/eject-030.png| Bin 0 -> 210 bytes
data/elementary/themes/img/ic/eject-060.png| Bin 0 -> 294 bytes
data/elementary/themes/img/ic/globe-040.png| Bin 0 -> 1940 bytes
data/elementary/themes/img/ic/globe-080.png| Bin 0 -> 4512 bytes
data/elementary/themes/img/ic/globe-160.png| Bin 0 -> 10136 bytes
data/elementary/themes/img/ic/select-all-015.png | Bin 0 -> 167 bytes
data/elementary/themes/img/ic/select-all-030.png | Bin 0 -> 183 bytes
data/elementary/themes/img/ic/select-all-060.png | Bin 0 -> 213 bytes
data/elementary/themes/img/ic/swap-015.png | Bin 0 -> 280 bytes
data/elementary/themes/img/ic/swap-030.png | Bin 0 -> 304 bytes
data/elementary/themes/img/ic/swap-060.png | Bin 0 -> 447 bytes
.../themes/img/ic/view-hidden-files-015.png| Bin 0 -> 179 bytes
.../themes/img/ic/view-hidden-files-030.png| Bin 0 -> 195 bytes
.../themes/img/ic/view-hidden-files-060.png| Bin 0 -> 233 bytes
data/elementary/themes/img/select-all.svg | 89
data/elementary/themes/img/swap.svg| 93 +
data/elementary/themes/img/view-hidden-files.svg | 115 +
27 files changed, 604 insertions(+), 27 deletions(-)
diff --git a/data/elementary/themes/edc/O/icons.edc
b/data/elementary/themes/edc/O/icons.edc
index a9afcefe99..663056d617 100644
--- a/data/elementary/themes/edc/O/icons.edc
+++ b/data/elementary/themes/edc/O/icons.edc
@@ -34,13 +34,6 @@
* 2. Search for a name in kde (oxygen) and gnome (tango - human) icon set
OR
* 3. Try to follow the naming convention
*/
- //Standard Action Icons
- ICON("edit-swap","icon_swap.png",64) // *** //
"widget/swap"
- ICON("edit-select-all","icon_efm_select.png",16)//
EFMBUTTON("select"
- ICON("view-hidden-files","icon_efm_view.png",16) // *** //
EFMBUTTON("hidden_files"
- ICON("window-close","icon_close.png",64)//
"widget/close"
- ICON("dialog-ok-apply","icon_check.png",64) //
"enlightenment/check"
- //Standard Application Icons
ICON("preferences-desktop-color","icon_colors.png",64) //
"enlightenment/colors"
ICON("preferences-desktop-pointer","icon_mouse.png",64) // *** //
"enlightenment/mouse"
ICON("preferences-desktop-shelf-bottom-desk","icon_shelf_bottom_desk.png",64)// ***
// "enlightenment/shelf_bottom_desk"
@@ -67,22 +60,12 @@
ICON("preferences-screen-hflip","icon_screen_hflip.png",64) // *** //
"enlightenment/screen_hflip"
ICON("preferences-applications-add","icon_applications_new.png",64) // ***
// "enlightenment/add_application"
ICON("preferences-illume","icon_illume.png",64)
- //Standard Module Category Icons
ICON("modules-utils","icon_gadget.png",64)
ICON("modules-system","icon_gadget.png",64)
ICON("modules-look","icon_look.png",64)
ICON("modules-core","logo_white_128.png",64)
ICON("modules-mobile","icon_globe.png",64)
ICON("modules-settings","icon_config.png",64)
- //Standard Place Icons
- ICON("start-here","logo_white_128.png",128) //
"enlightenment/e"
- ICON("network-website","icon_globe.png",64) //
"enlightenment/website"
- //Standard Device Icons
- ICON("media-eject","icon_efm_eject.png", 64)
- /* End of FreeDesktop.Org icons */
- //E Specific icons
- ICON("everything-clipboard","icon_evry_clipboard.png", 256)
- //EFM Mime icons
ICONMIME("inode/chardevice","icon_efm_file.png",128)
ICONMIME("inode/blockdevice","icon_efm_file.png",128)
ICONMIME("inode/directory-locked","icon_efm_file.png",128)
diff --git a/data/elementary/themes/edc/icons.edc
b/data/elementary/themes/
[E-devel] Tests....
How can Test Code like this pass when a string can't be formatted ?? Too many args ? How was this pushed with this many warnings ?? dh See the help page for details. [346/3825] Compiling C object src/tests/eina/eina_suite.p/eina_test_value.c.o In file included from ../src/tests/eina/eina_suite.h:22, from ../src/tests/eina/eina_test_value.c:29: ../src/tests/eina/eina_test_value.c: In function ‘eina_value_test_hash_fn’: ../src/tests/eina/eina_test_value.c:2348:42: warning: too many arguments for format [-Wformat-extra-args] 2348 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s' in '%s'", buf, str); | ^~~~ ../src/tests/eina/eina_test_value.c:2351:42: warning: too many arguments for format [-Wformat-extra-args] 2351 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s' in '%s'", buf, str); | ^~~~ ../src/tests/eina/eina_test_value.c:2354:42: warning: too many arguments for format [-Wformat-extra-args] 2354 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s' in '%s'", buf, str); | ^~~~ ../src/tests/eina/eina_test_value.c:2371:42: warning: too many arguments for format [-Wformat-extra-args] 2371 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s' in '%s'", buf, str); | ^~~~ ../src/tests/eina/eina_test_value.c:2374:42: warning: too many arguments for format [-Wformat-extra-args] 2374 | fail_unless(strstr(str, buf) != NULL, "Couldn't find '%s' in '%s'", buf, str); | ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: conf_randr: List modes using double scan correctly.
A++
dh
On 8/15/20 10:57 AM, Alastair Poole wrote:
netstar pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2027734141fa9d27e01886d7e81ea413ff57c8ce
commit 2027734141fa9d27e01886d7e81ea413ff57c8ce
Author: Alastair Poole
Date: Sat Aug 15 16:54:22 2020 +0100
conf_randr: List modes using double scan correctly.
As we can detect for double scan (since randr 1.2), list the mode
as valid, and also ensure the refresh rate is displayed correctly.
Each line is rendered twice, doubles the dot clock, so divide the
settings view by 2 so that it makes "sense". Can always add
flags to settings if deemed necessary.
---
src/bin/e_comp_x_randr.c | 1 +
src/bin/e_randr2.h | 1 +
src/modules/conf_randr/e_int_config_randr2.c | 5 -
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index fd9f3f650..f0070fabe 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -791,6 +791,7 @@ e_comp_x_randr_create(void)
m->refresh =
(double)minfo->dotClock /
(double)(minfo->hTotal * minfo->vTotal);
+m->flags = minfo->modeFlags;
if (j == (modes_pref - 1))
m->preferred = EINA_TRUE;
s->info.modes = eina_list_append(s->info.modes,
m);
diff --git a/src/bin/e_randr2.h b/src/bin/e_randr2.h
index 5abccf8e6..2c44a205f 100644
--- a/src/bin/e_randr2.h
+++ b/src/bin/e_randr2.h
@@ -50,6 +50,7 @@ struct _E_Randr2_Mode
{
intw, h; // resolution width and height
double refresh; // refresh in hz
+ unsigned int flags; // randr mode flags.
Eina_Bool preferred E_BITFIELD; // is this the preferred mode for the
device?
};
diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c
index f12b29920..5ce8714aa 100644
--- a/src/modules/conf_randr/e_int_config_randr2.c
+++ b/src/modules/conf_randr/e_int_config_randr2.c
@@ -387,7 +387,10 @@ _basic_screen_info_fill(E_Config_Dialog_Data *cfdata,
E_Config_Randr2_Screen *cs
{
mode_cbdata->cfdata = cfdata;
mode_cbdata->mode = *m;
- snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz", m->w, m->h,
m->refresh);
+ if (m->flags & ECORE_X_RANDR_MODE_DOUBLE_SCAN)
+ snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz", m->w, m->h,
m->refresh / 2);
+ else
+ snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz", m->w, m->h,
m->refresh);
it = elm_list_item_append(cfdata->modes_obj, buf, NULL, NULL,
_cb_mode_set, mode_cbdata);
cfdata->freelist = eina_list_append(cfdata->freelist,
mode_cbdata);
/* printf("mode add %p %p %p\n", mode_cbdata, cfdata->modes_obj,
it); */
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore_wl2_subsurf: follow wayland spec for sync
Great Catch !!! Thanks ;) APBbb... this should work to fix your FF prob... dh On 8/6/20 11:00 PM, Shinwoo Kim wrote: kimcinoo pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0e91ec6c78b989dd09610902a5ef8a061a8ee240 commit 0e91ec6c78b989dd09610902a5ef8a061a8ee240 Author: Shinwoo Kim Date: Fri Aug 7 11:59:49 2020 +0900 ecore_wl2_subsurf: follow wayland spec for sync Summary: By default a sub-suface is synchronized mode. So when a sub-surface is created, its sync value should be TRUE. If the E works as specification, user cannot make it work as desynchronized mode by calling subsurface.set_sync(FALSE). [Reference] https://github.com/wayland-project/wayland/blob/master/protocol/wayland.xml is telling "A sub-surface is initially in the synchronized mode." signed-off-by: Shawn Lee Reviewers: Hermet, zmike, devilhorns, raster Reviewed By: devilhorns Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12098 --- src/lib/ecore_wl2/ecore_wl2_subsurf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/ecore_wl2/ecore_wl2_subsurf.c b/src/lib/ecore_wl2/ecore_wl2_subsurf.c index 980c2eed47..5409fd2b26 100644 --- a/src/lib/ecore_wl2/ecore_wl2_subsurf.c +++ b/src/lib/ecore_wl2/ecore_wl2_subsurf.c @@ -65,6 +65,9 @@ ecore_wl2_subsurface_new(Ecore_Wl2_Window *window) goto sub_surf_err; } + /* A sub-surface is initially in the synchronized mode. */ + subsurf->sync = EINA_TRUE; + window->subsurfs = eina_inlist_append(window->subsurfs, EINA_INLIST_GET(subsurf)); ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/02: tell people where to look for news now for releases
+Please s/see NEWS file see dh On 4/11/20 6:11 PM, Carsten Haitzler wrote: +Please se NEWS file ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: fix pointer offset fpor older themes
Did you mean to leave the 2 printf's in here (at the bottom) ??
dh
On 4/1/20 3:13 PM, Carsten Haitzler wrote:
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=64f87877a6294ab46684f0da36ef7bc6f1dabe59
commit 64f87877a6294ab46684f0da36ef7bc6f1dabe59
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 1 20:12:15 2020 +0100
fix pointer offset fpor older themes
fixes T8622
so due rto optimizations in edje it no longer moves/resizes invsible
parts, so swallow a rect and it wont have moved if it is not visible
thus tracking its geometry by getting the geometry of the swallowed
part only works if its visible, so get the part geom from edje instead
which has to give the calculated geom.
---
src/bin/e_pointer.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 61743a2cf..eca3afb7d 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -225,8 +225,8 @@ _e_pointer_cb_hot_move(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj EINA
if (!ptr->e_cursor) return;
if (!evas_object_visible_get(ptr->o_ptr)) return;
- evas_object_geometry_get(ptr->buffer_o_hot,
-&x, &y, NULL, NULL);
+ edje_object_part_geometry_get(ptr->o_ptr, "e.swallow.hotspot",
+ &x, &y, NULL, NULL);
_e_pointer_hot_update(ptr, x, y);
}
@@ -237,8 +237,8 @@ _e_pointer_cb_hot_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA
int x = 0, y = 0;
if (!ptr->e_cursor) return;
- evas_object_geometry_get(ptr->buffer_o_hot,
-&x, &y, NULL, NULL);
+ edje_object_part_geometry_get(ptr->o_ptr, "e.swallow.hotspot",
+ &x, &y, NULL, NULL);
_e_pointer_hot_update(ptr, x, y);
}
@@ -477,8 +477,8 @@ _e_pointer_type_set(E_Pointer *ptr, const char *type)
_e_pointer_x11_setup(ptr, cursor);
if (!cursor[0]) return;
-evas_object_geometry_get(ptr->buffer_o_hot,
- &x, &y, NULL, NULL);
+edje_object_part_geometry_get(ptr->o_ptr, "e.swallow.hotspot",
+ &x, &y, NULL, NULL);
_e_pointer_hot_update(ptr, x, y);
if (ptr->canvas)
@@ -783,6 +783,7 @@ e_pointer_idler_before(void)
#ifndef HAVE_WAYLAND_ONLY
Ecore_X_Cursor cur;
+ printf("update cursor hot %i %i\n", ptr->hot.x, ptr->hot.y);
cur = ecore_x_cursor_new(ptr->win, ptr->pixels, ptr->w,
ptr->h, ptr->hot.x, ptr->hot.y);
ecore_x_window_cursor_set(ptr->win, cur);
@@ -830,6 +831,7 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int
x, int y)
else if ((o != ptr->o_ptr) || (x != px) || (y != py))
{
ecore_evas_cursor_unset(ptr->ee);
+printf("ecore_evas_obj ptr hot %i %i\n", ptr->hot.x, ptr->hot.y);
ecore_evas_object_cursor_set(ptr->ee, ptr->o_ptr, E_LAYER_MAX - 1,
ptr->hot.x, ptr->hot.y);
evas_object_show(ptr->o_ptr);
}
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: enlightenment/mailmap: Remove unused email addresses
Hmm, I did not give that any thought ... mainly removed them because anything I review on Phab always uses @samsung :( dh On 3/24/20 4:48 PM, Carsten Haitzler (The Rasterman) wrote: On Tue, 24 Mar 2020 13:23:29 -0700 Christopher Michael said: shouldn't we keep these for history reasons so looking into history maps back to the same/right person? devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=edb0a9b516b1c5d93535eb6113ed67b3c8dc1bef commit edb0a9b516b1c5d93535eb6113ed67b3c8dc1bef Author: Christopher Michael Date: Tue Mar 24 16:18:42 2020 -0400 enlightenment/mailmap: Remove unused email addresses --- .mailmap | 6 -- 1 file changed, 6 deletions(-) diff --git a/.mailmap b/.mailmap index 354eab2bd..31084fc34 100644 --- a/.mailmap +++ b/.mailmap @@ -22,15 +22,9 @@ Tom Hacohen Tom Gustavo Sverzut Barbieri Gustavo Sverzut Barbieri Gustavo Sverzut Barbieri Gustavo Sverzut Barbieri Christopher Michael Christopher Michael -Christopher Michael Christopher Michael -Christopher Michael Christopher Michael Christopher Michael Chris Michael Christopher Michael Christopher Michael Christopher Michael Christopher -Christopher Michael Chris Michael -Christopher Michael Christopher Michael -Christopher Michael Chris Michael -Christopher Michael Chris Micheal Sebastian Dransfeld Sebastian Dransfeld Sebastian Dransfeld sebastid Mike Blumenkrantz Mike Blumenkrantz -- ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas: Fix dereferenceing null pointer
On 3/4/20 4:41 PM, Marcel Hollerbach wrote:
Hi,
I was also looking at this piece the other day, but I was not having
time to fix this. However, something that showed up to me:
- evas_object_intercept_init is only called in the macro
EVAS_OBJECT_INTERCEPT_CALLBACK_DEFINE which is also getting the privat
data, maybe we can just pass the obj pointer via params here, and safe
the additional efl_data_scope_get call?
Makes sense to me.
- additionally, i think this should use efl_data_scope_safe_get, as
its a forward facing API, which might get a object of the wrong type,
which would crash right away right now.
Sure, that would work. I am heading out the door shortly, but I will
take a look tomorrow and sort this out.
Cheers,
dh
Thank you,
bu5hm4n
On 3/4/20 8:23 PM, Christopher Michael wrote:
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7a89b7711f5dcd1c7f177634730b64cfbc9d1c06
commit 7a89b7711f5dcd1c7f177634730b64cfbc9d1c06
Author: Christopher Michael
Date: Wed Mar 4 14:20:47 2020 -0500
evas: Fix dereferenceing null pointer
Coverity reports a forward null here. If we do not get obj
from
efl_data_scope_get then we should return. Also fixes some
formatting
Fixes CID1420216
---
src/lib/evas/canvas/evas_object_intercept.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_intercept.c
b/src/lib/evas/canvas/evas_object_intercept.c
index fd904f7708..c4a4b44f51 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -15,8 +15,12 @@ static void
evas_object_intercept_deinit(Evas_Object *eo_obj);
static void
evas_object_intercept_init(Evas_Object *eo_obj)
{
- Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj,
EFL_CANVAS_OBJECT_CLASS);
- if (!obj || !obj->interceptors)
+ Evas_Object_Protected_Data *obj;
+
+ obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
+ if (!obj) return;
+
+ if (!obj->interceptors)
obj->interceptors = calloc(1, sizeof(Evas_Intercept_Func));
}
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore_wl2: fix compilation
Hi Marcel, Can you explain to me why this commit is needed ?? The test compiled and executed correctly when I tested it here ... so "fix compilation" is a little confusing Cheers, dh On 1/23/20 5:18 AM, Marcel Hollerbach wrote: bu5hm4n pushed a commit to branch master. [1]http://git.enlightenment.org/core/efl.git/commit/?id=a8e45ab62f400d2938b0dabc a537f13f1f67bbee commit a8e45ab62f400d2938b0dabca537f13f1f67bbee Author: Marcel Hollerbach [2] Date: Thu Jan 23 11:14:33 2020 +0100 ecore_wl2: fix compilation --- src/tests/ecore_wl2/ecore_wl2_test_input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/ecore_wl2/ecore_wl2_test_input.c b/src/tests/ecore_wl2/ec ore_wl2_test_input.c index 2802ee6c00..2eb3aa6b38 100644 --- a/src/tests/ecore_wl2/ecore_wl2_test_input.c +++ b/src/tests/ecore_wl2/ecore_wl2_test_input.c @@ -218,8 +218,8 @@ EFL_START_TEST(wl2_input_keyboard_repeat) ecore_wl2_input_keyboard_repeat_set(input, 2.0, 2.0); ecore_wl2_input_keyboard_repeat_get(input, &rate, &delay); - ck_assert_double_ne(rate, 2.0); - ck_assert_double_ne(delay, 2.0); + ck_assert(!EINA_DBL_EQ(rate, 2.0)); + ck_assert(!EINA_DBL_EQ(delay, 2.0)); } } References 1. http://git.enlightenment.org/core/efl.git/commit/?id=a8e45ab62f400d2938b0dabca537f13f1f67bbee 2. mailto:m...@marcel-hollerbach.de ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "ecore_wl2: Fix a memory leaking case"
Ahhh ok. That makes complete and total sense then. I wasn't doubting you, just wanted to see if it was a specific test case that was failing. "The sequence of problems is (as described in the revision that introduces this):" Yes, I didn't see any diff revision in your commit, so had to manually track the diff down. No worries ! Cheers, dh On 1/20/20 12:20 PM, Marcel Hollerbach wrote: Everything that starts a wayland window. The sequence of problems is (as described in the revision that introduces this): - Module gets loaded, sets up a surface manager via ecore_wl2_surface_manager_add. - Module gets unloaded, registered surface manager gets deleted via ecore_wl2_surface_manager_del - Now the code continues without any loaded surface manager - Creating a window will error out in EE - No window can be created at all - Every single test fails Greetings, bu5hm4n On 1/20/20 6:16 PM, Christopher Michael wrote: On 1/20/20 11:53 AM, Marcel Hollerbach wrote: bu5hm4n pushed a commit to branch master. [1]http://git.enlightenment.org/core/efl.git/commit/?id=55ec2dc89e9b 38ad52c5e8b3d8ac42c8e906bba6 commit 55ec2dc89e9b38ad52c5e8b3d8ac42c8e906bba6 Author: Marcel Hollerbach[2] Date: Mon Jan 20 17:51:40 2020 +0100 Revert "ecore_wl2: Fix a memory leaking case" This reverts commit 97e71b9dc4fa73da99a890d9c39d6617e529dc94. This commit is absolutly wrong. This makes running wayland apps intree impossible, and also crashes tests when run in wayland mode. Which tests were crashing with this ?? Were they Ecore_Wl2 tests ? dh I asked multiple times in the revision for clarification, noone answered. This tricked me today for the second time, so better revert that. --- src/lib/ecore_wl2/ecore_wl2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c index d14b14aee5..33e06873cd 100644 --- a/src/lib/ecore_wl2/ecore_wl2.c +++ b/src/lib/ecore_wl2/ecore_wl2.c @@ -90,8 +90,6 @@ _ecore_wl2_surface_modules_init(void) local_module = NULL; return EINA_FALSE; } - eina_module_free(local_module); - local_module = NULL; return EINA_TRUE; } } ___ enlightenment-devel mailing list [3]enlightenment-devel@lists.sourceforge.net [4]https://lists.sourceforge.net/lists/listinfo/enlightenment-devel References 1. http://git.enlightenment.org/core/efl.git/commit/?id=55ec2dc89e9b38ad52c5e8b3d8ac42c8e906bba6 2. mailto:m...@marcel-hollerbach.de 3. mailto:enlightenment-devel@lists.sourceforge.net 4. https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "ecore_wl2: Fix a memory leaking case"
On 1/20/20 11:53 AM, Marcel Hollerbach wrote: bu5hm4n pushed a commit to branch master. [1]http://git.enlightenment.org/core/efl.git/commit/?id=55ec2dc89e9b38ad52c5e8b3 d8ac42c8e906bba6 commit 55ec2dc89e9b38ad52c5e8b3d8ac42c8e906bba6 Author: Marcel Hollerbach [2] Date: Mon Jan 20 17:51:40 2020 +0100 Revert "ecore_wl2: Fix a memory leaking case" This reverts commit 97e71b9dc4fa73da99a890d9c39d6617e529dc94. This commit is absolutly wrong. This makes running wayland apps intree impossible, and also crashes tests when run in wayland mode. Which tests were crashing with this ?? Were they Ecore_Wl2 tests ? dh I asked multiple times in the revision for clarification, noone answered. This tricked me today for the second time, so better revert that. --- src/lib/ecore_wl2/ecore_wl2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c index d14b14aee5..33e06873cd 100644 --- a/src/lib/ecore_wl2/ecore_wl2.c +++ b/src/lib/ecore_wl2/ecore_wl2.c @@ -90,8 +90,6 @@ _ecore_wl2_surface_modules_init(void) local_module = NULL; return EINA_FALSE; } - eina_module_free(local_module); - local_module = NULL; return EINA_TRUE; } } References 1. http://git.enlightenment.org/core/efl.git/commit/?id=55ec2dc89e9b38ad52c5e8b3d8ac42c8e906bba6 2. mailto:m...@marcel-hollerbach.de ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: shot - move save of shot and upload to slave binary tool and tidy code
Excellent !! :)
Btw, if someone wanted to get a jump on this, the "emprint" tool in git
already has the ability to select a crop region ... someone could, if
they wanted to, snarf some code out of emprint and implement that
feature in E pretty easily ;)
Cheers,
dh
On 12/19/19 6:25 PM, Carsten Haitzler wrote:
> raster pushed a commit to branch master.
>
> https://protect2.fireeye.com/url?k=dcbf7a16-81717bc5-dcbef159-000babff317b-4e052b12d58063b7&u=http://git.enlightenment.org/core/enlightenment.git/commit/?id=7227aaeb813fddb6a42da848152bfecf4a9497e8
>
> commit 7227aaeb813fddb6a42da848152bfecf4a9497e8
> Author: Carsten Haitzler (Rasterman)
> Date: Wed Dec 18 19:01:40 2019 +
>
> shot - move save of shot and upload to slave binary tool and tidy code
>
> this gets rid of that annoying freeze in e due to the sync save and
> possibly sync dns lookups in curl. slave binary handles it now and
> talks back to e via stdout.
>
> this also splits up the code into more files for specific purposes to
> make it easier to add features to and maintain. given on the todo is
> the ability to explicitly select a crop region and do some basic
> "drawing" too, this sets the stage for that and it made it easier to
> do the above upload/save tool.
> ---
> src/modules/shot/e_mod_main.c| 819
> +--
> src/modules/shot/e_mod_main.h| 28 ++
> src/modules/shot/e_mod_preview.c | 291 ++
> src/modules/shot/e_mod_save.c| 273 +
> src/modules/shot/e_mod_share.c | 217 +++
> src/modules/shot/meson.build | 18 +-
> src/modules/shot/upload.c| 208 ++
> 7 files changed, 1053 insertions(+), 801 deletions(-)
>
> diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
> index f0ff786d2..ac3f9bcab 100644
> --- a/src/modules/shot/e_mod_main.c
> +++ b/src/modules/shot/e_mod_main.c
> @@ -8,807 +8,28 @@
>*
>* @}
>*/
> -#include "e.h"
> -#include
> -#include
> +#include "e_mod_main.h"
>
> -#if defined(__FreeBSD__) || defined(__DragonFly__)
> -#include
> -#include
> -#endif
> -
> -static E_Module *shot_module = NULL;
> +E_Module *shot_module = NULL;
>
> static E_Action *border_act = NULL, *act = NULL;
> static E_Int_Menu_Augmentation *maug = NULL;
> static Ecore_Timer *timer, *border_timer = NULL;
> -static Evas_Object *win = NULL;
> static Evas_Object *snap = NULL;
> -E_Confirm_Dialog *cd = NULL;
> -static Evas_Object *o_bg = NULL, *o_box = NULL, *o_content = NULL;
> -static Evas_Object *o_event = NULL, *o_img = NULL, *o_hlist = NULL;
> -static int quality = 90;
> -static int screen = -1;
> -#define MAXZONES 64
> -static Evas_Object *o_rectdim[MAXZONES] = { NULL };
> -static Evas_Object *o_radio_all = NULL;
> -static Evas_Object *o_radio[MAXZONES] = { NULL };
> -static Evas_Object *o_fsel = NULL;
> -static Evas_Object *o_label = NULL;
> -static Evas_Object *o_entry = NULL;
> -static unsigned char *fdata = NULL;
> -static int fsize = 0;
> -static Ecore_Con_Url *url_up = NULL;
> -static Eina_List *handlers = NULL;
> -static char *url_ret = NULL;
> -static E_Dialog *fsel_dia = NULL;
> static E_Client_Menu_Hook *border_hook = NULL;
>
> static E_Client *shot_ec = NULL;
> static E_Zone *shot_zone = NULL;
> static char *shot_params;
>
> -static void _file_select_ok_cb(void *data EINA_UNUSED, E_Dialog *dia);
> -static void _file_select_cancel_cb(void *data EINA_UNUSED, E_Dialog *dia);
> -
> -static void
> -_win_cancel_cb(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
> -{
> - E_FREE_FUNC(win, evas_object_del);
> -}
> -
> -static void
> -_win_delete_cb()
> -{
> - win = NULL;
> -}
> -
> -static void
> -_on_focus_cb(void *data EINA_UNUSED, Evas_Object *obj)
> -{
> - if (obj == o_content) e_widget_focused_object_clear(o_box);
> - else if (o_content) e_widget_focused_object_clear(o_content);
> -}
> -
> -static void
> -_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj
> EINA_UNUSED, void *event)
> -{
> - Evas_Event_Key_Down *ev = event;
> -
> - if (!strcmp(ev->key, "Tab"))
> - {
> -if
> (evas_key_modifier_is_set(evas_key_modifier_get(evas_object_evas_get(win)),
> "Shift"))
> - {
> - if (e_widget_focus_get(o_box))
> - {
> - if (!e_widget_focus_jump(o_box, 0))
> -{
> - e_widget_focus_set(o_content, 0);
> - if (!e_widget_focus_get(o_content))
> - e_widget_focus_set(o_box, 0);
> -}
> - }
> - else
> - {
> - if (!e_widget_focus_jump(o_content, 0))
> - e_widget_focus_set(o_box, 0);
> - }
> - }
> -else
> - {
> - if (e_widget_focus_get(o_box))
> - {
> - if (!e_
[EGIT] [core/efl] master 01/06: ecore-wl2: Add API to find a window by surface
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a10a9ceccb9af0856ed653d1d821e36307b85872
commit a10a9ceccb9af0856ed653d1d821e36307b85872
Author: Christopher Michael
Date: Tue Nov 19 09:01:53 2019 -0500
ecore-wl2: Add API to find a window by surface
This patch adds a convenience API that can be used to find a window
based on wl_surface.
@feature
---
src/lib/ecore_wl2/Ecore_Wl2.h | 13 +
src/lib/ecore_wl2/ecore_wl2_display.c | 6 ++
2 files changed, 19 insertions(+)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index eca4733710..38c81055f1 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -713,6 +713,19 @@ EAPI Eina_Bool ecore_wl2_display_sync_is_done(const
Ecore_Wl2_Display *display);
*/
EAPI const char *ecore_wl2_display_name_get(const Ecore_Wl2_Display *display);
+/**
+ * Finds an Ecore_Wl2_Window based on wl_surface
+ *
+ * @param display The display to search for the window
+ * @param surface The wl_surface of the window to find
+ *
+ * @return The Ecore_Wl2_Window if found, or NULL if no such window exists
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ * @since 1.24
+ */
+EAPI Ecore_Wl2_Window
*ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct
wl_surface *surface);
+
/**
* @defgroup Ecore_Wl2_Window_Group Wayland Library Window Functions
* @ingroup Ecore_Wl2_Group
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index a1511c4711..85873fac69 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -1163,3 +1163,9 @@ ecore_wl2_display_flush(Ecore_Wl2_Display *display)
_begin_recovery_maybe(display, code);
}
+
+EAPI Ecore_Wl2_Window *
+ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct
wl_surface *surface)
+{
+ return _ecore_wl2_display_window_surface_find(display, surface);
+}
--
[EGIT] [core/efl] master 04/06: ecore-wl2: Add API to return window type
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=68ea9f1a7178c1d6a8b6a1ef283f48f602b3d14b
commit 68ea9f1a7178c1d6a8b6a1ef283f48f602b3d14b
Author: Christopher Michael
Date: Tue Nov 19 09:28:27 2019 -0500
ecore-wl2: Add API to return window type
Small patch whichs adds a new API to return the type of a given window
@feature
---
src/lib/ecore_wl2/Ecore_Wl2.h| 10 ++
src/lib/ecore_wl2/ecore_wl2_window.c | 7 +++
2 files changed, 17 insertions(+)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index b06f3b1375..04dd80a79f 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -1077,6 +1077,16 @@ EAPI void
ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool ico
*/
EAPI void ecore_wl2_window_type_set(Ecore_Wl2_Window *window,
Ecore_Wl2_Window_Type type);
+/**
+ * Get the type of a given window
+ *
+ * @see Ecore_Wl2_Window_Type
+ *
+ * @ingroup Ecore_Wl2_Window_Group
+ * @since 1.24
+ */
+EAPI Ecore_Wl2_Window_Type ecore_wl2_window_type_get(Ecore_Wl2_Window *window);
+
/**
* Find the output that a given window is on
*
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c
b/src/lib/ecore_wl2/ecore_wl2_window.c
index 97938339ce..6ba894b02f 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1741,3 +1741,10 @@ ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window,
Eina_Bool purge)
if (!window->wl2_surface) return;
ecore_wl2_surface_flush(window->wl2_surface, purge);
}
+
+EAPI Ecore_Wl2_Window_Type
+ecore_wl2_window_type_get(Ecore_Wl2_Window *window)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(window, ECORE_WL2_WINDOW_TYPE_NONE);
+ return window->type;
+}
--
[EGIT] [core/efl] master 05/06: tests/ecore_wl2: Add test for ecore_wl2_window_type functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8195368929be462427e430455e66b9d7dc952622
commit 8195368929be462427e430455e66b9d7dc952622
Author: Christopher Michael
Date: Tue Nov 19 09:31:46 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_type functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index e68d8c1861..9c6462c5b9 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -310,6 +310,25 @@ EFL_START_TEST(wl2_window_geometry)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_type)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Ecore_Wl2_Window_Type type = ECORE_WL2_WINDOW_TYPE_NONE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_type_set(win, ECORE_WL2_WINDOW_TYPE_TOPLEVEL);
+
+ type = ecore_wl2_window_type_get(win);
+ fail_if(type != ECORE_WL2_WINDOW_TYPE_TOPLEVEL);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -332,5 +351,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_rotation_app);
tcase_add_test(tc, wl2_wm_window_rotation_app);
tcase_add_test(tc, wl2_window_geometry);
+tcase_add_test(tc, wl2_window_type);
}
}
--
[EGIT] [core/efl] master 02/06: ecore-wl2: Add API to find a connected display given a name
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7fb23c2da13eb204b54e94bd18083d125e941b8f
commit 7fb23c2da13eb204b54e94bd18083d125e941b8f
Author: Christopher Michael
Date: Tue Nov 19 09:16:31 2019 -0500
ecore-wl2: Add API to find a connected display given a name
This patch adds a convenience function to find a connected display
given a name
@feature
---
src/lib/ecore_wl2/Ecore_Wl2.h | 16
src/lib/ecore_wl2/ecore_wl2_display.c | 31 +++
2 files changed, 47 insertions(+)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 38c81055f1..ffb32e390d 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -726,6 +726,22 @@ EAPI const char *ecore_wl2_display_name_get(const
Ecore_Wl2_Display *display);
*/
EAPI Ecore_Wl2_Window
*ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct
wl_surface *surface);
+/**
+ * Gets the connected display object
+ *
+ * @brief This function is typically used by clients to get an
+ * existing Wayland display.
+ *
+ * @param name The display target name. If @c NULL, the default
+ * display is assumed.
+ *
+ * @return The Ecore_Wl2_Display which was connected to
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ * @since 1.24
+ */
+EAPI Ecore_Wl2_Display *ecore_wl2_connected_display_get(const char *name);
+
/**
* @defgroup Ecore_Wl2_Window_Group Wayland Library Window Functions
* @ingroup Ecore_Wl2_Group
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 85873fac69..267e62511d 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -1169,3 +1169,34 @@
ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct wl_s
{
return _ecore_wl2_display_window_surface_find(display, surface);
}
+
+EAPI Ecore_Wl2_Display *
+ecore_wl2_connected_display_get(const char *name)
+{
+ Ecore_Wl2_Display *ewd;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(_client_displays, NULL);
+
+ if (!name)
+ {
+const char *n;
+
+/* client wants to connected to default display */
+n = getenv("WAYLAND_DISPLAY");
+if (!n) n = "wayland-0";
+
+/* we have a default wayland display */
+
+/* check hash of cached client displays for this name */
+ewd = eina_hash_find(_client_displays, n);
+ }
+ else
+ {
+/* client wants to connect to specific display */
+
+/* check hash of cached client displays for this name */
+ewd = eina_hash_find(_client_displays, name);
+ }
+
+ return ewd;
+}
--
[EGIT] [core/efl] master 06/06: ecore-wl2: Add API to find a window by given surface
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e36b1930bf04694fb67dd7e741dbcb5231bf5e58
commit e36b1930bf04694fb67dd7e741dbcb5231bf5e58
Author: Christopher Michael
Date: Tue Nov 19 09:37:11 2019 -0500
ecore-wl2: Add API to find a window by given surface
This patch adds a convenience function to find a window by a given
wl_surface.
@feature
---
src/lib/ecore_wl2/Ecore_Wl2.h| 10 ++
src/lib/ecore_wl2/ecore_wl2_window.c | 15 +++
2 files changed, 25 insertions(+)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 04dd80a79f..6f8f9dcd54 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -1360,6 +1360,16 @@ EAPI void
ecore_wl2_window_floating_mode_set(Ecore_Wl2_Window *window, Eina_Bool
*/
EAPI Eina_Bool ecore_wl2_window_floating_mode_get(Ecore_Wl2_Window *window);
+/**
+ * Finds a window by surface
+ *
+ * @param surface The surface to find the window of
+ *
+ * @ingroup Ecore_Wl2_Window_Group
+ * @since 1.24
+ */
+EAPI Ecore_Wl2_Window *ecore_wl2_window_surface_find(struct wl_surface
*surface);
+
/**
* @defgroup Ecore_Wl2_Input_Group Wayland Library Input Functions
* @ingroup Ecore_Wl2_Group
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c
b/src/lib/ecore_wl2/ecore_wl2_window.c
index 6ba894b02f..d31dcafeb0 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1748,3 +1748,18 @@ ecore_wl2_window_type_get(Ecore_Wl2_Window *window)
EINA_SAFETY_ON_NULL_RETURN_VAL(window, ECORE_WL2_WINDOW_TYPE_NONE);
return window->type;
}
+
+EAPI Ecore_Wl2_Window *
+ecore_wl2_window_surface_find(struct wl_surface *surface)
+{
+ Ecore_Wl2_Display *ewd;
+ Ecore_Wl2_Window *win;
+
+ EINA_SAFETY_ON_NULL_RETURN_VAL(surface, NULL);
+
+ ewd = ecore_wl2_connected_display_get(NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(ewd, NULL);
+
+ win = ecore_wl2_display_window_find_by_surface(ewd, surface);
+ return win;
+}
--
[EGIT] [core/efl] master 03/06: ecore-wl2: Add API to return the compositor object from a given display
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ab51bbeeef36eb951d2b0327a0d2f9513847f3ca
commit ab51bbeeef36eb951d2b0327a0d2f9513847f3ca
Author: Christopher Michael
Date: Tue Nov 19 09:23:18 2019 -0500
ecore-wl2: Add API to return the compositor object from a given display
This patch adds a convenience function to get the wl_compositor object
from a given display
@feature
---
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 ffb32e390d..b06f3b1375 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -742,6 +742,18 @@ EAPI Ecore_Wl2_Window
*ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Displa
*/
EAPI Ecore_Wl2_Display *ecore_wl2_connected_display_get(const char *name);
+/**
+ * Gets the wl_compositor which belongs to this display
+ *
+ * @param display The Ecore_Wl2_Display to get the compositor of
+ *
+ * @return The wl_compositor associated with this display
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ * @since 1.24
+ */
+EAPI struct wl_compositor *ecore_wl2_display_compositor_get(Ecore_Wl2_Display
*display);
+
/**
* @defgroup Ecore_Wl2_Window_Group Wayland Library Window Functions
* @ingroup Ecore_Wl2_Group
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 267e62511d..cc92b8f871 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -1200,3 +1200,10 @@ ecore_wl2_connected_display_get(const char *name)
return ewd;
}
+
+EAPI struct wl_compositor *
+ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
+ return display->wl.compositor;
+}
--
[EGIT] [core/efl] master 01/01: tests/ecore_wl2: Add test for ecore_wl2_window_geometry functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dd74c6ed35e281175aef666b672479608cb4dab6
commit dd74c6ed35e281175aef666b672479608cb4dab6
Author: Christopher Michael
Date: Tue Nov 19 08:37:29 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_geometry functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 24
1 file changed, 24 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index a3e1cbeb54..e68d8c1861 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -287,6 +287,29 @@ EFL_START_TEST(wl2_wm_window_rotation_app)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_geometry)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ int x, y, w, h;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_geometry_set(win, 10, 10, 100, 100);
+
+ ecore_wl2_window_geometry_get(win, &x, &y, &w, &h);
+
+ fail_if(x != 10);
+ fail_if(y != 10);
+ fail_if(w != 100);
+ fail_if(h != 100);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -308,5 +331,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_preferred_rot);
tcase_add_test(tc, wl2_window_rotation_app);
tcase_add_test(tc, wl2_wm_window_rotation_app);
+tcase_add_test(tc, wl2_window_geometry);
}
}
--
[EGIT] [core/efl] master 01/01: ecore-drm2: Fix issue of shifting 1 by more than 32bits
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2288c92bc5422c1a5df5fa4f6aabc2307a297e9d
commit 2288c92bc5422c1a5df5fa4f6aabc2307a297e9d
Author: Chris Michael
Date: Thu Nov 14 12:21:40 2019 -0500
ecore-drm2: Fix issue of shifting 1 by more than 32bits
Based on 9ca573f40f1065cc717c0c5aabb787671bab852b, this patch fixes
potential undefined behaviour on 64 bit systems.
@fix
---
src/lib/ecore_drm2/ecore_drm2_device.c | 2 +-
src/lib/ecore_drm2/ecore_drm2_outputs.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c
b/src/lib/ecore_drm2/ecore_drm2_device.c
index c86df1a271..7602114453 100644
--- a/src/lib/ecore_drm2/ecore_drm2_device.c
+++ b/src/lib/ecore_drm2/ecore_drm2_device.c
@@ -487,7 +487,7 @@ _drm2_atomic_state_plane_fill(Ecore_Drm2_Plane_State
*pstate, int fd)
{
pstate->supported_rotations |= r;
pstate->rotation_map[ffs(r)] =
- 1 << prop->enums[k].value;
+ 1ULL << prop->enums[k].value;
}
}
}
diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c
b/src/lib/ecore_drm2/ecore_drm2_outputs.c
index dfb2fa93d1..6fe3eb5770 100644
--- a/src/lib/ecore_drm2/ecore_drm2_outputs.c
+++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c
@@ -659,7 +659,7 @@ _output_plane_states_get(Ecore_Drm2_Atomic_State *state,
unsigned int crtc_id, i
states =
eina_list_append(states, _atomic_state_plane_duplicate(pstate));
}
-else if (pstate->mask & (1 << index))
+else if (pstate->mask & (1ULL << index))
{
states =
eina_list_append(states, _atomic_state_plane_duplicate(pstate));
@@ -1454,7 +1454,7 @@ ecore_drm2_output_possible_crtc_get(Ecore_Drm2_Output
*output, unsigned int crtc
{
if (res->crtcs[k] != output->crtc_id) continue;
- if (p & (1 << k))
+ if (p & (1ULL << k))
{
ret = EINA_TRUE;
break;
--
[EGIT] [core/efl] master 01/01: tests/ecore_wl2: Add test for ecore_wl2_window_wm_rotation_supported functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5b588c3c39a431d8b47e527941750b9ed089c311
commit 5b588c3c39a431d8b47e527941750b9ed089c311
Author: Christopher Michael
Date: Tue Nov 12 10:09:54 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_wm_rotation_supported
functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 2d7d516e1d..a3e1cbeb54 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -268,6 +268,25 @@ EFL_START_TEST(wl2_window_rotation_app)
}
EFL_END_TEST
+EFL_START_TEST(wl2_wm_window_rotation_app)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool r = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_wm_rotation_supported_set(win, EINA_TRUE);
+
+ r = ecore_wl2_window_wm_rotation_supported_get(win);
+ fail_if(r != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -288,5 +307,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_maximize);
tcase_add_test(tc, wl2_window_preferred_rot);
tcase_add_test(tc, wl2_window_rotation_app);
+tcase_add_test(tc, wl2_wm_window_rotation_app);
}
}
--
[EGIT] [core/efl] master 06/09: tests/ecore_wl2: Add test for ecore_wl2_window_maximized functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=67995823fd28e88a1c56e5d24c42a2a571cb5825
commit 67995823fd28e88a1c56e5d24c42a2a571cb5825
Author: Christopher Michael
Date: Tue Nov 12 09:47:36 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_maximized functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 69f93e3f88..035da8c9d3 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -206,6 +206,25 @@ EFL_START_TEST(wl2_window_fullscreen)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_maximize)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool m = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_maximized_set(win, EINA_TRUE);
+
+ m = ecore_wl2_window_maximized_get(win);
+ fail_if(m != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -223,5 +242,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_floating_mode);
tcase_add_test(tc, wl2_window_focus_skip);
tcase_add_test(tc, wl2_window_fullscreen);
+tcase_add_test(tc, wl2_window_maximize);
}
}
--
[EGIT] [core/efl] master 09/09: tests/ecore_wl2: Modify ecore_wl2_window_rotation test
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=96e148b2310e7d01df3734ded75f9299a6d64a21
commit 96e148b2310e7d01df3734ded75f9299a6d64a21
Author: Christopher Michael
Date: Tue Nov 12 09:55:41 2019 -0500
tests/ecore_wl2: Modify ecore_wl2_window_rotation test
Small patch to modify ecore_wl2_window_rotation test to support
ecore_wl2_window_rotation_set function
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 1a4385a719..2d7d516e1d 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -64,7 +64,7 @@ EFL_START_TEST(wl2_window_surface_test)
}
EFL_END_TEST
-EFL_START_TEST(wl2_window_rotation_get)
+EFL_START_TEST(wl2_window_rotation)
{
Ecore_Wl2_Display *disp;
Ecore_Wl2_Window *win;
@@ -78,6 +78,11 @@ EFL_START_TEST(wl2_window_rotation_get)
rot = ecore_wl2_window_rotation_get(win);
ck_assert_int_ge(rot, 0);
+
+ ecore_wl2_window_rotation_set(win, 90);
+
+ rot = ecore_wl2_window_rotation_get(win);
+ fail_if(rot != 90);
}
EFL_END_TEST
@@ -271,7 +276,7 @@ ecore_wl2_test_window(TCase *tc)
/* window tests can only run if there is an existing compositor */
tcase_add_test(tc, wl2_window_new);
tcase_add_test(tc, wl2_window_surface_test);
-tcase_add_test(tc, wl2_window_rotation_get);
+tcase_add_test(tc, wl2_window_rotation);
tcase_add_test(tc, wl2_window_output_find);
if (getenv("E_START"))
tcase_add_test(tc, wl2_window_aux_hints_supported_get);
--
[EGIT] [core/efl] master 05/09: tests/ecore_wl2: Add test for ecore_wl2_window_fullscreen functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=239549deec2adf2d14fe436cbce07a1f90898d35
commit 239549deec2adf2d14fe436cbce07a1f90898d35
Author: Christopher Michael
Date: Tue Nov 12 09:44:39 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_fullscreen functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 2962be4337..69f93e3f88 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -187,6 +187,25 @@ EFL_START_TEST(wl2_window_focus_skip)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_fullscreen)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool full = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_fullscreen_set(win, EINA_TRUE);
+
+ full = ecore_wl2_window_fullscreen_get(win);
+ fail_if(full != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -203,5 +222,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_alpha);
tcase_add_test(tc, wl2_window_floating_mode);
tcase_add_test(tc, wl2_window_focus_skip);
+tcase_add_test(tc, wl2_window_fullscreen);
}
}
--
[EGIT] [core/efl] master 07/09: tests/ecore_wl2: Add test for ecore_wl2_window_preferred_rotation functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=eb7816c7279277e71ca8deb23796a042db1bbdf8
commit eb7816c7279277e71ca8deb23796a042db1bbdf8
Author: Christopher Michael
Date: Tue Nov 12 09:50:12 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_preferred_rotation
functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 035da8c9d3..364991ea7d 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -225,6 +225,25 @@ EFL_START_TEST(wl2_window_maximize)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_preferred_rot)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ int rot = 0;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_preferred_rotation_set(win, 90);
+
+ rot = ecore_wl2_window_preferred_rotation_get(win);
+ fail_if(rot != 90);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -243,5 +262,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_focus_skip);
tcase_add_test(tc, wl2_window_fullscreen);
tcase_add_test(tc, wl2_window_maximize);
+tcase_add_test(tc, wl2_window_preferred_rot);
}
}
--
[EGIT] [core/efl] master 02/09: tests/ecore_wl2: Add test for ecore_wl2_window_alpha_get/set functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1357171d569a411d905ba406e94b0f3bc30a829d
commit 1357171d569a411d905ba406e94b0f3bc30a829d
Author: Christopher Michael
Date: Tue Nov 12 09:35:50 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_alpha_get/set functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 948def80c5..48b85d5f30 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -130,6 +130,25 @@ EFL_START_TEST(wl2_window_display_get)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_alpha)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool alpha = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_alpha_set(win, EINA_TRUE);
+
+ alpha = ecore_wl2_window_alpha_get(win);
+ fail_if(alpha != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -143,5 +162,6 @@ ecore_wl2_test_window(TCase *tc)
if (getenv("E_START"))
tcase_add_test(tc, wl2_window_aux_hints_supported_get);
tcase_add_test(tc, wl2_window_display_get);
+tcase_add_test(tc, wl2_window_alpha);
}
}
--
[EGIT] [core/efl] master 03/09: tests/ecore_wl2: Add test for ecore_wl2_window_floating_mode_get/set functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=17919040b6d906af6b033b6fafb1fe4103f70efc
commit 17919040b6d906af6b033b6fafb1fe4103f70efc
Author: Christopher Michael
Date: Tue Nov 12 09:39:15 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_floating_mode_get/set
functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 48b85d5f30..d70a3a818b 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -149,6 +149,25 @@ EFL_START_TEST(wl2_window_alpha)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_floating_mode)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool f = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_floating_mode_set(win, EINA_TRUE);
+
+ f = ecore_wl2_window_floating_mode_get(win);
+ fail_if(f != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -163,5 +182,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_aux_hints_supported_get);
tcase_add_test(tc, wl2_window_display_get);
tcase_add_test(tc, wl2_window_alpha);
+tcase_add_test(tc, wl2_window_floating_mode);
}
}
--
[EGIT] [core/efl] master 08/09: tests/ecore_wl2: Add test for ecore_wl2_window_rotation_app functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=82135245839583829fd78712809ea5f5e6e827e5
commit 82135245839583829fd78712809ea5f5e6e827e5
Author: Christopher Michael
Date: Tue Nov 12 09:53:09 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_rotation_app functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 364991ea7d..1a4385a719 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -244,6 +244,25 @@ EFL_START_TEST(wl2_window_preferred_rot)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_rotation_app)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool r = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_rotation_app_set(win, EINA_TRUE);
+
+ r = ecore_wl2_window_rotation_app_get(win);
+ fail_if(r != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -263,5 +282,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_fullscreen);
tcase_add_test(tc, wl2_window_maximize);
tcase_add_test(tc, wl2_window_preferred_rot);
+tcase_add_test(tc, wl2_window_rotation_app);
}
}
--
[EGIT] [core/efl] master 04/09: tests/ecore_wl2: Add test for ecore_wl2_window_focus_skip_get/set functions
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=52299bffa0e5ef638128431e96c0a599941489d7
commit 52299bffa0e5ef638128431e96c0a599941489d7
Author: Christopher Michael
Date: Tue Nov 12 09:41:29 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_window_focus_skip_get/set
functions
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_window.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c
b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index d70a3a818b..2962be4337 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -168,6 +168,25 @@ EFL_START_TEST(wl2_window_floating_mode)
}
EFL_END_TEST
+EFL_START_TEST(wl2_window_focus_skip)
+{
+ Ecore_Wl2_Display *disp;
+ Ecore_Wl2_Window *win;
+ Eina_Bool skip = EINA_FALSE;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ win = _window_create(disp);
+ ck_assert(win != NULL);
+
+ ecore_wl2_window_focus_skip_set(win, EINA_TRUE);
+
+ skip = ecore_wl2_window_focus_skip_get(win);
+ fail_if(skip != EINA_TRUE);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_window(TCase *tc)
{
@@ -183,5 +202,6 @@ ecore_wl2_test_window(TCase *tc)
tcase_add_test(tc, wl2_window_display_get);
tcase_add_test(tc, wl2_window_alpha);
tcase_add_test(tc, wl2_window_floating_mode);
+tcase_add_test(tc, wl2_window_focus_skip);
}
}
--
[EGIT] [core/efl] master 01/09: tests/ecore_wl2: Add test for ecore_wl2_display_compositor_version_get
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fb718059256e4a124800c4145c3a90fd92ca0ffe
commit fb718059256e4a124800c4145c3a90fd92ca0ffe
Author: Christopher Michael
Date: Tue Nov 12 09:22:09 2019 -0500
tests/ecore_wl2: Add test for ecore_wl2_display_compositor_version_get
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_test_display.c | 14 ++
1 file changed, 14 insertions(+)
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_display.c
b/src/tests/ecore_wl2/ecore_wl2_test_display.c
index 7f6f4cc9df..99b441b433 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_display.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_display.c
@@ -164,6 +164,19 @@ EFL_START_TEST(wl2_display_inputs_get)
}
EFL_END_TEST
+EFL_START_TEST(wl2_display_compositor_version_get)
+{
+ Ecore_Wl2_Display *disp;
+ int ver;
+
+ disp = _display_connect();
+ ck_assert(disp != NULL);
+
+ ver = ecore_wl2_display_compositor_version_get(disp);
+ ck_assert_int_ne(ver, 0);
+}
+EFL_END_TEST
+
void
ecore_wl2_test_display(TCase *tc)
{
@@ -188,5 +201,6 @@ ecore_wl2_test_display(TCase *tc)
tcase_add_test(tc, wl2_display_globals_get);
tcase_add_test(tc, wl2_display_screen_size_get);
tcase_add_test(tc, wl2_display_inputs_get);
+tcase_add_test(tc, wl2_display_compositor_version_get);
}
}
--
[EGIT] [core/efl] master 01/01: tests/ecore-wl2: Remove surface test
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4068d1c5be2fe2ed56586243adfca86f2f30
commit 4068d1c5be2fe2ed56586243adfca86f2f30
Author: Christopher Michael
Date: Tue Nov 5 09:44:53 2019 -0500
tests/ecore-wl2: Remove surface test
This test is not necessary anymore as the ecore_wl2_surface function
it was testing is now an internal function
ref T8016
---
src/tests/ecore_wl2/ecore_wl2_suite.c| 1 -
src/tests/ecore_wl2/ecore_wl2_suite.h| 1 -
src/tests/ecore_wl2/ecore_wl2_test_surface.c | 56
src/tests/ecore_wl2/meson.build | 3 +-
4 files changed, 1 insertion(+), 60 deletions(-)
diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.c
b/src/tests/ecore_wl2/ecore_wl2_suite.c
index 623d601cd6..b6875c006d 100644
--- a/src/tests/ecore_wl2/ecore_wl2_suite.c
+++ b/src/tests/ecore_wl2/ecore_wl2_suite.c
@@ -13,7 +13,6 @@ static const Efl_Test_Case etc[] =
{ "Display", ecore_wl2_test_display },
{ "Window", ecore_wl2_test_window },
{ "Input", ecore_wl2_test_input },
- { "Surface", ecore_wl2_test_surface },
#endif
{ NULL, NULL }
};
diff --git a/src/tests/ecore_wl2/ecore_wl2_suite.h
b/src/tests/ecore_wl2/ecore_wl2_suite.h
index ce0e1b482f..a8edf93074 100644
--- a/src/tests/ecore_wl2/ecore_wl2_suite.h
+++ b/src/tests/ecore_wl2/ecore_wl2_suite.h
@@ -8,6 +8,5 @@ void ecore_wl2_test_init(TCase *tc);
void ecore_wl2_test_display(TCase *tc);
void ecore_wl2_test_window(TCase *tc);
void ecore_wl2_test_input(TCase *tc);
-void ecore_wl2_test_surface(TCase *tc);
#endif
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_surface.c
b/src/tests/ecore_wl2/ecore_wl2_test_surface.c
deleted file mode 100644
index f4252e1664..00
--- a/src/tests/ecore_wl2/ecore_wl2_test_surface.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include
-#include
-#include
-#include
-#include
-
-#include "ecore_wl2_suite.h"
-
-static Ecore_Wl2_Display *
-_display_connect(void)
-{
- Ecore_Wl2_Display *disp;
-
- disp = ecore_wl2_display_connect(NULL);
- return disp;
-}
-
-static Ecore_Wl2_Window *
-_window_create(Ecore_Wl2_Display *disp)
-{
- Ecore_Wl2_Window *win;
-
- win = ecore_wl2_window_new(disp, NULL, 100, 100, 500, 500);
- return win;
-}
-
-EFL_START_TEST(wl2_surface_create)
-{
- Ecore_Wl2_Display *disp;
- Ecore_Wl2_Window *win;
- Ecore_Wl2_Surface *surf;
-
- disp = _display_connect();
- ck_assert(disp != NULL);
-
- win = _window_create(disp);
- ck_assert(win != NULL);
-
- surf = ecore_wl2_surface_create(win, EINA_FALSE);
- ck_assert(surf != NULL);
-}
-EFL_END_TEST
-
-void
-ecore_wl2_test_surface(TCase *tc)
-{
- if (getenv("WAYLAND_DISPLAY"))
- {
-/* surface tests can only run if there is an existing compositor */
-tcase_add_test(tc, wl2_surface_create);
- }
-}
diff --git a/src/tests/ecore_wl2/meson.build b/src/tests/ecore_wl2/meson.build
index c1d37cbbdd..eb1a13db6a 100644
--- a/src/tests/ecore_wl2/meson.build
+++ b/src/tests/ecore_wl2/meson.build
@@ -5,8 +5,7 @@ ecore_wl2_suite_src = [
'ecore_wl2_test_ecore_wl2.c',
'ecore_wl2_test_display.c',
'ecore_wl2_test_window.c',
- 'ecore_wl2_test_input.c',
- 'ecore_wl2_test_surface.c'
+ 'ecore_wl2_test_input.c'
]
ecore_wl2_suite = executable('ecore_wl2_suite',
--
[EGIT] [core/efl] master 10/35: ecore-wl2: Move ecore_wl2_buffer_discard function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad692d2cbd38f4835050113a2afdaf7bf1cf9e81 commit ad692d2cbd38f4835050113a2afdaf7bf1cf9e81 Author: Christopher Michael Date: Tue Nov 5 09:13:46 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_discard function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 996d955f63..c760d09735 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index c7880384a9..ea0f3e97ba 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -47,6 +47,7 @@ EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); +EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 03/35: ecore-wl2: Move ecore_wl2_window_damage function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8ffd0b7661453a1256f4ad831275d18dc7682dce commit 8ffd0b7661453a1256f4ad831275d18dc7682dce Author: Christopher Michael Date: Tue Nov 5 09:09:14 2019 -0500 ecore-wl2: Move ecore_wl2_window_damage function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index b706b4c9ed..fce758ccd9 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2004,7 +2004,6 @@ EAPI Eina_Bool ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window); EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 460d5fcc8a..1eb5b0a20e 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -40,6 +40,8 @@ EAPI void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, i EAPI void ecore_wl2_window_false_commit(Ecore_Wl2_Window *window); EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); +EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); + # undef EAPI # define EAPI --
[EGIT] [core/efl] master 05/35: ecore-wl2: Move ecore_wl2_buffer_create function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ffab0f77a47c617919c6216a1cf9381db68f89a8 commit ffab0f77a47c617919c6216a1cf9381db68f89a8 Author: Christopher Michael Date: Tue Nov 5 09:11:35 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_create function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 4e89831b11..a0638fe791 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index b57a7fc487..e60bcf6fab 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -42,6 +42,7 @@ EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); +EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 20/35: ecore-wl2: Move ecore_wl2_surface_destroy function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=752b541e6c3474c6be4b272c8905c3dd51aef4ea commit 752b541e6c3474c6be4b272c8905c3dd51aef4ea Author: Christopher Michael Date: Tue Nov 5 09:18:26 2019 -0500 ecore-wl2: Move ecore_wl2_surface_destroy function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index e47c4168c8..918705bf34 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 4667edc3e8..c7229aaf77 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -58,6 +58,7 @@ EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); +EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 18/35: ecore-wl2: Move ecore_wl2_buffer_age_inc function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a40dabd9e0289869c2c8b7f792fc8dc07e4fae10 commit a40dabd9e0289869c2c8b7f792fc8dc07e4fae10 Author: Christopher Michael Date: Tue Nov 5 09:17:02 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_age_inc function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 10aa339cda..de56f8b4fa 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index b3cdfa266f..f8105d728a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -55,6 +55,7 @@ EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); +EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 33/35: evas-wayland-common: Add include for ecore_wl2 internal functions
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ec1ce2b15d50d675ce9c25e29f6c9009943ff119 commit ec1ce2b15d50d675ce9c25e29f6c9009943ff119 Author: Christopher Michael Date: Tue Nov 5 09:26:49 2019 -0500 evas-wayland-common: Add include for ecore_wl2 internal functions --- src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h index 45c0d91821..539b83b38b 100644 --- a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h +++ b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h @@ -2,6 +2,7 @@ # define _EVAS_ENGINE_WAYLAND_COMMON_H #include "Ecore_Wl2.h" +#include "ecore_wl2_internal.h" typedef struct _Evas_Engine_Info_Wayland Evas_Engine_Info_Wayland; --
[EGIT] [core/efl] master 21/35: ecore-wl2: Move ecore_wl2_surface_reconfigure function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=25691ce647eb31650edd9eda42a44362d170bce7 commit 25691ce647eb31650edd9eda42a44362d170bce7 Author: Christopher Michael Date: Tue Nov 5 09:19:00 2019 -0500 ecore-wl2: Move ecore_wl2_surface_reconfigure function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 918705bf34..d8884ab4f7 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index c7229aaf77..22212cebc1 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -59,6 +59,7 @@ EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); +EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 23/35: ecore-wl2: Move ecore_wl2_surface_assign function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=49498f798bb60c5e3268ffe6721abcf13e93a367 commit 49498f798bb60c5e3268ffe6721abcf13e93a367 Author: Christopher Michael Date: Tue Nov 5 09:19:41 2019 -0500 ecore-wl2: Move ecore_wl2_surface_assign function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 5ba2f8264f..e6b189c0cb 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 385ddd55df..dd840a2833 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -61,6 +61,7 @@ EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Boo EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); +EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 24/35: ecore-wl2: Move ecore_wl2_surface_post function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c333022f0bdf47244e60d0475a3842a44870cc3d commit c333022f0bdf47244e60d0475a3842a44870cc3d Author: Christopher Michael Date: Tue Nov 5 09:20:02 2019 -0500 ecore-wl2: Move ecore_wl2_surface_post function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index e6b189c0cb..f46b912be0 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index dd840a2833..fadb4d4f00 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -62,6 +62,7 @@ EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); +EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 02/35: ecore-wl2-dmabuf: Add include for internal functions
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b6b7d2d61f484e49765a2d221359ff7a9b7ba78b commit b6b7d2d61f484e49765a2d221359ff7a9b7ba78b Author: Christopher Michael Date: Tue Nov 5 09:08:23 2019 -0500 ecore-wl2-dmabuf: Add include for internal functions --- src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c b/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c index 02e77f97c5..af394f3ce4 100644 --- a/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c +++ b/src/modules/ecore_wl2/engines/dmabuf/ecore_wl2_surface_module_dmabuf.c @@ -3,6 +3,7 @@ #endif #include "Ecore_Wl2.h" +#include "ecore_wl2_internal.h" #include #include --
[EGIT] [core/efl] master 16/35: ecore-wl2: Move ecore_wl2_buffer_age_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2dc751eb09eef034078678ee23002e8bb92fd4a2 commit 2dc751eb09eef034078678ee23002e8bb92fd4a2 Author: Christopher Michael Date: Tue Nov 5 09:16:11 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_age_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 0de6422e2f..92bfd086f7 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 69fb73a37d..07099c8add 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -53,6 +53,7 @@ EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); +EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 22/35: ecore-wl2: Move ecore_wl2_surface_data_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e451a9127019e756e8f8dd9f894ad167b5740ded commit e451a9127019e756e8f8dd9f894ad167b5740ded Author: Christopher Michael Date: Tue Nov 5 09:19:21 2019 -0500 ecore-wl2: Move ecore_wl2_surface_data_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index d8884ab4f7..5ba2f8264f 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 22212cebc1..385ddd55df 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -60,6 +60,7 @@ EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); +EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 13/35: ecore-wl2: Move ecore_wl2_buffer_destroy function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e1208ca31fac9cca94a471560293f0287309132e commit e1208ca31fac9cca94a471560293f0287309132e Author: Christopher Michael Date: Tue Nov 5 09:15:08 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_destroy function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 2f52064b86..e887135ad2 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index cbca056b62..5fe749e2f5 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -50,6 +50,7 @@ EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); +EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 11/35: ecore-wl2: Move ecore_wl2_buffer_lock function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=400ed3f3c400d939fb55b3149677f72858dac89a commit 400ed3f3c400d939fb55b3149677f72858dac89a Author: Christopher Michael Date: Tue Nov 5 09:14:16 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_lock function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index c760d09735..da049a3b70 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index ea0f3e97ba..fb2e7297ba 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -48,6 +48,7 @@ EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); +EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 25/35: ecore-wl2: Move ecore_wl2_surface_flush function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=58e06a4740b1b152fb7dce23eb2e2c3a00962915 commit 58e06a4740b1b152fb7dce23eb2e2c3a00962915 Author: Christopher Michael Date: Tue Nov 5 09:20:22 2019 -0500 ecore-wl2: Move ecore_wl2_surface_flush function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index f46b912be0..5c3ae9edba 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index fadb4d4f00..e42db65745 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -63,6 +63,7 @@ EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); +EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 28/35: ecore-wl2: Move ecore_wl2_surface_manager_add function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8d6b409699401e8b8c7e652d0fba940463826c9e commit 8d6b409699401e8b8c7e652d0fba940463826c9e Author: Christopher Michael Date: Tue Nov 5 09:21:29 2019 -0500 ecore-wl2: Move ecore_wl2_surface_manager_add function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 522eb90927..16bdf72711 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 927e892fee..7c39301364 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -66,6 +66,7 @@ EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rec EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); +EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 06/35: ecore-wl2: Move ecore_wl2_buffer_destroy function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=df15c774b86a40c4c654044a4aa90ec9737a7227 commit df15c774b86a40c4c654044a4aa90ec9737a7227 Author: Christopher Michael Date: Tue Nov 5 09:11:56 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_destroy function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index a0638fe791..e8867e47fe 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index e60bcf6fab..5b3cb68295 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -43,6 +43,7 @@ EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); +EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 30/35: ecore-wl2: Move ecore_wl2_surface_window_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ca3d6f0e7fe9b06502f178f8e41d950093897996 commit ca3d6f0e7fe9b06502f178f8e41d950093897996 Author: Christopher Michael Date: Tue Nov 5 09:22:21 2019 -0500 ecore-wl2: Move ecore_wl2_surface_window_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index b9d45a6df0..4843ff6b40 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); # endif diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 778a793d3f..fa5a4f4d4b 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -68,6 +68,7 @@ EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool pur EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); +EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 35/35: evas-wayland-common: Move boolean fields to bottom of structure
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2fe6d593212e09cb3cddfc509ad805d25cb2f926 commit 2fe6d593212e09cb3cddfc509ad805d25cb2f926 Author: Christopher Michael Date: Tue Nov 5 09:30:48 2019 -0500 evas-wayland-common: Move boolean fields to bottom of structure --- src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h index 8225924ec3..d531ded2e5 100644 --- a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h +++ b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h @@ -24,9 +24,6 @@ struct _Evas_Engine_Info_Wayland /* non-blocking or blocking mode */ Evas_Engine_Render_Mode render_mode; - Eina_Bool indirect : 1; - - Eina_Bool www_avail : 1; Eina_Rectangle window; int x_rel, y_rel; int x_cursor, y_cursor; @@ -41,6 +38,8 @@ struct _Evas_Engine_Info_Wayland Eina_Bool drag_stop : 1; Eina_Bool drag_ack : 1; Eina_Bool resizing : 1; + Eina_Bool indirect : 1; + Eina_Bool www_avail : 1; }; #endif --
[EGIT] [core/efl] master 34/35: evas-wayland-common: Fix variable type
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9eb745a3c1b93b89c1680dea3f1ed33ed8e28cd9 commit 9eb745a3c1b93b89c1680dea3f1ed33ed8e28cd9 Author: Christopher Michael Date: Tue Nov 5 09:29:06 2019 -0500 evas-wayland-common: Fix variable type The 'resizing' variable here does not need to be an 'int' as it's either true or false, so change to be Eina_Bool. --- src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h index 539b83b38b..8225924ec3 100644 --- a/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h +++ b/src/modules/evas/engines/wayland_common/Evas_Engine_Wayland.h @@ -30,7 +30,6 @@ struct _Evas_Engine_Info_Wayland Eina_Rectangle window; int x_rel, y_rel; int x_cursor, y_cursor; - int resizing; uint32_t timestamp; /* window surface should be made with these config */ int depth_bits; @@ -41,6 +40,7 @@ struct _Evas_Engine_Info_Wayland Eina_Bool drag_start : 1; Eina_Bool drag_stop : 1; Eina_Bool drag_ack : 1; + Eina_Bool resizing : 1; }; #endif --
[EGIT] [core/efl] master 09/35: ecore-wl2: Move ecore_wl2_buffer_unmap function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=694df8f823cc8de5f444240096faa8a393f80c01 commit 694df8f823cc8de5f444240096faa8a393f80c01 Author: Christopher Michael Date: Tue Nov 5 09:13:06 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_unmap function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index a5293add48..996d955f63 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index f5742beb4d..c7880384a9 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -46,6 +46,7 @@ EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, in EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); +EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 14/35: ecore-wl2: Move ecore_wl2_buffer_busy_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=431a5578daab3fa7a8fb983aa0a385e8fdb6b283 commit 431a5578daab3fa7a8fb983aa0a385e8fdb6b283 Author: Christopher Michael Date: Tue Nov 5 09:15:28 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_busy_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index e887135ad2..c47641ca45 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 5fe749e2f5..406fc985ea 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -51,6 +51,7 @@ EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); +EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 27/35: ecore-wl2: Move ecore_wl2_surface_buffer_create function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=132851bc4ee2906383cfe8f9baa776aa63274a49 commit 132851bc4ee2906383cfe8f9baa776aa63274a49 Author: Christopher Michael Date: Tue Nov 5 09:21:06 2019 -0500 ecore-wl2: Move ecore_wl2_surface_buffer_create function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index a81c466f64..522eb90927 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 7dfb0885c6..927e892fee 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -65,6 +65,7 @@ EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); +EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 15/35: ecore-wl2: Move ecore_wl2_buffer_busy_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ecd7a2c3c65116cce4b95e5646d12c70aa030e97 commit ecd7a2c3c65116cce4b95e5646d12c70aa030e97 Author: Christopher Michael Date: Tue Nov 5 09:15:48 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_busy_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index c47641ca45..0de6422e2f 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 406fc985ea..69fb73a37d 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -52,6 +52,7 @@ EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); +EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 17/35: ecore-wl2: Move ecore_wl2_buffer_age_set function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=97dca40f6a695248ae2fb0671ce31892e90bd95e commit 97dca40f6a695248ae2fb0671ce31892e90bd95e Author: Christopher Michael Date: Tue Nov 5 09:16:31 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_age_set function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 92bfd086f7..10aa339cda 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 07099c8add..b3cdfa266f 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -54,6 +54,7 @@ EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); +EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 32/35: ecore-wl2: Remove dead comment
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=316136d032fba3d1f2ed24868fb8f4606bb89c6e commit 316136d032fba3d1f2ed24868fb8f4606bb89c6e Author: Christopher Michael Date: Tue Nov 5 09:23:10 2019 -0500 ecore-wl2: Remove dead comment Now that the (mostly unused) functions have been moved to be internal, we don't need a comment in here about documenting them --- src/lib/ecore_wl2/Ecore_Wl2.h | 4 1 file changed, 4 deletions(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 9ec30151e4..eca4733710 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2003,10 +2003,6 @@ EAPI Eina_Bool ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window); */ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); -/* TODO: doxygen if we are keeping any of the below functions public */ - - - # endif # undef EAPI --
[EGIT] [core/efl] master 12/35: ecore-wl2: Move ecore_wl2_buffer_unlock function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f22e8b4270ae7565216ea03901325689cfa3e84b commit f22e8b4270ae7565216ea03901325689cfa3e84b Author: Christopher Michael Date: Tue Nov 5 09:14:48 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_unlock function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index da049a3b70..2f52064b86 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index fb2e7297ba..cbca056b62 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -49,6 +49,7 @@ EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stri EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); +EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 08/35: ecore-wl2: Move ecore_wl2_buffer_map function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=480390d8626cd7b33d611c9a3db1fe0a4e773009 commit 480390d8626cd7b33d611c9a3db1fe0a4e773009 Author: Christopher Michael Date: Tue Nov 5 09:12:43 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_map function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index d85156a369..a5293add48 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index a66bd3e44c..f5742beb4d 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -45,6 +45,7 @@ EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Ty EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); +EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 31/35: ecore-wl2: Move ecore_wl2_surface_alpha_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=40f10e204ac1a5eae4d36ee1efc3d23f0aa46704 commit 40f10e204ac1a5eae4d36ee1efc3d23f0aa46704 Author: Christopher Michael Date: Tue Nov 5 09:22:43 2019 -0500 ecore-wl2: Move ecore_wl2_surface_alpha_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 4843ff6b40..9ec30151e4 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); # endif diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index fa5a4f4d4b..0dcdd571ac 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -69,6 +69,7 @@ EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surfac EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); +EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 07/35: ecore-wl2: Move ecore_wl2_buffer_wl_buffer_get function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5f3a67945e5ef6b408f2330a612bb10a7157db68 commit 5f3a67945e5ef6b408f2330a612bb10a7157db68 Author: Christopher Michael Date: Tue Nov 5 09:12:21 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_wl_buffer_get function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index e8867e47fe..d85156a369 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 5b3cb68295..a66bd3e44c 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -44,6 +44,7 @@ EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rect EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); +EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 29/35: ecore-wl2: Move ecore_wl2_surface_manager_del function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2069181bae261cc744080c7b1f9ae4417d687789 commit 2069181bae261cc744080c7b1f9ae4417d687789 Author: Christopher Michael Date: Tue Nov 5 09:22:01 2019 -0500 ecore-wl2: Move ecore_wl2_surface_manager_del function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 16bdf72711..b9d45a6df0 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 7c39301364..778a793d3f 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -67,6 +67,7 @@ EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); +EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 04/35: ecore-wl2: Move ecore_wl2_buffer_init function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=848743f70db4c4c7033fd7abe3be4b00d6dd1ebc commit 848743f70db4c4c7033fd7abe3be4b00d6dd1ebc Author: Christopher Michael Date: Tue Nov 5 09:10:48 2019 -0500 ecore-wl2: Move ecore_wl2_buffer_init function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index fce758ccd9..4e89831b11 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2005,7 +2005,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index 1eb5b0a20e..b57a7fc487 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -41,6 +41,7 @@ EAPI void ecore_wl2_window_false_commit(Ecore_Wl2_Window *window); EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); +EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); # undef EAPI # define EAPI --
[EGIT] [core/efl] master 26/35: ecore-wl2: Move ecore_wl2_window_surface_flush function to be internal
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=307837d1991d0c553229fafdc922629e31c27f6f commit 307837d1991d0c553229fafdc922629e31c27f6f Author: Christopher Michael Date: Tue Nov 5 09:20:42 2019 -0500 ecore-wl2: Move ecore_wl2_window_surface_flush function to be internal As this function is only used in 1 place and will likely never be used outside of the modular dmabuf engine, we can move it to be internal only. ref T8013 --- src/lib/ecore_wl2/Ecore_Wl2.h | 1 - src/lib/ecore_wl2/ecore_wl2_internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 5c3ae9edba..a81c466f64 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -2006,7 +2006,6 @@ EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); /* TODO: doxygen if we are keeping any of the below functions public */ -EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index e42db65745..7dfb0885c6 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -64,6 +64,7 @@ EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); +EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); # undef EAPI # define EAPI --
