renderer: asynchronously load background tex (#11749)
Bumps required hyprgraphics to 0.1.6 --------- Co-authored-by: Mihai Fufezan <mihai@fufexan.net>
This commit is contained in:
parent
91f592a875
commit
4fc95d646d
16 changed files with 252 additions and 87 deletions
47
src/helpers/MainLoopExecutor.cpp
Normal file
47
src/helpers/MainLoopExecutor.cpp
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
#include "MainLoopExecutor.hpp"
|
||||
#include "../managers/eventLoop/EventLoopManager.hpp"
|
||||
#include "../macros.hpp"
|
||||
|
||||
static int onDataRead(int fd, uint32_t mask, void* data) {
|
||||
((CMainLoopExecutor*)data)->onFired();
|
||||
return 0;
|
||||
}
|
||||
|
||||
CMainLoopExecutor::CMainLoopExecutor(std::function<void()>&& callback) : m_fn(std::move(callback)) {
|
||||
|
||||
int fds[2];
|
||||
pipe(fds);
|
||||
|
||||
RASSERT(fds[0] != 0, "CMainLoopExecutor: failed to open a pipe");
|
||||
RASSERT(fds[1] != 0, "CMainLoopExecutor: failed to open a pipe");
|
||||
|
||||
m_event = wl_event_loop_add_fd(g_pEventLoopManager->m_wayland.loop, fds[0], WL_EVENT_READABLE, ::onDataRead, this);
|
||||
|
||||
m_readFd = Hyprutils::OS::CFileDescriptor(fds[0]);
|
||||
m_writeFd = Hyprutils::OS::CFileDescriptor(fds[1]);
|
||||
}
|
||||
|
||||
CMainLoopExecutor::~CMainLoopExecutor() {
|
||||
if (m_event) // FIXME: potential race in case of a weird destroy on a worker thread
|
||||
wl_event_source_remove(m_event);
|
||||
}
|
||||
|
||||
void CMainLoopExecutor::signal() {
|
||||
const char* amogus = "h";
|
||||
write(m_writeFd.get(), amogus, 1);
|
||||
}
|
||||
|
||||
void CMainLoopExecutor::onFired() {
|
||||
if (!m_fn)
|
||||
return;
|
||||
|
||||
m_fn();
|
||||
m_fn = nullptr;
|
||||
|
||||
// we need to remove the event here because we're on the main thread
|
||||
wl_event_source_remove(m_event);
|
||||
m_event = nullptr;
|
||||
|
||||
m_readFd.reset();
|
||||
m_writeFd.reset();
|
||||
}
|
||||
31
src/helpers/MainLoopExecutor.hpp
Normal file
31
src/helpers/MainLoopExecutor.hpp
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
#pragma once
|
||||
|
||||
#include <functional>
|
||||
#include <hyprutils/os/FileDescriptor.hpp>
|
||||
#include <wayland-server-core.h>
|
||||
|
||||
class CMainLoopExecutor {
|
||||
public:
|
||||
/*
|
||||
MainLoopExecutor
|
||||
|
||||
Executes a function on the main thread once the writeFd() has some data written to it,
|
||||
then destroys itself.
|
||||
|
||||
Needs to be kept owned, otherwise will die and kill the fds.
|
||||
*/
|
||||
|
||||
CMainLoopExecutor(std::function<void()>&& callback);
|
||||
~CMainLoopExecutor();
|
||||
|
||||
// Call from your worker thread: signals to the main thread. Destroy afterwards.
|
||||
void signal();
|
||||
|
||||
// do not call
|
||||
void onFired();
|
||||
|
||||
private:
|
||||
Hyprutils::OS::CFileDescriptor m_readFd, m_writeFd;
|
||||
wl_event_source* m_event = nullptr;
|
||||
std::function<void()> m_fn;
|
||||
};
|
||||
|
|
@ -55,6 +55,8 @@ CMonitor::CMonitor(SP<Aquamarine::IOutput> output_) : m_state(this), m_output(ou
|
|||
m_cursorZoom->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); });
|
||||
g_pAnimationManager->createAnimation(0.F, m_zoomAnimProgress, g_pConfigManager->getAnimationPropertyConfig("monitorAdded"), AVARDAMAGE_NONE);
|
||||
m_zoomAnimProgress->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); });
|
||||
g_pAnimationManager->createAnimation(0.F, m_backgroundOpacity, g_pConfigManager->getAnimationPropertyConfig("monitorAdded"), AVARDAMAGE_NONE);
|
||||
m_backgroundOpacity->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); });
|
||||
g_pAnimationManager->createAnimation(0.F, m_dpmsBlackOpacity, g_pConfigManager->getAnimationPropertyConfig("fadeDpms"), AVARDAMAGE_NONE);
|
||||
m_dpmsBlackOpacity->setUpdateCallback([this](auto) { g_pHyprRenderer->damageMonitor(m_self.lock()); });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -188,6 +188,9 @@ class CMonitor {
|
|||
|
||||
PHLANIMVAR<float> m_cursorZoom;
|
||||
|
||||
// for fading in the wallpaper because it doesn't happen instantly (it's loaded async)
|
||||
PHLANIMVAR<float> m_backgroundOpacity;
|
||||
|
||||
// for initial zoom anim
|
||||
PHLANIMVAR<float> m_zoomAnimProgress;
|
||||
CTimer m_newMonitorAnimTimer;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <hyprutils/memory/WeakPtr.hpp>
|
||||
#include <hyprutils/memory/Atomic.hpp>
|
||||
|
||||
using namespace Hyprutils::Memory;
|
||||
|
||||
|
|
@ -10,3 +11,5 @@ template <typename T>
|
|||
using WP = Hyprutils::Memory::CWeakPointer<T>;
|
||||
template <typename T>
|
||||
using UP = Hyprutils::Memory::CUniquePointer<T>;
|
||||
template <typename T>
|
||||
using ASP = Hyprutils::Memory::CAtomicSharedPointer<T>;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue