Compare commits
7 Commits
android-23
...
android-23
Author | SHA1 | Date | |
---|---|---|---|
38f31530f6 | |||
aec2a6609d | |||
7b077b11d4 | |||
81f45ede66 | |||
4f069aa827 | |||
707e928788 | |||
0dfe24176d |
@ -1,21 +0,0 @@
|
|||||||
#!/bin/bash -ex
|
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
export NDK_CCACHE="$(which ccache)"
|
|
||||||
ccache -s
|
|
||||||
|
|
||||||
export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
|
|
||||||
base64 --decode <<< "${EA_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
|
|
||||||
export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
|
|
||||||
export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
|
|
||||||
export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
|
|
||||||
base64 --decode <<< "${EA_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
|
|
||||||
./gradlew "publishEaReleaseBundle"
|
|
||||||
|
|
||||||
ccache -s
|
|
||||||
|
|
||||||
if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
|
|
||||||
rm "${ANDROID_KEYSTORE_FILE}"
|
|
||||||
fi
|
|
@ -1,21 +0,0 @@
|
|||||||
#!/bin/bash -ex
|
|
||||||
|
|
||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
export NDK_CCACHE="$(which ccache)"
|
|
||||||
ccache -s
|
|
||||||
|
|
||||||
export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
|
|
||||||
base64 --decode <<< "${MAINLINE_PLAY_ANDROID_KEYSTORE_B64}" > "${ANDROID_KEYSTORE_FILE}"
|
|
||||||
export ANDROID_KEY_ALIAS="${PLAY_ANDROID_KEY_ALIAS}"
|
|
||||||
export ANDROID_KEYSTORE_PASS="${PLAY_ANDROID_KEYSTORE_PASS}"
|
|
||||||
export SERVICE_ACCOUNT_KEY_PATH="${GITHUB_WORKSPACE}/sa.json"
|
|
||||||
base64 --decode <<< "${MAINLINE_SERVICE_ACCOUNT_KEY_B64}" > "${SERVICE_ACCOUNT_KEY_PATH}"
|
|
||||||
./gradlew "publishMainlineReleaseBundle"
|
|
||||||
|
|
||||||
ccache -s
|
|
||||||
|
|
||||||
if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
|
|
||||||
rm "${ANDROID_KEYSTORE_FILE}"
|
|
||||||
fi
|
|
66
.github/workflows/android-ea-play-release.yml
vendored
66
.github/workflows/android-ea-play-release.yml
vendored
@ -1,66 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
name: yuzu-android-ea-play-release
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
release-track:
|
|
||||||
description: 'Play store release track (internal/alpha/beta/production)'
|
|
||||||
required: true
|
|
||||||
default: 'alpha'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
android:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
name: Checkout
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
submodules: true
|
|
||||||
token: ${{ secrets.ALT_GITHUB_TOKEN }}
|
|
||||||
- run: npm install execa@5
|
|
||||||
- uses: actions/github-script@v5
|
|
||||||
name: 'Merge and publish Android EA changes'
|
|
||||||
env:
|
|
||||||
ALT_GITHUB_TOKEN: ${{ secrets.ALT_GITHUB_TOKEN }}
|
|
||||||
BUILD_EA: true
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
const execa = require("execa");
|
|
||||||
const mergebot = require('./.github/workflows/android-merge.js').mergebot;
|
|
||||||
process.chdir('${{ github.workspace }}');
|
|
||||||
mergebot(github, context, execa);
|
|
||||||
- name: Get tag name
|
|
||||||
run: echo "GIT_TAG_NAME=$(cat tag-name.txt)" >> $GITHUB_ENV
|
|
||||||
- name: Set up JDK 17
|
|
||||||
uses: actions/setup-java@v3
|
|
||||||
with:
|
|
||||||
java-version: '17'
|
|
||||||
distribution: 'temurin'
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
|
|
||||||
- name: Build
|
|
||||||
run: ./.ci/scripts/android/eabuild.sh
|
|
||||||
env:
|
|
||||||
EA_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
|
|
||||||
PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
|
|
||||||
PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
|
|
||||||
EA_SERVICE_ACCOUNT_KEY_B64: ${{ secrets.EA_SERVICE_ACCOUNT_KEY_B64 }}
|
|
||||||
STORE_TRACK: ${{ github.event.inputs.release-track }}
|
|
||||||
AUTO_VERSIONED: true
|
|
||||||
BUILD_EA: true
|
|
||||||
- name: Create release
|
|
||||||
uses: softprops/action-gh-release@v1
|
|
||||||
with:
|
|
||||||
tag_name: ${{ env.EA_TAG_NAME }}
|
|
||||||
name: ${{ env.EA_TAG_NAME }}
|
|
||||||
draft: false
|
|
||||||
prerelease: false
|
|
||||||
repository: yuzu/yuzu-android
|
|
||||||
token: ${{ secrets.ALT_GITHUB_TOKEN }}
|
|
@ -1,59 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
name: yuzu-android-mainline-play-release
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
release-tag:
|
|
||||||
description: 'Tag # from yuzu-android that you want to build and publish'
|
|
||||||
required: true
|
|
||||||
default: '200'
|
|
||||||
release-track:
|
|
||||||
description: 'Play store release track (internal/alpha/beta/production)'
|
|
||||||
required: true
|
|
||||||
default: 'alpha'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
android:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
if: ${{ github.repository == 'yuzu-emu/yuzu' }}
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
name: Checkout
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
submodules: true
|
|
||||||
token: ${{ secrets.ALT_GITHUB_TOKEN }}
|
|
||||||
- run: npm install execa@5
|
|
||||||
- uses: actions/github-script@v5
|
|
||||||
name: 'Pull mainline tag'
|
|
||||||
env:
|
|
||||||
MAINLINE_TAG: ${{ github.event.inputs.release-tag }}
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
const execa = require("execa");
|
|
||||||
const mergebot = require('./.github/workflows/android-merge.js').getMainlineTag;
|
|
||||||
process.chdir('${{ github.workspace }}');
|
|
||||||
mergebot(execa);
|
|
||||||
- name: Set up JDK 17
|
|
||||||
uses: actions/setup-java@v3
|
|
||||||
with:
|
|
||||||
java-version: '17'
|
|
||||||
distribution: 'temurin'
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update
|
|
||||||
sudo apt-get install -y ccache apksigner glslang-dev glslang-tools
|
|
||||||
- name: Build
|
|
||||||
run: |
|
|
||||||
echo "GIT_TAG_NAME=android-${{ github.event.inputs.releast-tag }}" >> $GITHUB_ENV
|
|
||||||
./.ci/scripts/android/mainlinebuild.sh
|
|
||||||
env:
|
|
||||||
MAINLINE_PLAY_ANDROID_KEYSTORE_B64: ${{ secrets.PLAY_ANDROID_KEYSTORE_B64 }}
|
|
||||||
PLAY_ANDROID_KEY_ALIAS: ${{ secrets.PLAY_ANDROID_KEY_ALIAS }}
|
|
||||||
PLAY_ANDROID_KEYSTORE_PASS: ${{ secrets.PLAY_ANDROID_KEYSTORE_PASS }}
|
|
||||||
SERVICE_ACCOUNT_KEY_B64: ${{ secrets.MAINLINE_SERVICE_ACCOUNT_KEY_B64 }}
|
|
||||||
STORE_TRACK: ${{ github.event.inputs.release-track }}
|
|
||||||
AUTO_VERSIONED: true
|
|
129
.github/workflows/android-merge.js
vendored
129
.github/workflows/android-merge.js
vendored
@ -6,12 +6,9 @@
|
|||||||
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
// which label to check for changes
|
// which label to check for changes
|
||||||
const CHANGE_LABEL_MAINLINE = 'android-merge';
|
const CHANGE_LABEL = 'android-merge';
|
||||||
const CHANGE_LABEL_EA = 'android-ea-merge';
|
|
||||||
// how far back in time should we consider the changes are "recent"? (default: 24 hours)
|
// how far back in time should we consider the changes are "recent"? (default: 24 hours)
|
||||||
const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);
|
const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);
|
||||||
const BUILD_EA = process.env.BUILD_EA == 'true';
|
|
||||||
const MAINLINE_TAG = process.env.MAINLINE_TAG;
|
|
||||||
|
|
||||||
async function checkBaseChanges(github) {
|
async function checkBaseChanges(github) {
|
||||||
// query the commit date of the latest commit on this branch
|
// query the commit date of the latest commit on this branch
|
||||||
@ -43,7 +40,20 @@ async function checkBaseChanges(github) {
|
|||||||
|
|
||||||
async function checkAndroidChanges(github) {
|
async function checkAndroidChanges(github) {
|
||||||
if (checkBaseChanges(github)) return true;
|
if (checkBaseChanges(github)) return true;
|
||||||
const pulls = getPulls(github, false);
|
const query = `query($owner:String!, $name:String!, $label:String!) {
|
||||||
|
repository(name:$name, owner:$owner) {
|
||||||
|
pullRequests(labels: [$label], states: OPEN, first: 100) {
|
||||||
|
nodes { number headRepository { pushedAt } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}`;
|
||||||
|
const variables = {
|
||||||
|
owner: 'yuzu-emu',
|
||||||
|
name: 'yuzu',
|
||||||
|
label: CHANGE_LABEL,
|
||||||
|
};
|
||||||
|
const result = await github.graphql(query, variables);
|
||||||
|
const pulls = result.repository.pullRequests.nodes;
|
||||||
for (let i = 0; i < pulls.length; i++) {
|
for (let i = 0; i < pulls.length; i++) {
|
||||||
let pull = pulls[i];
|
let pull = pulls[i];
|
||||||
if (new Date() - new Date(pull.headRepository.pushedAt) <= DETECTION_TIME_FRAME) {
|
if (new Date() - new Date(pull.headRepository.pushedAt) <= DETECTION_TIME_FRAME) {
|
||||||
@ -73,13 +83,7 @@ async function tagAndPush(github, owner, repo, execa, commit=false) {
|
|||||||
};
|
};
|
||||||
const tags = await github.graphql(query, variables);
|
const tags = await github.graphql(query, variables);
|
||||||
const tagList = tags.repository.refs.nodes;
|
const tagList = tags.repository.refs.nodes;
|
||||||
let lastTag = 'android-1';
|
const lastTag = tagList[0] ? tagList[0].name : 'dummy-0';
|
||||||
for (let i = 0; i < tagList.length; ++i) {
|
|
||||||
if (tagList[i].name.includes('android-')) {
|
|
||||||
lastTag = tagList[i].name;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
|
const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
|
||||||
const channel = repo.split('-')[1];
|
const channel = repo.split('-')[1];
|
||||||
const newTag = `${channel}-${tagNumber + 1}`;
|
const newTag = `${channel}-${tagNumber + 1}`;
|
||||||
@ -97,48 +101,6 @@ async function tagAndPush(github, owner, repo, execa, commit=false) {
|
|||||||
console.info('Successfully pushed new changes.');
|
console.info('Successfully pushed new changes.');
|
||||||
}
|
}
|
||||||
|
|
||||||
async function tagAndPushEA(github, owner, repo, execa) {
|
|
||||||
let altToken = process.env.ALT_GITHUB_TOKEN;
|
|
||||||
if (!altToken) {
|
|
||||||
throw `Please set ALT_GITHUB_TOKEN environment variable. This token should have write access to ${owner}/${repo}.`;
|
|
||||||
}
|
|
||||||
const query = `query ($owner:String!, $name:String!) {
|
|
||||||
repository(name:$name, owner:$owner) {
|
|
||||||
refs(refPrefix: "refs/tags/", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}, first: 10) {
|
|
||||||
nodes { name }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}`;
|
|
||||||
const variables = {
|
|
||||||
owner: owner,
|
|
||||||
name: repo,
|
|
||||||
};
|
|
||||||
const tags = await github.graphql(query, variables);
|
|
||||||
const tagList = tags.repository.refs.nodes;
|
|
||||||
let lastTag = 'ea-1';
|
|
||||||
for (let i = 0; i < tagList.length; ++i) {
|
|
||||||
if (tagList[i].name.includes('ea-')) {
|
|
||||||
lastTag = tagList[i].name;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const tagNumber = /\w+-(\d+)/.exec(lastTag)[1] | 0;
|
|
||||||
const newTag = `ea-${tagNumber + 1}`;
|
|
||||||
console.log(`New tag: ${newTag}`);
|
|
||||||
console.info('Pushing tags to GitHub ...');
|
|
||||||
await execa("git", ["remote", "add", "android", "https://github.com/yuzu-emu/yuzu-android.git"]);
|
|
||||||
await execa("git", ["fetch", "android"]);
|
|
||||||
|
|
||||||
await execa("git", ['tag', newTag]);
|
|
||||||
await execa("git", ['push', 'android', `${newTag}`]);
|
|
||||||
|
|
||||||
fs.writeFile('tag-name.txt', newTag, (err) => {
|
|
||||||
if (err) throw 'Could not write tag name to file!'
|
|
||||||
})
|
|
||||||
|
|
||||||
console.info('Successfully pushed new changes.');
|
|
||||||
}
|
|
||||||
|
|
||||||
async function generateReadme(pulls, context, mergeResults, execa) {
|
async function generateReadme(pulls, context, mergeResults, execa) {
|
||||||
let baseUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/`;
|
let baseUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/`;
|
||||||
let output =
|
let output =
|
||||||
@ -240,7 +202,10 @@ async function resetBranch(execa) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getPulls(github) {
|
async function mergebot(github, context, execa) {
|
||||||
|
// Reset our local copy of master to what appears on yuzu-emu/yuzu - master
|
||||||
|
await resetBranch(execa);
|
||||||
|
|
||||||
const query = `query ($owner:String!, $name:String!, $label:String!) {
|
const query = `query ($owner:String!, $name:String!, $label:String!) {
|
||||||
repository(name:$name, owner:$owner) {
|
repository(name:$name, owner:$owner) {
|
||||||
pullRequests(labels: [$label], states: OPEN, first: 100) {
|
pullRequests(labels: [$label], states: OPEN, first: 100) {
|
||||||
@ -250,49 +215,13 @@ async function getPulls(github) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}`;
|
}`;
|
||||||
const mainlineVariables = {
|
const variables = {
|
||||||
owner: 'yuzu-emu',
|
owner: 'yuzu-emu',
|
||||||
name: 'yuzu',
|
name: 'yuzu',
|
||||||
label: CHANGE_LABEL_MAINLINE,
|
label: CHANGE_LABEL,
|
||||||
};
|
};
|
||||||
const mainlineResult = await github.graphql(query, mainlineVariables);
|
const result = await github.graphql(query, variables);
|
||||||
const pulls = mainlineResult.repository.pullRequests.nodes;
|
const pulls = result.repository.pullRequests.nodes;
|
||||||
if (BUILD_EA) {
|
|
||||||
const eaVariables = {
|
|
||||||
owner: 'yuzu-emu',
|
|
||||||
name: 'yuzu',
|
|
||||||
label: CHANGE_LABEL_EA,
|
|
||||||
};
|
|
||||||
const eaResult = await github.graphql(query, eaVariables);
|
|
||||||
const eaPulls = eaResult.repository.pullRequests.nodes;
|
|
||||||
return pulls.concat(eaPulls);
|
|
||||||
}
|
|
||||||
return pulls;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getMainlineTag(execa) {
|
|
||||||
console.log(`::group::Getting mainline tag android-${MAINLINE_TAG}`);
|
|
||||||
let hasFailed = false;
|
|
||||||
try {
|
|
||||||
await execa("git", ["remote", "add", "mainline", "https://github.com/yuzu-emu/yuzu-android.git"]);
|
|
||||||
await execa("git", ["fetch", "mainline", "--tags"]);
|
|
||||||
await execa("git", ["checkout", `tags/android-${MAINLINE_TAG}`]);
|
|
||||||
await execa("git", ["submodule", "update", "--init", "--recursive"]);
|
|
||||||
} catch (err) {
|
|
||||||
console.log('::error title=Failed pull tag');
|
|
||||||
hasFailed = true;
|
|
||||||
}
|
|
||||||
console.log("::endgroup::");
|
|
||||||
if (hasFailed) {
|
|
||||||
throw 'Failed pull mainline tag. Aborting!';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function mergebot(github, context, execa) {
|
|
||||||
// Reset our local copy of master to what appears on yuzu-emu/yuzu - master
|
|
||||||
await resetBranch(execa);
|
|
||||||
|
|
||||||
const pulls = await getPulls(github);
|
|
||||||
let displayList = [];
|
let displayList = [];
|
||||||
for (let i = 0; i < pulls.length; i++) {
|
for (let i = 0; i < pulls.length; i++) {
|
||||||
let pull = pulls[i];
|
let pull = pulls[i];
|
||||||
@ -302,17 +231,11 @@ async function mergebot(github, context, execa) {
|
|||||||
console.table(displayList);
|
console.table(displayList);
|
||||||
await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
|
await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
|
||||||
const mergeResults = await mergePullRequests(pulls, execa);
|
const mergeResults = await mergePullRequests(pulls, execa);
|
||||||
|
await generateReadme(pulls, context, mergeResults, execa);
|
||||||
if (BUILD_EA) {
|
await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
|
||||||
await tagAndPushEA(github, 'yuzu-emu', `yuzu-android`, execa);
|
|
||||||
} else {
|
|
||||||
await generateReadme(pulls, context, mergeResults, execa);
|
|
||||||
await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports.mergebot = mergebot;
|
module.exports.mergebot = mergebot;
|
||||||
module.exports.checkAndroidChanges = checkAndroidChanges;
|
module.exports.checkAndroidChanges = checkAndroidChanges;
|
||||||
module.exports.tagAndPush = tagAndPush;
|
module.exports.tagAndPush = tagAndPush;
|
||||||
module.exports.checkBaseChanges = checkBaseChanges;
|
module.exports.checkBaseChanges = checkBaseChanges;
|
||||||
module.exports.getMainlineTag = getMainlineTag;
|
|
||||||
|
4
.github/workflows/android-publish.yml
vendored
4
.github/workflows/android-publish.yml
vendored
@ -1,4 +1,4 @@
|
|||||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
name: yuzu-android-publish
|
name: yuzu-android-publish
|
||||||
@ -16,7 +16,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
android:
|
android:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu' }}
|
if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu-android' }}
|
||||||
steps:
|
steps:
|
||||||
# this checkout is required to make sure the GitHub Actions scripts are available
|
# this checkout is required to make sure the GitHub Actions scripts are available
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
14
README.md
14
README.md
@ -1,13 +1,11 @@
|
|||||||
| Pull Request | Commit | Title | Author | Merged? |
|
| Pull Request | Commit | Title | Author | Merged? |
|
||||||
|----|----|----|----|----|
|
|----|----|----|----|----|
|
||||||
| [12461](https://github.com/yuzu-emu/yuzu//pull/12461) | [`4c08a0e6d`](https://github.com/yuzu-emu/yuzu//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
|
| [12461](https://github.com/yuzu-emu/yuzu-android//pull/12461) | [`4c08a0e6d`](https://github.com/yuzu-emu/yuzu-android//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
|
||||||
| [12749](https://github.com/yuzu-emu/yuzu//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||||
| [12756](https://github.com/yuzu-emu/yuzu//pull/12756) | [`cd3de0848`](https://github.com/yuzu-emu/yuzu//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12756](https://github.com/yuzu-emu/yuzu-android//pull/12756) | [`cd3de0848`](https://github.com/yuzu-emu/yuzu-android//pull/12756/files) | general: applet multiprocess | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||||
| [12903](https://github.com/yuzu-emu/yuzu//pull/12903) | [`f296a9ce9`](https://github.com/yuzu-emu/yuzu//pull/12903/files) | shader_recompiler: use only ConstOffset for OpImageFetch | [liamwhite](https://github.com/liamwhite/) | Yes |
|
| [12903](https://github.com/yuzu-emu/yuzu-android//pull/12903) | [`f296a9ce9`](https://github.com/yuzu-emu/yuzu-android//pull/12903/files) | shader_recompiler: use only ConstOffset for OpImageFetch | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||||
| [12914](https://github.com/yuzu-emu/yuzu//pull/12914) | [`fa47ac1c9`](https://github.com/yuzu-emu/yuzu//pull/12914/files) | VideoCore Refactor Part 1. | [FernandoS27](https://github.com/FernandoS27/) | Yes |
|
| [12914](https://github.com/yuzu-emu/yuzu-android//pull/12914) | [`fa47ac1c9`](https://github.com/yuzu-emu/yuzu-android//pull/12914/files) | VideoCore Refactor Part 1. | [FernandoS27](https://github.com/FernandoS27/) | Yes |
|
||||||
| [12920](https://github.com/yuzu-emu/yuzu//pull/12920) | [`62fc6d5c3`](https://github.com/yuzu-emu/yuzu//pull/12920/files) | android: Move JNI setup and helpers to common | [t895](https://github.com/t895/) | Yes |
|
| [12920](https://github.com/yuzu-emu/yuzu-android//pull/12920) | [`62fc6d5c3`](https://github.com/yuzu-emu/yuzu-android//pull/12920/files) | android: Move JNI setup and helpers to common | [t895](https://github.com/t895/) | Yes |
|
||||||
| [12951](https://github.com/yuzu-emu/yuzu//pull/12951) | [`fee263c59`](https://github.com/yuzu-emu/yuzu//pull/12951/files) | ipc: additional fixes | [liamwhite](https://github.com/liamwhite/) | Yes |
|
|
||||||
| [12953](https://github.com/yuzu-emu/yuzu//pull/12953) | [`ae833aa9c`](https://github.com/yuzu-emu/yuzu//pull/12953/files) | SMMU: Ensure the backing address range matches the current | [FernandoS27](https://github.com/FernandoS27/) | Yes |
|
|
||||||
|
|
||||||
|
|
||||||
End of merge log. You can find the original README.md below the break.
|
End of merge log. You can find the original README.md below the break.
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import kotlin.collections.setOf
|
import kotlin.collections.setOf
|
||||||
|
import org.jetbrains.kotlin.konan.properties.Properties
|
||||||
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
|
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
|
||||||
import com.github.triplet.gradle.androidpublisher.ReleaseStatus
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.android.application")
|
id("com.android.application")
|
||||||
@ -13,7 +13,6 @@ plugins {
|
|||||||
kotlin("plugin.serialization") version "1.9.20"
|
kotlin("plugin.serialization") version "1.9.20"
|
||||||
id("androidx.navigation.safeargs.kotlin")
|
id("androidx.navigation.safeargs.kotlin")
|
||||||
id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
|
id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
|
||||||
id("com.github.triplet.play") version "3.8.6"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -59,7 +58,15 @@ android {
|
|||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionName = getGitVersion()
|
versionName = getGitVersion()
|
||||||
|
|
||||||
versionCode = if (System.getenv("AUTO_VERSIONED") == "true") {
|
// If you want to use autoVersion for the versionCode, create a property in local.properties
|
||||||
|
// named "autoVersioned" and set it to "true"
|
||||||
|
val properties = Properties()
|
||||||
|
val versionProperty = try {
|
||||||
|
properties.load(project.rootProject.file("local.properties").inputStream())
|
||||||
|
properties.getProperty("autoVersioned") ?: ""
|
||||||
|
} catch (e: Exception) { "" }
|
||||||
|
|
||||||
|
versionCode = if (versionProperty == "true") {
|
||||||
autoVersion
|
autoVersion
|
||||||
} else {
|
} else {
|
||||||
1
|
1
|
||||||
@ -214,15 +221,6 @@ ktlint {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
play {
|
|
||||||
val keyPath = System.getenv("SERVICE_ACCOUNT_KEY_PATH")
|
|
||||||
if (keyPath != null) {
|
|
||||||
serviceAccountCredentials.set(File(keyPath))
|
|
||||||
}
|
|
||||||
track.set(System.getenv("STORE_TRACK") ?: "internal")
|
|
||||||
releaseStatus.set(ReleaseStatus.COMPLETED)
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("androidx.core:core-ktx:1.12.0")
|
implementation("androidx.core:core-ktx:1.12.0")
|
||||||
implementation("androidx.appcompat:appcompat:1.6.1")
|
implementation("androidx.appcompat:appcompat:1.6.1")
|
||||||
@ -259,13 +257,14 @@ fun runGitCommand(command: List<String>): String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun getGitVersion(): String {
|
fun getGitVersion(): String {
|
||||||
val gitVersion = runGitCommand(listOf("git", "describe", "--always", "--long"))
|
|
||||||
val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
|
val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
|
||||||
System.getenv("GIT_TAG_NAME") ?: gitVersion
|
val gitTag = System.getenv("GIT_TAG_NAME") ?: ""
|
||||||
|
gitTag
|
||||||
} else {
|
} else {
|
||||||
gitVersion
|
runGitCommand(listOf("git", "describe", "--always", "--long"))
|
||||||
|
.replace(Regex("(-0)?-[^-]+$"), "")
|
||||||
}
|
}
|
||||||
return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" }
|
return versionName.ifEmpty { "0.0" }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getGitHash(): String =
|
fun getGitHash(): String =
|
||||||
|
@ -532,7 +532,6 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
|
|||||||
cache_bytes = 0;
|
cache_bytes = 0;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
size_t old_vpage = (base_vaddress >> Memory::YUZU_PAGEBITS) - 1;
|
|
||||||
for (; page != page_end; ++page) {
|
for (; page != page_end; ++page) {
|
||||||
CounterAtomicType& count = cached_pages->at(page >> subentries_shift).Count(page);
|
CounterAtomicType& count = cached_pages->at(page >> subentries_shift).Count(page);
|
||||||
auto [asid_2, vpage] = ExtractCPUBacking(page);
|
auto [asid_2, vpage] = ExtractCPUBacking(page);
|
||||||
@ -548,12 +547,6 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
|
|||||||
memory_device_inter = registered_processes[asid_2.id];
|
memory_device_inter = registered_processes[asid_2.id];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vpage != old_vpage + 1) [[unlikely]] {
|
|
||||||
release_pending();
|
|
||||||
}
|
|
||||||
|
|
||||||
old_vpage = vpage;
|
|
||||||
|
|
||||||
// Adds or subtracts 1, as count is a unsigned 8-bit value
|
// Adds or subtracts 1, as count is a unsigned 8-bit value
|
||||||
count.fetch_add(static_cast<CounterType>(delta), std::memory_order_release);
|
count.fetch_add(static_cast<CounterType>(delta), std::memory_order_release);
|
||||||
|
|
||||||
|
@ -280,7 +280,7 @@ void ReadInArgument(bool is_domain, CallArguments& args, const u8* raw_data, HLE
|
|||||||
|
|
||||||
u32 value{};
|
u32 value{};
|
||||||
std::memcpy(&value, raw_data + ArgOffset, ArgSize);
|
std::memcpy(&value, raw_data + ArgOffset, ArgSize);
|
||||||
std::get<ArgIndex>(args) = ctx.GetDomainHandler<typename ArgType::element_type>(value - 1);
|
std::get<ArgIndex>(args) = ctx.GetDomainHandler<ArgType::Type>(value - 1);
|
||||||
|
|
||||||
return ReadInArgument<MethodArguments, CallArguments, ArgAlign, ArgEnd, HandleIndex, InBufferIndex, OutBufferIndex, true, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp);
|
return ReadInArgument<MethodArguments, CallArguments, ArgAlign, ArgEnd, HandleIndex, InBufferIndex, OutBufferIndex, true, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp);
|
||||||
} else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InCopyHandle) {
|
} else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InCopyHandle) {
|
||||||
|
@ -65,14 +65,6 @@ struct ClientProcessId {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct ProcessId {
|
struct ProcessId {
|
||||||
explicit ProcessId() : pid() {}
|
|
||||||
explicit ProcessId(u64 p) : pid(p) {}
|
|
||||||
/* implicit */ ProcessId(const ClientProcessId& c) : pid(c.pid) {}
|
|
||||||
|
|
||||||
bool operator==(const ProcessId& rhs) const {
|
|
||||||
return pid == rhs.pid;
|
|
||||||
}
|
|
||||||
|
|
||||||
explicit operator bool() const {
|
explicit operator bool() const {
|
||||||
return pid != 0;
|
return pid != 0;
|
||||||
}
|
}
|
||||||
@ -299,4 +291,4 @@ private:
|
|||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
} // namespace Service
|
} // namespace Service
|
@ -299,12 +299,8 @@ Result HLERequestContext::WriteToOutgoingCommandBuffer() {
|
|||||||
if (GetManager()->IsDomain()) {
|
if (GetManager()->IsDomain()) {
|
||||||
current_offset = domain_offset - static_cast<u32>(outgoing_domain_objects.size());
|
current_offset = domain_offset - static_cast<u32>(outgoing_domain_objects.size());
|
||||||
for (auto& object : outgoing_domain_objects) {
|
for (auto& object : outgoing_domain_objects) {
|
||||||
if (object) {
|
GetManager()->AppendDomainHandler(std::move(object));
|
||||||
GetManager()->AppendDomainHandler(std::move(object));
|
cmd_buf[current_offset++] = static_cast<u32_le>(GetManager()->DomainHandlerCount());
|
||||||
cmd_buf[current_offset++] = static_cast<u32_le>(GetManager()->DomainHandlerCount());
|
|
||||||
} else {
|
|
||||||
cmd_buf[current_offset++] = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
#include "common/hex_util.h"
|
#include "common/hex_util.h"
|
||||||
#include "common/microprofile.h"
|
#include "common/microprofile.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
#include "core/arm/debug.h"
|
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
#include "core/hle/kernel/k_page_table.h"
|
#include "core/hle/kernel/k_page_table.h"
|
||||||
@ -64,9 +63,7 @@ void StandardVmCallbacks::MemoryWriteUnsafe(VAddr address, const void* data, u64
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (system.ApplicationMemory().WriteBlock(address, data, size)) {
|
system.ApplicationMemory().WriteBlock(address, data, size);
|
||||||
Core::InvalidateInstructionCacheRange(system.ApplicationProcess(), address, size);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 StandardVmCallbacks::HidKeysDown() {
|
u64 StandardVmCallbacks::HidKeysDown() {
|
||||||
|
@ -32,14 +32,9 @@ struct Client::Impl {
|
|||||||
Impl(std::string host_, std::string username_, std::string token_)
|
Impl(std::string host_, std::string username_, std::string token_)
|
||||||
: host{std::move(host_)}, username{std::move(username_)}, token{std::move(token_)} {
|
: host{std::move(host_)}, username{std::move(username_)}, token{std::move(token_)} {
|
||||||
std::scoped_lock lock{jwt_cache.mutex};
|
std::scoped_lock lock{jwt_cache.mutex};
|
||||||
if (this->username == jwt_cache.username && this->token == jwt_cache.token) {
|
if (username == jwt_cache.username && token == jwt_cache.token) {
|
||||||
jwt = jwt_cache.jwt;
|
jwt = jwt_cache.jwt;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Normalize host expression
|
|
||||||
if (!this->host.empty() && this->host.back() == '/') {
|
|
||||||
static_cast<void>(this->host.pop_back());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A generic function handles POST, GET and DELETE request together
|
/// A generic function handles POST, GET and DELETE request together
|
||||||
@ -76,16 +71,18 @@ struct Client::Impl {
|
|||||||
const std::string& jwt_ = "", const std::string& username_ = "",
|
const std::string& jwt_ = "", const std::string& username_ = "",
|
||||||
const std::string& token_ = "") {
|
const std::string& token_ = "") {
|
||||||
if (cli == nullptr) {
|
if (cli == nullptr) {
|
||||||
cli = std::make_unique<httplib::Client>(host.c_str());
|
cli = std::make_unique<httplib::Client>(host);
|
||||||
cli->set_connection_timeout(TIMEOUT_SECONDS);
|
|
||||||
cli->set_read_timeout(TIMEOUT_SECONDS);
|
|
||||||
cli->set_write_timeout(TIMEOUT_SECONDS);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cli->is_valid()) {
|
if (!cli->is_valid()) {
|
||||||
LOG_ERROR(WebService, "Invalid URL {}", host + path);
|
LOG_ERROR(WebService, "Client is invalid, skipping request!");
|
||||||
return WebResult{WebResult::Code::InvalidURL, "Invalid URL", ""};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cli->set_connection_timeout(TIMEOUT_SECONDS);
|
||||||
|
cli->set_read_timeout(TIMEOUT_SECONDS);
|
||||||
|
cli->set_write_timeout(TIMEOUT_SECONDS);
|
||||||
|
|
||||||
httplib::Headers params;
|
httplib::Headers params;
|
||||||
if (!jwt_.empty()) {
|
if (!jwt_.empty()) {
|
||||||
params = {
|
params = {
|
||||||
@ -110,15 +107,15 @@ struct Client::Impl {
|
|||||||
request.headers = params;
|
request.headers = params;
|
||||||
request.body = data;
|
request.body = data;
|
||||||
|
|
||||||
httplib::Result result = cli->send(request);
|
httplib::Response response;
|
||||||
|
httplib::Error error;
|
||||||
|
|
||||||
if (!result) {
|
if (!cli->send(request, response, error)) {
|
||||||
LOG_ERROR(WebService, "{} to {} returned null", method, host + path);
|
LOG_ERROR(WebService, "{} to {} returned null (httplib Error: {})", method, host + path,
|
||||||
|
httplib::to_string(error));
|
||||||
return WebResult{WebResult::Code::LibError, "Null response", ""};
|
return WebResult{WebResult::Code::LibError, "Null response", ""};
|
||||||
}
|
}
|
||||||
|
|
||||||
httplib::Response response = result.value();
|
|
||||||
|
|
||||||
if (response.status >= 400) {
|
if (response.status >= 400) {
|
||||||
LOG_ERROR(WebService, "{} to {} returned error status code: {}", method, host + path,
|
LOG_ERROR(WebService, "{} to {} returned error status code: {}", method, host + path,
|
||||||
response.status);
|
response.status);
|
||||||
|
@ -45,23 +45,15 @@ ConfigureHotkeys::ConfigureHotkeys(Core::HID::HIDCore& hid_core, QWidget* parent
|
|||||||
|
|
||||||
controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
|
controller = hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1);
|
||||||
|
|
||||||
connect(timeout_timer.get(), &QTimer::timeout, [this] {
|
connect(timeout_timer.get(), &QTimer::timeout, [this] { SetPollingResult({}, true); });
|
||||||
const bool is_button_pressed = pressed_buttons != Core::HID::NpadButton::None ||
|
|
||||||
pressed_home_button || pressed_capture_button;
|
|
||||||
SetPollingResult(!is_button_pressed);
|
|
||||||
});
|
|
||||||
|
|
||||||
connect(poll_timer.get(), &QTimer::timeout, [this] {
|
connect(poll_timer.get(), &QTimer::timeout, [this] {
|
||||||
pressed_buttons |= controller->GetNpadButtons().raw;
|
const auto buttons = controller->GetNpadButtons();
|
||||||
pressed_home_button |= this->controller->GetHomeButtons().home != 0;
|
const auto home_pressed = controller->GetHomeButtons().home != 0;
|
||||||
pressed_capture_button |= this->controller->GetCaptureButtons().capture != 0;
|
const auto capture_pressed = controller->GetCaptureButtons().capture != 0;
|
||||||
if (pressed_buttons != Core::HID::NpadButton::None || pressed_home_button ||
|
if (home_pressed || capture_pressed) {
|
||||||
pressed_capture_button) {
|
SetPollingResult(buttons.raw, false);
|
||||||
const QString button_name =
|
return;
|
||||||
GetButtonCombinationName(pressed_buttons, pressed_home_button,
|
|
||||||
pressed_capture_button) +
|
|
||||||
QStringLiteral("...");
|
|
||||||
model->setData(button_model_index, button_name);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
RetranslateUI();
|
RetranslateUI();
|
||||||
@ -162,14 +154,16 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) {
|
|||||||
|
|
||||||
const auto previous_key = model->data(index);
|
const auto previous_key = model->data(index);
|
||||||
|
|
||||||
input_setter = [this, index, previous_key](const bool cancel) {
|
input_setter = [this, index, previous_key](const Core::HID::NpadButton button,
|
||||||
|
const bool cancel) {
|
||||||
if (cancel) {
|
if (cancel) {
|
||||||
model->setData(index, previous_key);
|
model->setData(index, previous_key);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const auto home_pressed = this->controller->GetHomeButtons().home != 0;
|
||||||
|
const auto capture_pressed = this->controller->GetCaptureButtons().capture != 0;
|
||||||
const QString button_string =
|
const QString button_string =
|
||||||
GetButtonCombinationName(pressed_buttons, pressed_home_button, pressed_capture_button);
|
GetButtonCombinationName(button, home_pressed, capture_pressed);
|
||||||
|
|
||||||
const auto [key_sequence_used, used_action] = IsUsedControllerKey(button_string);
|
const auto [key_sequence_used, used_action] = IsUsedControllerKey(button_string);
|
||||||
|
|
||||||
@ -183,22 +177,17 @@ void ConfigureHotkeys::ConfigureController(QModelIndex index) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
button_model_index = index;
|
|
||||||
pressed_buttons = Core::HID::NpadButton::None;
|
|
||||||
pressed_home_button = false;
|
|
||||||
pressed_capture_button = false;
|
|
||||||
|
|
||||||
model->setData(index, tr("[waiting]"));
|
model->setData(index, tr("[waiting]"));
|
||||||
timeout_timer->start(2500); // Cancel after 2.5 seconds
|
timeout_timer->start(2500); // Cancel after 2.5 seconds
|
||||||
poll_timer->start(100); // Check for new inputs every 100ms
|
poll_timer->start(200); // Check for new inputs every 200ms
|
||||||
// We need to disable configuration to be able to read npad buttons
|
// We need to disable configuration to be able to read npad buttons
|
||||||
controller->DisableConfiguration();
|
controller->DisableConfiguration();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureHotkeys::SetPollingResult(const bool cancel) {
|
void ConfigureHotkeys::SetPollingResult(Core::HID::NpadButton button, const bool cancel) {
|
||||||
timeout_timer->stop();
|
timeout_timer->stop();
|
||||||
poll_timer->stop();
|
poll_timer->stop();
|
||||||
(*input_setter)(cancel);
|
(*input_setter)(button, cancel);
|
||||||
// Re-Enable configuration
|
// Re-Enable configuration
|
||||||
controller->EnableConfiguration();
|
controller->EnableConfiguration();
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <QStandardItemModel>
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
||||||
@ -55,20 +54,14 @@ private:
|
|||||||
void RestoreControllerHotkey(QModelIndex index);
|
void RestoreControllerHotkey(QModelIndex index);
|
||||||
void RestoreHotkey(QModelIndex index);
|
void RestoreHotkey(QModelIndex index);
|
||||||
|
|
||||||
void SetPollingResult(bool cancel);
|
|
||||||
QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
|
|
||||||
|
|
||||||
std::unique_ptr<Ui::ConfigureHotkeys> ui;
|
std::unique_ptr<Ui::ConfigureHotkeys> ui;
|
||||||
|
|
||||||
QStandardItemModel* model;
|
QStandardItemModel* model;
|
||||||
|
|
||||||
bool pressed_home_button;
|
void SetPollingResult(Core::HID::NpadButton button, bool cancel);
|
||||||
bool pressed_capture_button;
|
QString GetButtonCombinationName(Core::HID::NpadButton button, bool home, bool capture) const;
|
||||||
QModelIndex button_model_index;
|
|
||||||
Core::HID::NpadButton pressed_buttons;
|
|
||||||
|
|
||||||
Core::HID::EmulatedController* controller;
|
Core::HID::EmulatedController* controller;
|
||||||
std::unique_ptr<QTimer> timeout_timer;
|
std::unique_ptr<QTimer> timeout_timer;
|
||||||
std::unique_ptr<QTimer> poll_timer;
|
std::unique_ptr<QTimer> poll_timer;
|
||||||
std::optional<std::function<void(bool)>> input_setter;
|
std::optional<std::function<void(Core::HID::NpadButton, bool)>> input_setter;
|
||||||
};
|
};
|
||||||
|
@ -248,22 +248,82 @@ void ConfigureUi::RetranslateUI() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureUi::InitializeLanguageComboBox() {
|
void ConfigureUi::InitializeLanguageComboBox() {
|
||||||
|
// This is a list of lexicographically sorted languages, only the available translations are
|
||||||
|
// shown to the user.
|
||||||
|
static const struct {
|
||||||
|
const QString name;
|
||||||
|
const char* id;
|
||||||
|
} languages[] = {
|
||||||
|
// clang-format off
|
||||||
|
{QStringLiteral(u"Bahasa Indonesia"), "id"}, // Indonesian
|
||||||
|
{QStringLiteral(u"Bahasa Melayu"), "ms"}, // Malay
|
||||||
|
{QStringLiteral(u"Catal\u00E0"), "ca"}, // Catalan
|
||||||
|
{QStringLiteral(u"\u010Ce\u0161tina"), "cs"}, // Czech
|
||||||
|
{QStringLiteral(u"Dansk"), "da"}, // Danish
|
||||||
|
{QStringLiteral(u"Deutsch"), "de"}, // German
|
||||||
|
{QStringLiteral(u"English"), "en"}, // English
|
||||||
|
{QStringLiteral(u"Espa\u00F1ol"), "es"}, // Spanish
|
||||||
|
{QStringLiteral(u"Fran\u00E7ais"), "fr"}, // French
|
||||||
|
{QStringLiteral(u"Hrvatski"), "hr"}, // Croatian
|
||||||
|
{QStringLiteral(u"Italiano"), "it"}, // Italian
|
||||||
|
{QStringLiteral(u"Magyar"), "hu"}, // Hungarian
|
||||||
|
{QStringLiteral(u"Nederlands"), "nl"}, // Dutch
|
||||||
|
{QStringLiteral(u"Norsk bokm\u00E5l"), "nb"}, // Norwegian
|
||||||
|
{QStringLiteral(u"Polski"), "pl"}, // Polish
|
||||||
|
{QStringLiteral(u"Portugu\u00EAs"), "pt_PT"}, // Portuguese
|
||||||
|
{QStringLiteral(u"Portugu\u00EAs (Brasil)"), "pt_BR"}, // Portuguese (Brazil)
|
||||||
|
{QStringLiteral(u"Rom\u00E2n\u0103"), "ro"}, // Romanian
|
||||||
|
{QStringLiteral(u"Srpski"), "sr"}, // Serbian
|
||||||
|
{QStringLiteral(u"Suomi"), "fi"}, // Finnish
|
||||||
|
{QStringLiteral(u"Svenska"), "sv"}, // Swedish
|
||||||
|
{QStringLiteral(u"Ti\u1EBFng Vi\u1EC7t"), "vi"}, // Vietnamese
|
||||||
|
{QStringLiteral(u"Ti\u1EBFng Vi\u1EC7t (Vi\u1EC7t Nam)"), "vi_VN"}, // Vietnamese
|
||||||
|
{QStringLiteral(u"T\u00FCrk\u00E7e"), "tr_TR"}, // Turkish
|
||||||
|
{QStringLiteral(u"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AC"), "el"}, // Greek
|
||||||
|
{QStringLiteral(u"\u0420\u0443\u0441\u0441\u043A\u0438\u0439"), "ru_RU"}, // Russian
|
||||||
|
{QStringLiteral(u"\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430"),
|
||||||
|
"uk"}, // Ukrainian
|
||||||
|
{QStringLiteral(u"\u0627\u0644\u0639\u0631\u0628\u064A\u0629"), "ar"}, // Arabic
|
||||||
|
{QStringLiteral(u"\u0641\u0627\u0631\u0633\u06CC"), "fa"}, // Farsi
|
||||||
|
{QStringLiteral(u"\uD55C\uAD6D\uC5B4"), "ko_KR"}, // Korean
|
||||||
|
{QStringLiteral(u"\u65E5\u672C\u8A9E"), "ja_JP"}, // Japanese
|
||||||
|
{QStringLiteral(u"\u7B80\u4F53\u4E2D\u6587"), "zh_CN"}, // Simplified Chinese
|
||||||
|
{QStringLiteral(u"\u7E41\u9AD4\u4E2D\u6587"), "zh_TW"}, // Traditional Chinese
|
||||||
|
// clang-format on
|
||||||
|
};
|
||||||
ui->language_combobox->addItem(tr("<System>"), QString{});
|
ui->language_combobox->addItem(tr("<System>"), QString{});
|
||||||
ui->language_combobox->addItem(tr("English"), QStringLiteral("en"));
|
QDir languages_dir{QStringLiteral(":/languages")};
|
||||||
QDirIterator it(QStringLiteral(":/languages"), QDirIterator::NoIteratorFlags);
|
QStringList language_files = languages_dir.entryList();
|
||||||
while (it.hasNext()) {
|
for (const auto& lang : languages) {
|
||||||
QString locale = it.next();
|
if (QString::fromLatin1(lang.id) == QStringLiteral("en")) {
|
||||||
|
ui->language_combobox->addItem(lang.name, QStringLiteral("en"));
|
||||||
|
language_files.removeOne(QStringLiteral("en.qm"));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < language_files.size(); ++i) {
|
||||||
|
QString locale = language_files[i];
|
||||||
|
locale.truncate(locale.lastIndexOf(QLatin1Char{'.'}));
|
||||||
|
if (QString::fromLatin1(lang.id) == locale) {
|
||||||
|
ui->language_combobox->addItem(lang.name, locale);
|
||||||
|
language_files.removeAt(i);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Anything remaining will be at the bottom
|
||||||
|
for (const QString& file : language_files) {
|
||||||
|
LOG_CRITICAL(Frontend, "Unexpected Language File: {}", file.toStdString());
|
||||||
|
QString locale = file;
|
||||||
locale.truncate(locale.lastIndexOf(QLatin1Char{'.'}));
|
locale.truncate(locale.lastIndexOf(QLatin1Char{'.'}));
|
||||||
locale.remove(0, locale.lastIndexOf(QLatin1Char{'/'}) + 1);
|
const QString language_name = QLocale::languageToString(QLocale(locale).language());
|
||||||
const QString lang = QLocale::languageToString(QLocale(locale).language());
|
const QString lang = QStringLiteral("%1 [%2]").arg(language_name, locale);
|
||||||
const QString country = QLocale::countryToString(QLocale(locale).country());
|
ui->language_combobox->addItem(lang, locale);
|
||||||
ui->language_combobox->addItem(QStringLiteral("%1 (%2)").arg(lang, country), locale);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unlike other configuration changes, interface language changes need to be reflected on the
|
// Unlike other configuration changes, interface language changes need to be reflected on the
|
||||||
// interface immediately. This is done by passing a signal to the main window, and then
|
// interface immediately. This is done by passing a signal to the main window, and then
|
||||||
// retranslating when passing back.
|
// retranslating when passing back.
|
||||||
connect(ui->language_combobox, qOverload<int>(&QComboBox::currentIndexChanged), this,
|
connect(ui->language_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
|
||||||
&ConfigureUi::OnLanguageChanged);
|
&ConfigureUi::OnLanguageChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,7 +193,8 @@ void ControllerShortcut::ControllerUpdateEvent(Core::HID::ControllerTriggerType
|
|||||||
if (!Settings::values.controller_navigation) {
|
if (!Settings::values.controller_navigation) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (button_sequence.npad.raw == Core::HID::NpadButton::None) {
|
if (button_sequence.npad.raw == Core::HID::NpadButton::None &&
|
||||||
|
button_sequence.capture.raw == 0 && button_sequence.home.raw == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user