SteamOS: add controller support, improved splash

This commit is contained in:
AAGaming 2023-10-27 22:12:58 -04:00
parent 4f8270ffd6
commit 4ed4797600
No known key found for this signature in database
GPG key ID: 00CFCD925A3E0C50
5 changed files with 120 additions and 10 deletions

View file

@ -16,6 +16,7 @@ import {
} from "electron"; } from "electron";
import { rm } from "fs/promises"; import { rm } from "fs/promises";
import { join } from "path"; import { join } from "path";
import { MessageBoxChoice } from "shared/browserWinProperties";
import { IpcEvents } from "shared/IpcEvents"; import { IpcEvents } from "shared/IpcEvents";
import { isTruthy } from "shared/utils/guards"; import { isTruthy } from "shared/utils/guards";
import { once } from "shared/utils/once"; import { once } from "shared/utils/once";
@ -36,11 +37,14 @@ import {
import { Settings, VencordSettings } from "./settings"; import { Settings, VencordSettings } from "./settings";
import { createSplashWindow } from "./splash"; import { createSplashWindow } from "./splash";
import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally"; import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader"; import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader";
let isQuitting = false; let isQuitting = false;
let tray: Tray; let tray: Tray;
applyDeckKeyboardFix();
app.on("before-quit", () => { app.on("before-quit", () => {
isQuitting = true; isQuitting = true;
}); });
@ -128,11 +132,6 @@ function initTray(win: BrowserWindow) {
}); });
} }
const enum MessageBoxChoice {
Default,
Cancel
}
async function clearData(win: BrowserWindow) { async function clearData(win: BrowserWindow) {
const { response } = await dialog.showMessageBox(win, { const { response } = await dialog.showMessageBox(win, {
message: "Are you sure you want to reset Vesktop?", message: "Are you sure you want to reset Vesktop?",
@ -266,6 +265,9 @@ function initMenuBar(win: BrowserWindow) {
} }
function getWindowBoundsOptions(): BrowserWindowConstructorOptions { function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
// We want the default window behaivour to apply in game mode since it expects everything to be fullscreen and maximized.
if (isDeckGameMode) return {};
const { x, y, width, height } = Settings.store.windowBounds ?? {}; const { x, y, width, height } = Settings.store.windowBounds ?? {};
const options = { const options = {
@ -405,7 +407,7 @@ function createMainWindow() {
win.setMenuBarVisibility(false); win.setMenuBarVisibility(false);
win.on("close", e => { win.on("close", e => {
const useTray = Settings.store.minimizeToTray !== false && Settings.store.tray !== false; const useTray = !isDeckGameMode && Settings.store.minimizeToTray !== false && Settings.store.tray !== false;
if (isQuitting || (process.platform !== "darwin" && !useTray)) return; if (isQuitting || (process.platform !== "darwin" && !useTray)) return;
e.preventDefault(); e.preventDefault();
@ -419,7 +421,7 @@ function createMainWindow() {
if (Settings.store.staticTitle) win.on("page-title-updated", e => e.preventDefault()); if (Settings.store.staticTitle) win.on("page-title-updated", e => e.preventDefault());
initWindowBoundsListeners(win); initWindowBoundsListeners(win);
if ((Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win); if (!isDeckGameMode && (Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win);
initMenuBar(win); initMenuBar(win);
makeLinksOpenExternally(win); makeLinksOpenExternally(win);
initSettingsListeners(win); initSettingsListeners(win);
@ -441,19 +443,27 @@ const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDeskto
export async function createWindows() { export async function createWindows() {
const splash = createSplashWindow(); const splash = createSplashWindow();
// SteamOS letterboxes and scales it terribly, so just full screen it
if (isDeckGameMode) splash.setFullScreen(true);
await ensureVencordFiles(); await ensureVencordFiles();
runVencordMain(); runVencordMain();
mainWin = createMainWindow(); mainWin = createMainWindow();
mainWin.once("ready-to-show", () => { mainWin.webContents.on("did-finish-load", () => {
splash.destroy(); splash.destroy();
mainWin!.show(); mainWin!.show();
if (Settings.store.maximized) { if (Settings.store.maximized && !isDeckGameMode) {
mainWin!.maximize(); mainWin!.maximize();
} }
if (isDeckGameMode) {
// always use entire display
mainWin!.setFullScreen(true);
askToApplySteamLayout(mainWin);
}
}); });
initArRPC(); initArRPC();

9
src/main/utils/sleep.ts Normal file
View file

@ -0,0 +1,9 @@
/*
* SPDX-License-Identifier: GPL-3.0
* Vesktop, a desktop app aiming to give you a snappier Discord Experience
* Copyright (c) 2023 Vendicated and Vencord contributors
*/
export function sleep(ms: number): Promise<void> {
return new Promise(r => setTimeout(r, ms));
}

84
src/main/utils/steamOS.ts Normal file
View file

@ -0,0 +1,84 @@
/*
* SPDX-License-Identifier: GPL-3.0
* Vesktop, a desktop app aiming to give you a snappier Discord Experience
* Copyright (c) 2023 Vendicated and Vencord contributors
*/
import { exec as callbackExec } from "child_process";
import { BrowserWindow, dialog } from "electron";
import { MessageBoxChoice } from "shared/browserWinProperties";
import { promisify } from "util";
import { Settings } from "../settings";
import { sleep } from "./sleep";
const exec = promisify(callbackExec);
// Bump this to re-show the prompt
const layoutVersion = 1;
// Get this from "show details" on the profile after exporting as a shared personal layout or using share with community
const layoutId = "3063409873"; // Vesktop Layout v1
const numberRegex = /^[0-9]*$/;
export const isDeckGameMode = Boolean(process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1");
export function applyDeckKeyboardFix() {
if (!isDeckGameMode) return;
// Prevent constant virtual keyboard spam that eventually crashes Steam.
process.env.GTK_IM_MODULE = "None";
}
// For some reason SteamAppId is always 0 for non-steam apps so we do this insanity instead.
function getAppId(): string | null {
// /home/deck/.local/share/Steam/steamapps/shadercache/APPID/fozmediav1
const path = process.env.STEAM_COMPAT_MEDIA_PATH;
if (!path) return null;
const pathElems = path?.split("/");
const appId = pathElems[pathElems.length - 2];
if (appId.match(numberRegex)) {
console.log(`Got Steam App ID ${appId}`);
return appId;
}
return null;
}
async function execSteamURL(url: string): Promise<void> {
await exec(`steam -ifrunning ${url}`);
}
async function showLayout(appId: string) {
await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
// because the UI doesn't consistently reload after the data for the config has loaded...
// HOW HAS NOBODY AT VALVE RUN INTO THIS YET
await sleep(300);
await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
}
export async function askToApplySteamLayout(win: BrowserWindow) {
const appId = getAppId();
if (!appId) return;
if (Settings.store.steamOSLayoutVersion === layoutVersion) return;
const update = Boolean(Settings.store.steamOSLayoutVersion);
// Touch screen breaks in some menus when native touch mode is enabled on latest SteamOS beta, remove most of the update specific text once that's fixed.
const { response } = await dialog.showMessageBox(win, {
message: `${update ? "Update" : "Apply"} Vesktop Steam Input Layout?`,
detail: `Would you like to ${update ? "Update" : "Apply"} Vesktop's recommended Steam Deck controller settings?
${update ? "Click yes using the touchpad" : "Tap yes"}, then press the X button or tap Apply Layout to confirm.${
update ? " Doing so will undo any customizations you have made." : ""
}
${update ? "Click" : "Tap"} no to keep your current layout.`,
buttons: ["Yes", "No"],
cancelId: MessageBoxChoice.Cancel,
defaultId: MessageBoxChoice.Default,
type: "question"
});
if (Settings.store.steamOSLayoutVersion !== layoutVersion) {
Settings.store.steamOSLayoutVersion = layoutVersion;
}
if (response === MessageBoxChoice.Cancel) return;
await showLayout(appId);
}

View file

@ -16,3 +16,8 @@ export const SplashProps: BrowserWindowConstructorOptions = {
maximizable: false, maximizable: false,
alwaysOnTop: true alwaysOnTop: true
}; };
export const enum MessageBoxChoice {
Default,
Cancel
}

View file

@ -31,4 +31,6 @@ export interface Settings {
splashTheming?: boolean; splashTheming?: boolean;
splashColor?: string; splashColor?: string;
splashBackground?: string; splashBackground?: string;
steamOSLayoutVersion?: number;
} }