hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2025-05-12 21:30:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: move password buffer clearing to handleInput (#708)

Browse source 
Makes more sense than clearing the input buffer in the auth impl.
Also added a check for the password buffer length to reset the fail
color as soon as the password length > 0.
This commit is contained in:
Maximilian Seidler 2025-03-17 11:25:51 +00:00 committed by GitHub
parent 7ab3162d66
commit ee8ee1f9f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/auth/Auth.cpp
View file

@ -29,6 +29,8 @@ void CAuth::submitInput(const std::string& input) {
for (const auto& i : m_vImpls) { for (const auto& i : m_vImpls) {
i->handleInput(input); i->handleInput(input);
} }
g_pHyprlock->clearPasswordBuffer();
} }
bool CAuth::checkWaiting() { bool CAuth::checkWaiting() {
@ -77,8 +79,6 @@ void CAuth::terminate() {
static void passwordFailCallback(std::shared_ptr<CTimer> self, void* data) { static void passwordFailCallback(std::shared_ptr<CTimer> self, void* data) {
g_pAuth->m_bDisplayFailText = true; g_pAuth->m_bDisplayFailText = true;
g_pHyprlock->clearPasswordBuffer();
g_pHyprlock->enqueueForceUpdateTimers(); g_pHyprlock->enqueueForceUpdateTimers();
g_pHyprlock->renderAllOutputs(); g_pHyprlock->renderAllOutputs();

7
src/auth/Pam.cpp
View file

@ -138,14 +138,7 @@ bool CPam::auth() {
return true; return true;
} }
// clearing the input must be done from the main thread
static void clearInputTimerCallback(std::shared_ptr<CTimer> self, void* data) {
g_pHyprlock->clearPasswordBuffer();
}
void CPam::waitForInput() { void CPam::waitForInput() {
g_pHyprlock->addTimer(std::chrono::milliseconds(1), clearInputTimerCallback, nullptr);
std::unique_lock<std::mutex> lk(m_sConversationState.inputMutex); std::unique_lock<std::mutex> lk(m_sConversationState.inputMutex);
m_bBlockInput = false; m_bBlockInput = false;
m_sConversationState.waitingForPamAuth = false; m_sConversationState.waitingForPamAuth = false;

7
src/renderer/widgets/PasswordInputField.cpp
View file

@ -165,6 +165,9 @@ void CPasswordInputField::updateDots() {
if (dots.currentAmount->goal() == passwordLength) if (dots.currentAmount->goal() == passwordLength)
return; return;
if (checkWaiting)
return;
if (passwordLength == 0) if (passwordLength == 0)
dots.currentAmount->setValueAndWarp(passwordLength); dots.currentAmount->setValueAndWarp(passwordLength);
else else
@ -298,7 +301,7 @@ bool CPasswordInputField::draw(const SRenderData& data) {
} }
} }
if (passwordLength == 0 && !placeholder.resourceID.empty()) { if (passwordLength == 0 && !checkWaiting && !placeholder.resourceID.empty()) {
SPreloadedAsset* currAsset = nullptr; SPreloadedAsset* currAsset = nullptr;
if (!placeholder.asset) if (!placeholder.asset)
@ -451,7 +454,7 @@ void CPasswordInputField::updateColors() {
if (checkWaiting) if (checkWaiting)
targetGrad = colorConfig.check; targetGrad = colorConfig.check;
else if (displayFail) else if (displayFail && passwordLength == 0)
targetGrad = colorConfig.fail; targetGrad = colorConfig.fail;
CGradientValueData* outerTarget = colorConfig.outer; CGradientValueData* outerTarget = colorConfig.outer;