From: Johan Malm <jgm323@gmail.com>
Date: Wed, 20 Apr 2022 17:48:49 +0000 (+0100)
Subject: Chase wlroots X11 hints update
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=286b2146c348;p=proto%2Flabwc.git

Chase wlroots X11 hints update
---

diff --git a/meson.build b/meson.build
index 7aea92b2..9cd11810 100644
--- a/meson.build
+++ b/meson.build
@@ -57,6 +57,7 @@ wayland_server = dependency('wayland-server', version: '>=1.19.0')
 wayland_protos = dependency('wayland-protocols')
 xkbcommon = dependency('xkbcommon')
 xcb = dependency('xcb', required: get_option('xwayland'))
+xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
 drm_full = dependency('libdrm')
 drm = drm_full.partial_dependency(compile_args: true, includes: true)
 xml2 = dependency('libxml-2.0')
@@ -83,6 +84,7 @@ labwc_deps = [
   wayland_server,
   wlroots,
   xkbcommon,
+  xcb_icccm,
   xml2,
   glib,
   cairo,
diff --git a/src/view.c b/src/view.c
index 6b003ac8..ead0dc98 100644
--- a/src/view.c
+++ b/src/view.c
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <strings.h>
+#include <xcb/xcb_icccm.h>
 #include "labwc.h"
 #include "ssd.h"
 
@@ -72,8 +73,8 @@ view_adjust_size(struct view *view, int *w, int *h)
 	int min_height = MIN_VIEW_HEIGHT;
 #if HAVE_XWAYLAND
 	if (view->type == LAB_XWAYLAND_VIEW) {
-		struct wlr_xwayland_surface_size_hints *hints =
-			view->xwayland_surface->size_hints;
+		xcb_size_hints_t *hints = view->xwayland_surface->size_hints;
+
 		/*
 		 * Honor size increments from WM_SIZE_HINTS. Typically, X11
 		 * terminal emulators will use WM_SIZE_HINTS to make sure that
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index e7273bb2..3507ea52 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,3 +1,3 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 2e14bed9
+revision = 640f3b9f2156a007c5d1a36afdee570e123c95e4