mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
Merge upstream PC input and dual-screen updates
This commit is contained in:
commit
68b0396dfe
819 files changed
+43953
-6186
No files matched your search
@@ -52,6 +52,23 @@ environment entries and is intentionally narrower than **Reset game profile**.
|
||||
Values are literal strings, with no shell expansion; quotes are only needed when
|
||||
the consuming program expects them.
|
||||
|
||||
## Saved compatibility mappings
|
||||
|
||||
The file-backed `steam-compatibility` writer applies planned changes in a batch,
|
||||
rather than searching and copying the mapping for each game. This covers retired
|
||||
DroidDeck-Proton replacements, default/tool changes and the x86-64 client's Proton
|
||||
repointing. It does not change the planner, manual choices, native/FEX routing,
|
||||
locking or atomic file publication. Unchanged files are still not rewritten.
|
||||
|
||||
Existing entry fields and duplicate entries are preserved, with the same first-match
|
||||
updates and reverse insertion order as the single-game writer. Single changes keep
|
||||
that writer's original path. This reduces bulk configuration work, not steady-state
|
||||
game rendering cost; large-library timings depend on the device and the number of
|
||||
entries actually changed.
|
||||
|
||||
Run the batch/reference and work-budget regressions with
|
||||
`python3 -m unittest discover -s tools/tests -p test_steam_compat_mapping.py`.
|
||||
|
||||
## Game debug logs
|
||||
|
||||
Under **Setup > Diagnostics**, enable **Session logs** and **Game debug logs**
|
||||
@@ -113,6 +130,13 @@ same WSI layer, and with eight images and no frame limit it drew flat out
|
||||
(about 240 frames a second at 120 Hz) and heated the device. Values set in the
|
||||
launch options or the environment editor are kept.
|
||||
|
||||
DOOM (2016) is the exception (`DOOMx64vk.exe` beside the launched program, which
|
||||
is `DOOMx64.exe` for a GOG install). It asks for exactly two images and stops with
|
||||
`FATAL ERROR: getSwapchainImagesKHR failed with error (VK_SUCCESS)` when it gets
|
||||
more, so its fix removes both variables, also from its launch options, and sets
|
||||
`vk_x11_strict_image_count=true`, the option Mesa's driconf gives the game. A
|
||||
per-game value in the environment editor still wins.
|
||||
|
||||
## Defaults and available suggestions
|
||||
|
||||
The initial configuration enables Mesa shader caching with
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
# Game Jolt store
|
||||
|
||||
The Game Jolt Store tab mirrors the itch.io one: browse, search, game page, build picker, installs, library, collections and updates.
|
||||
|
||||
## Sign-in
|
||||
|
||||
Game Jolt shows the normal sign-in card until an account is signed in. Signing in opens
|
||||
`StoreLoginActivity` on `https://gamejolt.com/login` (`GameJoltLogin`). The flow is not a token redirect:
|
||||
Game Jolt is a single-page site, so `StoreLoginActivity.Client.doUpdateVisitedHistory` also reports
|
||||
navigations, and any gamejolt.com page outside the sign-in, sign-up and legal paths counts as signed in.
|
||||
`finish` reads the WebView cookies, asks `/web/search/games?q=a` for the top-level `user`, and stores
|
||||
the cookie header and the user through `GameJoltAuth` (encrypted, `StoreAccounts`). The log names the
|
||||
cookies and the user keys, never their values.
|
||||
|
||||
## Data
|
||||
|
||||
`GameJoltApi` talks to `https://gamejolt.com/site-api/web/...` with the stored cookies. Games come back as
|
||||
`{payload, user}`; `GameJoltCatalog` turns a game into a `CatalogItem` (paid only when `sellable.type` is
|
||||
`paid`).
|
||||
|
||||
Browse queries (`GameJoltBrowse.queryString`): `section=` is always sent first (featured, hot, best, new).
|
||||
Game Jolt answers 404 to any browse request without it, even an empty one. The rest are `tag=`, `f_price=`,
|
||||
and `f_os[]`, `f_browser[]`, `f_maturity[]`, `f_status[]`, `f_partners[]`, `page=`. Every page logs its query,
|
||||
status and game count. The filters are drop-down menus (`BrowseDropdown`, shared with the itch bar). Devlog games have no playable
|
||||
copy, so the status filter only offers complete and early access, and a browse always asks for those two. With mature
|
||||
content off, `adult` is stripped from the query, including a stored one.
|
||||
|
||||
## Prices
|
||||
|
||||
`GameJoltPricing.of` reads `sellable.pricings[]` (amounts in cents). The promotional entry is the current price
|
||||
and the regular entry the original, only when the original is higher; the percent uses integer math. USD (or no
|
||||
currency) formats as `$12.34`, another currency as `12.34 EUR`. `CatalogItem` carries `finalPrice`,
|
||||
`originalPrice` and `discountPercent`, so tiles and the game page show prices and sale badges.
|
||||
|
||||
## Library and collections
|
||||
|
||||
`GameJoltLibrary.sync` fetches `/web/library/games/owned/@<user>` (paged, at most every ten minutes, forced by
|
||||
the refresh action) and merges the games into the store library as owned. `GameJoltCollections` lists the
|
||||
read-only collections: followed games (`/web/library/games/followed/@<user>`) and the account's playlists
|
||||
(`/web/library/games/playlist/<id>`). The Library page shows them through the same `CollectionsButton` as itch.
|
||||
Ownership comes from `sellables[0].is_owned`; `packages[0].is_game_owner` is not reliable. Library chips list a store when it has games in
|
||||
the list; a signed-in Itch.io or Game Jolt account keeps its chip, in store order, so its collections stay reachable.
|
||||
|
||||
## Builds and installs
|
||||
|
||||
`GameJoltBuilds.parse` reads the overview payload, keeps the newest release of each package and marks
|
||||
Windows builds installable. The picker (`GameJoltBuildPicker`) installs Windows builds of free games and of paid games the account owns;
|
||||
Linux builds say "Not supported yet" and everything else, including paid games not owned, opens the Game Jolt page.
|
||||
`GameJoltInstaller` asks `builds/get-download-url/<id>` for a signed link on every attempt, resumes with
|
||||
`Range`, unpacks through `StoreArchiveUnpacker` (shared with itch) and picks the launch option or an exe.
|
||||
An update downloads again and merges through `ItchStaging`, like itch.
|
||||
|
||||
## Updates
|
||||
|
||||
`GameJoltUpdates` works like `ItchUpdates` (see `itch-updates.md`). The install record keeps the release
|
||||
`published_on` as `installVersion` and `gameId`, `buildId` and `packageId` in `extra`. `evaluate` compares them
|
||||
with the current builds: a newer release of the same package is an update; if the package is gone, the first
|
||||
installable Windows build is offered as a replaced build. The automatic check runs when the Game Jolt Library
|
||||
source opens, at most every six hours, one game per second. A Check for updates button on an installed game's page
|
||||
checks that game only. Updates stage through `ItchStaging` and the safe folder. Uninstalling or finishing an
|
||||
install clears the record. Install folders use `Store.folder`, so the Itch.io display name never moves them.
|
||||
|
||||
## Controller
|
||||
|
||||
The menus, chips and buttons are the shared components (`MenuItem`, `AnchoredMenu`, `ValueChip`, `BrowseChip`,
|
||||
`IconAction`) that already take focus and confirm from a controller. The first menu entry takes initial focus.
|
||||
@@ -7,7 +7,9 @@ importer as Added Games. Existing Steam manifests are preserved.
|
||||
`droiddeck-steam-games watch` runs beside the client. It identifies a game by an
|
||||
existing manifest's install directory, a `steam_appid.txt` beside the game or selected
|
||||
executable, or a unique normalized title from Steam's store search with an explicit
|
||||
country. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes;
|
||||
country. A `steam_appid.txt` naming 480 (Spacewar, the Steamworks SDK sample that Steam
|
||||
emulators and multiplayer fixes use in place of the game) identifies nothing; the
|
||||
launcher's artwork matching ignores it too. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes;
|
||||
multiple matches still remain unresolved. Artwork's fuzzy matching is deliberately not
|
||||
used for identity. Ambiguous or unresolved titles remain non-Steam games.
|
||||
|
||||
@@ -32,7 +34,8 @@ internal Steam library and writes an installed manifest with `Universe=1` and
|
||||
`StateFlags=4`. Steam ignores manifests without the universe field. A manifest without
|
||||
installed depots makes Steam verify every file, so the importer carries the build another
|
||||
client recorded: WinNative's `.winnative-steam/steamapps` manifest beside the game folder,
|
||||
or a completed download's `.DepotDownloader/depot.config` depot manifest IDs. Steam then
|
||||
or a completed download's depot manifest IDs from `.DepotDownloader/depot.config` or, when
|
||||
that file is gone, the `<depot>_<gid>.manifest` names in `.DepotDownloader/completed`. Steam then
|
||||
only downloads what changed since that build. Bare manifests from earlier imports are
|
||||
upgraded while Steam has not touched them. Without either record Steam still verifies.
|
||||
WinNative's manifest also identifies the folder without a store lookup. Steam updates and uninstall
|
||||
@@ -42,6 +45,13 @@ the earlier importer are migrated, with the matching source symlink still presen
|
||||
registration fails, the game remains a shortcut. Once Steam takes over an install,
|
||||
manage it in Steam; forgetting an Added Games folder only removes its shortcuts.
|
||||
|
||||
An import is undone (its symlink and manifest, never the folder) when the folder was
|
||||
imported as Spacewar, or when a snapshot of the folder's current files names another app.
|
||||
The folder is then imported as that app if the account owns it, else it is a shortcut
|
||||
again. A failed title lookup undoes nothing. The launcher likewise drops artwork it
|
||||
fetched for the app the files named before and fetches it again; pictures the user chose
|
||||
are kept.
|
||||
|
||||
The account's `.droiddeck-routes.json` maps shortcut IDs to real Steam app IDs so the
|
||||
Android launcher uses the same title and Proton prefix as Steam. Other accounts do not
|
||||
inherit those routes. Managed shortcuts are replaced; user-created shortcuts and
|
||||
|
||||
@@ -233,6 +233,30 @@ picker. Its launcher sets five FuelPump variables frozen at install time: `FUEL_
|
||||
`AMAZON_GAMES_FUEL_DISPLAY_NAME` (the account name, `Player` without one). No Amazon Games SDK files
|
||||
are deployed into the prefix and `fuel.json` `PostInstall` steps are not run.
|
||||
|
||||
GOG's registry data reaches the prefix before Proton starts: a `goggame-<id>.script` install action
|
||||
with `setRegistry` becomes a `.reg` import through the game's own Proton (`reg.exe import /reg:32`),
|
||||
once per script revision - `.droiddeck-gog-registry` in the prefix holds the import's hash - and a
|
||||
failed import is retried on the next launch. GOG completes some installs by running a support
|
||||
installer from the game folder (the script's `Execute` action); under ARM64 FEX that 32-bit
|
||||
self-extractor stops at "Path not found", so the values it installs are applied from
|
||||
`GOG_INSTALL_REGISTRY` in `droiddeck-store-launch` instead: The Witcher: Enhanced Edition's
|
||||
`HKLM\Software\CD Projekt Red\The Witcher` block and its text/voice languages (#694), without which
|
||||
`witcher.exe` exits during startup. The language comes from the installed product's
|
||||
`goggame-<id>.info`, and a script's own `setRegistry` entries always win over the built-in table.
|
||||
|
||||
A GOG game's exe comes from its own manifest first: `goggame-<id>.info`'s play task in category
|
||||
`game` (`isPrimary` first), or a primary `launcher` task for launcher games, whose `path` stays
|
||||
inside the folder; any other `goggame-*.info` in the folder supplies the task only when the
|
||||
product's own has none. The task's `workingDir` becomes the shortcut's Start In, and the install root
|
||||
when the task declares none - GOG's own default, and what a game in a subfolder such as
|
||||
`System/witcher.exe` needs to find its `Data` folder. Else the product's `temp_executable`, else a
|
||||
score over the folder's `.exe` files - a word of the game's title in the name first (Blood Omen's
|
||||
`kain.exe` over its `dxconfig.exe`), config and tool names (`config`, `settings`, `launcher`,
|
||||
`editor`, `crashreport`, …) last, shallower and bigger ahead on a tie. GOG's `galaxy_*.exe` support
|
||||
installer is never the game, whatever the manifest or the temp executable says: The Witcher ships it
|
||||
beside `launcher.exe` and its own `temp_executable` names it, and starting it runs the same 32-bit
|
||||
installer that fails under ARM64 with "Path not found" (issue #694).
|
||||
|
||||
A game's web links reach Android: `droiddeck-store-launch` sets the prefix's
|
||||
`HKCU\Software\Wine\WineBrowser` `Browsers` to `/usr/local/bin/droiddeck-open-url`, which is also
|
||||
`xdg-open` first on the game's PATH, and hands http(s) addresses to the app, which opens them in
|
||||
|
||||
@@ -23,7 +23,9 @@ should not dictate which actions it can perform.
|
||||
|
||||
The model separates three concerns:
|
||||
|
||||
- **Source role:** physical, primary screen or secondary screen.
|
||||
- **Source role:** physical controller, game overlay (primary) or auxiliary panel
|
||||
(secondary). Swapping the game and auxiliary panel between displays preserves
|
||||
the panel's role and bindings.
|
||||
- **Profile:** the actions assigned to controls in each role. Game and Desktop are
|
||||
the two editable built-in profiles. Auto selects by session mode; explicit
|
||||
selection supports a game running inside a desktop session.
|
||||
@@ -111,6 +113,13 @@ wholesale. Upstream subsequently merged #1202; the October 30 integration retain
|
||||
its global physical shortcuts, saved assignments and configuration UI alongside
|
||||
the profile bindings.
|
||||
|
||||
The November 4 integration reuses upstream's common bottom-screen bar, extracted
|
||||
trackpad/terminal panels and screen-swap presentation. Custom controls coexist
|
||||
with the dashboard and KDE desktop panels. Routed on-screen stick updates retain
|
||||
upstream's throttled visual redraws without deferring pad publication. Upstream
|
||||
hardware-key translation and mouse capture use the existing output ownership and
|
||||
release capture while the input-profile editor is open.
|
||||
|
||||
Explicit captured bindings in the active profile take precedence over a global
|
||||
physical shortcut for the same key. Otherwise the global shortcut precedes the
|
||||
default Back/QAM handling and logical controller routing. A consumed shortcut
|
||||
|
||||
@@ -216,6 +216,37 @@ This run compiles Android Java/Kotlin and resources. A new APK build, Thor test
|
||||
and latency measurement were not performed for this merge; the full release
|
||||
build remains an upstream CI check.
|
||||
|
||||
### Upstream PC input and bottom-screen integration (2026-11-04 UTC)
|
||||
|
||||
Merged upstream `f0052415` without rewriting the published branch. The merge
|
||||
retains the common bottom-screen bar, dashboard, KDE desktop panel, game-screen
|
||||
swap, hardware mouse/keyboard fixes and on-screen stick redraw optimization.
|
||||
Custom controls use the same bar and preserve their secondary-source bindings
|
||||
when the game and panel swap displays. Pointer handoff now lives in upstream's
|
||||
shared `SessionTrackpadView`, used in either display arrangement.
|
||||
|
||||
Physical/IME key translation reuses `GuestKeys`, including keyboard Escape scan
|
||||
codes and the Desktop right-Ctrl alias, while preserving shared key ownership.
|
||||
The input-profile editor releases upstream's hardware mouse capture. Routed
|
||||
on-screen stick movement uses the same redraw throttling as the native overlay;
|
||||
pad publication remains synchronous, and mapped cursor frame updates keep their
|
||||
existing cadence mechanism.
|
||||
|
||||
The pointer-handoff regression now exercises the extracted trackpad view. Menu
|
||||
tests cover the custom panel alongside upstream's panel choices. A new ownership
|
||||
regression checks that releasing a hardware right-Ctrl alias cannot release Ctrl
|
||||
still held by the active profile. Panel teardown tests now use `ComponentActivity`
|
||||
to supply the lifecycle required by upstream's Compose bar.
|
||||
|
||||
The complete `:app:testDebugUnitTest` run passes **3,281 tests across 464 suites,
|
||||
zero failures/errors/skips**, using Java 17, NDK `28.2.13676358` and
|
||||
`-PskipRust=true`. Upstream's pinned MaliBridge submodule is initialized and its
|
||||
required Android server build also succeeds. The PR diff passes
|
||||
`git diff --check origin/main`.
|
||||
|
||||
No new APK installation, Thor regression pass or latency measurement was performed
|
||||
for this merge. The earlier device measurements do not validate this exact tree.
|
||||
|
||||
## Manual AYN Thor results
|
||||
|
||||
The user performed the following checks in the installed candidate. The desktop
|
||||
|
||||
Reference in new issue
Block a user