Fix build error with 0.15.0 wlroots

- wlr_subsurface.parent_link is now wlr_subsurface.current.link.
  wlr_surface.subsurfaces_{above,below} is moved to wlr_surface_state.
  Reference: https://github.com/swaywm/wlroots/pull/3169

- Unnecessary to include "wlr_box.h"
  Reference: https://github.com/swaywm/wlroots/pull/3011
This commit is contained in:
Moon Sungjoon 2021-10-31 05:12:33 +09:00
parent d1367b1c46
commit c6da94708a
No known key found for this signature in database
GPG key ID: 202859AA7174FAB8
6 changed files with 2 additions and 9 deletions

View file

@ -10,7 +10,6 @@
#include <wayland-server-core.h>
#include <wlr/backend.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_matrix.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>

2
util.c
View file

@ -6,8 +6,6 @@
* See the LICENSE file accompanying this file.
*/
#include <wlr/types/wlr_box.h>
#include "util.h"
int

5
view.c
View file

@ -12,7 +12,6 @@
#include <stdlib.h>
#include <string.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h>
@ -235,10 +234,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface)
view->wlr_surface = surface;
struct wlr_subsurface *subsurface;
wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) {
wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_below, current.link) {
subsurface_create(view, subsurface);
}
wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) {
wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_above, current.link) {
subsurface_create(view, subsurface);
}

1
view.h
View file

@ -5,7 +5,6 @@
#include <stdbool.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_xdg_shell.h>
#if CAGE_HAS_XWAYLAND

View file

@ -9,7 +9,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_xdg_shell.h>
#include <wlr/util/log.h>

View file

@ -9,7 +9,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <wayland-server-core.h>
#include <wlr/types/wlr_box.h>
#include <wlr/util/log.h>
#include <wlr/xwayland.h>