cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solitary: fix check for config error (#11733)

Browse source 
Adds a blocker for solitary optimizations if there is a hyprerror present
This commit is contained in:
Vaxry 2025-09-17 14:03:49 +02:00 • committed by GitHub
parent 7fd6998f7c
commit 1cb8cd3930
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/debug/HyprCtl.cpp
View file

@ -111,13 +111,14 @@ static std::string availableModesForOutput(PHLMONITOR pMonitor, eHyprCtlOutputFo
} }
const std::array<const char*, CMonitor::SC_CHECKS_COUNT> SOLITARY_REASONS_JSON = { const std::array<const char*, CMonitor::SC_CHECKS_COUNT> SOLITARY_REASONS_JSON = {
"\"UNKNOWN\"", "\"NOTIFICATION\"", "\"LOCK\"", "\"WORKSPACE\"", "\"WINDOWED\"", "\"DND\"", "\"SPECIAL\"", "\"ALPHA\"", "\"UNKNOWN\"", "\"NOTIFICATION\"", "\"LOCK\"", "\"WORKSPACE\"", "\"WINDOWED\"", "\"DND\"", "\"SPECIAL\"", "\"ALPHA\"", "\"OFFSET\"",
"\"OFFSET\"", "\"CANDIDATE\"", "\"OPAQUE\"", "\"TRANSFORM\"", "\"OVERLAYS\"", "\"FLOAT\"", "\"WORKSPACES\"", "\"SURFACES\"", "\"CANDIDATE\"", "\"OPAQUE\"", "\"TRANSFORM\"", "\"OVERLAYS\"", "\"FLOAT\"", "\"WORKSPACES\"", "\"SURFACES\"", "\"CONFIGERROR\"",
}; };
const std::array<const char*, CMonitor::SC_CHECKS_COUNT> SOLITARY_REASONS_TEXT = { const std::array<const char*, CMonitor::SC_CHECKS_COUNT> SOLITARY_REASONS_TEXT = {
"unknown reason", "notification", "session lock", "invalid workspace", "windowed mode", "dnd active", "special workspace", "alpha channel", "unknown reason", "notification", "session lock", "invalid workspace", "windowed mode", "dnd active",
"workspace offset", "missing candidate", "not opaque", "surface transformations", "other overlays", "floating windows", "other workspaces", "subsurfaces", "special workspace", "alpha channel", "workspace offset", "missing candidate", "not opaque", "surface transformations",
"other overlays", "floating windows", "other workspaces", "subsurfaces", "config error",
}; };
std::string CHyprCtl::getSolitaryBlockedReason(Hyprutils::Memory::CSharedPointer<CMonitor> m, eHyprCtlOutputFormat format) { std::string CHyprCtl::getSolitaryBlockedReason(Hyprutils::Memory::CSharedPointer<CMonitor> m, eHyprCtlOutputFormat format) {
@ -128,7 +129,7 @@ std::string CHyprCtl::getSolitaryBlockedReason(Hyprutils::Memory::CSharedPointer
std::string reasonStr = ""; std::string reasonStr = "";
const auto TEXTS = format == eHyprCtlOutputFormat::FORMAT_JSON ? SOLITARY_REASONS_JSON : SOLITARY_REASONS_TEXT; const auto TEXTS = format == eHyprCtlOutputFormat::FORMAT_JSON ? SOLITARY_REASONS_JSON : SOLITARY_REASONS_TEXT;
for (int i = 0; i < CMonitor::SC_CHECKS_COUNT; i++) { for (uint32_t i = 0; i < CMonitor::SC_CHECKS_COUNT; i++) {
if (reasons & (1 << i)) { if (reasons & (1 << i)) {
if (reasonStr != "") if (reasonStr != "")
reasonStr += ","; reasonStr += ",";

11
src/helpers/Monitor.cpp
View file

@ -25,6 +25,7 @@
#include "../managers/animation/AnimationManager.hpp" #include "../managers/animation/AnimationManager.hpp"
#include "../managers/animation/DesktopAnimationManager.hpp" #include "../managers/animation/DesktopAnimationManager.hpp"
#include "../managers/input/InputManager.hpp" #include "../managers/input/InputManager.hpp"
#include "../hyprerror/HyprError.hpp"
#include "sync/SyncTimeline.hpp" #include "sync/SyncTimeline.hpp"
#include "time/Time.hpp" #include "time/Time.hpp"
#include "../desktop/LayerSurface.hpp" #include "../desktop/LayerSurface.hpp"
@ -1499,8 +1500,8 @@ void CMonitor::setCTM(const Mat3x3& ctm_) {
g_pCompositor->scheduleFrameForMonitor(m_self.lock(), Aquamarine::IOutput::scheduleFrameReason::AQ_SCHEDULE_NEEDS_FRAME); g_pCompositor->scheduleFrameForMonitor(m_self.lock(), Aquamarine::IOutput::scheduleFrameReason::AQ_SCHEDULE_NEEDS_FRAME);
} }
uint16_t CMonitor::isSolitaryBlocked(bool full) { uint32_t CMonitor::isSolitaryBlocked(bool full) {
uint16_t reasons = 0; uint32_t reasons = 0;
if (g_pHyprNotificationOverlay->hasAny()) { if (g_pHyprNotificationOverlay->hasAny()) {
reasons |= SC_NOTIFICATION; reasons |= SC_NOTIFICATION;
@ -1508,6 +1509,12 @@ uint16_t CMonitor::isSolitaryBlocked(bool full) {
return reasons; return reasons;
} }
if (g_pHyprError->active() && g_pCompositor->m_lastMonitor == m_self) {
reasons |= SC_ERRORBAR;
if (!full)
return reasons;
}
if (g_pSessionLockManager->isSessionLocked()) { if (g_pSessionLockManager->isSessionLocked()) {
reasons |= SC_LOCK; reasons |= SC_LOCK;
if (!full) if (!full)

7
src/helpers/Monitor.hpp
View file

@ -235,7 +235,7 @@ class CMonitor {
}; };
// keep in sync with HyprCtl // keep in sync with HyprCtl
enum eSolitaryCheck : uint16_t { enum eSolitaryCheck : uint32_t {
SC_OK = 0, SC_OK = 0,
SC_UNKNOWN = (1 << 0), SC_UNKNOWN = (1 << 0),
@ -254,8 +254,9 @@ class CMonitor {
SC_FLOAT = (1 << 13), SC_FLOAT = (1 << 13),
SC_WORKSPACES = (1 << 14), SC_WORKSPACES = (1 << 14),
SC_SURFACES = (1 << 15), SC_SURFACES = (1 << 15),
SC_ERRORBAR = (1 << 16),
SC_CHECKS_COUNT = 16, SC_CHECKS_COUNT = 17,
}; };
// keep in sync with HyprCtl // keep in sync with HyprCtl
@ -297,7 +298,7 @@ class CMonitor {
WORKSPACEID activeSpecialWorkspaceID(); WORKSPACEID activeSpecialWorkspaceID();
CBox logicalBox(); CBox logicalBox();
void scheduleDone(); void scheduleDone();
uint16_t isSolitaryBlocked(bool full = false); uint32_t isSolitaryBlocked(bool full = false);
void recheckSolitary(); void recheckSolitary();
uint8_t isTearingBlocked(bool full = false); uint8_t isTearingBlocked(bool full = false);
bool updateTearing(); bool updateTearing();