hyprwm
/
hyprlock
mirror of https://github.com/hyprwm/hyprlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: force update labels on `SIGUSR2` (#169) 

* core: force update labels on `SIGUSR2`

* allow 0ms and force
This commit is contained in:
bvr-yr 2024-03-11 00:38:01 +03:00 committed by GitHub
parent 0f44f76368
commit 066e0ae88f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/Timer.cpp
View File

@ -1,7 +1,8 @@
#include "Timer.hpp" #include "Timer.hpp"
CTimer::CTimer(std::chrono::system_clock::duration timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data_) : cb(cb_), data(data_) { CTimer::CTimer(std::chrono::system_clock::duration timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data_, bool force) : cb(cb_), data(data_) {
expires = std::chrono::system_clock::now() + timeout; expires = std::chrono::system_clock::now() + timeout;
allowForceUpdate = force;
} }
bool CTimer::passed() { bool CTimer::passed() {
@ -23,3 +24,7 @@ void CTimer::call(std::shared_ptr<CTimer> self) {
float CTimer::leftMs() { float CTimer::leftMs() {
return std::chrono::duration_cast<std::chrono::milliseconds>(expires - std::chrono::system_clock::now()).count(); return std::chrono::duration_cast<std::chrono::milliseconds>(expires - std::chrono::system_clock::now()).count();
} }
bool CTimer::canForceUpdate() {
return allowForceUpdate;
}

6
src/core/Timer.hpp
View File

@ -5,10 +5,11 @@
class CTimer { class CTimer {
public: public:
CTimer(std::chrono::system_clock::duration timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data_); CTimer(std::chrono::system_clock::duration timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data_, bool force);
void cancel(); void cancel();
bool passed(); bool passed();
bool canForceUpdate();
float leftMs(); float leftMs();
@ -19,5 +20,6 @@ class CTimer {
std::function<void(std::shared_ptr<CTimer> self, void* data)> cb; std::function<void(std::shared_ptr<CTimer> self, void* data)> cb;
void* data = nullptr; void* data = nullptr;
std::chrono::system_clock::time_point expires; std::chrono::system_clock::time_point expires;
bool wasCancelled = false; bool wasCancelled = false;
bool allowForceUpdate = false;
}; };

25
src/core/hyprlock.cpp
View File

@ -307,6 +307,17 @@ static void handleUnlockSignal(int sig) {
} }
} }
static void handleForceUpdateSignal(int sig) {
if (sig == SIGUSR2) {
for (auto& t : g_pHyprlock->getTimers()) {
if (t->canForceUpdate()) {
t->call(t);
t->cancel();
}
}
}
}
static void handlePollTerminate(int sig) { static void handlePollTerminate(int sig) {
; ;
} }
@ -355,7 +366,8 @@ void CHyprlock::run() {
lockSession(); lockSession();
registerSignalAction(SIGUSR1, handleUnlockSignal, SA_RESTART); registerSignalAction(SIGUSR1, handleUnlockSignal, SA_RESTART);
registerSignalAction(SIGUSR2, handlePollTerminate); registerSignalAction(SIGUSR2, handleForceUpdateSignal);
registerSignalAction(SIGRTMIN, handlePollTerminate);
registerSignalAction(SIGSEGV, handleCriticalSignal); registerSignalAction(SIGSEGV, handleCriticalSignal);
registerSignalAction(SIGABRT, handleCriticalSignal); registerSignalAction(SIGABRT, handleCriticalSignal);
@ -493,7 +505,7 @@ void CHyprlock::run() {
wl_display_disconnect(m_sWaylandState.display); wl_display_disconnect(m_sWaylandState.display);
pthread_kill(pollThr.native_handle(), SIGUSR2); pthread_kill(pollThr.native_handle(), SIGRTMIN);
// wait for threads to exit cleanly to avoid a coredump // wait for threads to exit cleanly to avoid a coredump
pollThr.join(); pollThr.join();
@ -834,14 +846,19 @@ size_t CHyprlock::getPasswordFailedAttempts() {
return m_sPasswordState.failedAttempts; return m_sPasswordState.failedAttempts;
} }
std::shared_ptr<CTimer> CHyprlock::addTimer(const std::chrono::system_clock::duration& timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data) { std::shared_ptr<CTimer> CHyprlock::addTimer(const std::chrono::system_clock::duration& timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data,
bool force) {
std::lock_guard<std::mutex> lg(m_sLoopState.timersMutex); std::lock_guard<std::mutex> lg(m_sLoopState.timersMutex);
const auto T = m_vTimers.emplace_back(std::make_shared<CTimer>(timeout, cb_, data)); const auto T = m_vTimers.emplace_back(std::make_shared<CTimer>(timeout, cb_, data, force));
m_sLoopState.timerEvent = true; m_sLoopState.timerEvent = true;
m_sLoopState.timerCV.notify_all(); m_sLoopState.timerCV.notify_all();
return T; return T;
} }
std::vector<std::shared_ptr<CTimer>> CHyprlock::getTimers() {
return m_vTimers;
}
void CHyprlock::spawnAsync(const std::string& args) { void CHyprlock::spawnAsync(const std::string& args) {
Debug::log(LOG, "Executing (async) {}", args); Debug::log(LOG, "Executing (async) {}", args);

4
src/core/hyprlock.hpp
View File

@ -35,7 +35,8 @@ class CHyprlock {
void onGlobal(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version); void onGlobal(void* data, struct wl_registry* registry, uint32_t name, const char* interface, uint32_t version);
void onGlobalRemoved(void* data, struct wl_registry* registry, uint32_t name); void onGlobalRemoved(void* data, struct wl_registry* registry, uint32_t name);
std::shared_ptr<CTimer> addTimer(const std::chrono::system_clock::duration& timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data); std::shared_ptr<CTimer> addTimer(const std::chrono::system_clock::duration& timeout, std::function<void(std::shared_ptr<CTimer> self, void* data)> cb_, void* data,
bool force = false);
void onLockLocked(); void onLockLocked();
void onLockFinished(); void onLockFinished();
@ -83,6 +84,7 @@ class CHyprlock {
Vector2D m_vLastEnterCoords = {}; Vector2D m_vLastEnterCoords = {};
std::vector<std::unique_ptr<COutput>> m_vOutputs; std::vector<std::unique_ptr<COutput>> m_vOutputs;
std::vector<std::shared_ptr<CTimer>> getTimers();
struct { struct {
void* linuxDmabuf = nullptr; void* linuxDmabuf = nullptr;

5
src/renderer/widgets/IWidget.cpp
View File

@ -79,6 +79,11 @@ IWidget::SFormatResult IWidget::formatString(std::string in) {
for (const auto& v : vars) { for (const auto& v : vars) {
if (v.starts_with("update:")) { if (v.starts_with("update:")) {
try { try {
if (v.substr(7).contains(':')) {
auto str = v.substr(v.substr(7).find_first_of(':') + 8);
result.allowForceUpdate = str == "true" || std::stoull(str) == 1;
}
result.updateEveryMs = std::stoull(v.substr(7)); result.updateEveryMs = std::stoull(v.substr(7));
} catch (std::exception& e) { Debug::log(ERR, "Error parsing {} in cmd[]", v); } } catch (std::exception& e) { Debug::log(ERR, "Error parsing {} in cmd[]", v); }
} else { } else {

7
src/renderer/widgets/IWidget.hpp
View File

@ -15,9 +15,10 @@ class IWidget {
struct SFormatResult { struct SFormatResult {
std::string formatted; std::string formatted;
float updateEveryMs = 0; // 0 means don't (static) float updateEveryMs = 0; // 0 means don't (static)
bool alwaysUpdate = false; bool alwaysUpdate = false;
bool cmd = false; bool cmd = false;
bool allowForceUpdate = false;
}; };
virtual SFormatResult formatString(std::string in); virtual SFormatResult formatString(std::string in);

4
src/renderer/widgets/Label.cpp
View File

@ -53,7 +53,9 @@ void CLabel::onTimerUpdate() {
void CLabel::plantTimer() { void CLabel::plantTimer() {
if (label.updateEveryMs != 0) if (label.updateEveryMs != 0)
labelTimer = g_pHyprlock->addTimer(std::chrono::milliseconds((int)label.updateEveryMs), onTimer, this); labelTimer = g_pHyprlock->addTimer(std::chrono::milliseconds((int)label.updateEveryMs), onTimer, this, label.allowForceUpdate);
else if (label.updateEveryMs == 0 && label.allowForceUpdate)
labelTimer = g_pHyprlock->addTimer(std::chrono::hours(1), onTimer, this, true);
} }
CLabel::CLabel(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props, const std::string& output) : CLabel::CLabel(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props, const std::string& output) :