Compare commits

..
Author SHA1 Message Date
Boria138 932a6d41a6 feat: add system keyboard via tray and Start +
Code check / Check code (pull_request) Failing after 2m6s
Package Build - AppImage, Arch, Fedora, Debian / changes (pull_request) Failing after 49s
Package Build - AppImage, Arch, Fedora, Debian / Build AppImage (pull_request) Skipped
Package Build - AppImage, Arch, Fedora, Debian / Build Fedora RPM (43) (pull_request) Skipped
Package Build - AppImage, Arch, Fedora, Debian / Build Fedora RPM (44) (pull_request) Skipped
Package Build - AppImage, Arch, Fedora, Debian / Build Fedora RPM (45) (pull_request) Skipped
Package Build - AppImage, Arch, Fedora, Debian / Build Fedora RPM (rawhide) (pull_request) Skipped
Package Build - AppImage, Arch, Fedora, Debian / Build Arch Package (pull_request) Skipped
Package Build - AppImage, Arch, Fedora, Debian / Build Debian Package (pull_request) Skipped
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-17 14:16:37 +05:00
Boria138 49eadbf3c2 feat: support game command placeholder in launch wrappers
Code check / Check code (push) Failing after 2m27s
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-17 11:58:50 +05:00
Boria138 9bef5a8ac1 chore(secrets): clean
Code check / Check code (push) Failing after 3m37s
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-16 18:33:31 +05:00
Boria138 cfe339f3b2 ci: automatically sync Wine GPU names
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-16 16:36:41 +05:00
Boria138 ace6a59026 fix: match GPU filter names to Wine PCI device names
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-16 16:02:26 +05:00
Boria138 6bbea83fde feat: track Steam games and enable stopping from game details
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-14 15:22:15 +05:00
Boria138 181129621a fix: filter user native game entries by Exec file arguments
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-14 14:28:22 +05:00
Boria138 0a1b3ec854 fix: queue store installs and streamline GOG DLC lookup
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-14 14:22:40 +05:00
Boria138 9d95d26c8d feat: added Linux Native games support
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-14 08:29:06 +00:00
Boria138 ca321ac0ae chore(changelog): oops added @iodnoorov to thanks
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-13 21:57:51 +05:00
Boria138 5048244ed7 fix: respect disabled video fix setting in PortProton
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-13 21:48:24 +05:00
Boria138 e96550d155 chore: update Brazilian Portuguese and Simplified Chinese translations
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-13 21:19:14 +05:00
Boria138 eef9824596 fix(ci): fall back to rate-mirrors when Lenuma CDN is unavailable
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-13 21:15:29 +05:00
Codeberg Translateandadem c7acdd2ef4 Translated using Weblate (Russian)
Currently translated at 100.0% (808 of 808 strings)

Co-authored-by: Andrei Stepanov <adem4ik@gmail.com>
Translate-URL: https://translate.codeberg.org/projects/portprotonqt/portprotonqt/ru/
Translation: PortProtonQt/PortProtonQt
2026-11-13 17:44:11 +05:00
Boria138 4fb74c1d15 fix: create virtual mouse only while emulation is active
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-13 10:51:50 +05:00
Boria138 78dab249c1 fix: prevent SGDB mirror cover cache collisions
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-12 18:35:11 +05:00
Boria138 9e91eeb0dc feat: add library CLI
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-12 15:10:05 +05:00
Boria138 cb8d149b2a fix: show installed Wine/Proton versions when catalog loading fails
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-09 00:14:55 +05:00
Boria138 98475c0e59 fix: use Bash for PortProton functions in EasyTerm
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
2026-11-08 16:55:50 +05:00
83 changed files with 7580 additions and 346 deletions

No files matched your search

@@ -8,6 +8,7 @@ on:
- scripts
paths:
- 'build-aux/src/vk_gpu_info.c'
- 'build-aux/src/wine_gpu_names.h'
- '.gitea/workflows/build-vk-gpu-info-debian.yml'
jobs:
+34 -4
View File
@@ -31,9 +31,24 @@ jobs:
image: archlinux:base-devel
options: --privileged --device /dev/fuse
steps:
- name: Configure Arch mirror
- name: Configure Arch mirrors
run: |
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
if curl -fL --connect-timeout 10 --max-time 20 \
https://cdn.lenuma.ru/archlinux-mirror/core/os/x86_64/core.db -o /dev/null; then
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
elif curl -fL --retry 2 --connect-timeout 10 --max-time 60 \
https://github.com/westandskif/rate-mirrors/releases/download/v0.33.0/rate-mirrors-v0.33.0-x86_64-unknown-linux-musl.tar.gz \
-o /tmp/rate-mirrors.tar.gz &&
echo 'e0ffb221649b7e1ce6b67ffaabe7cfd2b619c8bf8d6971e07ff9507d4e19a4b3 /tmp/rate-mirrors.tar.gz' | sha256sum -c - &&
tar -xzf /tmp/rate-mirrors.tar.gz -C /tmp --strip-components=1 \
rate-mirrors-v0.33.0-x86_64-unknown-linux-musl/rate_mirrors &&
timeout --kill-after=5s 120s /tmp/rate_mirrors --allow-root --protocol=https --disable-untested-fallback \
--save=/tmp/arch-mirrorlist arch --max-delay=21600 &&
grep -q '^Server = https://' /tmp/arch-mirrorlist; then
install -m 644 /tmp/arch-mirrorlist /etc/pacman.d/mirrorlist
else
echo '::warning::Mirror ranking failed; keeping the original Arch mirrorlist'
fi
sed -i -E 's/^#?[[:space:]]*ParallelDownloads[[:space:]]*=.*/ParallelDownloads = 5/' /etc/pacman.conf
- name: Prepare container
@@ -74,9 +89,24 @@ jobs:
image: archlinux:base-devel
steps:
- name: Configure Arch mirror
- name: Configure Arch mirrors
run: |
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
if curl -fL --connect-timeout 10 --max-time 20 \
https://cdn.lenuma.ru/archlinux-mirror/core/os/x86_64/core.db -o /dev/null; then
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
elif curl -fL --retry 2 --connect-timeout 10 --max-time 60 \
https://github.com/westandskif/rate-mirrors/releases/download/v0.33.0/rate-mirrors-v0.33.0-x86_64-unknown-linux-musl.tar.gz \
-o /tmp/rate-mirrors.tar.gz &&
echo 'e0ffb221649b7e1ce6b67ffaabe7cfd2b619c8bf8d6971e07ff9507d4e19a4b3 /tmp/rate-mirrors.tar.gz' | sha256sum -c - &&
tar -xzf /tmp/rate-mirrors.tar.gz -C /tmp --strip-components=1 \
rate-mirrors-v0.33.0-x86_64-unknown-linux-musl/rate_mirrors &&
timeout --kill-after=5s 120s /tmp/rate_mirrors --allow-root --protocol=https --disable-untested-fallback \
--save=/tmp/arch-mirrorlist arch --max-delay=21600 &&
grep -q '^Server = https://' /tmp/arch-mirrorlist; then
install -m 644 /tmp/arch-mirrorlist /etc/pacman.d/mirrorlist
else
echo '::warning::Mirror ranking failed; keeping the original Arch mirrorlist'
fi
sed -i -E 's/^#?[[:space:]]*ParallelDownloads[[:space:]]*=.*/ParallelDownloads = 5/' /etc/pacman.conf
- name: Prepare container
+17 -2
View File
@@ -24,9 +24,24 @@ jobs:
container:
image: archlinux:base-devel@sha256:3cbf69d2d5958d6a294f3722c5668e6187c4df8e00fa27f72352f0bf83e495e1
steps:
- name: Configure Arch mirror
- name: Configure Arch mirrors
run: |
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
if curl -fL --connect-timeout 10 --max-time 20 \
https://cdn.lenuma.ru/archlinux-mirror/core/os/x86_64/core.db -o /dev/null; then
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
elif curl -fL --retry 2 --connect-timeout 10 --max-time 60 \
https://github.com/westandskif/rate-mirrors/releases/download/v0.33.0/rate-mirrors-v0.33.0-x86_64-unknown-linux-musl.tar.gz \
-o /tmp/rate-mirrors.tar.gz &&
echo 'e0ffb221649b7e1ce6b67ffaabe7cfd2b619c8bf8d6971e07ff9507d4e19a4b3 /tmp/rate-mirrors.tar.gz' | sha256sum -c - &&
tar -xzf /tmp/rate-mirrors.tar.gz -C /tmp --strip-components=1 \
rate-mirrors-v0.33.0-x86_64-unknown-linux-musl/rate_mirrors &&
timeout --kill-after=5s 120s /tmp/rate_mirrors --allow-root --protocol=https --disable-untested-fallback \
--save=/tmp/arch-mirrorlist arch --max-delay=21600 &&
grep -q '^Server = https://' /tmp/arch-mirrorlist; then
install -m 644 /tmp/arch-mirrorlist /etc/pacman.d/mirrorlist
else
echo '::warning::Mirror ranking failed; keeping the original Arch mirrorlist'
fi
sed -i -E 's/^#?[[:space:]]*ParallelDownloads[[:space:]]*=.*/ParallelDownloads = 5/' /etc/pacman.conf
- name: Install CI dependencies
-2
View File
@@ -30,8 +30,6 @@ jobs:
run: python dev-scripts/get_id.py
env:
STEAM_KEY: ${{ secrets.STEAM_KEY }}
LINUX_GAMING_API_KEY: ${{ secrets.LINUX_GAMING_API_KEY }}
LINUX_GAMING_API_USERNAME: ${{ secrets.LINUX_GAMING_API_USERNAME }}
- name: Commit and push changes
env:
+34 -4
View File
@@ -83,9 +83,24 @@ jobs:
image: archlinux:base-devel@sha256:3cbf69d2d5958d6a294f3722c5668e6187c4df8e00fa27f72352f0bf83e495e1
options: --privileged --device /dev/fuse
steps:
- name: Configure Arch mirror
- name: Configure Arch mirrors
run: |
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
if curl -fL --connect-timeout 10 --max-time 20 \
https://cdn.lenuma.ru/archlinux-mirror/core/os/x86_64/core.db -o /dev/null; then
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
elif curl -fL --retry 2 --connect-timeout 10 --max-time 60 \
https://github.com/westandskif/rate-mirrors/releases/download/v0.33.0/rate-mirrors-v0.33.0-x86_64-unknown-linux-musl.tar.gz \
-o /tmp/rate-mirrors.tar.gz &&
echo 'e0ffb221649b7e1ce6b67ffaabe7cfd2b619c8bf8d6971e07ff9507d4e19a4b3 /tmp/rate-mirrors.tar.gz' | sha256sum -c - &&
tar -xzf /tmp/rate-mirrors.tar.gz -C /tmp --strip-components=1 \
rate-mirrors-v0.33.0-x86_64-unknown-linux-musl/rate_mirrors &&
timeout --kill-after=5s 120s /tmp/rate_mirrors --allow-root --protocol=https --disable-untested-fallback \
--save=/tmp/arch-mirrorlist arch --max-delay=21600 &&
grep -q '^Server = https://' /tmp/arch-mirrorlist; then
install -m 644 /tmp/arch-mirrorlist /etc/pacman.d/mirrorlist
else
echo '::warning::Mirror ranking failed; keeping the original Arch mirrorlist'
fi
sed -i -E 's/^#?[[:space:]]*ParallelDownloads[[:space:]]*=.*/ParallelDownloads = 5/' /etc/pacman.conf
- name: Prepare container
@@ -198,9 +213,24 @@ jobs:
image: archlinux:base-devel@sha256:3cbf69d2d5958d6a294f3722c5668e6187c4df8e00fa27f72352f0bf83e495e1
steps:
- name: Configure Arch mirror
- name: Configure Arch mirrors
run: |
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
if curl -fL --connect-timeout 10 --max-time 20 \
https://cdn.lenuma.ru/archlinux-mirror/core/os/x86_64/core.db -o /dev/null; then
echo 'Server = https://cdn.lenuma.ru/archlinux-mirror/$repo/os/$arch' > /etc/pacman.d/mirrorlist
elif curl -fL --retry 2 --connect-timeout 10 --max-time 60 \
https://github.com/westandskif/rate-mirrors/releases/download/v0.33.0/rate-mirrors-v0.33.0-x86_64-unknown-linux-musl.tar.gz \
-o /tmp/rate-mirrors.tar.gz &&
echo 'e0ffb221649b7e1ce6b67ffaabe7cfd2b619c8bf8d6971e07ff9507d4e19a4b3 /tmp/rate-mirrors.tar.gz' | sha256sum -c - &&
tar -xzf /tmp/rate-mirrors.tar.gz -C /tmp --strip-components=1 \
rate-mirrors-v0.33.0-x86_64-unknown-linux-musl/rate_mirrors &&
timeout --kill-after=5s 120s /tmp/rate_mirrors --allow-root --protocol=https --disable-untested-fallback \
--save=/tmp/arch-mirrorlist arch --max-delay=21600 &&
grep -q '^Server = https://' /tmp/arch-mirrorlist; then
install -m 644 /tmp/arch-mirrorlist /etc/pacman.d/mirrorlist
else
echo '::warning::Mirror ranking failed; keeping the original Arch mirrorlist'
fi
sed -i -E 's/^#?[[:space:]]*ParallelDownloads[[:space:]]*=.*/ParallelDownloads = 5/' /etc/pacman.conf
- name: Prepare container
+1 -1
View File
@@ -40,6 +40,6 @@ jobs:
env:
RENOVATE_CONFIG_FILE: "/tmp/renovate-config/config.js"
RENOVATE_BINARY_SOURCE: "global"
GITHUB_COM_TOKEN: ${{ secrets.GITHUB_COM_TOKEN }}
GITHUB_COM_TOKEN: ${{ secrets.GHP_COM_TOKEN }}
LOG_LEVEL: "debug"
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
@@ -0,0 +1,49 @@
name: Update Wine GPU names
on:
workflow_dispatch:
schedule:
- cron: '0 4 * * 1'
concurrency:
group: update-wine-gpu-names
cancel-in-progress: false
jobs:
update:
if: gitea.repository == 'Linux-Gaming/PortProtonQt'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: https://git.linux-gaming.ru/actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
ref: main
token: ${{ secrets.GITEA_TOKEN }}
- name: Set up Python
uses: https://git.linux-gaming.ru/actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7
with:
python-version-file: pyproject.toml
- name: Update Wine GPU names
id: update
run: |
python dev-scripts/update_wine_gpu_names.py
if git diff --quiet -- build-aux/src/wine_gpu_names.h; then
echo "changed=false" >> "$GITHUB_OUTPUT"
else
echo "changed=true" >> "$GITHUB_OUTPUT"
fi
- name: Commit and push table changes
if: steps.update.outputs.changed == 'true'
run: |
git add -- build-aux/src/wine_gpu_names.h
if git diff --cached --quiet; then
echo "Wine GPU names are unchanged."
exit 0
fi
git config --local user.name 'Gitea Actions'
git config --local user.email 'gitea-actions@users.noreply.gitea.com'
git commit -m 'chore: sync Wine GPU names'
git push origin HEAD:main
+13
View File
@@ -7,6 +7,9 @@
### Added
- В Run After / Wrapper добавлена поддержка `%command%` для передачи команды игры обёртке, например `mako-launch %command%`, без повторного запуска игры
- Добавлено отслеживание запуска Steam-игр на странице игры
- Добавлен CLI для получения локальных данных библиотеки
- Для Run After / Wrapper добавлен раскрываемый список с отдельным полем для каждой записи, удалением записей и кнопкой полной очистки
- В фильтр библиотеки добавлен выбор нескольких источников одновременно с сохранением выбранной комбинации
- При добавлении игр в Steam добавлена загрузка обложек из SteamGridDB, если Steam AppID не найден
@@ -21,6 +24,8 @@
### Changed
- Для игр GOG и EGS папка установки выбирается до добавления в очередь
- Ускорено получение списка DLC для GOG
- В Run After / Wrapper выбор файлов ограничен `.exe` и файлами с правом исполнения в Linux
- В режиме CLOUD данные ProtonDB и ссылки на обложки SteamGridDB загружаются через `deckyloader.ru`
- Повторный запуск с `--silent` теперь запрашивает подтверждение: при согласии текущий PortProtonQt и запущенные игры завершаются, затем приложение запускается заново для новой игры: при отказе новый запуск полностью отменяется, текущая сессия продолжает работать
@@ -35,9 +40,15 @@
- Обновлён перевод на Португальский (Бразилия) `https://translate.codeberg.org/projects/portprotonqt/portprotonqt/pt_BR/`
- Обновлён перевод на Русский `https://translate.codeberg.org/projects/portprotonqt/portprotonqt/ru/`
- Обновлён перевод на Немецкий `https://translate.codeberg.org/projects/portprotonqt/portprotonqt/de/`
- Обновлён перевод на Китайский (упрощённый) `https://translate.codeberg.org/projects/portprotonqt/portprotonqt/zh_Hans/`
### Fixed
- Исправлена фильтрация видеокарт DXVK и VKD3D при расхождении нативного имени GPU с именем Wine
- Запросы установки других игр GOG и EGS во время получения списка DLC добавляются в очередь вместо ошибки «Другая загрузка уже выполняется»
- Виртуальная мышь создаётся только при включении эмуляции геймпадом и удаляется при её выключении
- При ошибке загрузки каталога WINE/Proton отображаются локально установленные версии
- Исправлен запуск команд с функциями PortProton во встроенном терминале при использовании zsh или fish
- Исправлено зависание при смене сетки библиотеки
- Исправлено открытие контекстного меню в файловом проводнике кнопкой геймпада
- Исправлена блокировка установки игр GOG и EGS сообщением «Другая загрузка уже выполняется» после отмены выбора DLC
@@ -54,12 +65,14 @@
- В меню системного трея при запуске игры с `--silent` добавлены отсутствовавшие действия приостановки и возобновления игры
- Исправлена гонка при запуске игры с `--silent`
- Исправлено обрезание значений в избранных настройках
- При выключенной опции «Fix video in game» больше не блокируется создание DXGI Device Manager в Wine/Proton
### Contributors
- @Dervart
- @adem4ik
- @rogerio-mattos
- @Rubin13
- @iodnoorov
---
+1 -1
View File
@@ -8,7 +8,7 @@ arch=('x86_64')
url="https://git.linux-gaming.ru/Linux-Gaming/PortProtonQt"
license=('GPL-3.0')
depends=('python-requests' 'python-babel' 'python-evdev' 'python-orjson'
'python-psutil' 'python-tqdm' 'python-vdf' 'python-libarchive-c' 'pyside6' 'python-rapidfuzz' 'python-pefile' 'python-pillow' 'perl-image-exiftool' 'python-websocket-client' 'cabextract' 'unzip' 'curl' 'file' 'findutils' 'gawk' 'grep' 'tar' 'xz' 'zstd' 'gzip' 'unrar' 'qt6-svg' 'qt6-imageformats' 'qt6-multimedia' 'pciutils' 'mesa-utils' 'vulkan-icd-loader' 'procps-ng' 'psmisc' '7zip' 'python-dbus-fast' 'sdl3' 'desktop-file-utils')
'python-psutil' 'python-tqdm' 'python-vdf' 'python-libarchive-c' 'pyside6' 'python-rapidfuzz' 'python-pefile' 'python-pillow' 'perl-image-exiftool' 'python-websocket-client' 'cabextract' 'unzip' 'curl' 'file' 'findutils' 'gawk' 'grep' 'tar' 'xz' 'zstd' 'gzip' 'unrar' 'qt6-svg' 'qt6-imageformats' 'qt6-multimedia' 'pciutils' 'mesa-utils' 'vulkan-icd-loader' 'procps-ng' 'psmisc' '7zip' 'python-dbus-fast' 'sdl3' 'desktop-file-utils' 'wayland' 'libxkbcommon' 'libx11' 'xkeyboard-config')
makedepends=('meson' 'ninja' 'vulkan-headers' 'gettext' 'sdl3')
conflicts=("portprotonqt-steam-compat")
provides=('portprotonqt-steam-compat')
+1 -1
View File
@@ -8,7 +8,7 @@ arch=('x86_64')
url="https://git.linux-gaming.ru/Linux-Gaming/PortProtonQt"
license=('GPL-3.0')
depends=('python-requests' 'python-babel' 'python-evdev' 'python-orjson'
'python-psutil' 'python-tqdm' 'python-vdf' 'python-libarchive-c' 'pyside6' 'python-rapidfuzz' 'python-pefile' 'python-pillow' 'perl-image-exiftool' 'python-websocket-client' 'cabextract' 'unzip' 'curl' 'file' 'findutils' 'gawk' 'grep' 'tar' 'xz' 'zstd' 'gzip' 'unrar' 'qt6-svg' 'qt6-imageformats' 'qt6-multimedia' 'pciutils' 'mesa-utils' 'vulkan-icd-loader' 'procps-ng' 'psmisc' '7zip' 'python-dbus-fast' 'sdl3' 'desktop-file-utils')
'python-psutil' 'python-tqdm' 'python-vdf' 'python-libarchive-c' 'pyside6' 'python-rapidfuzz' 'python-pefile' 'python-pillow' 'perl-image-exiftool' 'python-websocket-client' 'cabextract' 'unzip' 'curl' 'file' 'findutils' 'gawk' 'grep' 'tar' 'xz' 'zstd' 'gzip' 'unrar' 'qt6-svg' 'qt6-imageformats' 'qt6-multimedia' 'pciutils' 'mesa-utils' 'vulkan-icd-loader' 'procps-ng' 'psmisc' '7zip' 'python-dbus-fast' 'sdl3' 'desktop-file-utils' 'wayland' 'libxkbcommon' 'libx11' 'xkeyboard-config')
makedepends=('meson' 'ninja' 'vulkan-headers' 'gettext' 'sdl3')
conflicts=("portprotonqt-steam-compat")
provides=('portprotonqt-steam-compat')
Binary file not shown.
+4
View File
@@ -23,6 +23,9 @@ BuildRequires: gettext
BuildRequires: systemd-rpm-macros
BuildRequires: vulkan-loader-devel
BuildRequires: pkgconfig(sdl3)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(x11)
BuildRequires: gcc
Obsoletes: python3-%{pypi_name}-git < %{version}-%{release}
@@ -66,6 +69,7 @@ Requires: psmisc
Requires: 7zip
Requires: python3-dbus-fast
Requires: desktop-file-utils
Requires: xkeyboard-config
# System Tab
Recommends: NetworkManager
+4
View File
@@ -20,6 +20,9 @@ BuildRequires: gettext
BuildRequires: systemd-rpm-macros
BuildRequires: vulkan-loader-devel
BuildRequires: pkgconfig(sdl3)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(x11)
BuildRequires: gcc
Obsoletes: python3-%{pypi_name} < %{version}-%{release}
@@ -63,6 +66,7 @@ Requires: psmisc
Requires: 7zip
Requires: python3-dbus-fast
Requires: desktop-file-utils
Requires: xkeyboard-config
# System Tab
Recommends: NetworkManager
Binary file not shown.
@@ -2008,6 +2008,37 @@ pw_init_db () {
return 0
}
pw_select_gpu () {
[[ -n "${PW_GPU_USE}" && "${PW_GPU_USE}" != "disabled" ]] || return 0
local vk_gpu_info_cmd vk_info_output line current_device_name="" filter_name="${PW_GPU_USE}"
vk_gpu_info_cmd="$(dirname "${BASH_SOURCE[0]}")/../../../bin/vk_gpu_info"
if [[ ! -x "${vk_gpu_info_cmd}" ]] ; then
vk_gpu_info_cmd="$(command -v vk_gpu_info 2>/dev/null || true)"
fi
if [[ -n "${vk_gpu_info_cmd}" ]] ; then
if vk_info_output="$("${vk_gpu_info_cmd}" 2>/dev/null)" ; then
while IFS= read -r line ; do
case "$line" in
"GPU #"*) current_device_name="" ;;
"device_name: "*) current_device_name="${line#device_name: }" ;;
"wine_device_name: "*)
if [[ "${current_device_name}" == "${PW_GPU_USE}" && -n "${line#wine_device_name: }" ]] ; then
filter_name="${line#wine_device_name: }"
break
fi
;;
esac
done <<< "${vk_info_output}"
else
print_warning "vk_gpu_info failed; using the native GPU name for device filters."
fi
fi
[[ -v DXVK_FILTER_DEVICE_NAME ]] || export DXVK_FILTER_DEVICE_NAME="${filter_name}"
[[ -v VKD3D_FILTER_DEVICE_NAME ]] || export VKD3D_FILTER_DEVICE_NAME="${filter_name}"
export MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE="1"
export MESA_VK_DEVICE_SELECT="$PW_vendorID:$PW_deviceID"
}
pw_check_vulkan_extensions () {
local ext_name="$1"
local ext_key
@@ -2389,6 +2420,7 @@ pw_optiscaler_sync_files () {
for dll in $OPTISCALER_FILES ; do rm -fr "$PATH_TO_GAME/$dll"; done
for dll in $ORIGINAL_GAME_DLLS ; do [[ -e "$PATH_TO_GAME/${dll}.b" ]] && mv -f "$PATH_TO_GAME/${dll}.b" "$PATH_TO_GAME/${dll}" 2>/dev/null; done
try_remove_file "$PATH_TO_GAME/optiscaler_version"
try_remove_file "$PATH_TO_GAME/dxvk.conf"
fi
return 0
fi
@@ -2400,6 +2432,7 @@ pw_optiscaler_sync_files () {
check_variables OPTISCALER_FG_TYPE "Nukems"
sed -i "s|FGType =.*|FGType = $OPTISCALER_FG_TYPE|g" "$OPTISCALER_PATH/OptiScaler.ini"
echo "" > "$PATH_TO_GAME/dxvk.conf"
if [[ -f "$PATH_TO_GAME/dxgi.dll" ]] \
&& [[ -f "$PATH_TO_GAME/specialk_version" ]]
then
@@ -2418,11 +2451,7 @@ pw_optiscaler_sync_files () {
echo "$PW_OPTISCALER_VER" > "$PATH_TO_GAME/optiscaler_version"
fi
export PW_USE_NVAPI_AND_DLSS="1"
export DXVK_NVAPI_DRIVER_VERSION="99999"
if [[ $(check_vendor_gpu) != "nvidia" ]] ; then
export DXVK_NVAPI_ALLOW_OTHER_DRIVERS="1"
fi
export PW_USE_RAY_TRACING="1"
set_to_dxvk_conf nvidia_new
}
pw_specialk_set_ini_value () {
@@ -2897,9 +2926,64 @@ start_portproton () {
export DXVK_ASYNC="1"
fi
export WINE_HIDE_NVIDIA_GPU="0"
export WINE_HIDE_AMD_GPU="0"
unset DXVK_NVAPI_DRIVER_VERSION DXVK_NVAPI_ALLOW_OTHER_DRIVERS WINEHAGS
set_to_dxvk_conf () {
case "$1" in
default)
sed -i \
-e /'dxgi.customDeviceDesc =/c # dxgi.customDeviceDesc =' \
-e /'dxgi.customDeviceId =/c # dxgi.customDeviceId =' \
-e /'dxgi.customVendorId =/c # dxgi.customVendorId =' \
-e /'dxgi.hideNvidiaGpu =/c # dxgi.hideNvidiaGpu =' \
-e /'d3d11.cachedDynamicResources =/c # d3d11.cachedDynamicResources =' \
-e /'dxgi.maxFrameLatency =/c # dxgi.maxFrameLatency =' \
-e /'d3d9.maxFrameLatency =/c # d3d9.maxFrameLatency =' \
-e /'dxgi.syncInterval =/c # dxgi.syncInterval =' \
-e /'d3d9.presentInterval =/c # d3d9.presentInterval =' \
-e /'dxgi.numBackBuffers =/c # dxgi.numBackBuffers =' \
-e /'d3d9.numBackBuffers =/c # d3d9.numBackBuffers =' \
-e /'d3d9.deviceLossOnFocusLoss =/c # d3d9.deviceLossOnFocusLoss =' \
-e /'d3d9.countLosableResources =/c # d3d9.countLosableResources =' \
"${DXVK_CONFIG_FILE}"
export WINE_HIDE_NVIDIA_GPU="0"
export WINE_HIDE_AMD_GPU="0"
unset DXVK_NVAPI_DRIVER_VERSION DXVK_NVAPI_ALLOW_OTHER_DRIVERS WINEHAGS
;;
nvidia_new)
sed -i \
-e /'dxgi.customDeviceDesc =/c dxgi.customDeviceDesc = "NVIDIA GeForce RTX 4090"' \
-e /'dxgi.customDeviceId =/c dxgi.customDeviceId = 2684' \
-e /'dxgi.customVendorId =/c dxgi.customVendorId = 10de' \
-e /'dxgi.hideNvidiaGpu =/c dxgi.hideNvidiaGpu = False' \
"${DXVK_CONFIG_FILE}"
# export WINE_HIDE_AMD_GPU="1"
export DXVK_NVAPI_DRIVER_VERSION="99999"
if [[ $(check_vendor_gpu) != "nvidia" ]] ; then
export DXVK_NVAPI_ALLOW_OTHER_DRIVERS="1"
fi
export PW_USE_NVAPI_AND_DLSS="1"
export PW_USE_RAY_TRACING="1"
;;
low_latency)
sed -i \
-e /'d3d11.cachedDynamicResources =/c d3d11.cachedDynamicResources = a' \
-e /'dxgi.maxFrameLatency =/c dxgi.maxFrameLatency = 1' \
-e /'d3d9.maxFrameLatency =/c d3d9.maxFrameLatency = 1' \
-e /'dxgi.syncInterval =/c dxgi.syncInterval = 0' \
-e /'d3d9.presentInterval =/c d3d9.presentInterval = 0' \
-e /'dxgi.numBackBuffers =/c dxgi.numBackBuffers = 2' \
-e /'d3d9.numBackBuffers =/c d3d9.numBackBuffers = 2' \
-e /'d3d9.deviceLossOnFocusLoss =/c d3d9.deviceLossOnFocusLoss = True' \
-e /'d3d9.countLosableResources =/c d3d9.countLosableResources = True' \
-e /'dxvk.tearFree =/c dxvk.tearFree = False' \
"${DXVK_CONFIG_FILE}"
;;
esac
}
set_to_dxvk_conf default
# NVAPI, DLSS AND FAKE DLSS
if [[ -d "$PATH_TO_GAME/Engine" ]]; then
@@ -2946,7 +3030,7 @@ start_portproton () {
if [[ "${PW_FIX_VIDEO_IN_GAME}" == 1 ]]
then export WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER="1"
else export WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER="0"
else unset WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER
fi
if [[ -f "$PATH_TO_GAME/MangoHud.conf" ]] ; then
@@ -2959,12 +3043,7 @@ start_portproton () {
[[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && pw_select_vkbasalt_user_conf
if [[ $PW_GPU_USE != "disabled" ]] ; then
export DXVK_FILTER_DEVICE_NAME="$PW_GPU_USE"
export VKD3D_FILTER_DEVICE_NAME="$PW_GPU_USE"
export MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE="1"
export MESA_VK_DEVICE_SELECT="$PW_vendorID:$PW_deviceID"
fi
pw_select_gpu
if [[ -f "$PATH_TO_GAME/dxvk.conf" ]] ; then
export DXVK_CONFIG_FILE="$PATH_TO_GAME/dxvk.conf"
@@ -3985,6 +4064,22 @@ pw_launch_wrapper () {
return
fi
local wrapper_arg
local -a launch_cmd=()
local wrapper_command_seen=0
for wrapper_arg in "${wrapper_cmd[@]}" ; do
if [[ "$wrapper_arg" == '%command%' ]] ; then
launch_cmd+=("$@")
wrapper_command_seen=1
else
launch_cmd+=("$wrapper_arg")
fi
done
if [[ "$wrapper_command_seen" == 1 ]] ; then
"${launch_cmd[@]}"
return
fi
if [[ "${wrapper_cmd[0]##*/}" == "systemd-run" ]] ; then
"${wrapper_cmd[@]}" -- "$@"
return
@@ -178,6 +178,7 @@ source "${PORT_SCRIPTS_PATH}/var"
cd "${XDG_DATA_HOME:-$HOME}" || fatal "Data directory not found: ${XDG_DATA_HOME:-$HOME}"
[[ ! -f "$VKBASALT_CONFIG_FILE" ]] && cp -f "${PORT_CONF_PATH}/vkBasalt.conf" "$VKBASALT_CONFIG_FILE"
[[ ! -f "$DXVK_CONFIG_FILE" ]] && cp -f "${PORT_CONF_PATH}/dxvk.conf" "$DXVK_CONFIG_FILE"
export STEAM_SCRIPTS="${PORT_DATA_PATH}/steam_scripts"
create_new_dir "$STEAM_SCRIPTS"
+60
View File
@@ -0,0 +1,60 @@
/* Assisted-by: Codex:GPT-6 */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <string.h>
#include <wayland-client.h>
#include <xkbcommon/xkbcommon.h>
struct wl_display *portproton_keyboard_wayland_connect(const char *name)
{
return wl_display_connect(name);
}
struct xkb_context *portproton_keyboard_xkb_context_new(enum xkb_context_flags flags)
{
return xkb_context_new(flags);
}
Display *portproton_keyboard_x11_open_display(const char *name)
{
return XOpenDisplay(name);
}
int portproton_keyboard_x11_layout_name(Display *display, unsigned int group,
char *buffer, size_t size)
{
const long property_length = 1024;
Atom property = XInternAtom(display, "_XKB_RULES_NAMES", True);
Atom type;
int format;
unsigned long length, remaining;
unsigned char *data = NULL;
if (!property || !buffer || size == 0)
return 0;
if (XGetWindowProperty(display, DefaultRootWindow(display), property, 0,
property_length, False, XA_STRING, &type, &format,
&length, &remaining, &data) != Success || !data)
return 0;
char *start = (char *)data;
char *end = start + length;
for (unsigned int field = 0; field < 2 && start < end; ++field) {
char *separator = memchr(start, '\0', (size_t)(end - start));
start = separator ? separator + 1 : end;
}
char *layouts_end = memchr(start, '\0', (size_t)(end - start));
if (!layouts_end)
layouts_end = end;
for (unsigned int index = 0; index < group && start < layouts_end; ++index) {
char *separator = memchr(start, ',', (size_t)(layouts_end - start));
start = separator ? separator + 1 : layouts_end;
}
char *separator = memchr(start, ',', (size_t)(layouts_end - start));
size_t count = (size_t)((separator ? separator : layouts_end) - start);
int found = format == 8 && count > 0 && count < size;
if (found) {
memcpy(buffer, start, count);
buffer[count] = '\0';
}
XFree(data);
return found;
}
+2
View File
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <string.h>
#include <vulkan/vulkan.h>
#include "wine_gpu_names.h"
typedef struct {
uint32_t vendor_id;
@@ -275,6 +276,7 @@ int main() {
printf("vendor_id: 0x%04x\n", props.vendorID);
printf("device_id: 0x%04x\n", props.deviceID);
printf("device_name: %s\n", device_name);
printf("wine_device_name: %s\n", wine_device_name(props.vendorID, props.deviceID, device_name));
printf("driver_name: %s\n", driver_name);
printf("driver_info: %s\n", driver_info);
printf("api_version: %u.%u.%u\n",
+371
View File
@@ -0,0 +1,371 @@
/*
* GPU names derived from Wine gpu_device_name()
*
* Copyright 1994 Alexandre Julliard
* Copyright 2019 Zhiyi Zhang for CodeWeavers
* Copyright 2021 Jacek Caban for CodeWeavers
*
* Adapted from LGPL-2.1-or-later Wine code under section 3 of LGPL-2.1.
* This adaptation is licensed under GPL-3.0.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
// Source: wine-mirror/wine, dlls/win32u/sysparams.c
// Revision: 9f8c4ae4d35c7ff4153267aba9618c026f5f5583
#ifndef WINE_GPU_NAMES_H
#define WINE_GPU_NAMES_H
#include <stddef.h>
#include <stdint.h>
static const struct {
uint32_t vendor_id;
uint32_t device_id;
const char *name;
} wine_gpu_names[] = {
{0x10de, 0x0018, "NVIDIA RIVA 128"},
{0x10de, 0x0020, "NVIDIA RIVA TNT"},
{0x10de, 0x0028, "NVIDIA RIVA TNT2/TNT2 Pro"},
{0x10de, 0x0100, "NVIDIA GeForce 256"},
{0x10de, 0x0150, "NVIDIA GeForce2 GTS/GeForce2 Pro"},
{0x10de, 0x0110, "NVIDIA GeForce2 MX/MX 400"},
{0x10de, 0x0200, "NVIDIA GeForce3"},
{0x10de, 0x0170, "NVIDIA GeForce4 MX 460"},
{0x10de, 0x0253, "NVIDIA GeForce4 Ti 4200"},
{0x10de, 0x0320, "NVIDIA GeForce FX 5200"},
{0x10de, 0x0312, "NVIDIA GeForce FX 5600"},
{0x10de, 0x0302, "NVIDIA GeForce FX 5800"},
{0x10de, 0x014f, "NVIDIA GeForce 6200"},
{0x10de, 0x0140, "NVIDIA GeForce 6600 GT"},
{0x10de, 0x0041, "NVIDIA GeForce 6800"},
{0x10de, 0x01d7, "NVIDIA GeForce Go 7300"},
{0x10de, 0x01d8, "NVIDIA GeForce Go 7400"},
{0x10de, 0x0391, "NVIDIA GeForce 7600 GT"},
{0x10de, 0x0092, "NVIDIA GeForce 7800 GT"},
{0x10de, 0x0849, "NVIDIA GeForce 8200"},
{0x10de, 0x084b, "NVIDIA GeForce 8200"},
{0x10de, 0x0423, "NVIDIA GeForce 8300 GS"},
{0x10de, 0x0404, "NVIDIA GeForce 8400 GS"},
{0x10de, 0x0421, "NVIDIA GeForce 8500 GT"},
{0x10de, 0x0402, "NVIDIA GeForce 8600 GT"},
{0x10de, 0x0407, "NVIDIA GeForce 8600M GT"},
{0x10de, 0x0193, "NVIDIA GeForce 8800 GTS"},
{0x10de, 0x0191, "NVIDIA GeForce 8800 GTX"},
{0x10de, 0x086d, "NVIDIA GeForce 9200"},
{0x10de, 0x086c, "NVIDIA GeForce 9300"},
{0x10de, 0x0863, "NVIDIA GeForce 9400M"},
{0x10de, 0x042c, "NVIDIA GeForce 9400 GT"},
{0x10de, 0x0640, "NVIDIA GeForce 9500 GT"},
{0x10de, 0x0622, "NVIDIA GeForce 9600 GT"},
{0x10de, 0x064a, "NVIDIA GeForce 9700M GT"},
{0x10de, 0x0614, "NVIDIA GeForce 9800 GT"},
{0x10de, 0x0a23, "NVIDIA GeForce 210"},
{0x10de, 0x0a20, "NVIDIA GeForce GT 220"},
{0x10de, 0x0ca3, "NVIDIA GeForce GT 240"},
{0x10de, 0x0615, "NVIDIA GeForce GTS 250"},
{0x10de, 0x05e2, "NVIDIA GeForce GTX 260"},
{0x10de, 0x05e6, "NVIDIA GeForce GTX 275"},
{0x10de, 0x05e1, "NVIDIA GeForce GTX 280"},
{0x10de, 0x0a7a, "NVIDIA GeForce 315M"},
{0x10de, 0x08a3, "NVIDIA GeForce 320M"},
{0x10de, 0x0a2d, "NVIDIA GeForce GT 320M"},
{0x10de, 0x0a35, "NVIDIA GeForce GT 325M"},
{0x10de, 0x0ca0, "NVIDIA GeForce GT 330"},
{0x10de, 0x0cb0, "NVIDIA GeForce GTS 350M"},
{0x10de, 0x1055, "NVIDIA GeForce 410M"},
{0x10de, 0x0de2, "NVIDIA GeForce GT 420"},
{0x10de, 0x0df0, "NVIDIA GeForce GT 425M"},
{0x10de, 0x0de1, "NVIDIA GeForce GT 430"},
{0x10de, 0x0de0, "NVIDIA GeForce GT 440"},
{0x10de, 0x0dc4, "NVIDIA GeForce GTS 450"},
{0x10de, 0x0e22, "NVIDIA GeForce GTX 460"},
{0x10de, 0x0dd1, "NVIDIA GeForce GTX 460M"},
{0x10de, 0x06c4, "NVIDIA GeForce GTX 465"},
{0x10de, 0x06cd, "NVIDIA GeForce GTX 470"},
{0x10de, 0x06c0, "NVIDIA GeForce GTX 480"},
{0x10de, 0x1040, "NVIDIA GeForce GT 520"},
{0x10de, 0x0dec, "NVIDIA GeForce GT 525M"},
{0x10de, 0x0df4, "NVIDIA GeForce GT 540M"},
{0x10de, 0x1244, "NVIDIA GeForce GTX 550 Ti"},
{0x10de, 0x04b8, "NVIDIA GeForce GT 555M"},
{0x10de, 0x1200, "NVIDIA GeForce GTX 560 Ti"},
{0x10de, 0x1251, "NVIDIA GeForce GTX 560M"},
{0x10de, 0x1201, "NVIDIA GeForce GTX 560"},
{0x10de, 0x1081, "NVIDIA GeForce GTX 570"},
{0x10de, 0x1080, "NVIDIA GeForce GTX 580"},
{0x10de, 0x104a, "NVIDIA GeForce GT 610"},
{0x10de, 0x0f00, "NVIDIA GeForce GT 630"},
{0x10de, 0x0de9, "NVIDIA GeForce GT 630M"},
{0x10de, 0x0fc1, "NVIDIA GeForce GT 640"},
{0x10de, 0x0fd2, "NVIDIA GeForce GT 640M"},
{0x10de, 0x0fd1, "NVIDIA GeForce GT 650M"},
{0x10de, 0x0fc6, "NVIDIA GeForce GTX 650"},
{0x10de, 0x11c6, "NVIDIA GeForce GTX 650 Ti"},
{0x10de, 0x11c0, "NVIDIA GeForce GTX 660"},
{0x10de, 0x0fd4, "NVIDIA GeForce GTX 660M"},
{0x10de, 0x1183, "NVIDIA GeForce GTX 660 Ti"},
{0x10de, 0x1189, "NVIDIA GeForce GTX 670"},
{0x10de, 0x11a1, "NVIDIA GeForce GTX 670MX"},
{0x10de, 0x11a7, "NVIDIA GeForce GTX 675MX"},
{0x10de, 0x11a2, "NVIDIA GeForce GTX 675MX"},
{0x10de, 0x1180, "NVIDIA GeForce GTX 680"},
{0x10de, 0x1188, "NVIDIA GeForce GTX 690"},
{0x10de, 0x128b, "NVIDIA GeForce GT 720"},
{0x10de, 0x1287, "NVIDIA GeForce GT 730"},
{0x10de, 0x0fe1, "NVIDIA GeForce GT 730M"},
{0x10de, 0x1292, "NVIDIA GeForce GT 740M"},
{0x10de, 0x0fe9, "NVIDIA GeForce GT 750M"},
{0x10de, 0x0fcd, "NVIDIA GeForce GT 755M"},
{0x10de, 0x1381, "NVIDIA GeForce GTX 750"},
{0x10de, 0x1380, "NVIDIA GeForce GTX 750 Ti"},
{0x10de, 0x1187, "NVIDIA GeForce GTX 760"},
{0x10de, 0x1193, "NVIDIA GeForce GTX 760 Ti"},
{0x10de, 0x11e2, "NVIDIA GeForce GTX 765M"},
{0x10de, 0x11e0, "NVIDIA GeForce GTX 770M"},
{0x10de, 0x1184, "NVIDIA GeForce GTX 770"},
{0x10de, 0x119d, "NVIDIA GeForce GTX 775M"},
{0x10de, 0x1004, "NVIDIA GeForce GTX 780"},
{0x10de, 0x119e, "NVIDIA GeForce GTX 780M"},
{0x10de, 0x100a, "NVIDIA GeForce GTX 780 Ti"},
{0x10de, 0x1005, "NVIDIA GeForce GTX TITAN"},
{0x10de, 0x100c, "NVIDIA GeForce GTX TITAN Black"},
{0x10de, 0x17c2, "NVIDIA GeForce GTX TITAN X"},
{0x10de, 0x1001, "NVIDIA GeForce GTX TITAN Z"},
{0x10de, 0x0fed, "NVIDIA GeForce 820M"},
{0x10de, 0x1340, "NVIDIA GeForce 830M"},
{0x10de, 0x1341, "NVIDIA GeForce 840M"},
{0x10de, 0x1344, "NVIDIA GeForce 845M"},
{0x10de, 0x1391, "NVIDIA GeForce GTX 850M"},
{0x10de, 0x1392, "NVIDIA GeForce GTX 860M"},
{0x10de, 0x119a, "NVIDIA GeForce GTX 860M"},
{0x10de, 0x1199, "NVIDIA GeForce GTX 870M"},
{0x10de, 0x1198, "NVIDIA GeForce GTX 880M"},
{0x10de, 0x1347, "NVIDIA GeForce 940M"},
{0x10de, 0x1402, "NVIDIA GeForce GTX 950"},
{0x10de, 0x139a, "NVIDIA GeForce GTX 950M"},
{0x10de, 0x1401, "NVIDIA GeForce GTX 960"},
{0x10de, 0x139b, "NVIDIA GeForce GTX 960M"},
{0x10de, 0x13c2, "NVIDIA GeForce GTX 970"},
{0x10de, 0x13d8, "NVIDIA GeForce GTX 970M"},
{0x10de, 0x13c0, "NVIDIA GeForce GTX 980"},
{0x10de, 0x17c8, "NVIDIA GeForce GTX 980 Ti"},
{0x10de, 0x1d01, "NVIDIA GeForce GT 1030"},
{0x10de, 0x1c81, "NVIDIA GeForce GTX 1050"},
{0x10de, 0x1c82, "NVIDIA GeForce GTX 1050 Ti"},
{0x10de, 0x1c02, "NVIDIA GeForce GTX 1060 3GB"},
{0x10de, 0x1c03, "NVIDIA GeForce GTX 1060"},
{0x10de, 0x1c20, "NVIDIA GeForce GTX 1060M"},
{0x10de, 0x1b81, "NVIDIA GeForce GTX 1070"},
{0x10de, 0x1be1, "NVIDIA GeForce GTX 1070M"},
{0x10de, 0x1b80, "NVIDIA GeForce GTX 1080"},
{0x10de, 0x1be0, "NVIDIA GeForce GTX 1080M"},
{0x10de, 0x1b06, "NVIDIA GeForce GTX 1080 Ti"},
{0x10de, 0x1b00, "NVIDIA TITAN X (Pascal)"},
{0x10de, 0x1d81, "NVIDIA TITAN V"},
{0x10de, 0x1f82, "NVIDIA GeForce GTX 1650"},
{0x10de, 0x2187, "NVIDIA GeForce GTX 1650 SUPER"},
{0x10de, 0x21c4, "NVIDIA GeForce GTX 1660 SUPER"},
{0x10de, 0x2182, "NVIDIA GeForce GTX 1660 Ti"},
{0x10de, 0x1f08, "NVIDIA GeForce RTX 2060"},
{0x10de, 0x1f07, "NVIDIA GeForce RTX 2070"},
{0x10de, 0x1e87, "NVIDIA GeForce RTX 2080"},
{0x10de, 0x1e07, "NVIDIA GeForce RTX 2080 Ti"},
{0x10de, 0x2507, "NVIDIA GeForce RTX 3050"},
{0x10de, 0x2544, "NVIDIA GeForce RTX 3060"},
{0x10de, 0x2504, "NVIDIA GeForce RTX 3060 (Low Hash Rate)"},
{0x10de, 0x2414, "NVIDIA GeForce RTX 3060 Ti (GA103)"},
{0x10de, 0x2486, "NVIDIA GeForce RTX 3060 Ti (GA104)"},
{0x10de, 0x2489, "NVIDIA GeForce RTX 3060 Ti (GA104, Low Hash Rate)"},
{0x10de, 0x2484, "NVIDIA GeForce RTX 3070"},
{0x10de, 0x2488, "NVIDIA GeForce RTX 3070 (Low Hash Rate)"},
{0x10de, 0x249d, "NVIDIA GeForce RTX 3070 (mobile)"},
{0x10de, 0x2482, "NVIDIA GeForce RTX 3070 Ti"},
{0x10de, 0x2206, "NVIDIA GeForce RTX 3080 10GB"},
{0x10de, 0x2216, "NVIDIA GeForce RTX 3080 10GB (Low Hash Rate)"},
{0x10de, 0x220a, "NVIDIA GeForce RTX 3080 12GB"},
{0x10de, 0x2208, "NVIDIA GeForce RTX 3080 Ti"},
{0x10de, 0x2204, "NVIDIA GeForce RTX 3090"},
{0x10de, 0x2203, "NVIDIA GeForce RTX 3090 Ti"},
{0x10de, 0x1eb8, "NVIDIA Tesla T4"},
{0x10de, 0x2236, "NVIDIA Ampere A10"},
{0x10de, 0x2882, "NVIDIA GeForce RTX 4060"},
{0x10de, 0x28a0, "NVIDIA GeForce RTX 4060M"},
{0x10de, 0x2803, "NVIDIA GeForce RTX 4060 Ti 8GB"},
{0x10de, 0x2805, "NVIDIA GeForce RTX 4060 Ti 16GB"},
{0x10de, 0x2786, "NVIDIA GeForce RTX 4070"},
{0x10de, 0x2783, "NVIDIA GeForce RTX 4070 SUPER"},
{0x10de, 0x2782, "NVIDIA GeForce RTX 4070 Ti"},
{0x10de, 0x2705, "NVIDIA GeForce RTX 4070 Ti SUPER"},
{0x10de, 0x2704, "NVIDIA GeForce RTX 4080"},
{0x10de, 0x2702, "NVIDIA GeForce RTX 4080 SUPER"},
{0x10de, 0x2684, "NVIDIA GeForce RTX 4090"},
{0x1002, 0x5246, "ATI Rage Fury"},
{0x1002, 0x5144, "ATI RADEON 7200 SERIES"},
{0x1002, 0x514c, "ATI RADEON 8500 SERIES"},
{0x1002, 0x4144, "ATI Radeon 9500"},
{0x1002, 0x5955, "ATI RADEON XPRESS 200M Series"},
{0x1002, 0x5e4c, "ATI Radeon X700 SE"},
{0x1002, 0x71c2, "ATI Radeon X1600 Series"},
{0x1002, 0x94c7, "ATI Mobility Radeon HD 2350"},
{0x1002, 0x9581, "ATI Mobility Radeon HD 2600"},
{0x1002, 0x9400, "ATI Radeon HD 2900 XT"},
{0x1002, 0x9620, "ATI Radeon HD 3200 Graphics"},
{0x1002, 0x9515, "ATI Radeon HD 3850 AGP"},
{0x1002, 0x9712, "ATI Mobility Radeon HD 4200"},
{0x1002, 0x954f, "ATI Radeon HD 4350"},
{0x1002, 0x9495, "ATI Radeon HD 4600 Series"},
{0x1002, 0x944e, "ATI Radeon HD 4700 Series"},
{0x1002, 0x944c, "ATI Radeon HD 4800 Series"},
{0x1002, 0x68f9, "ATI Radeon HD 5400 Series"},
{0x1002, 0x68d8, "ATI Radeon HD 5600 Series"},
{0x1002, 0x68be, "ATI Radeon HD 5700 Series"},
{0x1002, 0x6898, "ATI Radeon HD 5800 Series"},
{0x1002, 0x689c, "ATI Radeon HD 5900 Series"},
{0x1002, 0x9803, "AMD Radeon HD 6300 series Graphics"},
{0x1002, 0x6770, "AMD Radeon HD 6400 Series"},
{0x1002, 0x9644, "AMD Radeon HD 6410D"},
{0x1002, 0x9648, "AMD Radeon HD 6480G"},
{0x1002, 0x6760, "AMD Radeon HD 6490M"},
{0x1002, 0x9640, "AMD Radeon HD 6550D"},
{0x1002, 0x6758, "AMD Radeon HD 6600 Series"},
{0x1002, 0x6741, "AMD Radeon HD 6600M Series"},
{0x1002, 0x68ba, "AMD Radeon HD 6700 Series"},
{0x1002, 0x6739, "AMD Radeon HD 6800 Series"},
{0x1002, 0x6719, "AMD Radeon HD 6900 Series"},
{0x1002, 0x9901, "AMD Radeon HD 7660D"},
{0x1002, 0x683d, "AMD Radeon HD 7700 Series"},
{0x1002, 0x6819, "AMD Radeon HD 7800 Series"},
{0x1002, 0x6818, "AMD Radeon HD 7870 Series"},
{0x1002, 0x679a, "AMD Radeon HD 7900 Series"},
{0x1002, 0x6660, "AMD Radeon HD 8600M Series"},
{0x1002, 0x6610, "AMD Radeon HD 8670"},
{0x1002, 0x665c, "AMD Radeon HD 8770"},
{0x1002, 0x9830, "AMD Radeon HD 8400 / R3 Series"},
{0x1002, 0x130f, "AMD Radeon(TM) R7 Graphics"},
{0x1002, 0x6939, "AMD Radeon R9 285"},
{0x1002, 0x67b1, "AMD Radeon R9 290"},
{0x1002, 0x67b0, "AMD Radeon R9 290X"},
{0x1002, 0x7300, "AMD Radeon (TM) R9 Fury Series"},
{0x1002, 0x6821, "AMD Radeon R9 M370X"},
{0x1002, 0x6647, "AMD Radeon R9 M380"},
{0x1002, 0x6920, "AMD Radeon R9 M395X"},
{0x1002, 0x67ef, "Radeon(TM) RX 460 Graphics"},
{0x1002, 0x67df, "Radeon (TM) RX 480 Graphics"},
{0x1002, 0x73df, "AMD Radeon RX 6700 XT"},
{0x1002, 0x687f, "Radeon RX Vega"},
{0x1002, 0x69af, "Radeon Pro Vega 20"},
{0x1002, 0x15dd, "AMD Radeon(TM) Vega 10 Mobile Graphics"},
{0x1002, 0x66af, "Radeon RX Vega 20"},
{0x1002, 0x731f, "Radeon RX 5700 / 5700 XT"},
{0x1002, 0x7340, "Radeon RX 5500M"},
{0x1002, 0x73bf, "Radeon RX 6800/6800 XT / 6900 XT"},
{0x1002, 0x7480, "AMD Radeon RX 7600 XT"},
{0x1002, 0x7590, "AMD Radeon RX 9060 XT"},
{0x1002, 0x73a1, "Radeon Pro V620"},
{0x1002, 0x73ae, "Radeon Pro V620 VF"},
{0x1002, 0x163f, "AMD VANGOGH"},
{0x1002, 0x164e, "AMD Radeon(TM) Graphics"},
{0x8086, 0x3577, "Intel(R) 82830M Graphics Controller"},
{0x8086, 0x3582, "Intel(R) 82852/82855 GM/GME Graphics Controller"},
{0x8086, 0x2562, "Intel(R) 845G"},
{0x8086, 0x2572, "Intel(R) 82865G Graphics Controller"},
{0x8086, 0x2582, "Intel(R) 82915G/GV/910GL Express Chipset Family"},
{0x8086, 0x258a, "Intel(R) E7221G"},
{0x8086, 0x2592, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family"},
{0x8086, 0x2772, "Intel(R) 945G"},
{0x8086, 0x27a2, "Mobile Intel(R) 945GM Express Chipset Family"},
{0x8086, 0x27ae, "Intel(R) 945GME"},
{0x8086, 0x29b2, "Intel(R) Q35"},
{0x8086, 0x29c2, "Intel(R) G33"},
{0x8086, 0x29d2, "Intel(R) Q33"},
{0x8086, 0xa001, "Intel(R) IGD"},
{0x8086, 0xa011, "Intel(R) IGD"},
{0x8086, 0x2992, "Intel(R) 965Q"},
{0x8086, 0x2982, "Intel(R) 965G"},
{0x8086, 0x2972, "Intel(R) 946GZ"},
{0x8086, 0x2a02, "Mobile Intel(R) 965 Express Chipset Family"},
{0x8086, 0x2a12, "Intel(R) 965GME"},
{0x8086, 0x2a42, "Mobile Intel(R) GM45 Express Chipset Family"},
{0x8086, 0x2e02, "Intel(R) Integrated Graphics Device"},
{0x8086, 0x2e22, "Intel(R) G45/G43"},
{0x8086, 0x2e12, "Intel(R) Q45/Q43"},
{0x8086, 0x2e32, "Intel(R) G41"},
{0x8086, 0x2e92, "Intel(R) B43"},
{0x8086, 0x0042, "Intel(R) HD Graphics"},
{0x8086, 0x0046, "Intel(R) HD Graphics"},
{0x8086, 0x0122, "Intel(R) HD Graphics 3000"},
{0x8086, 0x0126, "Intel(R) HD Graphics 3000"},
{0x8086, 0x010a, "Intel(R) HD Graphics Family"},
{0x8086, 0x0162, "Intel(R) HD Graphics 4000"},
{0x8086, 0x0166, "Intel(R) HD Graphics 4000"},
{0x8086, 0x015a, "Intel(R) HD Graphics Family"},
{0x8086, 0x0412, "Intel(R) HD Graphics 4600"},
{0x8086, 0x0416, "Intel(R) HD Graphics 4600"},
{0x8086, 0x0a26, "Intel(R) HD Graphics 5000"},
{0x8086, 0x0422, "Intel(R) HD Graphics 5000"},
{0x8086, 0x0a22, "Intel(R) Iris(TM) Graphics 5100"},
{0x8086, 0x0a2a, "Intel(R) Iris(TM) Graphics 5100"},
{0x8086, 0x0a2b, "Intel(R) Iris(TM) Graphics 5100"},
{0x8086, 0x0a2e, "Intel(R) Iris(TM) Graphics 5100"},
{0x8086, 0x0d22, "Intel(R) Iris(TM) Pro Graphics 5200"},
{0x8086, 0x0d26, "Intel(R) Iris(TM) Pro Graphics 5200"},
{0x8086, 0x0d2a, "Intel(R) Iris(TM) Pro Graphics 5200"},
{0x8086, 0x0d2b, "Intel(R) Iris(TM) Pro Graphics 5200"},
{0x8086, 0x0d2e, "Intel(R) Iris(TM) Pro Graphics 5200"},
{0x8086, 0x0c22, "Intel(R) Iris(TM) Pro Graphics 5200"},
{0x8086, 0x161e, "Intel(R) HD Graphics 5300"},
{0x8086, 0x1616, "Intel(R) HD Graphics 5500"},
{0x8086, 0x1612, "Intel(R) HD Graphics 5600"},
{0x8086, 0x1626, "Intel(R) HD Graphics 6000"},
{0x8086, 0x162b, "Intel(R) Iris(TM) Graphics 6100"},
{0x8086, 0x1622, "Intel(R) Iris(TM) Pro Graphics 6200"},
{0x8086, 0x162a, "Intel(R) Iris(TM) Pro Graphics P6300"},
{0x8086, 0x1902, "Intel(R) HD Graphics 510"},
{0x8086, 0x1906, "Intel(R) HD Graphics 510"},
{0x8086, 0x190b, "Intel(R) HD Graphics 510"},
{0x8086, 0x191e, "Intel(R) HD Graphics 515"},
{0x8086, 0x1916, "Intel(R) HD Graphics 520"},
{0x8086, 0x1921, "Intel(R) HD Graphics 520"},
{0x8086, 0x1912, "Intel(R) HD Graphics 530"},
{0x8086, 0x191b, "Intel(R) HD Graphics 530"},
{0x8086, 0x191d, "Intel(R) HD Graphics P530"},
{0x8086, 0x1926, "Intel(R) Iris(TM) Graphics 540"},
{0x8086, 0x1927, "Intel(R) Iris(TM) Graphics 550"},
{0x8086, 0x192b, "Intel(R) Iris(TM) Graphics 555"},
{0x8086, 0x192d, "Intel(R) Iris(TM) Graphics P555"},
{0x8086, 0x1932, "Intel(R) Iris(TM) Pro Graphics 580"},
{0x8086, 0x193b, "Intel(R) Iris(TM) Pro Graphics 580"},
{0x8086, 0x193a, "Intel(R) Iris(TM) Pro Graphics P580"},
{0x8086, 0x193d, "Intel(R) Iris(TM) Pro Graphics P580"},
{0x8086, 0x87c0, "Intel(R) UHD Graphics 617"},
{0x8086, 0x3ea0, "Intel(R) UHD Graphics 620"},
{0x8086, 0x5917, "Intel(R) UHD Graphics 620"},
{0x8086, 0x591e, "Intel(R) HD Graphics 615"},
{0x8086, 0x5916, "Intel(R) HD Graphics 620"},
{0x8086, 0x5912, "Intel(R) HD Graphics 630"},
{0x8086, 0x591b, "Intel(R) HD Graphics 630"},
{0x8086, 0x3e9b, "Intel(R) UHD Graphics 630"},
{0x8086, 0x3e91, "Intel(R) UHD Graphics 630"},
};
static inline const char *wine_device_name(uint32_t vendor_id, uint32_t device_id, const char *native_name) {
for (size_t i = 0; i < sizeof(wine_gpu_names) / sizeof(wine_gpu_names[0]); i++) {
if (wine_gpu_names[i].vendor_id == vendor_id && wine_gpu_names[i].device_id == device_id) {
return wine_gpu_names[i].name;
}
}
return native_name;
}
#endif
+23 -7
View File
@@ -18,8 +18,8 @@ _portprotonqt_completions() {
prev="${COMP_WORDS[COMP_CWORD-1]}"
# All available options
opts="--fullscreen --resolution --debug-level --add-steam-compat-tool --reinstall-steam-compat-tool --remove-steam-compat-tool --clear-cache --reset-settings --ppqtos --silent --log --restore-prefix --create-backup --help -h"
long_opts="--fullscreen --resolution --debug-level --add-steam-compat-tool --reinstall-steam-compat-tool --remove-steam-compat-tool --clear-cache --reset-settings --ppqtos --silent --log --restore-prefix --create-backup --help"
opts="--fullscreen --resolution --debug-level --add-steam-compat-tool --reinstall-steam-compat-tool --remove-steam-compat-tool --list-games --all --game-info --edit-game --set --fields --pretty --raw --clear-cache --reset-settings --ppqtos --silent --log --restore-prefix --create-backup --help -h"
long_opts="--fullscreen --resolution --debug-level --add-steam-compat-tool --reinstall-steam-compat-tool --remove-steam-compat-tool --list-games --all --game-info --edit-game --set --fields --pretty --raw --clear-cache --reset-settings --ppqtos --silent --log --restore-prefix --create-backup --help"
# Values for options with arguments
local debug_levels="ALL DEBUG INFO WARNING ERROR CRITICAL"
@@ -73,11 +73,19 @@ _portprotonqt() {
'--add-steam-compat-tool[Add as Steam compatibility tool]'
'--reinstall-steam-compat-tool[Reinstall Steam compatibility tool]'
'--remove-steam-compat-tool[Remove Steam compatibility tool]'
'--list-games[Print local game libraries as JSON]'
'--game-info[Print one game as JSON]:ID:'
'--edit-game[Edit game settings]:ID:'
'*--set[Set a game setting]:KEY=VALUE:'
'--all[Include uninstalled games in the library list]'
'--fields[Select JSON fields]:FIELD,...:'
'--pretty[Format JSON with indentation]'
'--raw[Print compact JSON]'
'--clear-cache[Clear PortProtonQt cache and exit]'
'--reset-settings[Reset PortProtonQt settings and exit]'
'--ppqtos[Show the system tab]'
'--silent[Launch .exe file without GUI]'
'--log[Enable PortProton logging]'
'--silent[Launch Windows file or native game in tray]'
'--log[Enable game logging]'
'--restore-prefix[Restore prefix from .ppack backup]:PPACK file:_files -g "*.ppack"'
'--create-backup[Create prefix backup]:PREFIX: :BACKUP_DIR:_files -/'
'(-h --help)'{-h,--help}'[Show help message]'
@@ -94,18 +102,26 @@ cat > "$OUTPUT_DIR/portprotonqt.fish" << 'EOF'
# Fish completion for portprotonqt
complete -c portprotonqt -f
complete -c portprotonqt -n "test -z (commandline -ct)" -a "--fullscreen --resolution --debug-level --add-steam-compat-tool --reinstall-steam-compat-tool --remove-steam-compat-tool --clear-cache --reset-settings --ppqtos --silent --log --restore-prefix --create-backup --help"
complete -c portprotonqt -n "test -z (commandline -ct)" -a "--fullscreen --resolution --debug-level --add-steam-compat-tool --reinstall-steam-compat-tool --remove-steam-compat-tool --list-games --all --game-info --edit-game --set --fields --pretty --raw --clear-cache --reset-settings --ppqtos --silent --log --restore-prefix --create-backup --help"
complete -c portprotonqt -l fullscreen -d "Launch in fullscreen mode"
complete -c portprotonqt -l resolution -d "Launch with specific resolution" -r -f -a "1920x1080 1280x720 2560x1440 3840x2160"
complete -c portprotonqt -l debug-level -d "Set logging level" -r -f -a "ALL DEBUG INFO WARNING ERROR CRITICAL"
complete -c portprotonqt -l add-steam-compat-tool -d "Add as Steam compatibility tool"
complete -c portprotonqt -l reinstall-steam-compat-tool -d "Reinstall Steam compatibility tool"
complete -c portprotonqt -l remove-steam-compat-tool -d "Remove Steam compatibility tool"
complete -c portprotonqt -l list-games -d "Print local game libraries as JSON"
complete -c portprotonqt -l game-info -d "Print one game as JSON" -r -f
complete -c portprotonqt -l edit-game -d "Edit game settings" -r -f
complete -c portprotonqt -l set -d "Set a game setting (KEY=VALUE)" -r -f
complete -c portprotonqt -l all -d "Include uninstalled games in the library list"
complete -c portprotonqt -l fields -d "Select JSON fields (comma-separated)" -r -f
complete -c portprotonqt -l pretty -d "Format JSON with indentation"
complete -c portprotonqt -l raw -d "Print compact JSON"
complete -c portprotonqt -l clear-cache -d "Clear PortProtonQt cache and exit"
complete -c portprotonqt -l reset-settings -d "Reset PortProtonQt settings and exit"
complete -c portprotonqt -l ppqtos -d "Show the system tab"
complete -c portprotonqt -l silent -d "Launch .exe file without GUI"
complete -c portprotonqt -l log -d "Enable PortProton logging"
complete -c portprotonqt -l silent -d "Launch Windows file or native game in tray"
complete -c portprotonqt -l log -d "Enable game logging"
complete -c portprotonqt -l restore-prefix -d "Restore prefix from .ppack backup" -r -a "(__fish_complete_suffix .ppack)"
complete -c portprotonqt -l create-backup -d "Create prefix backup" -r
complete -c portprotonqt -s h -l help -d "Show help message"
+104
View File
@@ -0,0 +1,104 @@
#!/usr/bin/env python3
"""Synchronize GPU names with Wine without rewriting the surrounding header."""
import os
from pathlib import Path
import re
import subprocess
import tempfile
from urllib.request import urlopen
ROOT = Path(__file__).resolve().parents[1]
HEADER = ROOT / "build-aux/src/wine_gpu_names.h"
WINE_REPOSITORY = "https://github.com/wine-mirror/wine.git"
WINE_SOURCE = "dlls/win32u/sysparams.c"
NETWORK_TIMEOUT = 30
MAX_SOURCE_BYTES = 2 * 1024 * 1024
C_STRING = r'"(?:[^"\\\r\n]|\\[^\r\n])*"'
WINE_ROW = re.compile(
r'case\s+MAKELONG\(\s*(0x[0-9a-fA-F]+)\s*,\s*(0x[0-9a-fA-F]+)\s*\)'
r'\s*:\s*return\s+(' + C_STRING + r')\s*;'
)
HEADER_ROW = re.compile(
r'^ \{(0x[0-9a-fA-F]+), (0x[0-9a-fA-F]+), (' + C_STRING + r')\},$', re.M,
)
TABLE = re.compile(r'(\} wine_gpu_names\[\] = \{\n)(.*?)(\n\};)', re.S)
def parse_wine_names(source):
function = re.search(
r'\bconst char\s*\*gpu_device_name\([^)]*\)\s*\{(.*?)\n\};', source, re.S,
)
if function is None:
raise ValueError("Wine gpu_device_name() was not found")
body = function.group(1)
rows = WINE_ROW.findall(body)
if not rows or len(rows) != len(re.findall(r'\bcase\b', body)):
raise ValueError("Wine GPU table is empty or contains unsupported cases")
result = []
seen = set()
for vendor, device, name in rows:
identity = (int(vendor, 16), int(device, 16))
if identity in seen or any(value > 0xffff for value in identity) or name == '""':
raise ValueError(f"Invalid or duplicate Wine GPU entry: {vendor}:{device}")
seen.add(identity)
result.append((f"0x{identity[0]:04x}", f"0x{identity[1]:04x}", name))
return result
def update_header(header, source, revision):
if not re.fullmatch(r'[0-9a-f]{40}', revision):
raise ValueError("Invalid Wine source revision")
rows = parse_wine_names(source)
tables = list(TABLE.finditer(header))
if len(tables) != 1:
raise ValueError("Expected exactly one wine_gpu_names array in the header")
table = tables[0]
existing = HEADER_ROW.findall(table.group(2))
if not existing or len(existing) != len(table.group(2).strip().splitlines()):
raise ValueError("Unsupported existing header table format")
if rows == existing:
return header
replacement = "\n".join(f" {{{vendor}, {device}, {name}}}," for vendor, device, name in rows)
updated = header[:table.start(2)] + replacement + header[table.end(2):]
updated, count = re.subn(r'^// Revision: [0-9a-f]{40}$', f"// Revision: {revision}", updated, flags=re.M)
if count != 1:
raise ValueError("Expected exactly one Wine revision comment")
return updated
def main():
print("Resolving Wine master revision...", flush=True)
refs = subprocess.run(
["git", "ls-remote", WINE_REPOSITORY, "refs/heads/master"],
capture_output=True, text=True, check=True, timeout=NETWORK_TIMEOUT,
).stdout.split()
if len(refs) != 2 or not re.fullmatch(r'[0-9a-f]{40}', refs[0]):
raise ValueError("Could not resolve Wine master revision")
revision = refs[0]
url = f"https://raw.githubusercontent.com/wine-mirror/wine/{revision}/{WINE_SOURCE}"
print(f"Fetching Wine GPU names at {revision}...", flush=True)
with urlopen(url, timeout=NETWORK_TIMEOUT) as response:
source = response.read(MAX_SOURCE_BYTES + 1)
if len(source) > MAX_SOURCE_BYTES:
raise ValueError("Wine source exceeds the download size limit")
header = HEADER.read_text(encoding="utf-8")
updated = update_header(header, source.decode("utf-8"), revision)
if updated == header:
print("Wine GPU names are unchanged.")
return
temporary = None
try:
with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", dir=HEADER.parent, delete=False) as output:
temporary = Path(output.name)
output.write(updated)
temporary.chmod(HEADER.stat().st_mode & 0o777)
os.replace(temporary, HEADER)
finally:
if temporary is not None:
temporary.unlink(missing_ok=True)
print(f"Updated {len(parse_wine_names(source.decode('utf-8')))} Wine GPU names.")
if __name__ == "__main__":
main()
+2
View File
@@ -40,6 +40,8 @@ pkgdatadir = pythondir / meson.project_name()
cc = meson.get_compiler('c')
sdl3_dep = dependency('sdl3', required: true)
gamepad_sources = files('build-aux/src/gamepad_backend.c')
keyboard_deps = [dependency('wayland-client'), dependency('xkbcommon'), dependency('x11')]
keyboard_sources = files('build-aux/src/keyboard_backend.c')
# Install Python package
subdir('portprotonqt')
+66 -8
View File
@@ -25,6 +25,7 @@ from PySide6.QtGui import QIcon
from portprotonqt.config import (
consume_download_counter_skip,
display_config,
find_game_by_exe,
get_portproton_start_command,
get_portproton_location,
save_portdata_path_to_config,
@@ -33,6 +34,7 @@ from portprotonqt.config import (
window_config,
)
from portprotonqt.logger import get_logger, setup_logger
from portprotonqt.native_games import NATIVE_URI_PREFIX, create_native_desktop_file
from portprotonqt.cli import (
parse_args,
is_portproton_url,
@@ -140,6 +142,38 @@ def is_restore_prefix_request(args: argparse.Namespace) -> bool:
def main():
parsed_args = parse_args()
if parsed_args.list_games or parsed_args.game_info or parsed_args.edit_game:
import orjson
from portprotonqt.cli import edit_game, list_games
try:
if parsed_args.edit_game:
result = edit_game(parsed_args.edit_game, parsed_args.settings)
elif parsed_args.game_info:
games = list_games()
result = next((game for game in games if game["id"] == parsed_args.game_info), None)
if result is None:
get_logger(__name__).error("Game not found: %s", parsed_args.game_info)
return 1
else:
result = [game for game in list_games() if parsed_args.all_games or game.get("installed", False)]
if parsed_args.fields:
entries = result if isinstance(result, list) else [result]
selected = [{field: game.get(field) for field in parsed_args.fields} for game in entries]
result = selected if isinstance(result, list) else selected[0]
option = orjson.OPT_INDENT_2 if parsed_args.pretty else 0
sys.stdout.write(orjson.dumps(result, option=option).decode("utf-8") + "\n")
except OSError as error:
get_logger(__name__).error("Library command failed: %s", error)
return 1
except ValueError as error:
get_logger(__name__).error("Invalid library command: %s", error)
return 1
except RuntimeError as error:
get_logger(__name__).error("Failed to edit game settings: %s", error)
return 1
return 0
os.environ["PORTPROTONQT_PYTHON"] = sys.executable
if os.environ.get("PORTPROTONQT_INTEGRATE_APPIMAGE") == "1":
@@ -239,6 +273,17 @@ def main():
app.setApplicationVersion(__app_version__)
args = parsed_args
native_launch_uri = None
if args.file_or_url and args.file_or_url.startswith(NATIVE_URI_PREFIX):
native_launch_uri = args.file_or_url
elif args.file_or_url and not is_launch_file(args.file_or_url):
target = normalize_launch_path(args.file_or_url)
if os.path.isfile(target) and os.access(target, os.X_OK) and not is_autoinstall_file(target) and not is_prefix_backup_file(target):
entry = find_game_by_exe(target)
name = entry.get("Name", os.path.basename(target)) if entry is not None else os.path.basename(target)
result = create_native_desktop_file(target, name)
if result and os.path.isfile(result[1]):
native_launch_uri = NATIVE_URI_PREFIX + result[1]
setup_logger(args.debug_level)
logger = get_logger(__name__)
if consume_download_counter_skip():
@@ -270,6 +315,9 @@ def main():
elif is_restore_prefix_request(args):
restore_prefix_path = normalize_launch_path(args.file_or_url)
ipc_message = f"restore:{quote(restore_prefix_path, safe='')}"
elif native_launch_uri:
launch_action = "silent" if is_silent_launch and not args.log else "log" if args.log else "open"
ipc_message = f"{launch_action}:{quote(native_launch_uri, safe='')}"
elif args.file_or_url and is_launch_file(args.file_or_url):
launch_action = "silent" if is_silent_launch and not args.log else "log" if args.log else "open"
ipc_message = f"{launch_action}:{normalize_launch_path(args.file_or_url)}"
@@ -367,7 +415,7 @@ def main():
logger.warning("Failed to persist PORT_DATA_PATH in PortProtonQt config")
# Check if we have a portproton:// URL or launch file to handle
if args.file_or_url and not restore_prefix_path and not gog_launch_uri and not egs_launch_uri:
if args.file_or_url and not restore_prefix_path and not gog_launch_uri and not egs_launch_uri and not native_launch_uri:
if is_portproton_url(args.file_or_url):
# Parse the portproton:// URL to get the full download URL
download_url = parse_portproton_url(args.file_or_url)
@@ -452,7 +500,7 @@ def main():
launch_path = exe_path or autoinstall_path
silent_game_request = is_silent_launch and not args.log and bool(
exe_path or gog_launch_uri or egs_launch_uri
exe_path or gog_launch_uri or egs_launch_uri or native_launch_uri
)
window = MainWindow(app_name=__app_name__, version=version, launch_exe=launch_path, resolution=window_resolution, show_system_tab=args.ppqtos)
window.silent_launch_mode = silent_game_request
@@ -462,9 +510,9 @@ def main():
window.tray_manager.set_minimal_mode()
def open_store_game_card(source: str, app_id: str, log_mode: bool = False) -> None:
exec_line = f"{source}://launch/{app_id}"
exec_line = NATIVE_URI_PREFIX + app_id if source == "native" else f"{source}://launch/{app_id}"
if log_mode:
window._pending_log_exe = getattr(window, f"{source}_api").get_launch_target(app_id)
window._pending_log_exe = exec_line if source == "native" else getattr(window, f"{source}_api").get_launch_target(app_id)
def open_card(games: list[tuple]) -> None:
game = next((item for item in games if item[5] == exec_line), None)
@@ -478,7 +526,7 @@ def main():
"anticheat_status": game[9], "playtime_seconds": game[11],
"game_source": game[12], "anticheat_slug": game[13],
"ppdb_id": game[14], "ppdb_rating": game[15],
"protondb_appid": game[16],
"protondb_appid": game[16] if len(game) > 16 else "",
})
loader = getattr(window, f"_load_{source}_games_async")
@@ -506,6 +554,12 @@ def main():
restart_target = target
app.quit()
return
if target.startswith(NATIVE_URI_PREFIX):
if silent and not log_mode:
window.toggleGame(target)
else:
open_store_game_card("native", target.removeprefix(NATIVE_URI_PREFIX), log_mode)
return
if is_launch_file(target):
path = normalize_launch_path(target)
if silent:
@@ -520,7 +574,11 @@ def main():
open_store_game_card(source, app_id, log_mode)
# Handle launch file if provided
if exe_path:
if native_launch_uri:
def handle_native_launch() -> None:
handle_game_request(native_launch_uri, is_silent_launch and not args.log, args.log)
QTimer.singleShot(0, handle_native_launch)
elif exe_path:
# Defer the call until after the window is shown
def handle_launch_exe() -> None:
handle_game_request(exe_path, is_silent_launch and not args.log, args.log)
@@ -601,8 +659,8 @@ def main():
if launch_path and is_launch_file(launch_path):
logger.info("Opening launch file via IPC: %s", launch_path)
handle_game_request(launch_path, False, log_mode)
elif log_mode and launch_path.startswith(("gog://launch/", "egs://launch/")):
handle_game_request(unquote(launch_path), False, True)
elif launch_path.startswith(NATIVE_URI_PREFIX) or (log_mode and launch_path.startswith(("gog://launch/", "egs://launch/"))):
handle_game_request(unquote(launch_path), False, log_mode)
else:
logger.warning("Invalid launch file via IPC: %s", launch_path)
elif msg.startswith("restore:"):
+291 -3
View File
@@ -2,6 +2,7 @@ import argparse
import os
import re
import shutil
import shlex
import sys
from pathlib import Path
@@ -17,6 +18,27 @@ def parse_args():
Parses command-line arguments.
"""
parser = argparse.ArgumentParser(description="PortProtonQt CLI")
library = parser.add_mutually_exclusive_group()
library.add_argument(
"--list-games", action="store_true",
help="Print local PortProton, Steam, GOG and EGS library data as JSON and exit"
)
library.add_argument(
"--game-info", metavar="ID",
help="Print one game as JSON using its source-qualified ID from --list-games"
)
library.add_argument("--edit-game", metavar="ID", help="Edit a game's PortProton settings and print its updated data")
parser.add_argument("--set", dest="settings", action="append", default=[], metavar="KEY=VALUE",
help="Set a game setting; repeat to change multiple values with --edit-game")
parser.add_argument("--all", dest="all_games", action="store_true",
help="Include uninstalled games from cached libraries in --list-games")
parser.add_argument("--fields", metavar="FIELD,...",
help="Select JSON fields for --list-games or --game-info (e.g. executable,icon,name)")
formatting = parser.add_mutually_exclusive_group()
formatting.add_argument("--pretty", dest="pretty", action="store_true", default=True,
help="Format JSON with indentation (default)")
formatting.add_argument("--raw", dest="pretty", action="store_false",
help="Print compact JSON without indentation")
parser.add_argument(
"--fullscreen",
action="store_true",
@@ -67,12 +89,12 @@ def parse_args():
parser.add_argument(
"--silent",
action="store_true",
help="Launch supported Windows file in tray without showing the main window"
help="Launch supported Windows file or native game in tray without showing the main window"
)
parser.add_argument(
"--log",
action="store_true",
help="Enable PortProton logging for the launched Windows file"
help="Enable logging for the launched Windows file or native game"
)
parser.add_argument(
"--restore-prefix",
@@ -89,7 +111,7 @@ def parse_args():
parser.add_argument(
'file_or_url',
nargs='?',
help="Launch file path (.exe/.bat/.cmd/.msi/.reg/.iso/.mdf/.nrg) or portproton:// URL"
help="Launch file path (.exe/.bat/.cmd/.msi/.reg/.iso/.mdf/.nrg), native executable, or portproton:// URL"
)
if os.environ.get("STEAM_COMPAT") == "1" and "--" in sys.argv[1:]:
separator_index = sys.argv.index("--")
@@ -106,10 +128,276 @@ def parse_args():
args = parser.parse_args()
launch_args = []
if args.settings and not args.edit_game:
parser.error("--set requires --edit-game")
if args.edit_game and not args.settings:
parser.error("--edit-game requires at least one --set KEY=VALUE")
if args.all_games and not args.list_games:
parser.error("--all requires --list-games")
if args.fields is not None:
if not (args.list_games or args.game_info):
parser.error("--fields requires --list-games or --game-info")
args.fields = [field.strip() for field in args.fields.split(",")]
if any(not re.fullmatch(r"[a-z][a-z_0-9]*", field) for field in args.fields):
parser.error("--fields requires comma-separated field names without empty entries")
args.launch_args = launch_args
return args
def _read_game_settings(path: Path) -> dict[str, str]:
"""Read literal shell assignments without executing configuration code."""
from portprotonqt.logger import get_logger
settings: dict[str, str] = {}
if not path.is_file():
return settings
try:
content = path.read_text(encoding="utf-8")
except (OSError, UnicodeError) as error:
get_logger(__name__).warning("Failed to read %s: %s", path, error)
return settings
for line in content.splitlines():
match = re.fullmatch(r"(?:export\s+)?([A-Za-z_][A-Za-z_0-9]*)=(.*)", line)
if not match:
match = re.fullmatch(r"check_variables ([A-Za-z_][A-Za-z_0-9]*) (.*)", line)
if not match:
continue
value = match[2]
if any(token in value for token in ("$", "`")):
continue
try:
lexer = shlex.shlex(value, posix=True, punctuation_chars=True)
lexer.whitespace_split = True
parts = list(lexer)
except ValueError:
continue
if len(parts) <= 1:
settings[match[1]] = parts[0] if parts else ""
return settings
def _get_game_metadata(name: str, exec_line: str, executable: str | None) -> dict:
"""Read custom artwork and cached metadata without fetching remote resources."""
from portprotonqt.config.portproton import get_custom_icon_path, resolve_custom_data_dir
from portprotonqt.image_utils import COVER_IMAGE_EXTENSIONS
from portprotonqt.localization import get_metadata_language, read_metadata_translations
from portprotonqt.steam_api.api import get_cached_steam_game_info
from portprotonqt.time_utils import (
get_last_launch_timestamp, get_playtime_for_exe, get_statistics_path,
)
metadata = get_cached_steam_game_info(name, exec_line)
metadata.setdefault("name", name)
metadata.setdefault("description", "")
metadata.setdefault("cover", "")
if not executable:
return metadata
data_home = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
folder = Path(resolve_custom_data_dir(str(data_home / "PortProtonQt/custom_data"), executable))
metadata["custom_data_directory"] = str(folder)
metadata_file = folder / "metadata.txt"
if metadata_file.is_file():
translations = read_metadata_translations(str(metadata_file), get_metadata_language())
metadata.update({key: value for key, value in translations.items() if value})
for extension in COVER_IMAGE_EXTENSIONS:
cover = folder / f"cover{extension}"
if cover.is_file():
metadata["cover"] = str(cover)
break
metadata["custom_icon"] = get_custom_icon_path(executable)
metadata["playtime_seconds"] = get_playtime_for_exe(get_statistics_path(), executable)
metadata["last_launch_timestamp"] = get_last_launch_timestamp(Path(executable).stem)
return metadata
def _get_game_runtime(
location: Path, executable: str | None, variables: dict[str, str], overrides: dict[str, str]
) -> dict:
"""Export configured runtime values; never source PPDB files or launch Wine."""
user_conf = location / "data/user.conf"
ppdb = Path(f"{executable}.ppdb") if executable else None
settings = _read_game_settings(ppdb) if ppdb else {}
runner = settings.get("PW_WINE_USE", overrides.get("PW_DEFAULT_WINE_USE", variables.get("PW_WINE_USE")))
prefix = settings.get("PW_PREFIX_NAME", overrides.get("PW_DEFAULT_PREFIX_NAME", variables.get("PW_PREFIX_NAME")))
settings.update(overrides)
runner = overrides.get("PW_WINE_VER") or overrides.get("PW_WINE_USE", runner)
prefix = overrides.get("PW_PREFIX_NAME", prefix)
resolved_runner = runner
if runner == "PROTON_LG":
resolved_runner = variables.get("PW_PROTON_LG_VER")
elif runner and (runner == "WINE_LG" or runner.startswith("WINE_") and runner.endswith("_LG")):
resolved_runner = variables.get("PW_WINE_LG_VER")
runner_path = None
if resolved_runner and resolved_runner != "USE_SYSTEM_WINE":
runner_path = Path(resolved_runner) if Path(resolved_runner).is_absolute() else (
location / "data/dist" / resolved_runner.upper()
)
elif resolved_runner == "USE_SYSTEM_WINE":
wine = shutil.which("wine")
runner_path = Path(wine).parent.parent if wine else None
wine_directory = runner_path
if wine_directory and (wine_directory / "files").is_dir() and not (wine_directory / "dist").is_dir():
wine_directory /= "files"
wine_bin = "bin-wow64" if settings.get("PW_USE_WOW64") == "1" and wine_directory and (
wine_directory / "bin-wow64"
).is_dir() else "bin"
prefix_path = location / "data/prefixes" / prefix if prefix else None
return {
"wine_path": str(wine_directory / wine_bin / "wine") if wine_directory else None,
"wineserver_path": str(wine_directory / wine_bin / "wineserver") if wine_directory else None,
"runner": resolved_runner,
"runner_path": str(runner_path) if runner_path else None,
"runner_installed": runner_path.is_dir() if runner_path else False,
"prefix": prefix, "prefix_path": str(prefix_path) if prefix_path else None,
"settings": settings, "user_config": str(user_conf),
"ppdb_exists": ppdb.is_file() if ppdb else False,
}
def _list_store_games(source: str, location: str | None, variables: dict, overrides: dict) -> list[dict]:
"""Export a cached GOG or Epic library using the existing store backends."""
from portprotonqt.egs_api import EGSAPI
from portprotonqt.gog_api import GOGAPI
from portprotonqt.main_window import MainWindow
api = GOGAPI() if source == "gog" else EGSAPI()
installed = api.load_installed()
games = []
for record in api.load_library():
app_id = str(record.get("app_id", ""))
if not app_id:
continue
is_installed = api.is_game_installed(app_id, installed)
target = api.get_launch_target(app_id) if is_installed else None
name, cover = MainWindow._get_custom_store_data(source, app_id, str(record.get("title", app_id)))
metadata = _get_game_metadata(name, target, target) if target else {}
metadata.pop("name", None)
icon = metadata.pop("custom_icon", "") or record.get("icon", "")
games.append({
**{key: value for key, value in record.items() if key not in {"app_id", "title"}},
**metadata,
"id": f"{source}:{app_id}", "source": source, "name": name,
"description": record.get("description") or metadata.get("description", ""),
"cover": cover or record.get("cover") or metadata.get("cover", ""),
"icon": icon, "installed": is_installed,
"exec": f"{source}://{'launch' if is_installed else 'install'}/{app_id}",
"executable": target, "directory": str(Path(target).parent) if target else None,
"runtime": _get_game_runtime(Path(location), target, variables, overrides) if location and target else None,
})
return games
def _list_steam_games() -> list[dict]:
"""Export installed Steam games and their locally cached metadata."""
from portprotonqt.main_window import MainWindow
from portprotonqt.steam_api import get_steam_installed_games
from portprotonqt.steam_api.api import get_cached_full_steam_game_info
games = []
for name, appid, last_played, playtime in get_steam_installed_games():
metadata = get_cached_full_steam_game_info(appid, name)
name, cover = MainWindow._get_custom_store_data("steam", appid, name)
games.append({
**metadata,
"id": f"steam:{appid}", "source": "steam", "name": name,
"cover": cover or metadata.get("cover", ""),
"installed": True, "exec": f"steam://rungameid/{appid}",
"last_launch_timestamp": last_played, "playtime_seconds": playtime,
})
return games
def _list_portproton_games(location: str | None, variables: dict, overrides: dict) -> list[dict]:
"""Return local PortProton shortcuts without launching games or downloading metadata."""
from portprotonqt.config.portproton import extract_exec_target_path, parse_desktop_entry
if not location:
return []
games = []
for desktop_path in sorted(Path(location).glob("*.desktop")):
entry = parse_desktop_entry(str(desktop_path))
if entry is None:
continue
exec_line = entry.get("Exec", "")
executable = extract_exec_target_path(exec_line)
metadata = _get_game_metadata(entry.get("Name", desktop_path.stem), exec_line, executable)
icon = metadata.pop("custom_icon", "") or entry.get("Icon", "")
games.append({
**metadata,
"id": f"portproton:{desktop_path.name}", "source": "portproton",
"installed": bool(executable and Path(executable).is_file()),
"name": metadata.get("name") or entry.get("Name", desktop_path.stem),
"runtime": _get_game_runtime(Path(location), executable, variables, overrides),
"desktop_file": str(desktop_path),
"exec": exec_line,
"executable": executable,
"directory": str(Path(executable).parent) if executable else None,
"icon": icon,
"ppdb": f"{executable}.ppdb" if executable else None,
})
return games
def list_games() -> list[dict]:
"""Return locally available library data from all supported game sources."""
from portprotonqt.config.portproton import get_portproton_location, get_portproton_scripts_path
location = get_portproton_location()
scripts = get_portproton_scripts_path()
variables = _read_game_settings(Path(scripts) / "var") if scripts else {}
overrides = _read_game_settings(Path(location) / "data/user.conf") if location else {}
games = _list_portproton_games(location, variables, overrides)
games.extend(_list_steam_games())
for source in ("gog", "egs"):
games.extend(_list_store_games(source, location, variables, overrides))
return games
def edit_game(game_id: str, changes: list[str]) -> dict:
"""Update a game's PPDB through PortProton and verify the saved settings."""
import subprocess
from portprotonqt.config.portproton import WINDOWS_LAUNCH_EXTENSIONS, get_portproton_start_command
from portprotonqt.settings_manager import ADVANCED_SETTING_KEYS, get_toggle_settings
game = next((game for game in list_games() if game["id"] == game_id), None)
if game is None:
raise ValueError(f"Game not found: {game_id}")
executable = game.get("executable")
if (game.get("source") not in {"portproton", "gog", "egs"} or not executable
or not Path(executable).is_file() or Path(executable).suffix.lower() not in WINDOWS_LAUNCH_EXTENSIONS):
raise ValueError("Editing requires an installed Windows game managed by PortProton, GOG or EGS")
toggles = set(get_toggle_settings()) | {"PW_MANGOHUD", "PW_VKBASALT", "PW_GAMESCOPE"}
allowed = set(ADVANCED_SETTING_KEYS) | toggles | set((game.get("runtime") or {}).get("settings", {}))
values: dict[str, str] = {}
for change in changes:
key, separator, value = change.partition("=")
if not separator or key not in allowed or not re.fullmatch(r"[A-Z_][A-Z_0-9]*", key):
raise ValueError(f"Unknown or invalid game setting: {key}")
if any(character in value for character in ("$", "`", "|", "\n", "\r", "\0")):
raise ValueError(f"Unsupported shell syntax in setting: {key}")
if key in toggles and value not in {"0", "1"}:
raise ValueError(f"{key} must be 0 or 1")
if key == "PW_PREFIX_NAME" and (not value or value in {".", ".."} or "/" in value or "\\" in value):
raise ValueError("PW_PREFIX_NAME must be a prefix name, not a path")
values[key] = value
if not values:
raise ValueError("At least one setting is required")
command = get_portproton_start_command()
if not command:
raise ValueError("PortProton start.sh was not found")
result = subprocess.run(
[*command, "cli", "--edit-db", executable, *[f"{key}={value}" for key, value in values.items()]],
capture_output=True, text=True, errors="replace", check=False,
)
if result.returncode:
raise RuntimeError(f"PortProton failed to edit game settings: {result.stderr.strip()}")
saved = _read_game_settings(Path(f"{executable}.ppdb"))
if any(saved.get(key) != value for key, value in values.items()):
raise RuntimeError("PortProton did not save the requested settings; check PPDB permissions")
return next(game for game in list_games() if game["id"] == game_id)
def add_steam_compat_tool(force_install: bool = False) -> bool:
"""
Add PortProtonQt as a Steam compatibility tool.
+125 -5
View File
@@ -2,6 +2,8 @@ import os
import glob
import shutil
import tempfile
import configparser
from pathlib import Path
from typing import TYPE_CHECKING
from PySide6.QtWidgets import QMessageBox, QDialog, QMenu, QLineEdit, QApplication, QVBoxLayout, QHBoxLayout, QLabel, QPushButton, QFrame
from PySide6.QtCore import QUrl, QPoint, QObject, Signal, Qt, QStandardPaths, QTimer, QSize, QProcess, QThread
@@ -9,6 +11,7 @@ from PySide6.QtGui import QDesktopServices, QIcon, QKeySequence, QAction
from portprotonqt.localization import _
from portprotonqt.config import (
create_desktop_file,
get_portproton_location,
extract_exec_target_path,
favorites_config,
favorites_folders_config,
@@ -29,6 +32,7 @@ from portprotonqt.icon_extractor import generate_thumbnail
from portprotonqt.dialogs import AddGameDialog
from portprotonqt.dialogs.base import DraggableDialog
from portprotonqt.theme_manager import ThemeManager
from portprotonqt.native_games import NATIVE_URI_PREFIX, build_native_shortcut_command, quote_native_arguments
from portprotonqt.logger import get_logger
from portprotonqt.virtual_keyboard import VirtualKeyboard
from portprotonqt.image_utils import COVER_IMAGE_EXTENSIONS
@@ -127,6 +131,8 @@ class ContextMenuManager:
Returns:
bool: True if the game is running, False otherwise.
"""
if game_card.game_source == "native":
return getattr(self.parent, "target_exe", None) == os.path.basename(game_card.exec_line.removeprefix("native://"))
if game_card.game_source == "steam":
return False
exec_line = self._get_exec_line(game_card.name, game_card.exec_line)
@@ -731,6 +737,9 @@ class ContextMenuManager:
)
)
if game_card.game_source == "native":
self._add_native_actions(menu, game_card)
if game_card.game_source == "steam":
desktop_dir = QStandardPaths.writableLocation(
QStandardPaths.StandardLocation.DesktopLocation
@@ -829,6 +838,96 @@ class ContextMenuManager:
menu.popup(game_card.mapToGlobal(pos))
def _add_native_actions(self, menu: QMenu, card: "GameCard") -> None:
source = Path(card.exec_line.removeprefix(NATIVE_URI_PREFIX))
data = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
managed = str(source.parent) == get_portproton_location() or source.parent == data / "PortProtonQt/native_games"
desktop = QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DesktopLocation)
for directory, add_text, remove_text, icon in (
(desktop, _("Add to Desktop"), _("Remove from Desktop"), "desktop"),
(self._get_applications_dir() if managed else "", _("Add to Menu"), _("Remove from Menu"), "menu"),
):
if not directory:
continue
exists = (Path(directory) / source.name).is_file()
action = menu.addAction(self._get_safe_icon("delete" if exists else icon), remove_text if exists else add_text)
action.triggered.connect(lambda _checked=False, target=directory: self._toggle_native_shortcut(card.exec_line, target))
if get_steam_home() is not None:
is_in_steam = is_game_in_steam(card.name)
action = menu.addAction(self._get_safe_icon("delete" if is_in_steam else "menu_steam"),
_("Remove from Steam") if is_in_steam else _("Add to Steam"))
action.triggered.connect(lambda: self.remove_from_steam(card.name, card.exec_line, "native")
if is_in_steam else self.add_to_steam(card.name, card.exec_line, card.cover_path))
action = menu.addAction(self._get_safe_icon("edit"), _("Edit Shortcut"))
action.triggered.connect(lambda: self._edit_native_shortcut(card))
if managed:
action = menu.addAction(self._get_safe_icon("delete"), _("Delete"))
action.triggered.connect(lambda: self.delete_game(card.name, card.exec_line))
action = menu.addAction(self._get_safe_icon("search"), _("Open Game Folder"))
action.triggered.connect(lambda: self.parent.detail_page_manager._open_executable_folder(card.exec_line))
def _toggle_native_shortcut(self, exec_line: str, directory: str) -> None:
source = Path(exec_line.removeprefix(NATIVE_URI_PREFIX))
target = Path(directory) / source.name
try:
if target.is_file():
if target == source:
retained = Path(get_portproton_location() or source.parent) / source.name
retained.parent.mkdir(parents=True, exist_ok=True)
shutil.copyfile(source, retained)
target.unlink()
else:
parser = configparser.ConfigParser(interpolation=None, strict=False)
parser.optionxform = lambda optionstr: optionstr
parser.read_string(source.read_text(encoding="utf-8"))
command = quote_native_arguments([exec_line])
parser["Desktop Entry"]["Exec"] = build_native_shortcut_command(command)
for action, mode in (("RunSilent", "--silent"), ("RunLog", "--log")):
section = f"Desktop Action {action}"
if parser.has_section(section):
parser[section]["Exec"] = build_native_shortcut_command(command, mode)
target.parent.mkdir(parents=True, exist_ok=True)
with target.open("w", encoding="utf-8") as output:
parser.write(output, space_around_delimiters=False)
target.chmod(0o755)
if directory == self._get_applications_dir():
self._update_desktop_database()
self.parent.refreshGames()
except Exception as error:
logger.warning("Cannot update native shortcut: %s", error)
self.signals.show_warning_dialog.emit(_("Error"), str(error))
def _edit_native_shortcut(self, card: "GameCard") -> None:
source = card.exec_line.removeprefix(NATIVE_URI_PREFIX)
dialog = AddGameDialog(parent=self.parent, theme=self.theme, edit_mode=True,
game_name=card.name, exe_path=source, cover_path=card.cover_path)
dialog.add_to_steam_checkbox.setChecked(is_game_in_steam(card.name))
if dialog.exec() != QDialog.DialogCode.Accepted:
return
name = dialog.nameEdit.text().strip()
if not name:
return
cover = dialog.coverEdit.text().strip()
if not os.path.isfile(cover) and dialog.last_cover_path:
cover = dialog.last_cover_path
try:
self._save_local_shortcut_name(source, name)
data = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
directory = resolve_custom_data_dir(os.path.join(data, "PortProtonQt/custom_data"), source)
if os.path.isfile(cover) and Path(cover).suffix.lower() in COVER_IMAGE_EXTENSIONS:
target = Path(directory) / ("cover" + Path(cover).suffix.lower())
if os.path.abspath(cover) != str(target):
self._remove_old_cover_files(directory)
shutil.copyfile(cover, target)
if dialog.add_to_steam_checkbox.isChecked():
if not is_game_in_steam(card.name):
self.add_to_steam(name, card.exec_line, cover)
elif is_game_in_steam(card.name):
self.remove_from_steam(card.name, card.exec_line, "native")
self.parent.refreshGames()
except OSError as error:
logger.warning("Cannot edit native metadata: %s", error)
def _launch_game(self, game_card):
"""
Launch or stop a game based on its current state.
@@ -836,6 +935,9 @@ class ContextMenuManager:
Args:
game_card: The GameCard instance containing game data.
"""
if game_card.game_source == "native":
self.parent.toggleGame(game_card.exec_line, game_name=game_card.name)
return
if not self._check_portproton():
return
@@ -996,6 +1098,9 @@ class ContextMenuManager:
def _get_exec_line(self, game_name, exec_line):
"""Retrieve and validate exec_line from .desktop file if necessary."""
if exec_line and exec_line.startswith(NATIVE_URI_PREFIX):
entry = parse_desktop_entry(exec_line.removeprefix(NATIVE_URI_PREFIX))
return entry.get("Exec") if entry else None
if exec_line and exec_line.strip() != "full":
return exec_line
desktop_path = self._get_desktop_path(game_name)
@@ -1127,6 +1232,20 @@ class ContextMenuManager:
def _delete_game_without_confirm(self, game_name: str, exec_line: str) -> None:
card_exec_line = exec_line
if exec_line.startswith(NATIVE_URI_PREFIX):
source = Path(exec_line.removeprefix(NATIVE_URI_PREFIX))
data = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
desktop = QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DesktopLocation)
paths = [str(source), str(data / "PortProtonQt/native_games" / source.name),
str(Path(self._get_applications_dir()) / source.name)]
if desktop:
paths.append(str(Path(desktop) / source.name))
self._remove_installed_shortcuts(game_name, paths)
self._remove_statistics_entry(str(source), game_name)
self.game_library_manager.remove_game_incremental(game_name, exec_line)
for key in ("all", "native", "favorites"):
getattr(self.parent, "_loaded_library_cache", {}).pop(key, None)
return
if not self._check_portproton():
return
desktop_path = self._get_desktop_path(game_name)
@@ -1754,10 +1873,11 @@ class ContextMenuManager:
"""
if not self._check_portproton():
return
exec_line = self._get_exec_line(game_name, exec_line)
if not exec_line or not exec_line.startswith(NATIVE_URI_PREFIX):
exec_line = self._get_exec_line(game_name, exec_line)
if not exec_line:
return
if not exec_line.startswith(("gog://launch/", "egs://launch/")):
if not exec_line.startswith((NATIVE_URI_PREFIX, "gog://launch/", "egs://launch/")):
exe_path = self._parse_exe_path(exec_line, game_name)
if not exe_path:
return
@@ -1812,11 +1932,11 @@ class ContextMenuManager:
_(message).format(game_name=game_name)
)
exec_line = self._get_exec_line(game_name, exec_line)
if not exec_line or not exec_line.startswith(NATIVE_URI_PREFIX):
exec_line = self._get_exec_line(game_name, exec_line)
if not exec_line:
return
exe_path = extract_exec_target_path(exec_line)
if not exe_path:
if not exec_line.startswith(NATIVE_URI_PREFIX) and not extract_exec_target_path(exec_line):
return
logger.debug("Removing game '%s' from Steam", game_name)
try:
+63 -8
View File
@@ -6,6 +6,9 @@ import signal
import subprocess
import threading
import time
import tempfile
import shutil
from typing import IO
from portprotonqt.logger import get_logger
from portprotonqt.config import get_portproton_location
@@ -18,7 +21,7 @@ logger = get_logger(__name__)
class DebugLogManager:
"""Manages debug log creation with game launch and Wine output capture."""
"""Manage debug logs for Wine and native game launches."""
def __init__(self):
self.process: subprocess.Popen | None = None
@@ -26,15 +29,19 @@ class DebugLogManager:
self.start_command: list[str] | None = None
self.wine_output: list[str] = []
self.runtime_env: dict[str, str] | None = None
self.native_output: IO[str] | None = None
self.native_directory: str | None = None
self.is_running = False
self.output_queue = queue.Queue()
self.output_thread = None
self._stop_event = threading.Event()
def start(self, exe_path: str, start_command: list[str]) -> bool:
"""Start game with PW_LOG=1 and capture output."""
"""Capture game output, enabling PW_LOG for PortProton launches."""
if self.is_running:
return False
if exe_path.startswith("native://"):
return self._start_native(exe_path)
self.exe_path = exe_path
self.start_command = start_command
@@ -86,6 +93,52 @@ class DebugLogManager:
logger.error("Failed to start debug session: %s", e)
return False
def _start_native(self, uri: str) -> bool:
from portprotonqt.native_games import get_native_launch
try:
command, directory = get_native_launch(uri.removeprefix("native://"))
self.native_output = tempfile.TemporaryFile(mode="w+", encoding="utf-8", errors="replace")
self.process = subprocess.Popen(
command, cwd=directory, stdout=self.native_output,
stderr=subprocess.STDOUT, start_new_session=True,
)
except Exception as error:
logger.error("Failed to start native debug session: %s", error)
if self.native_output is not None:
self.native_output.close()
self.native_output = None
return False
self.exe_path = uri.removeprefix("native://")
self.start_command = command
self.native_directory = directory
self.is_running = True
return True
def _save_native_log(self) -> str | None:
output = self.native_output
if output is None:
return None
from portprotonqt.native_games import load_native_settings, get_native_ppdb_path
try:
settings = load_native_settings(str(self.exe_path))
destination = get_native_ppdb_path(str(self.exe_path), settings).with_suffix(".log")
destination.parent.mkdir(parents=True, exist_ok=True)
output.seek(0)
with destination.open("w", encoding="utf-8") as log:
log.write(generate_system_info("native://" + str(self.exe_path), self.start_command))
log.write(f"\nCommand: {self.start_command!r}\nWorking directory: {self.native_directory}\n\n")
shutil.copyfileobj(output, log)
return str(destination)
except OSError as error:
logger.error("Failed to save native debug log: %s", error)
return None
finally:
output.close()
self.native_output = None
self.native_directory = None
def _read_output(self):
"""Read output from subprocess in a separate thread."""
if self.process and self.process.stdout:
@@ -98,19 +151,20 @@ class DebugLogManager:
logger.debug("Error reading output: %s", e)
def stop(self) -> str | None:
"""Stop game and save debug log with captured Wine output."""
self._capture_env_vars()
"""Stop the game and save its diagnostic log."""
if self.native_output is None:
self._capture_env_vars()
self._stop_event.set()
if self.is_running and self.process:
try:
os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
os.killpg(self.process.pid if self.native_output is not None else os.getpgid(self.process.pid), signal.SIGTERM)
try:
time.sleep(0.1)
if self.process.poll() is None:
os.killpg(os.getpgid(self.process.pid), signal.SIGKILL)
os.killpg(self.process.pid if self.native_output is not None else os.getpgid(self.process.pid), signal.SIGKILL)
except ProcessLookupError:
pass
except Exception as e:
@@ -123,7 +177,7 @@ class DebugLogManager:
except queue.Empty:
pass
log_file = self._save_log()
log_file = self._save_native_log() if self.native_output is not None else self._save_log()
if self.process and self.process.stdout:
try:
@@ -146,7 +200,8 @@ class DebugLogManager:
self.is_running = False
return False
self._capture_env_vars()
if self.native_output is None:
self._capture_env_vars()
return True
def _capture_env_vars(self) -> None:
+35 -22
View File
@@ -290,7 +290,8 @@ def get_filesystem_info(exe_path: str | None, portproton_path: str) -> str:
game_dir = os.path.dirname(exe_path)
lines.append(f"Filesystem {game_dir} - {get_fs_type(game_dir)}")
lines.append(f"Filesystem {portproton_path} - {get_fs_type(portproton_path)}")
if portproton_path:
lines.append(f"Filesystem {portproton_path} - {get_fs_type(portproton_path)}")
tmp_dir = f"/tmp/PortProton_{os.environ.get('USER', 'user')}"
if os.path.exists(tmp_dir):
@@ -313,8 +314,17 @@ def generate_system_info(
get_d3d_extras_status,
)
portproton_path = get_portproton_location()
if not portproton_path:
from portprotonqt.native_games import load_native_settings, get_native_launch, get_native_ppdb_path
native = bool(exe_path and exe_path.startswith("native://"))
desktop_path = exe_path.removeprefix("native://") if native and exe_path else None
if desktop_path:
runtime_env = load_native_settings(desktop_path)
command, directory = get_native_launch(desktop_path)
exe_path = next((part for part in reversed(command)
if os.path.isabs(part) and os.path.isfile(part) and os.access(part, os.X_OK)), directory)
portproton_path = get_portproton_location() or ""
if not portproton_path and not native:
return "Error: PortProton location not found"
lines = []
@@ -344,16 +354,17 @@ def generate_system_info(
lines.append(get_libc_version())
lines.append("-" * 61)
lines.append(get_vulkan_use_info(portproton_path, exe_path))
lines.append("-" * 61)
if not native:
lines.append(get_vulkan_use_info(portproton_path, exe_path))
lines.append("-" * 61)
lines.append("Version WINE in use:")
lines.append(get_wine_version(portproton_path, exe_path))
lines.append("-" * 61)
lines.append("Version WINE in use:")
lines.append(get_wine_version(portproton_path, exe_path))
lines.append("-" * 61)
lines.append("Program bit depth:")
lines.append(get_program_bit_depth(exe_path))
lines.append("-" * 61)
lines.append("Program bit depth:")
lines.append(get_program_bit_depth(exe_path))
lines.append("-" * 61)
lines.append("Date and time of start debug for PortProton:")
lines.append(datetime.now().strftime("%c %z"))
@@ -419,26 +430,28 @@ def generate_system_info(
lines.append(locale_avail)
lines.append("-" * 61)
lines.append(get_d3d_extras_status(portproton_path, exe_path))
lines.append("-" * 61)
prefix_name = get_prefix_name(exe_path)
winetricks_content = get_winetricks_log(portproton_path, prefix_name)
if winetricks_content:
lines.append("winetricks.log:")
lines.append(winetricks_content)
if not native:
lines.append(get_d3d_extras_status(portproton_path, exe_path))
lines.append("-" * 61)
prefix_name = get_prefix_name(exe_path)
winetricks_content = get_winetricks_log(portproton_path, prefix_name)
if winetricks_content:
lines.append("winetricks.log:")
lines.append(winetricks_content)
lines.append("-" * 61)
if exe_path:
ppdb_content = get_ppdb_content(exe_path, start_cmd)
ppdb_path = str(get_native_ppdb_path(desktop_path, runtime_env)).removesuffix(".ppdb") if desktop_path and runtime_env else exe_path
ppdb_content = get_file_content(ppdb_path + ".ppdb") if native else get_ppdb_content(exe_path, start_cmd)
if ppdb_content:
lines.append(f"Use {exe_path}.ppdb db file:")
lines.append(f"Use {ppdb_path}.ppdb db file:")
if ppdb_log_vars:
lines.append("\n".join(ppdb_log_vars))
lines.append(ppdb_content)
lines.append("-" * 61)
user_overrides = get_user_overrides(portproton_path)
user_overrides = "" if native else get_user_overrides(portproton_path)
if user_overrides:
lines.append(user_overrides)
lines.append("-" * 61)
+49 -8
View File
@@ -19,6 +19,8 @@ from PySide6.QtWidgets import (
from PySide6.QtCore import Qt, QUrl, QTimer, QProcess, QProcessEnvironment
from PySide6.QtGui import QDesktopServices
from portprotonqt.native_games import get_native_launch, load_native_settings
from portprotonqt.detail_pages.widgets import (
create_scroll_area,
create_back_button,
@@ -655,7 +657,7 @@ class DetailPageManager:
)
buttons_layout.addWidget(open_folder_button)
elif (
str(game_source).lower() not in {"gog", "egs"}
str(game_source).lower() not in {"gog", "egs", "native"}
and not self._has_game_shortcut(game_name)
):
add_button = self._make_action_button(
@@ -670,7 +672,24 @@ class DetailPageManager:
buttons_layout.addWidget(add_button)
# Show settings button for PortProton games or Steam games using PortProtonQt
if str(game_source).lower() == "portproton":
if source == "native":
settings_button = self._make_action_button(
_("Settings"), self.main_window.theme_manager.get_icon("settings", as_path=True),
)
settings_button.clicked.connect(lambda: self.main_window.open_native_settings(exec_line))
buttons_layout.addWidget(settings_button)
log_button = self._make_action_button(_("Create Log"), self.main_window.theme_manager.get_icon("edit", as_path=True))
log_button.clicked.connect(lambda: self.toggleDebugLog(exec_line, log_button))
buttons_layout.addWidget(log_button)
self._debug_log_button = log_button
data_home = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
if os.path.dirname(exec_line.removeprefix("native://")) in (
getattr(self.main_window, "portproton_location", None), os.path.join(data_home, "PortProtonQt/native_games")
):
folder_button = self._make_action_button(_("Open Folder"), self.main_window.theme_manager.get_icon("search", as_path=True))
folder_button.clicked.connect(lambda: self._open_executable_folder(exec_line))
buttons_layout.addWidget(folder_button)
elif str(game_source).lower() == "portproton":
self._add_portproton_buttons(buttons_layout, exec_line)
elif (
source in {"gog", "egs"}
@@ -725,6 +744,8 @@ class DetailPageManager:
def _get_current_exe(self, exec_line: str) -> str | None:
"""Extract current executable from exec line."""
if exec_line.startswith("native://"):
return os.path.basename(exec_line.removeprefix("native://"))
file_to_check = extract_exec_target_path(exec_line)
return os.path.basename(file_to_check) if file_to_check else None
@@ -740,6 +761,8 @@ class DetailPageManager:
play_button = self._make_action_button(text, icon)
play_button.setProperty("sound_event", False)
play_button.clicked.connect(lambda: self.main_window.toggleGame(exec_line, play_button))
if exec_line.startswith("steam://"):
self.main_window._toggle_steam_game(exec_line, play_button, launch=False)
return play_button
def _add_portproton_buttons(self, buttons_layout: FlowLayout, exec_line: str) -> None:
@@ -822,9 +845,26 @@ class DetailPageManager:
def _open_executable_folder(self, exe_path: str | None) -> None:
"""Open the folder containing an executable."""
if not exe_path or not os.path.exists(exe_path):
if not exe_path:
return
folder_path = os.path.dirname(os.path.abspath(exe_path))
if exe_path.startswith("native://"):
try:
desktop_path = exe_path.removeprefix("native://")
settings = load_native_settings(desktop_path)
command, directory = get_native_launch(desktop_path)
executable = next((part for part in reversed(command)
if os.path.isabs(part) and os.path.isfile(part) and os.access(part, os.X_OK)), None)
folder_path = os.path.dirname(executable) if executable else settings.get("Path", "")
if not folder_path or not os.path.isdir(folder_path):
raise ValueError("Game directory is not available")
except Exception as error:
logger.warning("Cannot resolve native game folder: %s", error)
QMessageBox.warning(self.main_window, _("Error"), str(error))
return
else:
if not os.path.exists(exe_path):
return
folder_path = os.path.dirname(os.path.abspath(exe_path))
QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
def _has_game_shortcut(self, game_name: str) -> bool:
@@ -1454,14 +1494,15 @@ class DetailPageManager:
"""Start debug logging session."""
if exe_path is None:
return
resolved_exe_path = self.main_window.resolve_launch_file_path(exe_path)
native = exe_path.startswith("native://")
resolved_exe_path = exe_path if native else self.main_window.resolve_launch_file_path(exe_path)
if resolved_exe_path is None:
return
if not self.main_window._check_alt_i586_dependencies_before_launch():
if not native and not self.main_window._check_alt_i586_dependencies_before_launch():
return
start_command = get_portproton_start_command()
if not start_command:
start_command = [] if native else get_portproton_start_command()
if start_command is None:
return
if self.debug_log_manager.start(resolved_exe_path, start_command):
+16 -2
View File
@@ -10,7 +10,7 @@ from typing import Any, cast, TYPE_CHECKING
from PySide6.QtGui import QIcon, QPixmap
from PySide6.QtWidgets import (
QDialog, QFormLayout, QHBoxLayout, QLabel, QVBoxLayout,
QProgressBar, QSizePolicy, QWidget, QCheckBox, QProgressDialog, QScrollArea, QLineEdit, QApplication
QProgressBar, QSizePolicy, QWidget, QCheckBox, QProgressDialog, QScrollArea, QLineEdit, QApplication, QMessageBox
)
from PySide6.QtCore import Qt, QObject, Signal, QTimer, QStandardPaths, QSize, QThread
import psutil
@@ -31,6 +31,7 @@ from portprotonqt.config import (
ui_config,
)
from portprotonqt.config.portproton import get_custom_icon_path, resolve_custom_data_dir
from portprotonqt.native_games import create_native_desktop_file, is_native_executable
from portprotonqt.logger import get_logger
from portprotonqt.theme_manager import ThemeManager
from portprotonqt.custom_widgets import AutoSizeButton
@@ -483,6 +484,9 @@ class AddGameDialog(DraggableDialog):
self.add_to_steam_checkbox.setChecked(self._steam_shortcut_exists(current_name))
self.add_to_menu_checkbox.setChecked(self._menu_shortcut_exists(current_name))
self.add_to_desktop_checkbox.setChecked(self._desktop_shortcut_exists(current_name))
if not edit_mode and is_native_executable(self.exeEdit.text().strip()):
self.add_to_menu_checkbox.setChecked(True)
self.add_to_desktop_checkbox.setChecked(True)
self.coverPreview = QLabel(self)
self.coverPreview.setAlignment(Qt.AlignmentFlag.AlignCenter)
@@ -620,7 +624,10 @@ class AddGameDialog(DraggableDialog):
try:
from portprotonqt.dialogs.file_explorer import FileExplorer
initial_path = os.path.dirname(self.last_exe_path) if self.last_exe_path and os.path.isfile(self.last_exe_path) else None
file_explorer = FileExplorer(self, file_filter=LAUNCH_FILE_EXTENSIONS, initial_path=initial_path)
def file_filter(path: str) -> bool:
return path.lower().endswith(LAUNCH_FILE_EXTENSIONS) or is_native_executable(path)
file_explorer = FileExplorer(self, file_filter=file_filter, initial_path=initial_path)
file_explorer.file_signal.file_selected.connect(self.onExeSelected)
if not self.edit_mode:
folder_button = AutoSizeButton(_("Select folder"), icon=theme_manager.get_icon("folder", as_path=True))
@@ -960,6 +967,13 @@ class AddGameDialog(DraggableDialog):
if not name:
return None, None
if is_native_executable(exe_path):
cover = self.last_cover_path or self.coverEdit.text().strip()
result = create_native_desktop_file(exe_path, name, cover)
if result is None:
QMessageBox.warning(self, _("Error"), _("Failed to create shortcut: {name}").format(name=name))
return result or (None, None)
if exe_path.lower().endswith(DISC_IMAGE_EXTENSIONS):
parent_widget = cast("MainWindow | None", self.parentWidget())
if not parent_widget or not hasattr(parent_widget, "resolve_launch_file_path"):
+15 -3
View File
@@ -25,7 +25,7 @@ from portprotonqt.theme_manager import ThemeManager
from portprotonqt.custom_widgets import AutoSizeButton
from portprotonqt.localization import _
from portprotonqt.dialogs.dialog_utils import create_dialog_hints_widget, update_dialog_hints
from portprotonqt.icon_extractor import generate_thumbnail
from portprotonqt.icon_extractor import generate_thumbnail, get_exe_icon_cache_path
from portprotonqt.dialogs.base import DraggableDialog, FileSelectedSignal
from portprotonqt.image_utils import COVER_IMAGE_EXTENSIONS
from portprotonqt.scripts_utils.mount_points import list_mounted_drive_paths
@@ -116,7 +116,7 @@ class FileExplorer(DraggableDialog):
self.signals.thumbnail_ready.emit(self.file_path, image)
else:
logger.warning("Failed to load image: %s", self.file_path)
elif self.file_path.lower().endswith((".exe",) + DISC_IMAGE_EXTENSIONS):
elif self.file_path.lower().endswith((".exe", ".appimage") + DISC_IMAGE_EXTENSIONS):
thumbnail_source = self.file_path
if self.file_path.lower().endswith(DISC_IMAGE_EXTENSIONS) and callable(self.resolve_launch_file_path):
resolved_path = self.resolve_launch_file_path(self.file_path)
@@ -125,6 +125,14 @@ class FileExplorer(DraggableDialog):
return
thumbnail_source = resolved_path
if thumbnail_source.lower().endswith(".appimage"):
icon_path = get_exe_icon_cache_path(thumbnail_source)
os.makedirs(os.path.dirname(icon_path), exist_ok=True)
image = QImage()
if os.path.isfile(icon_path) or generate_thumbnail(thumbnail_source, icon_path):
image = QImage(icon_path)
self.signals.thumbnail_ready.emit(self.file_path, image)
return
if not thumbnail_source.lower().endswith(".exe"):
return
@@ -142,6 +150,8 @@ class FileExplorer(DraggableDialog):
os.unlink(tmp_name)
except Exception as e:
logger.error("Error loading thumbnail for %s: %s", self.file_path, str(e))
if self.file_path.lower().endswith(".appimage"):
self.signals.thumbnail_ready.emit(self.file_path, QImage())
def __init__(self, parent=None, theme=None, file_filter=None, initial_path=None, directory_only=False):
super().__init__(parent)
@@ -214,7 +224,7 @@ class FileExplorer(DraggableDialog):
if file_path in self.thumbnail_cache or file_path in self.pending_thumbnails:
continue
mime_type = mime_db.mimeTypeForFile(file_path).name()
if mime_type.startswith("image/") or file_path.lower().endswith(COVER_IMAGE_EXTENSIONS + (".exe",) + DISC_IMAGE_EXTENSIONS):
if mime_type.startswith("image/") or file_path.lower().endswith(COVER_IMAGE_EXTENSIONS + (".exe", ".appimage") + DISC_IMAGE_EXTENSIONS):
self.pending_thumbnails.add(file_path)
resolver = None
main_window = cast("MainWindow | None", self.main_window)
@@ -246,6 +256,8 @@ class FileExplorer(DraggableDialog):
def _set_thumbnail_icon(self, file_path: str, image: QImage) -> None:
icon = QIcon(QPixmap.fromImage(image))
self.thumbnail_cache[file_path] = icon
if image.isNull():
return
item = self.file_items.get(file_path)
if item:
item.setData(THEMED_ICON_ROLE, None)
+3 -8
View File
@@ -352,14 +352,9 @@ class ProtonManager(DraggableDialog):
logger.error(f"Wine data loading failed: {error_msg}")
if hasattr(self, 'content_stack'):
self.content_stack.setCurrentIndex(1)
error_label = QLabel(_("Error loading WINE/Proton: {error}").format(error=error_msg))
error_label.setStyleSheet(self.theme.GETWINE_WINDOW_STYLE)
error_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
if hasattr(self, 'tab_widget'):
error_tab = QWidget()
error_layout = QVBoxLayout(error_tab)
error_layout.addWidget(error_label)
self.tab_widget.addTab(error_tab, _("Error"))
self.tab_widget.clear()
self.create_installed_tab()
def process_metadata(self, metadata):
self.cpu_level = get_cpu_level()
@@ -679,7 +674,7 @@ class ProtonManager(DraggableDialog):
version_item = QTableWidgetItem(version_name)
version_item.setFlags(version_item.flags() & ~Qt.ItemFlag.ItemIsEditable)
table.setItem(row_index, 1, version_item)
size_item = QTableWidgetItem(_("Unknown"))
size_item = QTableWidgetItem(_("Loading…"))
size_item.setFlags(size_item.flags() & ~Qt.ItemFlag.ItemIsEditable)
table.setItem(row_index, 2, size_item)
for col in range(table.columnCount()):
+58 -5
View File
@@ -60,6 +60,7 @@ from portprotonqt.dialogs.settings_gamescope import GAMESCOPE_ENV_KEYS, Gamescop
from portprotonqt.dialogs.settings_vkbasalt import VKBASALT_ENV_KEYS, VkBasaltSettingsMixin
from portprotonqt.localization import _, format_setting_name_for_display
from portprotonqt.logger import get_logger
from portprotonqt.native_games import NATIVE_TOGGLE_KEYS, NATIVE_ADVANCED_KEYS, load_native_settings, save_native_settings, get_native_ppdb_path
from portprotonqt.preloader import Preloader
from portprotonqt.qt_utils import get_screen_info, get_system_dpi_for_wine
from portprotonqt.settings_manager import (
@@ -166,11 +167,11 @@ class ExeSettingsDialog(
if not self.user_conf and not self.exe_path and not self.appid:
return
self.portproton_path = get_portproton_location()
if self.portproton_path is None:
if self.portproton_path is None and self.game_source != "native":
logger.error("PortProton location not found")
return
self.start_sh = get_portproton_start_command()
if self.start_sh is None:
if self.start_sh is None and self.game_source != "native":
logger.error("PortProton start command not found")
return
@@ -178,7 +179,7 @@ class ExeSettingsDialog(
self.lg_dist_aliases = {}
self.plugins_ver = ""
self.prefix_options = []
if self.portproton_path:
if self.portproton_path and self.game_source != "native":
scripts_path = get_portproton_scripts_path()
if scripts_path:
var_path = os.path.join(scripts_path, "var")
@@ -229,6 +230,9 @@ class ExeSettingsDialog(
self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
self.toggle_settings = get_toggle_settings()
if self.game_source == "native":
self.toggle_settings = {key: description for key, description in self.toggle_settings.items() if key in NATIVE_TOGGLE_KEYS}
self.setWindowTitle(_("Native") + " — " + _("Settings"))
self.setup_ui()
if self.user_conf:
@@ -581,6 +585,10 @@ class ExeSettingsDialog(
self.settings_container.setCurrentIndex(0)
self.advanced_container.setCurrentIndex(0)
if self.game_source == "native":
self.on_show_ppdb_finished(0, QProcess.ExitStatus.NormalExit)
return
process = QProcess(self)
process.finished.connect(self.on_show_ppdb_finished)
command = ["cli", "--get-user-conf"] if self.user_conf else [
@@ -590,7 +598,7 @@ class ExeSettingsDialog(
process.start(args[0], args[1:])
def on_show_ppdb_finished(self, exit_code, exit_status):
"""Handle --show-ppdb output."""
"""Populate shared settings controls from the selected game's data."""
process = cast(QProcess, self.sender())
self.current_settings = {}
self.blocked_keys = set()
@@ -605,7 +613,15 @@ class ExeSettingsDialog(
self.reject()
return
if exit_code == 0 and exit_status == QProcess.ExitStatus.NormalExit:
if self.game_source == "native":
try:
self.current_settings = load_native_settings(cast(str, self.exe_path))
except Exception as error:
logger.warning("Cannot load native settings: %s", error)
QMessageBox.warning(self, _("Error"), str(error))
self.reject()
return
elif exit_code == 0 and exit_status == QProcess.ExitStatus.NormalExit:
output = bytes(process.readAllStandardOutput().data()).decode('utf-8', 'ignore')
for line in output.splitlines():
line_stripped = line.strip()
@@ -707,6 +723,16 @@ class ExeSettingsDialog(
return
db_path = self.exe_path + ".ppdb"
if self.game_source == "native":
try:
settings = load_native_settings(self.exe_path)
db_path = str(get_native_ppdb_path(self.exe_path, settings))
if not os.path.exists(db_path):
save_native_settings(self.exe_path, {})
except Exception as error:
logger.warning("Cannot create native PPDB: %s", error)
QMessageBox.critical(self, _("Error"), str(error))
return
if not os.path.exists(db_path):
QMessageBox.critical(self, _("Error"), _("PPDB file does not exist at: ") + db_path)
@@ -730,6 +756,14 @@ class ExeSettingsDialog(
return
db_path = self.exe_path + ".ppdb"
if self.game_source == "native":
try:
settings = load_native_settings(self.exe_path)
db_path = str(get_native_ppdb_path(self.exe_path, settings))
except Exception as error:
logger.warning("Cannot resolve native PPDB: %s", error)
QMessageBox.critical(self, _("Error"), str(error))
return
if not os.path.exists(db_path):
QMessageBox.information(self, _("Information"), _("PPDB file does not exist at: ") + db_path)
self.load_current_settings()
@@ -890,6 +924,14 @@ class ExeSettingsDialog(
dist_options=self.dist_options,
prefix_options=self.prefix_options
)
if self.game_source == "native":
advanced_settings = [setting for setting in advanced_settings if setting['key'] in NATIVE_ADVANCED_KEYS]
for setting in advanced_settings:
if setting["key"] == "PW_WINE_CPU_TOPOLOGY":
setting["options"] = [disabled_text] + [str(count) for count in range(1, len(os.sched_getaffinity(0)) + 1)]
for setting in advanced_settings:
if setting['key'] == 'LAUNCH_PARAMETERS':
setting['description'] = _("Launch Arguments")
if self.user_conf:
for setting in advanced_settings:
setting['key'] = DEFAULT_WINE_SETTING_KEYS.get(setting['key'], setting['key'])
@@ -1672,6 +1714,17 @@ class ExeSettingsDialog(
if not changes:
return
if self.game_source == "native":
try:
values = dict(change.split('=', 1) for change in changes)
save_native_settings(cast(str, self.exe_path), values)
except Exception as error:
logger.warning("Cannot save native settings: %s", error)
QMessageBox.warning(self, _("Error"), str(error))
return
self.load_current_settings()
return
self.saving = True
self.clear_ppdb_button.setEnabled(False)
self.saved_current_settings = self.current_settings.copy()
+13
View File
@@ -402,6 +402,7 @@ class GameCard(AnimatedCard):
self.steam_visible = str(game_source).lower() == "steam"
self.gog_visible = str(game_source).lower() == "gog"
self.egs_visible = str(game_source).lower() == "egs"
self.native_visible = str(game_source).lower() == "native"
self.portproton_visible = str(game_source).lower() == "portproton"
self.ppdb_visible = bool(self.ppdb_id) and not self.economy_mode
@@ -515,6 +516,13 @@ class GameCard(AnimatedCard):
)
self.egsLabel.setVisible(self.egs_visible and not self.vertical_layout)
self.nativeLabel = SourceCorner(
icon=self.theme_manager.get_icon("badge_linux", as_path=True),
config=corner_config,
parent=self.coverWidget,
)
self.nativeLabel.setVisible(self.native_visible and not self.vertical_layout)
portproton_icon = self.theme_manager.get_icon("badge_portproton", as_path=True)
self.portprotonLabel = SourceCorner(
icon=portproton_icon,
@@ -661,6 +669,7 @@ class GameCard(AnimatedCard):
(self.steamLabel, "badge_steam"),
(self.gogLabel, "badge_gog"),
(self.egsLabel, "badge_egs"),
(self.nativeLabel, "badge_linux"),
(self.portprotonLabel, "badge_portproton"),
):
icon = self.theme_manager.get_icon(
@@ -882,6 +891,7 @@ class GameCard(AnimatedCard):
(self.steam_visible, self.steamLabel),
(self.gog_visible, self.gogLabel),
(self.egs_visible, self.egsLabel),
(self.native_visible, self.nativeLabel),
(self.portproton_visible, self.portprotonLabel),
]
@@ -905,6 +915,7 @@ class GameCard(AnimatedCard):
self.portprotonLabel.raise_()
self.gogLabel.raise_()
self.egsLabel.raise_()
self.nativeLabel.raise_()
self.steamLabel.raise_()
except RuntimeError:
pass
@@ -1046,6 +1057,7 @@ class GameCard(AnimatedCard):
self.steam_visible = str(self.game_source).lower() == "steam"
self.gog_visible = str(self.game_source).lower() == "gog"
self.egs_visible = str(self.game_source).lower() == "egs"
self.native_visible = str(self.game_source).lower() == "native"
self.portproton_visible = str(self.game_source).lower() == "portproton"
self.ppdb_visible = bool(self.ppdb_id) and not self.economy_mode
protondb_visible = is_valid_protondb_tier(self.protondb_tier) and not self.economy_mode
@@ -1056,6 +1068,7 @@ class GameCard(AnimatedCard):
self.steamLabel.setVisible(self.steam_visible)
self.gogLabel.setVisible(self.gog_visible)
self.egsLabel.setVisible(self.egs_visible)
self.nativeLabel.setVisible(self.native_visible)
self.portprotonLabel.setVisible(self.portproton_visible)
self.ppdbLabel.setVisible(self.ppdb_visible and not hidden_badges)
self.protondbLabel.setVisible(protondb_visible and not hidden_badges)
+89 -2
View File
@@ -1,11 +1,18 @@
"""Unified icon extractor for NE and PE files."""
"""Unified icon extractor for NE, PE and type-2 AppImages."""
import os
import hashlib
import re
import shlex
import struct
import io
import subprocess
import tarfile
import posixpath
import glob
import pefile
from PySide6.QtCore import QByteArray, QBuffer, QIODevice
from PySide6.QtGui import QImage, QImageWriter
from PIL import Image
from portprotonqt.config.base import CACHE_DIR
from portprotonqt.config.portproton import get_custom_icon_path
@@ -16,6 +23,82 @@ logger = get_logger(__name__)
RT_ICON = 3
RT_GROUP_ICON = 14
THUMBNAIL_SIZE = 128
APPIMAGE_EXTRACT_TIMEOUT = 10
ELF_SECTION_LAYOUTS = {1: (32, "I", 46), 2: (40, "Q", 58)}
def _read_dwarfs_icon(path: str, offset: int) -> bytes:
"""Read an icon and resolve archive-local links without extracting to disk."""
filename = ".DirIcon"
seen: set[str] = set()
while filename not in seen:
seen.add(filename)
result = subprocess.run(
["dwarfsextract", "-i", os.path.abspath(path), "-O", str(offset),
"-f", "pax", "-o", "-", "--pattern", ":" + glob.escape(filename),
"--skip-devices", "--skip-specials", "--log-level", "error"],
capture_output=True, check=True, timeout=APPIMAGE_EXTRACT_TIMEOUT,
)
with tarfile.open(fileobj=io.BytesIO(result.stdout)) as archive:
member = next((item for item in archive if item.name.removeprefix("./") == filename), None)
if member is None:
return b""
if member.issym() or member.islnk():
target = member.linkname
base = posixpath.dirname(filename) if member.issym() else ""
filename = posixpath.normpath(target.lstrip("/") if target.startswith("/")
else posixpath.join(base, target))
if filename == ".." or filename.startswith("../"):
return b""
continue
if not member.isfile():
return b""
stream = archive.extractfile(member)
return stream.read() if stream is not None else b""
return b""
def _get_appimage_icon(path: str) -> io.BytesIO | None:
"""Read .DirIcon from a type-2 AppImage without executing its runtime."""
with open(path, "rb") as source:
header = source.read(64)
if len(header) < 64 or header[:4] != b"\x7fELF" or header[8:11] != b"AI\x02":
return None
layout = ELF_SECTION_LAYOUTS.get(header[4])
if layout is None or header[5] not in (1, 2):
return None
endian = "<" if header[5] == 1 else ">"
section_offset, offset_format, size_offset = layout
offset = struct.unpack_from(endian + offset_format, header, section_offset)[0]
entry_size, entry_count = struct.unpack_from(endian + "HH", header, size_offset)
offset += entry_size * entry_count
source.seek(offset)
magic = source.read(6)
if not magic.startswith(b"hsqs") and magic != b"DWARFS":
return None
try:
if magic == b"DWARFS":
data = _read_dwarfs_icon(path, offset)
else:
result = subprocess.run(
["unsquashfs", "-cat", "-o", str(offset), os.path.abspath(path), ".DirIcon"],
capture_output=True, check=True, timeout=APPIMAGE_EXTRACT_TIMEOUT,
)
data = result.stdout
except OSError as error:
logger.warning("Cannot read AppImage icon from %s: %s", path, error)
return None
except subprocess.SubprocessError as error:
logger.warning("Cannot extract AppImage icon from %s: %s", path, error)
return None
image = QImage.fromData(data)
if image.isNull():
return None
buffer = QBuffer()
buffer.open(QIODevice.OpenModeFlag.WriteOnly)
if not QImageWriter(buffer, QByteArray(b"PNG")).write(image):
return None
return io.BytesIO(buffer.data().data())
def _resolve_batch_icon_target(inputfile: str) -> str | None:
@@ -54,6 +137,8 @@ def get_exe_icon_cache_path(exe_path: str) -> str:
if custom_icon:
return custom_icon
icon_name = re.sub(r"[^A-Za-z0-9._-]", "_", os.path.basename(exe_path))
if exe_path.lower().endswith(".appimage"):
icon_name += "-" + hashlib.sha256(os.fsencode(os.path.abspath(exe_path))).hexdigest()
return os.path.join(
CACHE_DIR,
"images",
@@ -64,7 +149,7 @@ def get_exe_icon_cache_path(exe_path: str) -> str:
def generate_thumbnail(inputfile: str, outfile: str, size: int = 128, force_resize: bool = True) -> bool:
"""
Generates a thumbnail for an .exe file.
Generates a thumbnail for a Windows executable or type-2 AppImage.
inputfile: the input file path
outfile: output filename
@@ -117,6 +202,8 @@ class IconExtractor:
"""
try:
with open(self.file_path, "rb") as f:
if f.read(4) == b"\x7fELF":
return _get_appimage_icon(self.file_path)
if not self._parse_file(f):
return None
+1 -1
View File
@@ -498,7 +498,7 @@ def load_pixmap_async(
logger.error(f"URL processing error {cover}: {e}")
# SteamGridDB (SGDB)
if cover and cover.startswith("https://cdn2.steamgriddb.com"):
if cover and cover.startswith(("https://cdn2.steamgriddb.com/", "https://deckyloader.ru/sgdb-cdn/")):
try:
parts = cover.split("/")
filename = parts[-1] if parts else "sgdb_cover.png"
+22 -7
View File
@@ -86,9 +86,8 @@ class MouseEmulationThread(QThread):
ecodes.EV_REL: [ecodes.REL_X, ecodes.REL_Y, ecodes.REL_WHEEL],
}, name="Virtual DPad Mouse")
self.finished.emit(True)
# Store device in thread result
self._device = ui
self.finished.emit(True)
except PermissionError as e:
logger.error("EMUL: Permission denied for /dev/uinput: %s", e)
@@ -214,10 +213,6 @@ class InputManager(
logger.info("EMUL: Mouse emulation initialized (enabled=%s)", self.mouse_emulation_enabled)
if self.mouse_emulation_enabled:
# Initialize mouse emulation asynchronously to avoid blocking startup
QTimer.singleShot(0, self._async_enable_mouse_emulation)
# FileExplorer specific attributes
self.file_explorer = None
self.nav_timer = QTimer(self)
@@ -265,6 +260,8 @@ class InputManager(
def _on_mouse_emulation_finished(self, success: bool):
"""Handle mouse emulation thread completion."""
if not self.mouse_emulation_enabled:
return
if success and self.mouse_emulation_thread:
device = self.mouse_emulation_thread.get_device()
if device:
@@ -281,6 +278,22 @@ class InputManager(
self.emulation_active = self.mouse_emulation_enabled
if not self.emulation_active:
self.emulation_triggered = False
thread = self.mouse_emulation_thread
if thread and thread.isRunning():
return
if self.emulation_triggered:
if self.ui is None:
self._async_enable_mouse_emulation()
elif self.ui is not None:
try:
self.ui.close()
except Exception as e:
logger.error("EMUL: Error closing virtual mouse: %s", e)
self.ui = None
self.mouse_emulation_thread = None
self.stick_x_raw = 0
self.stick_y_raw = 0
self.scroll_accumulator = 0.0
def _navigate_game_cards(self, container, tab_index: int, code: int, value: int) -> None:
"""Common navigation logic for game cards in a container."""
@@ -414,8 +427,10 @@ class InputManager(
# Stop the thread if still running
thread = self.mouse_emulation_thread
if thread and thread.isRunning():
if thread:
thread.wait()
if self.ui is None:
self.ui = thread.get_device()
self.mouse_emulation_thread = None
if self.ui:
+11
View File
@@ -311,6 +311,17 @@ class DpadInputMixin(InputMixin):
@Slot(int, int, float)
def handle_dpad_slot(self, code: int, value: int, current_time: float) -> None:
keyboard = getattr(self._parent, 'system_keyboard', None)
if keyboard is not None and keyboard.isVisible():
if value == 0:
self._reset_dpad_repeat()
return
directions = {PAD_DPAD_X: ('left', 'right'), PAD_AXIS_LEFT_X: ('left', 'right'),
PAD_DPAD_Y: ('up', 'down'), PAD_AXIS_LEFT_Y: ('up', 'down')}
if code in directions:
self._start_dpad_repeat(code, value, current_time)
keyboard.send('direction', directions[code][value > 0])
return
if self._route_surface_dpad(code, value, current_time):
return
self._handle_default_dpad(code, value, current_time)
+56 -8
View File
@@ -57,8 +57,6 @@ class GamepadRuntimeMixin(InputMixin):
def _on_gamepad_hotplug(self, action: str) -> None:
try:
if self._gamepad_polling_suspended:
return
if action == 'add':
self.check_gamepad()
elif action == 'remove':
@@ -80,8 +78,6 @@ class GamepadRuntimeMixin(InputMixin):
def check_gamepad(self) -> None:
try:
if self._gamepad_polling_suspended:
return
new_gamepad = self.find_gamepad()
if new_gamepad:
@@ -128,6 +124,7 @@ class GamepadRuntimeMixin(InputMixin):
self.lt_pressed = False
self.rt_pressed = False
self.start_held = False
self._start_consumed = False
self.select_held = False
self.pending_menu_fullscreen_time = 0.0
self.guide_held = False
@@ -173,6 +170,9 @@ class GamepadRuntimeMixin(InputMixin):
keyboard = getattr(self._parent, "keyboard", None)
if keyboard and hasattr(keyboard, "update_keyboard"):
keyboard.update_keyboard()
system_keyboard = getattr(self._parent, 'system_keyboard', None)
if system_keyboard is not None:
system_keyboard.send('gamepad', self.gamepad_type.value)
def find_gamepad(self) -> SDLGamepad | None:
"""Open the SDL3 handle that combines all connected gamepads."""
@@ -206,6 +206,9 @@ class GamepadRuntimeMixin(InputMixin):
logger.info("Gamepad axes configured for SDL backend: %s", device.name)
def _handle_pending_menu_fullscreen(self, current_time: float) -> None:
if getattr(self, '_gamepad_polling_suspended', False):
self.pending_menu_fullscreen_time = 0.0
return
if not self.pending_menu_fullscreen_time:
return
if current_time < self.pending_menu_fullscreen_time:
@@ -217,10 +220,10 @@ class GamepadRuntimeMixin(InputMixin):
def _poll_button_events(self, gamepad: SDLGamepad, current_time: float) -> None:
"""Emit button changes using SDL's standardized controller mapping."""
# Deliver Guide before Select when both change in the same SDL snapshot.
# Deliver modifier buttons before their combinations in the same snapshot.
buttons = sorted(
SDL_CONTROLLER_BUTTON_TO_PAD.items(),
key=lambda item: item[1] not in BUTTONS['guide'],
key=lambda item: (item[1] not in BUTTONS['guide'], item[1] != PAD_BUTTON_START),
)
for button_index, button_code in buttons:
value = gamepad.get_button(button_index)
@@ -242,6 +245,8 @@ class GamepadRuntimeMixin(InputMixin):
if button_code == PAD_BUTTON_START:
self.start_held = value == 1
emulation_combo = self._handle_emulation_combo(button_code, value)
if self._handle_system_keyboard_input(button_code, value, emulation_combo):
return
if self._is_mouse_emulation_active() and value == 1:
if button_code in BUTTONS['confirm']:
self.click_left()
@@ -265,6 +270,41 @@ class GamepadRuntimeMixin(InputMixin):
self.pending_menu_fullscreen_time = 0.0
return emulation_combo
def _handle_system_keyboard_input(self, button_code: int, value: int, combo: bool) -> bool:
keyboard = getattr(getattr(self, '_parent', None), 'system_keyboard', None)
if keyboard is None:
return False
if combo:
self._start_consumed = True
return True
if button_code == PAD_BUTTON_START:
if value:
self._start_consumed = False
return True
if getattr(self, '_start_consumed', False):
return True
if value and button_code in BUTTONS['prev_dir'] and self.start_held:
self._start_consumed = True
keyboard.toggle()
return True
if keyboard.isVisible():
actions = {'confirm': 'confirm', 'back': 'back', 'menu': 'back',
'prev_tab': 'language', 'next_tab': 'shift', 'add_game': 'backspace'}
if button_code == PAD_BUTTON_START and not value:
keyboard.send('button', 'confirm')
else:
for name, action in actions.items():
if button_code in BUTTONS[name]:
if value:
keyboard.send('button', action)
elif name == 'add_game':
keyboard.send('button', 'backspace_release')
break
return True
if button_code == PAD_BUTTON_START and not value:
self.button_event.emit(PAD_BUTTON_START, 1)
return False
def _should_schedule_menu_fullscreen(self, button_code: int, value: int, emulation_combo: bool) -> bool:
return (
value == 1 and button_code in BUTTONS['menu'] and
@@ -347,14 +387,22 @@ class GamepadRuntimeMixin(InputMixin):
def _is_mouse_emulation_active(self) -> bool:
"""Return True when the gamepad currently drives mouse emulation."""
keyboard = getattr(getattr(self, '_parent', None), 'system_keyboard', None)
if keyboard is not None and keyboard.isVisible():
return False
return self.mouse_emulation_enabled and self.emulation_active and self.emulation_triggered
def _should_skip_regular_events(self) -> bool:
"""Skip regular UI events while mouse emulation owns the controller."""
keyboard = getattr(getattr(self, '_parent', None), 'system_keyboard', None)
if keyboard is not None and keyboard.isVisible():
return False
if getattr(self, '_gamepad_polling_suspended', False):
return True
return self._is_mouse_emulation_active() and QApplication.activeWindow() is not None
def _poll_gamepad(self) -> None:
if not self.running or self._gamepad_polling_suspended:
if not self.running:
return
current_time = time.time()
active_gamepad = self.gamepad
@@ -382,7 +430,7 @@ class GamepadRuntimeMixin(InputMixin):
self._poll_axis_events(active_gamepad, current_time)
if (
current_time - self.last_update >= self.update_interval and
self.mouse_emulation_enabled and self.emulation_active and self.emulation_triggered
self._is_mouse_emulation_active()
):
self.update_mouse_position()
self.last_update = current_time
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PortProtonQt 0.1.1\n"
"Report-Msgid-Bugs-To: support@linux-gaming.ru\n"
"POT-Creation-Date: 2026-06-04 10:32+0500\n"
"PO-Revision-Date: 2026-10-17 23:27+0000\n"
"PO-Revision-Date: 2026-11-01 00:08+0000\n"
"Last-Translator: rogerio-mattos <rogerio-mattos@noreply.codeberg.org>\n"
"Language-Team: Portuguese (Brazil) <https://translate.codeberg.org/projects/"
"portprotonqt/portprotonqt/pt_BR/>\n"
@@ -32,6 +32,8 @@ msgid ""
"PortProtonQt is already running. Stop it and all games, then restart for "
"the new launch?"
msgstr ""
"O PortProtonQt já está em execução. Deseja encerrá-lo junto com todos os "
"jogos abertos e reiniciá-lo para iniciar uma nova sessão?"
msgid "Yes"
msgstr "Sim"
@@ -149,9 +151,8 @@ msgstr "A pasta já existe: {file_name}"
msgid "Failed to rename file: {error}"
msgstr "Falha ao renomear o arquivo: {error}"
#, fuzzy
msgid "Select multiple"
msgstr "Selecionar Tudo"
msgstr "Selecionar vários"
msgid "Delete from PortProton"
msgstr "Excluir do PortProton"
@@ -481,9 +482,13 @@ msgid ""
"characters:\n"
"\n"
msgstr ""
"Foram encontrados caracteres cirílicos nos seguintes caminhos. O Wine pode "
"funcionar de forma instável. Mova o jogo ou o PortProton para um caminho sem "
"caracteres cirílicos:\n"
"\n"
msgid "Don't remind again"
msgstr ""
msgstr "Não lembrar novamente"
msgid "Game not found."
msgstr "Jogo não encontrado."
@@ -964,19 +969,19 @@ msgstr "Iniciando {0}"
#, python-brace-format
msgid "Scanning: {folder}"
msgstr ""
msgstr "Verificado: {folder}"
#, python-brace-format
msgid "Checking existing shortcuts: {path}"
msgstr ""
msgstr "Verificando os atalhos existentes: {path}"
#, python-brace-format
msgid "Adding: {name}"
msgstr ""
msgstr "Adicionando: {name}"
#, fuzzy, python-brace-format
#, python-brace-format
msgid "Failed to create shortcut: {name}"
msgstr "Falha ao criar a pasta: {error}"
msgstr "Falha ao criar atalho: {name}"
msgid "Name:"
msgstr "Nome:"
@@ -993,9 +998,8 @@ msgstr "Capa Personalizada:"
msgid "Enter local path or URL for cover image"
msgstr "Informe o caminho local ou a URL da imagem de capa"
#, fuzzy
msgid "Custom Icon:"
msgstr "Capa Personalizada:"
msgstr "Ícone personalizado:"
msgid "Add shortcut to:"
msgstr "Adicionar atalho em:"
@@ -1009,29 +1013,28 @@ msgstr "Aplicar"
msgid "Invalid image"
msgstr "Imagem inválida"
#, fuzzy
msgid "Select folder"
msgstr "Excluir Pasta"
msgstr "Selecionar pasta"
#, fuzzy
msgid "Processing games…"
msgstr "Jogos Recentes"
msgstr "Processando jogos…"
#, python-brace-format
msgid ""
"Processed {completed}/{total}\n"
"{current}"
msgstr ""
"Processados: {completed}/{total}\n"
"{current}"
msgid "Information"
msgstr "Informação"
msgid "No games found in the selected folder."
msgstr ""
msgstr "Nenhum jogo encontrado na pasta selecionada."
#, fuzzy
msgid "Select games"
msgstr "Jogos Recentes"
msgstr "Selecionar jogos"
msgid "Close"
msgstr "Fechar"
@@ -2401,7 +2404,7 @@ msgid "Show compatibility report after game crash"
msgstr "Mostrar relatório de compatibilidade após a falha do jogo"
msgid "Disable Cyrillic path warning"
msgstr ""
msgstr "Desativar aviso de caminho em cirílico"
msgid "Disable ALT Linux i586 dependency check"
msgstr "Desativar verificação de dependências do ALT Linux i586"
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: support@linux-gaming.ru\n"
"POT-Creation-Date: 2026-03-22 13:50+0500\n"
"PO-Revision-Date: 2026-10-24 09:27+0000\n"
"PO-Revision-Date: 2026-10-26 12:27+0000\n"
"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
"Language-Team: Russian <https://translate.codeberg.org/projects/portprotonqt/"
"portprotonqt/ru/>\n"
@@ -996,9 +996,8 @@ msgstr "Пользовательская обложка:"
msgid "Enter local path or URL for cover image"
msgstr "Введите локальный путь или URL обложки"
#, fuzzy
msgid "Custom Icon:"
msgstr "Пользовательская обложка:"
msgstr "Пользовательский значок:"
msgid "Add shortcut to:"
msgstr "Добавить ярлык:"
@@ -7,9 +7,9 @@
msgid ""
msgstr ""
"Project-Id-Version: PortProtonQt 0.1.1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"Report-Msgid-Bugs-To: support@linux-gaming.ru\n"
"POT-Creation-Date: 2026-06-18 23:41+0500\n"
"PO-Revision-Date: 2026-07-22 12:06+0000\n"
"PO-Revision-Date: 2026-11-01 00:08+0000\n"
"Last-Translator: rogerio-mattos <rogerio-mattos@noreply.codeberg.org>\n"
"Language-Team: Chinese (Simplified Han script) <https://"
"translate.codeberg.org/projects/portprotonqt/portprotonqt/zh_Hans/>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2026.6.1\n"
"X-Generator: Weblate 2026.10.1\n"
"Generated-By: Babel 2.18.0\n"
msgid ""
@@ -29,7 +29,7 @@ msgstr "PortProton 数据文件夹不可读写。请为 PortProton 数据选择
msgid ""
"PortProtonQt is already running. Stop it and all games, then restart for "
"the new launch?"
msgstr ""
msgstr "PortProtonQt 已 stacked运行。请关闭它及所有游戏,然后重新启动以应用新设置?"
msgid "Yes"
msgstr "是"
@@ -143,9 +143,8 @@ msgstr "文件已存在:{file_name}"
msgid "Failed to rename file: {error}"
msgstr "重命名文件失败:{error}"
#, fuzzy
msgid "Select multiple"
msgstr "全选"
msgstr "多选"
msgid "Delete from PortProton"
msgstr "从 PortProton 中删除"
@@ -156,9 +155,8 @@ msgstr "停止游戏"
msgid "Launch Game"
msgstr "启动游戏"
#, fuzzy
msgid "Repair"
msgstr "已配对"
msgstr "修复"
msgid "Remove from Desktop"
msgstr "从桌面移除"
@@ -176,7 +174,7 @@ msgid "Delete"
msgstr "删除"
msgid "Import"
msgstr ""
msgstr "导入"
msgid "Edit Shortcut"
msgstr "编辑快捷方式"
@@ -260,9 +258,9 @@ msgstr "桌面"
msgid "Failed to save custom data: {error}"
msgstr "保存自定义数据失败:{error}"
#, fuzzy, python-brace-format
#, python-brace-format
msgid "Executable not found"
msgstr "找不到可执行文件:{0}"
msgstr "未找到可执行文件"
#, python-brace-format
msgid "Executable not found: {0}"
@@ -456,14 +454,14 @@ msgstr "缺少 32 位依赖项。现在安装吗?"
#, python-brace-format
msgid "Delete '{0}' and all files in its installation folder?"
msgstr ""
msgstr "导入('{0}'及其安装文件夹中的所有文件)?"
#, fuzzy
msgid "Select Epic game folder"
msgstr "删除文件夹"
msgid "Another Epic operation is running"
msgstr ""
msgstr "另一个 Epic 操作正在运行中"
#, fuzzy
msgid "Wine prefix not found"
@@ -475,9 +473,12 @@ msgid ""
"characters:\n"
"\n"
msgstr ""
"在以下路径中找到了西里尔字母字符。Wine 可能会运行不稳定。请将游戏或 "
"PortProton 移动到不包含西里尔字母字符的路径:\n"
"\n"
msgid "Don't remind again"
msgstr ""
msgstr "不再提示"
msgid "Game not found."
msgstr "未找到游戏。"
@@ -930,19 +931,19 @@ msgstr "正在启动 {0}"
#, python-brace-format
msgid "Scanning: {folder}"
msgstr ""
msgstr "正在扫描:{folder}"
#, python-brace-format
msgid "Checking existing shortcuts: {path}"
msgstr ""
msgstr "正在检查现有快捷方式:{path}"
#, python-brace-format
msgid "Adding: {name}"
msgstr ""
msgstr "正在添加:{name}"
#, fuzzy, python-brace-format
#, python-brace-format
msgid "Failed to create shortcut: {name}"
msgstr "创建文件夹失败:{error}"
msgstr "创建快捷方式失败:{name}"
msgid "Name:"
msgstr "名称:"
@@ -979,21 +980,22 @@ msgstr "图像无效"
msgid "Select folder"
msgstr "删除文件夹"
#, fuzzy
msgid "Processing games…"
msgstr "最近游戏"
msgstr "正在处理游戏…"
#, python-brace-format
msgid ""
"Processed {completed}/{total}\n"
"{current}"
msgstr ""
"已处理:{completed}/{total}\n"
"{current}"
msgid "Information"
msgstr "信息"
msgid "No games found in the selected folder."
msgstr ""
msgstr "在所选文件夹中未找到任何游戏。"
#, fuzzy
msgid "Select games"
@@ -1013,10 +1015,10 @@ msgid "No cover selected"
msgstr "未选择封面"
msgid "Compatibility report"
msgstr ""
msgstr "兼容性报告"
msgid "The program stopped. Compatibility details were collected automatically."
msgstr ""
msgstr "程序已停止。已自动收集兼容性详细信息。"
msgid "Downloading…"
msgstr "正在下载…"
@@ -1242,7 +1244,7 @@ msgid "Exe Settings"
msgstr "可执行文件设置"
msgid "Edit user.conf"
msgstr ""
msgstr "编辑 user.conf"
msgid "Search settings…"
msgstr "搜索设置…"
@@ -1268,9 +1270,8 @@ msgstr "编辑 PPDB"
msgid "Clear PPDB"
msgstr "清除 PPDB"
#, fuzzy
msgid "Failed to load global game settings."
msgstr "加载主题失败"
msgstr "加载全局游戏设置失败"
msgid "Executable path is not available."
msgstr "可执行文件路径不可用。"
@@ -1281,9 +1282,8 @@ msgstr "PPDB 文件不存在于: "
msgid "Failed to open PPDB file:\n"
msgstr "打开 PPDB 文件失败:\n"
#, fuzzy
msgid "Failed to open file:\n"
msgstr "打开 PPDB 文件失败:\n"
msgstr "打开文件失败:\n"
msgid "Confirm PPDB Clear"
msgstr "确认清除 PPDB"
@@ -1303,9 +1303,8 @@ msgstr "默认"
msgid "disabled"
msgstr "已禁用"
#, fuzzy
msgid "Download Wine/Proton..."
msgstr "将 WINE/Proton 下载到 Steam"
msgstr "下载 Wine/Proton…"
msgid "Enter prefix name"
msgstr "输入前缀名称"
@@ -2104,13 +2103,11 @@ msgstr "全部清除"
msgid "Now Downloading"
msgstr "正在下载"
#, fuzzy
msgid "Waiting…"
msgstr "警告"
msgstr "请稍候…"
#, fuzzy
msgid "Disk: "
msgstr "链接:"
msgstr "磁盘: "
#, fuzzy
msgid "Started at"
@@ -2124,10 +2121,10 @@ msgid "Store"
msgstr "存储"
msgid "Copy the link to clipboard"
msgstr ""
msgstr "将链接复制到剪贴板"
msgid "Failed to log out of GOG account"
msgstr ""
msgstr "退出 GOG 账号失败"
msgid "Refreshing…"
msgstr "正在刷新…"
@@ -2149,27 +2146,27 @@ msgid "Log out"
msgstr "注销"
msgid "Open login page"
msgstr ""
msgstr "打开登录页面"
msgid "GOG account not connected"
msgstr ""
msgstr "未连接 GOG 账号"
#, python-brace-format
msgid "Refreshing GOG library… {0}/{1}"
msgstr ""
msgstr "正在刷新 GOG 藏品库… {0}/{1}"
#, fuzzy, python-brace-format
msgid "Failed to refresh GOG library: {0}"
msgstr "启动游戏失败:{0}"
msgid "Failed to log out of Epic account"
msgstr ""
msgstr "退出 Epic 账号失败"
msgid "Copy the authorization code to clipboard"
msgstr ""
msgstr "将授权码复制到剪贴板"
msgid "Epic authorization…"
msgstr ""
msgstr "Epic 授权中…"
#, fuzzy, python-brace-format
msgid "Epic login failed: {0}"
@@ -2183,33 +2180,33 @@ msgstr "已连接"
msgid "Epic account not connected"
msgstr "已连接"
#, fuzzy, python-brace-format
#, python-brace-format
msgid "Refreshing Epic library… {0}/{1}"
msgstr "启动游戏失败:{0}"
msgstr "正在刷新 Epic 游戏库… {0}/{1}"
#, fuzzy, python-brace-format
msgid "Failed to refresh Epic library: {0}"
msgstr "启动游戏失败:{0}"
msgid "Select installation folder"
msgstr ""
msgstr "选择安装文件夹"
#, fuzzy
msgid "Another download is running"
msgstr "正在下载"
msgid "Another GOG operation is already running"
msgstr ""
msgstr "另一个 GOG 操作正在运行中"
msgid "GOG installation not found"
msgstr ""
msgstr "未找到 GOG 安装"
#, fuzzy
msgid "Select GOG game folder"
msgstr "删除文件夹"
msgid "Selected folder is not this GOG game"
msgstr ""
msgstr "所选文件夹不是此 GOG 游戏"
#, fuzzy
msgid "Starting"
@@ -2221,11 +2218,11 @@ msgstr "正在下载… {0}%"
#, python-brace-format
msgid "Disk: {0} MiB/s"
msgstr ""
msgstr "磁盘:{0} MiB/s"
#, fuzzy, python-brace-format
msgid "ETA: {0}"
msgstr ",预计剩余时间:{}秒"
msgstr "ETA: {0}"
#, fuzzy
msgid "Failed"
@@ -2279,7 +2276,7 @@ msgid "Theme"
msgstr "主题"
msgid "Grid"
msgstr ""
msgstr "网格"
#, fuzzy
msgid "List"
@@ -2289,21 +2286,17 @@ msgstr "浅色"
msgid "Vertical"
msgstr "部分"
#, fuzzy
msgid "Horizontal Blocks"
msgstr "水平 HUD 布局"
msgstr "水平块"
#, fuzzy
msgid "Horizontal Cards"
msgstr "水平 HUD 布局"
msgstr "水平卡片"
#, fuzzy
msgid "Horizontal endless Blocks"
msgstr "水平 HUD 布局"
msgstr "水平无限块"
#, fuzzy
msgid "Horizontal endless Cards"
msgstr "水平 HUD 布局"
msgstr "水平无限卡片"
#, fuzzy
msgid "Layout"
@@ -2331,7 +2324,7 @@ msgid "Auto"
msgstr "自动"
msgid "Account"
msgstr ""
msgstr "账号"
msgid "Brief"
msgstr "简要"
@@ -2359,7 +2352,7 @@ msgid "Auto Fullscreen on Gamepad connected"
msgstr "连接手柄时自动全屏"
msgid "Disable Boot Animation"
msgstr ""
msgstr "禁用开机动画"
msgid "Minimize to tray on close"
msgstr "关闭时最小化到系统托盘"
@@ -2374,22 +2367,22 @@ msgid "Hide Auto-Install Tab"
msgstr "隐藏自动安装标签页"
msgid "Hide Control Hints"
msgstr ""
msgstr "隐藏操作提示"
msgid "Force English language"
msgstr ""
msgstr "强制使用英语"
msgid "Enable UI Sounds"
msgstr "启用界面音效"
msgid "Show compatibility report after game crash"
msgstr ""
msgstr "游戏崩溃后显示兼容性报告"
msgid "Disable Cyrillic path warning"
msgstr ""
msgstr "禁用西里尔字母路径警告"
msgid "Disable ALT Linux i586 dependency check"
msgstr ""
msgstr "禁用 ALT Linux i586 依赖项检查"
msgid "Disable runtime download"
msgstr "禁用运行时下载"
@@ -2398,7 +2391,7 @@ msgid "Add to Steam compatibility tools"
msgstr "添加到 Steam 兼容工具"
msgid "Disable Steam Proton scanning"
msgstr ""
msgstr "禁用 Steam Proton 扫描"
msgid "Download WINE/Proton to Steam"
msgstr "将 WINE/Proton 下载到 Steam"
@@ -2487,7 +2480,7 @@ msgstr "确定要清除缓存吗?此操作无法撤销。"
#, python-brace-format
msgid "AppImage integrated at: {path}"
msgstr ""
msgstr "AppImage 已集成于:{path}"
#, fuzzy, python-brace-format
msgid "Failed to integrate AppImage: {error}"
@@ -2635,13 +2628,12 @@ msgstr "作者:"
msgid "Link:"
msgstr "链接:"
#, fuzzy, python-brace-format
#, python-brace-format
msgid "Delete theme '{0}'?"
msgstr "选择主题:"
msgstr "删除主题“{0}”?"
#, fuzzy
msgid "Failed to delete theme."
msgstr "加载主题失败"
msgstr "删除主题失败。"
msgid "Prefix:"
msgstr "前缀:"
+328 -13
View File
@@ -12,7 +12,7 @@ from datetime import datetime
from pathlib import Path
from queue import Empty, Queue
from threading import Thread
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Any
import psutil
import orjson
@@ -29,6 +29,7 @@ from portprotonqt.detail_pages import DetailPageManager
from portprotonqt.portproton_api import PortProtonAPI, remove_empty_custom_data_dirs
from portprotonqt.gog_api import GOGAPI
from portprotonqt.egs_api import EGSAPI
from portprotonqt.native_games import NativeLibraryWorker, NATIVE_URI_PREFIX, get_native_launch, read_native_game
from portprotonqt.debug_utils import get_prefix_name
from portprotonqt.input_manager import InputManager, MainWindowProtocol
from portprotonqt.context_menu_manager import ContextMenuManager
@@ -92,6 +93,9 @@ from collections.abc import Callable
from concurrent.futures import ThreadPoolExecutor
STORE_LAUNCH_GRACE_SECONDS = 10
GAME_PROCESS_CHECK_INTERVAL_MS = 500
STEAM_PROCESS_EXIT_GRACE_SECONDS = 3
STEAM_STOP_GRACE_SECONDS = 3
if TYPE_CHECKING:
from portprotonqt.appimage_updater import AppImageUpdateWorker
@@ -104,6 +108,36 @@ ALT_BIARCH_URL = "https://www.altlinux.org/Biarch"
GAME_LAUNCH_MARKER = "PORTPROTONQT_GAME_LAUNCH_STARTED"
GAME_EXIT_MARKER = "PORTPROTONQT_GAME_EXIT_CODE"
class SteamGameScanWorker(QThread):
def __init__(self, appid: str, parent: QObject) -> None:
super().__init__(parent)
self.appid = appid
self.known: dict[int, dict[str, Any]] = {}
self.result: dict[int, dict[str, Any]] = {}
self.stop_started: float | None = None
self.error: str | None = None
def run(self) -> None:
self.error = None
try:
processes = []
for process in psutil.process_iter(["pid", "ppid", "name", "cmdline", "create_time", "status"]):
if self.isInterruptionRequested():
return
processes.append(process.info)
self.result = MainWindow._collect_steam_processes(self.appid, processes, self.known)
if self.stop_started is not None:
MainWindow._stop_steam_processes(self.appid, {
"known": self.result, "stop_started": self.stop_started,
})
except psutil.Error as error:
logger.warning("Steam process scan failed for %s: %s", self.appid, error)
self.error = str(error)
except OSError as error:
logger.warning("Steam process scan failed for %s: %s", self.appid, error)
self.error = str(error)
class MainWindow(
MainWindowControlHintsMixin,
MainWindowAutoInstallTabMixin,
@@ -545,6 +579,8 @@ class MainWindow(
self.restore_state()
self.keyboard = VirtualKeyboard(self, self.theme)
from portprotonqt.system_keyboard import SystemKeyboard
self.system_keyboard = SystemKeyboard(self)
self.detail_animations = DetailPageAnimations(self, self.theme)
self._animations = {}
@@ -1036,7 +1072,7 @@ class MainWindow(
self.games_loaded.emit(games)
# Load games from different sources in parallel to prevent blocking
results = {'portproton': [], 'steam': [], 'gog': [], 'egs': []}
results = {'portproton': [], 'steam': [], 'gog': [], 'egs': [], 'native': []}
completed = dict.fromkeys(results, False)
def check_completion():
@@ -1066,13 +1102,19 @@ class MainWindow(
completed['egs'] = True
check_completion()
def native_callback(games: list[tuple]) -> None:
results['native'] = games
completed['native'] = True
check_completion()
self._load_portproton_games_async(portproton_callback)
self._load_steam_games_async(steam_callback)
self._load_gog_games_async(gog_callback)
self._load_egs_games_async(egs_callback)
self._load_native_games_async(native_callback)
else:
# Load selected sources in parallel.
results = {'portproton': [], 'steam': [], 'gog': [], 'egs': []}
results = {'portproton': [], 'steam': [], 'gog': [], 'egs': [], 'native': []}
selected_sources = set(display_filter.split(","))
completed = {
source: bool(selected_sources & results.keys()) and source not in selected_sources
@@ -1119,9 +1161,14 @@ class MainWindow(
completed['egs'] = True
check_completion()
def native_callback(games: list[tuple]) -> None:
results['native'] = games
completed['native'] = True
check_completion()
callbacks = {
"portproton": portproton_callback, "steam": steam_callback,
"gog": gog_callback, "egs": egs_callback,
"gog": gog_callback, "egs": egs_callback, "native": native_callback,
}
for source, callback in callbacks.items():
if not completed[source]:
@@ -1130,6 +1177,90 @@ class MainWindow(
# Run loading immediately to show status without delay
start_loading()
def _load_native_games_async(self, callback: Callable[[list[tuple]], None]) -> None:
self._native_games_callback = callback
self.native_library_worker = NativeLibraryWorker()
self.native_library_worker.finished.connect(self._on_native_games_loaded)
self.native_library_worker.start()
def open_native_settings(self, exec_line: str) -> None:
desktop_path = exec_line.removeprefix(NATIVE_URI_PREFIX)
try:
dialog = ExeSettingsDialog(self, self.theme, desktop_path, game_source="native")
except OSError as error:
logger.warning("Cannot open native settings for %s: %s", desktop_path, error)
QMessageBox.warning(self, _("Error"), str(error))
return
dialog.exec()
dialog.deleteLater()
def _launch_native_game(self, exec_line: str, button: QPushButton | None = None) -> None:
desktop_path = Path(exec_line.removeprefix(NATIVE_URI_PREFIX))
if self.game_processes:
if getattr(self, "native_game_running", False) and self.game_start_exe == str(desktop_path):
self.stop_running_game(button)
else:
QMessageBox.warning(self, _("Error"), _("Cannot launch game while another game is running"))
return
try:
if not desktop_path.is_absolute() or desktop_path.suffix != ".desktop":
raise ValueError("Invalid native desktop path")
command, directory = get_native_launch(str(desktop_path))
process = subprocess.Popen(command, cwd=directory, start_new_session=True, text=True)
except Exception as error:
logger.warning("Failed to launch native game %s: %s", desktop_path, error)
QMessageBox.warning(self, _("Error"), _("Failed to launch game: {0}").format(error))
return
self.native_game_running = True
self.game_stopped_by_user = False
self.game_processes = [process]
self.current_running_button = button
self.target_exe = desktop_path.name
self.game_start_exe = str(desktop_path)
self.game_start_exact_path = True
self.game_start_time = datetime.now()
self.game_launch_monotonic = time.monotonic()
self.game_launch_started = True
self.wine_download_seen = False
save_last_launch(desktop_path.stem, self.game_start_time)
self._update_last_launch_after_start(str(desktop_path), self.game_start_time)
self.launch_output_queue = Queue()
self.input_manager.suspend_gamepad_polling()
self._set_running_button_stop()
SoundManager().play("game_launch")
self.checkProcessTimer = QTimer(self)
self.checkProcessTimer.timeout.connect(self.checkTargetExe)
self.checkProcessTimer.start(GAME_PROCESS_CHECK_INTERVAL_MS)
@Slot()
def _on_native_games_loaded(self) -> None:
worker = self.native_library_worker
if worker is None:
return
self.native_library_worker = None
games = worker.games
worker.deleteLater()
if not games:
self._native_games_callback([])
return
completed = []
def on_info(info: dict, game: tuple) -> None:
updated = list(game)
updated[1] = info.get("description", "") or game[1]
updated[2] = game[2] or info.get("cover", "")
updated[3] = info.get("appid", "")
updated[4] = info.get("controller_support", "")
completed.append(tuple(updated))
if len(completed) == len(games):
self._native_games_callback(completed)
for game in games:
if ui_config.get_economy_mode():
on_info(get_cached_steam_game_info(game[0], game[5]), game)
else:
get_steam_game_info_async(game[0], game[5], lambda info, game=game: on_info(info, game))
def _load_gog_games_async(self, callback: Callable[[list[tuple]], None]) -> None:
api = getattr(self, "gog_api", None) or GOGAPI()
installed = api.load_installed()
@@ -1463,7 +1594,7 @@ class MainWindow(
callback: Callable[[tuple | None], None],
):
entry = parse_desktop_entry(file_path)
if not entry:
if not entry or read_native_game(Path(file_path)) is not None:
callback(None)
return
desktop_name = entry.get("Name", _("Unknown Application"))
@@ -1805,11 +1936,13 @@ class MainWindow(
self.detail_page_manager.openGameDetailPage(game_data)
pending_log_exe = self._pending_log_exe
detail_exe = extract_exec_target_path(game_data.get("exec_line", ""))
if exec_line.startswith(("gog://launch/", "egs://launch/")):
if exec_line.startswith(NATIVE_URI_PREFIX):
detail_exe = exec_line
elif exec_line.startswith(("gog://launch/", "egs://launch/")):
source, app_id = exec_line.split("://", 1)[0], exec_line.rsplit("/", 1)[-1]
detail_exe = getattr(self, f"{source}_api").get_launch_target(app_id)
if pending_log_exe and detail_exe:
if os.path.abspath(detail_exe) == pending_log_exe:
if detail_exe == pending_log_exe or os.path.abspath(detail_exe) == pending_log_exe:
self._pending_log_exe = None
log_button = self.detail_page_manager._debug_log_button
if log_button:
@@ -2126,7 +2259,7 @@ class MainWindow(
def checkTargetExe(self):
"""Update launch state from the marker and PortProton process."""
"""Update launch state and reset controls after the game exits."""
dependency_active = self._drain_launch_output_progress()
child_running = self._has_running_game_process()
@@ -2251,6 +2384,7 @@ class MainWindow(
self.game_processes = [] if launcher_only else [
proc for proc in self.game_processes if proc.poll() is None
]
self.native_game_running = False
if not getattr(self, "_animated_covers_suspended", False):
self.input_manager.resume_gamepad_polling()
self._refresh_portproton_shortcuts()
@@ -2345,6 +2479,8 @@ class MainWindow(
def _get_game_executable(self, exec_line: str) -> str:
"""Resolve a library launch entry to its tracked executable."""
if exec_line.startswith(NATIVE_URI_PREFIX):
return exec_line.removeprefix(NATIVE_URI_PREFIX)
if exec_line.startswith("gog://launch/"):
app_id = exec_line.rsplit("/", 1)[-1]
return str(self.gog_api.get_launch_target(app_id) or "")
@@ -2354,6 +2490,19 @@ class MainWindow(
return extract_exec_target_path(exec_line) or ""
def _has_running_game_process(self) -> bool:
if getattr(self, "native_game_running", False):
if any(process.poll() is None for process in self.game_processes):
return True
groups = {process.pid for process in self.game_processes}
for process in psutil.process_iter(attrs=["pid", "status"]):
try:
if process.info["status"] != psutil.STATUS_ZOMBIE and os.getpgid(process.pid) in groups:
return True
except ProcessLookupError:
continue
except PermissionError:
continue
return False
if self._observe_game_processes():
return True
process_alive = any(proc.poll() is None for proc in self.game_processes)
@@ -2475,6 +2624,8 @@ class MainWindow(
self._start_launch_output_reader(game_process)
def _analyze_short_launch(self) -> None:
if getattr(self, "native_game_running", False):
return
if not ui_config.get_crash_reports_enabled():
logger.info("Compatibility report skipped: crash reports disabled")
return
@@ -2546,11 +2697,12 @@ class MainWindow(
def _terminate_game_processes(self) -> None:
for proc in self.game_processes:
if proc.poll() is not None:
if proc.poll() is not None and not getattr(self, "native_game_running", False):
continue
try:
os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
proc.kill()
os.killpg(proc.pid if getattr(self, "native_game_running", False) else os.getpgid(proc.pid), signal.SIGTERM)
if not getattr(self, "native_game_running", False):
proc.kill()
except ProcessLookupError:
continue
except OSError as e:
@@ -2569,11 +2721,14 @@ class MainWindow(
return True
def stop_running_game(self, button=None) -> bool:
"""Stop current game via PortProton CLI stop command."""
"""Stop the current game's owned processes and launcher."""
if button is not None:
self.current_running_button = button
self.game_stopped_by_user = True
self.egs_launch_cancelled = True
if getattr(self, "native_game_running", False):
self._terminate_game_processes()
return True
if getattr(self, "launcher_process_only", False):
if self._run_portproton_stop_command():
return True
@@ -2763,6 +2918,157 @@ class MainWindow(
else:
logger.warning("Failed to open Steam URI: %s", exec_line)
def _toggle_steam_game(
self, exec_line: str, button: QPushButton | None, launch: bool = True
) -> None:
appid = exec_line.rsplit("/", 1)[-1]
if not appid.isdigit():
logger.warning("Invalid Steam URI: %s", exec_line)
return
watches = getattr(self, "_steam_watches", None)
if watches is None:
self._steam_watches: dict[str, dict[str, Any]] = {}
watches = self._steam_watches
if appid in watches:
watch = watches[appid]
watch["button"] = button
if launch and watch["running"]:
if not watch["stop"]:
watch["stop_started"] = time.monotonic()
watch["stop"] = True
elif launch and not watch["launch_requested"]:
watch["launch_requested"] = True
self._launch_steam_game(exec_line)
if button is not None:
button.setEnabled(watch["running"] or not watch["launch_requested"])
self._scan_steam_game(appid)
return
process = SteamGameScanWorker(appid, self)
timer = QTimer(self)
watch: dict[str, Any] = {
"process": process, "timer": timer, "button": button,
"running": False, "stop": False, "launch_requested": launch,
}
watches[appid] = watch
if button is not None:
button.setEnabled(not launch)
process.finished.connect(lambda: self._steam_scan_finished(appid))
timer.timeout.connect(lambda: self._scan_steam_game(appid))
if launch:
self._launch_steam_game(exec_line)
timer.start(GAME_PROCESS_CHECK_INTERVAL_MS)
self._scan_steam_game(appid)
def _scan_steam_game(self, appid: str) -> None:
watch = self._steam_watches[appid]
process = watch["process"]
if not process.isRunning():
process.known = watch.get("known", {})
process.stop_started = watch.get("stop_started") if watch["stop"] else None
process.start()
@staticmethod
def _collect_steam_processes(
appid: str, snapshot: list[dict[str, Any]], known: dict[int, dict[str, Any]]
) -> dict[int, dict[str, Any]]:
processes: dict[int, dict[str, Any]] = {}
children: dict[int, list[int]] = {}
selected: set[int] = set()
for info in snapshot:
if info.get("status") == psutil.STATUS_ZOMBIE or info["create_time"] is None:
continue
pid, parent = info["pid"], info["ppid"]
processes[pid] = info
children.setdefault(parent, []).append(pid)
args = info["cmdline"] or []
args = args[:args.index("--")] if "--" in args else args
if info["name"] == "reaper" and "SteamLaunch" in args and f"AppId={appid}" in args:
selected.add(pid)
elif pid in known and info["create_time"] == known[pid]["create_time"]:
selected.add(pid)
pending = list(selected)
while pending:
for child in children.get(pending.pop(), []):
if child not in selected:
selected.add(child)
pending.append(child)
return {pid: processes[pid] for pid in selected}
def _steam_scan_finished(self, appid: str) -> None:
watch = self._steam_watches.get(appid)
if watch is None:
return
if watch["process"].error is not None:
return
processes = watch["process"].result
watch["known"] = processes
now = time.monotonic()
reapers = [info["cmdline"] or []
for info in processes.values() if info["name"] == "reaper"]
if reapers:
watch["preparing"] = all("Install=1" in args for args in reapers)
if processes:
watch["last_seen"] = now
watch["running"] = True
elif (
watch["running"] and (not watch.get("preparing") or watch["stop"])
and now - watch.get("last_seen", 0) >= STEAM_PROCESS_EXIT_GRACE_SECONDS
):
watch["running"] = False
watch["launch_requested"] = False
watch["stop"] = False
running = watch["running"]
button = watch["button"]
if button is not None:
try:
button.setEnabled(running or not watch.get("launch_requested", True))
if running:
button.setText(_("Stop"))
button.setIcon(self.theme_manager.get_icon("stop", as_path=True))
elif not watch.get("launch_requested", True):
button.setText(_("Start"))
button.setIcon(self.theme_manager.get_icon("play", as_path=True))
except RuntimeError:
watch["button"] = None
@staticmethod
def _stop_steam_processes(appid: str, watch: dict[str, Any]) -> None:
now = time.monotonic()
started = watch.setdefault("stop_started", now)
stop_signal = (
signal.SIGKILL if now - started >= STEAM_STOP_GRACE_SECONDS else signal.SIGTERM
)
for pid, info in watch["known"].items():
try:
process = psutil.Process(pid)
if process.create_time() != info["create_time"]:
continue
process.send_signal(stop_signal)
except psutil.NoSuchProcess:
logger.debug("Steam game %s process %s already exited", appid, pid)
except psutil.AccessDenied as error:
logger.warning("Cannot stop Steam game %s process %s: %s", appid, pid, error)
def _finish_steam_watch(self, appid: str) -> None:
watch = self._steam_watches.pop(appid, None)
if watch is None:
return
watch["timer"].stop()
watch["timer"].deleteLater()
process = watch["process"]
process.blockSignals(True)
process.requestInterruption()
process.wait()
process.deleteLater()
button = watch["button"]
if button is not None:
try:
button.setEnabled(True)
button.setText(_("Start"))
button.setIcon(self.theme_manager.get_icon("play", as_path=True))
except RuntimeError:
logger.debug("Steam game button already deleted")
def _handle_gog_game(self, exec_line: str, button=None) -> None:
action, app_id = exec_line.removeprefix("gog://").split("/", 1)
if action == "install" and self.gog_api.is_game_installed(app_id):
@@ -3081,9 +3387,13 @@ class MainWindow(
button.setIcon(self.theme_manager.get_icon("stop", as_path=True))
def toggleGame(self, exec_line, button=None, game_name=None):
if exec_line.startswith(NATIVE_URI_PREFIX):
self._launch_native_game(exec_line, button)
return
# Handle Steam games
if exec_line.startswith("steam://"):
self._launch_steam_game(exec_line)
self._toggle_steam_game(exec_line, button)
return
if exec_line.startswith("gog://"):
@@ -3221,6 +3531,9 @@ class MainWindow(
# Full application close
event.accept()
system_keyboard = getattr(self, 'system_keyboard', None)
if system_keyboard is not None:
system_keyboard.shutdown()
watcher = getattr(self, "system_theme_watcher", None)
if watcher is not None:
@@ -3259,6 +3572,8 @@ class MainWindow(
if not self._run_portproton_stop_command():
logger.warning("Failed to stop installation during application shutdown")
for appid in list(getattr(self, "_steam_watches", {})):
self._finish_steam_watch(appid)
self.disc_image_manager.cleanup_iso_rw_paths()
self._stopBackgroundWorkers()
+27
View File
@@ -22,6 +22,7 @@ install_data(
'localization.py',
'logger.py',
'main_window.py',
'native_games.py',
'port_data_path_selector.py',
'portproton_api.py',
'preloader.py',
@@ -76,6 +77,14 @@ shared_library(
install_dir: pkgdatadir,
)
shared_library(
'portprotonqt_keyboard',
keyboard_sources,
dependencies: keyboard_deps,
install: true,
install_dir: pkgdatadir,
)
install_data(
['compatibility_rules.json',
'keyboard_layouts.json',
@@ -84,6 +93,24 @@ install_data(
)
# Install animations package
install_data(
['system_keyboard/__init__.py',
'system_keyboard/__main__.py',
'system_keyboard/input.py',
'system_keyboard/keys.py',
'system_keyboard/layouts.py',
'system_keyboard/detection.py',
'system_keyboard/gsettings_detection.py',
'system_keyboard/wayland_detection.py',
'system_keyboard/cosmic_detection.py',
'system_keyboard/manual_layout.py',
'system_keyboard/native.py',
'system_keyboard/window.py',
'system_keyboard/wayland_window.py',
],
install_dir: pythondir / meson.project_name() / 'system_keyboard',
)
install_data(
['animations/__init__.py',
'animations/detail_background.py',
+514
View File
@@ -0,0 +1,514 @@
"""Discover installed native games from desktop application entries."""
import configparser
import platform
import os
import re
import shlex
import shutil
import tempfile
from pathlib import Path
from datetime import datetime
from PySide6.QtCore import QThread
from portprotonqt.config import LAUNCH_FILE_EXTENSIONS, WINDOWS_LAUNCH_EXTENSIONS, get_portproton_location, get_portproton_scripts_path, get_custom_data_dir_name
from portprotonqt.config.portproton import get_custom_icon_path, extract_exec_target_path, resolve_custom_data_dir, parse_desktop_entry
from portprotonqt.localization import _, get_metadata_language, read_metadata_translations
from portprotonqt.logger import get_logger
from portprotonqt.icon_extractor import get_exe_icon_cache_path
from portprotonqt.time_utils import (
get_statistics_path, parse_playtime_file, get_last_launch_path, _parse_last_launch_line,
format_last_launch, format_playtime,
)
logger = get_logger(__name__)
NATIVE_URI_PREFIX = "native://"
NATIVE_SETTINGS_SECTION = "X-PortProtonQt"
NATIVE_TOGGLE_KEYS = frozenset({"PW_USE_GAMEMODE", "PW_USE_RUNTIME", "PW_REDUCE_PULSE_LATENCY",
"PW_USE_GALLIUM_ZINK", "PW_USE_OBS_VKCAPTURE", "PW_USE_INHIBIT_SLEEP"})
NATIVE_ADVANCED_KEYS = frozenset({"LAUNCH_PARAMETERS", "PW_MESA_GL_VERSION_OVERRIDE", "PW_LOCALE_SELECT",
"PW_MESA_VK_WSI_PRESENT_MODE", "PW_WINE_CPU_TOPOLOGY"})
def is_native_executable(path: str) -> bool:
"""Recognize native launch files while preserving Windows and disc formats."""
return (
Path(path).suffix.lower() not in LAUNCH_FILE_EXTENSIONS
and os.path.isfile(path)
and os.access(path, os.X_OK)
)
def quote_native_arguments(arguments: list[str]) -> str:
"""Quote arguments using desktop entry escaping, without a shell."""
escaped = []
for argument in arguments:
value = argument.replace("\\", "\\\\").replace('"', '\\"').replace("`", "\\`").replace("$", "\\$")
escaped.append('"' + value.replace("\\", "\\\\").replace("%", "%%") + '"')
return " ".join(escaped)
def build_native_shortcut_command(command: str, mode: str = "--silent") -> str:
"""Use the installed application launcher for native desktop shortcuts."""
flatpak_id = os.getenv("FLATPAK_ID")
appimage = os.getenv("APPIMAGE", "").strip()
launcher = ["portprotonqt"]
if flatpak_id:
launcher = ["flatpak", "run", flatpak_id]
elif appimage and os.path.isfile(appimage):
launcher = [appimage]
if mode:
launcher.append(mode)
return quote_native_arguments(launcher) + " " + command
def get_native_source_command(command: str) -> str:
"""Unwrap a PortProtonQt desktop command before applying native settings."""
parts = shlex.split(command.replace("\\\\", "\\"))
if "--silent" in parts and (parts[0] in {"portprotonqt", "flatpak", os.getenv("APPIMAGE", "").strip()} or parts[0].lower().endswith(".appimage")):
target = extract_exec_target_path(parts)
if target:
target = target.replace("\\$", "$").replace("\\`", "`").replace("%%", "%")
return quote_native_arguments([target])
return command
def get_native_tool_paths() -> dict[str, str]:
"""Locate the existing PortProton runtime and shader bundle without loading Wine."""
scripts = get_portproton_scripts_path()
location = get_portproton_location()
if not scripts or not location:
return {}
values = {}
try:
for line in (Path(scripts) / "var").read_text(encoding="utf-8").splitlines():
key, separator, value = line.removeprefix("export ").partition("=")
if separator and key in {"PW_LIBS_VER", "PW_PLUGINS_VER"}:
values[key] = value.strip().strip('"\'')
except OSError as error:
logger.warning("Cannot read native runtime versions: %s", error)
return {}
root = Path(location) / "data/tmp"
return {"runtime": str(root / ("libs" + values.get("PW_LIBS_VER", ""))),
"plugins": str(root / ("plugins" + values.get("PW_PLUGINS_VER", ""))),
"PW_PLUGINS_VER": values.get("PW_PLUGINS_VER", "")}
def read_native_variables(path: Path) -> dict[str, str]:
"""Read literal var/PPDB assignments without executing shell commands."""
values = {}
for line in path.read_text(encoding="utf-8").splitlines():
if not line.strip().startswith(("export ", "check_variables ")):
continue
parts = shlex.split(line, comments=True)
if not parts:
continue
if parts[0] == "check_variables" and len(parts) == 3:
values[parts[1]] = parts[2]
elif parts[0] == "export" and len(parts) == 2 and "=" in parts[1]:
key, value = parts[1].split("=", 1)
values[key] = value.replace("\\$", "$").replace("\\`", "`")
return values
def get_native_ppdb_path(desktop_path: str, settings: dict[str, str]) -> Path:
"""Keep native settings and logs in a named per-game user data directory."""
data_home = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
name = settings.get("Name", Path(desktop_path).stem).replace("/", "_").strip(".") or "native"
return data_home / "PortProtonQt/native_games" / name / (name + ".ppdb")
def get_native_defaults() -> dict[str, str]:
"""Read supported Linux defaults from the existing PortProton var file."""
values = dict.fromkeys(NATIVE_TOGGLE_KEYS | NATIVE_ADVANCED_KEYS, "0")
values.update(dict.fromkeys(NATIVE_ADVANCED_KEYS, "disabled"))
values.update({"LAUNCH_PARAMETERS": "", "PW_MANGOHUD": "0", "PW_MANGOHUD_USER_CONF": "0",
"PW_VKBASALT": "0", "PW_VKBASALT_USER_CONF": "0", "PW_GAMESCOPE": "0",
"MANGOHUD_CONFIG": "", "FPS_LIMIT": ""})
scripts = get_portproton_scripts_path()
if scripts and (Path(scripts) / "var").is_file():
defaults = read_native_variables(Path(scripts) / "var")
values.update({key: value for key, value in defaults.items()
if (key in values and key != "PW_USE_RUNTIME") or key.startswith(("PW_VKBASALT_", "PW_GAMESCOPE_"))})
values["MANGOHUD_CONFIG"] = ",".join(item for item in defaults.get("DEFAULT_MANGOHUD_CONFIG", "").split(",")
if item not in {"wine", "winesync"})
return values
def load_native_settings(desktop_path: str) -> dict[str, str]:
"""Load var defaults, existing desktop settings, and the game PPDB."""
parser = configparser.ConfigParser(interpolation=None, strict=False)
parser.optionxform = lambda optionstr: optionstr
parser.read_string(Path(desktop_path).read_text(encoding="utf-8"))
settings = get_native_defaults()
if parser.has_section(NATIVE_SETTINGS_SECTION):
settings.update(parser[NATIVE_SETTINGS_SECTION])
settings["Path"] = parser["Desktop Entry"].get("Path", "").replace("\\\\", "\\")
database = Path(desktop_path + ".ppdb")
if database.is_file():
content = database.read_text(encoding="utf-8")
if content.lstrip().startswith("["):
parser.read_string(content)
settings.update(parser[NATIVE_SETTINGS_SECTION])
else:
settings.update(read_native_variables(database))
settings.setdefault("Name", parser["Desktop Entry"].get("Name", Path(desktop_path).stem))
settings.setdefault("Exec", parser["Desktop Entry"]["Exec"])
settings["Exec"] = get_native_source_command(settings["Exec"])
parts = shlex.split(settings["Exec"].replace("\\\\", "\\"))
executable = next((part.replace("%%", "%") for part in reversed(parts)
if os.path.isabs(part.replace("%%", "%")) and Path(part.replace("%%", "%")).is_file()), None)
if executable is None and parts:
executable = shutil.which(parts[0])
legacy_paths = [Path((executable or desktop_path) + ".ppdb")]
data_home = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
legacy_paths.append(data_home / "PortProtonQt/native_games" / (get_custom_data_dir_name(desktop_path) + ".ppdb"))
for legacy in legacy_paths:
if legacy.is_file():
settings.update(read_native_variables(legacy))
database = get_native_ppdb_path(desktop_path, settings)
if database.is_file():
settings.update(read_native_variables(database))
settings.setdefault("PW_PLUGINS_VER", get_native_tool_paths().get("PW_PLUGINS_VER", ""))
return settings
def build_native_runtime(settings: dict[str, str]) -> tuple[list[str], list[str]]:
"""Use PortProton's runtime and portable Linux tools without loading Wine."""
paths = get_native_tool_paths()
runtime = Path(paths.get("runtime", ""))
wrapper = runtime / "pressure-vessel/bin/pressure-vessel-unruntime"
if not wrapper.is_file() or not (runtime / "runtime/files").is_dir():
raise ValueError("PortProton container runtime is not installed")
environment = [f"PRESSURE_VESSEL_RUNTIME_BASE={runtime}", "PRESSURE_VESSEL_RUNTIME=runtime",
f"PRESSURE_VESSEL_VARIABLE_DIR={runtime / 'var'}", "PRESSURE_VESSEL_COPY_RUNTIME=1",
"PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1"]
if platform.freedesktop_os_release().get("ID") == "altlinux":
drivers = [str(path.resolve()) for path in (Path("/etc/libnvidiacurrent"), Path("/etc/libnvidia32current"))
if path.is_dir()]
if drivers:
environment.append("PRESSURE_VESSEL_APP_LD_LIBRARY_PATH=" + ":".join(filter(None, [os.getenv("LD_LIBRARY_PATH", ""), *drivers])))
environment.append("LIBGL_DRIVERS_PATH=/usr/lib/X11/modules/dri:/usr/lib64/X11/modules/dri")
command = [str(wrapper), "--share-home", "--remove-game-overlay", "--share-pid", "--", "env"]
portable = Path(paths.get("plugins", "")) / "portable"
command += [f"PATH={portable / 'bin'}:{os.environ.get('PATH', '')}"]
if settings.get("PW_MANGOHUD") == "1" or settings.get("PW_VKBASALT") == "1":
layers = portable / "share/vulkan/implicit_layer.d"
libraries = ":".join(str(portable / "lib" / arch) for arch in ("lib64", "lib32"))
command += [f"LD_LIBRARY_PATH={libraries}:/overrides/lib/x86_64-linux-gnu:/overrides/lib/i386-linux-gnu",
f"VK_ADD_LAYER_PATH={layers}", f"VK_ADD_IMPLICIT_LAYER_PATH={layers}"]
environment.remove("PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=1")
environment.append("PRESSURE_VESSEL_IMPORT_VULKAN_LAYERS=0")
if settings.get("PW_MANGOHUD") == "1":
if not (portable / "lib/lib64/libMangoHud_shim.so").is_file():
raise ValueError("PortProton portable MangoHud is not installed")
preload = ":".join(filter(None, [os.getenv("LD_PRELOAD", ""), "libMangoHud_shim.so"]))
command += ["MANGOHUD=1", f"LD_PRELOAD={preload}"]
return command, environment
def build_native_launch_command(command: str, settings: dict[str, str]) -> str:
"""Compose Linux launch wrappers and environment for a desktop entry."""
prefix = []
environment = []
for key, variable in (("PW_REDUCE_PULSE_LATENCY", "PULSE_LATENCY_MSEC=60"),
("PW_USE_GALLIUM_ZINK", "MESA_LOADER_DRIVER_OVERRIDE=zink"),
("PW_USE_OBS_VKCAPTURE", "OBS_VKCAPTURE=1")):
if settings.get(key) == "1":
environment.append(variable)
for key, variable in (("PW_LOCALE_SELECT", "LC_ALL"), ("PW_MESA_GL_VERSION_OVERRIDE", "MESA_GL_VERSION_OVERRIDE"),
("PW_MESA_VK_WSI_PRESENT_MODE", "MESA_VK_WSI_PRESENT_MODE")):
if settings.get(key) not in (None, "", "disabled"):
environment.append(f"{variable}={settings[key]}")
if settings.get("PW_USE_INHIBIT_SLEEP") == "1":
prefix += ["systemd-inhibit", "--what=idle:sleep", "--why=Native game", "--"]
if settings.get("PW_GAMESCOPE") == "1":
prefix += ["gamescope", *shlex.split(settings.get("PW_GAMESCOPE_ARGS_NEW", "")), "--"]
if settings.get("PW_USE_RUNTIME") == "1":
runtime_command, runtime_env = build_native_runtime(settings)
prefix += runtime_command
environment += runtime_env
cores = settings.get("PW_WINE_CPU_TOPOLOGY", "disabled")
if cores not in ("", "disabled"):
available = sorted(os.sched_getaffinity(0))
count = int(cores)
if not 1 <= count <= len(available):
raise ValueError("Invalid CPU cores limit")
prefix += ["taskset", "-c", ",".join(str(cpu) for cpu in available[:count])]
if settings.get("PW_USE_GAMEMODE") == "1":
prefix.append("gamemoderun")
if settings.get("PW_MANGOHUD") == "1":
if settings.get("PW_USE_RUNTIME") != "1":
prefix += ["mangohud", "--dlsym"]
if settings.get("PW_MANGOHUD_USER_CONF") != "1":
config = settings.get("MANGOHUD_CONFIG", "")
if settings.get("FPS_LIMIT"):
config += f",fps_limit={settings['FPS_LIMIT']}"
environment.append(f"MANGOHUD_CONFIG={config.strip(',')}")
if settings.get("PW_VKBASALT") == "1":
environment.append("ENABLE_VKBASALT=1")
if settings.get("VKBASALT_CONFIG_FILE"):
environment.append(f"VKBASALT_CONFIG_FILE={settings['VKBASALT_CONFIG_FILE']}")
if environment:
prefix = ["env", *environment, *prefix]
suffix = quote_native_arguments(shlex.split(settings.get("LAUNCH_PARAMETERS", "")))
return " ".join(part for part in (quote_native_arguments(prefix), command, suffix) if part)
def write_native_vkbasalt_config(desktop_path: str, settings: dict[str, str]) -> None:
"""Keep native vkBasalt configuration isolated from global settings."""
if settings.get("PW_VKBASALT") != "1" or settings.get("PW_VKBASALT_USER_CONF") == "1":
settings.pop("VKBASALT_CONFIG_FILE", None)
return
config = get_native_ppdb_path(desktop_path, settings).with_suffix(".vkbasalt.conf")
plugins = Path(get_native_tool_paths().get("plugins", "")) / "reshade"
lines = [f"effects = {settings.get('PW_VKBASALT_EFFECTS', 'cas')}",
f"casSharpness = {settings.get('PW_VKBASALT_FFX_CAS', '0.50')}",
f"toggleKey = {settings.get('PW_VKBASALT_TOOGLE_KEY', 'Home')}",
f"reshadeTexturePath = {plugins / 'textures'}", f"reshadeIncludePath = {plugins}"]
for shader in settings.get("PW_VKBASALT_EFFECTS", "").split(":"):
if shader and shader != "cas":
if Path(shader).name != shader:
raise ValueError("Invalid vkBasalt shader name")
shader_path = plugins / "shaders" / (shader + ".fx")
if not shader_path.is_file():
raise ValueError(f"vkBasalt shader is not installed: {shader}")
lines.append(f"{shader} = {shader_path}")
config.write_text("\n".join(lines) + "\n", encoding="utf-8")
settings["VKBASALT_CONFIG_FILE"] = str(config)
def save_native_settings(desktop_path: str, changes: dict[str, str]) -> None:
"""Save native settings only to PPDB, leaving installed launchers unchanged."""
settings = load_native_settings(desktop_path)
settings.update(changes)
settings["Exec"] = get_native_source_command(settings["Exec"])
command, directory = settings["Exec"], settings.get("Path", "")
if not shlex.split(command.replace("\\\\", "\\")) or any(char in "".join(settings.values()) for char in "\n\r\x00"):
raise ValueError("Invalid native launch command or directory")
if directory and (not os.path.isabs(directory) or not os.path.isdir(directory)):
raise ValueError("Working directory must be an existing absolute path")
database = get_native_ppdb_path(desktop_path, settings)
database.parent.mkdir(parents=True, exist_ok=True)
write_native_vkbasalt_config(desktop_path, settings)
temporary: Path | None = None
try:
with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", dir=database.parent, delete=False) as output:
temporary = Path(output.name)
for key, value in sorted(settings.items()):
if key in {"Name", "Icon", "Exec", "Path"}:
continue
escaped = value.replace("\\", "\\\\").replace('"', '\\"').replace("$", "\\$").replace("`", "\\`")
output.write(f'export {key}="{escaped}"\n')
os.replace(temporary, database)
finally:
if temporary is not None:
temporary.unlink(missing_ok=True)
def create_native_desktop_file(executable: str, name: str, icon: str = "") -> tuple[str, str] | None:
"""Build a native launcher through PortProtonQt with the game's directory."""
path = Path(executable).expanduser().absolute()
if not path.is_file() or not os.access(path, os.X_OK) or path.suffix.lower() in WINDOWS_LAUNCH_EXTENSIONS:
logger.warning("Not an executable native game: %s", path)
return None
if not name.strip() or any(char in str(path) + icon for char in "\n\r\x00"):
logger.warning("Invalid native game name or path")
return None
name = " ".join(name.splitlines()).strip()
# Desktop Exec uses double quoting and doubles literal percent signs.
command = build_native_shortcut_command(quote_native_arguments([str(path)]))
directory = str(path.parent).replace("\\", "\\\\")
icon = get_custom_icon_path(str(path)) or icon
if not icon and path.suffix.lower() == ".appimage":
icon = get_exe_icon_cache_path(str(path))
icon = icon.replace("\\", "\\\\") if os.path.isfile(icon) else "applications-games"
comment = _('Launch "{name}" with PortProton').format(name=name)
content = (f"[Desktop Entry]\nType=Application\nName={name}\nComment={comment}\nExec={command}\n"
f"Path={directory}\nIcon={icon}\nTerminal=false\nCategories=Game;\nStartupNotify=true\nActions=RunSilent;RunLog;\n")
for action, label, mode in (("RunSilent", _("Run in silent mode"), "--silent"),
("RunLog", _("Run in logging mode"), "--log")):
action_command = build_native_shortcut_command(quote_native_arguments([str(path)]), mode)
content += f"\n[Desktop Action {action}]\nName={label}\nExec={action_command}\nIcon={icon}\n"
location = get_portproton_location()
if not location:
logger.warning("PortProton data directory is unavailable")
return None
filename = name.replace("/", "_") + ".desktop"
destination = Path(location) / filename
try:
destination.parent.mkdir(parents=True, exist_ok=True)
except OSError as error:
logger.warning("Cannot create native library directory: %s", error)
return None
return content, str(destination)
def read_native_game(path: Path) -> tuple | None:
"""Read a game entry without modifying the installed desktop file."""
parser = configparser.ConfigParser(interpolation=None, strict=False)
try:
parser.read_string(path.read_text(encoding="utf-8"))
if not parser.has_section("Desktop Entry"):
return None
entry = parser["Desktop Entry"]
if entry.get("Type") != "Application" or "Game" not in entry.get("Categories", "").split(";"):
return None
if any(entry.get(key, "false").lower() == "true" for key in ("Hidden", "NoDisplay")):
return None
if any(mime.startswith("x-scheme-handler/") for mime in entry.get("MimeType", "").split(";")):
return None
name, command = entry.get("Name", ""), entry.get("Exec", "")
parts = shlex.split(command.replace("\\\\", "\\"))
if not name or not parts:
return None
if any(part.lower().endswith(WINDOWS_LAUNCH_EXTENSIONS)
or part.lower().startswith(("steam://", "gog://", "egs://")) for part in parts):
return None
if entry.get("TryExec") and not shutil.which(entry["TryExec"]):
return None
original = parser[NATIVE_SETTINGS_SECTION].get("Exec", command) if parser.has_section(NATIVE_SETTINGS_SECTION) else command
executable = extract_exec_target_path(shlex.split(original.replace("\\\\", "\\"))) or ""
data_home = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
if path.is_relative_to(data_home / "applications"):
if not os.path.isfile(parts[0]) or (len(parts) > 1 and os.path.isfile(parts[1])):
return None
root = str(data_home / "PortProtonQt/custom_data")
custom = Path(resolve_custom_data_dir(root, str(path)))
if not custom.is_dir() and executable:
custom = Path(resolve_custom_data_dir(root, executable))
description = entry.get("Comment", "")
metadata = custom / "metadata.txt"
if metadata.is_file():
translations = read_metadata_translations(str(metadata), get_metadata_language())
name = translations.get("name") or name
description = translations.get("description") or description
cover = next((str(path) for path in custom.glob("cover.*") if path.is_file()), "")
if not cover:
from portprotonqt.steam_api.api import get_cached_sgdb_cover
cover = get_cached_sgdb_cover(name)
if not cover and executable.lower().endswith(".appimage"):
cached_icon = get_exe_icon_cache_path(executable)
if os.path.isfile(cached_icon):
cover = cached_icon
return (name, description, cover,
"", "", NATIVE_URI_PREFIX + str(path), _("Never"), "", "", "", 0, 0,
"native", "", "", "")
except configparser.Error as error:
logger.warning("Invalid native desktop entry %s: %s", path, error)
except OSError as error:
logger.warning("Cannot read native desktop entry %s: %s", path, error)
except UnicodeError as error:
logger.warning("Invalid native desktop encoding %s: %s", path, error)
except ValueError as error:
logger.warning("Invalid native desktop command %s: %s", path, error)
return None
def get_native_launch(desktop_path: str) -> tuple[list[str], str]:
"""Resolve desktop field codes into a direct Linux process command."""
parser = configparser.ConfigParser(interpolation=None, strict=False)
parser.read_string(Path(desktop_path).read_text(encoding="utf-8"))
entry = parser["Desktop Entry"]
settings = load_native_settings(desktop_path)
entry["Exec"] = settings["Exec"]
if get_native_ppdb_path(desktop_path, settings).is_file():
entry["Exec"] = build_native_launch_command(settings["Exec"], settings)
entry["Path"] = settings.get("Path", "").replace("\\", "\\\\")
escapes = {"\\": "\\", "s": " ", "n": "\n", "t": "\t", "r": "\r"}
command = re.sub(r"\\([\\sntr])", lambda match: escapes[match[1]], entry.get("Exec", ""))
arguments = []
for part in shlex.split(command):
part = part.replace("\\$", "$").replace("\\`", "`")
if part == "%i":
if entry.get("Icon"):
arguments.extend(["--icon", entry["Icon"]])
continue
value = re.sub(r"%%|%[fFuUdDnNvmick]", lambda match:
{"%%": "%", "%c": entry.get("Name", ""), "%k": desktop_path}.get(match[0], ""), part)
if value:
arguments.append(value)
if not arguments:
raise ValueError("Empty native launch command")
directory = re.sub(r"\\([\\sntr])", lambda match: escapes[match[1]], entry.get("Path", ""))
if directory and not os.path.isdir(directory):
raise ValueError(f"Working directory does not exist: {directory}")
executable = next((part for part in reversed(arguments)
if os.path.isabs(part) and os.path.isfile(part) and os.access(part, os.X_OK)), arguments[0])
fallback = Path(executable).parent if os.path.isabs(executable) else Path.home()
return arguments, directory or str(fallback)
def load_native_game_times(games: list[tuple]) -> list[tuple]:
"""Read shared statistics once for the native library batch."""
statistics, launches = {}, {}
try:
path = get_statistics_path()
if os.path.isfile(path):
statistics = parse_playtime_file(path)
path = get_last_launch_path()
if os.path.isfile(path):
launches = dict(parsed for line in Path(path).read_text(encoding="utf-8").splitlines()
if (parsed := _parse_last_launch_line(line)))
except OSError as error:
logger.warning("Cannot read native game statistics: %s", error)
updated_games = []
for game in games:
path = Path(game[5].removeprefix(NATIVE_URI_PREFIX))
updated = list(game)
updated[11] = statistics.get(str(path).replace(" ", "#@_@#"), 0)
updated[7] = format_playtime(updated[11])
if path.stem in launches:
try:
launched = datetime.fromisoformat(launches[path.stem])
updated[6], updated[10] = format_last_launch(launched), launched.timestamp()
except ValueError as error:
logger.warning("Invalid native last launch time for %s: %s", path, error)
updated_games.append(tuple(updated))
return updated_games
class NativeLibraryWorker(QThread):
"""Scan application directories outside the UI thread."""
def __init__(self) -> None:
super().__init__()
self.games: list[tuple] = []
def run(self) -> None:
data_home = Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share")))
data_dirs = os.environ.get("XDG_DATA_DIRS", "/usr/local/share:/usr/share").split(os.pathsep)
roots = [data_home, *(Path(directory) for directory in data_dirs if directory),
data_home / "flatpak/exports/share", Path("/var/lib/flatpak/exports/share")]
directories = [root / "applications" for root in roots]
directories.insert(0, data_home / "PortProtonQt/native_games")
location = get_portproton_location()
if location:
directories.insert(0, Path(location))
seen: set[str] = set()
commands: set[tuple[str, str, str]] = set()
for applications in directories:
try:
for path in sorted(applications.glob("*.desktop") if location and applications == Path(location)
else applications.rglob("*.desktop")):
if self.isInterruptionRequested():
return
desktop_id = str(path.relative_to(applications)).replace(os.sep, "-")
if desktop_id in seen:
continue
seen.add(desktop_id)
game = read_native_game(path)
if not game:
continue
entry = parse_desktop_entry(str(path)) or {}
command = get_native_source_command(entry.get("Exec", ""))
identity = (command, entry.get("Path", ""), entry.get("Name", ""))
if identity in commands:
continue
commands.add(identity)
self.games.append(game)
except OSError as error:
logger.warning("Cannot scan native games in %s: %s", applications, error)
self.games = load_native_game_times(self.games)
+5 -5
View File
@@ -1869,11 +1869,11 @@ def build_command(args: argparse.Namespace) -> list[str]:
"""Build the command list to execute in the PTY."""
if args.e:
if len(args.e) == 1:
return [
default_shell(),
"-lc",
_with_portproton_functions(args.e[0]),
]
command = args.e[0]
# functions_helper is bash-only, user shell may be zsh or fish
if _needs_portproton_functions(command):
return [CONF_FALLBACK_SHELL, "-lc", _with_portproton_functions(command)]
return [default_shell(), "-lc", command]
return args.e
return [default_shell()]
+1 -1
View File
@@ -316,7 +316,7 @@ def get_advanced_settings(disabled_text, logical_core_options=None, locale_optio
advanced_settings.append({
'key': 'PW_RUN_AFTER_EXE',
'name': _("Run After / Wrapper"),
'description': _("Path to a second .exe, script, or wrapper command. Example: systemd-run --user --scope --slice=app.slice"),
'description': _("Path to a second .exe, script, or wrapper command. Use %command% for the game command: /home/user/.local/bin/mako-launch %command%. Example: systemd-run --user --scope --slice=app.slice"),
'type': 'text',
'default': ''
})
+45 -4
View File
@@ -575,6 +575,23 @@ def get_cached_full_steam_game_info(appid: int, fallback_name: str = "") -> dict
)
def get_cached_sgdb_cover(game_name: str) -> str:
"""Read a cached SGDB grid URL without creating a download worker."""
cache = CacheManager()
safe_name = "".join(c for c in game_name if c.isalnum() or c in " -_")[:50]
key = f"sgdb_{safe_name}_grids"
if not cache.is_fresh(key, SGDB_CACHE_DURATION):
return ""
cover = cache.load_json(key)
if not isinstance(cover, str):
return ""
from portprotonqt.portproton_api import get_user_conf_setting
if get_user_conf_setting("MIRROR") == "CLOUD":
cover = cover.replace("https://cdn2.steamgriddb.com/", "https://deckyloader.ru/sgdb-cdn/", 1)
return cover
def get_cached_steam_game_info(desktop_name: str, exec_line: str) -> dict:
"""Return Steam metadata from local cache only."""
from portprotonqt.steam_api.utils import filter_candidates, remove_duplicates
@@ -582,7 +599,8 @@ def get_cached_steam_game_info(desktop_name: str, exec_line: str) -> dict:
game_exe = extract_exec_target_path(exec_line) or exec_line
exe_name = os.path.splitext(os.path.basename(game_exe))[0]
folder_name = os.path.basename(os.path.dirname(game_exe)) if game_exe else ""
candidates = remove_duplicates(filter_candidates([desktop_name, exe_name, folder_name]))
names = [desktop_name] if exec_line.startswith("native://") else [desktop_name, exe_name, folder_name]
candidates = remove_duplicates(filter_candidates(names))
apps_path = CacheManager().cache_dir / "steam_apps.json"
steam_apps, steam_apps_index = _get_cached_data_and_index(apps_path, build_index)
if not steam_apps:
@@ -660,6 +678,7 @@ def get_steam_game_info_async(
is_autoinstall = exec_line.startswith("autoinstall:")
is_store_uri = exec_line.startswith(("gog://", "egs://"))
is_native = exec_line.startswith("native://")
if game_exe.lower().endswith(('.bat', '.cmd')):
if os.path.exists(game_exe):
@@ -681,7 +700,7 @@ def get_steam_game_info_async(
else:
logger.error("Command file not found: %s", game_exe)
if cached_match is not None or is_store_uri:
if cached_match is not None or is_store_uri or is_native:
meta_data = {}
elif not game_exe.lower().endswith('.exe'):
logger.error("Invalid executable path: %s. Expected .exe", game_exe)
@@ -705,9 +724,9 @@ def get_steam_game_info_async(
candidates.append(file_description)
if desktop_name:
candidates.append(desktop_name)
if exe_name and not is_store_uri:
if exe_name and not (is_store_uri or is_native):
candidates.append(exe_name)
if folder_name and not is_store_uri:
if folder_name and not (is_store_uri or is_native):
candidates.append(folder_name)
candidates = filter_candidates(candidates)
candidates = remove_duplicates(candidates)
@@ -724,6 +743,9 @@ def get_steam_game_info_async(
if matching_app is None and (not steam_apps or not steam_apps_index):
game_name = desktop_name or exe_name
if is_native:
fetch_sgdb_cover_async(game_name, lambda cover: callback({"name": game_name, "cover": cover}))
return
def on_sgdb_cover_failure(cover: str) -> None:
result = _build_game_info_result(
@@ -762,6 +784,9 @@ def get_steam_game_info_async(
game_name = desktop_name or exe_name.capitalize()
if not matching_app:
if is_native:
fetch_sgdb_cover_async(game_name, lambda cover: callback({"name": game_name, "cover": cover}))
return
def on_sgdb_cover_non_steam(cover: str) -> None:
def on_anticheat_info_non_steam(anticheat_info: dict) -> None:
result = _build_game_info_result(
@@ -790,6 +815,22 @@ def get_steam_game_info_async(
cache_manager.save_json(match_key, matching_app)
def on_app_info(app_info: dict | None) -> None:
if is_native:
info = app_info or {}
result = {"appid": appid, "name": info.get("name", game_name),
"description": info.get("short_description", ""),
"controller_support": info.get("controller_support", "")}
def on_native_cover(cover: str) -> None:
result["cover"] = cover
callback(result)
local_cover = get_local_steam_cover(appid, prefer_exact=False)
if local_cover:
on_native_cover(local_cover)
else:
fetch_sgdb_cover_async(result["name"], on_native_cover)
return
if not app_info:
cover = get_local_steam_cover(appid, prefer_exact=False)
if not cover and not has_custom_data:
+44 -6
View File
@@ -1,6 +1,7 @@
"""Steam shortcuts management for PortProtonQt."""
import base64
import glob
import os
import random
import re
@@ -16,7 +17,10 @@ import requests
import vdf
import websocket
from portprotonqt.config.portproton import get_custom_icon_path
from PySide6.QtGui import QIcon, QImageReader
from PySide6.QtCore import QStandardPaths
from portprotonqt.config.portproton import get_custom_icon_path, parse_desktop_entry
from portprotonqt.logger import get_logger
from portprotonqt.downloader import Downloader
from portprotonqt.icon_extractor import generate_thumbnail
@@ -171,7 +175,7 @@ def call_steam_api(js_cmd: str, *args) -> dict | None:
def _parse_exec_line(exec_line: str) -> tuple[str | None, str]:
"""Parse exec_line to extract executable path."""
try:
exe_path = extract_exec_target_path(exec_line)
exe_path = exec_line if exec_line.startswith("native://") else extract_exec_target_path(exec_line)
if not exe_path:
logger.error("Failed to parse exec_line: %s", exec_line)
return None, "Failed to parse executable command: no target path"
@@ -224,6 +228,33 @@ export LD_PRELOAD=
return script_path, ""
def _resolve_desktop_icon(source: str) -> QIcon:
"""Resolve a desktop icon through Qt, then standard XDG icon directories."""
if not source:
return QIcon()
if os.path.isfile(source):
return QIcon(source)
icon = QIcon.fromTheme(source)
if not icon.isNull() or os.path.basename(source) != source:
return icon
formats = {bytes(value.data()).decode("ascii") for value in QImageReader.supportedImageFormats()}
filename = glob.escape(source)
if Path(source).suffix.lstrip(".").lower() not in formats:
filename += ".*"
roots = QStandardPaths.standardLocations(QStandardPaths.StandardLocation.GenericDataLocation)
patterns = (f"icons/hicolor/*/*/{filename}", f"icons/*/*/*/{filename}",
f"icons/{filename}", f"pixmaps/{filename}")
for root in roots:
for pattern in patterns:
for path in sorted(Path(root).glob(pattern)):
if not path.is_file() or path.suffix.lstrip(".").lower() not in formats:
continue
icon = QIcon(str(path))
if not icon.isNull():
return icon
return QIcon()
def _generate_icon(exe_path: str, portproton_dir: str) -> str:
"""Generate thumbnail icon for the game."""
safe_game_name = re.sub(r'[<>:"/\\|?*]', '_', os.path.basename(exe_path))
@@ -236,7 +267,13 @@ def _generate_icon(exe_path: str, portproton_dir: str) -> str:
if os.path.exists(generated_icon_path):
logger.info(f"Reusing existing thumbnail: {generated_icon_path}")
else:
success = generate_thumbnail(exe_path, generated_icon_path, size=128, force_resize=True)
if exe_path.endswith(".desktop"):
entry = parse_desktop_entry(exe_path) or {}
source = entry.get("Icon", "")
icon = _resolve_desktop_icon(source)
success = icon.pixmap(128, 128).save(generated_icon_path)
else:
success = generate_thumbnail(exe_path, generated_icon_path, size=128, force_resize=True)
if not success or not os.path.exists(generated_icon_path):
logger.warning(f"Failed to generate thumbnail for {exe_path}")
return ""
@@ -424,7 +461,8 @@ def add_to_steam(
return (False, error)
is_store_uri = exe_path.startswith(("gog://launch/", "egs://launch/"))
if not is_store_uri and not os.path.exists(exe_path):
local_path = exe_path.removeprefix("native://")
if not is_store_uri and not os.path.exists(local_path):
logger.error(f"Executable not found: {exe_path}")
return (False, f"Executable file not found: {exe_path}")
@@ -438,8 +476,8 @@ def add_to_steam(
if error:
return (False, error)
custom_icon = get_custom_icon_path(script_path) or get_custom_icon_path(exe_path)
icon_source = custom_icon or icon_source or (None if is_store_uri else exe_path)
custom_icon = get_custom_icon_path(script_path) or get_custom_icon_path(local_path)
icon_source = custom_icon or icon_source or (None if is_store_uri else local_path)
icon_path = custom_icon or (_generate_icon(icon_source, portproton_dir) if icon_source else "")
steam_home = get_steam_home()
+126
View File
@@ -0,0 +1,126 @@
"""Launch and control the system keyboard independently of application focus.
Assisted-by: Codex:GPT-6
"""
import os
import sys
import orjson
from PySide6.QtCore import QObject, QProcess, QProcessEnvironment
from PySide6.QtWidgets import QApplication, QMessageBox, QWidget
from portprotonqt.config import ui_config
from portprotonqt.localization import _
from portprotonqt.logger import get_logger
from .wayland_detection import compositor
logger = get_logger(__name__)
SHUTDOWN_TIMEOUT_MS = 3000
ERROR_OUTPUT_LIMIT = 8192
class SystemKeyboard(QObject):
"""Retain the child process and forward gamepad commands over its stdin."""
def __init__(self, parent: QWidget) -> None:
super().__init__(parent)
self.owner = parent
self.process = QProcess(self)
self.process.started.connect(self._started)
self.process.readyReadStandardOutput.connect(self._read_state)
self.process.readyReadStandardError.connect(self._read_errors)
self.process.errorOccurred.connect(self._process_error)
self.process.finished.connect(self._finished)
self.visible = False
self.shift_pressed = False
self.output = bytearray()
self.errors = ''
self.closing = False
app = QApplication.instance()
if app is not None:
app.aboutToQuit.connect(self.shutdown)
def isVisible(self) -> bool:
return self.visible
def toggle(self) -> None:
if self.visible:
self.hide()
return
self.visible = True
if self.process.state() != QProcess.ProcessState.NotRunning:
self.send('show')
return
self.errors = ''
self.output.clear()
environment = QProcessEnvironment.systemEnvironment()
platform = 'offscreen' if compositor(os.environ) else 'xcb'
environment.insert('QT_QPA_PLATFORM', platform)
self.process.setProcessEnvironment(environment)
self.process.start(sys.executable, ['-m', 'portprotonqt.system_keyboard'])
def _started(self) -> None:
self.send('theme', ui_config.get_theme())
self.send('show' if self.visible else 'hide')
def send(self, action: str, value: object = None) -> None:
if self.process.state() == QProcess.ProcessState.Running:
self.process.write(orjson.dumps({'action': action, 'value': value}) + b'\n')
def hide(self) -> None:
self.visible = False
self.send('hide')
def _read_state(self) -> None:
self.output.extend(bytes(self.process.readAllStandardOutput().data()))
while b'\n' in self.output:
line, _, remainder = self.output.partition(b'\n')
self.output = bytearray(remainder)
try:
data = orjson.loads(line)
except orjson.JSONDecodeError:
logger.warning('Invalid system keyboard response: %r', line)
continue
if isinstance(data, dict) and data.get('event') == 'hidden':
self.visible = False
self.shift_pressed = False
elif isinstance(data, dict) and data.get('event') == 'shift':
self.shift_pressed = bool(data.get('value'))
def _read_errors(self) -> None:
output = bytes(self.process.readAllStandardError().data()).decode(errors='replace')
self.errors = (self.errors + output)[-ERROR_OUTPUT_LIMIT:]
if output.strip():
logger.warning('System keyboard: %s', output.strip())
def _process_error(self, error: QProcess.ProcessError) -> None:
if error == QProcess.ProcessError.FailedToStart:
self.visible = False
self._show_error(self.process.errorString())
def _finished(self, code: int, status: QProcess.ExitStatus) -> None:
self.visible = False
self.shift_pressed = False
self._read_errors()
if not self.closing and (code or status == QProcess.ExitStatus.CrashExit):
self._show_error(self.errors.strip() or self.process.errorString())
def _show_error(self, message: str) -> None:
logger.error('Cannot open system keyboard: %s', message)
if not self.closing:
QMessageBox.warning(self.owner, _('Error'), message)
def shutdown(self) -> None:
self.closing = True
self.visible = False
self.send('quit')
if self.process.state() == QProcess.ProcessState.NotRunning:
return
if self.process.waitForFinished(SHUTDOWN_TIMEOUT_MS):
return
self.process.terminate()
if not self.process.waitForFinished(SHUTDOWN_TIMEOUT_MS):
self.process.kill()
self.process.waitForFinished(SHUTDOWN_TIMEOUT_MS)
+73
View File
@@ -0,0 +1,73 @@
"""Isolated Qt frontend: X11/XWayland or a native Wayland layer surface."""
import os
import sys
import orjson
from typing import Any
from PySide6.QtCore import QSocketNotifier
from PySide6.QtWidgets import QApplication
from portprotonqt.logger import get_logger, setup_logger
logger = get_logger(__name__)
COMMAND_READ_SIZE = 8192
class CommandReader:
def __init__(self, window: Any) -> None:
self.window = window
self.buffer = bytearray()
os.set_blocking(sys.stdin.fileno(), False)
self.notifier = QSocketNotifier(sys.stdin.fileno(), QSocketNotifier.Type.Read)
self.notifier.activated.connect(self.read)
def read(self) -> None:
try:
data = os.read(sys.stdin.fileno(), COMMAND_READ_SIZE)
except BlockingIOError:
return
if not data:
self.notifier.setEnabled(False)
self.window.command('quit')
return
self.buffer.extend(data)
while b'\n' in self.buffer:
line, _, remaining = self.buffer.partition(b'\n')
self.buffer = bytearray(remaining)
try:
command = orjson.loads(line)
if isinstance(command, dict) and isinstance(command.get('action'), str):
self.window.command(command['action'], command.get('value'))
except Exception:
logger.exception('Invalid system keyboard command')
def main() -> int:
setup_logger('WARNING')
from .wayland_detection import compositor
layer_shell = compositor(os.environ) is not None
os.environ['QT_QPA_PLATFORM'] = 'offscreen' if layer_shell else 'xcb'
app = QApplication([sys.argv[0]])
app.setQuitOnLastWindowClosed(False)
from .window import SystemKeyboardWindow
window = SystemKeyboardWindow()
try:
if layer_shell:
from .wayland_window import WaylandWindow
window.native_layer = WaylandWindow(window)
reader = CommandReader(window)
app.aboutToQuit.connect(window.shutdown)
window.worker.start()
result = app.exec()
window.shutdown()
del reader
return result
except Exception:
logger.exception('Failed to start system keyboard')
window.shutdown()
return 1
if __name__ == '__main__':
raise SystemExit(main())
@@ -0,0 +1,187 @@
"""COSMIC layout notifications over Wayland, without focus or OSK ownership."""
from typing import Any
import ctypes as C
import os
import select
from .layouts import Layout
from .native import load_library
class Message(C.Structure):
_fields_ = [('name', C.c_char_p), ('signature', C.c_char_p),
('types', C.c_void_p)]
class Interface(C.Structure):
_fields_ = [('name', C.c_char_p), ('version', C.c_int),
('method_count', C.c_int), ('methods', C.POINTER(Message)),
('event_count', C.c_int), ('events', C.POINTER(Message))]
class CosmicLayout:
def __init__(self) -> None:
self.display = self.layout = None
self.group = None
self.error = None
self.callbacks, self.proxies = [], []
self.keyboard = self.manager = self.tracker = None
self.lib = load_library()
self._configure_library()
self._configure_protocol()
try:
self.display = self.lib.portproton_keyboard_wayland_connect(None)
if not self.display:
raise RuntimeError('Failed to connect to Wayland')
self.registry = self._new(self.display, (1, self._interface('wl_registry')), C.c_void_p())
self._listen(self.registry, [
(self._global, [C.c_uint32, C.c_char_p, C.c_uint32]),
(lambda *args: None, [C.c_uint32])])
for _ in range(4):
self._check(self.lib.wl_display_roundtrip(self.display))
if self.layout is None or self.group is None:
raise RuntimeError('COSMIC keyboard layout protocol or keymap unavailable')
except Exception:
self.close()
raise
def _configure_library(self) -> None:
p = C.c_void_p
for name, args, result in (
('portproton_keyboard_wayland_connect', [C.c_char_p], p),
('wl_display_disconnect', [p], None),
('wl_display_roundtrip', [p], C.c_int),
('wl_display_dispatch', [p], C.c_int),
('wl_display_dispatch_pending', [p], C.c_int),
('wl_display_get_fd', [p], C.c_int),
('wl_display_flush', [p], C.c_int),
('wl_proxy_destroy', [p], None),
('wl_proxy_add_listener', [p, p, p], C.c_int),
('wl_proxy_marshal_flags', [p, C.c_uint32, C.POINTER(Interface),
C.c_uint32, C.c_uint32], p),
):
fn = getattr(self.lib, name)
fn.argtypes, fn.restype = args, result
def _configure_protocol(self) -> None:
p = C.c_void_p
# Keep protocol metadata alive for the entire connection.
self.group_requests = (Message * 2)(Message(b'set_group', b'u', None),
Message(b'destroy', b'', None))
self.group_events = (Message * 1)(Message(b'group', b'u', None))
self.group_interface = Interface(b'zcosmic_keyboard_layout_v1', 1, 2,
self.group_requests, 1, self.group_events)
self.manager_types = (C.c_void_p * 2)(C.addressof(self.group_interface),
C.addressof(self._interface('wl_keyboard')))
self.manager_requests = (Message * 2)(
Message(b'get_keyboard_layout', b'no', C.cast(self.manager_types, p)),
Message(b'destroy', b'', None))
self.manager_interface = Interface(b'zcosmic_keyboard_layout_manager_v1', 1,
2, self.manager_requests, 0, None)
def _interface(self, name: Any) -> Any:
return Interface.in_dll(self.lib, name + '_interface')
def _new(self, proxy: Any, request: tuple[Any, Any], *args: Any) -> Any:
opcode, interface = request
result = self.lib.wl_proxy_marshal_flags(proxy, opcode, C.byref(interface),
1, 0, *args)
if not result:
raise RuntimeError('COSMIC: не удалось создать объект Wayland')
self.proxies.append(result)
return result
def _listen(self, proxy: Any, handlers: Any) -> None:
callbacks = []
for handler, types in handlers:
def guarded(data: Any, obj: Any, *args: Any, handler: Any = handler) -> None:
try:
handler(*args)
except Exception as exc:
self.error = exc
callbacks.append(C.CFUNCTYPE(None, C.c_void_p, C.c_void_p, *types)(guarded))
table = (C.c_void_p * len(callbacks))(*[C.cast(fn, C.c_void_p) for fn in callbacks])
self.callbacks.append((callbacks, table))
if self.lib.wl_proxy_add_listener(proxy, table, None) != 0:
raise RuntimeError('COSMIC: не удалось подписаться на события Wayland')
def _global(self, name: Any, interface: Any, version: Any) -> None:
if interface == b'wl_seat' and not hasattr(self, 'seat'):
self.seat = self._new(self.registry, (0, self._interface('wl_seat')),
C.c_uint32(name), interface, C.c_uint32(1), C.c_void_p())
self._listen(self.seat, [(self._capabilities, [C.c_uint32])])
elif interface == self.manager_interface.name and self.manager is None:
self.manager = self._new(self.registry, (0, self.manager_interface),
C.c_uint32(name), interface, C.c_uint32(1), C.c_void_p())
self._track()
def _capabilities(self, capabilities: Any) -> None:
if capabilities & 2 and self.keyboard is None:
self.keyboard = self._new(self.seat, (1, self._interface('wl_keyboard')), C.c_void_p())
u, p = C.c_uint32, C.c_void_p
self._listen(self.keyboard, [
(self._keymap, [u, C.c_int, u]),
(lambda *args: None, [u, p, p]),
(lambda *args: None, [u, p]),
(lambda *args: None, [u, u, u, u]),
(lambda *args: None, [u, u, u, u, u])])
self._track()
elif not capabilities & 2 and self.keyboard is not None:
self.error = RuntimeError('COSMIC: клавиатура отключена')
def _track(self) -> None:
if self.keyboard and self.manager and self.tracker is None:
self.tracker = self._new(self.manager, (0, self.group_interface),
C.c_void_p(), C.c_void_p(self.keyboard))
self._listen(self.tracker, [(self._group, [C.c_uint32])])
def _group(self, group: Any) -> None:
self.group = group
def layout_identifier(self) -> str:
if self.layout is None or self.group is None:
return 'System'
return self.layout.layout_identifier(self.group)
def _keymap(self, format: Any, fd: Any, size: Any) -> None:
try:
if format != 1 or not 0 < size <= 16 * 1024 * 1024:
raise RuntimeError('COSMIC: неверная карта Wayland')
text = os.pread(fd, size, 0)
if len(text) != size:
raise RuntimeError('COSMIC: неполная карта Wayland')
replacement = Layout(keymap_text=text)
finally:
os.close(fd)
if self.layout is not None:
self.layout.close()
self.layout = replacement
def _check(self, result: Any) -> None:
if result < 0:
raise RuntimeError('COSMIC: соединение Wayland закрыто')
if self.error is not None:
raise self.error
def labels(self, modifiers: Any=()) -> Any:
self._check(self.lib.wl_display_dispatch_pending(self.display))
fd = self.lib.wl_display_get_fd(self.display)
for _ in range(32):
if not select.select([fd], [], [], 0)[0]:
break
self._check(self.lib.wl_display_dispatch(self.display))
if self.layout is None or self.group is None:
raise RuntimeError('COSMIC: раскладка недоступна')
return self.layout.labels(modifiers, mask=(0, 0, 0, self.group))
def close(self) -> None:
if self.layout is not None:
self.layout.close()
self.layout = None
if self.display:
for proxy in reversed(self.proxies):
self.lib.wl_proxy_destroy(proxy)
self.proxies.clear()
self.lib.wl_display_disconnect(self.display)
self.display = None
+130
View File
@@ -0,0 +1,130 @@
"""Read the X11/XWayland keymap without capturing keyboard focus."""
import ctypes as C
import os
from collections.abc import Mapping
from .keys import (ROWS, MODIFIERS, XKB_KEYCODE_OFFSET, XKB_CORE_KEYBOARD,
XKB_SHIFT_MASK, XKB_LOCK_MASK, XKB_ALTGR_MASK, XKB_GROUP_COUNT, XKB_GROUP_SHIFT)
from evdev import ecodes
from .native import load_library
LAYOUT_NAME_BUFFER_BYTES = 256
def is_x11_session(environment: Mapping[str, str]) -> bool:
if environment.get('XDG_SESSION_TYPE'):
return environment['XDG_SESSION_TYPE'] == 'x11'
return bool(environment.get('DISPLAY')) and not environment.get('WAYLAND_DISPLAY')
class XkbState(C.Structure):
_fields_ = [('group', C.c_ubyte), ('locked_group', C.c_ubyte),
('base_group', C.c_ushort), ('latched_group', C.c_ushort),
*[(name, C.c_ubyte) for name in (
'mods', 'base_mods', 'latched_mods', 'locked_mods',
'compat_state', 'grab_mods', 'compat_grab_mods',
'lookup_mods', 'compat_lookup_mods')],
('ptr_buttons', C.c_ushort)]
class X11Layout:
def __init__(self) -> None:
self.display = None
self.lib = load_library()
functions = {
'portproton_keyboard_x11_open_display': ([C.c_char_p], C.c_void_p),
'XCloseDisplay': ([C.c_void_p], C.c_int),
'XkbGetState': ([C.c_void_p, C.c_uint, C.POINTER(XkbState)], C.c_int),
'XkbLockGroup': ([C.c_void_p, C.c_uint, C.c_uint], C.c_int),
'XkbLockModifiers': ([C.c_void_p, C.c_uint, C.c_uint, C.c_uint], C.c_int),
'XkbLookupKeySym': ([C.c_void_p, C.c_ubyte, C.c_uint,
C.POINTER(C.c_uint), C.POINTER(C.c_ulong)], C.c_int),
'XKeysymToString': ([C.c_ulong], C.c_char_p),
'XStringToKeysym': ([C.c_char_p], C.c_ulong),
'XKeysymToKeycode': ([C.c_void_p, C.c_ulong], C.c_ubyte),
'XSync': ([C.c_void_p, C.c_int], C.c_int),
'portproton_keyboard_x11_layout_name': ([C.c_void_p, C.c_uint, C.c_void_p, C.c_size_t], C.c_int),
}
for name, (args, result) in functions.items():
function = getattr(self.lib, name)
function.argtypes, function.restype = args, result
self.xkb = self.lib
self.xkb.xkb_keysym_to_utf32.argtypes = [C.c_uint]
self.xkb.xkb_keysym_to_utf32.restype = C.c_uint
self.display = self.lib.portproton_keyboard_x11_open_display(None)
if not self.display:
raise RuntimeError('Cannot read the X11 keyboard layout')
def state(self) -> XkbState:
state = XkbState()
if self.lib.XkbGetState(self.display, XKB_CORE_KEYBOARD, C.byref(state)) != 0:
raise RuntimeError('Cannot read XKB state')
return state
def switch(self) -> None:
group = (self.state().group + 1) % XKB_GROUP_COUNT
if not self.lib.XkbLockGroup(self.display, XKB_CORE_KEYBOARD, group):
raise RuntimeError('Cannot switch XKB layout')
self.lib.XSync(self.display, False)
def caps_lock(self) -> bool:
return bool(self.state().locked_mods & XKB_LOCK_MASK)
def layout_identifier(self) -> str:
name = C.create_string_buffer(LAYOUT_NAME_BUFFER_BYTES)
if self.lib.portproton_keyboard_x11_layout_name(self.display, self.state().group, name, len(name)):
return name.value.decode()
return 'System'
def toggle_caps_lock(self) -> None:
value = 0 if self.caps_lock() else XKB_LOCK_MASK
if not self.lib.XkbLockModifiers(self.display, XKB_CORE_KEYBOARD, XKB_LOCK_MASK, value):
raise RuntimeError('Cannot switch XKB Caps Lock')
self.lib.XSync(self.display, False)
def keycode(self, name: str) -> int:
symbol = self.lib.XStringToKeysym(name.encode())
code = self.lib.XKeysymToKeycode(self.display, symbol) if symbol else 0
if code < XKB_KEYCODE_OFFSET:
raise ValueError(f'Unknown shortcut key: {name}')
return code - XKB_KEYCODE_OFFSET
def labels(self, modifiers: set[int] | tuple[int, ...] = ()) -> dict[str, str]:
state = self.state()
mask = state.mods & (XKB_SHIFT_MASK | XKB_LOCK_MASK | XKB_ALTGR_MASK)
for code, bit in ((ecodes.KEY_LEFTSHIFT, XKB_SHIFT_MASK),
(ecodes.KEY_CAPSLOCK, XKB_LOCK_MASK),
(ecodes.KEY_RIGHTALT, XKB_ALTGR_MASK)):
if code in modifiers:
mask |= bit
# Match XkbBuildCoreState from X11/extensions/XKB.h.
mask |= state.group << XKB_GROUP_SHIFT
result = {}
for row in ROWS:
for fallback, code in row:
if code in MODIFIERS or code in {ecodes.KEY_TAB, ecodes.KEY_CAPSLOCK}:
continue
symbol, consumed = C.c_ulong(), C.c_uint()
if self.lib.XkbLookupKeySym(self.display, code + XKB_KEYCODE_OFFSET,
mask, C.byref(consumed), C.byref(symbol)):
value = self.xkb.xkb_keysym_to_utf32(symbol.value)
character = chr(value) if value else ''
result[str(code)] = character if character.isprintable() else fallback
return result
def close(self) -> None:
if self.display:
self.lib.XCloseDisplay(self.display)
self.display = None
def detect_layout() -> object:
desktop = os.environ.get('XDG_CURRENT_DESKTOP', '').lower().split(':')
if 'gnome' in desktop:
from .gsettings_detection import GSettingsLayout
return GSettingsLayout()
from .wayland_detection import compositor, detect_layout as detect_wayland_layout
if compositor(os.environ):
return detect_wayland_layout(os.environ)
return X11Layout()
@@ -0,0 +1,98 @@
"""GNOME source-history labels and the configured switching shortcut."""
import ast
import re
from evdev import ecodes
from .detection import X11Layout
from .layouts import Layout
from .wayland_detection import command
SOURCE_SCHEMA = 'org.gnome.desktop.input-sources'
BINDINGS_SCHEMA = 'org.gnome.desktop.wm.keybindings'
SHORTCUT_MODIFIERS = {
'Control': ecodes.KEY_LEFTCTRL, 'Ctrl': ecodes.KEY_LEFTCTRL,
'Primary': ecodes.KEY_LEFTCTRL, 'Alt': ecodes.KEY_LEFTALT,
'Shift': ecodes.KEY_LEFTSHIFT, 'Super': ecodes.KEY_LEFTMETA,
}
class GSettingsLayout:
def __init__(self) -> None:
self.layout: Layout | None = None
self.current: tuple[str, str] | None = None
description = command(['gsettings', 'describe', SOURCE_SCHEMA, 'current']).lower()
self.legacy_current = 'zero-based index' in description and 'deprecated' not in description
self._update()
def _read(self, key: str) -> object:
text = command(['gsettings', 'get', SOURCE_SCHEMA, key]).strip()
text = re.sub(r'^@[a-z()]+\s+|^uint32\s+', '', text)
if text in ('true', 'false'):
return text == 'true'
return ast.literal_eval(text)
def _source(self) -> tuple[str, str]:
sources = self._read('sources')
if self._read('per-window'):
raise ValueError('GSettings cannot track per-window input sources')
if not isinstance(sources, list) or not sources:
raise ValueError('GSettings has no input sources')
if self.legacy_current:
index = self._read('current')
if type(index) is not int or not 0 <= index < len(sources):
raise ValueError('Invalid GSettings current input-source index')
selected = sources[index]
elif len(sources) == 1:
selected = sources[0]
else:
recent = self._read('mru-sources')
if not isinstance(recent, list) or not recent or recent[0] not in sources:
raise ValueError('GSettings input-source history is unavailable')
selected = recent[0]
kind, name = selected
if kind != 'xkb' or not isinstance(name, str) or not name:
raise ValueError('GSettings input source is not an XKB layout')
layout, _, variant = name.partition('+')
return layout, variant
def _update(self) -> None:
choice = self._source()
if choice == self.current:
return
replacement = Layout(*choice)
if self.layout is not None:
self.layout.close()
self.layout, self.current = replacement, choice
def labels(self, modifiers: set[int] | tuple[int, ...] = ()) -> dict[str, str]:
self._update()
assert self.layout is not None
return self.layout.labels(modifiers)
def switch_codes(self) -> tuple[int, ...]:
text = command(['gsettings', 'get', BINDINGS_SCHEMA, 'switch-input-source']).strip()
bindings = ast.literal_eval(re.sub(r'^@as\s+', '', text))
if not isinstance(bindings, list):
raise ValueError('Invalid GSettings input-source shortcuts')
keymap = X11Layout()
try:
for accelerator in bindings:
modifiers = re.findall(r'<([^>]+)>', accelerator)
name = re.sub(r'<[^>]+>', '', accelerator)
if not name or any(item not in SHORTCUT_MODIFIERS for item in modifiers):
continue
try:
code = keymap.keycode(name)
except ValueError:
continue
return tuple(SHORTCUT_MODIFIERS[item] for item in modifiers) + (code,)
finally:
keymap.close()
raise RuntimeError('No supported GSettings switch-input-source shortcut')
def close(self) -> None:
if self.layout is not None:
self.layout.close()
self.layout = None
+197
View File
@@ -0,0 +1,197 @@
"""System input for the themed on-screen keyboard.
Assisted-by: Codex:GPT-6
"""
from queue import Empty, Queue
from threading import Event
import time
from typing import Any
from evdev import UInput, ecodes
from PySide6.QtCore import QThread, Signal
from portprotonqt.logger import get_logger
logger = get_logger(__name__)
INPUT_POLL_SECONDS = 0.15
KEY_ROWS = (
(ecodes.KEY_GRAVE, *range(ecodes.KEY_1, ecodes.KEY_EQUAL + 1)),
(ecodes.KEY_TAB, *range(ecodes.KEY_Q, ecodes.KEY_RIGHTBRACE + 1), ecodes.KEY_BACKSLASH),
(ecodes.KEY_CAPSLOCK, *range(ecodes.KEY_A, ecodes.KEY_APOSTROPHE + 1)),
(ecodes.KEY_LEFTSHIFT, ecodes.KEY_102ND, *range(ecodes.KEY_Z, ecodes.KEY_SLASH + 1)),
)
SPECIAL_KEYS = (
ecodes.KEY_BACKSPACE, ecodes.KEY_ENTER, ecodes.KEY_SPACE,
ecodes.KEY_HOME, ecodes.KEY_END, ecodes.KEY_LEFT, ecodes.KEY_RIGHT,
ecodes.KEY_UP, ecodes.KEY_DOWN,
ecodes.KEY_LEFTCTRL, ecodes.KEY_KBD_LAYOUT_NEXT, ecodes.KEY_DELETE,
ecodes.KEY_LEFTALT, ecodes.KEY_RIGHTALT, ecodes.KEY_LEFTMETA,
)
class SystemInputWorker(QThread):
"""Own the uinput device and serialize all key events off the UI thread."""
ready = Signal()
failed = Signal(str)
state_changed = Signal(dict)
warning = Signal(str)
def __init__(self) -> None:
super().__init__()
self.commands: Queue[tuple[str, tuple[int, ...]]] = Queue()
self.stopping = Event()
self.enabled = Event()
self.modifiers: set[int] = set()
self.caps_lock = False
self.layout: Any = None
self.manual_layout = False
def run(self) -> None:
device = None
try:
keys = {code for row in KEY_ROWS for code in row} | set(SPECIAL_KEYS)
device = UInput({ecodes.EV_KEY: sorted(keys), ecodes.EV_LED: [ecodes.LED_CAPSL]},
name="PortProtonQt Keyboard", bustype=ecodes.BUS_USB)
self._load_layout()
self.ready.emit()
self._run_commands(device)
except OSError as error:
logger.warning("System keyboard input unavailable: %s", error)
self.failed.emit(str(error))
except Exception as error:
logger.exception("System keyboard input failed")
self.failed.emit(str(error))
finally:
if self.layout is not None:
self.layout.close()
if device is not None:
device.close()
def _run_commands(self, device: UInput) -> None:
next_poll = 0.0
while not self.stopping.is_set():
try:
action, codes = self.commands.get(timeout=INPUT_POLL_SECONDS)
except Empty:
action, codes = '', ()
if self.stopping.is_set():
break
try:
if action:
self._execute(device, action, codes)
except RuntimeError as error:
logger.warning('System keyboard command failed: %s', error)
self.warning.emit(str(error))
except ValueError as error:
logger.warning('Invalid system keyboard command: %s', error)
self.warning.emit(str(error))
if action or time.monotonic() >= next_poll:
self._refresh_state(device)
next_poll = time.monotonic() + INPUT_POLL_SECONDS
def _load_layout(self) -> None:
import os
from .detection import detect_layout
from .manual_layout import ManualLayout
from .wayland_detection import compositor
try:
self.layout = detect_layout()
except Exception as error:
if not compositor(os.environ):
raise
logger.warning("System layout detection unavailable: %s", error)
self.layout = ManualLayout()
self.manual_layout = True
self.warning.emit(f'{error}. Manual US/RU labels; external layout changes are not tracked.')
def _execute(self, device: UInput, action: str, codes: tuple[int, ...]) -> None:
from .detection import X11Layout, is_x11_session
from .gsettings_detection import GSettingsLayout
import os
if action in {'tap', 'caps', 'language'} and not self.enabled.is_set():
return
if action == 'modifiers':
self.modifiers = set(codes)
elif action == 'release':
self.modifiers.clear()
elif action == 'caps':
if isinstance(self.layout, X11Layout) and is_x11_session(os.environ):
self.layout.toggle_caps_lock()
else:
self.send_keys(device, (ecodes.KEY_CAPSLOCK,))
elif action == 'language':
if isinstance(self.layout, X11Layout) and is_x11_session(os.environ):
self.layout.switch()
elif isinstance(self.layout, GSettingsLayout):
self.send_keys(device, self.layout.switch_codes())
elif self.manual_layout:
self.send_keys(device, (ecodes.KEY_KBD_LAYOUT_NEXT,))
self.layout.switch()
elif hasattr(self.layout, 'switch') and not isinstance(self.layout, X11Layout):
self.layout.switch()
else:
self.send_keys(device, (ecodes.KEY_KBD_LAYOUT_NEXT,))
self.modifiers.clear()
elif action == 'tap':
self.send_keys(device, tuple(sorted(self.modifiers)) + codes)
self.modifiers.clear()
def _refresh_state(self, device: UInput) -> None:
from .detection import X11Layout, is_x11_session
import os
try:
for event in device.read():
if event.type == ecodes.EV_LED and event.code == ecodes.LED_CAPSL:
self.caps_lock = bool(event.value)
except BlockingIOError:
pass
try:
caps = (self.layout.caps_lock() if isinstance(self.layout, X11Layout)
and is_x11_session(os.environ) else self.caps_lock)
modifiers = self.modifiers & {ecodes.KEY_LEFTSHIFT, ecodes.KEY_RIGHTALT}
if caps:
modifiers.add(ecodes.KEY_CAPSLOCK)
labels = self.layout.labels(modifiers)
current = getattr(self.layout, 'current', None)
name = current[0] if isinstance(current, tuple) else getattr(self.layout, 'language', 'System')
if hasattr(self.layout, 'layout_identifier'):
name = self.layout.layout_identifier()
self.state_changed.emit({'labels': labels, 'caps': caps,
'shift': ecodes.KEY_LEFTSHIFT in self.modifiers,
'modifiers': tuple(sorted(self.modifiers)), 'layout': name})
except Exception as error:
logger.warning("Cannot update system keyboard labels: %s", error)
self.warning.emit(str(error))
def send_keys(self, device: UInput, codes: tuple[int, ...]) -> None:
pressed = []
try:
for code in codes:
pressed.append(code)
device.write(ecodes.EV_KEY, code, 1)
device.syn()
finally:
for code in reversed(pressed):
try:
device.write(ecodes.EV_KEY, code, 0)
device.syn()
except OSError:
logger.exception("Failed to release system keyboard key %s", code)
def stop(self) -> None:
self.enabled.clear()
self.stopping.set()
self.commands.put(('', ()))
self.wait()
def cancel_pending(self) -> None:
self.enabled.clear()
while True:
try:
self.commands.get_nowait()
except Empty:
break
self.commands.put(('release', ()))
+17
View File
@@ -0,0 +1,17 @@
"""Physical keys shared by uinput and XKB label readers."""
from evdev import ecodes
from .input import KEY_ROWS
ROWS = [[("", code) for code in row] for row in KEY_ROWS]
MODIFIERS = {ecodes.KEY_LEFTSHIFT, ecodes.KEY_LEFTCTRL, ecodes.KEY_LEFTMETA,
ecodes.KEY_LEFTALT, ecodes.KEY_RIGHTALT}
KEY_KBD_LAYOUT_NEXT = ecodes.KEY_KBD_LAYOUT_NEXT
XKB_KEYCODE_OFFSET = 8
XKB_CORE_KEYBOARD = 0x0100
XKB_SHIFT_MASK = 1
XKB_LOCK_MASK = 2
XKB_ALTGR_MASK = 128
XKB_GROUP_COUNT = 4
XKB_GROUP_SHIFT = 13
+108
View File
@@ -0,0 +1,108 @@
"""Generate labels from the installed XKB database, not a hand-written language list."""
from typing import Any
import ctypes as C
import xml.etree.ElementTree as ET
from .keys import ROWS, MODIFIERS
from .native import load_library
class Names(C.Structure):
_fields_ = [(name, C.c_char_p) for name in ('rules', 'model', 'layout', 'variant', 'options')]
def available_layouts(registry: Any='/usr/share/X11/xkb/rules/evdev.xml') -> Any:
result = []
for layout in ET.parse(registry).findall('./layoutList/layout'):
name = layout.findtext('./configItem/name')
result.append((name, ''))
for variant in layout.findall('./variantList/variant'):
result.append((name, variant.findtext('./configItem/name')))
return result
class Layout:
def __init__(self, layout: Any='us', variant: Any='', *, keymap_text: Any=None) -> None:
self.context = self.keymap = None
self.lib = load_library()
self._configure_library()
self.context = self.lib.portproton_keyboard_xkb_context_new(0)
if not self.context:
raise RuntimeError('Failed to create XKB context')
names = Names(None, b'pc105', layout.encode(), variant.encode(), b'')
if keymap_text is None:
self.keymap = self.lib.xkb_keymap_new_from_names(self.context, C.byref(names), 0)
else:
self.keymap = self.lib.xkb_keymap_new_from_string(self.context, keymap_text, 1, 0)
if not self.keymap:
self.close()
raise ValueError(f'Unknown XKB layout: {layout}+{variant}')
def _configure_library(self) -> None:
functions = {
'portproton_keyboard_xkb_context_new': ([C.c_int], C.c_void_p),
'xkb_keymap_num_layouts': ([C.c_void_p], C.c_uint),
'xkb_keymap_layout_get_name': ([C.c_void_p, C.c_uint], C.c_char_p),
'xkb_context_unref': ([C.c_void_p], None),
'xkb_keymap_new_from_names': ([C.c_void_p, C.POINTER(Names), C.c_int], C.c_void_p),
'xkb_keymap_new_from_string': ([C.c_void_p, C.c_char_p, C.c_int, C.c_int], C.c_void_p),
'xkb_state_update_mask': ([C.c_void_p] + [C.c_uint] * 6, C.c_uint),
'xkb_keymap_unref': ([C.c_void_p], None),
'xkb_state_new': ([C.c_void_p], C.c_void_p),
'xkb_state_unref': ([C.c_void_p], None),
'xkb_state_update_key': ([C.c_void_p, C.c_uint, C.c_int], C.c_uint),
'xkb_state_key_get_utf8': ([C.c_void_p, C.c_uint, C.c_void_p, C.c_size_t], C.c_int),
'xkb_state_key_get_one_sym': ([C.c_void_p, C.c_uint], C.c_uint),
'xkb_keysym_get_name': ([C.c_uint, C.c_void_p, C.c_size_t], C.c_int),
}
for name, (args, result) in functions.items():
function = getattr(self.lib, name)
function.argtypes, function.restype = args, result
def labels(self, modifiers: Any=(), *, mask: Any=None) -> Any:
state = self.lib.xkb_state_new(self.keymap)
if not state:
raise RuntimeError('Не удалось создать состояние XKB')
try:
if mask is not None:
depressed, latched, locked, group = mask
self.lib.xkb_state_update_mask(state, depressed, latched, locked, 0, 0, group)
for code in modifiers:
self.lib.xkb_state_update_key(state, code + 8, 1)
labels = {}
for row in ROWS:
for fallback, code in row:
if code in MODIFIERS or code in {1, 14, 15, 28, 58, 57, 103, 105, 106, 108, 111}:
labels[str(code)] = fallback
continue
buffer = C.create_string_buffer(128)
length = self.lib.xkb_state_key_get_utf8(state, code + 8, buffer, len(buffer))
label = buffer.value.decode() if 0 < length < len(buffer) else ''
if not label or not label.isprintable():
sym = self.lib.xkb_state_key_get_one_sym(state, code + 8)
self.lib.xkb_keysym_get_name(sym, buffer, len(buffer))
label = buffer.value.decode() or fallback
labels[str(code)] = label
return labels
finally:
self.lib.xkb_state_unref(state)
def export(self) -> Any:
return {name: self.labels(mods) for name, mods in
[('normal', ()), ('shift', (42,)), ('altgr', (100,)), ('shift-altgr', (42, 100))]}
def layout_count(self) -> int:
return self.lib.xkb_keymap_num_layouts(self.keymap)
def layout_identifier(self, group: int) -> str:
name = self.lib.xkb_keymap_layout_get_name(self.keymap, group)
return name.decode() if name else 'System'
def close(self) -> None:
if self.keymap:
self.lib.xkb_keymap_unref(self.keymap)
self.keymap = None
if self.context:
self.lib.xkb_context_unref(self.context)
self.context = None
@@ -0,0 +1,23 @@
"""Manual label fallback for compositors without layout detection."""
from typing import Any
from .layouts import Layout
class ManualLayout:
def __init__(self) -> None:
self.layout = Layout('us')
self.language = 'us'
def switch(self) -> Any:
language = 'ru' if self.language == 'us' else 'us'
replacement = Layout(language)
self.layout.close()
self.layout = replacement
self.language = language
def labels(self, modifiers: Any=()) -> Any:
return self.layout.labels(modifiers)
def close(self) -> None:
self.layout.close()
+14
View File
@@ -0,0 +1,14 @@
"""Load the linked keyboard backend using the same paths as the SDL backend."""
import ctypes
from pathlib import Path
KEYBOARD_LIBRARY_NAME = 'libportprotonqt_keyboard.so'
SYSTEM_KEYBOARD_LIBRARY = Path(__file__).parent.parent / KEYBOARD_LIBRARY_NAME
DEV_KEYBOARD_LIBRARY = Path(__file__).parent.parent.parent / 'build-aux' / 'lib' / KEYBOARD_LIBRARY_NAME
KEYBOARD_LIBRARY_PATH = (SYSTEM_KEYBOARD_LIBRARY if SYSTEM_KEYBOARD_LIBRARY.is_file()
else DEV_KEYBOARD_LIBRARY)
def load_library() -> ctypes.CDLL:
return ctypes.CDLL(str(KEYBOARD_LIBRARY_PATH))
@@ -0,0 +1,123 @@
"""Compositor IPC adapters for layer-shell layout labels."""
from typing import Any
import orjson
import subprocess
import xml.etree.ElementTree as ET
from .layouts import Layout
def compositor(environment: Any) -> Any:
desktop = environment.get('XDG_CURRENT_DESKTOP', '').lower().split(':')
for name, variable in [('hyprland', 'HYPRLAND_INSTANCE_SIGNATURE'),
('sway', 'SWAYSOCK'), ('niri', 'NIRI_SOCKET')]:
if environment.get(variable):
return name
return next((name for name in ('hyprland', 'sway', 'niri', 'cosmic') if name in desktop), None)
def command(args: Any) -> Any:
try:
return subprocess.run(args, capture_output=True, text=True,
timeout=1, check=True).stdout
except (OSError, subprocess.SubprocessError) as exc:
raise RuntimeError(f'Ошибка IPC ({args[0]}): {exc}') from exc
class NiriLayout:
def __init__(self, registry: Any='/usr/share/X11/xkb/rules/evdev.xml') -> None:
self.names = {}
for entry in ET.parse(registry).findall('./layoutList/layout'):
code = entry.findtext('./configItem/name')
self.names[entry.findtext('./configItem/description')] = (code, '')
for variant in entry.findall('./variantList/variant'):
self.names[variant.findtext('./configItem/description')] = (
code, variant.findtext('./configItem/name'))
self.layout = None
self.current = None
self._update()
def _query_name(self) -> Any:
try:
result = subprocess.run(
['niri', 'msg', '--json', 'keyboard-layouts'],
capture_output=True, text=True, timeout=1, check=True)
except (OSError, subprocess.SubprocessError) as exc:
raise RuntimeError(f'Не удалось запросить раскладку через niri IPC: {exc}') from exc
data = orjson.loads(result.stdout)
index = data['current_idx']
if type(index) is not int or not 0 <= index < len(data['names']):
raise ValueError('Некорректный индекс раскладки niri')
return data['names'][index]
def _update(self) -> None:
name = self._query_name()
if name not in self.names:
raise ValueError(f'Раскладка отсутствует в реестре XKB: {name}')
choice = self.names[name]
if choice != self.current:
replacement = Layout(*choice)
if self.layout is not None:
self.layout.close()
self.layout = replacement
self.current = choice
def labels(self, modifiers: Any=()) -> Any:
self._update()
assert self.layout is not None
return self.layout.labels(modifiers)
def switch(self) -> None:
command(['niri', 'msg', 'action', 'switch-layout', 'next'])
def close(self) -> None:
if self.layout is not None:
self.layout.close()
self.layout = None
class SwayLayout(NiriLayout):
def _query_name(self) -> Any:
inputs = orjson.loads(command(['swaymsg', '-t', 'get_inputs', '-r']))
keyboards = [item for item in inputs if item.get('type') == 'keyboard'
and item.get('xkb_active_layout_name')]
if not keyboards:
raise RuntimeError('Sway не сообщил раскладку клавиатуры')
# Never silently display one of several conflicting device layouts.
names = {item['xkb_active_layout_name'] for item in keyboards}
if len(names) != 1:
raise RuntimeError('У клавиатур Sway разные раскладки; задайте --layout')
return keyboards[0]['xkb_active_layout_name']
def switch(self) -> Any:
result = orjson.loads(command(['swaymsg', '-r', 'input type:keyboard xkb_switch_layout next']))
if not result or not all(item.get('success') for item in result):
raise RuntimeError(f'Sway не переключил раскладку: {result}')
class HyprlandLayout(NiriLayout):
def _query_name(self) -> Any:
data = orjson.loads(command(['hyprctl', '-j', 'devices']))
keyboard = next((item for item in data['keyboards'] if item.get('main')), None)
if keyboard is None or not keyboard.get('active_keymap'):
raise RuntimeError('Hyprland не сообщил раскладку основной клавиатуры')
self.keyboard = keyboard['name']
return keyboard['active_keymap']
def switch(self) -> Any:
self._query_name()
result = command(['hyprctl', 'switchxkblayout', self.keyboard, 'next'])
if result.strip() != 'ok':
raise RuntimeError(f'Hyprland не переключил раскладку: {result.strip()}')
def detect_layout(environment: Any) -> Any:
if compositor(environment) == 'cosmic':
from .cosmic_detection import CosmicLayout
return CosmicLayout()
adapter = {'niri': NiriLayout, 'sway': SwayLayout,
'hyprland': HyprlandLayout}.get(compositor(environment))
if adapter is None:
raise RuntimeError('Нет адаптера определения раскладки для этого композитора')
return adapter()
@@ -0,0 +1,378 @@
"""Present the Qt keyboard through native layer-shell and shared memory."""
import ctypes as C
from functools import partial
import mmap
import os
import select
from typing import Any
from PySide6.QtCore import QEvent, QObject, QPoint, QPointF, QSocketNotifier, Qt, QTimer
from PySide6.QtGui import QImage, QMouseEvent, QRegion
from PySide6.QtWidgets import QApplication
from portprotonqt.logger import get_logger
from .cosmic_detection import Interface, Message
from .native import load_library
logger = get_logger(__name__)
WL_VERSION = 1
WL_DESTROY = 1
WL_FIXED_SCALE = 256
LAYER_OVERLAY = 3
ANCHOR_ALL_EDGES = 15
KEYBOARD_INTERACTIVITY_NONE = 0
SHM_ARGB8888 = 0
PIXEL_BYTES = 4
FRAME_INTERVAL_MS = 33
MAX_SURFACE_PIXELS = 33_177_600
POINTER_BUTTON_LEFT = 272
class WaylandWindow(QObject):
"""Keep native surfaces separate from Qt's offscreen platform plugin."""
def __init__(self, window: Any) -> None:
super().__init__(window)
self.window = window
self.callbacks: list[Any] = []
self.proxies: list[int] = []
self.buffers: dict[int, dict[str, Any]] = {}
self.compositor = self.shm = self.shell = None
self.seat: int | None = None
self.surface = self.layer = self.pointer = self.touch = None
self.display = None
self.wanted_visible = self.configured = False
self.dirty = True
self.position = QPointF()
self.pressed_widget: Any = None
self.lib = load_library()
self._configure_library()
self._configure_protocol()
self.display = self.lib.portproton_keyboard_wayland_connect(None)
if not self.display:
raise RuntimeError('Cannot connect to the Wayland compositor')
self.registry = self._request(self.display, (1, self._interface('wl_registry')), (C.c_void_p(),))
self._listen(self.registry, [(self._global, [C.c_uint32, C.c_char_p, C.c_uint32]),
(self._global_removed, [C.c_uint32])])
self.sync = self._request(self.display, (0, self._interface('wl_callback')), (C.c_void_p(),))
self._listen(self.sync, [(self._registry_ready, [C.c_uint32])])
self.notifier = QSocketNotifier(self.lib.wl_display_get_fd(self.display), QSocketNotifier.Type.Read, self)
self.notifier.activated.connect(self._dispatch)
self.timer = QTimer(self)
self.timer.setInterval(FRAME_INTERVAL_MS)
self.timer.timeout.connect(self._render)
self.timer.start()
app = QApplication.instance()
if app is not None:
app.installEventFilter(self)
self.lib.wl_display_flush(self.display)
def _configure_library(self) -> None:
p = C.c_void_p
functions = {
'portproton_keyboard_wayland_connect': ([C.c_char_p], p),
'wl_display_disconnect': ([p], None),
'wl_display_dispatch_pending': ([p], C.c_int),
'wl_display_prepare_read': ([p], C.c_int),
'wl_display_read_events': ([p], C.c_int),
'wl_display_cancel_read': ([p], None),
'wl_display_get_fd': ([p], C.c_int),
'wl_display_flush': ([p], C.c_int),
'wl_proxy_destroy': ([p], None),
'wl_proxy_add_listener': ([p, p, p], C.c_int),
'wl_proxy_marshal_flags': ([p, C.c_uint32, C.POINTER(Interface), C.c_uint32, C.c_uint32], p),
}
for name, (args, result) in functions.items():
function = getattr(self.lib, name)
function.argtypes, function.restype = args, result
def _configure_protocol(self) -> None:
self.layer_methods = (Message * 8)(
Message(b'set_size', b'uu', None), Message(b'set_anchor', b'u', None),
Message(b'set_exclusive_zone', b'i', None), Message(b'set_margin', b'iiii', None),
Message(b'set_keyboard_interactivity', b'u', None), Message(b'get_popup', b'o', None),
Message(b'ack_configure', b'u', None), Message(b'destroy', b'', None))
self.layer_events = (Message * 2)(Message(b'configure', b'uuu', None), Message(b'closed', b'', None))
self.layer_interface = Interface(b'zwlr_layer_surface_v1', WL_VERSION, 8,
self.layer_methods, 2, self.layer_events)
self.shell_types = (C.c_void_p * 5)(C.addressof(self.layer_interface),
C.addressof(self._interface('wl_surface')), C.addressof(self._interface('wl_output')), None, None)
self.shell_methods = (Message * 1)(Message(b'get_layer_surface', b'no?ous',
C.cast(self.shell_types, C.c_void_p)))
self.shell_interface = Interface(b'zwlr_layer_shell_v1', WL_VERSION, 1, self.shell_methods, 0, None)
def _interface(self, name: str) -> Interface:
return Interface.in_dll(self.lib, name + '_interface')
def _request(self, proxy: int | None, request: tuple[int, Any], arguments: tuple[Any, ...] = ()) -> Any:
opcode, interface = request
pointer = C.byref(interface) if interface is not None else None
result = self.lib.wl_proxy_marshal_flags(proxy, opcode, pointer, WL_VERSION, 0, *arguments)
if interface is not None:
if not result:
raise RuntimeError('Cannot create Wayland protocol object')
self.proxies.append(result)
return result
def _listen(self, proxy: int, handlers: list[tuple[Any, list[Any]]]) -> None:
callbacks = []
for handler, types in handlers:
def guarded(data: Any, obj: Any, *args: Any, handler: Any = handler) -> None:
try:
handler(*args)
except Exception:
logger.exception('System keyboard Wayland event failed')
QApplication.exit(1)
callbacks.append(C.CFUNCTYPE(None, C.c_void_p, C.c_void_p, *types)(guarded))
table = (C.c_void_p * len(callbacks))(*[C.cast(callback, C.c_void_p) for callback in callbacks])
self.callbacks.append((callbacks, table))
if self.lib.wl_proxy_add_listener(proxy, table, None) != 0:
raise RuntimeError('Cannot subscribe to Wayland events')
def _global(self, name: int, interface: bytes, version: int) -> None:
interfaces = {b'wl_compositor': ('compositor', self._interface('wl_compositor')),
b'wl_shm': ('shm', self._interface('wl_shm')),
b'zwlr_layer_shell_v1': ('shell', self.shell_interface),
b'wl_seat': ('seat', self._interface('wl_seat'))}
if interface not in interfaces:
return
attribute, metadata = interfaces[interface]
if getattr(self, attribute, None) is not None:
return
proxy = self._request(self.registry, (0, metadata),
(C.c_uint32(name), interface, C.c_uint32(WL_VERSION), C.c_void_p()))
setattr(self, attribute, proxy)
if interface == b'wl_seat':
self._listen(proxy, [(self._seat_capabilities, [C.c_uint32])])
self._create_surface()
def _global_removed(self, name: int) -> None:
logger.debug('Wayland global removed: %s', name)
def _registry_ready(self, serial: int) -> None:
self.lib.wl_proxy_destroy(self.sync)
self.proxies.remove(self.sync)
if not all((self.compositor, self.shm, self.shell)):
logger.error('The compositor does not provide layer-shell or shared-memory surfaces')
QApplication.exit(1)
def show_layer(self) -> None:
self.wanted_visible = True
self._create_surface()
def _create_surface(self) -> None:
if self.surface or not self.wanted_visible or not all((self.compositor, self.shm, self.shell)):
return
self.surface = self._request(self.compositor, (0, self._interface('wl_surface')), (C.c_void_p(),))
self._listen(self.surface, [(self._surface_output, [C.c_void_p]),
(self._surface_output, [C.c_void_p])])
self.layer = self._request(self.shell, (0, self.layer_interface),
(C.c_void_p(), C.c_void_p(self.surface), C.c_void_p(),
C.c_uint32(LAYER_OVERLAY), b'portprotonqt-system-keyboard'))
self._listen(self.layer, [(self._configured, [C.c_uint32, C.c_uint32, C.c_uint32]),
(self.window.hide_keyboard, [])])
self._request(self.layer, (0, None), (C.c_uint32(0), C.c_uint32(0)))
self._request(self.layer, (1, None), (C.c_uint32(ANCHOR_ALL_EDGES),))
self._request(self.layer, (2, None), (C.c_int32(-1),))
self._request(self.layer, (4, None), (C.c_uint32(KEYBOARD_INTERACTIVITY_NONE),))
self._input_region(False)
self._request(self.surface, (6, None))
self.lib.wl_display_flush(self.display)
def _configured(self, serial: int, width: int, height: int) -> None:
if not width or not height or width * height > MAX_SURFACE_PIXELS:
raise ValueError('Invalid Wayland layer-surface dimensions')
self._request(self.layer, (6, None), (C.c_uint32(serial),))
self.window.resize(width, height)
self.window._position_keyboard()
self.configured = self.dirty = True
def _surface_output(self, output: int) -> None:
self.dirty = True
def _input_region(self, include_panel: bool = True) -> None:
region = self._request(self.compositor, (1, self._interface('wl_region')), (C.c_void_p(),))
if include_panel:
rect = self.window.keyboard.geometry()
args = tuple(C.c_int32(value) for value in (rect.x(), rect.y(), rect.width(), rect.height()))
self._request(region, (1, None), args)
self._request(self.surface, (5, None), (C.c_void_p(region),))
self._destroy(region, 0)
def _destroy(self, proxy: int | None, opcode: int) -> None:
if proxy is not None:
self.lib.wl_proxy_marshal_flags(proxy, opcode, None, WL_VERSION, WL_DESTROY)
self.proxies.remove(proxy)
def _buffer(self, width: int, height: int) -> int | None:
size = width * height * PIXEL_BYTES
for proxy, buffer in self.buffers.items():
if buffer['size'] == (width, height) and not buffer['busy']:
return proxy
if sum(buffer['size'] == (width, height) for buffer in self.buffers.values()) >= 2:
return None
fd = os.memfd_create('portprotonqt-keyboard', os.MFD_CLOEXEC)
try:
os.ftruncate(fd, size)
memory = mmap.mmap(fd, size)
pool = self._request(self.shm, (0, self._interface('wl_shm_pool')),
(C.c_void_p(), C.c_int(fd), C.c_int32(size)))
proxy = self._request(pool, (0, self._interface('wl_buffer')),
(C.c_void_p(), C.c_int32(0), C.c_int32(width), C.c_int32(height),
C.c_int32(width * PIXEL_BYTES), C.c_uint32(SHM_ARGB8888)))
self._destroy(pool, 1)
finally:
os.close(fd)
self.buffers[proxy] = {'memory': memory, 'size': (width, height), 'busy': False}
self._listen(proxy, [(partial(self._released, proxy), [])])
return proxy
def _released(self, proxy: int) -> None:
buffer = self.buffers.get(proxy)
if buffer is not None:
buffer['busy'] = False
if buffer['size'] != (self.window.width(), self.window.height()):
self._destroy(proxy, 0)
buffer['memory'].close()
del self.buffers[proxy]
def _render(self) -> None:
if not self.surface or not self.configured or not self.dirty:
return
width, height = self.window.width(), self.window.height()
proxy = self._buffer(width, height)
if proxy is None:
return
image = QImage(width, height, QImage.Format.Format_ARGB32_Premultiplied)
image.fill(Qt.GlobalColor.transparent)
self.dirty = False
self.window.render(image, QPoint(), QRegion(), self.window.RenderFlag.DrawChildren)
buffer = self.buffers[proxy]
buffer['memory'].seek(0)
buffer['memory'].write(image.constBits())
buffer['busy'] = True
self._request(self.surface, (1, None), (C.c_void_p(proxy), C.c_int32(0), C.c_int32(0)))
self._request(self.surface, (2, None), tuple(C.c_int32(v) for v in (0, 0, width, height)))
self._input_region()
self._request(self.surface, (6, None))
self.lib.wl_display_flush(self.display)
def eventFilter(self, obj: QObject, event: QEvent) -> bool:
if event.type() == QEvent.Type.UpdateRequest:
self.dirty = True
return False
def _dispatch(self) -> None:
while self.lib.wl_display_prepare_read(self.display) != 0:
if self.lib.wl_display_dispatch_pending(self.display) < 0:
QApplication.exit(1)
return
fd = self.lib.wl_display_get_fd(self.display)
if select.select([fd], [], [], 0)[0]:
result = self.lib.wl_display_read_events(self.display)
else:
self.lib.wl_display_cancel_read(self.display)
result = 0
if result < 0 or self.lib.wl_display_dispatch_pending(self.display) < 0:
logger.error('System keyboard Wayland connection closed')
QApplication.exit(1)
return
self.lib.wl_display_flush(self.display)
def _seat_capabilities(self, capabilities: int) -> None:
if capabilities & 1 and self.pointer is None:
self.pointer = self._request(self.seat, (0, self._interface('wl_pointer')), (C.c_void_p(),))
u, i, p = C.c_uint32, C.c_int32, C.c_void_p
self._listen(self.pointer, [(self._pointer_enter, [u, p, i, i]),
(self._pointer_leave, [u, p]),
(self._pointer_motion, [u, i, i]),
(self._pointer_button, [u, u, u, u]),
(self._pointer_axis, [u, u, i])])
if capabilities & 4 and self.touch is None:
self.touch = self._request(self.seat, (2, self._interface('wl_touch')), (C.c_void_p(),))
u, i, p = C.c_uint32, C.c_int32, C.c_void_p
self._listen(self.touch, [(self._touch_down, [u, u, p, i, i, i]),
(self._touch_up, [u, u, i]), (self._touch_motion, [u, i, i, i]),
(self._touch_frame, []), (self._touch_cancel, [])])
def _pointer_enter(self, *event: int) -> None:
serial, surface, x, y = event
self.position = QPointF(x / WL_FIXED_SCALE, y / WL_FIXED_SCALE)
def _pointer_leave(self, serial: int, surface: int) -> None:
self.dirty = True
def _pointer_motion(self, timestamp: int, x: int, y: int) -> None:
self.position = QPointF(x / WL_FIXED_SCALE, y / WL_FIXED_SCALE)
self._mouse_event(QEvent.Type.MouseMove)
def _pointer_button(self, *event: int) -> None:
serial, timestamp, button, state = event
if button == POINTER_BUTTON_LEFT:
kind = QEvent.Type.MouseButtonPress if state else QEvent.Type.MouseButtonRelease
self._mouse_event(kind)
def _pointer_axis(self, timestamp: int, axis: int, value: int) -> None:
logger.debug('System keyboard pointer axis: %s', axis)
def _touch_down(self, *event: int) -> None:
serial, timestamp, surface, touch_id, x, y = event
if self.pressed_widget is None:
self.touch_id = touch_id
self.position = QPointF(x / WL_FIXED_SCALE, y / WL_FIXED_SCALE)
self._mouse_event(QEvent.Type.MouseButtonPress)
def _touch_up(self, serial: int, timestamp: int, touch_id: int) -> None:
if touch_id == getattr(self, 'touch_id', None):
self._mouse_event(QEvent.Type.MouseButtonRelease)
self.touch_id = None
def _touch_motion(self, *event: int) -> None:
timestamp, touch_id, x, y = event
if touch_id == getattr(self, 'touch_id', None):
self._pointer_motion(timestamp, x, y)
def _touch_frame(self) -> None:
self.dirty = True
def _touch_cancel(self) -> None:
self.touch_id = None
self.pressed_widget = None
self.window.keyboard.stop_backspace_repeat()
def _mouse_event(self, kind: QEvent.Type) -> None:
point = self.position.toPoint()
target = self.pressed_widget or self.window.childAt(point) or self.window.keyboard
if kind == QEvent.Type.MouseButtonPress:
self.pressed_widget = target
local = QPointF(target.mapFrom(self.window, point))
button = Qt.MouseButton.NoButton if kind == QEvent.Type.MouseMove else Qt.MouseButton.LeftButton
held = self.pressed_widget is not None and kind != QEvent.Type.MouseButtonRelease
buttons = Qt.MouseButton.LeftButton if held else Qt.MouseButton.NoButton
event = QMouseEvent(kind, local, self.position, button, buttons, Qt.KeyboardModifier.NoModifier)
QApplication.sendEvent(target, event)
if kind == QEvent.Type.MouseButtonRelease:
self.pressed_widget = None
self.dirty = True
def hide_layer(self) -> None:
self.wanted_visible = self.configured = False
self.pressed_widget = None
self._destroy(self.layer, 7)
self._destroy(self.surface, 0)
self.layer = self.surface = None
self.lib.wl_display_flush(self.display)
def shutdown(self) -> None:
self.timer.stop()
self.notifier.setEnabled(False)
if self.display:
for proxy in reversed(self.proxies):
self.lib.wl_proxy_destroy(proxy)
self.proxies.clear()
self.lib.wl_display_disconnect(self.display)
self.display = None
for buffer in self.buffers.values():
buffer['memory'].close()
self.buffers.clear()
+336
View File
@@ -0,0 +1,336 @@
"""Reuse the embedded keyboard's buttons and theme for system input."""
import os
import sys
from types import SimpleNamespace
from typing import Any, cast
import orjson
from evdev import ecodes
from PySide6.QtCore import QEvent, QObject, QPoint, Qt
from PySide6.QtGui import QCloseEvent, QMouseEvent
from PySide6.QtWidgets import QApplication, QFrame, QLabel, QPushButton, QWidget
from portprotonqt.config import gamepad_config, ui_config
from portprotonqt.input_manager.constants import GamepadType
from portprotonqt.keyboard_layouts import keyboard_layouts
from portprotonqt.logger import get_logger
from portprotonqt.tabs.control_hints import MainWindowControlHintsMixin
from portprotonqt.theme_manager import ThemeManager
from portprotonqt.virtual_keyboard import VirtualKeyboard, LAYOUT_DISPLAY_NAMES
from .input import KEY_ROWS, SystemInputWorker
from .wayland_detection import compositor
logger = get_logger(__name__)
def report(event: str, value: object = None) -> None:
sys.stdout.buffer.write(orjson.dumps({'event': event, 'value': value}) + b'\n')
sys.stdout.buffer.flush()
class SystemKeyboardPanel(VirtualKeyboard):
def __init__(self, owner: 'SystemKeyboardWindow', theme: Any) -> None:
self.owner = owner
self.keycodes: dict[str, int] = {}
self.labels: dict[str, str] = {}
self.modifiers: set[int] = set()
self.layout_name = 'System'
self.drag_origin: QPoint | None = None
super().__init__(owner, theme)
self.set_slide_animation_enabled(False)
self.setObjectName('systemKeyboard')
self.keyboard_container.setObjectName('systemKeyboardContainer')
self.refresh_theme(theme)
def refresh_theme(self, theme: Any) -> None:
super().refresh_theme(theme)
self.setStyleSheet(theme.VIRTUAL_KEYBOARD_STYLE + theme.SYSTEM_KEYBOARD_BACKGROUND_STYLE)
def get_layouts_setxkbmap(self) -> list[str]:
return ['us']
def _space_button_text(self) -> str:
return f'Space · {LAYOUT_DISPLAY_NAMES.get(self.layout_name, self.layout_name)}'
def _save_focused_coords(self) -> tuple[int, int] | None:
current = self.selected_button
if current is None:
return None
index = self.keyboard_layout.indexOf(current)
if index < 0:
return None
row, column, _, _ = cast(tuple[int, int, int, int], self.keyboard_layout.getItemPosition(index))
return row, column
def _apply_responsive_metrics(self) -> None:
metrics = self.theme.SYSTEM_KEYBOARD
width = min(self.owner.width(), metrics['width'])
available = width - self.margins * 2 - self.spacing * (self.num_cols - 1)
self.button_width = min(self.max_button_width,
max(metrics['minimum_key_width'], available // self.num_cols))
def update_keyboard(self) -> None:
shifted = self.shift_pressed
self.shift_pressed = False
super().update_keyboard()
self.shift_pressed = shifted
self.keycodes.clear()
for row, codes in zip(keyboard_layouts['us']['normal'], KEY_ROWS, strict=True):
self.keycodes.update(zip(row, codes, strict=True))
self.apply_key_state()
if self.owner.warning_message:
warning = QLabel(self.owner.warning_message)
warning.setStyleSheet(self.theme.SETTINGS_TITLE_STYLE)
warning.setWordWrap(True)
self.keyboard_layout.addWidget(warning, 5, 0, 1, self.num_cols)
for button in self.findChildren(QPushButton):
button.setFocusPolicy(Qt.FocusPolicy.NoFocus)
def apply_key_state(self) -> None:
for key, button in self.buttons.items():
code = self.keycodes.get(key)
if code not in {None, ecodes.KEY_TAB, ecodes.KEY_CAPSLOCK, ecodes.KEY_LEFTSHIFT} and str(code) in self.labels:
text = self.labels[str(code)].replace('&', '&&')
if button.text() != text:
button.setText(text)
for button in self.findChildren(QPushButton):
checked = None
if button.text() == 'CAPS':
checked = self.caps_lock
elif button.text() == '⬆':
checked = self.shift_pressed
elif button.text().startswith('Space · '):
button.setText(self._space_button_text())
if checked is not None and button.isChecked() != checked:
button.setChecked(checked)
button.style().unpolish(button)
button.style().polish(button)
button.update()
def _release_modifiers(self) -> None:
self.modifiers.clear()
self.shift_pressed = False
self.owner.worker.commands.put(('release', ()))
self.apply_key_state()
def on_button_click(self, key: str) -> None:
code = ecodes.KEY_SPACE if key == ' ' else self.keycodes.get(key)
if code is not None:
self.owner.worker.commands.put(('tap', (code,)))
def on_backspace_click(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_BACKSPACE,)))
def on_enter_click(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_ENTER,)))
def on_clear_click(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_LEFTCTRL, ecodes.KEY_A)))
self.owner.worker.commands.put(('tap', (ecodes.KEY_BACKSPACE,)))
def on_caps_click(self) -> None:
self.apply_key_state()
self.owner.worker.commands.put(('caps', ()))
def on_shift_click(self, checked: bool) -> None:
self.shift_pressed = checked
if checked:
self.modifiers.add(ecodes.KEY_LEFTSHIFT)
else:
self.modifiers.discard(ecodes.KEY_LEFTSHIFT)
self.owner.worker.commands.put(('modifiers', tuple(sorted(self.modifiers))))
self.apply_key_state()
def on_lang_click(self) -> None:
self.owner.worker.commands.put(('language', ()))
def up_key(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_UP,)))
def down_key(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_DOWN,)))
def left_key(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_LEFT,)))
def right_key(self) -> None:
self.owner.worker.commands.put(('tap', (ecodes.KEY_RIGHT,)))
def hide(self) -> None:
self.stop_backspace_repeat()
QFrame.hide(self)
if getattr(self.owner, 'keyboard', None) is self:
self.owner.hide_keyboard()
def eventFilter(self, obj: QObject, event: QEvent) -> bool:
return QFrame.eventFilter(self, obj, event)
def mousePressEvent(self, event: QMouseEvent) -> None:
if event.button() == Qt.MouseButton.LeftButton:
self.drag_origin = event.globalPosition().toPoint()
event.accept()
return
super().mousePressEvent(event)
def mouseMoveEvent(self, event: QMouseEvent) -> None:
if self.drag_origin is not None:
position = event.globalPosition().toPoint()
delta = position - self.drag_origin
self.drag_origin = position
if self.owner.layer_shell:
position = self.pos() + delta
self.move(max(0, min(position.x(), self.owner.width() - self.width())),
max(0, min(position.y(), self.owner.height() - self.height())))
else:
self.owner.move(self.owner.pos() + delta)
event.accept()
return
super().mouseMoveEvent(event)
def mouseReleaseEvent(self, event: QMouseEvent) -> None:
self.drag_origin = None
super().mouseReleaseEvent(event)
class SystemKeyboardWindow(QWidget, MainWindowControlHintsMixin):
def __init__(self) -> None:
super().__init__(None, Qt.WindowType.Tool | Qt.WindowType.FramelessWindowHint
| Qt.WindowType.WindowStaysOnTopHint | Qt.WindowType.WindowDoesNotAcceptFocus)
self.setWindowTitle('PortProtonQt System Keyboard')
self.setAttribute(Qt.WidgetAttribute.WA_ShowWithoutActivating)
self.setAttribute(Qt.WidgetAttribute.WA_X11NetWmWindowTypeDock)
self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
self.layer_shell = compositor(os.environ) is not None
self.native_layer: Any = None
self.theme_manager = ThemeManager()
self.theme = self.theme_manager.apply_theme(ui_config.get_theme())
gtype = GamepadType.PLAYSTATION if gamepad_config.get_gamepad_type() == 'playstation' else GamepadType.XBOX
self.input_manager = SimpleNamespace(gamepad_type=gtype)
self.worker = SystemInputWorker()
self.ready = False
self.wanted_visible = False
self.warning_message = ''
self.resize(self.theme.SYSTEM_KEYBOARD['width'], self.theme.SYSTEM_KEYBOARD['height'])
self.keyboard = SystemKeyboardPanel(self, self.theme)
self.worker.ready.connect(self._ready)
self.worker.failed.connect(self._failed)
self.worker.state_changed.connect(self._state_changed)
self.worker.warning.connect(self._warning)
self._position_keyboard()
screen = self.screen()
if screen is not None:
screen.availableGeometryChanged.connect(self._position_keyboard)
screen.geometryChanged.connect(self._position_keyboard)
def _position_keyboard(self) -> None:
screen = self.screen()
if screen is None:
return
metrics = self.theme.SYSTEM_KEYBOARD
area = screen.geometry() if self.layer_shell else screen.availableGeometry()
available_width = self.width() if self.layer_shell else area.width()
width, height = min(available_width, metrics['width']), metrics['height']
if self.warning_message:
height += metrics['warning_height']
if self.layer_shell:
self.keyboard.setFixedSize(width, height)
self.keyboard.move((self.width() - width) // 2, max(0, self.height() - height))
else:
self.resize(width, height)
self.move(area.x() + (area.width() - width) // 2, area.bottom() - height + 1)
self.keyboard.setFixedSize(width, height)
self.keyboard.move(0, 0)
self.keyboard.update_keyboard()
def show_keyboard(self) -> None:
self.wanted_visible = True
if not self.ready:
return
self.worker.enabled.set()
self._position_keyboard()
self.keyboard.show()
self.show()
self.keyboard.raise_()
if self.native_layer is not None:
self.native_layer.show_layer()
def hide_keyboard(self) -> None:
self.wanted_visible = False
self.worker.cancel_pending()
self.keyboard.stop_backspace_repeat()
self.keyboard._release_modifiers()
if self.native_layer is not None:
self.native_layer.hide_layer()
self.hide()
report('hidden')
def _ready(self) -> None:
self.ready = True
if self.wanted_visible:
self.show_keyboard()
def _failed(self, message: str) -> None:
logger.error('System keyboard: %s. Requires evdev and access to /dev/uinput.', message)
app = QApplication.instance()
if app is not None:
app.exit(1)
def _warning(self, message: str) -> None:
logger.warning('System keyboard: %s', message)
if self.warning_message != message:
self.warning_message = message
self._position_keyboard()
def _state_changed(self, state: dict[str, Any]) -> None:
changed = self.keyboard.labels != state['labels'] or self.keyboard.caps_lock != state['caps']
changed |= self.keyboard.shift_pressed != state['shift']
changed |= self.keyboard.modifiers != set(state['modifiers'])
changed |= self.keyboard.layout_name != state['layout']
self.keyboard.labels = state['labels']
self.keyboard.caps_lock = state['caps']
self.keyboard.shift_pressed = state['shift']
self.keyboard.modifiers = set(state['modifiers'])
self.keyboard.layout_name = state['layout']
self.keyboard.apply_key_state()
if changed:
report('shift', state['shift'])
def command(self, action: str, value: Any = None) -> None:
if action == 'show':
self.show_keyboard()
elif action == 'hide':
self.hide_keyboard()
elif action == 'theme' and isinstance(value, str):
self.theme = self.theme_manager.apply_theme(value)
self.keyboard.refresh_theme(self.theme)
self.keyboard.current_theme_name = value
self._position_keyboard()
elif action == 'gamepad' and isinstance(value, str):
self.input_manager.gamepad_type = GamepadType(value)
self.keyboard.update_keyboard()
elif action == 'direction' and value in ('up', 'down', 'left', 'right'):
self.keyboard.focusNextKey(value)
elif action == 'button' and self.ready and self.wanted_visible:
handlers = {'confirm': self.keyboard.activateFocusedKey, 'back': self.hide_keyboard,
'language': self.keyboard.on_lang_click, 'backspace': self.keyboard.on_backspace_pressed,
'backspace_release': self.keyboard.stop_backspace_repeat}
if value == 'shift':
self.keyboard.on_shift_click(not self.keyboard.shift_pressed)
elif value in handlers:
handlers[value]()
elif action == 'quit':
app = QApplication.instance()
if app is not None:
app.quit()
def closeEvent(self, event: QCloseEvent) -> None:
event.ignore()
self.hide_keyboard()
def shutdown(self) -> None:
self.keyboard.stop_backspace_repeat()
self.worker.stop()
if self.native_layer is not None:
self.native_layer.shutdown()
+103 -42
View File
@@ -4,6 +4,7 @@ import os
import re
import shutil
import subprocess
import zlib
from datetime import datetime
from pathlib import Path
from typing import TYPE_CHECKING, Any
@@ -48,7 +49,8 @@ GOG_LOGIN_TIMEOUT_MS = 300000
EGS_LOGIN_TIMEOUT_MS = 300000
MIB_PER_GIB = 1024.0
STORE_INFO_TIMEOUT_SECONDS = 120
STORE_DLC_ART_TIMEOUT_SECONDS = 15
STORE_DLC_METADATA_TIMEOUT_SECONDS = 15
GOG_CONTENT_GENERATION = 2
STORE_DLC_CACHE_TTL_SECONDS = 300
@@ -257,11 +259,13 @@ class StoreDLCWorker(QThread):
cache_name = f"store-dlc-{'egs' if epic else 'gog'}-{self.app_id}"
data = self._load_epic_dlc_info() if epic else cache.load_json(cache_name) if cache.is_fresh(cache_name, STORE_DLC_CACHE_TTL_SECONDS) else None
if data is None:
result = subprocess.run(
self.api.build_command(arguments), env=environment, capture_output=True,
timeout=STORE_INFO_TIMEOUT_SECONDS, check=True,
)
data = orjson.loads(result.stdout)
data = None if epic else self._load_gog_dlc_info()
if data is None:
result = subprocess.run(
self.api.build_command(arguments), env=environment, capture_output=True,
timeout=STORE_INFO_TIMEOUT_SECONDS, check=True,
)
data = orjson.loads(result.stdout)
cache.save_json(cache_name, data)
entries = data.get("game", {}).get("owned_dlc", []) if epic else data.get("dlcs", [])
installed = set(self.api.load_installed()) if epic else set()
@@ -293,6 +297,43 @@ class StoreDLCWorker(QThread):
if not self.isInterruptionRequested():
self.failed.emit(str(error))
def _load_gog_dlc_info(self) -> dict | None:
assert isinstance(self.api, GOGAPI)
try:
response = requests.get(
f"https://content-system.gog.com/products/{self.app_id}/os/windows/builds",
params={"generation": GOG_CONTENT_GENERATION},
timeout=STORE_DLC_METADATA_TIMEOUT_SECONDS,
)
response.raise_for_status()
builds = response.json().get("items", [])
build = next((item for item in builds if item.get("branch") is None), None)
if build is None or build.get("generation") != GOG_CONTENT_GENERATION:
return None
response = requests.get(build["link"], timeout=STORE_DLC_METADATA_TIMEOUT_SECONDS)
response.raise_for_status()
manifest = orjson.loads(zlib.decompress(response.content))
products = [product for product in manifest["products"]
if str(product["productId"]) != self.app_id]
if not products:
return {"dlcs": []}
credentials = self.api.get_credentials()
token = credentials.get("access_token")
if not token:
return None
response = requests.get(
"https://embed.gog.com/user/data/games",
headers={"Authorization": f"Bearer {token}"},
timeout=STORE_DLC_METADATA_TIMEOUT_SECONDS,
)
response.raise_for_status()
owned = {str(app_id) for app_id in response.json()["owned"]}
return {"dlcs": [{"id": str(product["productId"]), "title": product["name"]}
for product in products if str(product["productId"]) in owned]}
except Exception as error:
logger.warning("Failed to load GOG DLC metadata, falling back to gogdl: %s", error)
return None
def _load_epic_dlc_info(self) -> dict | None:
assets = self.api._load_json(self.api.config_dir / "assets.json", None)
data = self.api._load_json(self.api.config_dir / "metadata" / f"{self.app_id}.json", None)
@@ -328,7 +369,7 @@ class StoreDLCWorker(QThread):
try:
response = requests.get(
f"https://api.gog.com/products/{self.app_id}?expand=expanded_dlcs",
timeout=STORE_DLC_ART_TIMEOUT_SECONDS,
timeout=STORE_DLC_METADATA_TIMEOUT_SECONDS,
)
response.raise_for_status()
data = response.json()
@@ -791,24 +832,27 @@ class MainWindowDownloadTabMixin(_MainWindowTypingBase):
if getattr(self, "gog_repair_worker", None) is not None:
return
app_id = str(game["app_id"])
if "_install_path" not in game:
install_path = self.gog_api.get_install_path(app_id, str(game["title"]))
install_path.mkdir(parents=True, exist_ok=True)
selected_paths: list[str] = []
file_explorer = FileExplorer(
self,
theme=self.theme,
initial_path=str(install_path),
directory_only=True,
)
file_explorer.setWindowTitle(_("Select installation folder"))
file_explorer.file_signal.file_selected.connect(selected_paths.append)
file_explorer.exec()
if not selected_paths:
return
game = {**game, "_install_path": selected_paths[0]}
if self.gog_process is not None or self.egs_process is not None:
self._queue_store_download("gog", game)
return
install_path = self.gog_api.get_install_path(app_id, str(game["title"]))
install_path.mkdir(parents=True, exist_ok=True)
selected_paths: list[str] = []
file_explorer = FileExplorer(
self,
theme=self.theme,
initial_path=str(install_path),
directory_only=True,
)
file_explorer.setWindowTitle(_("Select installation folder"))
file_explorer.file_signal.file_selected.connect(selected_paths.append)
file_explorer.exec()
if not selected_paths:
return
install_path = Path(selected_paths[0])
game = game.copy()
install_path = Path(game.pop("_install_path"))
game_path = self.gog_api.find_install_path(app_id, install_path)
if game_path is not None:
self.gog_api.save_installed_game(
@@ -845,7 +889,15 @@ class MainWindowDownloadTabMixin(_MainWindowTypingBase):
def _select_store_dlcs(self, source: str, game: dict) -> None:
if getattr(self, "store_dlc_worker", None) is not None:
QMessageBox.warning(self, _("Error"), _("Another download is running"))
pending = getattr(self, "store_dlc_pending", [])
request = (source, game)
active_source, active_game, _results, _errors = self.store_dlc_request
if (source, str(game["app_id"])) == (active_source, str(active_game["app_id"])):
return
if not any(item_source == source and str(item_game["app_id"]) == str(game["app_id"])
for item_source, item_game in pending):
pending.append(request)
self.store_dlc_pending = pending
return
api = self.egs_api if source == "egs" else self.gog_api
worker = StoreDLCWorker(api, str(game["app_id"]))
@@ -854,20 +906,26 @@ class MainWindowDownloadTabMixin(_MainWindowTypingBase):
worker.loaded.connect(results.append)
worker.failed.connect(errors.append)
worker.finished.connect(self._on_store_dlc_worker_finished)
worker.finished.connect(
lambda: self._on_store_dlcs_loaded(source, game, results[0]) if results else None
)
worker.finished.connect(
lambda: QMessageBox.warning(self, _("Error"), errors[0]) if errors else None
)
self.store_dlc_request = (source, game, results, errors)
self.store_dlc_worker = worker
worker.start()
def _on_store_dlc_worker_finished(self) -> None:
worker = self.store_dlc_worker
self.store_dlc_worker = None
if worker is not None:
worker.deleteLater()
if worker is None:
self.store_dlc_pending = []
return
worker.deleteLater()
source, game, results, errors = self.store_dlc_request
if results:
self._on_store_dlcs_loaded(source, game, results[0])
elif errors:
QMessageBox.warning(self, _("Error"), errors[0])
pending = getattr(self, "store_dlc_pending", [])
if pending and self.store_dlc_worker is None:
source, game = pending.pop(0)
self._select_store_dlcs(source, game)
def _on_store_dlcs_loaded(self, source: str, game: dict, dlcs: list[dict]) -> None:
selected = []
@@ -969,20 +1027,23 @@ class MainWindowDownloadTabMixin(_MainWindowTypingBase):
if selected_game is not None and str(selected_game["app_id"]) == app_id:
game = selected_game
self.egs_selected_dlc_game = None
if "_install_path" not in game:
selected_paths: list[str] = []
explorer = FileExplorer(
self, theme=self.theme, initial_path=str(self.egs_api.games_dir),
directory_only=True,
)
explorer.setWindowTitle(_("Select installation folder"))
explorer.file_signal.file_selected.connect(selected_paths.append)
explorer.exec()
if not selected_paths:
return
game = {**game, "_install_path": selected_paths[0]}
if self.gog_process is not None or self.egs_process is not None:
self._queue_store_download("egs", game)
return
selected_paths: list[str] = []
explorer = FileExplorer(
self, theme=self.theme, initial_path=str(self.egs_api.games_dir),
directory_only=True,
)
explorer.setWindowTitle(_("Select installation folder"))
explorer.file_signal.file_selected.connect(selected_paths.append)
explorer.exec()
if not selected_paths:
return
install_path = Path(selected_paths[0])
game = game.copy()
install_path = Path(game.pop("_install_path"))
folder_name = Path(str(game.get("folder_name") or app_id)).name
try:
game_path = install_path
+55 -9
View File
@@ -1,5 +1,7 @@
import os
import re
import shutil
from pathlib import Path
from collections.abc import Callable
from typing import TYPE_CHECKING, Any, cast
@@ -40,6 +42,7 @@ from portprotonqt.dialogs.proton_manager import (
from portprotonqt.image_utils import COVER_IMAGE_EXTENSIONS
from portprotonqt.localization import _, get_metadata_language, read_metadata_translations
from portprotonqt.logger import get_logger
from portprotonqt.native_games import NATIVE_URI_PREFIX, save_native_settings, is_native_executable, read_native_game
from portprotonqt.scripts_utils.shortcut_tools import find_ext_ppdb
from portprotonqt.scripts_utils.prefix_backup import BACKUP_EXTENSION
from portprotonqt.steam_api import get_cached_steam_game_info, is_game_in_steam
@@ -117,7 +120,7 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
))
game_config.set_display_filter(display_filter)
self.onlyInstalledCheckBox.setVisible(
display_filter not in ("steam", "portproton")
display_filter not in ("steam", "portproton", "native")
)
self._position_library_controls_widget()
self._on_only_installed_changed(game_config.get_only_installed())
@@ -362,13 +365,14 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
display_filter = game_config.get_display_filter()
only_installed = game_config.get_only_installed()
self.filter_keys = ["all", "steam", "gog", "egs", "portproton", "favorites"]
self.filter_keys = ["all", "steam", "gog", "egs", "portproton", "native", "favorites"]
self.filter_labels = [
_("All"),
"Steam",
"GOG",
"Epic Games",
"PortProton",
_("Native"),
_("Favorites"),
]
self.gamesDisplayCombo = self._create_library_combo(self.filter_labels, _("Display Filter:"))
@@ -406,7 +410,7 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
controls_layout.addWidget(self.gamesDisplayCombo, 1, 0)
controls_layout.addWidget(self.onlyInstalledCheckBox, 4, 0)
self.onlyInstalledCheckBox.setVisible(
display_filter not in ("steam", "portproton")
display_filter not in ("steam", "portproton", "native")
)
self.badge_view_keys = ["detailed", "compact", "hidden"]
@@ -652,7 +656,7 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
path = url.toLocalFile().lower()
if path.endswith(
LAUNCH_FILE_EXTENSIONS + PP_FILE_EXTENSIONS + THEME_ARCHIVE_EXTENSIONS
):
) or (os.path.isfile(url.toLocalFile()) and is_native_executable(url.toLocalFile())):
event.acceptProposedAction()
return
event.ignore()
@@ -676,7 +680,7 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
self.open_local_autoinstall_card(path)
event.acceptProposedAction()
break
if path_lower.endswith(LAUNCH_FILE_EXTENSIONS):
if path_lower.endswith(LAUNCH_FILE_EXTENSIONS) or (os.path.isfile(path) and is_native_executable(path)):
self.openAddGameDialog(path)
event.acceptProposedAction()
break
@@ -755,6 +759,9 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
name = dialog.nameEdit.text().strip()
exe_path = dialog.exeEdit.text().strip()
user_cover = dialog.coverEdit.text().strip()
native = is_native_executable(exe_path)
if native:
user_cover = dialog.last_cover_path or user_cover
if not name or not exe_path:
return
@@ -789,14 +796,30 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
entry = parse_desktop_entry(desktop_path)
if not entry:
return
self._known_portproton_desktops.add(desktop_path)
if not native:
self._known_portproton_desktops.add(desktop_path)
elif cover_path:
desktop_entry = re.sub(r"^Icon=.*$", lambda _match: f"Icon={cover_path}", desktop_entry, flags=re.MULTILINE)
self._write_desktop_file(desktop_entry, desktop_path)
if native:
try:
save_native_settings(desktop_path, {})
except Exception as error:
logger.warning("Cannot create native PPDB: %s", error)
QMessageBox.warning(self, _("Error"), str(error))
return
for source in ("all", "native", "favorites"):
getattr(self, "_loaded_library_cache", {}).pop(source, None)
description = entry.get("Comment", "")
exec_line = entry.get("Exec", exe_path)
exec_line = NATIVE_URI_PREFIX + desktop_path if native else entry.get("Exec", exe_path)
cover_for_shortcut = dialog.last_cover_path if dialog.last_cover_path else user_cover
self._sync_game_shortcuts_from_dialog(dialog, name, exec_line, cover_for_shortcut)
# User cover fallback
user_cover_path = cover_path # Already set if user provided
native_game = read_native_game(Path(desktop_path)) if native else None
if native_game:
user_cover_path = native_game[2] or user_cover_path
# Statistics (playtime, last launch - defaults for new)
playtime_seconds = 0
@@ -845,13 +868,15 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
steam_info.get("anticheat_status", ""),
last_played_timestamp,
playtime_seconds,
"portproton",
"native" if native else "portproton",
steam_info.get("anticheat_slug", ""),
steam_info.get("ppdb_id", ""),
steam_info.get("ppdb_rating", ""),
)
# Incremental add
if native and game_config.get_display_filter() not in ("all", "native"):
return
self.game_library_manager.add_game_incremental(game_data)
# Trigger visible images load
@@ -873,7 +898,7 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
cached_steam_info.get("anticheat_status", ""),
last_played_timestamp,
playtime_seconds,
"portproton",
"native" if native else "portproton",
cached_steam_info.get("anticheat_slug", ""),
cached_steam_info.get("ppdb_id", ""),
cached_steam_info.get("ppdb_rating", ""),
@@ -885,6 +910,27 @@ class MainWindowLibraryTabMixin(_MainWindowTypingBase):
def _sync_game_shortcuts_from_dialog(self, dialog, game_name, exec_line, cover_path):
"""Apply shortcut options selected in add/edit game dialog."""
if exec_line.startswith(NATIVE_URI_PREFIX):
source = Path(exec_line.removeprefix(NATIVE_URI_PREFIX))
data_home = os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
for directory, checkbox in (
(os.path.join(data_home, "applications"), dialog.add_to_menu_checkbox),
(QStandardPaths.writableLocation(QStandardPaths.StandardLocation.DesktopLocation), dialog.add_to_desktop_checkbox),
):
if directory and checkbox.isChecked():
try:
os.makedirs(directory, exist_ok=True)
shutil.copyfile(source, Path(directory) / source.name)
os.chmod(Path(directory) / source.name, 0o755)
except OSError as error:
logger.warning("Failed to copy native shortcut to %s: %s", directory, error)
QMessageBox.warning(self, _("Error"), str(error))
if dialog.add_to_steam_checkbox.isChecked():
if not is_game_in_steam(game_name):
self.context_menu_manager.add_to_steam(game_name, exec_line, cover_path)
elif is_game_in_steam(game_name):
self.context_menu_manager.remove_from_steam(game_name, exec_line, "native")
return
applications_dir = os.path.join(os.path.expanduser("~"), ".local", "share", "applications")
menu_path = os.path.join(applications_dir, f"{game_name}.desktop")
if dialog.add_to_menu_checkbox.isChecked():
+1
View File
@@ -32,6 +32,7 @@ class MainWindowWorkersMixin:
"egs_auth_worker": None,
"gog_library_worker": None,
"gog_metadata_worker": None,
"native_library_worker": None,
"gog_repair_worker": None,
"gog_delete_worker": None,
"store_dlc_worker": None,
@@ -0,0 +1 @@
<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m8.0008 1a6.9996 6.9996 0 0 0-7.0008 6.9992 6.9996 6.9996 0 0 0 7.0008 7.0008 6.9996 6.9996 0 0 0 6.9992-7.0008 6.9996 6.9996 0 0 0-6.9992-6.9992zm0.03052 1.8345c0.49138 0 0.68069 0.026991 1.0522 0.151 0.77261 0.25794 1.4608 0.88663 1.857 1.698 0.36432 0.74592 0.47136 1.542 0.34538 2.5446-0.02796 0.2226-0.0498 0.49442-0.0498 0.60402v0.1992l0.24578 0.24739c0.8226 0.82687 1.5016 1.8186 1.8892 2.7614 0.0076 0.01852 0.01187 0.0377 0.01928 0.05622-0.49301 0.83904-1.1794 1.5485-2.0016 2.0691-0.04447-0.3775-0.13313-0.76334-0.26667-1.147-0.33295-0.95658-0.86947-1.775-1.5422-2.3534-0.22323-0.19199-0.53694-0.41582-0.75181-0.53655-0.0648-0.036441-0.11405-0.069295-0.11084-0.072289 0.0035-0.00285 0.10384-0.043441 0.22329-0.08996 0.47005-0.18305 0.84651-0.41233 1.1438-0.69558 0.4802-0.45754 0.7046-0.96565 0.70361-1.5984-0.0012-0.60346-0.212-1.0975-0.64418-1.5133-0.37522-0.36091-0.8574-0.54398-1.3639-0.53815-0.30388 0.003495-0.61702 0.07465-0.92048 0.21687-0.40675 0.1906-0.86555 0.57266-1.2353 1.0265-0.19966 0.24497-0.64341 0.92641-0.61687 1.0008 0.17687 0.49573 0.05014 0.89774-0.68755 1.1213-0.14863 0.00956-0.2752 0.022977-0.28112 0.028916-0.01608 0.016029 0.06854 0.1696 0.16707 0.30843 0.14523 0.20473 0.39623 0.4208 0.6763 0.57992 0.0689 0.039149 0.12571 0.076335 0.1253 0.081928 0 0.00577-0.07689 0.054243-0.16867 0.10763-0.66042 0.38426-1.248 1.1985-1.6 2.2201-0.14407 0.4181-0.23536 0.77816-0.28755 1.1454-0.55629-0.51797-1.0112-1.1354-1.3414-1.8201 0.18238-0.35341 0.3666-0.624 0.69237-1.0217 0.32937-0.40208 0.89278-0.92816 1.3494-1.2594l0.17671-0.12851v-0.12209c1e-6 -0.11617-0.0027-0.11963-0.04659-0.10602-0.13353 0.041394-0.41447 0.20677-0.53012 0.31165l-0.05783 0.053012 0.01125-0.24418c0.01809-0.40899 0.1444-0.77469 0.40482-1.1647l0.13815-0.20562-0.0498-0.1751c-0.1341-0.46267-0.11978-1.0338 0.04016-1.5133 0.15572-0.46694 0.38428-0.82639 0.76144-1.2032 0.5179-0.51738 1.0636-0.80828 1.8201-0.96867 0.24284-0.051483 0.30063-0.056286 0.71165-0.056225zm0.45783 3.1325c0.39072-0.00731 0.65853 0.36199 0.5494 0.75663-0.03707 0.13416-0.22104 0.31614-0.36466 0.35823-0.13428 0.039318-0.26887 0.039149-0.38072 0v-0.00161c-0.19556-0.069357-0.35076-0.27993-0.36787-0.5012-0.01367-0.17688 0.04474-0.32481 0.17831-0.4498 0.12845-0.12009 0.21938-0.15913 0.38554-0.16225zm-0.14297 0.33574c-0.06851 0.00128-0.10608 0.017958-0.15904 0.06747-0.05507 0.051532-0.07953 0.11181-0.0739 0.18474 0.0071 0.091227 0.07199 0.17863 0.15261 0.20723 0.04612 0.016141 0.10046 0.01621 0.15582 0 0.05921-0.017353 0.13572-0.090873 0.151-0.14618 0.045-0.1627-0.06542-0.31627-0.22651-0.31325zm-3.0185 0.55904c-0.01687-1.298e-4 -0.03412 0.00176-0.05301 0.00321-0.12511 0.00961-0.15006 0.020885-0.27149 0.12048-0.15317 0.12564-0.3168 0.33226-0.45301 0.57349-0.10345 0.18332-0.24198 0.53868-0.2008 0.51566 0.0143-0.00799 0.11568-0.087633 0.22329-0.17671 0.26056-0.21554 0.35801-0.28499 0.67148-0.47068 0.36751-0.21785 0.41804-0.28276 0.32932-0.42892-0.05724-0.094184-0.12772-0.13564-0.24578-0.13655z" fill="#fff" stroke-width="0"/></svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

@@ -313,6 +313,12 @@ virtual_keyboard_fade_animation_duration = 140
virtual_keyboard_slide_fade_animation_duration = 180
virtual_keyboard_slide_bounce_animation_duration = 220
virtual_keyboard_animation_type = "slide"
SYSTEM_KEYBOARD = {
"width": 1000,
"height": 220,
"minimum_key_width": 18,
"warning_height": 36,
}
DETAIL_PAGE_LAYOUT_MODE = "full"
COMPATIBILITY_REPORT_DIALOG = {
@@ -44,6 +44,16 @@ CONTEXT_MENU_STYLE = f"""
}}
"""
SYSTEM_KEYBOARD_BACKGROUND_STYLE = f"""
QFrame#systemKeyboard {{
background: {color_bg};
border-radius: {border_radius_small};
}}
QWidget#systemKeyboardContainer {{
background: {color_transparent};
}}
"""
VIRTUAL_KEYBOARD_STYLE = f"""
QWidget {{
background: {color_overlay};
+4
View File
@@ -104,6 +104,10 @@ class TrayManager:
self.tray_menu.addAction(self.pause_game_action)
self.tray_menu.addAction(self.stop_game_action)
self.update_game_actions()
system_keyboard = getattr(getattr(self, 'main_window', None), 'system_keyboard', None)
if system_keyboard is not None:
keyboard_action = self.tray_menu.addAction('System Keyboard · Start + Y')
keyboard_action.triggered.connect(system_keyboard.toggle)
if self.minimal_mode:
return
self.tray_menu.addSeparator()
+3
View File
@@ -177,6 +177,9 @@ def test_app_restarts_installed_appimage_after_integration(
lambda: SimpleNamespace(
debug_level="NOTSET",
reinstall_steam_compat_tool=True,
list_games=False,
game_info=None,
edit_game=None,
),
)
monkeypatch.setattr(
+480
View File
@@ -49,6 +49,8 @@ def silent_startup(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> SimpleNam
monkeypatch.setenv("LD_PRELOAD", "libMangoHud_shim.so")
monkeypatch.setattr(app, "get_steam_language", lambda: "english")
monkeypatch.setattr(app, "get_portproton_location", lambda: str(tmp_path))
monkeypatch.setattr("portprotonqt.native_games.get_portproton_location", lambda: str(tmp_path))
monkeypatch.setattr("portprotonqt.config.portproton.get_portproton_location", lambda: str(tmp_path))
monkeypatch.setattr(app, "get_portproton_start_command", lambda: ["start.sh"])
monkeypatch.setattr(app, "consume_download_counter_skip", lambda: False)
monkeypatch.setattr(app, "update_app_version", lambda _version: False)
@@ -232,6 +234,59 @@ def test_other_launch_modes_keep_main_window(
startup.window.assert_called_once()
@pytest.mark.parametrize("flags", [[], ["--silent"], ["--log"], ["--silent", "--log"]])
@pytest.mark.parametrize("existing", [False, True])
def test_native_shortcut_launch_modes(
silent_startup: SimpleNamespace, monkeypatch: pytest.MonkeyPatch, flags: list[str], existing: bool,
) -> None:
from urllib.parse import quote
from PySide6.QtCore import QThread
from portprotonqt.native_games import create_native_desktop_file
startup = silent_startup
executable = startup.exe.with_name("native game")
executable.write_text("#!/bin/sh\nexit 0\n")
executable.chmod(0o755)
result = create_native_desktop_file(str(executable), "Native")
assert result is not None
content, destination = result
Path(destination).write_text(content)
uri = "native://" + destination
startup.socket.waitForConnected.return_value = existing
monkeypatch.setattr(sys, "argv", ["portprotonqt", *flags, str(executable)])
mode = "log" if "--log" in flags else "silent" if "--silent" in flags else "open"
if existing:
startup.app.main()
startup.socket.write.assert_called_once_with(f"{mode}:{quote(uri, safe='')}".encode())
startup.window.assert_not_called()
return
window, timers = MagicMock(), MagicMock()
window.game_processes = []
startup.window.side_effect, startup.window.return_value = None, window
monkeypatch.setattr(startup.app, "QTimer", timers)
monkeypatch.setattr(QThread, "start", MagicMock())
monkeypatch.setattr(startup.app.display_config, "get_auto_fullscreen_gamepad", lambda: False)
monkeypatch.setattr(startup.app.display_config, "get_start_minimized", lambda: False)
def event_loop() -> int:
callback = next(call.args[1] for call in timers.singleShot.call_args_list
if getattr(call.args[1], "__name__", "") == "handle_native_launch")
callback()
return 0
startup.qt_app.exec.side_effect = event_loop
with pytest.raises(SystemExit):
startup.app.main()
assert window.silent_launch_mode is (mode == "silent")
if mode == "silent":
window.toggleGame.assert_called_once_with(uri)
else:
window._load_native_games_async.assert_called_once()
window._load_native_games_async.call_args.args[0]([
("Native", "", "", "", "", uri, "", "", "", "", 0, 0, "native", "", "", "")])
assert window.openGameDetailPage.call_args.args[0]["exec_line"] == uri
if mode == "log":
assert window._pending_log_exe == uri
class TestNormalizeLaunchPath:
def test_plain_path(self):
assert normalize_launch_path("/tmp/game.exe") == "/tmp/game.exe"
@@ -408,3 +463,428 @@ class TestParseResolution:
def test_empty_string(self):
assert parse_resolution("") is None
def test_list_games_json_data(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import _list_portproton_games
from portprotonqt.config import portproton
executable = tmp_path / "Game with spaces.exe"
shortcut = tmp_path / "game.desktop"
shortcut.write_text(
'[Desktop Entry]\nName=Test Game\n'
f'Exec=portprotonqt --silent "{executable}"\nIcon=test-icon\n',
encoding="utf-8",
)
monkeypatch.setattr(portproton, "get_portproton_location", lambda: str(tmp_path))
monkeypatch.setattr(portproton, "get_portproton_scripts_path", lambda: None)
monkeypatch.setattr("portprotonqt.cli._get_game_metadata", lambda *args: {
"name": "Test Game", "description": "Description", "cover": "cover.png",
"appid": 123, "custom_icon": "",
})
games = _list_portproton_games(str(tmp_path), {}, {})
assert len(games) == 1
assert games[0]["description"] == "Description"
assert games[0]["cover"] == "cover.png"
assert games[0]["appid"] == 123
assert not {"metadata", "desktop_entry", "custom_icon"} & games[0].keys()
assert {key: games[0][key] for key in (
"id", "name", "desktop_file", "exec", "executable", "directory", "icon", "ppdb"
)} == {
"id": "portproton:game.desktop", "name": "Test Game",
"desktop_file": str(shortcut),
"exec": f'portprotonqt --silent "{executable}"',
"executable": str(executable), "directory": str(tmp_path),
"icon": "test-icon", "ppdb": f"{executable}.ppdb",
}
def test_list_games_unconfigured(monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import _list_portproton_games
from portprotonqt.config import portproton
monkeypatch.setattr(portproton, "get_portproton_location", lambda: None)
assert _list_portproton_games(None, {}, {}) == []
def test_parse_list_games(monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["portprotonqt", "--list-games"])
assert parse_args().list_games
def test_export_custom_artwork(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import _get_game_metadata
from portprotonqt.config.portproton import resolve_custom_data_dir
monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path))
monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "config"))
monkeypatch.setattr("portprotonqt.steam_api.api.get_cached_steam_game_info", lambda *args: {
"name": "Cached", "description": "Cached description", "appid": "123",
})
monkeypatch.setattr("portprotonqt.localization.get_metadata_language", lambda: "en")
monkeypatch.setattr("portprotonqt.time_utils.get_playtime_for_exe", lambda *args: 42)
monkeypatch.setattr("portprotonqt.time_utils.get_last_launch_timestamp", lambda *args: 100)
executable = str(tmp_path / "Game.exe")
folder = Path(resolve_custom_data_dir(str(tmp_path / "PortProtonQt/custom_data"), executable))
folder.mkdir(parents=True)
(folder / "metadata.txt").write_text("name_en=Custom\ndescription_en=Description\n")
(folder / "cover.png").touch()
(folder / "icon.png").touch()
metadata = _get_game_metadata("Original", "launch", executable)
assert metadata["name"] == "Custom"
assert metadata["description"] == "Description"
assert metadata["cover"] == str(folder / "cover.png")
assert metadata["custom_icon"] == str(folder / "icon.png")
assert metadata["appid"] == "123"
assert metadata["playtime_seconds"] == 42
def test_export_runtime(tmp_path: Path) -> None:
from portprotonqt.cli import _get_game_runtime
executable = str(tmp_path / "Game.exe")
Path(f"{executable}.ppdb").write_text(
'export PW_WINE_USE="PROTON_LG"\nexport PW_PREFIX_NAME="GAME"\n'
)
runner = tmp_path / "data/dist/PROTON_TEST"
runner.mkdir(parents=True)
runtime = _get_game_runtime(tmp_path, executable, {"PW_PROTON_LG_VER": "PROTON_TEST"}, {})
assert runtime["runner"] == "PROTON_TEST"
assert "runner_version" not in runtime
assert runtime["runner_path"] == str(runner)
assert runtime["runner_installed"]
assert runtime["prefix_path"] == str(tmp_path / "data/prefixes/GAME")
def test_settings_do_not_execute_shell(tmp_path: Path) -> None:
from portprotonqt.cli import _read_game_settings
marker = tmp_path / "should-not-exist"
settings = tmp_path / "settings"
settings.write_text(
f'export PW_WINE_USE="$(touch {marker})"\n'
'export PW_PREFIX_NAME="Game prefix"\n'
'check_variables PW_VULKAN_USE "1"\n'
)
assert _read_game_settings(settings) == {"PW_PREFIX_NAME": "Game prefix", "PW_VULKAN_USE": "1"}
assert not marker.exists()
def test_list_games_exits_before_gui(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
import orjson
from portprotonqt import app
monkeypatch.setattr(app, "parse_args", lambda: SimpleNamespace(list_games=True, game_info=None, edit_game=None, pretty=True, fields=None, all_games=True))
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [{"name": "Игра"}])
gui = MagicMock(side_effect=AssertionError("GUI must not start"))
monkeypatch.setattr(app, "QApplication", gui)
assert app.main() == 0
output = capsys.readouterr().out
assert orjson.loads(output) == [{"name": "Игра"}]
assert output == '[\n {\n "name": "Игра"\n }\n]\n'
gui.assert_not_called()
@pytest.mark.parametrize("external", [False, True])
def test_runtime_wine_layout(tmp_path: Path, external: bool) -> None:
from portprotonqt.cli import _get_game_runtime
runner = tmp_path / "External Wine" if external else tmp_path / "data/dist/PROTON_TEST"
(runner / "files/bin-wow64").mkdir(parents=True)
selected = str(runner) if external else "PROTON_TEST"
runtime = _get_game_runtime(tmp_path, None, {}, {
"PW_WINE_USE": selected, "PW_USE_WOW64": "1", "PW_PREFIX_NAME": "CUSTOM",
})
assert runtime["wine_path"] == str(runner / "files/bin-wow64/wine")
assert runtime["wineserver_path"] == str(runner / "files/bin-wow64/wineserver")
assert runtime["prefix_path"] == str(tmp_path / "data/prefixes/CUSTOM")
@pytest.mark.parametrize("source,backend", [("gog", "gog_api.GOGAPI"), ("egs", "egs_api.EGSAPI")])
def test_list_store_games(source: str, backend: str, monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import _list_store_games
api = MagicMock()
api.load_library.return_value = [
{"app_id": "123", "title": "Installed", "description": "Details", "cover": "store.jpg"},
{"app_id": "456", "title": "Owned"},
]
api.load_installed.return_value = {"123": {}}
api.is_game_installed.side_effect = lambda app_id, installed: app_id in installed
api.get_launch_target.return_value = "/games/game.exe"
monkeypatch.setattr(f"portprotonqt.{backend}", lambda: api)
monkeypatch.setattr("portprotonqt.main_window.MainWindow._get_custom_store_data",
lambda source, app_id, name: (name, "custom.jpg"))
monkeypatch.setattr("portprotonqt.cli._get_game_metadata", lambda *args: {"custom_icon": "icon.png"})
games = _list_store_games(source, None, {}, {})
assert [game["id"] for game in games] == [f"{source}:123", f"{source}:456"]
assert all(game["source"] == source for game in games)
assert games[0]["description"] == "Details"
assert games[0]["cover"] == "custom.jpg"
assert games[0]["icon"] == "icon.png"
assert games[0]["exec"] == f"{source}://launch/123"
assert games[1]["exec"] == f"{source}://install/456"
assert games[1]["executable"] is None
api.get_launch_target.assert_called_once_with("123")
def test_list_steam_games(monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import _list_steam_games
monkeypatch.setattr("portprotonqt.steam_api.get_steam_installed_games", lambda: [("Game", 123, 100, 42)])
monkeypatch.setattr("portprotonqt.steam_api.api.get_cached_full_steam_game_info",
lambda *args: {"description": "Details", "cover": "cached.jpg"})
monkeypatch.setattr("portprotonqt.main_window.MainWindow._get_custom_store_data",
lambda *args: ("Custom", "custom.jpg"))
game = _list_steam_games()[0]
assert game["id"] == "steam:123"
assert game["source"] == "steam"
assert game["name"] == "Custom"
assert game["cover"] == "custom.jpg"
assert game["exec"] == "steam://rungameid/123"
assert game["playtime_seconds"] == 42
def test_list_all_sources_without_portproton(monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import list_games
monkeypatch.setattr("portprotonqt.config.portproton.get_portproton_location", lambda: None)
monkeypatch.setattr("portprotonqt.config.portproton.get_portproton_scripts_path", lambda: None)
monkeypatch.setattr("portprotonqt.cli._list_steam_games", lambda: [{"source": "steam"}])
monkeypatch.setattr("portprotonqt.cli._list_store_games", lambda source, *args: [{"source": source}])
assert [game["source"] for game in list_games()] == ["steam", "gog", "egs"]
@pytest.mark.parametrize("format_flag,pretty", [("--pretty", True), ("--raw", False)])
def test_json_format_args(format_flag: str, pretty: bool, monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["portprotonqt", "--game-info", "steam:123", format_flag])
args = parse_args()
assert args.game_info == "steam:123"
assert args.pretty is pretty
@pytest.mark.parametrize("game_id", ["steam:123", "gog:123", "missing"])
def test_game_info_output(game_id: str, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
import orjson
from portprotonqt import app
monkeypatch.setattr(app, "parse_args", lambda: SimpleNamespace(
list_games=False, game_info=game_id, edit_game=None, pretty=False, fields=None,
))
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [
{"id": "steam:123", "source": "steam"}, {"id": "gog:123", "source": "gog"},
])
code = app.main()
output = capsys.readouterr().out
if game_id == "missing":
assert code == 1
assert output == ""
else:
assert code == 0
assert orjson.loads(output)["id"] == game_id
assert len(output.splitlines()) == 1
@pytest.mark.parametrize("flags", [
["--pretty", "--raw"], ["--list-games", "--game-info", "steam:123"], ["--game-info"],
])
def test_library_conflicting_args(flags: list[str], monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["portprotonqt", *flags])
with pytest.raises(SystemExit) as error:
parse_args()
assert error.value.code == 2
@pytest.fixture
def editable_game(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> dict:
from portprotonqt.cli import _read_game_settings
executable = tmp_path / "Game with spaces.exe"
executable.touch()
ppdb = Path(f"{executable}.ppdb")
ppdb.write_text('# Keep this comment\nexport PW_MANGOHUD="0"\nexport PW_WINDOWS_VER="10"\n')
game = {"id": "portproton:game.desktop", "source": "portproton", "executable": str(executable)}
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [
{**game, "runtime": {"settings": _read_game_settings(ppdb)}},
])
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
functions = "\n".join(
name + helper.split(name, 1)[1].split("\n}\n", 1)[0] + "\n}"
for name in ("set_several_variables () {", "edit_db_from_gui () {")
)
script = tmp_path / "start.sh"
script.write_text(
'#!/usr/bin/env bash\nset -e\n' + functions + '\n'
'print_info () { printf "%s\\n" "$*"; }\n'
'print_error () { printf "%s\\n" "$*" >&2; }\n'
'PORTWINE_DB_FILE="${3}.ppdb"\n'
'set_several_variables "${@:4}"\nedit_db_from_gui $keys_all\n'
)
monkeypatch.setattr("portprotonqt.config.portproton.get_portproton_start_command",
lambda: ["bash", str(script)])
return {**game, "ppdb": ppdb, "script": script}
def test_edit_game_roundtrip(editable_game: dict) -> None:
from portprotonqt.cli import edit_game
result = edit_game(editable_game["id"], [
"PW_MANGOHUD=1", 'LAUNCH_PARAMETERS=--option=value "quoted"',
"PW_PREFIX_NAME=GAME", "WINEDLLOVERRIDES=d3d11=n,b;dxgi=n",
])
settings = result["runtime"]["settings"]
assert settings["PW_MANGOHUD"] == "1"
assert settings["LAUNCH_PARAMETERS"] == '--option=value "quoted"'
assert settings["WINEDLLOVERRIDES"] == "d3d11=n,b;dxgi=n"
assert settings["PW_PREFIX_NAME"] == "GAME"
assert settings["PW_WINDOWS_VER"] == "10"
assert editable_game["ppdb"].read_text().startswith("# Keep this comment\n")
@pytest.mark.parametrize("change", [
"PW_MANGOHUD=2", "NOT_A_SETTING=1", "PW_MANGOHUD", "PW_PREFIX_NAME=../other",
"PW_PREFIX_NAME=", "PW_MANGOHUD=$(touch /tmp/forbidden)", "PW_MANGOHUD=1\ntrue",
"LAUNCH_PARAMETERS=a|b", "LAUNCH_PARAMETERS=`id`",
])
def test_edit_game_rejects_invalid_values(editable_game: dict, change: str, monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import edit_game
run = MagicMock()
monkeypatch.setattr("subprocess.run", run)
before = editable_game["ppdb"].read_bytes()
with pytest.raises(ValueError):
edit_game(editable_game["id"], ["PW_MANGOHUD=1", change])
run.assert_not_called()
assert editable_game["ppdb"].read_bytes() == before
@pytest.mark.parametrize("source", ["portproton", "gog", "egs"])
def test_edit_game_sources(editable_game: dict, source: str, monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import edit_game
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [{**editable_game, "source": source}])
edit_game(editable_game["id"], ["PW_MANGOHUD=1"])
assert 'export PW_MANGOHUD="1"' in editable_game["ppdb"].read_text()
@pytest.mark.parametrize("mode", ["missing", "steam", "uninstalled", "no-script", "failed", "not-saved"])
def test_edit_game_errors(editable_game: dict, mode: str, monkeypatch: pytest.MonkeyPatch) -> None:
from portprotonqt.cli import edit_game
if mode == "missing":
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [])
elif mode in {"steam", "uninstalled"}:
game = {**editable_game, "source": "steam"} if mode == "steam" else {**editable_game, "executable": None}
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [game])
elif mode == "no-script":
monkeypatch.setattr("portprotonqt.config.portproton.get_portproton_start_command", lambda: None)
else:
editable_game["script"].write_text("exit 4\n" if mode == "failed" else "exit 0\n")
expected = RuntimeError if mode in {"failed", "not-saved"} else ValueError
with pytest.raises(expected):
edit_game(editable_game["id"], ["PW_MANGOHUD=1"])
@pytest.mark.parametrize("flags", [
["--set", "PW_MANGOHUD=1"], ["--edit-game", "gog:123"],
["--edit-game", "gog:123", "--set", "PW_MANGOHUD=1", "--list-games"],
])
def test_edit_game_argument_errors(flags: list[str], monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["portprotonqt", *flags])
with pytest.raises(SystemExit) as error:
parse_args()
assert error.value.code == 2
@pytest.mark.parametrize("failure", [False, True])
def test_edit_game_cli_output(failure: bool, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
import orjson
from portprotonqt import app
monkeypatch.setattr(sys, "argv", [
"portprotonqt", "--edit-game", "gog:123", "--set", "PW_MANGOHUD=1", "--raw",
])
edit = MagicMock(return_value={"id": "gog:123"})
if failure:
edit.side_effect = RuntimeError("write failed")
monkeypatch.setattr("portprotonqt.cli.edit_game", edit)
assert app.main() == (1 if failure else 0)
output = capsys.readouterr().out
assert output == "" if failure else orjson.loads(output) == {"id": "gog:123"}
edit.assert_called_once_with("gog:123", ["PW_MANGOHUD=1"])
@pytest.mark.parametrize("single", [False, True])
@pytest.mark.parametrize("pretty", [False, True])
def test_library_selected_fields(single: bool, pretty: bool, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
import orjson
from portprotonqt import app
command = ["--game-info", "gog:123"] if single else ["--list-games"]
monkeypatch.setattr(sys, "argv", [
"portprotonqt", *command, "--fields", "executable, icon,name,source",
"--pretty" if pretty else "--raw",
])
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [
{"id": "gog:123", "name": "Game", "icon": "icon.png", "source": "gog",
"executable": "/games/game.exe", "description": "Not selected", "installed": True},
{"id": "steam:456", "name": "Steam Game", "source": "steam", "installed": True},
])
assert app.main() == 0
output = capsys.readouterr().out
expected = {"executable": "/games/game.exe", "icon": "icon.png", "name": "Game", "source": "gog"}
assert orjson.loads(output) == (expected if single else [
expected, {"executable": None, "icon": None, "name": "Steam Game", "source": "steam"},
])
assert (len(output.splitlines()) > 1) is pretty
def test_library_selected_fields_empty(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
from portprotonqt import app
monkeypatch.setattr(sys, "argv", ["portprotonqt", "--list-games", "--fields", "name"])
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: [])
assert app.main() == 0
assert capsys.readouterr().out == "[]\n"
@pytest.mark.parametrize("flags", [
["--fields", "name"], ["--list-games", "--fields", ""],
["--list-games", "--fields", "name,,icon"], ["--list-games", "--fields", "name,"],
["--list-games", "--fields", "name;icon"],
["--edit-game", "gog:123", "--set", "PW_MANGOHUD=1", "--fields", "name"],
])
def test_library_selected_fields_argument_errors(flags: list[str], monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["portprotonqt", *flags])
with pytest.raises(SystemExit) as error:
parse_args()
assert error.value.code == 2
@pytest.mark.parametrize("include_all", [False, True])
def test_list_games_installed_filter(include_all: bool, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
import orjson
from portprotonqt import app
arguments = ["portprotonqt", "--list-games", "--fields", "id", "--raw"]
if include_all:
arguments.append("--all")
monkeypatch.setattr(sys, "argv", arguments)
games = [
{"id": "portproton:missing.desktop", "installed": False},
{"id": "steam:123", "installed": True},
{"id": "gog:456", "installed": False},
{"id": "egs:789", "installed": True},
]
monkeypatch.setattr("portprotonqt.cli.list_games", lambda: games)
assert app.main() == 0
expected = [game for game in games if include_all or game["installed"]]
assert orjson.loads(capsys.readouterr().out) == [{"id": game["id"]} for game in expected]
@pytest.mark.parametrize("flags", [["--all"], ["--game-info", "gog:123", "--all"]])
def test_all_requires_list_games(flags: list[str], monkeypatch: pytest.MonkeyPatch) -> None:
monkeypatch.setattr(sys, "argv", ["portprotonqt", *flags])
with pytest.raises(SystemExit) as error:
parse_args()
assert error.value.code == 2
+37 -1
View File
@@ -4,7 +4,7 @@ from types import SimpleNamespace
from typing import Any, cast
from unittest.mock import MagicMock
from pytest import MonkeyPatch
from pytest import MonkeyPatch, mark
from PySide6.QtWidgets import QWidget
import portprotonqt.detail_pages.utils as detail_utils
@@ -701,3 +701,39 @@ def test_steam_with_appid_shows_edit_not_add(monkeypatch) -> None:
add_count = sum(1 for t in button_texts if "Add" in t or "Добавить" in t)
assert edit_count == 1
assert add_count == 0
@mark.parametrize("managed", [False, True])
def test_native_detail_folder_button_only_for_managed_games(
tmp_path: Path, monkeypatch: MonkeyPatch, managed: bool,
) -> None:
monkeypatch.setattr("portprotonqt.detail_pages._", lambda text: text)
data = tmp_path / "data"
monkeypatch.setenv("XDG_DATA_HOME", str(data))
directory = data / "PortProtonQt/native_games" if managed else tmp_path / "usr/share/applications"
manager = _make_manager_with_shortcut_mock(has_shortcut=False, monkeypatch=monkeypatch)
manager._create_game_buttons_layout({
"game_source": "native",
"exec_line": "native://" + str(directory / "hytale.desktop"),
"name": "Hytale Launcher",
})
buttons = _get_added_buttons(manager)
assert "Settings" in buttons
assert "Create Log" in buttons
assert ("Open Folder" in buttons) is managed
def test_steam_detail_button_attaches_to_existing_game_watch() -> None:
button = MagicMock()
window = SimpleNamespace(
target_exe=None, theme_manager=MagicMock(), toggleGame=MagicMock(),
_toggle_steam_game=MagicMock(),
)
manager = SimpleNamespace(main_window=window, _make_action_button=MagicMock(return_value=button))
result = DetailPageManager._create_play_button(
cast(Any, manager), "steam://rungameid/3263320", None
)
assert result is button
window._toggle_steam_game.assert_called_once_with(
"steam://rungameid/3263320", button, launch=False
)
+46 -1
View File
@@ -1,3 +1,4 @@
import argparse
import time
from types import SimpleNamespace
@@ -6,9 +7,53 @@ from PySide6.QtCore import QEvent, Qt
from PySide6.QtGui import QKeyEvent
from PySide6.QtWidgets import QApplication
from portprotonqt.scripts_utils.easyterm import TerminalWidget
from portprotonqt.scripts_utils.easyterm import (
CONF_FALLBACK_SHELL,
TerminalWidget,
build_command,
)
PROCESS_TIMEOUT_SECONDS = 30
HELPER_PATH = "/usr/share/portproton/scripts/functions_helper"
USER_SHELL = "/usr/bin/zsh"
@pytest.fixture
def user_shell(monkeypatch: pytest.MonkeyPatch) -> str:
monkeypatch.setattr(
"portprotonqt.scripts_utils.easyterm.default_shell", lambda: USER_SHELL
)
monkeypatch.setattr(
"portprotonqt.scripts_utils.easyterm._portproton_functions_helper_path",
lambda: HELPER_PATH,
)
return USER_SHELL
def test_build_command_uses_bash_for_portproton_functions(user_shell: str) -> None:
command = build_command(argparse.Namespace(e=["pw_run Game"]))
assert command == [
CONF_FALLBACK_SHELL,
"-lc",
f"source {HELPER_PATH}; pw_run Game",
]
def test_build_command_uses_bash_for_exported_functions(
user_shell: str, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.setenv("BASH_FUNC_launch_game%%", "() { :; }")
command = build_command(argparse.Namespace(e=["launch_game"]))
assert command[0] == CONF_FALLBACK_SHELL
def test_build_command_keeps_user_shell_for_plain_commands(user_shell: str) -> None:
command = build_command(argparse.Namespace(e=["ls -l"]))
assert command == [user_shell, "-lc", "ls -l"]
def test_terminal_keeps_failed_command_output(
+58
View File
@@ -147,3 +147,61 @@ def test_list_icon_uses_theme_state_colors(
QIcon.Mode.Selected: "folder-#222222.svg",
QIcon.Mode.Disabled: "folder-#333333.svg",
}
def test_appimage_thumbnail_worker_caches_icon_and_finishes(
tmp_path: Path, monkeypatch: MonkeyPatch,
) -> None:
from PySide6.QtCore import QThreadPool
from PySide6.QtGui import QImage
source = tmp_path / "game.AppImage"
source.touch()
cache = tmp_path / "cache" / "icon.png"
monkeypatch.setattr(file_explorer_module, "get_exe_icon_cache_path", lambda _path: str(cache))
calls = []
def generate(path: str, output: str) -> bool:
calls.append(path)
image = QImage(16, 16, QImage.Format.Format_ARGB32)
image.fill(QColor("red"))
return image.save(output)
monkeypatch.setattr(file_explorer_module, "generate_thumbnail", generate)
pool = QThreadPool()
for _attempt in range(2):
loader = FileExplorer.ThumbnailLoader(str(source), "application/vnd.appimage")
received = []
loader.signals.thumbnail_ready.connect(lambda path, image, received=received: received.append((path, image)))
pool.start(loader)
assert pool.waitForDone(5000)
_application.processEvents()
assert len(received) == 1
assert received[0][0] == str(source)
assert not received[0][1].isNull()
assert calls == [str(source)]
assert pool.activeThreadCount() == 0
def test_appimage_thumbnail_failure_completes_without_replacing_icon(
tmp_path: Path, monkeypatch: MonkeyPatch,
) -> None:
from PySide6.QtGui import QImage
source = tmp_path / "game.AppImage"
source.touch()
cache = tmp_path / "cache" / "icon.png"
monkeypatch.setattr(file_explorer_module, "get_exe_icon_cache_path", lambda _path: str(cache))
monkeypatch.setattr(file_explorer_module, "generate_thumbnail", lambda *_args: False)
loader = FileExplorer.ThumbnailLoader(str(source), "application/vnd.appimage")
received = []
loader.signals.thumbnail_ready.connect(lambda path, image: received.append((path, image)))
loader.run()
assert len(received) == 1
assert received[0][0] == str(source)
assert received[0][1].isNull()
item = MagicMock()
explorer = SimpleNamespace(thumbnail_cache={}, file_items={str(source): item})
FileExplorer._set_thumbnail_icon(cast(FileExplorer, explorer), str(source), QImage())
assert str(source) in explorer.thumbnail_cache
item.setIcon.assert_not_called()
+84 -3
View File
@@ -8,7 +8,7 @@ from typing import Any, cast
from unittest.mock import patch
from PIL import Image
from pytest import MonkeyPatch, raises
from pytest import MonkeyPatch, raises, mark
import portprotonqt.game_card as game_card_module
import portprotonqt.image_utils as image_utils
@@ -608,9 +608,16 @@ def test_game_card_uses_exe_fallback_without_valid_cover(
]
@mark.parametrize("url, filename", [
("https://example.org/game.jpg", "game.jpg"),
("https://cdn2.steamgriddb.com/grid/unique-cover.png", "unique-cover.png"),
("https://deckyloader.ru/sgdb-cdn/grid/unique-cover.png", "unique-cover.png"),
])
def test_remote_cover_replaces_immediate_exe_fallback_only_on_success(
tmp_path: Path,
monkeypatch: MonkeyPatch,
url: str,
filename: str,
) -> None:
exe_path = tmp_path / "game.exe"
exe_path.write_bytes(b"MZ")
@@ -626,6 +633,8 @@ def test_remote_cover_replaces_immediate_exe_fallback_only_on_success(
timeout: int,
callback: Callable[[str | None], None],
) -> None:
assert _url == url
assert Path(_path).name == filename
callbacks.append(callback)
monkeypatch.setattr("portprotonqt.icon_extractor.CACHE_DIR", tmp_path / "cache" / "PortProtonQt")
@@ -642,13 +651,13 @@ def test_remote_cover_replaces_immediate_exe_fallback_only_on_success(
)
image_utils.load_pixmap_async(
"https://example.org/game.jpg", 100, 150,
url, 100, 150,
lambda pixmap: loaded_paths.append(cast(FakePixmap, pixmap).path),
app_name="game", fallback_exe=str(exe_path),
fallback_icon_path=str(fallback_path),
)
callbacks[0](None)
downloaded_path = tmp_path / "cache" / "PortProtonQt" / "images" / "game.jpg"
downloaded_path = tmp_path / "cache" / "PortProtonQt" / "images" / filename
downloaded_path.write_bytes(b"cover")
callbacks[0](str(downloaded_path))
@@ -669,3 +678,75 @@ def test_custom_icon_overrides_extracted_icon(tmp_path: Path, monkeypatch: Monke
icon.unlink()
assert get_custom_icon_path(executable) == ""
assert get_exe_icon_cache_path(executable) != str(icon)
@mark.parametrize("elf_class,endian", [(1, "<"), (2, "<"), (2, ">")])
@mark.parametrize("svg", [False, True])
def test_appimage_icon_extraction(tmp_path: Path, elf_class: int, endian: str, svg: bool) -> None:
from portprotonqt.icon_extractor import APPIMAGE_EXTRACT_TIMEOUT, ELF_SECTION_LAYOUTS
header = bytearray(64)
header[:4] = b"\x7fELF"
header[4:6] = bytes([elf_class, 1 if endian == "<" else 2])
header[8:11] = b"AI\x02"
offset_position, offset_format, size_position = ELF_SECTION_LAYOUTS[elf_class]
struct.pack_into(endian + offset_format, header, offset_position, len(header))
struct.pack_into(endian + "HH", header, size_position, 0, 0)
source = tmp_path / "game.AppImage"
source.write_bytes(header + b"hsqs")
output = tmp_path / "icon.png"
icon = io.BytesIO()
Image.new("RGBA", (16, 16), "red").save(icon, "PNG")
payload = (b'<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">'
b'<rect width="16" height="16" fill="red"/></svg>') if svg else icon.getvalue()
with patch("portprotonqt.icon_extractor.subprocess.run", return_value=SimpleNamespace(stdout=payload)) as run:
assert generate_thumbnail(str(source), str(output))
run.assert_called_once_with(
["unsquashfs", "-cat", "-o", "64", str(source), ".DirIcon"],
capture_output=True, check=True, timeout=APPIMAGE_EXTRACT_TIMEOUT,
)
with Image.open(output) as image:
assert image.size == (128, 128)
assert image.convert("RGBA").getpixel((64, 64)) == (255, 0, 0, 255)
def test_appimage_icon_missing_tool(tmp_path: Path) -> None:
header = bytearray(64)
header[:6] = b"\x7fELF\x02\x01"
header[8:11] = b"AI\x02"
struct.pack_into("<Q", header, 40, len(header))
source = tmp_path / "game.AppImage"
source.write_bytes(header + b"hsqs")
with patch("portprotonqt.icon_extractor.subprocess.run", side_effect=FileNotFoundError):
assert not generate_thumbnail(str(source), str(tmp_path / "icon.png"))
@mark.parametrize("target", ["icon.png", "../outside", ".DirIcon"])
def test_dwarfs_icon_symlink(tmp_path: Path, target: str) -> None:
import tarfile
header = bytearray(64)
header[:6] = b"\x7fELF\x02\x01"
header[8:11] = b"AI\x02"
struct.pack_into("<Q", header, 40, len(header))
source = tmp_path / "game.AppImage"
source.write_bytes(header + b"DWARFS")
link_archive = io.BytesIO()
with tarfile.open(fileobj=link_archive, mode="w") as archive:
member = tarfile.TarInfo(".DirIcon")
member.type = tarfile.SYMTYPE
member.linkname = target
archive.addfile(member)
icon = io.BytesIO()
Image.new("RGBA", (16, 16), "red").save(icon, "PNG")
icon_archive = io.BytesIO()
with tarfile.open(fileobj=icon_archive, mode="w") as archive:
member = tarfile.TarInfo("icon.png")
member.size = len(icon.getvalue())
archive.addfile(member, io.BytesIO(icon.getvalue()))
results = [SimpleNamespace(stdout=data.getvalue()) for data in (link_archive, icon_archive)]
with patch("portprotonqt.icon_extractor.subprocess.run", side_effect=results) as run:
assert generate_thumbnail(str(source), str(tmp_path / "icon.png")) is (target == "icon.png")
assert run.call_count == (2 if target == "icon.png" else 1)
assert run.call_args_list[0].args[0][0] == "dwarfsextract"
assert "--skip-specials" in run.call_args_list[0].args[0]
+47
View File
@@ -1657,3 +1657,50 @@ def test_run_after_dpad_reaches_delete_from_entry(direction: int, column: int) -
assert QApplication.focusWidget() == entry
table.close()
table.deleteLater()
def test_mouse_device_follows_emulation_toggle(monkeypatch: MonkeyPatch) -> None:
manager = InputManager.__new__(InputManager)
QObject.__init__(manager)
manager.mouse_emulation_enabled = True
manager.emulation_triggered = False
manager.mouse_emulation_thread = None
manager.ui = None
create = MagicMock()
monkeypatch.setattr(manager, "_async_enable_mouse_emulation", create)
manager._update_emulation_flag()
create.assert_not_called()
manager.emulation_triggered = True
manager._update_emulation_flag()
create.assert_called_once_with()
device = MagicMock()
manager.ui = device
manager.emulation_triggered = False
manager._update_emulation_flag()
device.close.assert_called_once_with()
assert manager.ui is None
assert manager.mouse_emulation_enabled
manager.emulation_triggered = True
manager._update_emulation_flag()
assert create.call_count == 2
def test_mouse_shutdown_collects_pending_device() -> None:
manager = InputManager.__new__(InputManager)
QObject.__init__(manager)
device = MagicMock()
thread = MagicMock()
thread.get_device.return_value = device
manager.mouse_emulation_thread = thread
manager.mouse_emulation_enabled = True
manager.ui = None
manager.disable_mouse_emulation()
manager._on_mouse_emulation_finished(True)
thread.wait.assert_called_once_with()
device.close.assert_called_once_with()
assert manager.ui is None
assert manager.mouse_emulation_thread is None
+18 -1
View File
@@ -13,7 +13,7 @@ from PySide6.QtWidgets import QApplication, QLineEdit, QWidget
from portprotonqt import image_utils
from portprotonqt.game_card import GameCard
from portprotonqt.game_library_manager import GameLibraryManager
from portprotonqt.theme_manager import load_theme
from portprotonqt.theme_manager import ThemeManager, load_theme
LOAD_TIMEOUT_MS = 30000
@@ -54,6 +54,23 @@ def library_scene(
QCoreApplication.sendPostedEvents(None, QEvent.Type.DeferredDelete)
def test_native_card_uses_linux_source_corner(
library_scene: tuple[GameLibraryManager, list[Callable[[QPixmap], None]]],
monkeypatch: pytest.MonkeyPatch,
) -> None:
manager, _ = library_scene
monkeypatch.setattr(ThemeManager(), "current_theme_name", "standart")
card = manager._create_game_card((
"Native", "", "", "", "", "native:///game.desktop", "", "", "", "", 0, 0, "native",
))
assert card.native_visible
assert isinstance(card.nativeLabel._icon, str)
assert Path(card.nativeLabel._icon).name == "badge_linux.svg"
assert Path(card.nativeLabel._icon).is_file()
assert not card.portproton_visible
card.deleteLater()
@pytest.mark.parametrize("layout_mode", ["horizontal", "horizontal_top"])
@pytest.mark.parametrize("orientation", ["horizontal", "vertical"])
def test_new_horizontal_cards_fit_before_layout_insertion(
+206 -13
View File
@@ -316,7 +316,7 @@ def _tile_theme() -> Any:
@mark.parametrize(
"worker_name",
("egs_library_worker", "gog_library_worker", "gog_metadata_worker", "gog_repair_worker", "gog_delete_worker", "store_dlc_worker"),
("egs_library_worker", "gog_library_worker", "gog_metadata_worker", "native_library_worker", "gog_repair_worker", "gog_delete_worker", "store_dlc_worker"),
)
def test_shutdown_waits_for_store_library_workers(worker_name: str) -> None:
worker = MagicMock()
@@ -435,14 +435,16 @@ def test_minimal_tray_exits_after_stopping_game(monkeypatch: MonkeyPatch) -> Non
quit_app.assert_called_once_with()
@mark.parametrize(("vertical_layout", "ribbon_visible"), [(False, True), (True, True)])
@mark.parametrize("source", ["portproton", "native"])
def test_source_ribbon_visibility(
monkeypatch: MonkeyPatch,
vertical_layout: bool,
ribbon_visible: bool,
source: str,
) -> None:
card = MagicMock()
card.coverLabel = MagicMock()
card.game_source = "portproton"
card.game_source = source
card.ppdb_id = "report-id"
card.protondb_tier = "Platinum"
card.anticheat_status = "Supported"
@@ -453,9 +455,9 @@ def test_source_ribbon_visibility(
card.parentWidget.return_value = None
monkeypatch.setattr("portprotonqt.game_card.ui_config.get_economy_mode", lambda: False)
GameCard.update_badge_visibility(card, "portproton")
GameCard.update_badge_visibility(card, source)
card.portprotonLabel.setVisible.assert_called_with(ribbon_visible)
getattr(card, f"{source}Label").setVisible.assert_called_with(ribbon_visible)
card.ppdbLabel.setVisible.assert_called_with(False)
card.protondbLabel.setVisible.assert_called_with(False)
card.anticheatLabel.setVisible.assert_called_with(False)
@@ -1707,7 +1709,8 @@ def test_open_local_autoinstall_card_uses_autoinstall_page(tmp_path: Path) -> No
assert game_data["exec_line"] == f"autoinstall:{shlex.quote(str(script_path))}"
assert return_tab_index == 0
def test_open_game_detail_starts_pending_log(tmp_path: Path) -> None:
@mark.parametrize("native", [False, True])
def test_open_game_detail_starts_pending_log(tmp_path: Path, native: bool) -> None:
exe_path = tmp_path / "Game.exe"
exe_path.touch()
started = []
@@ -1732,11 +1735,12 @@ def test_open_game_detail_starts_pending_log(tmp_path: Path) -> None:
window.detail_page_manager = FakeDetailPageManager()
window.stackedWidget = FakeStackedWidget()
window.currentDetailPage = None
window._pending_log_exe = str(exe_path)
target = "native://" + str(tmp_path / "Native Game.desktop") if native else str(exe_path)
window._pending_log_exe = target
window.openGameDetailPage({"name": "Game", "exec_line": str(exe_path)})
window.openGameDetailPage({"name": "Game", "exec_line": target})
assert started == [(str(exe_path), window.detail_page_manager._debug_log_button)]
assert started == [(target, window.detail_page_manager._debug_log_button)]
assert window._pending_log_exe is None
def test_launch_exe_skips_library_load_for_ppai() -> None:
@@ -2734,6 +2738,7 @@ def test_add_game_dialog_does_not_reprocess_its_shortcut(
exeEdit=SimpleNamespace(text=lambda: "/games/praest.exe"),
coverEdit=SimpleNamespace(text=lambda: ""),
getDesktopEntryData=lambda: (entry, str(desktop_path)),
native_checkbox=SimpleNamespace(isChecked=lambda: False),
last_cover_path="",
)
window: Any = MainWindow.__new__(MainWindow)
@@ -3280,27 +3285,30 @@ def test_library_source_multiselection(
)
def test_library_loads_only_selected_sources(monkeypatch: MonkeyPatch) -> None:
@mark.parametrize("source", ["portproton", "native"])
def test_library_loads_only_selected_sources(monkeypatch: MonkeyPatch, source: str) -> None:
_application = QApplication.instance() or QApplication([])
monkeypatch.setattr(game_config, "get_display_filter", lambda: "gog,portproton")
monkeypatch.setattr(game_config, "get_display_filter", lambda: f"gog,{source}")
monkeypatch.setattr(game_config, "get_only_installed", lambda: False)
callbacks = {}
loaded = MagicMock()
window = cast(Any, SimpleNamespace(
_loading_games=False, launch_exe=None, games_loaded=SimpleNamespace(emit=loaded),
_load_gog_games_async=lambda callback: callbacks.update(gog=callback),
_load_portproton_games_async=lambda callback: callbacks.update(portproton=callback),
_load_portproton_games_async=MagicMock(), _load_native_games_async=MagicMock(),
_load_steam_games_async=MagicMock(), _load_egs_games_async=MagicMock(),
))
setattr(window, f"_load_{source}_games_async", lambda callback: callbacks.update({source: callback}))
MainWindow.loadGames(window, force_load=True)
pp_game = ("PP", "", "", "", "", "pp.exe")
gog_game = ("GOG", "", "", "", "", "gog://launch/1")
callbacks["gog"]([gog_game])
loaded.assert_not_called()
callbacks["portproton"]([pp_game])
callbacks[source]([pp_game])
loaded.assert_called_once_with([pp_game, gog_game])
loaded.assert_called_once_with([pp_game, gog_game] if source == "portproton" else [gog_game, pp_game])
getattr(window, f"_load_{'native' if source == 'portproton' else 'portproton'}_games_async").assert_not_called()
window._load_steam_games_async.assert_not_called()
window._load_egs_games_async.assert_not_called()
@@ -3378,3 +3386,188 @@ def test_custom_combo_opens_readonly_field_on_mouse_release(readonly: bool) -> N
assert combo.view().isVisible() is readonly
combo.hidePopup()
combo.close()
def _steam_snapshot(text: str | bytes, created: float = 1.0) -> list[dict[str, Any]]:
if isinstance(text, bytes):
text = text.decode()
snapshot = []
for line in text.splitlines():
pid, parent, name, args = line.split(maxsplit=3)
snapshot.append({
"pid": int(pid), "ppid": int(parent), "name": name,
"cmdline": args.split(), "create_time": created,
})
return snapshot
@mark.parametrize(
("command", "running"),
[
("123 789 reaper /steam/reaper SteamLaunch AppId=620 -- /game", True),
("123 789 reaper /steam/reaper SteamLaunch AppId=6200 -- /game", False),
("123 1 steam steam SteamLaunch AppId=620", False),
("123 789 reaper /steam/reaper SteamLaunch AppId=1 -- AppId=620", False),
],
)
def test_steam_watch_matches_exact_game(command: str, running: bool) -> None:
process = MagicMock()
process.error = None
process.result = MainWindow._collect_steam_processes("620", _steam_snapshot(command.encode()), {})
button = MagicMock()
watch = {
"process": process, "button": button, "running": False,
"stop": False,
}
window = SimpleNamespace(
_steam_watches={"620": watch}, theme_manager=MagicMock(),
_finish_steam_watch=MagicMock(),
)
MainWindow._steam_scan_finished(cast(Any, window), "620")
assert watch["running"] is running
button.setEnabled.assert_called_once_with(running)
window._finish_steam_watch.assert_not_called()
def test_steam_stop_signals_only_selected_reaper(monkeypatch: MonkeyPatch) -> None:
snapshot = _steam_snapshot(
"123 789 reaper /steam/reaper SteamLaunch AppId=620 -- /game\n"
"456 789 reaper /steam/reaper SteamLaunch AppId=730 -- /other\n"
"789 1 steam steam\n"
)
process = MagicMock()
process.create_time.return_value = 1.0
factory = MagicMock(return_value=process)
monkeypatch.setattr(main_window_module.psutil, "Process", factory)
monkeypatch.setattr(main_window_module.psutil, "process_iter", lambda _attrs: [
SimpleNamespace(info=info) for info in snapshot
])
parent = QObject()
worker = main_window_module.SteamGameScanWorker("620", parent)
worker.stop_started = main_window_module.time.monotonic()
worker.run()
factory.assert_called_once_with(123)
process.send_signal.assert_called_once_with(signal.SIGTERM)
@mark.parametrize("was_running", [False, True])
def test_steam_watch_waits_until_game_has_run(was_running: bool) -> None:
process = MagicMock()
process.error = None
process.result = MainWindow._collect_steam_processes("620", _steam_snapshot(b""), {})
window = SimpleNamespace(
_steam_watches={"620": {
"process": process, "button": None, "running": was_running,
"stop": False,
}},
_finish_steam_watch=MagicMock(),
)
MainWindow._steam_scan_finished(cast(Any, window), "620")
window._finish_steam_watch.assert_not_called()
assert window._steam_watches["620"]["running"] is False
if was_running:
assert window._steam_watches["620"]["launch_requested"] is False
def test_steam_watch_cleanup_waits_for_scan_and_restores_button() -> None:
process, timer, button = MagicMock(), MagicMock(), MagicMock()
window = SimpleNamespace(
_steam_watches={"620": {"process": process, "timer": timer, "button": button}},
theme_manager=MagicMock(),
)
MainWindow._finish_steam_watch(cast(Any, window), "620")
assert window._steam_watches == {}
timer.stop.assert_called_once()
process.blockSignals.assert_called_once_with(True)
process.requestInterruption.assert_called_once()
process.wait.assert_called_once()
process.deleteLater.assert_called_once()
button.setEnabled.assert_called_once_with(True)
def test_steam_watch_rebinds_detail_button_without_stopping() -> None:
button = MagicMock()
watch = {"running": True, "launch_requested": True, "stop": False, "button": None}
window = SimpleNamespace(
_steam_watches={"620": watch}, _scan_steam_game=MagicMock(),
_launch_steam_game=MagicMock(),
)
MainWindow._toggle_steam_game(cast(Any, window), "steam://rungameid/620", button, False)
assert watch["button"] is button
assert watch["stop"] is False
window._launch_steam_game.assert_not_called()
window._scan_steam_game.assert_called_once_with("620")
MainWindow._toggle_steam_game(cast(Any, window), "steam://rungameid/620", button)
assert watch["stop"] is True
def test_steam_watch_launches_previously_observed_idle_game() -> None:
button = MagicMock()
watch = {"running": False, "launch_requested": False, "stop": False}
window = SimpleNamespace(
_steam_watches={"620": watch}, _scan_steam_game=MagicMock(),
_launch_steam_game=MagicMock(),
)
MainWindow._toggle_steam_game(cast(Any, window), "steam://rungameid/620", button)
window._launch_steam_game.assert_called_once_with("steam://rungameid/620")
assert watch["launch_requested"] is True
button.setEnabled.assert_called_once_with(False)
def test_steam_watch_retains_orphaned_game_but_not_reused_pid() -> None:
output = (
"100 1 steam steam\n"
"123 100 reaper /steam/reaper SteamLaunch AppId=620 -- /game\n"
"124 123 wine wine /game.exe\n"
"125 124 game.exe /game.exe\n"
"200 100 reaper /steam/reaper SteamLaunch AppId=730 -- /other\n"
)
known = MainWindow._collect_steam_processes("620", _steam_snapshot(output), {})
assert set(known) == {123, 124, 125}
orphaned = "124 1 wine wine /game.exe\n125 1 game.exe /game.exe\n"
known = MainWindow._collect_steam_processes("620", _steam_snapshot(orphaned), known)
assert set(known) == {124, 125}
assert MainWindow._collect_steam_processes("620", _steam_snapshot("124 1 other /other\n", created=2.0), known) == {}
def test_steam_stop_signals_descendants_and_escalates(monkeypatch: MonkeyPatch) -> None:
processes = {123: MagicMock(), 124: MagicMock()}
for process in processes.values():
process.create_time.return_value = 1.0
monkeypatch.setattr(main_window_module.psutil, "Process", lambda pid: processes[pid])
monkeypatch.setattr(main_window_module.time, "monotonic", lambda: 10.0)
watch = {"known": {123: {"create_time": 1.0}, 124: {"create_time": 1.0}}}
MainWindow._stop_steam_processes("620", watch)
for process in processes.values():
process.send_signal.assert_called_once_with(signal.SIGTERM)
process.send_signal.reset_mock()
monkeypatch.setattr(main_window_module.time, "monotonic", lambda: 14.0)
MainWindow._stop_steam_processes("620", watch)
for process in processes.values():
process.send_signal.assert_called_once_with(signal.SIGKILL)
def test_steam_watch_keeps_stop_during_preparation_gap(monkeypatch: MonkeyPatch) -> None:
process = MagicMock()
process.error = None
process.result = MainWindow._collect_steam_processes("620", _steam_snapshot(b"123 1 reaper /steam/reaper SteamLaunch AppId=620 Install=1 -- /setup\n"), {})
watch = {"process": process, "button": None, "running": False, "stop": False}
window = SimpleNamespace(_steam_watches={"620": watch})
monkeypatch.setattr(main_window_module.time, "monotonic", lambda: 10.0)
MainWindow._steam_scan_finished(cast(Any, window), "620")
process.error = None
process.result = MainWindow._collect_steam_processes("620", _steam_snapshot(b""), {})
monkeypatch.setattr(main_window_module.time, "monotonic", lambda: 1000.0)
MainWindow._steam_scan_finished(cast(Any, window), "620")
assert watch["running"] is True
process.error = None
process.result = MainWindow._collect_steam_processes("620", _steam_snapshot(b"456 1 reaper /steam/reaper SteamLaunch AppId=620 -- /game\n"), {})
MainWindow._steam_scan_finished(cast(Any, window), "620")
assert watch["preparing"] is False
process.error = None
process.result = MainWindow._collect_steam_processes("620", _steam_snapshot(b""), {})
MainWindow._steam_scan_finished(cast(Any, window), "620")
assert watch["running"] is True
monkeypatch.setattr(main_window_module.time, "monotonic", lambda: 1004.0)
MainWindow._steam_scan_finished(cast(Any, window), "620")
assert watch["running"] is False
File diff suppressed because it is too large. Load diff
+154 -13
View File
@@ -1,9 +1,10 @@
"""Tests for the bundled PortProton shell scripts."""
import os
import shutil
import subprocess
from pathlib import Path
from pytest import mark
from pytest import mark, skip
@mark.parametrize("case", [
@@ -42,6 +43,29 @@ gui_config () {
assert ppdb.read_text() == expected
@mark.parametrize("enabled", ["0", "1", ""])
@mark.parametrize("inherited", [None, "0", "1"])
def test_video_fix_controls_dxgi_device_manager(
tmp_path: Path, enabled: str, inherited: str | None,
) -> None:
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
block = ' if [[ "${PW_FIX_VIDEO_IN_GAME}" == 1 ]]' + helper.split(
' if [[ "${PW_FIX_VIDEO_IN_GAME}" == 1 ]]', 1,
)[1].split(" fi", 1)[0] + " fi\n"
env = {"PATH": os.defpath, "PW_FIX_VIDEO_IN_GAME": enabled}
if inherited is not None:
env["WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER"] = inherited
result = subprocess.run(
["bash", "-c", block
+ 'printf "%s" "${WINE_DO_NOT_CREATE_DXGI_DEVICE_MANAGER-unset}"'],
cwd=tmp_path, env=env, capture_output=True, text=True, check=False,
)
assert result.returncode == 0, result.stderr
assert result.stdout == ("1" if enabled == "1" else "unset")
@mark.parametrize("second_name", ["Game.exe", "Trainer.exe"])
@mark.parametrize("copies", [1, 3])
def test_run_after_accepts_same_exe(tmp_path: Path, second_name: str, copies: int) -> None:
@@ -129,18 +153,6 @@ def test_run_after_paths_are_passed_in_environment(tmp_path: Path, trainer_path:
assert 'start "" "%PW_RUN_AFTER_SECOND_PATH%"' in batch
def test_scripts_do_not_modify_dxvk_config() -> None:
scripts = Path("build-aux/share/portproton/scripts")
helper = (scripts / "functions_helper").read_text(encoding="utf-8")
start = (scripts / "start.sh").read_text(encoding="utf-8")
assert "set_to_dxvk_conf" not in helper
assert 'try_remove_file "$PATH_TO_GAME/dxvk.conf"' not in helper
assert '> "$PATH_TO_GAME/dxvk.conf"' not in helper
assert 'cp -f "${PORT_CONF_PATH}/dxvk.conf"' not in start
assert 'export DXVK_CONFIG_FILE="$PATH_TO_GAME/dxvk.conf"' in helper
def test_game_launch_marker_is_emitted_for_wine_and_proton() -> None:
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text(
encoding="utf-8",
@@ -315,3 +327,132 @@ def test_run_after_wrapper_preserves_command_with_comma(tmp_path: Path) -> None:
capture_output=True, text=True, check=True,
)
assert result.stdout.splitlines() == ["first,second", "game"]
def test_wine_gpu_name_lookup(tmp_path: Path) -> None:
compiler = shutil.which("cc")
if compiler is None:
skip("C compiler is unavailable")
source = tmp_path / "wine_names.c"
source.write_text(
'#include <stdio.h>\n#include "wine_gpu_names.h"\n'
'int main(void) {\n'
'puts(wine_device_name(0x1002, 0x163f, "AMD Custom GPU 0405 (RADV VANGOGH)"));\n'
'puts(wine_device_name(0x10de, 0x249d, "NVIDIA GeForce RTX 3070 Laptop GPU"));\n'
'puts(wine_device_name(0x8086, 0x5912, "Intel native name"));\n'
'puts(wine_device_name(0xffff, 0x163f, "Unknown vendor"));\n'
'puts(wine_device_name(0x1002, 0xffff, "Unknown device"));\n'
'puts(wine_device_name(0x11002, 0x163f, "Non-PCI vendor"));\n'
'return 0;\n}\n',
)
binary = tmp_path / "wine_names"
subprocess.run(
[compiler, "-std=c99", "-Wall", "-Wextra", "-Werror", "-I",
str(Path("build-aux/src").resolve()), str(source), "-o", str(binary)],
capture_output=True, text=True, check=True,
)
result = subprocess.run([str(binary)], capture_output=True, text=True, check=True)
assert result.stdout.splitlines() == [
"AMD VANGOGH", "NVIDIA GeForce RTX 3070 (mobile)", "Intel(R) HD Graphics 630",
"Unknown vendor", "Unknown device", "Non-PCI vendor",
]
@mark.parametrize("names", [
("AMD Custom GPU 0405 (RADV VANGOGH)", "AMD VANGOGH"),
("NVIDIA GeForce RTX 3070 Laptop GPU", "NVIDIA GeForce RTX 3070 (mobile)"),
("Unknown GPU", "Unknown GPU"),
])
@mark.parametrize("override", [
{}, {"DXVK_FILTER_DEVICE_NAME": "custom-dxvk"},
{"VKD3D_FILTER_DEVICE_NAME": "custom-vkd3d"},
{"DXVK_FILTER_DEVICE_NAME": "", "VKD3D_FILTER_DEVICE_NAME": ""},
])
def test_gpu_selection_uses_wine_name_for_both_filters(
tmp_path: Path, names: tuple[str, str], override: dict[str, str],
) -> None:
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
function = "pw_select_gpu () {" + helper.split("pw_select_gpu () {", 1)[1].split(
"\npw_check_vulkan_extensions () {", 1,
)[0]
binary = tmp_path / "vk_gpu_info"
binary.write_text('#!/bin/bash\nprintf "%s" "$GPU_OUTPUT"\n')
binary.chmod(0o755)
native, wine = names
output = (
"GPU #0\ndevice_name: Other GPU\nwine_device_name: Other Wine GPU\n\n"
f"GPU #1\ndevice_name: {native}\nwine_device_name: {wine}\n\n"
"GPU #2\ndevice_name: Last GPU\nwine_device_name: Last Wine GPU\n"
)
result = subprocess.run(
["bash", "-c", function + '\npw_select_gpu\n'
'printf "%s\\n" "$DXVK_FILTER_DEVICE_NAME" "$VKD3D_FILTER_DEVICE_NAME" '
'"$PW_GPU_USE" "$MESA_VK_DEVICE_SELECT" "$MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE"'],
cwd=tmp_path, capture_output=True, text=True, check=True,
env={"PATH": f"{tmp_path}:{os.defpath}", "GPU_OUTPUT": output, "PW_GPU_USE": native,
"PW_vendorID": "0x1002", "PW_deviceID": "0x163f", **override},
)
assert result.stdout.splitlines() == [
override.get("DXVK_FILTER_DEVICE_NAME", wine),
override.get("VKD3D_FILTER_DEVICE_NAME", wine), native, "0x1002:0x163f", "1",
]
@mark.parametrize("case", [
("GPU #0\ndevice_name: Selected GPU\n", 0),
("GPU #0\ndevice_name: Selected GPU\nwine_device_name: \n", 0),
("GPU #0\ndevice_name: Other GPU\nwine_device_name: Other Wine GPU\n", 0),
("GPU #0\ndevice_name: Selected GPU\nwine_device_name: Wine GPU\n", 1),
])
@mark.parametrize("selected", ["Selected GPU", "disabled", ""])
def test_gpu_selection_falls_back_to_native_name(
tmp_path: Path, case: tuple[str, int], selected: str,
) -> None:
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
function = "pw_select_gpu () {" + helper.split("pw_select_gpu () {", 1)[1].split(
"\npw_check_vulkan_extensions () {", 1,
)[0]
output, status = case
binary = tmp_path / "vk_gpu_info"
binary.write_text(
'#!/bin/bash\ntouch probe-ran\nprintf "%s" "$GPU_OUTPUT"\n'
f'exit {status}\n',
)
binary.chmod(0o755)
result = subprocess.run(
["bash", "-c", function + '\nprint_warning () { echo "$*" >&2; }\npw_select_gpu\n'
'printf "%s\\n" "${DXVK_FILTER_DEVICE_NAME-unset}" '
'"${VKD3D_FILTER_DEVICE_NAME-unset}"'],
cwd=tmp_path, capture_output=True, text=True, check=True,
env={"PATH": f"{tmp_path}:{os.defpath}", "GPU_OUTPUT": output,
"PW_GPU_USE": selected, "PW_vendorID": "0x1002", "PW_deviceID": "0x163f"},
)
expected = selected if selected == "Selected GPU" else "unset"
assert result.stdout.splitlines() == [expected, expected]
assert (tmp_path / "probe-ran").exists() == (selected == "Selected GPU")
assert ("vk_gpu_info failed" in result.stderr) == (status != 0 and selected == "Selected GPU")
@mark.parametrize("exit_code", [0, 37])
def test_run_after_command_placeholder_preserves_arguments_and_status(
tmp_path: Path, exit_code: int,
) -> None:
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
wrapper = helper.split("pw_launch_wrapper () {", 1)[1].split(
"export -f pw_launch_wrapper", 1,
)[0]
launcher = tmp_path / "Обёртка с пробелами"
launcher.write_text(
'#!/bin/bash\nexport WRAPPER_ACTIVE=yes\nexec "$@"\n',
)
launcher.chmod(0o755)
result = subprocess.run(
["bash", "-c", "pw_launch_wrapper () {" + wrapper
+ '\npw_launch_wrapper bash -c \'printf "%s\\n" "$WRAPPER_ACTIVE" "$@"; '
+ 'exit "$EXIT_CODE"\' game "аргумент с пробелами" \'$(false)\' ""'],
env={"PATH": os.defpath, "PW_RUN_AFTER_EXE": f'"{launcher}" %command%',
"EXIT_CODE": str(exit_code)},
capture_output=True, text=True, check=False,
)
assert result.returncode == exit_code, result.stderr
assert result.stdout == "yes\nаргумент с пробелами\n$(false)\n\n"
+71
View File
@@ -219,3 +219,74 @@ def test_disabled_steam_proton_scanning_keeps_local_versions(
assert manager.get_installed_versions() == [("LocalWine", str(local_wine))]
compat.assert_not_called()
home.assert_not_called()
def test_metadata_error_preserves_local_versions(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
from PySide6.QtWidgets import QLabel, QStackedWidget, QTabWidget
import portprotonqt.dialogs.proton_manager as module
app = QApplication.instance() or QApplication([])
local_version = tmp_path / "GE-Proton"
local_version.mkdir()
manager = SimpleNamespace(
content_stack=QStackedWidget(),
tab_widget=QTabWidget(),
theme=SimpleNamespace(GETWINE_WINDOW_STYLE=""),
)
manager.content_stack.addWidget(QWidget())
manager.content_stack.addWidget(QWidget())
manager.tab_widget.addTab(QWidget(), "Loading")
def create_installed_tab() -> None:
assert local_version.is_dir()
manager.tab_widget.addTab(QLabel(local_version.name), "Installed")
manager.create_installed_tab = create_installed_tab
monkeypatch.setattr(module, "_", lambda text: text)
module.ProtonManager.on_wine_data_load_error(cast(Any, manager), "ConnectionError: " + "x" * 2000)
assert manager.content_stack.currentIndex() == 1
assert manager.tab_widget.count() == 1
assert manager.tab_widget.currentIndex() == 0
assert manager.tab_widget.widget(0).text() == local_version.name
manager.tab_widget.deleteLater()
manager.content_stack.deleteLater()
app.processEvents()
def test_installed_sizes_update_after_metadata_error(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
from PySide6.QtCore import QEventLoop, QTimer
from PySide6.QtWidgets import QPushButton, QTableWidget
from portprotonqt.theme_manager import ThemeWrapper, load_theme
import portprotonqt.dialogs.proton_manager as module
app = QApplication.instance() or QApplication([])
version = tmp_path / "GE-Proton"
version.mkdir()
(version / "wine").write_bytes(b"x" * 2048)
monkeypatch.setattr(module.ProtonManager, "start_loading_wine_data", lambda self: None)
monkeypatch.setattr(module, "AutoSizeButton", lambda text, **kwargs: QPushButton(text))
monkeypatch.setattr(module.ProtonManager, "get_installed_versions", lambda self: [("GE-Proton", str(version))])
manager = module.ProtonManager(portproton_location=str(tmp_path), theme=ThemeWrapper(load_theme("standart")))
manager.on_wine_data_load_error("Offline")
workers = list(manager._installed_size_tables)
loop = QEventLoop()
workers[0].finished.connect(loop.quit)
QTimer.singleShot(3000, loop.quit)
loop.exec()
app.processEvents()
try:
installed_tab = manager.tab_widget.widget(0)
assert installed_tab is not None
table = installed_tab.findChild(QTableWidget)
assert table is not None
size_item = table.item(0, 2)
assert size_item is not None
assert size_item.text() == "2.0 KiB"
finally:
from shiboken6 import isValid
for worker in workers:
if isValid(worker):
worker.wait()
manager.close()
app.processEvents()
+86 -7
View File
@@ -69,7 +69,7 @@ def test_game_card_context_menu_does_not_block_gamepad_polling(monkeypatch) -> N
assert app is not None
@pytest.mark.parametrize("target", ["game.exe", "gog://launch/123", "egs://launch/game-id"])
@pytest.mark.parametrize("target", ["game.exe", "gog://launch/123", "egs://launch/game-id", "native"])
def test_add_to_steam_for_all_accounts(
tmp_path: Path,
monkeypatch: Any,
@@ -77,8 +77,10 @@ def test_add_to_steam_for_all_accounts(
) -> None:
steam_home = tmp_path / "steam"
user_ids = ("76561197960265729", "76561197960265730")
executable = tmp_path / "game.exe"
executable = tmp_path / ("Hytale Launcher.desktop" if target == "native" else "game.exe")
executable.touch()
if target == "native":
target = "native://" + str(executable)
monkeypatch.setattr(steam_shortcuts, "get_steam_home", lambda: steam_home)
monkeypatch.setattr(
steam_shortcuts,
@@ -112,6 +114,9 @@ def test_add_to_steam_for_all_accounts(
)
assert result is True
if target.startswith("native://"):
script = tmp_path / "steam_scripts" / "Test Game.sh"
assert "'" + target + "'" in script.read_text()
generate_icon.assert_not_called()
assert custom_icon_lookup.call_args_list[0].args == (
str(tmp_path / "steam_scripts" / "Test Game.sh"),
@@ -1568,7 +1573,8 @@ def test_local_shortcut_name_keeps_metadata_on_write_failure(
assert list(game_dir.iterdir()) == [metadata]
@pytest.mark.parametrize("target", ["game.exe", "gog://launch/123", "egs://launch/game-id"])
@pytest.mark.parametrize("target", ["game.exe", "gog://launch/123", "egs://launch/game-id",
"native:///usr/share/applications/com.hypixel.HytaleLauncher.desktop"])
@pytest.mark.parametrize("batch,result,expected", [
(True, (True, "restart"), (0, 0)),
(False, (True, "Game added to Steam via CEF API"), (0, 0)),
@@ -1582,7 +1588,8 @@ def test_steam_addition_dialogs(monkeypatch: Any, batch: bool, result: tuple[boo
manager = object.__new__(ContextMenuManager)
manager._batch_action = batch
manager._check_portproton = lambda: True
monkeypatch.setattr(manager, "_get_exec_line", lambda game_name, exec_line: exec_line)
resolve_exec = MagicMock(side_effect=lambda game_name, exec_line: exec_line)
monkeypatch.setattr(manager, "_get_exec_line", resolve_exec)
if target == "game.exe":
monkeypatch.setattr(manager, "_parse_exe_path", lambda exec_line, game_name: exec_line)
manager.signals = MagicMock()
@@ -1591,7 +1598,11 @@ def test_steam_addition_dialogs(monkeypatch: Any, batch: bool, result: tuple[boo
add_shortcut = MagicMock(return_value=result)
monkeypatch.setattr("portprotonqt.context_menu_manager.add_to_steam", add_shortcut)
manager.add_to_steam("Game", target, "cover")
if target != "game.exe":
if target.startswith("native://"):
resolve_exec.assert_not_called()
api.get_launch_target.assert_not_called()
add_shortcut.assert_called_once_with("Game", target, "cover")
elif target != "game.exe":
api.get_launch_target.assert_called_once_with(target.rsplit("/", 1)[-1])
add_shortcut.assert_called_once_with("Game", target, "cover", "installed.exe")
assert manager.signals.show_info_dialog.emit.call_count == expected[0]
@@ -2015,7 +2026,7 @@ def test_game_folder_import_completion_refreshes_completed_games(
@pytest.mark.parametrize("edit_mode", [False, True])
def test_add_game_file_picker_offers_folder_selection_only_for_adding(
monkeypatch: pytest.MonkeyPatch, edit_mode: bool,
monkeypatch: pytest.MonkeyPatch, tmp_path: Path, edit_mode: bool,
) -> None:
from PySide6.QtWidgets import QHBoxLayout
import portprotonqt.dialogs.base as module
@@ -2023,7 +2034,8 @@ def test_add_game_file_picker_offers_folder_selection_only_for_adding(
app = QApplication.instance() or QApplication([])
explorer = SimpleNamespace(file_signal=MagicMock(), button_layout=QHBoxLayout(), show=MagicMock())
monkeypatch.setattr(explorer_module, "FileExplorer", lambda *_args, **_kwargs: explorer)
create_explorer = MagicMock(return_value=explorer)
monkeypatch.setattr(explorer_module, "FileExplorer", create_explorer)
monkeypatch.setattr(module, "AutoSizeButton", lambda text, **_kwargs: QPushButton(text))
dialog = SimpleNamespace(
last_exe_path=None, edit_mode=edit_mode, onExeSelected=MagicMock(),
@@ -2033,6 +2045,17 @@ def test_add_game_file_picker_offers_folder_selection_only_for_adding(
module.AddGameDialog.browseExe(cast(Any, dialog))
file_filter = create_explorer.call_args.kwargs["file_filter"]
assert file_filter("/game.exe")
for filename in ("game", "game.AppImage", "game.sh", "game.txt"):
path = tmp_path / filename
path.touch()
path.chmod(0o644)
assert not file_filter(str(path))
path.chmod(0o755)
assert file_filter(str(path))
assert not file_filter(str(tmp_path))
assert not file_filter(str(tmp_path / "missing"))
explorer.file_signal.file_selected.connect.assert_called_once_with(dialog.onExeSelected)
assert explorer.button_layout.count() == int(not edit_mode)
if not edit_mode:
@@ -2683,3 +2706,59 @@ def test_sgdb_cloud_urls_use_proxy(
api.fetch_sgdb_cover_async("Portal 2", completed.append, image_type)
assert completed == [f"https://deckyloader.ru/sgdb-cdn/{image_type}/asset.png"]
@pytest.mark.parametrize("themed", [False, True])
def test_native_steam_icon_uses_desktop_icon(tmp_path: Path, monkeypatch: Any, themed: bool) -> None:
from PySide6.QtGui import QPixmap
app = QApplication.instance() or QApplication([])
image = tmp_path / "pixmaps/hytale-launcher.png"
image.parent.mkdir()
pixmap = QPixmap(32, 32)
pixmap.fill(Qt.GlobalColor.red)
assert pixmap.save(str(image))
source = tmp_path / "hytale.desktop"
icon = "hytale-launcher" if themed else str(image)
source.write_text(f"[Desktop Entry]\nType=Application\nName=Hytale\nIcon={icon}\nExec=hytale-launcher\n")
monkeypatch.setattr(steam_shortcuts.QIcon, "fromTheme", lambda _name: QIcon())
monkeypatch.setattr(steam_shortcuts.QStandardPaths, "standardLocations", lambda _location: [str(tmp_path)])
generated = steam_shortcuts._generate_icon(str(source), str(tmp_path))
assert generated
assert not QPixmap(generated).isNull()
assert app is not None
@pytest.mark.parametrize("relative", [
"pixmaps/hytale.xpm", "icons/hytale.png", "icons/hicolor/128x128/apps/hytale.png",
"icons/hicolor/scalable/apps/hytale.svg", "icons/other/64x64/games/hytale.png",
])
def test_desktop_icon_searches_xdg_formats(tmp_path: Path, monkeypatch: Any, relative: str) -> None:
from PySide6.QtGui import QPixmap
app = QApplication.instance() or QApplication([])
image = tmp_path / relative
image.parent.mkdir(parents=True)
if image.suffix == ".svg":
image.write_text('<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><rect width="32" height="32" fill="red"/></svg>')
else:
pixmap = QPixmap(32, 32)
pixmap.fill(Qt.GlobalColor.red)
assert pixmap.save(str(image))
monkeypatch.setattr(steam_shortcuts.QIcon, "fromTheme", lambda _name: QIcon())
monkeypatch.setattr(steam_shortcuts.QStandardPaths, "standardLocations", lambda _location: [str(tmp_path)])
assert not steam_shortcuts._resolve_desktop_icon("hytale").pixmap(32, 32).isNull()
assert not steam_shortcuts._resolve_desktop_icon(image.name).pixmap(32, 32).isNull()
assert steam_shortcuts._resolve_desktop_icon("missing").isNull()
assert app is not None
def test_native_cached_metadata_does_not_search_desktop_directory(monkeypatch: Any) -> None:
import portprotonqt.steam_api.api as api
monkeypatch.setattr(api, "_get_cached_data_and_index", lambda *_args: ([{"appid": 1}], {}))
search = MagicMock(return_value=None)
monkeypatch.setattr(api, "search_app", search)
assert api.get_cached_steam_game_info("Hytale Launcher", "native:///usr/share/applications/com.hypixel.HytaleLauncher.desktop") == {}
assert search.call_count == 1
assert search.call_args.args[0] == "Hytale Launcher"
+161 -5
View File
@@ -56,6 +56,7 @@ def test_store_dlc_worker_filters_and_preserves_installed(
cache.is_fresh.return_value = False
monkeypatch.setattr(download_tab_module, "CacheManager", lambda: cache)
worker = download_tab_module.StoreDLCWorker(api, "111")
monkeypatch.setattr(worker, "_load_gog_dlc_info", lambda: None)
monkeypatch.setattr(worker, "_load_dlc_covers", lambda: {})
results = []
worker.loaded.connect(results.append)
@@ -76,6 +77,7 @@ def test_store_dlc_worker_failure_does_not_continue_install(
api = GOGAPI()
monkeypatch.setattr(api, "build_command", MagicMock(side_effect=FileNotFoundError("gogdl")))
worker = download_tab_module.StoreDLCWorker(api, "111")
monkeypatch.setattr(worker, "_load_gog_dlc_info", lambda: None)
loaded, errors = [], []
worker.loaded.connect(loaded.append)
worker.failed.connect(errors.append)
@@ -122,7 +124,6 @@ def test_dlc_worker_released_before_modal_and_retry(
dialog = download_tab_module.QDialog(self)
QTimer.singleShot(0, dialog.reject)
dialog.exec()
loop.quit()
window: Any = Window()
window.gog_api = cast(Any, object())
@@ -136,18 +137,29 @@ def test_dlc_worker_released_before_modal_and_retry(
def warning(*args: Any) -> None:
observations.append((window.store_dlc_worker, QThread.currentThread()))
loop.quit()
monkeypatch.setattr(download_tab_module.StoreDLCWorker, "run", run)
monkeypatch.setattr(download_tab_module.QMessageBox, "warning", warning)
timeout = QTimer()
timeout.setSingleShot(True)
timeout.timeout.connect(loop.quit)
for _attempt in range(2):
ready = QTimer()
ready.setInterval(10)
for attempt in range(2):
def finish_when_observed(expected: int = attempt + 1) -> None:
if len(observations) == expected and window.store_dlc_worker is None:
loop.quit()
ready.timeout.connect(finish_when_observed)
window._select_store_dlcs(source, {"app_id": "123", "title": "Game"})
ready.start()
timeout.start(3000)
loop.exec()
ready.stop()
ready.timeout.disconnect(finish_when_observed)
timeout.stop()
assert len(observations) == attempt + 1
assert window.store_dlc_worker is None
assert observations == [(None, application.thread())] * 2
window.deleteLater()
@@ -174,6 +186,7 @@ def test_dlc_worker_shutdown_suppresses_picker(monkeypatch: MonkeyPatch) -> None
monkeypatch.setattr(download_tab_module.QMessageBox, "warning", warning)
window._select_store_dlcs("gog", {"app_id": "123", "title": "Game"})
worker = window.store_dlc_worker
window._select_store_dlcs("gog", {"app_id": "456", "title": "Queued"})
assert started.wait(3)
window._stopWorkerThread("store_dlc_worker", None)
assert not worker.isRunning()
@@ -181,6 +194,7 @@ def test_dlc_worker_shutdown_suppresses_picker(monkeypatch: MonkeyPatch) -> None
assert window.store_dlc_worker is None
window._on_store_dlcs_loaded.assert_not_called()
warning.assert_not_called()
assert window.store_dlc_pending == []
window.deleteLater()
@@ -201,8 +215,8 @@ def test_store_download_queues_reject_duplicates() -> None:
)
for game in (queued, queued, active):
GOGMixin._install_gog_game(cast(Any, window), game)
GOGMixin._install_egs_download(cast(Any, window), str(game["app_id"]))
window._queue_store_download("gog", game)
window._queue_store_download("egs", game)
assert window.store_download_queue == [
("gog", queued), ("egs", queued), ("egs", active),
@@ -1542,3 +1556,145 @@ def test_failed_store_process_completes_callback_path() -> None:
process.finished.emit.assert_called_once_with(
download_tab_module.os.EX_UNAVAILABLE, download_tab_module.QProcess.ExitStatus.CrashExit,
)
@mark.parametrize("failed", (False, True))
def test_store_dlc_requests_queue_while_worker_is_busy(
monkeypatch: MonkeyPatch, failed: bool,
) -> None:
workers = []
def create_worker(*args: Any) -> Any:
worker = MagicMock()
workers.append(worker)
return worker
monkeypatch.setattr(download_tab_module, "StoreDLCWorker", create_worker)
warning = MagicMock()
monkeypatch.setattr(download_tab_module.QMessageBox, "warning", warning)
window = SimpleNamespace(
store_dlc_worker=None, gog_api=object(), egs_api=object(),
_on_store_dlcs_loaded=MagicMock(), _on_store_dlc_worker_finished=MagicMock(),
)
window._select_store_dlcs = lambda source, game: GOGMixin._select_store_dlcs(
cast(Any, window), source, game
)
first = {"app_id": "1", "title": "First"}
second = {"app_id": "2", "title": "Second"}
third = {"app_id": "3", "title": "Third"}
for source, game in (("gog", first), ("gog", first), ("gog", second),
("gog", second), ("egs", third)):
window._select_store_dlcs(source, game)
assert len(workers) == 1
assert window.store_dlc_pending == [("gog", second), ("egs", third)]
warning.assert_not_called()
for source, game in (("gog", first), ("gog", second), ("egs", third)):
assert window.store_dlc_request[:2] == (source, game)
window.store_dlc_request[3 if failed else 2].append("failed" if failed else [])
GOGMixin._on_store_dlc_worker_finished(cast(Any, window))
assert len(workers) == 3
assert window.store_dlc_worker is None
assert window.store_dlc_pending == []
assert warning.call_count == (3 if failed else 0)
assert window._on_store_dlcs_loaded.call_count == (0 if failed else 3)
@mark.parametrize("source", ("gog", "egs"))
@mark.parametrize("cancelled", (False, True))
def test_store_selects_folder_before_queue_and_reuses_it(
tmp_path: Path, monkeypatch: MonkeyPatch, source: str, cancelled: bool,
) -> None:
game = {"app_id": "123", "title": "Game", "_dlcs": []}
selected_path = tmp_path / "Chosen"
explorer = MagicMock()
if not cancelled:
explorer.file_signal.file_selected.connect.side_effect = (
lambda callback: callback(str(selected_path))
)
factory = MagicMock(return_value=explorer)
monkeypatch.setattr(download_tab_module, "FileExplorer", factory)
api = SimpleNamespace(
games_dir=tmp_path, config_dir=tmp_path, load_library=lambda: [game],
get_install_path=lambda *_args: tmp_path,
find_install_path=lambda *_args: None,
build_command=lambda args: [source, *args],
)
window = SimpleNamespace(
gog_process=object(), egs_process=None, gog_api=api, egs_api=api,
theme=object(), egs_selected_dlc_game=game,
_queue_store_download=MagicMock(), _start_gog_download=MagicMock(),
_start_egs_download=MagicMock(),
)
if source == "gog":
GOGMixin._install_gog_game(cast(Any, window), game)
else:
GOGMixin._install_egs_download(cast(Any, window), "123")
explorer.exec.assert_called_once_with()
if cancelled:
window._queue_store_download.assert_not_called()
return
prepared = {**game, "_install_path": str(selected_path)}
window._queue_store_download.assert_called_once_with(source, prepared)
window.gog_process = None
if source == "gog":
GOGMixin._install_gog_game(cast(Any, window), prepared)
started = window._start_gog_download
else:
window.egs_selected_dlc_game = prepared
GOGMixin._install_egs_download(cast(Any, window), "123")
started = window._start_egs_download
factory.assert_called_once()
assert started.call_args.args[:2] == (game, selected_path)
@mark.parametrize("has_dlcs", (False, True))
def test_gog_dlc_metadata_does_not_calculate_download_sizes(
tmp_path: Path, monkeypatch: MonkeyPatch, has_dlcs: bool,
) -> None:
import zlib
monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path))
api = GOGAPI()
monkeypatch.setattr(api, "get_credentials", lambda: {"access_token": "test-token"})
products = [{"productId": "111", "name": "Base"}]
if has_dlcs:
products.extend([{"productId": "222", "name": "Owned"},
{"productId": "333", "name": "Not owned"}])
builds = MagicMock()
builds.json.return_value = {"items": [
{"branch": None, "generation": download_tab_module.GOG_CONTENT_GENERATION,
"link": "https://example.com/manifest"},
]}
manifest = MagicMock(content=zlib.compress(orjson.dumps({"products": products})))
owned = MagicMock()
owned.json.return_value = {"owned": [111, 222]}
request = MagicMock(side_effect=[builds, manifest, owned])
monkeypatch.setattr(download_tab_module.requests, "get", request)
subprocess = MagicMock(side_effect=AssertionError("Must not calculate sizes"))
monkeypatch.setattr(download_tab_module.subprocess, "run", subprocess)
worker = download_tab_module.StoreDLCWorker(api, "111")
assert worker._load_gog_dlc_info() == {
"dlcs": [{"id": "222", "title": "Owned"}] if has_dlcs else [],
}
assert request.call_count == (3 if has_dlcs else 2)
subprocess.assert_not_called()
@mark.parametrize("failure", ("network", "legacy", "manifest"))
def test_gog_dlc_metadata_falls_back_safely(
tmp_path: Path, monkeypatch: MonkeyPatch, failure: str,
) -> None:
monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path))
api = GOGAPI()
response = MagicMock(content=b"invalid compressed manifest")
response.json.return_value = {"items": [
{"branch": None, "generation": 1 if failure == "legacy" else
download_tab_module.GOG_CONTENT_GENERATION, "link": "https://example.com/manifest"},
]}
if failure == "network":
response.raise_for_status.side_effect = download_tab_module.requests.ConnectionError("offline")
monkeypatch.setattr(download_tab_module.requests, "get", MagicMock(return_value=response))
worker = download_tab_module.StoreDLCWorker(api, "111")
assert worker._load_gog_dlc_info() is None
+292
View File
@@ -0,0 +1,292 @@
"""System keyboard input, focus-independent routing and native lifecycle."""
from collections.abc import Generator
from threading import Event
from types import SimpleNamespace
from typing import Any, cast
from unittest.mock import MagicMock
import pytest
from evdev import ecodes
from PySide6.QtCore import QObject, QPoint, Qt
from PySide6.QtGui import QImage, QRegion
from PySide6.QtWidgets import QApplication, QPushButton, QWidget
from portprotonqt.input_manager import InputManager
from portprotonqt.input_manager.constants import (PAD_BUTTON_START, PAD_BUTTON_NORTH,
PAD_BUTTON_SOUTH, SDL_CONTROLLER_BUTTON_TO_PAD)
from portprotonqt.native_gamepad import SDLGamepad
from portprotonqt.system_keyboard import SystemKeyboard
from portprotonqt.system_keyboard.input import SystemInputWorker
from portprotonqt.system_keyboard.window import SystemKeyboardWindow
from portprotonqt.system_keyboard import input as system_input
from portprotonqt.system_keyboard import window as system_window
from portprotonqt.system_keyboard import wayland_detection
from portprotonqt.system_keyboard.cosmic_detection import CosmicLayout
from portprotonqt.system_keyboard.detection import X11Layout, XkbState
from portprotonqt.system_keyboard.keys import XKB_GROUP_SHIFT
from portprotonqt.theme_manager import load_theme
@pytest.fixture
def application() -> QApplication:
return cast(QApplication, QApplication.instance() or QApplication([]))
@pytest.fixture
def keyboard_window(monkeypatch: pytest.MonkeyPatch, application: QApplication) -> Generator[SystemKeyboardWindow]:
theme = load_theme('standart')
monkeypatch.setattr(system_window.ThemeManager, 'apply_theme', lambda self, name: theme)
monkeypatch.setattr(system_window, 'compositor', lambda env: None)
monkeypatch.setattr(system_window, 'report', MagicMock())
window = SystemKeyboardWindow()
yield window
window.shutdown()
window.hide()
def test_panel_matches_embedded_layout_without_extra_rows(keyboard_window: SystemKeyboardWindow) -> None:
keyboard = keyboard_window.keyboard
assert keyboard.current_layout == 'us'
assert keyboard.keyboard_layout.rowCount() == 5
item = keyboard.keyboard_layout.itemAtPosition(3, 1)
assert item is not None
extra_iso_key = item.widget()
assert isinstance(extra_iso_key, QPushButton)
assert extra_iso_key.text() == '<'
assert keyboard.keycodes['<'] == ecodes.KEY_102ND
assert keyboard.height() == keyboard_window.theme.SYSTEM_KEYBOARD['height']
assert keyboard_window.windowFlags() & Qt.WindowType.WindowDoesNotAcceptFocus
def test_panel_sends_physical_keys_without_editing_target(keyboard_window: SystemKeyboardWindow) -> None:
keyboard = keyboard_window.keyboard
keyboard.on_button_click('q')
keyboard.on_enter_click()
keyboard.on_lang_click()
commands = keyboard_window.worker.commands
assert commands.get_nowait() == ('tap', (ecodes.KEY_Q,))
assert commands.get_nowait() == ('tap', (ecodes.KEY_ENTER,))
assert commands.get_nowait() == ('language', ())
keyboard.on_shift_click(True)
assert commands.get_nowait() == ('modifiers', (ecodes.KEY_LEFTSHIFT,))
keyboard.buttons['q'].click()
assert commands.get_nowait() == ('tap', (ecodes.KEY_Q,))
def test_hide_cancels_pending_input_and_repeat(keyboard_window: SystemKeyboardWindow) -> None:
keyboard_window.ready = True
keyboard_window.show_keyboard()
keyboard_window.keyboard.on_backspace_pressed()
keyboard_window.hide_keyboard()
assert not keyboard_window.worker.enabled.is_set()
assert keyboard_window.keyboard.backspace_timer is None
assert keyboard_window.worker.commands.get_nowait() == ('release', ())
assert not keyboard_window.isVisible()
def test_refresh_preserves_selected_key(keyboard_window: SystemKeyboardWindow) -> None:
keyboard = keyboard_window.keyboard
keyboard._set_selected_button(keyboard.buttons['q'])
original_button = keyboard.buttons['q']
original_button.setDown(True)
keyboard_window._state_changed({'labels': {str(ecodes.KEY_Q): 'й'}, 'caps': False,
'shift': False, 'modifiers': (), 'layout': 'ru'})
assert keyboard.selected_button is keyboard.buttons['q']
assert keyboard.buttons['q'].text() == 'й'
assert keyboard.buttons['q'] is original_button
assert original_button.isDown()
def test_caps_highlight_and_space_follow_system_state(keyboard_window: SystemKeyboardWindow) -> None:
keyboard = keyboard_window.keyboard
button = keyboard.buttons['CAPS']
keyboard_window._state_changed({'labels': {str(ecodes.KEY_CAPSLOCK): '', str(ecodes.KEY_Q): 'Й'},
'caps': True, 'shift': False, 'modifiers': (), 'layout': 'ru'})
assert button.text() == 'CAPS'
assert button.isChecked()
assert keyboard.buttons['q'].text() == 'Й'
item = keyboard.keyboard_layout.itemAtPosition(4, 1)
assert item is not None
space = item.widget()
assert isinstance(space, QPushButton)
assert space.text() == f'Space · {system_window.LAYOUT_DISPLAY_NAMES["ru"]}'
keyboard_window._state_changed({'labels': {str(ecodes.KEY_Q): 'q'}, 'caps': False,
'shift': False, 'modifiers': (), 'layout': 'us'})
assert not button.isChecked()
assert space.text() == f'Space · {system_window.LAYOUT_DISPLAY_NAMES["us"]}'
def test_panel_has_themed_background(keyboard_window: SystemKeyboardWindow) -> None:
keyboard_window.ready = True
keyboard_window.show_keyboard()
QApplication.processEvents()
image = QImage(keyboard_window.size(), QImage.Format.Format_ARGB32_Premultiplied)
image.fill(Qt.GlobalColor.transparent)
keyboard_window.render(image, QPoint(), QRegion(), QWidget.RenderFlag.DrawChildren)
assert image.pixelColor(0, 0).alpha() == 0
assert image.pixelColor(1, keyboard_window.height() // 2).alpha() > 0
def test_caps_button_does_not_keep_unconfirmed_local_toggle(keyboard_window: SystemKeyboardWindow) -> None:
button = keyboard_window.keyboard.buttons['CAPS']
button.click()
assert not button.isChecked()
assert keyboard_window.worker.commands.get_nowait() == ('caps', ())
button.setChecked(True)
keyboard_window._state_changed({'labels': {}, 'caps': False, 'shift': False,
'modifiers': (), 'layout': 'System'})
assert not button.isChecked()
def test_x11_labels_use_xkb_group_bits(application: QApplication) -> None:
layout: Any = X11Layout.__new__(X11Layout)
state = XkbState()
state.group = 1
layout.state = lambda: state
layout.display = 123
layout.lib = MagicMock()
layout.xkb = MagicMock()
layout.lib.XkbLookupKeySym.return_value = False
layout.labels()
assert layout.lib.XkbLookupKeySym.call_args_list
for call in layout.lib.XkbLookupKeySym.call_args_list:
assert call.args[2] == 1 << XKB_GROUP_SHIFT
def test_key_failure_releases_all_pressed_keys(application: QApplication) -> None:
worker = SystemInputWorker()
device = MagicMock()
device.write.side_effect = [None, OSError('injection failed'), None, None]
with pytest.raises(OSError, match='injection failed'):
worker.send_keys(device, (ecodes.KEY_LEFTSHIFT, ecodes.KEY_Q))
assert [call.args for call in device.write.call_args_list] == [
(ecodes.EV_KEY, ecodes.KEY_LEFTSHIFT, 1), (ecodes.EV_KEY, ecodes.KEY_Q, 1),
(ecodes.EV_KEY, ecodes.KEY_Q, 0), (ecodes.EV_KEY, ecodes.KEY_LEFTSHIFT, 0)]
def test_hidden_keyboard_cannot_inject(application: QApplication) -> None:
worker = SystemInputWorker()
device = MagicMock()
worker._execute(device, 'tap', (ecodes.KEY_Q,))
worker._execute(device, 'language', ())
worker._execute(device, 'caps', ())
device.write.assert_not_called()
def test_worker_shutdown_closes_device_once(monkeypatch: pytest.MonkeyPatch, application: QApplication) -> None:
worker = SystemInputWorker()
device = MagicMock()
opened = Event()
def open_device(*args: Any, **kwargs: Any) -> Any:
opened.set()
return device
monkeypatch.setattr(system_input, 'UInput', open_device)
monkeypatch.setattr(worker, '_load_layout', MagicMock())
monkeypatch.setattr(worker, '_refresh_state', MagicMock())
worker.start()
assert opened.wait(2)
worker.stop()
worker.stop()
assert not worker.isRunning()
device.close.assert_called_once()
def test_worker_failure_reports_and_finishes(monkeypatch: pytest.MonkeyPatch, application: QApplication) -> None:
worker = SystemInputWorker()
monkeypatch.setattr(system_input, 'UInput', MagicMock(side_effect=PermissionError('uinput denied')))
failures = []
worker.failed.connect(failures.append)
worker.start()
assert worker.wait(2000)
application.processEvents()
assert failures == ['uinput denied']
@pytest.mark.parametrize('session', ['wayland', 'x11'])
def test_xwayland_switch_uses_uinput_instead_of_xkb(
monkeypatch: pytest.MonkeyPatch, application: QApplication, session: str,
) -> None:
monkeypatch.setenv('XDG_SESSION_TYPE', session)
worker = SystemInputWorker()
worker.enabled.set()
layout: Any = X11Layout.__new__(X11Layout)
layout.switch = MagicMock()
worker.layout = layout
device = MagicMock()
worker._execute(device, 'language', ())
if session == 'x11':
layout.switch.assert_called_once()
device.write.assert_not_called()
else:
layout.switch.assert_not_called()
assert [call.args for call in device.write.call_args_list] == [
(ecodes.EV_KEY, ecodes.KEY_KBD_LAYOUT_NEXT, 1),
(ecodes.EV_KEY, ecodes.KEY_KBD_LAYOUT_NEXT, 0)]
def test_cosmic_switch_matches_prototype_uinput_path(application: QApplication) -> None:
worker = SystemInputWorker()
worker.enabled.set()
worker.layout = CosmicLayout.__new__(CosmicLayout)
device = MagicMock()
worker._execute(device, 'language', ())
assert [call.args for call in device.write.call_args_list] == [
(ecodes.EV_KEY, ecodes.KEY_KBD_LAYOUT_NEXT, 1),
(ecodes.EV_KEY, ecodes.KEY_KBD_LAYOUT_NEXT, 0)]
def test_niri_switch_uses_ipc(monkeypatch: pytest.MonkeyPatch) -> None:
command = MagicMock()
monkeypatch.setattr(wayland_detection, 'command', command)
layout = wayland_detection.NiriLayout.__new__(wayland_detection.NiriLayout)
layout.switch()
command.assert_called_once_with(['niri', 'msg', 'action', 'switch-layout', 'next'])
def test_start_y_is_consumed_before_internal_search(application: QApplication) -> None:
manager: Any = InputManager.__new__(InputManager)
QObject.__init__(manager)
keyboard = SimpleNamespace(toggle=MagicMock(), isVisible=lambda: False)
manager._parent = SimpleNamespace(system_keyboard=keyboard)
manager.start_held = True
assert manager._handle_system_keyboard_input(PAD_BUTTON_START, 1, False)
assert manager._handle_system_keyboard_input(PAD_BUTTON_NORTH, 1, False)
assert manager._handle_system_keyboard_input(PAD_BUTTON_START, 0, False)
keyboard.toggle.assert_called_once()
manager.start_held = False
assert not manager._handle_system_keyboard_input(PAD_BUTTON_NORTH, 1, False)
def test_system_keyboard_routes_buttons_without_application_focus(application: QApplication) -> None:
manager: Any = InputManager.__new__(InputManager)
QObject.__init__(manager)
keyboard = SimpleNamespace(send=MagicMock(), isVisible=lambda: True)
manager._parent = SimpleNamespace(system_keyboard=keyboard)
manager.start_held = False
assert manager._handle_system_keyboard_input(PAD_BUTTON_SOUTH, 1, False)
keyboard.send.assert_called_once_with('button', 'confirm')
def test_start_is_polled_before_y_in_same_snapshot(application: QApplication) -> None:
manager: Any = InputManager.__new__(InputManager)
manager._handle_button_value = MagicMock()
gamepad = cast(SDLGamepad, SimpleNamespace(get_button=lambda index: 1))
manager._poll_button_events(gamepad, 1.0)
codes = [call.args[1] for call in manager._handle_button_value.call_args_list]
assert codes.index(PAD_BUTTON_START) < codes.index(PAD_BUTTON_NORTH)
assert set(codes) == set(SDL_CONTROLLER_BUTTON_TO_PAD.values())
def test_controller_shutdown_waits_for_child(monkeypatch: pytest.MonkeyPatch, application: QApplication) -> None:
parent = QWidget()
keyboard = SystemKeyboard(parent)
process = MagicMock()
from PySide6.QtCore import QProcess
process.state.return_value = QProcess.ProcessState.Running
process.waitForFinished.side_effect = [False, False, True]
keyboard.process = process
keyboard.shutdown()
process.terminate.assert_called_once()
process.kill.assert_called_once()
assert process.waitForFinished.call_count == 3