wlroots: Adds 0.19 as submodule dependency and update code to build against it.

Author: phkaeser

dependencies

@@ -21,8 +21,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
 # * pixman at pixman-0.43.0
 
 PKG_CHECK_MODULES(WAYLAND_SERVER REQUIRED IMPORTED_TARGET wayland-server>=1.22.0)
-# We build for wlroots 0.18.
-PKG_CHECK_MODULES(WLROOTS IMPORTED_TARGET wlroots-0.18>=0.18)
+# We build for wlroots 0.19 or 0.18.
+PKG_CHECK_MODULES(WLROOTS IMPORTED_TARGET wlroots-0.19>=0.19)
+IF(NOT WLROOTS_FOUND)
+  PKG_CHECK_MODULES(WLROOTS REQUIRED IMPORTED_TARGET wlroots-0.18>=0.18)
+ENDIF(NOT WLROOTS_FOUND)
 PKG_CHECK_MODULES(XCB REQUIRED IMPORTED_TARGET xcb>=1.15)
 # XWayland considered optional.
 PKG_CHECK_MODULES(XWAYLAND xwayland>=22.1.9)

src/CMakeLists.txt

@@ -150,6 +150,16 @@ wlmaker_cursor_t *wlmaker_cursor_create(
 /* ------------------------------------------------------------------------- */
 void wlmaker_cursor_destroy(wlmaker_cursor_t *cursor_ptr)
 {
+    wlmtk_util_disconnect_listener(
+        &cursor_ptr->seat_request_set_cursor_listener);
+    if (NULL != cursor_ptr->wlr_cursor_ptr) {
+        wlmtk_util_disconnect_listener(&cursor_ptr->frame_listener);
+        wlmtk_util_disconnect_listener(&cursor_ptr->axis_listener);
+        wlmtk_util_disconnect_listener(&cursor_ptr->button_listener);
+        wlmtk_util_disconnect_listener(&cursor_ptr->motion_absolute_listener);
+        wlmtk_util_disconnect_listener(&cursor_ptr->motion_listener);
+    }
+
     if (NULL != cursor_ptr->pointer_ptr) {
         wlmtk_pointer_destroy(cursor_ptr->pointer_ptr);
         cursor_ptr->pointer_ptr = NULL;

src/cursor.c

@@ -25,6 +25,7 @@
 #define WLR_USE_UNSTABLE
 #include <wlr/types/wlr_output.h>
 #include <wlr/util/addon.h>
+#include <wlr/version.h>
 #undef WLR_USE_UNSTABLE
 
 /* == Exported methods ===================================================== */
@@ -34,7 +35,11 @@ void wlmtk_test_wlr_output_init(struct wlr_output *wlr_output_ptr)
 {
     wlr_addon_set_init(&wlr_output_ptr->addons);
     wlr_addon_set_init(&wlr_output_ptr->addons);
+#if WLR_VERSION_NUM >= (19 << 8)
+    wl_list_init(&wlr_output_ptr->WLR_PRIVATE.display_destroy.link);
+#else  // WLR_VERSION_NUM >= (19 << 8)
     wl_list_init(&wlr_output_ptr->display_destroy.link);
+#endif  // WLR_VERSION_NUM >= (19 << 8)
     wl_list_init(&wlr_output_ptr->modes);
     wl_list_init(&wlr_output_ptr->resources);
     wl_signal_init(&wlr_output_ptr->events.commit);

src/toolkit/test.c

@@ -308,8 +308,13 @@ void handle_decoration_request_mode(
         BS_ABORT();
     }
 
-    wlr_xdg_toplevel_decoration_v1_set_mode(
-        decoration_ptr->wlr_xdg_toplevel_decoration_v1_ptr, mode);
+    // TODO(kaeser@gubbe.ch): Setting the mode expects the surface to have been
+    // committed already. Need to implement server-side state tracking and
+    // applying these modes downstream after first commit.
+    if (decoration_ptr->wlr_xdg_toplevel_decoration_v1_ptr->toplevel->base->initialized) {
+        wlr_xdg_toplevel_decoration_v1_set_mode(
+            decoration_ptr->wlr_xdg_toplevel_decoration_v1_ptr, mode);
+    }
 
     if (NULL != content_ptr) {
         bs_log(BS_INFO, "XDG decoration request_mode for XDG surface %p, "

src/xdg_decoration.c

@@ -103,11 +103,7 @@ wlmaker_xdg_popup_t *wlmaker_xdg_popup_create(
         &wlmaker_xdg_popup_ptr->reposition_listener,
         handle_reposition);
     wlmtk_util_connect_listener_signal(
-#if WLR_VERSION_NUM >= (18 << 8)
         &wlr_xdg_popup_ptr->events.destroy,
-#else // WLR_VERSION_NUM >= (18 << 8)
-        &wlr_xdg_popup_ptr->base->events.destroy,
-#endif // WLR_VERSION_NUM >= (18 << 8)
         &wlmaker_xdg_popup_ptr->destroy_listener,
         handle_destroy);
     wlmtk_util_connect_listener_signal(

src/xdg_popup.c

@@ -37,18 +37,12 @@ static void handle_destroy(
     struct wl_listener *listener_ptr,
     void *data_ptr);
 
-#if WLR_VERSION_NUM >= (18 << 8)
 static void handle_new_toplevel(
     struct wl_listener *listener_ptr,
     void *data_ptr);
 static void handle_new_popup(
     struct wl_listener *listener_ptr,
     void *data_ptr);
-#else  // WLR_VERSION_NUM >= (18 << )8
-static void handle_new_surface(
-    struct wl_listener *listener_ptr,
-    void *data_ptr);
-#endif // WLR_VERSION_NUM >= (18 << 8)
 
 /* == Exported methods ===================================================== */
 
@@ -67,7 +61,6 @@ wlmaker_xdg_shell_t *wlmaker_xdg_shell_create(wlmaker_server_t *server_ptr)
         return NULL;
     }
 
-#if WLR_VERSION_NUM >= (18 << 8)
     wlmtk_util_connect_listener_signal(
         &xdg_shell_ptr->wlr_xdg_shell_ptr->events.new_toplevel,
         &xdg_shell_ptr->new_toplevel_listener,
@@ -76,12 +69,6 @@ wlmaker_xdg_shell_t *wlmaker_xdg_shell_create(wlmaker_server_t *server_ptr)
         &xdg_shell_ptr->wlr_xdg_shell_ptr->events.new_popup,
         &xdg_shell_ptr->new_popup_listener,
         handle_new_popup);
-#else // WLR_VERSION_NUM >= (18 << 8)
-    wlmtk_util_connect_listener_signal(
-        &xdg_shell_ptr->wlr_xdg_shell_ptr->events.new_surface,
-        &xdg_shell_ptr->new_surface_listener,
-        handle_new_surface);
-#endif // WLR_VERSION_NUM >= (18 << 8)
     wlmtk_util_connect_listener_signal(
         &xdg_shell_ptr->wlr_xdg_shell_ptr->events.destroy,
         &xdg_shell_ptr->destroy_listener,
@@ -94,12 +81,8 @@ wlmaker_xdg_shell_t *wlmaker_xdg_shell_create(wlmaker_server_t *server_ptr)
 void wlmaker_xdg_shell_destroy(wlmaker_xdg_shell_t *xdg_shell_ptr)
 {
     wl_list_remove(&xdg_shell_ptr->destroy_listener.link);
-#if WLR_VERSION_NUM >= (18 << 8)
     wl_list_remove(&xdg_shell_ptr->new_popup_listener.link);
     wl_list_remove(&xdg_shell_ptr->new_toplevel_listener.link);
-#else // WLR_VERSION_NUM >= (18 << 8)
-    wl_list_remove(&xdg_shell_ptr->new_surface_listener.link);
-#endif // WLR_VERSION_NUM >= (18 << 8)
     // Note: xdg_shell_ptr->wlr_xdg_shell_ptr is destroyed when the display
     // is destroyed.
     free(xdg_shell_ptr);
@@ -123,7 +106,6 @@ void handle_destroy(struct wl_listener *listener_ptr,
     wlmaker_xdg_shell_destroy(xdg_shell_ptr);
 }
 
-#if WLR_VERSION_NUM >= (18 << 8)
 /* ------------------------------------------------------------------------- */
 /**
  * Event handler for the `new_toplevel` signal raised by `wlr_xdg_shell`.
@@ -167,43 +149,4 @@ void handle_new_popup(struct wl_listener *listener_ptr,
     }
 }
 
-#else // WLR_VERSION_NUM >= (18 << 8)
-
-/* ------------------------------------------------------------------------- */
-/**
- * Event handler for the `new_surface` signal raised by `wlr_xdg_shell`.
-  *
-  * @param listener_ptr
-  * @param data_ptr
-  */
-void handle_new_surface(struct wl_listener *listener_ptr,
-                        void *data_ptr)
-{
-    struct wlr_xdg_surface *wlr_xdg_surface_ptr;
-    wlmaker_xdg_shell_t *xdg_shell_ptr = BS_CONTAINER_OF(
-        listener_ptr, wlmaker_xdg_shell_t, new_surface_listener);
-    wlr_xdg_surface_ptr = data_ptr;
-
-    switch (wlr_xdg_surface_ptr->role) {
-    case WLR_XDG_SURFACE_ROLE_POPUP:
-        // We're dealing with popups separately -- via the `new_popup` signal
-        // from the `wlr_xdg_surface` for popups as children of XDG shell
-        // surfaces, respectively the `new_popup` signal of the
-        // `wlr_scene_layer_surface` for popups of the WLR layer surface.
-        break;
-
-    case WLR_XDG_SURFACE_ROLE_TOPLEVEL:;
-        wlmtk_window_t *window_ptr = wlmtk_window_create_from_xdg_toplevel(
-            wlr_xdg_surface_ptr->toplevel, xdg_shell_ptr->server_ptr);
-        bs_log(BS_INFO, "XDG shell: Toolkit window %p for surface %p",
-               window_ptr, wlr_xdg_surface_ptr);
-        break;
-
-    default:
-        bs_log(BS_ERROR, "Unhandled role: %d", wlr_xdg_surface_ptr->role);
-    }
-}
-
-#endif // WLR_VERSION_NUM >= (18 << 8)
-
 /* == End of xdg_shell.c =================================================== */

src/xdg_shell.c

@@ -248,11 +248,7 @@ xdg_toplevel_surface_t *xdg_toplevel_surface_create(
         &xdg_tl_surface_ptr->super_content.client.gid);
 
     wlmtk_util_connect_listener_signal(
-#if WLR_VERSION_NUM >= (18 << 8)
         &wlr_xdg_toplevel_ptr->events.destroy,
-#else // WLR_VERSION_NUM >= (18 << 8)
-        &wlr_xdg_toplevel_ptr->base->events.destroy,
-#endif // WLR_VERSION_NUM >= (18 << 8)
         &xdg_tl_surface_ptr->destroy_listener,
         handle_destroy);
     wlmtk_util_connect_listener_signal(
@@ -598,8 +594,13 @@ void handle_toplevel_request_maximize(
     // Protocol expects an `ack_configure`. Depending on current state, that
     // may not have been sent throught @ref wlmtk_window_request_maximized,
     // hence adding an explicit `ack_configure` here.
-    wlr_xdg_surface_schedule_configure(
-        xdg_tl_surface_ptr->wlr_xdg_toplevel_ptr->base);
+    // TODO(kaeser@gubbe.ch): Setting the mode expects the surface to have been
+    // committed already. Need to implement server-side state tracking and
+    // applying these modes downstream after first commit.
+    if (xdg_tl_surface_ptr->wlr_xdg_toplevel_ptr->base->initialized) {
+        wlr_xdg_surface_schedule_configure(
+            xdg_tl_surface_ptr->wlr_xdg_toplevel_ptr->base);
+    }
 }
 
 /* ------------------------------------------------------------------------- */