Support Wayland output resizing

Author: chruffins

server/internal/config/desktop.go

@@ -13,8 +13,10 @@ import (
 )
 
 type Desktop struct {
-	Display string
-	Wayland bool
+	Display              string
+	Wayland              bool
+	WaylandOutput        string
+	WaylandResizeCommand string
 
 	ScreenSize types.ScreenSize
 
@@ -37,6 +39,16 @@ func (Desktop) Init(cmd *cobra.Command) error {
 		return err
 	}
 
+	cmd.PersistentFlags().String("desktop.wayland.output", "HEADLESS-1", "Wayland output name used for resizing")
+	if err := viper.BindPFlag("desktop.wayland.output", cmd.PersistentFlags().Lookup("desktop.wayland.output")); err != nil {
+		return err
+	}
+
+	cmd.PersistentFlags().String("desktop.wayland.resize_command", "wlr-randr", "Wayland output resize executable")
+	if err := viper.BindPFlag("desktop.wayland.resize_command", cmd.PersistentFlags().Lookup("desktop.wayland.resize_command")); err != nil {
+		return err
+	}
+
 	cmd.PersistentFlags().String("desktop.screen", "1280x720@30", "default screen size and framerate")
 	if err := viper.BindPFlag("desktop.screen", cmd.PersistentFlags().Lookup("desktop.screen")); err != nil {
 		return err
@@ -82,6 +94,8 @@ func (Desktop) InitV2(cmd *cobra.Command) error {
 func (s *Desktop) Set() {
 	s.Display = viper.GetString("desktop.display")
 	s.Wayland = viper.GetBool("desktop.wayland")
+	s.WaylandOutput = viper.GetString("desktop.wayland.output")
+	s.WaylandResizeCommand = viper.GetString("desktop.wayland.resize_command")
 
 	// Display is provided by env variable unless explicitly set
 	if s.Display == "" {

server/internal/desktop/wayland.go

@@ -169,6 +169,12 @@ func (input *waylandInput) sync() error {
 	return input.emit(evSyn, 0, 0)
 }
 
+func (input *waylandInput) position() (int, int) {
+	input.mu.Lock()
+	defer input.mu.Unlock()
+	return input.cursorX, input.cursorY
+}
+
 func (input *waylandInput) move(x, y int) error {
 	input.mu.Lock()
 	defer input.mu.Unlock()

server/internal/desktop/xorg.go

@@ -1,6 +1,7 @@
 package desktop
 
 import (
+	"fmt"
 	"image"
 	"os/exec"
 	"regexp"
@@ -22,7 +23,7 @@ func (manager *DesktopManagerCtx) Move(x, y int) {
 
 func (manager *DesktopManagerCtx) GetCursorPosition() (int, int) {
 	if manager.waylandInput != nil {
-		return manager.waylandInput.cursorX, manager.waylandInput.cursorY
+		return manager.waylandInput.position()
 	}
 	return xorg.GetCursorPosition()
 }
@@ -153,6 +154,14 @@ func (manager *DesktopManagerCtx) ScreenConfigurations() []types.ScreenSize {
 
 func (manager *DesktopManagerCtx) SetScreenSize(screenSize types.ScreenSize) (types.ScreenSize, error) {
 	if manager.waylandInput != nil {
+		if manager.config.WaylandResizeCommand == "" || manager.config.WaylandOutput == "" {
+			return manager.screenSize, fmt.Errorf("Wayland output resize is not configured")
+		}
+		resize := fmt.Sprintf("%dx%d", screenSize.Width, screenSize.Height)
+		if err := exec.Command(manager.config.WaylandResizeCommand, "--output", manager.config.WaylandOutput, "--mode", resize).Run(); err != nil {
+			return manager.screenSize, fmt.Errorf("resize Wayland output: %w", err)
+		}
+
 		input, err := newWaylandInput(screenSize.Width, screenSize.Height)
 		if err != nil {
 			return manager.screenSize, err

webpage/docs/configuration/desktop.md

@@ -15,11 +15,15 @@ Neko uses the [X Server](https://www.x.org/archive/X11R7.6/doc/man/man1/Xserver.
 <ConfigurationTab options={configOptions} filter={[
   'desktop.display',
   'desktop.wayland',
+  'desktop.wayland.output',
+  'desktop.wayland.resize_command',
   'desktop.screen'
 ]} comments={false} />
 
 - <Def id="display" /> refers to the X server that is running on the system. If it is not specified, the environment variable `DISPLAY` is used. The same display is referred to in the [Capture](capture#video.display) configuration to capture the screen. In most cases, we want to use the same display for both.
 - <Def id="wayland" /> disables X11 desktop initialization and injects pointer and keyboard events through a `/dev/uinput` virtual device. The container must have access to `/dev/uinput`; the compositor must accept libinput devices.
+- <Def id="wayland.output" /> is the compositor output name passed to the resize command. The default `HEADLESS-1` matches the wlroots headless backend.
+- <Def id="wayland.resize_command" /> is the executable used to resize the output. It must accept `--output <name> --mode <width>x<height>`, as `wlr-randr` does.
 - <Def id="screen" /> refers to the screen resolution and refresh rate. The format is `<width>x<height>@<refresh rate>`. If not specified, the default is `1280x720@30`.
 
 :::tip

webpage/docs/configuration/help.json

@@ -269,6 +269,26 @@
     "defaultValue": false,
     "description": "use Wayland desktop input and screen management"
   },
+  {
+    "key": [
+      "desktop",
+      "wayland",
+      "output"
+    ],
+    "type": "string",
+    "defaultValue": "HEADLESS-1",
+    "description": "Wayland output name used for resizing"
+  },
+  {
+    "key": [
+      "desktop",
+      "wayland",
+      "resize_command"
+    ],
+    "type": "string",
+    "defaultValue": "wlr-randr",
+    "description": "Wayland output resize executable"
+  },
   {
     "key": [
       "desktop",