summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/ecore_wayland/ecore_wl.c4
-rw-r--r--src/lib/ecore_wayland/ecore_wl_private.h4
-rw-r--r--src/lib/ecore_wayland/ecore_wl_subsurf.c6
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index b3ec5df33d..bb0c5fea54 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -274,7 +274,7 @@ ecore_wl_registry_get(void)
274} 274}
275 275
276struct wl_compositor * 276struct wl_compositor *
277ecore_wl_compositor_get(void) 277_ecore_wl_compositor_get(void)
278{ 278{
279 if ((!_ecore_wl_disp) || (!_ecore_wl_disp->wl.display)) 279 if ((!_ecore_wl_disp) || (!_ecore_wl_disp->wl.display))
280 return NULL; 280 return NULL;
@@ -285,7 +285,7 @@ ecore_wl_compositor_get(void)
285} 285}
286 286
287struct wl_subcompositor * 287struct wl_subcompositor *
288ecore_wl_subcompositor_get(void) 288_ecore_wl_subcompositor_get(void)
289{ 289{
290 if ((!_ecore_wl_disp) || (!_ecore_wl_disp->wl.display)) 290 if ((!_ecore_wl_disp) || (!_ecore_wl_disp->wl.display))
291 return NULL; 291 return NULL;
diff --git a/src/lib/ecore_wayland/ecore_wl_private.h b/src/lib/ecore_wayland/ecore_wl_private.h
index d615f0f4dd..581774bb8d 100644
--- a/src/lib/ecore_wayland/ecore_wl_private.h
+++ b/src/lib/ecore_wayland/ecore_wl_private.h
@@ -97,7 +97,7 @@ void _ecore_wl_events_shutdown(void);
97 97
98void _ecore_wl_subsurfs_del_all(Ecore_Wl_Window *win); 98void _ecore_wl_subsurfs_del_all(Ecore_Wl_Window *win);
99 99
100struct wl_compositor *ecore_wl_compositor_get(void); 100struct wl_compositor *_ecore_wl_compositor_get(void);
101struct wl_subcompositor *ecore_wl_subcompositor_get(void); 101struct wl_subcompositor *_ecore_wl_subcompositor_get(void);
102 102
103#endif 103#endif
diff --git a/src/lib/ecore_wayland/ecore_wl_subsurf.c b/src/lib/ecore_wayland/ecore_wl_subsurf.c
index d59810d6cd..dd883ac230 100644
--- a/src/lib/ecore_wayland/ecore_wl_subsurf.c
+++ b/src/lib/ecore_wayland/ecore_wl_subsurf.c
@@ -30,10 +30,10 @@ ecore_wl_subsurf_create(Ecore_Wl_Window *win)
30 if (!win) return NULL; 30 if (!win) return NULL;
31 if (!win->surface) return NULL; 31 if (!win->surface) return NULL;
32 32
33 subcomp = ecore_wl_subcompositor_get(); 33 subcomp = _ecore_wl_subcompositor_get();
34 if (!subcomp) return NULL; 34 if (!subcomp) return NULL;
35 35
36 surface = wl_compositor_create_surface(ecore_wl_compositor_get()); 36 surface = wl_compositor_create_surface(_ecore_wl_compositor_get());
37 if (!surface) 37 if (!surface)
38 return NULL; 38 return NULL;
39 39
@@ -182,7 +182,7 @@ ecore_wl_subsurf_opaque_region_set(Ecore_Wl_Subsurf *ess, int x, int y, int w, i
182 182
183 if ((w > 0) && (h > 0)) 183 if ((w > 0) && (h > 0))
184 { 184 {
185 region = wl_compositor_create_region(ecore_wl_compositor_get()); 185 region = wl_compositor_create_region(_ecore_wl_compositor_get());
186 wl_region_add(region, x, y, w, h); 186 wl_region_add(region, x, y, w, h);
187 wl_surface_set_opaque_region(ess->surface, region); 187 wl_surface_set_opaque_region(ess->surface, region);
188 wl_region_destroy(region); 188 wl_region_destroy(region);
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index b92469157f..0de39d9e58 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -252,7 +252,7 @@ ecore_wl_window_surface_create(Ecore_Wl_Window *win)
252{ 252{
253 if (!win) return NULL; 253 if (!win) return NULL;
254 if (win->surface) return win->surface; 254 if (win->surface) return win->surface;
255 win->surface = wl_compositor_create_surface(ecore_wl_compositor_get()); 255 win->surface = wl_compositor_create_surface(_ecore_wl_compositor_get());
256 win->surface_id = wl_proxy_get_id((struct wl_proxy *)win->surface); 256 win->surface_id = wl_proxy_get_id((struct wl_proxy *)win->surface);
257 return win->surface; 257 return win->surface;
258} 258}
@@ -610,7 +610,7 @@ ecore_wl_window_input_region_set(Ecore_Wl_Window *win, int x, int y, int w, int
610 struct wl_region *region = NULL; 610 struct wl_region *region = NULL;
611 611
612 region = 612 region =
613 wl_compositor_create_region(ecore_wl_compositor_get()); 613 wl_compositor_create_region(_ecore_wl_compositor_get());
614 wl_region_add(region, x, y, w, h); 614 wl_region_add(region, x, y, w, h);
615 wl_surface_set_input_region(win->surface, region); 615 wl_surface_set_input_region(win->surface, region);
616 wl_region_destroy(region); 616 wl_region_destroy(region);
@@ -640,7 +640,7 @@ ecore_wl_window_opaque_region_set(Ecore_Wl_Window *win, int x, int y, int w, int
640 struct wl_region *region = NULL; 640 struct wl_region *region = NULL;
641 641
642 region = 642 region =
643 wl_compositor_create_region(ecore_wl_compositor_get()); 643 wl_compositor_create_region(_ecore_wl_compositor_get());
644 644
645 switch (win->rotation) 645 switch (win->rotation)
646 { 646 {