Commit Graph
22 Commits
Author SHA1 Message Date
Xuc Pan d5db0ebdf3 fix(portal): bound pending input across capture recovery 2026-11-09 23:26:21 +08:00
Xuc Pan eb862b5529 fix(audio): select the managed default capture source explicitly 2026-11-09 23:26:21 +08:00
falcon-jin 98af6fce28 feat(capture): support consented multi-monitor desktops with recovery (#32) 2026-11-09 23:26:07 +08:00
喵喵机 6d0e733cd7 fix(input): preserve keyboard modifiers while preventing forged lock keys (#34) 2026-11-09 23:25:07 +08:00
Xuc Pan f02dcdd8c0 fix(session): monitor Windows lifetime without repeated Wine startups
Keep process observations in the resident session marker and bound utility pipe reads. Reap managed-prefix Wine workers through pidfds, including WebView2 thread groups whose leaders already exited.
2026-10-18 01:31:34 +08:00
迢辰andXuc Pan a5e2aa44cd fix(capture): map the DMA-BUF frames niri actually sends (#26)
* fix(capture): map the DMA-BUF frames niri actually sends

`uur run` reported "No Wayland frames arrived within 120 seconds" on a
session where the portal handshake succeeded. The session log showed the
stream never leaving negotiation:

    portal session ready (video node 73)
    stream state: connecting
    stream state: paused
    stream state: error - no more input formats
    stream state: unconnected

Three separate defects in `uur-pw-capture`:

1. The format filter omitted `modifier`. niri marks that property
   MANDATORY (SPA flags 0x18), and SPA filtering fails unless both sides
   carry a mandatory property -- which surfaces as "no more input
   formats". The filter now advertises LINEAR, the layout the frame
   protocol already assumes.

2. `on_process` only handled `data != NULL` and `SPA_DATA_MemFd`. niri
   delivers SPA_DATA_DmaBuf planes, which carry an fd and no pointer, so
   every frame was dropped in silence. Since the session negotiates
   LINEAR, that fd is directly mappable without GBM/EGL; the helper now
   mmaps it. A non-linear modifier is refused instead of publishing
   garbage.

3. DMA-BUF producers leave `chunk->size` and `maxsize` at 1. Both the
   mapping length and the row count were derived from those, so the mmap
   covered one byte and `rows` came out zero -- publishing an all-black
   frame. Both now use the negotiated stride and height.

Verified on niri 26.04 with Wine 11.19: the stream reaches `streaming`,
~60 fps (1195 frames in 20 s), and the published frame decodes to the
real desktop rather than black.

* fix(capture): validate DMA-BUFs and recover interrupted screen streams

Use immutable transport files across geometry changes and remap Wine readers safely. Bound stream recovery and preserve portal stop-sharing intent. Refs #29.

* fix(capture): watch Mutter layout changes and support older build headers

* fix(capture): keep display changes outside the failure retry budget

* fix(capture): honor portal stop signals during GNOME recovery

Subscribe before starting on the portal-owned D-Bus connection and accept the real Session.Closed dictionary body. Correlate Mutter's close-before-MonitorsChanged ordering without restarting an explicit Stop Sharing session.

Verified in a private GNOME 51.1 namespace with real GBM DMA-BUF, 100/125 percent scaling, portrait and landscape, and native Stop Sharing. Existing 48 tests and strict clippy pass. Real Wine GDI reader captured 120 final-run frames across four layout changes with no hook fallbacks. No test scripts added.

---------

Co-authored-by: Xuc Pan <[email protected]>
2026-10-15 16:57:34 +08:00
迢辰andXuc Pan 306489d8ad fix(capture): choose a cursor mode the portal advertises (#25)
* fix(capture): choose a cursor mode the portal advertises

`uur run` on a Wayland session aborted during capture negotiation:

    Error: Portal request didn't succeed: Other
    Error: ZBus Error: org.freedesktop.portal.Error.InvalidArgument:
           Unavailable cursor mode 2

`negotiate` hardcoded `CursorMode::Embedded` (2). The portal frontend
validates that against the backend's `AvailableCursorModes` and rejects
anything outside it, so any backend that does not offer Embedded could
never start a session. A frontend whose backend property cache is empty
reports `AvailableCursorModes = 0` and then rejects every mode, which is
what made this fail even on backends that do support Embedded: restarting
`xdg-desktop-portal` restored the flags from 0 to 7 and mode 2 was
accepted again.

`preferred_cursor_mode` now reads the advertised flags and picks Embedded,
then Hidden, then Metadata. If none are advertised it fails with an
actionable message naming the portal restart, instead of surfacing a raw
D-Bus error. Older portals that do not implement the v2 property keep the
previous behaviour.

The same hardcoded mode in the RemoteDesktop input path is routed through
the shared helper.

Adds four tests: preference order, subset fallback, the empty-advertisement
regression, and source-type mapping.

* fix(capture): preserve portal errors and report cursor fallback

---------

Co-authored-by: Xuc Pan <[email protected]>
2026-10-15 14:44:04 +08:00
迢辰andXuc Pan bfecaa5c69 fix(wine): select the client root that actually holds bin/ (#24)
* fix(wine): select the client root that actually holds bin/

`uur run` aborted with "WebView2 bootstrapper missing from the client
directory" on a complete install.

`find_client_dir` searched depth-first for `GameViewerServer.exe` and
returned the first hit, special-casing only a parent named `bin`. NetEase
ships the payload twice: as `<root>/bin/` and as a sibling
`<root>/<version>/`. When readdir order reached `<root>/<version>/` first,
that directory was returned as the client root. It has no `bin/`
subdirectory, so every `join("bin")` lookup missed -- the WebView2
bootstrapper and the terminal proxies -- and the session bailed out.
`deploy_terminal_proxy` then created a spurious `bin/` inside the version
directory and wrote proxies into it.

Now every directory holding `GameViewer.exe` is collected and ranked:
`bin/GameViewerServer.exe` scores highest because that is the layout uur
drives, then `bin/MicrosoftEdgeWebview2Setup.exe`, then a top-level
server. Ties break on path depth, then lexically, so the choice no longer
depends on readdir order. A versioned copy is still used when it is the
only candidate.

Adds four tests covering both layouts, readdir stability, and the
fallback.

* fix(wine): require complete payloads and support flat client layouts

---------

Co-authored-by: Xuc Pan <[email protected]>
2026-10-15 14:44:00 +08:00
迢辰andXuc Pan 1dc156739c fix(wine): make setup detect a provisioned prefix (#23)
* fix(wine): make setup detect a provisioned prefix

Two defects made `uur setup` fail on a fully installed prefix.

1. The service check matched `gameviewerserver.exe`, but the Windows
   service NetEase registers uses `GameViewerService.exe` as its
   ImagePath. `GameViewerServer.exe` is the streaming server and never
   appears in the service registration, so `client_service_registered`
   and `query_client_service` always returned false. A completed
   install was reported as "GameViewerService has no valid registered
   executable" and setup re-downloaded and re-installed every run.

   Both checks now share one `SERVICE_IMAGE` constant, and the
   `system.reg` parse is factored into a pure `service_image_path`
   helper so it is testable without a Wine prefix.

2. `wineboot --init` returns before wineserver flushes
   `system.reg`/`user.reg` to disk (measured ~7s on Wine 11), so a
   freshly created prefix was misread as uninitialized and setup
   aborted with "Wine prefix initialization failed (exit status: 0)".
   Added a bounded `flush_prefix` barrier that waits for `wineserver -w`
   to return, then polls for the registry files.

Verified on Wine 11.19: a clean install into an isolated prefix
succeeds end to end, re-running setup takes the already-provisioned
fast path, and `setup --repair` verifies without reinstalling.

* fix(wine): bound prefix readiness waits without blocking on services

---------

Co-authored-by: Xuc Pan <[email protected]>
2026-10-15 14:41:50 +08:00
Xuc Pan 8c0589021f fix: repair Wine setup and niri capture, input and tray (#22)
* fix(setup): verify provisioning and runtime readiness

* feat: add explicit per-user uninstall and purge

* fix: restore niri input and provide native capture and tray

* fix(build): declare Wayland scanner and release dependencies
2026-10-13 15:26:06 +08:00
Xuc Pan 3c78382f20 test(session): cover first deployment from readonly source 2026-10-05 23:24:53 +08:00
Xuc Pan 2833b08a37 fix(session): make prefix deployment repeatable 2026-10-05 23:19:31 +08:00
Xuc Pan 31aaab0fee fix(bridge): ignore zero virtual-key input 2026-09-30 06:59:52 +08:00
Xuc Pan 5245c9ee61 fix(desktop): improve HiDPI and exit integration 2026-09-25 03:04:51 +08:00
Xuc Pan 9f12a88a08 fix(desktop): improve HiDPI and exit integration 2026-09-25 03:04:51 +08:00
Muush 2b41541128 fix(wallpaper): resolve wpaperd relative targets from its working directory
wpaperd writes configured image paths verbatim into the state symlink, so
targets relative to its working directory dangle under symlink semantics
and link.canonicalize() fails for every output. Read /proc/<pid>/cwd where
the process is matched and resolve relative targets against it; absolute
targets keep filesystem semantics.
2026-09-24 23:14:23 +08:00
Xuc Pan d47178916f fix(wallpaper): resolve wpaperd links from link location 2026-09-24 13:13:12 +08:00
Muush 3dc3b62477 feat(wallpaper): detect wpaperd wallpapers from state links
wpaperd mirrors the current wallpaper of every output as a symlink
under $XDG_STATE_HOME/wpaperd/wallpapers, rewritten on each change.
Identify the wpaperd process in the runtime provider scan and resolve
the newest link, joining relative targets with $HOME.
2026-09-24 13:13:12 +08:00
Xuc Pan 17a09e08a5 fix(wine): use builtin DLLs for WebView2 setup 2026-09-23 09:00:41 +08:00
Xuc Pan c9cfc479dc fix(wine): prefer bundled msvcp140 for UU 4.41 2026-09-20 22:54:50 +08:00
HTwoOhwater fd2368058f fix(bridge): dispatch concurrent hook input without socket lifetime locking 2026-09-20 22:53:27 +08:00
Xuc Pan 611383544b Initial commit 2026-09-05 13:04:29 +08:00