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

renderer: add mouse zoom animations (#10882)

Browse source 
Adds animations for the mouse zoom effect.
This commit is contained in:
aphelei 2025-07-01 11:33:48 +02:00 • committed by GitHub
parent e827b75e22
commit e9c5594186
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/config/ConfigManager.cpp
View file

@ -972,6 +972,7 @@ void CConfigManager::setDefaultAnimationVars() {
m_animationTree.createNode("border", "global"); m_animationTree.createNode("border", "global");
m_animationTree.createNode("borderangle", "global"); m_animationTree.createNode("borderangle", "global");
m_animationTree.createNode("workspaces", "global"); m_animationTree.createNode("workspaces", "global");
m_animationTree.createNode("zoomFactor", "global");
// layer // layer
m_animationTree.createNode("layersIn", "layers"); m_animationTree.createNode("layersIn", "layers");
@ -1129,8 +1130,11 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
w->uncacheWindowDecos(); w->uncacheWindowDecos();
} }
for (auto const& m : g_pCompositor->m_monitors) static auto PZOOMFACTOR = CConfigValue<Hyprlang::FLOAT>("cursor:zoom_factor");
for (auto const& m : g_pCompositor->m_monitors) {
*(m->m_cursorZoom) = *PZOOMFACTOR;
g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->m_id); g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->m_id);
}
// Update the keyboard layout to the cfg'd one if this is not the first launch // Update the keyboard layout to the cfg'd one if this is not the first launch
if (!m_isFirstLaunch) { if (!m_isFirstLaunch) {

2
src/debug/HyprCtl.cpp
View file

@ -1142,7 +1142,9 @@ static std::string dispatchKeyword(eHyprCtlOutputFormat format, std::string in)
// decorations will probably need a repaint // decorations will probably need a repaint
if (COMMAND.contains("decoration:") || COMMAND.contains("border") || COMMAND == "workspace" || COMMAND.contains("zoom_factor") || COMMAND == "source" || if (COMMAND.contains("decoration:") || COMMAND.contains("border") || COMMAND == "workspace" || COMMAND.contains("zoom_factor") || COMMAND == "source" ||
COMMAND.starts_with("windowrule")) { COMMAND.starts_with("windowrule")) {
static auto PZOOMFACTOR = CConfigValue<Hyprlang::FLOAT>("cursor:zoom_factor");
for (auto const& m : g_pCompositor->m_monitors) { for (auto const& m : g_pCompositor->m_monitors) {
*(m->m_cursorZoom) = *PZOOMFACTOR;
g_pHyprRenderer->damageMonitor(m); g_pHyprRenderer->damageMonitor(m);
g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->m_id); g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->m_id);
} }

9
src/helpers/Monitor.cpp
View file

@ -50,6 +50,9 @@ static int ratHandler(void* data) {
CMonitor::CMonitor(SP<Aquamarine::IOutput> output_) : m_state(this), m_output(output_) { CMonitor::CMonitor(SP<Aquamarine::IOutput> output_) : m_state(this), m_output(output_) {
g_pAnimationManager->createAnimation(0.f, m_specialFade, g_pConfigManager->getAnimationPropertyConfig("specialWorkspaceIn"), AVARDAMAGE_NONE); g_pAnimationManager->createAnimation(0.f, m_specialFade, g_pConfigManager->getAnimationPropertyConfig("specialWorkspaceIn"), AVARDAMAGE_NONE);
m_specialFade->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); }); m_specialFade->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); });
static auto PZOOMFACTOR = CConfigValue<Hyprlang::FLOAT>("cursor:zoom_factor");
g_pAnimationManager->createAnimation(*PZOOMFACTOR, m_cursorZoom, g_pConfigManager->getAnimationPropertyConfig("zoomFactor"), AVARDAMAGE_NONE);
m_cursorZoom->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); });
} }
CMonitor::~CMonitor() { CMonitor::~CMonitor() {
@ -917,8 +920,7 @@ bool CMonitor::applyMonitorRule(SMonitorRule* pMonitorRule, bool force) {
} }
void CMonitor::addDamage(const pixman_region32_t* rg) { void CMonitor::addDamage(const pixman_region32_t* rg) {
static auto PZOOMFACTOR = CConfigValue<Hyprlang::FLOAT>("cursor:zoom_factor"); if (m_cursorZoom->value() != 1.f && g_pCompositor->getMonitorFromCursor() == m_self) {
if (*PZOOMFACTOR != 1.f && g_pCompositor->getMonitorFromCursor() == m_self) {
m_damage.damageEntire(); m_damage.damageEntire();
g_pCompositor->scheduleFrameForMonitor(m_self.lock(), Aquamarine::IOutput::AQ_SCHEDULE_DAMAGE); g_pCompositor->scheduleFrameForMonitor(m_self.lock(), Aquamarine::IOutput::AQ_SCHEDULE_DAMAGE);
} else if (m_damage.damage(rg)) } else if (m_damage.damage(rg))
@ -930,8 +932,7 @@ void CMonitor::addDamage(const CRegion& rg) {
} }
void CMonitor::addDamage(const CBox& box) { void CMonitor::addDamage(const CBox& box) {
static auto PZOOMFACTOR = CConfigValue<Hyprlang::FLOAT>("cursor:zoom_factor"); if (m_cursorZoom->value() != 1.f && g_pCompositor->getMonitorFromCursor() == m_self) {
if (*PZOOMFACTOR != 1.f && g_pCompositor->getMonitorFromCursor() == m_self) {
m_damage.damageEntire(); m_damage.damageEntire();
g_pCompositor->scheduleFrameForMonitor(m_self.lock(), Aquamarine::IOutput::AQ_SCHEDULE_DAMAGE); g_pCompositor->scheduleFrameForMonitor(m_self.lock(), Aquamarine::IOutput::AQ_SCHEDULE_DAMAGE);
} }

2
src/helpers/Monitor.hpp
View file

@ -178,6 +178,8 @@ class CMonitor {
// for special fade/blur // for special fade/blur
PHLANIMVAR<float> m_specialFade; PHLANIMVAR<float> m_specialFade;
PHLANIMVAR<float> m_cursorZoom;
struct { struct {
bool canTear = false; bool canTear = false;
bool nextRenderTorn = false; bool nextRenderTorn = false;

2
src/managers/input/InputManager.cpp
View file

@ -213,7 +213,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus, bool mouse) {
if (PMONITOR == nullptr) if (PMONITOR == nullptr)
return; return;
if (*PZOOMFACTOR != 1.f) if (PMONITOR->m_cursorZoom->value() != 1.f)
g_pHyprRenderer->damageMonitor(PMONITOR); g_pHyprRenderer->damageMonitor(PMONITOR);
bool skipFrameSchedule = PMONITOR->shouldSkipScheduleFrameOnMouseEvent(); bool skipFrameSchedule = PMONITOR->shouldSkipScheduleFrameOnMouseEvent();

9
src/render/Renderer.cpp
View file

@ -1163,13 +1163,14 @@ void CHyprRenderer::renderMonitor(PHLMONITOR pMonitor) {
static auto PDAMAGEBLINK = CConfigValue<Hyprlang::INT>("debug:damage_blink"); static auto PDAMAGEBLINK = CConfigValue<Hyprlang::INT>("debug:damage_blink");
static auto PDIRECTSCANOUT = CConfigValue<Hyprlang::INT>("render:direct_scanout"); static auto PDIRECTSCANOUT = CConfigValue<Hyprlang::INT>("render:direct_scanout");
static auto PVFR = CConfigValue<Hyprlang::INT>("misc:vfr"); static auto PVFR = CConfigValue<Hyprlang::INT>("misc:vfr");
static auto PZOOMFACTOR = CConfigValue<Hyprlang::FLOAT>("cursor:zoom_factor");
static auto PANIMENABLED = CConfigValue<Hyprlang::INT>("animations:enabled"); static auto PANIMENABLED = CConfigValue<Hyprlang::INT>("animations:enabled");
static auto PFIRSTLAUNCHANIM = CConfigValue<Hyprlang::INT>("animations:first_launch_animation"); static auto PFIRSTLAUNCHANIM = CConfigValue<Hyprlang::INT>("animations:first_launch_animation");
static auto PTEARINGENABLED = CConfigValue<Hyprlang::INT>("general:allow_tearing"); static auto PTEARINGENABLED = CConfigValue<Hyprlang::INT>("general:allow_tearing");
static int damageBlinkCleanup = 0; // because double-buffered static int damageBlinkCleanup = 0; // because double-buffered
const float ZOOMFACTOR = pMonitor->m_cursorZoom->value();
if (pMonitor->m_pixelSize.x < 1 || pMonitor->m_pixelSize.y < 1) { if (pMonitor->m_pixelSize.x < 1 || pMonitor->m_pixelSize.y < 1) {
Debug::log(ERR, "Refusing to render a monitor because of an invalid pixel size: {}", pMonitor->m_pixelSize); Debug::log(ERR, "Refusing to render a monitor because of an invalid pixel size: {}", pMonitor->m_pixelSize);
return; return;
@ -1298,16 +1299,16 @@ void CHyprRenderer::renderMonitor(PHLMONITOR pMonitor) {
TRACY_GPU_ZONE("Render"); TRACY_GPU_ZONE("Render");
static bool zoomLock = false; static bool zoomLock = false;
if (zoomLock && *PZOOMFACTOR == 1.f) { if (zoomLock && ZOOMFACTOR == 1.f) {
g_pPointerManager->unlockSoftwareAll(); g_pPointerManager->unlockSoftwareAll();
zoomLock = false; zoomLock = false;
} else if (!zoomLock && *PZOOMFACTOR != 1.f) { } else if (!zoomLock && ZOOMFACTOR != 1.f) {
g_pPointerManager->lockSoftwareAll(); g_pPointerManager->lockSoftwareAll();
zoomLock = true; zoomLock = true;
} }
if (pMonitor == g_pCompositor->getMonitorFromCursor()) if (pMonitor == g_pCompositor->getMonitorFromCursor())
g_pHyprOpenGL->m_renderData.mouseZoomFactor = std::clamp(*PZOOMFACTOR, 1.f, INFINITY); g_pHyprOpenGL->m_renderData.mouseZoomFactor = std::clamp(ZOOMFACTOR, 1.f, INFINITY);
else else
g_pHyprOpenGL->m_renderData.mouseZoomFactor = 1.f; g_pHyprOpenGL->m_renderData.mouseZoomFactor = 1.f;