isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Port to latest Wayland API (to wl_surface_shell)

Browse Source 
Requests for the shell to manipulate it's state for the surface are now
abstracted through a wl_shell_surface object rather through wl_shell as
before.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Rob Bradford 2011-12-08 16:19:50 +00:00
parent 889e4aba9c
commit 4928ca5a90
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/winsys/cogl-winsys-egl.c
View File

@ -99,6 +99,7 @@ typedef struct _CoglOnscreenEGL
#ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT #ifdef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT
struct wl_egl_window *wayland_egl_native_window; struct wl_egl_window *wayland_egl_native_window;
struct wl_surface *wayland_surface; struct wl_surface *wayland_surface;
struct wl_shell_surface *wayland_shell_surface;
#endif #endif
#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT #ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT
@ -1332,6 +1333,10 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
return FALSE; return FALSE;
} }
egl_onscreen->wayland_shell_surface =
wl_shell_get_shell_surface (egl_renderer->wayland_shell,
egl_onscreen->wayland_surface);
egl_onscreen->wayland_egl_native_window = egl_onscreen->wayland_egl_native_window =
wl_egl_window_create (egl_onscreen->wayland_surface, wl_egl_window_create (egl_onscreen->wayland_surface,
cogl_framebuffer_get_width (framebuffer), cogl_framebuffer_get_width (framebuffer),
@ -1352,8 +1357,7 @@ _cogl_winsys_onscreen_init (CoglOnscreen *onscreen,
egl_onscreen->wayland_egl_native_window, egl_onscreen->wayland_egl_native_window,
NULL); NULL);
wl_shell_set_toplevel (egl_renderer->wayland_shell, wl_shell_surface_set_toplevel (egl_onscreen->wayland_shell_surface);
egl_onscreen->wayland_surface);
#elif defined (COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT) || \ #elif defined (COGL_HAS_EGL_PLATFORM_POWERVR_NULL_SUPPORT) || \
defined (COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT) || \ defined (COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT) || \