From bb35960e652f98a882ed3cd2d1968b860942b896 Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 4 Jul 2016 17:01:37 -0500 Subject: Move code to make a window a shell surface into seperate function --- wayland/window.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'wayland') diff --git a/wayland/window.c b/wayland/window.c index ba64cb60..7ca9e4ec 100644 --- a/wayland/window.c +++ b/wayland/window.c @@ -59,6 +59,12 @@ static const struct wl_shell_surface_listener surface_listener = { .configure = shell_surface_configure }; +void window_make_shell(struct window *window) { + window->shell_surface = wl_shell_get_shell_surface(window->registry->shell, window->surface); + wl_shell_surface_add_listener(window->shell_surface, &surface_listener, window); + wl_shell_surface_set_toplevel(window->shell_surface); +} + struct window *window_setup(struct registry *registry, uint32_t width, uint32_t height, bool shell_surface) { struct window *window = malloc(sizeof(struct window)); memset(window, 0, sizeof(struct window)); @@ -69,9 +75,7 @@ struct window *window_setup(struct registry *registry, uint32_t width, uint32_t window->surface = wl_compositor_create_surface(registry->compositor); if (shell_surface) { - window->shell_surface = wl_shell_get_shell_surface(registry->shell, window->surface); - wl_shell_surface_add_listener(window->shell_surface, &surface_listener, window); - wl_shell_surface_set_toplevel(window->shell_surface); + window_make_shell(window); } if (registry->pointer) { wl_pointer_add_listener(registry->pointer, &pointer_listener, window); -- cgit v1.2.3-54-g00ecf