Screenshare: auto-pick game window, remember Vesktop stream audio

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
rope 2026-10-12 20:00:48 +01:00
parent 414b892d60
commit e6120f821a
3 changed files with 100 additions and 8 deletions

View file

@ -6,7 +6,11 @@
mangohud mangohud
gamescope gamescope
spotify spotify
vesktop # Preselect the last stream's audio source (e.g. Hearthstone) when it's
# running again, instead of resetting to "None" every Go Live.
(vesktop.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ../patches/vesktop-remember-stream-audio.patch ];
}))
lsfg-vk lsfg-vk
lsfg-vk-ui lsfg-vk-ui
faugus-launcher faugus-launcher

View file

@ -0,0 +1,67 @@
--- a/src/renderer/components/ScreenSharePicker.tsx
+++ b/src/renderer/components/ScreenSharePicker.tsx
@@ -31,7 +31,14 @@
useForceUpdater
} from "@vencord/types/utils";
import { onceReady } from "@vencord/types/webpack";
-import { FluxDispatcher, MediaEngineStore, Select, UserStore, useState } from "@vencord/types/webpack/common";
+import {
+ FluxDispatcher,
+ MediaEngineStore,
+ Select,
+ useEffect,
+ UserStore,
+ useState
+} from "@vencord/types/webpack/common";
import { Node } from "@vencord/venmic";
import type { Dispatch, SetStateAction } from "react";
import { addPatch } from "renderer/patches/shared";
@@ -590,6 +597,21 @@
const hasPipewirePulse = sources.ok ? sources.hasPipewirePulse : true;
const [ignorePulseWarning, setIgnorePulseWarning] = useState(false);
+ // Once the first source list arrives, preselect whichever of the last
+ // stream's audio sources are running again (e.g. the same game).
+ const [restored, setRestored] = useState(false);
+ useEffect(() => {
+ if (restored || loading || !sources.ok) return;
+ setRestored(true);
+
+ const last = State.store.screenshareAudio;
+ if (includeSources !== "None" || !last || last === "None") return;
+ if (last === "Entire System") return setIncludeSources(last);
+
+ const running = last.filter(l => sources.targets.some(t => hasMatchingProps(l, t)));
+ if (running.length) setIncludeSources(running);
+ }, [loading]);
+
if (!sources.ok && sources.isGlibCxxOutdated) {
return (
<Paragraph>
@@ -746,6 +768,7 @@
disabled={!selected}
onClick={() => {
currentSettings = settings;
+ if (isLinux) State.store.screenshareAudio = settings.includeSources;
try {
const frameRate = Number(qualitySettings.frameRate);
const height = Number(qualitySettings.resolution);
--- a/src/renderer/settings.ts
+++ b/src/renderer/settings.ts
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+import type { Node } from "@vencord/venmic";
import { useEffect, useReducer } from "@vencord/types/webpack/common";
import { SettingsStore } from "shared/utils/SettingsStore";
@@ -37,6 +38,8 @@
resolution: string;
frameRate: string;
};
+ // audio sources picked for the last stream, preselected when running again
+ screenshareAudio?: "None" | "Entire System" | Node[];
}
const stateKey = "VesktopState";

View file

@ -108,15 +108,36 @@ in
# separate hyprpaper daemon. # separate hyprpaper daemon.
stylix.targets.hyprpaper.enable = false; stylix.targets.hyprpaper.enable = false;
# Screenshare picker: auto-allow restore tokens (the "allow a restore # Screenshare picker. allow_token_by_default pre-ticks the "allow a
# token" checkbox) so Vesktop/Discord gets a token on the first pick # restore token" box so Vesktop/Discord isn't re-prompted. The custom
# instead of re-prompting. XDPH parses "[SELECTION]<flags>/..." from the # picker skips the dialog when a game is open: XDPH hands it the window
# picker's stdout; flag 'r' = token allowed, so inject it always. # list as id[HC>]class[HT>]title[HE>]address[HA>]… and reads back
# "[SELECTION]<flags>/window:<id>" (flag r = token allowed). Hearthstone
# wins, else any other Proton window (steam_app_*) that isn't a launcher
# or HDT. Escape hatch: share again within 30s (cancel, retry) and the
# normal picker shows.
xdg.configFile."hypr/xdph.conf".text = '' xdg.configFile."hypr/xdph.conf".text = ''
screencopy { screencopy {
custom_picker_binary = ${pkgs.writeShellScript "share-picker-auto-restore" '' allow_token_by_default = true
${pkgs.xdg-desktop-portal-hyprland}/bin/hyprland-share-picker "$@" \ custom_picker_binary = ${pkgs.writeShellScript "share-picker-game-first" ''
| ${pkgs.gnused}/bin/sed 's/^\[SELECTION\]/[SELECTION]r/' stamp="''${XDG_RUNTIME_DIR:-/tmp}/xdph-autopick"
printf -v now '%(%s)T' -1
read -r last 2>/dev/null < "$stamp" || last=0
game=$(printf '%s' "''${XDPH_WINDOW_SHARING_LIST-}" | ${pkgs.gawk}/bin/awk '
BEGIN { RS = "\\[HA>\\]"; FS = "\\[H[CTE]>\\]" }
$2 ~ /^steam_app_/ && $3 == "Hearthstone" { hs = $1 }
$2 ~ /^steam_app_/ && $3 != "" && !other \
&& $3 !~ /^(Battle\.net|Hearthstone Deck Tracker|HearthstoneOverlay)/ { other = $1 }
END { print hs != "" ? hs : other }')
if [ -n "$game" ] && (( now - last > 30 )); then
echo "$now" > "$stamp"
echo "[SELECTION]r/window:$game"
exit 0
fi
echo 0 > "$stamp"
exec ${pkgs.xdg-desktop-portal-hyprland}/bin/hyprland-share-picker "$@"
''} ''}
} }
''; '';