summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wl2
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-02-08 11:56:30 -0600
committerDerek Foreman <derekf@osg.samsung.com>2018-04-20 13:00:27 -0500
commit6da0933d60fba481c063703c21398dda8b79a90f (patch)
treed634c01b019382a2479256a02db50edadb6fa5b1 /src/lib/ecore_wl2
parentd85e96006050427dce2ea4bc9e1677652e9a7842 (diff)
ecore_wl2: Add alpha to reconfigure
Currently we only ever make wayland windows with alpha, this is a step towards changing that.
Diffstat (limited to 'src/lib/ecore_wl2')
-rw-r--r--src/lib/ecore_wl2/Ecore_Wl2.h4
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_surface.c5
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_surface_module_dmabuf.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 5f65191ee1..b9f8e1d498 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -432,7 +432,7 @@ typedef struct _Ecore_Wl2_Surface_Interface
432 432
433 void *(*setup)(Ecore_Wl2_Window *win); 433 void *(*setup)(Ecore_Wl2_Window *win);
434 void (*destroy)(Ecore_Wl2_Surface *surface, void *priv_data); 434 void (*destroy)(Ecore_Wl2_Surface *surface, void *priv_data);
435 void (*reconfigure)(Ecore_Wl2_Surface *surface, void *priv_data, int w, int h, uint32_t flags); 435 void (*reconfigure)(Ecore_Wl2_Surface *surface, void *priv_data, int w, int h, uint32_t flags, Eina_Bool alpha);
436 void *(*data_get)(Ecore_Wl2_Surface *surface, void *priv_data, int *w, int *h); 436 void *(*data_get)(Ecore_Wl2_Surface *surface, void *priv_data, int *w, int *h);
437 int (*assign)(Ecore_Wl2_Surface *surface, void *priv_data); 437 int (*assign)(Ecore_Wl2_Surface *surface, void *priv_data);
438 void (*post)(Ecore_Wl2_Surface *surface, void *priv_data, Eina_Rectangle *rects, unsigned int count); 438 void (*post)(Ecore_Wl2_Surface *surface, void *priv_data, Eina_Rectangle *rects, unsigned int count);
@@ -2015,7 +2015,7 @@ EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h);
2015 2015
2016EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); 2016EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha);
2017EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); 2017EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface);
2018EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags); 2018EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha);
2019EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); 2019EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h);
2020EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); 2020EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface);
2021EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); 2021EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count);
diff --git a/src/lib/ecore_wl2/ecore_wl2_surface.c b/src/lib/ecore_wl2/ecore_wl2_surface.c
index 9e7512d090..8720af0b76 100644
--- a/src/lib/ecore_wl2/ecore_wl2_surface.c
+++ b/src/lib/ecore_wl2/ecore_wl2_surface.c
@@ -27,13 +27,14 @@ ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface)
27} 27}
28 28
29EAPI void 29EAPI void
30ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags) 30ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha)
31{ 31{
32 EINA_SAFETY_ON_NULL_RETURN(surface); 32 EINA_SAFETY_ON_NULL_RETURN(surface);
33 33
34 surface->funcs->reconfigure(surface, surface->private_data, w, h, flags); 34 surface->funcs->reconfigure(surface, surface->private_data, w, h, flags, alpha);
35 surface->w = w; 35 surface->w = w;
36 surface->h = h; 36 surface->h = h;
37 surface->alpha = alpha;
37} 38}
38 39
39EAPI void * 40EAPI void *
diff --git a/src/lib/ecore_wl2/ecore_wl2_surface_module_dmabuf.c b/src/lib/ecore_wl2/ecore_wl2_surface_module_dmabuf.c
index d9baeff90d..34a1edde48 100644
--- a/src/lib/ecore_wl2/ecore_wl2_surface_module_dmabuf.c
+++ b/src/lib/ecore_wl2/ecore_wl2_surface_module_dmabuf.c
@@ -47,7 +47,7 @@ _evas_dmabuf_surface_setup(Ecore_Wl2_Window *win)
47} 47}
48 48
49static void 49static void
50_evas_dmabuf_surface_reconfigure(Ecore_Wl2_Surface *s EINA_UNUSED, void *priv_data, int w, int h, uint32_t flags EINA_UNUSED) 50_evas_dmabuf_surface_reconfigure(Ecore_Wl2_Surface *s EINA_UNUSED, void *priv_data, int w, int h, uint32_t flags EINA_UNUSED, Eina_Bool alpha EINA_UNUSED)
51{ 51{
52 Ecore_Wl2_Dmabuf_Private *p; 52 Ecore_Wl2_Dmabuf_Private *p;
53 Ecore_Wl2_Buffer *b; 53 Ecore_Wl2_Buffer *b;