feat(app): feed wayland surface contents to the headless output
- commit
- f8066e5d09e27e9a0313de284aa4bca2585c95ec
- author
- brice · · 2026-09-23 15:28 UTC
- parent
- 077af26
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
1 file · +1 -2
M internal/app/app.go +1 -2
| @@ -52,7 +52,6 @@ func run(ctx context.Context, opts Options, inject func(chan<- ports.InputEvent) | |||
| 52 | 52 | configErrors := make(chan error, 8) | |
| 53 | 53 | renderScenes := make(chan ports.Scene, 1) | |
| 54 | 54 | contents := make(chan ports.SurfaceContent, 64) | |
| 55 | - | // TODO(merge): wire wayland Contents to contents. | |
| 56 | 55 | ch := core.Channels{Client: client, Input: input, Output: output, Config: config, Commands: commands, Spawn: spawn, Scenes: scenes, ConfigErrors: configErrors} | |
| 57 | 56 | c, err := core.New(opts.Config, ch) | |
| 58 | 57 | if err != nil { | |
| @@ -60,7 +59,7 @@ func run(ctx context.Context, opts Options, inject func(chan<- ports.InputEvent) | |||
| 60 | 59 | } | |
| 61 | 60 | output <- ports.OutputMode{Width: 1920, Height: 1080} | |
| 62 | 61 | runtimeDir := os.Getenv("XDG_RUNTIME_DIR") | |
| 63 | - | server, err := wayland.New(wayland.Options{RuntimeDir: runtimeDir, OutputWidth: 1920, OutputHeight: 1080}, wayland.Channels{Events: client, Commands: commands}, logging.For(ctx, "wayland")) | |
| 62 | + | server, err := wayland.New(wayland.Options{RuntimeDir: runtimeDir, OutputWidth: 1920, OutputHeight: 1080}, wayland.Channels{Events: client, Commands: commands, Contents: contents}, logging.For(ctx, "wayland")) | |
| 64 | 63 | if err != nil { | |
| 65 | 64 | return err | |
| 66 | 65 | } | |
| @@ -52,7 +52,6 @@ func run(ctx context.Context, opts Options, inject func(chan<- ports.InputEvent) | |||||
| 52 | configErrors := make(chan error, 8) | 52 | configErrors := make(chan error, 8) | ||
| 53 | renderScenes := make(chan ports.Scene, 1) | 53 | renderScenes := make(chan ports.Scene, 1) | ||
| 54 | contents := make(chan ports.SurfaceContent, 64) | 54 | contents := make(chan ports.SurfaceContent, 64) | ||
| 55 | - | // TODO(merge): wire wayland Contents to contents. | |||
| 56 | ch := core.Channels{Client: client, Input: input, Output: output, Config: config, Commands: commands, Spawn: spawn, Scenes: scenes, ConfigErrors: configErrors} | 55 | ch := core.Channels{Client: client, Input: input, Output: output, Config: config, Commands: commands, Spawn: spawn, Scenes: scenes, ConfigErrors: configErrors} | ||
| 57 | c, err := core.New(opts.Config, ch) | 56 | c, err := core.New(opts.Config, ch) | ||
| 58 | if err != nil { | 57 | if err != nil { | ||
| @@ -60,7 +59,7 @@ func run(ctx context.Context, opts Options, inject func(chan<- ports.InputEvent) | |||||
| 60 | } | 59 | } | ||
| 61 | output <- ports.OutputMode{Width: 1920, Height: 1080} | 60 | output <- ports.OutputMode{Width: 1920, Height: 1080} | ||
| 62 | runtimeDir := os.Getenv("XDG_RUNTIME_DIR") | 61 | runtimeDir := os.Getenv("XDG_RUNTIME_DIR") | ||
| 63 | - | server, err := wayland.New(wayland.Options{RuntimeDir: runtimeDir, OutputWidth: 1920, OutputHeight: 1080}, wayland.Channels{Events: client, Commands: commands}, logging.For(ctx, "wayland")) | 62 | + | server, err := wayland.New(wayland.Options{RuntimeDir: runtimeDir, OutputWidth: 1920, OutputHeight: 1080}, wayland.Channels{Events: client, Commands: commands, Contents: contents}, logging.For(ctx, "wayland")) |
| 64 | if err != nil { | 63 | if err != nil { | ||
| 65 | return err | 64 | return err | ||
| 66 | } | 65 | } | ||