Merge branch 'master' into display-destroy

This commit is contained in:
emersion 2017-12-14 20:29:30 +01:00
commit 75ef7860bb
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
19 changed files with 111 additions and 28 deletions

View file

@ -7,6 +7,7 @@
#include <wayland-egl.h>
#include <wlr/render/egl.h>
#include <wlr/backend/wayland.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
#include <wayland-util.h>
@ -76,6 +77,8 @@ void wlr_wl_registry_poll(struct wlr_wl_backend *backend);
void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output);
struct wlr_wl_backend_output *wlr_wl_output_for_surface(
struct wlr_wl_backend *backend, struct wl_surface *surface);
void wlr_wl_output_layout_get_box(struct wlr_wl_backend *backend,
struct wlr_box *box);
extern const struct wl_seat_listener seat_listener;