Chase wlroots master branch up to a289f81

.github/workflows/ci.yml

@@ -16,11 +16,11 @@ jobs:
       pixman-version: "0.42.0"
       hwdata-version: "0.364"
       wayland-version: "1.22.0"
-      wayland-protocols-version: "1.31"
+      wayland-protocols-version: "1.32"
     strategy:
       fail-fast: false
       matrix:
-        wlroots-version: ["0.16.2", master]
+        wlroots-version: ["0.17.0", master]
     steps:
       - name: Install dependencies
         run: |
@@ -147,7 +147,7 @@ jobs:
           - "pypy-3.8"
           - "pypy-3.9"
           - "pypy-3.10"
-        wlroots-version: ["0.16.2"]
+        wlroots-version: ["0.17.0"]
         include:
           - python-version: "3.12"
             wlroots-version: master
@@ -262,7 +262,7 @@ jobs:
     needs: build-wayland
     env:
       python-version: "3.12"
-      wlroots-version: "0.16.2"
+      wlroots-version: "0.17.0"
     steps:
       - name: Download wayland libraries
         uses: actions/download-artifact@v3
@@ -298,7 +298,7 @@ jobs:
     needs: build-wayland
     env:
       python-version: "3.12"
-      wlroots-version: "0.16.2"
+      wlroots-version: "0.17.0"
     steps:
       - name: Download wayland libraries
         uses: actions/download-artifact@v3

.github/workflows/release.yml

@@ -13,9 +13,9 @@ jobs:
       libdrm-version: "2.4.114"
       seatd-version: "0.6.3"
       pixman-version: "0.42.0"
-      wayland-protocols-version: "1.31"
+      wayland-protocols-version: "1.32"
       wayland-version: "1.22.0"
-      wlroots-version: "0.16.2"
+      wlroots-version: "0.17.0"
     steps:
       - name: Install dependencies
         run: |

tiny/server.py

@@ -22,9 +22,11 @@
     Keyboard,
     Output,
     OutputLayout,
+    OutputState,
     Scene,
     SceneBuffer,
     SceneNodeType,
+    SceneOutput,
     SceneSurface,
     SceneTree,
     Seat,
@@ -51,6 +53,7 @@
 if TYPE_CHECKING:
     from wlroots.wlr_types import InputDevice
     from wlroots.wlr_types.keyboard import KeyboardKeyEvent, KeyboardModifiers
+    from wlroots.wlr_types.output import OutputEventRequestState
 
 _weakkeydict: WeakKeyDictionary = WeakKeyDictionary()
 
@@ -213,7 +216,7 @@ def process_cursor_motion(self, time) -> None:
         logging.debug("Processing cursor motion: %s, %s", sx, sy)
 
         if view is None:
-            self._cursor_manager.set_cursor_image("left_ptr", self._cursor)
+            self._cursor.set_xcursor(self._cursor_manager, "default")
 
         if surface is None:
             # Clear pointer focus so future button events and such are not sent
@@ -289,8 +292,8 @@ def focus_view(self, view: View, surface: Surface | None = None) -> None:
         if previous_surface is not None:
             # Deactivate the previously focused surface
             logging.info("Un-focusing previous")
-            previous_xdg_surface = XdgSurface.from_surface(previous_surface)
-            previous_xdg_surface.set_activated(False)
+            if previous_xdg_surface := XdgSurface.try_from_surface(previous_surface):
+                previous_xdg_surface.set_activated(False)
 
         view.scene_node.raise_to_top()
         # roll the given surface to the front of the list, copy and modify the
@@ -322,10 +325,12 @@ def server_new_xdg_surface(self, listener, xdg_surface: XdgSurface) -> None:
             # we must provide the proper parent scene node of the xdg popup. To
             # enable this, we always set the user data field of xdg_surfaces to
             # the corresponding scene node.
