From 8ed82712a05dbb6c127a7949072d358463411d90 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Sat, 12 Apr 2025 21:13:04 -0700 Subject: [PATCH 1/5] hotfix: Fix logo resolution in Qt UI. --- src/qt_gui/about_dialog.ui | 2 +- src/qt_gui/check_update.cpp | 2 +- src/shadps4.qrc | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qt_gui/about_dialog.ui b/src/qt_gui/about_dialog.ui index 3842513a5..804f0aea2 100644 --- a/src/qt_gui/about_dialog.ui +++ b/src/qt_gui/about_dialog.ui @@ -35,7 +35,7 @@ - :/images/shadps4.ico + :/images/shadps4.svg true diff --git a/src/qt_gui/check_update.cpp b/src/qt_gui/check_update.cpp index 7d3a42798..a823eedab 100644 --- a/src/qt_gui/check_update.cpp +++ b/src/qt_gui/check_update.cpp @@ -188,7 +188,7 @@ void CheckUpdate::setupUI(const QString& downloadUrl, const QString& latestDate, QHBoxLayout* titleLayout = new QHBoxLayout(); QLabel* imageLabel = new QLabel(this); - QPixmap pixmap(":/images/shadps4.ico"); + QPixmap pixmap(":/images/shadps4.svg"); imageLabel->setPixmap(pixmap); imageLabel->setScaledContents(true); imageLabel->setFixedSize(50, 50); diff --git a/src/shadps4.qrc b/src/shadps4.qrc index 83dea01c4..81a36af34 100644 --- a/src/shadps4.qrc +++ b/src/shadps4.qrc @@ -1,6 +1,7 @@ images/shadps4.ico + images/shadps4.svg images/about_icon.png images/dump_icon.png images/play_icon.png From 6c2574364b7d8907087759c2961d36859010ec43 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Sun, 13 Apr 2025 08:12:02 -0700 Subject: [PATCH 2/5] libraries: Reduce some controller log spam. (#2777) --- src/core/libraries/move/move.cpp | 8 +++++++- src/core/libraries/pad/pad.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core/libraries/move/move.cpp b/src/core/libraries/move/move.cpp index 626fed9b4..500d89586 100644 --- a/src/core/libraries/move/move.cpp +++ b/src/core/libraries/move/move.cpp @@ -9,7 +9,7 @@ namespace Libraries::Move { int PS4_SYSV_ABI sceMoveOpen() { - LOG_ERROR(Lib_Move, "(STUBBED) called"); + LOG_TRACE(Lib_Move, "(STUBBED) called"); return ORBIS_FAIL; } @@ -18,6 +18,11 @@ int PS4_SYSV_ABI sceMoveGetDeviceInfo() { return ORBIS_OK; } +int PS4_SYSV_ABI sceMoveReadStateLatest() { + LOG_TRACE(Lib_Move, "(STUBBED) called"); + return ORBIS_OK; +} + int PS4_SYSV_ABI sceMoveReadStateRecent() { LOG_TRACE(Lib_Move, "(STUBBED) called"); return ORBIS_OK; @@ -36,6 +41,7 @@ int PS4_SYSV_ABI sceMoveInit() { void RegisterlibSceMove(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("HzC60MfjJxU", "libSceMove", 1, "libSceMove", 1, 1, sceMoveOpen); LIB_FUNCTION("GWXTyxs4QbE", "libSceMove", 1, "libSceMove", 1, 1, sceMoveGetDeviceInfo); + LIB_FUNCTION("ttU+JOhShl4", "libSceMove", 1, "libSceMove", 1, 1, sceMoveReadStateLatest); LIB_FUNCTION("f2bcpK6kJfg", "libSceMove", 1, "libSceMove", 1, 1, sceMoveReadStateRecent); LIB_FUNCTION("tsZi60H4ypY", "libSceMove", 1, "libSceMove", 1, 1, sceMoveTerm); LIB_FUNCTION("j1ITE-EoJmE", "libSceMove", 1, "libSceMove", 1, 1, sceMoveInit); diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp index 2e5973144..5dfc68e90 100644 --- a/src/core/libraries/pad/pad.cpp +++ b/src/core/libraries/pad/pad.cpp @@ -250,7 +250,6 @@ int PS4_SYSV_ABI scePadMbusTerm() { } int PS4_SYSV_ABI scePadOpen(s32 userId, s32 type, s32 index, const OrbisPadOpenParam* pParam) { - LOG_INFO(Lib_Pad, "(DUMMY) called user_id = {} type = {} index = {}", userId, type, index); if (userId == -1) { return ORBIS_PAD_ERROR_DEVICE_NO_HANDLE; } @@ -261,6 +260,7 @@ int PS4_SYSV_ABI scePadOpen(s32 userId, s32 type, s32 index, const OrbisPadOpenP if (type != ORBIS_PAD_PORT_TYPE_STANDARD && type != ORBIS_PAD_PORT_TYPE_REMOTE_CONTROL) return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED; } + LOG_INFO(Lib_Pad, "(DUMMY) called user_id = {} type = {} index = {}", userId, type, index); scePadResetLightBar(1); return 1; // dummy } From aec6e330dc339de856deb77d8711caaad539928f Mon Sep 17 00:00:00 2001 From: Vinicius Rangel Date: Sun, 13 Apr 2025 13:27:20 -0300 Subject: [PATCH 3/5] Update ImGui submodule (#2779) * update imgui submodule * fix imgui breaking changes * update ffmpeg-core submodule --- externals/dear_imgui | 2 +- externals/ffmpeg-core | 2 +- src/core/devtools/widget/text_editor.cpp | 59 ++++++++++-------------- src/imgui/imgui_std.h | 4 +- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/externals/dear_imgui b/externals/dear_imgui index 636cd4a7d..f4d935909 160000 --- a/externals/dear_imgui +++ b/externals/dear_imgui @@ -1 +1 @@ -Subproject commit 636cd4a7d623a2bc9bf59bb3acbb4ca075befba3 +Subproject commit f4d9359095eff3eb03f685921edc1cf0e37b1687 diff --git a/externals/ffmpeg-core b/externals/ffmpeg-core index 42557a704..b0de1dcca 160000 --- a/externals/ffmpeg-core +++ b/externals/ffmpeg-core @@ -1 +1 @@ -Subproject commit 42557a704720d1b7d85c03bff0c2d369a61848da +Subproject commit b0de1dcca26c0ebfb8011b8e59dd17fc399db0ff diff --git a/src/core/devtools/widget/text_editor.cpp b/src/core/devtools/widget/text_editor.cpp index 7171cac47..12031d1ef 100644 --- a/src/core/devtools/widget/text_editor.cpp +++ b/src/core/devtools/widget/text_editor.cpp @@ -627,65 +627,56 @@ void TextEditor::HandleKeyboardInputs() { io.WantCaptureKeyboard = true; io.WantTextInput = true; - if (!IsReadOnly() && ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Z))) + if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Z)) Undo(); - else if (!IsReadOnly() && !ctrl && !shift && alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace))) + else if (!IsReadOnly() && !ctrl && !shift && alt && ImGui::IsKeyPressed(ImGuiKey_Backspace)) Undo(); - else if (!IsReadOnly() && ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Y))) + else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Y)) Redo(); - else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_UpArrow))) + else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_UpArrow)) MoveUp(1, shift); - else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_DownArrow))) + else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_DownArrow)) MoveDown(1, shift); - else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_LeftArrow))) + else if (!alt && ImGui::IsKeyPressed(ImGuiKey_LeftArrow)) MoveLeft(1, shift, ctrl); - else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_RightArrow))) + else if (!alt && ImGui::IsKeyPressed(ImGuiKey_RightArrow)) MoveRight(1, shift, ctrl); - else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_PageUp))) + else if (!alt && ImGui::IsKeyPressed(ImGuiKey_PageUp)) MoveUp(GetPageSize() - 4, shift); - else if (!alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_PageDown))) + else if (!alt && ImGui::IsKeyPressed(ImGuiKey_PageDown)) MoveDown(GetPageSize() - 4, shift); - else if (!alt && ctrl && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Home))) + else if (!alt && ctrl && ImGui::IsKeyPressed(ImGuiKey_Home)) MoveTop(shift); - else if (ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_End))) + else if (ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_End)) MoveBottom(shift); - else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Home))) + else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_Home)) MoveHome(shift); - else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_End))) + else if (!ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_End)) MoveEnd(shift); - else if (!IsReadOnly() && !ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) + else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Delete)) Delete(); else if (!IsReadOnly() && !ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Backspace))) + ImGui::IsKeyPressed(ImGuiKey_Backspace)) Backspace(); - else if (!ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert))) + else if (!ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Insert)) mOverwrite ^= true; - else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert))) + else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Insert)) Copy(); - else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_C))) + else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_C)) Copy(); - else if (!IsReadOnly() && !ctrl && shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Insert))) + else if (!IsReadOnly() && !ctrl && shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Insert)) Paste(); - else if (!IsReadOnly() && ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_V))) + else if (!IsReadOnly() && ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_V)) Paste(); - else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_X))) + else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_X)) Cut(); - else if (!ctrl && shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Delete))) + else if (!ctrl && shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Delete)) Cut(); - else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_A))) + else if (ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_A)) SelectAll(); - else if (!IsReadOnly() && !ctrl && !shift && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Enter))) + else if (!IsReadOnly() && !ctrl && !shift && !alt && ImGui::IsKeyPressed(ImGuiKey_Enter)) EnterCharacter('\n', false); - else if (!IsReadOnly() && !ctrl && !alt && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_Tab))) + else if (!IsReadOnly() && !ctrl && !alt && ImGui::IsKeyPressed(ImGuiKey_Tab)) EnterCharacter('\t', shift); if (!IsReadOnly() && !io.InputQueueCharacters.empty()) { diff --git a/src/imgui/imgui_std.h b/src/imgui/imgui_std.h index cd7208064..743702657 100644 --- a/src/imgui/imgui_std.h +++ b/src/imgui/imgui_std.h @@ -50,14 +50,14 @@ inline void KeepWindowInside(ImVec2 display_size = GetIO().DisplaySize) { } inline void KeepNavHighlight() { - GetCurrentContext()->NavDisableHighlight = false; + GetCurrentContext()->NavCursorVisible = true; } inline void SetItemCurrentNavFocus(const ImGuiID id = -1) { const auto ctx = GetCurrentContext(); SetFocusID(id == -1 ? ctx->LastItemData.ID : id, ctx->CurrentWindow); ctx->NavInitResult.Clear(); - ctx->NavDisableHighlight = false; + ctx->NavCursorVisible = true; } inline void DrawPrettyBackground() { From 14fad28a9bc3bbf68b53b0c63937c85bc1eafc2e Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Sun, 13 Apr 2025 12:10:24 -0700 Subject: [PATCH 4/5] misc: Few small fixes. (#2780) * qt: Use PNG file for logo. * build: Fix some CMake issues. --- CMakeLists.txt | 12 +++++------- REUSE.toml | 1 + src/images/shadps4.png | Bin 0 -> 35291 bytes src/qt_gui/about_dialog.ui | 2 +- src/qt_gui/check_update.cpp | 2 +- src/shadps4.qrc | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 src/images/shadps4.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 37492eeb3..63dc7b4c3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) if(APPLE) list(APPEND ADDITIONAL_LANGUAGES OBJC) # Starting with 15.4, Rosetta 2 has support for all the necessary instruction sets. - set(CMAKE_OSX_DEPLOYMENT_TARGET 15.4) + set(CMAKE_OSX_DEPLOYMENT_TARGET 15.4 CACHE STRING "") endif() if (NOT CMAKE_BUILD_TYPE) @@ -105,11 +105,8 @@ if (CLANG_FORMAT) unset(CCOMMENT) endif() -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - # generate git revision information -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/") -include(GetGitRevisionDescription) +include("${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules/GetGitRevisionDescription.cmake") get_git_head_revision(GIT_REF_SPEC GIT_REV) git_describe(GIT_DESC --always --long --dirty) git_branch_name(GIT_BRANCH) @@ -209,6 +206,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/common/scm_rev.cpp.in" "${CMAKE_ message("end git things, remote: ${GIT_REMOTE_NAME}, branch: ${GIT_BRANCH}") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(Boost 1.84.0 CONFIG) find_package(FFmpeg 5.1.2 MODULE) find_package(fmt 10.2.0 CONFIG) @@ -229,10 +227,10 @@ find_package(ZLIB 1.3 MODULE) find_package(Zydis 5.0.0 CONFIG) find_package(pugixml 1.14 CONFIG) find_package(libusb 1.0.27 MODULE) - if (APPLE) find_package(date 3.0.1 CONFIG) endif() +list(POP_BACK CMAKE_MODULE_PATH) # Note: Windows always has these functions through winpthreads include(CheckSymbolExists) @@ -1174,7 +1172,7 @@ target_include_directories(shadps4 PRIVATE ${HOST_SHADERS_INCLUDE}) # embed resources -include(CMakeRC) +include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMakeRC.cmake") cmrc_add_resource_library(embedded-resources ALIAS res::embedded NAMESPACE res diff --git a/REUSE.toml b/REUSE.toml index d17594e4d..662987611 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -57,6 +57,7 @@ path = [ "src/images/utils_icon.png", "src/images/shadPS4.icns", "src/images/shadps4.ico", + "src/images/shadps4.png", "src/images/net.shadps4.shadPS4.svg", "src/images/themes_icon.png", "src/images/update_icon.png", diff --git a/src/images/shadps4.png b/src/images/shadps4.png new file mode 100644 index 0000000000000000000000000000000000000000..037732e3b14d6a97574ce29956c703a6ce7089ac GIT binary patch literal 35291 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 i4Ok5|w_0000 - :/images/shadps4.svg + :/images/shadps4.png true diff --git a/src/qt_gui/check_update.cpp b/src/qt_gui/check_update.cpp index a823eedab..550fdddb5 100644 --- a/src/qt_gui/check_update.cpp +++ b/src/qt_gui/check_update.cpp @@ -188,7 +188,7 @@ void CheckUpdate::setupUI(const QString& downloadUrl, const QString& latestDate, QHBoxLayout* titleLayout = new QHBoxLayout(); QLabel* imageLabel = new QLabel(this); - QPixmap pixmap(":/images/shadps4.svg"); + QPixmap pixmap(":/images/shadps4.png"); imageLabel->setPixmap(pixmap); imageLabel->setScaledContents(true); imageLabel->setFixedSize(50, 50); diff --git a/src/shadps4.qrc b/src/shadps4.qrc index 81a36af34..2aee394c8 100644 --- a/src/shadps4.qrc +++ b/src/shadps4.qrc @@ -1,7 +1,7 @@ images/shadps4.ico - images/shadps4.svg + images/shadps4.png images/about_icon.png images/dump_icon.png images/play_icon.png From d188d14e197ccc05414106ad2d089701d039267d Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Sun, 13 Apr 2025 12:18:28 -0700 Subject: [PATCH 5/5] hotfix: Update discord-rpc to remove invasive macOS minimum linker flag. --- externals/discord-rpc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/discord-rpc b/externals/discord-rpc index d3b5af882..19f66e6dc 160000 --- a/externals/discord-rpc +++ b/externals/discord-rpc @@ -1 +1 @@ -Subproject commit d3b5af8827031f3bccbf8c15d5dc1bfdc9467f17 +Subproject commit 19f66e6dcabb2268965f453db9e5774ede43238f