forked from PrismLauncher/PrismLauncher
-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'PrismLauncher:develop' into develop
- Loading branch information
Showing
171 changed files
with
2,699 additions
and
1,937 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,14 +59,14 @@ jobs: | |
| qt_ver: 5 | ||
| qt_host: linux | ||
| qt_arch: "" | ||
| qt_version: "5.12.8" | ||
| qt_version: "5.15.2" | ||
| qt_modules: "qtnetworkauth" | ||
|
|
||
| - os: ubuntu-20.04 | ||
| qt_ver: 6 | ||
| qt_host: linux | ||
| qt_arch: "" | ||
| qt_version: "6.2.4" | ||
| qt_version: "6.5.3" | ||
| qt_modules: "qt5compat qtimageformats qtnetworkauth" | ||
|
|
||
| - os: windows-2022 | ||
|
|
@@ -173,7 +173,7 @@ jobs: | |
|
|
||
| - name: Retrieve ccache cache (Windows MinGW-w64) | ||
| if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug' | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].2 | ||
| with: | ||
| path: '${{ github.workspace }}\.ccache' | ||
| key: ${{ matrix.os }}-mingw-w64-ccache-${{ github.run_id }} | ||
|
|
@@ -206,7 +206,7 @@ jobs: | |
| if: runner.os == 'Linux' | ||
| run: | | ||
| sudo apt-get -y update | ||
| sudo apt-get -y install ninja-build extra-cmake-modules scdoc appstream | ||
| sudo apt-get -y install ninja-build extra-cmake-modules scdoc appstream libxcb-cursor-dev | ||
| - name: Install Dependencies (macOS) | ||
| if: runner.os == 'macOS' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "name": "flite", | ||
| "config-opts": [ | ||
| "--enable-shared", | ||
| "--with-audio=pulseaudio" | ||
| ], | ||
| "no-parallel-make": true, | ||
| "sources": [ | ||
| { | ||
| "type": "git", | ||
| "url": "https://github.com/festvox/flite.git", | ||
| "tag": "v2.2", | ||
| "commit": "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88", | ||
| "x-checker-data": { | ||
| "type": "git", | ||
| "tag-pattern": "^v([\\d.]+)$" | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,18 @@ | ||
| { | ||
| "name": "libdecor", | ||
| "buildsystem": "meson", | ||
| "config-opts": [ | ||
| "-Ddemo=false" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "type": "git", | ||
| "url": "https://gitlab.freedesktop.org/libdecor/libdecor.git", | ||
| "commit": "73260393a97291c887e1074ab7f318e031be0ac6" | ||
| }, | ||
| { | ||
| "type": "patch", | ||
| "path": "patches/weird_libdecor.patch" | ||
| } | ||
| ], | ||
| "cleanup": [ | ||
| "/include", | ||
| "/lib/pkgconfig" | ||
| ] | ||
| "name": "libdecor", | ||
| "buildsystem": "meson", | ||
| "config-opts": [ | ||
| "-Ddemo=false" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "type": "git", | ||
| "url": "https://gitlab.freedesktop.org/libdecor/libdecor.git", | ||
| "commit": "c2bd8ad6fa42c0cb17553ce77ad8a87d1f543b1f" | ||
| } | ||
| ], | ||
| "cleanup": [ | ||
| "/include", | ||
| "/lib/pkgconfig" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 0 additions & 24 deletions
24
flatpak/patches/0003-Don-t-crash-on-calls-to-focus-or-icon.patch
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
flatpak/patches/0005-Add-warning-about-being-an-unofficial-patch.patch
This file was deleted.
Oops, something went wrong.
20 changes: 0 additions & 20 deletions
20
flatpak/patches/0007-Platform-Prefer-Wayland-over-X11.patch
This file was deleted.
Oops, something went wrong.
59 changes: 59 additions & 0 deletions
59
flatpak/patches/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001 | ||
| From: Dan Klishch <[email protected]> | ||
| Date: Sat, 30 Sep 2023 23:38:05 -0400 | ||
| Subject: Defer setting cursor position until the cursor is locked | ||
|
|
||
| --- | ||
| src/wl_platform.h | 3 +++ | ||
| src/wl_window.c | 14 ++++++++++++-- | ||
| 2 files changed, 15 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/src/wl_platform.h b/src/wl_platform.h | ||
| index ca34f66e..cd1f227f 100644 | ||
| --- a/src/wl_platform.h | ||
| +++ b/src/wl_platform.h | ||
| @@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland | ||
| int scaleSize; | ||
| int compositorPreferredScale; | ||
|
|
||
| + double askedCursorPosX, askedCursorPosY; | ||
| + GLFWbool didAskForSetCursorPos; | ||
| + | ||
| struct zwp_relative_pointer_v1* relativePointer; | ||
| struct zwp_locked_pointer_v1* lockedPointer; | ||
| struct zwp_confined_pointer_v1* confinedPointer; | ||
| diff --git a/src/wl_window.c b/src/wl_window.c | ||
| index 1de26558..0df16747 100644 | ||
| --- a/src/wl_window.c | ||
| +++ b/src/wl_window.c | ||
| @@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos) | ||
|
|
||
| void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y) | ||
| { | ||
| - _glfwInputError(GLFW_FEATURE_UNAVAILABLE, | ||
| - "Wayland: The platform does not support setting the cursor position"); | ||
| + window->wl.didAskForSetCursorPos = true; | ||
| + window->wl.askedCursorPosX = x; | ||
| + window->wl.askedCursorPosY = y; | ||
| } | ||
|
|
||
| void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode) | ||
| @@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener = | ||
| static void lockedPointerHandleLocked(void* userData, | ||
| struct zwp_locked_pointer_v1* lockedPointer) | ||
| { | ||
| + _GLFWwindow* window = userData; | ||
| + | ||
| + if (window->wl.didAskForSetCursorPos) | ||
| + { | ||
| + window->wl.didAskForSetCursorPos = false; | ||
| + zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer, | ||
| + wl_fixed_from_double(window->wl.askedCursorPosX), | ||
| + wl_fixed_from_double(window->wl.askedCursorPosY)); | ||
| + } | ||
| } | ||
|
|
||
| static void lockedPointerHandleUnlocked(void* userData, | ||
| -- | ||
| 2.42.0 | ||
|
|
Oops, something went wrong.