merge wlroots-next

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 ## Info
-dwl's commit:
+dwl version:
 wlroots version:
 ## Description
 <!--

client.h

@@ -45,7 +45,7 @@ client_get_parent(Client *c)
 		return client_from_wlr_surface(c->surface.xwayland->parent->surface);
 #endif
 	if (c->surface.xdg->toplevel->parent)
-		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->surface);
+		return client_from_wlr_surface(c->surface.xdg->toplevel->parent->base->surface);
 
 	return NULL;
 }
@@ -57,8 +57,7 @@ client_get_size_hints(Client *c, struct wlr_box *max, struct wlr_box *min)
 	struct wlr_xdg_toplevel_state *state;
 #ifdef XWAYLAND
 	if (client_is_x11(c)) {
-		struct wlr_xwayland_surface_size_hints *size_hints;
-		size_hints = c->surface.xwayland->size_hints;
+		xcb_size_hints_t *size_hints = c->surface.xwayland->size_hints;
 		if (size_hints) {
 			max->width = size_hints->max_width;
 			max->height = size_hints->max_height;
@@ -102,7 +101,20 @@ client_activate_surface(struct wlr_surface *s, int activated)
 	if (wlr_surface_is_xdg_surface(s)
 			&& (surface = wlr_xdg_surface_from_wlr_surface(s))
 			&& surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL)
-		wlr_xdg_toplevel_set_activated(surface, activated);
+		wlr_xdg_toplevel_set_activated(surface->toplevel, activated);
+}
+
+static inline uint32_t
+client_set_bounds(Client *c, int32_t width, int32_t height)
+{
+#ifdef XWAYLAND
+	if (client_is_x11(c))
+		return 0;
+#endif
+	if (c->surface.xdg->client->shell->version >=
+			XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION)
+		return wlr_xdg_toplevel_set_bounds(c->surface.xdg->toplevel, width, height);
+	return 0;
 }
 
 static inline void
@@ -151,7 +163,6 @@ client_get_title(Client *c)
 	return c->surface.xdg->toplevel->title;
 }
 
-
 static inline int
 client_is_float_type(Client *c)
 {
@@ -173,8 +184,7 @@ client_is_float_type(Client *c)
 	}
 #endif
 	return ((min.width > 0 || min.height > 0 || max.width > 0 || max.height > 0)
-		&& (min.width == max.width || min.height == max.height))
-		|| client_get_parent(c);
+		&& (min.width == max.width || min.height == max.height));
 }
 
 static inline int
@@ -226,7 +236,7 @@ client_send_close(Client *c)
 		return;
 	}
 #endif
-	wlr_xdg_toplevel_send_close(c->surface.xdg);
+	wlr_xdg_toplevel_send_close(c->surface.xdg->toplevel);
 }
 
 static inline void
@@ -238,7 +248,7 @@ client_set_fullscreen(Client *c, int fullscreen)
 		return;
 	}
 #endif
-	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg, fullscreen);
+	wlr_xdg_toplevel_set_fullscreen(c->surface.xdg->toplevel, fullscreen);
 }
 
 static inline uint32_t
@@ -251,7 +261,7 @@ client_set_size(Client *c, uint32_t width, uint32_t height)
 		return 0;
 	}
 #endif
-	return wlr_xdg_toplevel_set_size(c->surface.xdg, width, height);
+	return wlr_xdg_toplevel_set_size(c->surface.xdg->toplevel, width, height);
 }
 
 static inline void
@@ -261,7 +271,7 @@ client_set_tiled(Client *c, uint32_t edges)
 	if (client_is_x11(c))
 		return;
 #endif
-	wlr_xdg_toplevel_set_tiled(c->surface.xdg, edges);
+	wlr_xdg_toplevel_set_tiled(c->surface.xdg->toplevel, edges);
 }
 
 static inline struct wlr_surface *

config.def.h

@@ -1,12 +1,12 @@
 /* appearance */
-static const int sloppyfocus        = 1;  /* focus follows mouse */
-static const unsigned int borderpx  = 1;  /* border pixel of windows */
-static const int lockfullscreen     = 1;  /* 1 will force focus on the fullscreen window */
-static const float rootcolor[]      = {0.3, 0.3, 0.3, 1.0};
-static const float bordercolor[]    = {0.5, 0.5, 0.5, 1.0};
-static const float focuscolor[]     = {1.0, 0.0, 0.0, 1.0};
+static const int sloppyfocus               = 1;  /* focus follows mouse */
+static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
+static const unsigned int borderpx         = 1;  /* border pixel of windows */
+static const float rootcolor[]             = {0.3, 0.3, 0.3, 1.0};
+static const float bordercolor[]           = {0.5, 0.5, 0.5, 1.0};
+static const float focuscolor[]            = {1.0, 0.0, 0.0, 1.0};
 /* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
-static const float fullscreen_bg[]  = {0.1, 0.1, 0.1, 1.0};
+static const float fullscreen_bg[]         = {0.1, 0.1, 0.1, 1.0};
 
 /* tagging */
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

config.mk

@@ -11,4 +11,4 @@ XWAYLAND =
 XLIBS =
 # Uncomment to build XWayland support
 #XWAYLAND = -DXWAYLAND
-#XLIBS = xcb
+#XLIBS = xcb xcb-icccm