hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2026-05-02 10:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix build errors and update image buffer rendering

Browse source
This commit is contained in:
Felix Salcher 2025-10-09 11:59:54 +02:00
parent 8cff6e5f14
commit 476ee484a9
No known key found for this signature in database
5 changed files with 71 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/hyprlock.cpp
View file

@ -2,11 +2,11 @@
#include "../helpers/Log.hpp"
#include "../config/ConfigManager.hpp"
#include "../renderer/Renderer.hpp"
#include "../renderer/AsyncResourceManager.hpp"
#include "../renderer/widgets/PasswordInputField.hpp"
#include "../auth/Auth.hpp"
#include "../auth/Fingerprint.hpp"
#include "Egl.hpp"
#include "src/renderer/widgets/IWidget.hpp"
#include <chrono>
#include <hyprutils/memory/UniquePtr.hpp>
#include <sys/wait.h>

24
src/renderer/AsyncResourceManager.cpp
View file

@ -9,6 +9,8 @@
#include <algorithm>
#include <cstdint>
#include <functional>
#include <hyprgraphics/resource/resources/ImageResource.hpp>
#include <hyprgraphics/image/Image.hpp>
#include <sys/eventfd.h>
#include <sys/poll.h>
@ -37,8 +39,13 @@ ResourceID CAsyncResourceManager::resourceIDForImageRequest(const std::string& p
return scopeResourceID(3, std::hash<std::string>{}(path) ^ (revision << 32));
}
ResourceID CAsyncResourceManager::resourceIDForImageRequest(const std::span<const uint8_t> data) {
auto sv = std::string_view{reinterpret_cast<const char*>(data.data()), data.size()};
return scopeResourceID(4, std::hash<std::string_view>{}(sv));
}
ResourceID CAsyncResourceManager::resourceIDForScreencopy(const std::string& port) {
return scopeResourceID(4, std::hash<std::string>{}(port));
return scopeResourceID(5, std::hash<std::string>{}(port));
}
ResourceID CAsyncResourceManager::requestText(const CTextResource::STextResourceData& params, const AWP<IWidget>& widget) {
@ -86,6 +93,21 @@ ResourceID CAsyncResourceManager::requestImage(const std::string& path, size_t r
return RESOURCEID;
}
ResourceID CAsyncResourceManager::requestImage(const std::span<const uint8_t> data, const AWP<IWidget>& widget) {
const auto RESOURCEID = resourceIDForImageRequest(data);
if (request(RESOURCEID, widget)) {
Debug::log(TRACE, "Reusing image buffer (resourceID: {})", RESOURCEID, (uintptr_t)widget.get());
return RESOURCEID;
}
auto resource = makeAtomicShared<CImageResource>(data, eImageFormat::IMAGE_FORMAT_PNG);
CAtomicSharedPointer<IAsyncResource> resourceGeneric{resource};
Debug::log(TRACE, "Requesting image (resourceID: {})", RESOURCEID, (uintptr_t)widget.get());
enqueue(RESOURCEID, resourceGeneric, widget);
return RESOURCEID;
}
ASP<CTexture> CAsyncResourceManager::getAssetByID(size_t id) {
if (!m_assets.contains(id))
return nullptr;

3
src/renderer/AsyncResourceManager.hpp
View file

@ -8,7 +8,6 @@
#include <hyprgraphics/resource/AsyncResourceGatherer.hpp>
#include <hyprgraphics/resource/resources/AsyncResource.hpp>
#include <hyprgraphics/resource/resources/TextResource.hpp>
#include <hyprgraphics/resource/resources/ImageResource.hpp>
#include <hyprutils/os/FileDescriptor.hpp>
class CAsyncResourceManager {
@ -31,6 +30,7 @@ class CAsyncResourceManager {
static ResourceID resourceIDForTextCmdRequest(const CTextResource::STextResourceData& s, size_t revision);
// Image paths may be file system links, thus this function supports a revision parameter that gets factored into the resource id.
static ResourceID resourceIDForImageRequest(const std::string& path, size_t revision);
static ResourceID resourceIDForImageRequest(const std::span<const uint8_t> data);
static ResourceID resourceIDForScreencopy(const std::string& port);
struct SPreloadedTexture {
@ -45,6 +45,7 @@ class CAsyncResourceManager {
// Same as requestText but substitute the text with what launching sh -c request.text returns.
ResourceID requestTextCmd(const CTextResource::STextResourceData& params, size_t revision, const AWP<IWidget>& widget);
ResourceID requestImage(const std::string& path, size_t revision, const AWP<IWidget>& widget);
ResourceID requestImage(const std::span<const uint8_t> data, const AWP<IWidget>& widget);
ASP<CTexture> getAssetByID(ResourceID id);

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

@ -1,7 +1,6 @@
#include "PasswordInputField.hpp"
#include "../AsyncResourceManager.hpp"
#include "../Renderer.hpp"
#include "../AsyncResourceGatherer.hpp"
#include "../../core/hyprlock.hpp"
#include "../../auth/Auth.hpp"
#include "../../config/ConfigDataValues.hpp"
@ -17,10 +16,10 @@
#include <algorithm>
#include <hyprlang.hpp>
static unsigned char eye_closed_png[] = {
static const unsigned char eye_closed_png[] = {
#embed "icons/eye-closed.png"
};
static unsigned char eye_open_png[] = {
static const unsigned char eye_open_png[] = {
#embed "icons/eye-open.png"
};
@ -165,7 +164,6 @@ void CPasswordInputField::updateFade() {
}
const bool INPUTUSED = passwordLength > 0 || checkWaiting;
if (INPUTUSED && fade.allowFadeOut)
fade.allowFadeOut = false;
@ -203,62 +201,28 @@ void CPasswordInputField::updateDots() {
void CPasswordInputField::updatePassword() {
std::string& passwordContent = g_pHyprlock->getPasswordBuffer();
std::string textResourceID = std::format("password:{}-{}", (uintptr_t)this, std::hash<std::string>{}(passwordContent));
if (passwordContent == password.text.content || checkWaiting || g_pAsyncResourceGatherer->getAssetByID(textResourceID))
if (passwordContent == password.text.content || checkWaiting)
return;
password.text.content = passwordContent;
CAsyncResourceGatherer::SPreloadRequest request;
Hyprgraphics::CTextResource::STextResourceData request;
request.id = textResourceID;
request.asset = password.text.content;
request.type = CAsyncResourceGatherer::eTargetType::TARGET_TEXT;
request.props["font_family"] = fontFamily;
request.props["color"] = colorConfig.font;
request.props["font_size"] = (int)(std::nearbyint(configSize.y * password.text.size * 0.5f) * 2.f);
request.callback = [REF = m_self]() { assetReadyCallback(REF); };
request.text = password.text.content;
request.font = fontFamily;
request.color = colorConfig.font.asRGB();
request.fontSize = (int)(std::nearbyint(configSize.y * password.text.size * 0.5f) * 2.f);
password.text.pendingResourceID = textResourceID;
g_pAsyncResourceGatherer->requestAsyncAssetPreload(request);
}
void CPasswordInputField::renderPasswordUpdate() {
auto newAsset = g_pAsyncResourceGatherer->getAssetByID(password.text.pendingResourceID);
if (newAsset) {
// new asset is ready :D
g_pAsyncResourceGatherer->unloadAsset(password.text.asset);
password.text.asset = newAsset;
password.text.resourceID = password.text.pendingResourceID;
password.text.pendingResourceID = "";
} else {
Debug::log(WARN, "Asset {} not available after the asyncResourceGatherer's callback!", password.text.pendingResourceID);
g_pHyprlock->addTimer(std::chrono::milliseconds(10), [REF = m_self](auto, auto) { assetReadyCallback(REF); }, nullptr);
return;
}
g_pHyprlock->renderOutput(outputStringPort);
AWP<IWidget> widget;
password.text.resourceID = g_asyncResourceManager->requestText(request, widget);
}
void CPasswordInputField::updateEye() {
CAsyncResourceGatherer::SPreloadRequest request;
AWP<IWidget> widget(m_self);
password.eye.openRescourceID = std::format("eye-open:{}", (uintptr_t)this);
request.id = password.eye.openRescourceID;
request.image_buffer = std::span(eye_open_png);
request.type = CAsyncResourceGatherer::eTargetType::TARGET_EMBEDDED_IMAGE;
g_pAsyncResourceGatherer->requestAsyncAssetPreload(request);
password.eye.closedRescourceID = std::format("eye-closed:{}", (uintptr_t)this);
request.id = password.eye.closedRescourceID;
request.image_buffer = std::span(eye_closed_png);
request.type = CAsyncResourceGatherer::eTargetType::TARGET_EMBEDDED_IMAGE;
g_pAsyncResourceGatherer->requestAsyncAssetPreload(request);
password.eye.openRescourceID = g_asyncResourceManager->requestImage(std::span(eye_open_png), widget);
password.eye.closedRescourceID = g_asyncResourceManager->requestImage(std::span(eye_closed_png), widget);
}
bool CPasswordInputField::draw(const SRenderData& data) {
@ -271,7 +235,7 @@ bool CPasswordInputField::draw(const SRenderData& data) {
bool forceReload = false;
if (passwordLength != g_pHyprlock->getPasswordBufferDisplayLen() && password.show) {
g_pAsyncResourceGatherer->unloadAsset(password.text.asset);
g_asyncResourceManager->unload(password.text.asset);
password.text.asset = nullptr;
password.show = false;
}
@ -330,9 +294,9 @@ bool CPasswordInputField::draw(const SRenderData& data) {
if (!hiddenInputState.enabled) {
if (!password.eye.openAsset)
password.eye.openAsset = g_pAsyncResourceGatherer->getAssetByID(password.eye.openRescourceID);
password.eye.openAsset = g_asyncResourceManager->getAssetByID(password.eye.openRescourceID);
if (!password.eye.closedAsset)
password.eye.closedAsset = g_pAsyncResourceGatherer->getAssetByID(password.eye.closedRescourceID);
password.eye.closedAsset = g_asyncResourceManager->getAssetByID(password.eye.closedRescourceID);
int eyeOffset = 0;
auto eyeAsset = password.show ? password.eye.closedAsset : password.eye.openAsset;
@ -343,16 +307,17 @@ bool CPasswordInputField::draw(const SRenderData& data) {
if (password.allowToggle && password.show) {
if (!password.text.asset)
password.text.asset = g_pAsyncResourceGatherer->getAssetByID(password.text.resourceID);
password.text.asset = g_asyncResourceManager->getAssetByID(password.text.resourceID);
if (password.text.asset)
drawPasswordText(eyeOffset, fontCol);
else
forceReload = true;
} else {
if (!password.dots.format.empty()) {
if (!password.dots.asset)
password.dots.asset = g_pAsyncResourceGatherer->getAssetByID(password.dots.resourceID);
password.dots.asset = g_asyncResourceManager->getAssetByID(password.dots.resourceID);
if (password.dots.asset)
drawPasswordDots(eyeOffset, fontCol, data);
@ -367,7 +332,7 @@ bool CPasswordInputField::draw(const SRenderData& data) {
auto padding = (inputFieldBox.h - eyeSize.y) / 2.0;
auto eyePosition = inputFieldBox.pos() + (password.eye.placement == "right" ? Vector2D{inputFieldBox.w - eyeSize.x - padding, padding} : Vector2D{padding, padding});
CBox box = {eyePosition, eyeSize};
g_pRenderer->renderTexture(box, eyeAsset->texture, fontCol.a);
g_pRenderer->renderTexture(box, *eyeAsset, fontCol.a);
}
}
@ -401,7 +366,7 @@ bool CPasswordInputField::draw(const SRenderData& data) {
void CPasswordInputField::drawPasswordText(int eyeOffset, CHyprColor fontCol) {
CBox inputFieldBox = {pos, size->value()};
Vector2D passSize = password.text.asset->texture.m_vSize;
Vector2D passSize = password.text.asset->m_vSize;
double padding = (inputFieldBox.h - passSize.y) / 2.0;
double areaWidth = inputFieldBox.w - (padding * 2) - eyeOffset;
@ -416,7 +381,7 @@ void CPasswordInputField::drawPasswordText(int eyeOffset, CHyprColor fontCol) {
glEnable(GL_SCISSOR_TEST);
glScissor(inputFieldBox.x + padding + (password.eye.placement == "left" ? eyeOffset : 0), inputFieldBox.y, areaWidth, inputFieldBox.h);
g_pRenderer->renderTexture(box, password.text.asset->texture, fontCol.a);
g_pRenderer->renderTexture(box, *password.text.asset, fontCol.a);
glScissor(0, 0, viewport.x, viewport.y);
glDisable(GL_SCISSOR_TEST);
}
@ -429,7 +394,7 @@ bool CPasswordInputField::drawPasswordDots(int eyeOffset, CHyprColor fontCol, co
int passSpacing = std::floor(passSize.x * password.dots.spacing);
if (!password.dots.format.empty()) {
passSize = password.dots.asset->texture.m_vSize;
passSize = password.dots.asset->m_vSize;
passSpacing = std::floor(passSize.x * password.dots.spacing);
}
@ -476,7 +441,7 @@ bool CPasswordInputField::drawPasswordDots(int eyeOffset, CHyprColor fontCol, co
break;
}
g_pRenderer->renderTexture(box, password.dots.asset->texture, fontCol.a, password.dots.rounding);
g_pRenderer->renderTexture(box, *password.dots.asset, fontCol.a, password.dots.rounding);
} else
g_pRenderer->renderRect(box, fontCol, password.dots.rounding);

46
src/renderer/widgets/PasswordInputField.hpp
View file

@ -12,8 +12,6 @@
#include <any>
#include <unordered_map>
struct SPreloadedAsset;
class CPasswordInputField : public IWidget {
public:
CPasswordInputField() = default;
@ -82,36 +80,34 @@ class CPasswordInputField : public IWidget {
bool show = false;
struct {
float size = 0.25;
bool center = false;
std::string content = "";
std::string resourceID = "";
std::string pendingResourceID = "";
ASP<SPreloadedAsset> asset = nullptr;
ASP<SPreloadedAsset> previousAsset = nullptr;
float size = 0.25;
bool center = false;
std::string content = "";
size_t resourceID = 0;
ASP<CTexture> asset = nullptr;
} text;
struct {
PHLANIMVAR<float> currentAmount;
float size = 0.25;
bool center = false;
float spacing = 0;
int rounding = 0;
std::string format = "";
std::string resourceID = "";
ASP<SPreloadedAsset> asset = nullptr;
PHLANIMVAR<float> currentAmount;
float size = 0.25;
bool center = false;
float spacing = 0;
int rounding = 0;
std::string format = "";
size_t resourceID = 9;
ASP<CTexture> asset = nullptr;
} dots;
struct {
int margin = 16;
double size = 0.25;
std::string placement = "right";
bool hide = false;
int margin = 16;
double size = 0.25;
std::string placement = "right";
bool hide = false;
std::string openRescourceID = "";
ASP<SPreloadedAsset> openAsset = nullptr;
std::string closedRescourceID = "";
ASP<SPreloadedAsset> closedAsset = nullptr;
size_t openRescourceID = 0;
ASP<CTexture> openAsset = nullptr;
size_t closedRescourceID = 9;
ASP<CTexture> closedAsset = nullptr;
} eye;
} password;