Skip to content

Commit 6a8b161

Browse files
PointerDilemmaPointerDilemma
committed
core: move fail_timeout from input-field to general
1 parent f883e66 commit 6a8b161

File tree

6 files changed

+38
-22
lines changed

6 files changed

+38
-22
lines changed

‎src/auth/Auth.cpp‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ void CAuth::terminate() {
7676
}
7777
}
7878

79+
static void passwordUnlockCallback(std::shared_ptr<CTimer> self, void* data) {
80+
g_pHyprlock->unlock();
81+
}
82+
83+
void CAuth::enqueueUnlock() {
84+
g_pHyprlock->addTimer(std::chrono::milliseconds(0), passwordUnlockCallback, nullptr);
85+
}
86+
7987
static void passwordFailCallback(std::shared_ptr<CTimer> self, void* data) {
8088
g_pAuth->m_bDisplayFailText = true;
8189

@@ -84,20 +92,33 @@ static void passwordFailCallback(std::shared_ptr<CTimer> self, void* data) {
8492
g_pHyprlock->renderAllOutputs();
8593
}
8694

87-
static void passwordUnlockCallback(std::shared_ptr<CTimer> self, void* data) {
88-
g_pHyprlock->unlock();
95+
static void displayFailTimeoutCallback(std::shared_ptr<CTimer> self, void* data) {
96+
if (g_pAuth->m_bDisplayFailText) {
97+
g_pAuth->m_bDisplayFailText = false;
98+
g_pHyprlock->renderAllOutputs();
99+
}
89100
}
90101

91102
void CAuth::enqueueFail(const std::string& failText, eAuthImplementations implType) {
103+
const auto FAILTIMEOUT = g_pConfigManager->getValue<Hyprlang::INT>("auth:fail_timeout");
104+
92105
m_sCurrentFail.failText = failText;
93106
m_sCurrentFail.failSource = implType;
94107
m_sCurrentFail.failedAttempts++;
95108

96109
Debug::log(LOG, "Failed attempts: {}", m_sCurrentFail.failedAttempts);
97110

111+
if (m_resetDisplayFailTimer) {
112+
m_resetDisplayFailTimer->cancel();
113+
m_resetDisplayFailTimer.reset();
114+
}
115+
98116
g_pHyprlock->addTimer(std::chrono::milliseconds(0), passwordFailCallback, nullptr);
117+
m_resetDisplayFailTimer = g_pHyprlock->addTimer(std::chrono::milliseconds(*FAILTIMEOUT), displayFailTimeoutCallback, nullptr);
99118
}
100119

101-
void CAuth::enqueueUnlock() {
102-
g_pHyprlock->addTimer(std::chrono::milliseconds(0), passwordUnlockCallback, nullptr);
120+
void CAuth::resetDisplayFail() {
121+
g_pAuth->m_bDisplayFailText = false;
122+
m_resetDisplayFailTimer->cancel();
123+
m_resetDisplayFailTimer.reset();
103124
}

‎src/auth/Auth.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <vector>
55

66
#include "../defines.hpp"
7+
#include "../core/Timer.hpp"
78

89
enum eAuthImplementations {
910
AUTH_IMPL_PAM = 0,
@@ -47,6 +48,8 @@ class CAuth {
4748
void enqueueUnlock();
4849
void enqueueFail(const std::string& failText, eAuthImplementations implType);
4950

51+
void resetDisplayFail();
52+
5053
// Should only be set via the main thread
5154
bool m_bDisplayFailText = false;
5255

@@ -58,6 +61,7 @@ class CAuth {
5861
} m_sCurrentFail;
5962

6063
std::vector<SP<IAuthImplementation>> m_vImpls;
64+
std::shared_ptr<CTimer> m_resetDisplayFailTimer;
6165
};
6266

6367
inline UP<CAuth> g_pAuth;

‎src/config/ConfigManager.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ void CConfigManager::init() {
218218
m_config.addConfigValue("general:fractional_scaling", Hyprlang::INT{2});
219219
m_config.addConfigValue("general:screencopy_mode", Hyprlang::INT{0});
220220

221+
m_config.addConfigValue("auth:fail_timeout", Hyprlang::INT{2000});
221222
m_config.addConfigValue("auth:pam:enabled", Hyprlang::INT{1});
222223
m_config.addConfigValue("auth:pam:module", Hyprlang::STRING{"hyprlock"});
223224
m_config.addConfigValue("auth:fingerprint:enabled", Hyprlang::INT{0});
@@ -298,7 +299,6 @@ void CConfigManager::init() {
298299
m_config.addSpecialConfigValue("input-field", "check_color", GRADIENTCONFIG("0xFF22CC88"));
299300
m_config.addSpecialConfigValue("input-field", "fail_color", GRADIENTCONFIG("0xFFCC2222"));
300301
m_config.addSpecialConfigValue("input-field", "fail_text", Hyprlang::STRING{"<i>$FAIL</i>"});
301-
m_config.addSpecialConfigValue("input-field", "fail_timeout", Hyprlang::INT{2000});
302302
m_config.addSpecialConfigValue("input-field", "capslock_color", GRADIENTCONFIG(""));
303303
m_config.addSpecialConfigValue("input-field", "numlock_color", GRADIENTCONFIG(""));
304304
m_config.addSpecialConfigValue("input-field", "bothlock_color", GRADIENTCONFIG(""));
@@ -474,7 +474,6 @@ std::vector<CConfigManager::SWidgetConfig> CConfigManager::getWidgetConfigs() {
474474
{"check_color", m_config.getSpecialConfigValue("input-field", "check_color", k.c_str())},
475475
{"fail_color", m_config.getSpecialConfigValue("input-field", "fail_color", k.c_str())},
476476
{"fail_text", m_config.getSpecialConfigValue("input-field", "fail_text", k.c_str())},
477-
{"fail_timeout", m_config.getSpecialConfigValue("input-field", "fail_timeout", k.c_str())},
478477
{"capslock_color", m_config.getSpecialConfigValue("input-field", "capslock_color", k.c_str())},
479478
{"numlock_color", m_config.getSpecialConfigValue("input-field", "numlock_color", k.c_str())},
480479
{"bothlock_color", m_config.getSpecialConfigValue("input-field", "bothlock_color", k.c_str())},

‎src/core/hyprlock.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,9 @@ void CHyprlock::onKey(uint32_t key, bool down) {
636636
return;
637637
}
638638

639+
if (g_pAuth->m_bDisplayFailText)
640+
g_pAuth->resetDisplayFail();
641+
639642
if (down) {
640643
m_bCapsLock = xkb_state_mod_name_is_active(g_pSeatManager->m_pXKBState, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_LOCKED);
641644
m_bNumLock = xkb_state_mod_name_is_active(g_pSeatManager->m_pXKBState, XKB_MOD_NAME_NUM, XKB_STATE_MODS_LOCKED);

‎src/renderer/widgets/PasswordInputField.cpp‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ void CPasswordInputField::configure(const std::unordered_map<std::string, std::a
4848
rounding = std::any_cast<Hyprlang::INT>(props.at("rounding"));
4949
configPlaceholderText = std::any_cast<Hyprlang::STRING>(props.at("placeholder_text"));
5050
configFailText = std::any_cast<Hyprlang::STRING>(props.at("fail_text"));
51-
configFailTimeoutMs = std::any_cast<Hyprlang::INT>(props.at("fail_timeout"));
5251
fontFamily = std::any_cast<Hyprlang::STRING>(props.at("font_family"));
5352
colorConfig.outer = CGradientValueData::fromAnyPv(props.at("outer_color"));
5453
colorConfig.inner = std::any_cast<Hyprlang::INT>(props.at("inner_color"));
@@ -326,13 +325,6 @@ bool CPasswordInputField::draw(const SRenderData& data) {
326325
return redrawShadow || forceReload;
327326
}
328327

329-
static void failTimeoutCallback(std::shared_ptr<CTimer> self, void* data) {
330-
if (g_pAuth->m_bDisplayFailText) {
331-
g_pAuth->m_bDisplayFailText = false;
332-
g_pHyprlock->renderAllOutputs();
333-
}
334-
}
335-
336328
void CPasswordInputField::updatePlaceholder() {
337329
if (passwordLength != 0) {
338330
if (placeholder.asset && /* keep prompt asset cause it is likely to be used again */ displayFail) {
@@ -351,12 +343,7 @@ void CPasswordInputField::updatePlaceholder() {
351343

352344
placeholder.failedAttempts = g_pAuth->getFailedAttempts();
353345

354-
std::string newText;
355-
if (displayFail) {
356-
g_pHyprlock->addTimer(std::chrono::milliseconds(configFailTimeoutMs), failTimeoutCallback, nullptr);
357-
newText = formatString(configFailText).formatted;
358-
} else
359-
newText = formatString(configPlaceholderText).formatted;
346+
std::string newText = (displayFail) ? formatString(configFailText).formatted : formatString(configPlaceholderText).formatted;
360347

361348
// if the text is unchanged we don't need to do anything, unless we are swapping font color
362349
const auto ALLOWCOLORSWAP = outThick == 0 && colorConfig.swapFont;
@@ -388,6 +375,10 @@ void CPasswordInputField::updatePlaceholder() {
388375
request.props["font_family"] = fontFamily;
389376
request.props["color"] = colorState.font;
390377
request.props["font_size"] = (int)size->value().y / 4;
378+
request.callback = [REF = m_self] {
379+
if (const auto SELF = REF.lock(); SELF)
380+
g_pHyprlock->renderOutput(SELF->outputStringPort);
381+
};
391382
g_pRenderer->asyncResourceGatherer->requestAsyncAssetPreload(request);
392383
}
393384

‎src/renderer/widgets/PasswordInputField.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "Shadowable.hpp"
88
#include "../../config/ConfigDataValues.hpp"
99
#include "../../helpers/AnimatedVariable.hpp"
10-
#include <chrono>
1110
#include <hyprutils/math/Vector2D.hpp>
1211
#include <vector>
1312
#include <any>
@@ -83,7 +82,6 @@ class CPasswordInputField : public IWidget {
8382
size_t failedAttempts = 0;
8483

8584
std::vector<std::string> registeredResourceIDs;
86-
8785
} placeholder;
8886

8987
struct {

0 commit comments

Comments
 (0)