hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 03:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move wlr_surface into wlr

Browse source
This commit is contained in:
nyorain 2017-08-09 15:58:10 +02:00
parent 8473c3955c
commit cf9ee6ce3f
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/compositor/main.c
View file

@ -10,11 +10,11 @@
#include <wlr/render.h> #include <wlr/render.h>
#include <wlr/render/gles2.h> #include <wlr/render/gles2.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "shared.h" #include "shared.h"
#include "compositor.h" #include "compositor.h"
#include "wlr_surface.h"
struct sample_state { struct sample_state {
struct wlr_renderer *renderer; struct wlr_renderer *renderer;

2
examples/compositor/wl_compositor.c
View file

@ -2,8 +2,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/types/wlr_surface.h>
#include "compositor.h" #include "compositor.h"
#include "compositor/wlr_surface.h"
static void destroy_surface_listener(struct wl_listener *listener, void *data) { static void destroy_surface_listener(struct wl_listener *listener, void *data) {
struct wl_compositor_state *state; struct wl_compositor_state *state;

3
examples/meson.build
View file

@ -11,8 +11,7 @@ executable('tablet', 'tablet.c', dependencies: dep_wlr, link_with: lib_shared)
compositor_src = [ compositor_src = [
'compositor/main.c', 'compositor/main.c',
'compositor/wl_compositor.c', 'compositor/wl_compositor.c',
'compositor/wl_shell.c', 'compositor/wl_shell.c'
'compositor/wlr_surface.c',
] ]
executable('compositor', compositor_src, dependencies: dep_wlr, link_with: lib_shared) executable('compositor', compositor_src, dependencies: dep_wlr, link_with: lib_shared)

5
examples/compositor/wlr_surface.h → include/wlr/types/wlr_surface.h
View file

@ -1,5 +1,5 @@
#ifndef _EXAMPLES_COMPOSITOR_SURFACE_H #ifndef _WLR_TYPES_WLR_SURFACE_H
#define _EXAMPLES_COMPOSITOR_SURFACE_H #define _WLR_TYPES_WLR_SURFACE_H
#include <wayland-server.h> #include <wayland-server.h>
@ -18,6 +18,7 @@ struct wlr_surface {
} signals; } signals;
}; };
struct wlr_renderer;
struct wlr_surface *wlr_surface_create(struct wl_resource *res, struct wlr_surface *wlr_surface_create(struct wl_resource *res,
struct wlr_renderer *renderer); struct wlr_renderer *renderer);

1
types/meson.build
View file

@ -4,6 +4,7 @@ wlr_files += files(
'wlr_output.c', 'wlr_output.c',
'wlr_pointer.c', 'wlr_pointer.c',
'wlr_region.c', 'wlr_region.c',
'wlr_surface.c',
'wlr_tablet_pad.c', 'wlr_tablet_pad.c',
'wlr_tablet_tool.c', 'wlr_tablet_tool.c',
'wlr_touch.c', 'wlr_touch.c',

2
examples/compositor/wlr_surface.c → types/wlr_surface.c
View file

@ -3,7 +3,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <wlr/render/interface.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) { static void surface_destroy(struct wl_client *client, struct wl_resource *resource) {
struct wlr_surface *surface = wl_resource_get_user_data(resource); struct wlr_surface *surface = wl_resource_get_user_data(resource);