-            parent_xdg_surface = XdgSurface.from_surface(xdg_surface.popup.parent)
-            parent_scene_tree = cast(SceneTree, parent_xdg_surface.data)
-            scene_tree = Scene.xdg_surface_create(parent_scene_tree, xdg_surface)
-            xdg_surface.data = scene_tree
+            if parent_xdg_surface := XdgSurface.try_from_surface(
+                xdg_surface.popup.parent
+            ):
+                parent_scene_tree = cast(SceneTree, parent_xdg_surface.data)
+                scene_tree = Scene.xdg_surface_create(parent_scene_tree, xdg_surface)
+                xdg_surface.data = scene_tree
             return
 
         assert xdg_surface.role == XdgSurfaceRole.TOPLEVEL
@@ -344,16 +349,24 @@ def server_new_xdg_surface(self, listener, xdg_surface: XdgSurface) -> None:
     # output and frame handling callbacks
 
     def server_new_output(self, listener, output: Output) -> None:
+        SceneOutput.create(self._scene, output)
         output.init_render(self._allocator, self._renderer)
 
-        output.set_mode(output.preferred_mode())
-        output.enable()
-        output.commit()
+        state = OutputState()
+        state.set_enabled()
+        if mode := output.preferred_mode():
+            state.set_mode(mode)
+
+        output.commit_state(state)
+        state.finish()
 
         self.outputs.append(output)
-        self._output_layout.add_auto(output)
+        if not self._output_layout.add_auto(output):
+            logging.warning("Failed to add output to layout.")
+            return
 
         output.frame_event.add(Listener(self.output_frame))
+        output.request_state_event.add(Listener(self.output_request_state))
 
     def output_frame(self, listener, data) -> None:
         output = self.outputs[0]
@@ -363,6 +376,10 @@ def output_frame(self, listener, data) -> None:
         now = Timespec.get_monotonic_time()
         scene_output.send_frame_done(now)
 
+    def output_request_state(self, listener, request: OutputEventRequestState) -> None:
+        output = self.outputs[0]
+        output.commit_state(request.state)
+
     # #############################################################
     # input handling callbacks
 

tiny/view.py

@@ -31,8 +31,8 @@ def __init__(
         self.x = 0.0
         self.y = 0.0
 
-        xdg_surface.map_event.add(Listener(self.xdg_toplevel_map))
-        xdg_surface.unmap_event.add(Listener(self.xdg_toplevel_unmap))
+        xdg_surface.surface.map_event.add(Listener(self.xdg_toplevel_map))
+        xdg_surface.surface.unmap_event.add(Listener(self.xdg_toplevel_unmap))
         xdg_surface.destroy_event.add(Listener(self.xdg_toplevel_destroy))
 
         toplevel = xdg_surface.toplevel

wlroots/backend.py

@@ -32,8 +32,12 @@ def __init__(self, display: Display, *, backend_type=BackendType.AUTO) -> None:
             backends), $WAYLAND_DISPLAY (for Wayland backends), and
             $WLR_BACKENDS (to set the available backends).
         """
+        self.session: Session | None = None
+
         if backend_type == BackendType.AUTO:
-            ptr = lib.wlr_backend_autocreate(display._ptr)
+            session_ptr = ffi.new("struct wlr_session **")
+            ptr = lib.wlr_backend_autocreate(display._ptr, session_ptr)
+            self.session = Session(session_ptr[0])
         elif backend_type == BackendType.HEADLESS:
             ptr = lib.wlr_headless_backend_create(display._ptr)
         else:
@@ -93,17 +97,19 @@ def __exit__(self, exc_type, exc_value, exc_tb) -> None:
         self.destroy()
 
     def get_session(self) -> Session:
-        return Session(self)
+        if self.session is None:
+            raise ValueError("Backend does not have a session")
+        return self.session
 
     @property
     def is_headless(self) -> bool:
         return lib.wlr_backend_is_headless(self._ptr)
 
 
 class Session:
-    def __init__(self, backend: Backend) -> None:
+    def __init__(self, ptr) -> None:
         """The running session"""
-        self._ptr = lib.wlr_backend_get_session(backend._ptr)
+        self._ptr = ptr
 
     def change_vt(self, vt: int) -> bool:
         return lib.wlr_session_change_vt(self._ptr, vt)