diff options
| author | nyorain <nyorain@gmail.com> | 2017-08-09 15:58:10 +0200 |
|---|---|---|
| committer | nyorain <nyorain@gmail.com> | 2017-08-09 17:27:12 +0200 |
| commit | cf9ee6ce3fe6d9b35f5c737c3fefa6759f8095c0 (patch) | |
| tree | 65fbe2d82eee072a057056d32735500c450db79a | |
| parent | 8473c3955cb8469c5f999410f68a3b3d3e6bee18 (diff) | |
Move wlr_surface into wlr
| -rw-r--r-- | examples/compositor/main.c | 2 | ||||
| -rw-r--r-- | examples/compositor/wl_compositor.c | 2 | ||||
| -rw-r--r-- | examples/meson.build | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_surface.h (renamed from examples/compositor/wlr_surface.h) | 5 | ||||
| -rw-r--r-- | types/meson.build | 1 | ||||
| -rw-r--r-- | types/wlr_surface.c (renamed from examples/compositor/wlr_surface.c) | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/examples/compositor/main.c b/examples/compositor/main.c index 01292f51..8e5fcc34 100644 --- a/examples/compositor/main.c +++ b/examples/compositor/main.c @@ -10,11 +10,11 @@ #include <wlr/render.h> #include <wlr/render/gles2.h> #include <wlr/types/wlr_output.h> +#include <wlr/types/wlr_surface.h> #include <xkbcommon/xkbcommon.h> #include <wlr/util/log.h> #include "shared.h" #include "compositor.h" -#include "wlr_surface.h" struct sample_state { struct wlr_renderer *renderer; diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c index 8c8ee3b6..89d23d6a 100644 --- a/examples/compositor/wl_compositor.c +++ b/examples/compositor/wl_compositor.c @@ -2,8 +2,8 @@ #include <stdlib.h> #include <wayland-server.h> #include <wlr/util/log.h> +#include <wlr/types/wlr_surface.h> #include "compositor.h" -#include "compositor/wlr_surface.h" static void destroy_surface_listener(struct wl_listener *listener, void *data) { struct wl_compositor_state *state; diff --git a/examples/meson.build b/examples/meson.build index 6e52a920..a44a4946 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -11,8 +11,7 @@ executable('tablet', 'tablet.c', dependencies: dep_wlr, link_with: lib_shared) compositor_src = [ 'compositor/main.c', 'compositor/wl_compositor.c', - 'compositor/wl_shell.c', - 'compositor/wlr_surface.c', + 'compositor/wl_shell.c' ] executable('compositor', compositor_src, dependencies: dep_wlr, link_with: lib_shared) diff --git a/examples/compositor/wlr_surface.h b/include/wlr/types/wlr_surface.h index d294bdef..88a9a4d8 100644 --- a/examples/compositor/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -1,5 +1,5 @@ -#ifndef _EXAMPLES_COMPOSITOR_SURFACE_H -#define _EXAMPLES_COMPOSITOR_SURFACE_H +#ifndef _WLR_TYPES_WLR_SURFACE_H +#define _WLR_TYPES_WLR_SURFACE_H #include <wayland-server.h> @@ -18,6 +18,7 @@ struct wlr_surface { } signals; }; +struct wlr_renderer; struct wlr_surface *wlr_surface_create(struct wl_resource *res, struct wlr_renderer *renderer); diff --git a/types/meson.build b/types/meson.build index 89e36ac0..a07daf85 100644 --- a/types/meson.build +++ b/types/meson.build @@ -4,6 +4,7 @@ wlr_files += files( 'wlr_output.c', 'wlr_pointer.c', 'wlr_region.c', + 'wlr_surface.c', 'wlr_tablet_pad.c', 'wlr_tablet_tool.c', 'wlr_touch.c', diff --git a/examples/compositor/wlr_surface.c b/types/wlr_surface.c index 5a5c3e0d..4a72159c 100644 --- a/examples/compositor/wlr_surface.c +++ b/types/wlr_surface.c @@ -3,7 +3,7 @@ #include <wayland-server.h> #include <wlr/util/log.h> #include <wlr/render/interface.h> -#include "wlr_surface.h" +#include <wlr/types/wlr_surface.h> static void surface_destroy(struct wl_client *client, struct wl_resource *resource) { struct wlr_surface *surface = wl_resource_get_user_data(resource); |