From 11d404930d14f5ebf9a9f635b22ddc8f1d79e41e Mon Sep 17 00:00:00 2001 From: Wintego <17454585+Wintego@users.noreply.github.com> Date: Thu, 5 Nov 2026 08:31:30 +0300 Subject: [PATCH] Default the game resolution to the display's shape --- runtime/cfg.c | 38 ++++++++++++++++++++++++++++++++++++- runtime/platform/linux.c | 6 ++++++ runtime/platform/platform.h | 1 + runtime/platform/win32.c | 8 ++++++++ totk.ini.example | 4 +++- 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/runtime/cfg.c b/runtime/cfg.c index 2921dd08..4979fc99 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -7,6 +7,7 @@ // cfg_get handed out stays valid) and cfg_save writes only the changed keys back, keeping the rest of the file. // Readers take no lock: an entry is complete before n_entries counts it, and value pointers are swapped atomically. #include +#include #include #include #include @@ -327,9 +328,43 @@ static const char *raw_get(const char *name) { return NULL; } +// ---- the screen's shape (desktop): a primary display of another shape than 16:9 gives output_res a default of that +// shape while neither the environment nor totk.ini sets it, so the first start fills the screen instead of a 16:9 +// picture between black bars. The sizes are the ones the installer lays the HUD out for (installer/steps.py +// ASPECT_SIZES, ui/menu.cpp row_output_res): of the display's shape within 1%, the smallest at least 1080 high that fits +// the display, else the largest that fits. A 16:9 display, an unknown one or one of another shape keeps 1920x1080. +static const unsigned SHAPED[][2] = { + {2560, 1080}, {3440, 1440}, {3840, 1600}, {5120, 2160}, // 21:9 + {3840, 1080}, {5120, 1440}, // 32:9 + {1280, 800}, {1680, 1050}, {1920, 1200}, {2560, 1600}, // 16:10 + {1920, 1280}, {2160, 1440}, {2256, 1504}, {2880, 1920}, {3000, 2000}, // 3:2 +}; +static char screen_res[16]; // set once by cfg_init, "" for none + +static void screen_default(void) { + int sw, sh; + if (!plat_screen_size(&sw, &sh)) return; + double r = (double)sw / sh; + if (fabs(r / (16.0 / 9.0) - 1) <= 0.01) return; + int best = -1, fit = -1; + for (int i = 0; i < (int)(sizeof SHAPED / sizeof *SHAPED); i++) { + unsigned w = SHAPED[i][0], h = SHAPED[i][1]; + if (fabs((double)w / h / r - 1) > 0.01 || w > (unsigned)sw || h > (unsigned)sh) continue; + if (fit < 0 || w > SHAPED[fit][0]) fit = i; // the largest that fits + if (h >= 1080 && (best < 0 || w < SHAPED[best][0])) best = i; + } + if (best < 0) best = fit; + if (best < 0) return; + snprintf(screen_res, sizeof screen_res, "%ux%u", SHAPED[best][0], SHAPED[best][1]); + if (!raw_get(PREFIX "OUTPUT_RES")) + rt_log("cfg: the display is %dx%d: output_res defaults to %s, its shape (totk.ini output_res sets another)", sw, + sh, screen_res); +} + const char *cfg_get(const char *name) { const char *v = raw_get(name); - if (v || strncmp(name, PREFIX, PREFIX_LEN) || !profile_of()) return v; + if (v || strncmp(name, PREFIX, PREFIX_LEN)) return v; + if (!profile_of()) return screen_res[0] && !strcasecmp(name + PREFIX_LEN, "OUTPUT_RES") ? screen_res : NULL; for (size_t i = 0; i < sizeof DECK / sizeof *DECK; i++) if (!strcasecmp(DECK[i].key, name + PREFIX_LEN)) return DECK[i].value; return NULL; @@ -704,6 +739,7 @@ static void load_ini(void) { void cfg_init(void) { load_ini(); + if (!profile_of()) screen_default(); if (profile_of()) rt_log("cfg: device profile Steam Deck: defaults for the keys totk.ini does not set (TOTK_DEVICE_PROFILE=desktop " "turns it off)"); diff --git a/runtime/platform/linux.c b/runtime/platform/linux.c index 1c29cdde..3b07d9ce 100644 --- a/runtime/platform/linux.c +++ b/runtime/platform/linux.c @@ -993,6 +993,12 @@ int plat_mem_read(uint64_t addr, void *out, size_t n) { return process_vm_readv(getpid(), &local, 1, &remote, 1, 0) == (ssize_t)n; } +// Not known before the SDL window exists; the Steam Deck has its own profile (cfg.c) +int plat_screen_size(int *w, int *h) { + (void)w, (void)h; + return 0; +} + int plat_mem_readable(uint64_t addr, uint64_t n) { uint8_t b; uint64_t end = addr + (n ? n : 1); diff --git a/runtime/platform/platform.h b/runtime/platform/platform.h index af20ec68..d13eda95 100644 --- a/runtime/platform/platform.h +++ b/runtime/platform/platform.h @@ -240,6 +240,7 @@ typedef struct { } PlatCrash; void plat_crash_hook(void (*fn)(const PlatCrash *c)); int plat_mem_read(uint64_t addr, void *out, size_t n); // copies n bytes, 0 instead of faulting on unmapped memory +int plat_screen_size(int *w, int *h); // the primary display's current mode in pixels; 0 unknown int plat_mem_readable(uint64_t addr, uint64_t n); // every page of [addr, addr + n) can be read; no fault void *plat_aligned_alloc(size_t size, size_t align); // free with plat_aligned_free; NULL on failure void plat_aligned_free(void *p); diff --git a/runtime/platform/win32.c b/runtime/platform/win32.c index e986adfe..aee2e3dc 100644 --- a/runtime/platform/win32.c +++ b/runtime/platform/win32.c @@ -775,6 +775,14 @@ int plat_mem_read(uint64_t addr, void *out, size_t n) { return ReadProcessMemory(GetCurrentProcess(), (const void *)(uintptr_t)addr, out, n, &got) && got == n; } +// The display mode's own size: physical pixels whatever the process's DPI awareness and the display scale +int plat_screen_size(int *w, int *h) { + DEVMODEW dm = {.dmSize = sizeof dm}; + if (!EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm) || !dm.dmPelsWidth || !dm.dmPelsHeight) return 0; + *w = (int)dm.dmPelsWidth, *h = (int)dm.dmPelsHeight; + return 1; +} + int plat_mem_readable(uint64_t addr, uint64_t n) { for (uint64_t a = addr, end = addr + n; a < end || a == addr;) { MEMORY_BASIC_INFORMATION mbi; diff --git a/totk.ini.example b/totk.ini.example index bad5072c..6c2bb55a 100644 --- a/totk.ini.example +++ b/totk.ini.example @@ -144,7 +144,9 @@ # (32:9), 1280x800, 1680x1050, 1920x1200, 2560x1600 (16:10), 1920x1280, 2160x1440, 2256x1504, 2880x1920 and 3000x2000 # (3:2). Any other size # gets the camera's view but a 16:9 HUD, stretched over the picture, unless you build its layout with -# tools/make_romfs_patches.py --aspect WxH. Read at start. +# tools/make_romfs_patches.py --aspect WxH. Read at start. Default: 1920x1080, or on a primary display of one of those +# shapes the smallest of its sizes at least 1080 high that fits the display (1920x1280 on a 3:2 laptop, 2560x1080 on +# a 21:9 monitor), so the picture fills the screen without black bars. # output_res = 1920x1080 # 3D render scale: the scene's size relative to the game resolution, game (5/6, the game's own 1600x900 at 1080p) or # a percentage (25 to 400, at most 4096 pixels a side); above 100 supersamples the scene (anti-aliasing). Read at start.