session-picker: add onclick and onhover

Author: PointerDilemma

src/config/LoginSessionManager.cpp

@@ -42,7 +42,7 @@ static bool parseDesktopFile(SLoginSessionConfig& sessionConfig) {
     return true;
 }
 
-static std::vector<SLoginSessionConfig> gatherSessions(const std::vector<std::string>& searchPaths) {
+static std::vector<SLoginSessionConfig> gatherSessionsInPaths(const std::vector<std::string>& searchPaths) {
     std::vector<SLoginSessionConfig> sessions;
 
     for (const auto& DIR : searchPaths) {
@@ -66,16 +66,19 @@ static std::vector<SLoginSessionConfig> gatherSessions(const std::vector<std::st
     return sessions;
 }
 
-CLoginSessionManager::CLoginSessionManager(const std::string& sessionDirs) {
+void CLoginSessionManager::gather(const std::string& sessionDirs) {
     const auto LOGINDEFAULTSESSION = g_pConfigManager->getValue<Hyprlang::STRING>("login:default_session");
 
     Debug::log(LOG, "LoginSessions: Default session: {}, Search directories: {}", std::string{*LOGINDEFAULTSESSION}, sessionDirs);
 
     Hyprutils::String::CVarList sessionDirPaths{sessionDirs, 0, ':', true};
-    m_loginSessions              = gatherSessions(std::vector<std::string>{sessionDirPaths.begin(), sessionDirPaths.end()});
+    m_loginSessions = gatherSessionsInPaths(std::vector<std::string>{sessionDirPaths.begin(), sessionDirPaths.end()});
+
     const auto CONFIGUEDSESSIONS = g_pConfigManager->getLoginSessionConfigs();
     m_loginSessions.insert(m_loginSessions.end(), CONFIGUEDSESSIONS.begin(), CONFIGUEDSESSIONS.end());
 
+    // Handle different possiblites for the default_session option.
+    // It can either be a path to a .desktop file, or the display name.
     if (const std::string DEFAULTSESSIONSTRING{*LOGINDEFAULTSESSION}; !DEFAULTSESSIONSTRING.empty()) {
         bool       found   = false;
         const auto ABSPATH = absolutePath(DEFAULTSESSIONSTRING, "/");
@@ -156,6 +159,11 @@ void CLoginSessionManager::handleKeyDown() {
     }
 }
 
+void CLoginSessionManager::selectSession(size_t index) {
+    if (index < m_loginSessions.size())
+        m_selectedLoginSession = index;
+}
+
 void CLoginSessionManager::onGotLoginSessionAssetCallback() {
     m_renderedSessionNames++;
     if (m_renderedSessionNames == m_loginSessionResourceIds.size())

src/config/LoginSessionManager.hpp

@@ -7,15 +7,17 @@
 
 class CLoginSessionManager {
   public:
-    CLoginSessionManager(const std::string& sessionDirs);
+    CLoginSessionManager()  = default;
     ~CLoginSessionManager() = default;
 
     CLoginSessionManager(const CLoginSessionManager&)            = delete;
     CLoginSessionManager& operator=(const CLoginSessionManager&) = delete;
     CLoginSessionManager(CLoginSessionManager&&) noexcept        = delete;
 
+    void                                    gather(const std::string& sessionDirs);
     void                                    handleKeyUp();
     void                                    handleKeyDown();
+    void                                    selectSession(size_t index);
     void                                    onGotLoginSessionAssetCallback();
 
     const SLoginSessionConfig&              getSelectedLoginSession() const;

src/core/hyprlock.cpp

@@ -39,7 +39,7 @@ static void setMallocThreshold() {
 }
 
 CHyprlock::CHyprlock(const std::string& wlDisplay, const bool immediateRender, const int graceSeconds, const bool greetdLogin, const std::string& sessionDirs) :
-    m_bGreetdLogin(greetdLogin), m_greetdSessionDirs(sessionDirs) {
+    m_greetdLogin(greetdLogin), m_greetdSessionDirs(sessionDirs) {
     setMallocThreshold();
 
     m_sWaylandState.display = wl_display_connect(wlDisplay.empty() ? nullptr : wlDisplay.c_str());
@@ -314,10 +314,13 @@ void CHyprlock::run() {
     wl_display_roundtrip(m_sWaylandState.display);
 
     g_pRenderer            = makeUnique<CRenderer>();
-    g_pLoginSessionManager = makeUnique<CLoginSessionManager>(m_greetdSessionDirs);
-    g_pAuth                = makeUnique<CAuth>(m_bGreetdLogin);
+    g_pLoginSessionManager = makeUnique<CLoginSessionManager>();
+    g_pAuth                = makeUnique<CAuth>(m_greetdLogin);
     g_pAuth->start();
 
+    if (m_greetdLogin)
+        g_pLoginSessionManager->gather(m_greetdSessionDirs);
+
     Debug::log(LOG, "Running on {}", m_currentDesktop);
 
     if (!g_pHyprlock->m_bImmediateRender) {
@@ -697,9 +700,9 @@ void CHyprlock::handleKeySym(xkb_keysym_t sym, bool composed) {
         m_bCapsLock = !m_bCapsLock;
     else if (SYM == XKB_KEY_Num_Lock)
         m_bNumLock = !m_bNumLock;
-    else if (SYM == XKB_KEY_Up)
+    else if (SYM == XKB_KEY_Up && m_greetdLogin)
         g_pLoginSessionManager->handleKeyUp();
-    else if (SYM == XKB_KEY_Down)
+    else if (SYM == XKB_KEY_Down && m_greetdLogin)
         g_pLoginSessionManager->handleKeyDown();
     else {
         char buf[16] = {0};

src/core/hyprlock.hpp

@@ -89,7 +89,7 @@ class CHyprlock {
 
     bool                             m_bImmediateRender = false;
 
-    bool                             m_bGreetdLogin = false;
+    bool                             m_greetdLogin = false;
 
     //
     std::chrono::system_clock::time_point m_tGraceEnds;

src/main.cpp

@@ -45,8 +45,8 @@ int main(int argc, char** argv, char** envp) {
     std::string              wlDisplay;
     bool                     immediateRender = false;
     bool                     noFadeIn        = false;
-    int                      graceSeconds    = 0;
     bool                     greetdLogin     = false;
+    int                      graceSeconds    = 0;
 
     std::vector<std::string> args(argv, argv + argc);
 

src/renderer/widgets/SessionPicker.cpp

@@ -4,6 +4,8 @@
 #include "../../helpers/Color.hpp"
 #include "../../config/ConfigDataValues.hpp"
 #include "../../config/LoginSessionManager.hpp"
+#include "../../core/Seat.hpp"
+#include "../../core/hyprlock.hpp"
 #include <algorithm>
 #include <hyprlang.hpp>
 #include <hyprutils/math/Vector2D.hpp>
@@ -44,21 +46,21 @@ bool CSessionPicker::draw(const SRenderData& data) {
 
     const double   PAD = std::abs((m_size.y - m_biggestEntryAssetSize.y) / 2);
     const Vector2D SIZE{std::max(m_size.x, m_biggestEntryAssetSize.x + PAD), m_size.y};
-    const CBox     RECTBOX{
+    m_box = CBox{
         posFromHVAlign(m_viewport, SIZE, m_configPos, m_halign, m_valign),
         SIZE,
     };
 
-    const auto ENTRYHEIGHT = RECTBOX.h / (m_loginSessions.size() + 1);
-    const auto TOPLEFT     = RECTBOX.pos() + Vector2D{0.0, RECTBOX.h};
+    const auto ENTRYHEIGHT = m_box.h / (m_loginSessions.size() + 1);
+    const auto TOPLEFT     = m_box.pos() + Vector2D{0.0, m_box.h};
 
     for (size_t i = 0; i < m_loginSessions.size(); ++i) {
         auto&      sessionEntry = m_loginSessions[i];
 
         const CBox ENTRYBOX{
             TOPLEFT.x,
             TOPLEFT.y - ENTRYHEIGHT - (i * (ENTRYHEIGHT + m_entrySpacing)),
-            RECTBOX.w,
+            m_box.w,
             ENTRYHEIGHT,
         };
 
@@ -121,3 +123,23 @@ void CSessionPicker::setupSessionEntryTexts() {
         };
     };
 }
+
+CBox CSessionPicker::getBoundingBoxWl() const {
+    return {
+        Vector2D{m_box.pos().x, m_viewport.y - m_box.pos().y - m_box.size().y},
+        m_box.size(),
+    };
+}
+
+void CSessionPicker::onClick(uint32_t button, bool down, const Vector2D& pos) {
+    const auto   DIFFERENTIAL   = pos.y - (m_viewport.y - m_box.pos().y - m_box.size().y);
+    const auto   HEIGHTPERENTRY = m_box.size().y / m_loginSessions.size();
+    const size_t SELECTEDENTRY  = std::floor(DIFFERENTIAL / HEIGHTPERENTRY);
+    g_pLoginSessionManager->selectSession(SELECTEDENTRY);
+    Debug::log(LOG, "clicked on entry: DIFF {} H/E {} SEL {}", DIFFERENTIAL, HEIGHTPERENTRY, SELECTEDENTRY);
+    g_pHyprlock->renderAllOutputs();
+}
+
+void CSessionPicker::onHover(const Vector2D& pos) {
+    g_pSeatManager->m_pCursorShape->setShape(WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_TEXT);
+}

src/renderer/widgets/SessionPicker.hpp

@@ -27,6 +27,9 @@ class CSessionPicker : public IWidget {
 
     virtual void configure(const std::unordered_map<std::string, std::any>& props, const SP<COutput>& pOutput);
     virtual bool draw(const SRenderData& data);
+    virtual CBox getBoundingBoxWl() const;
+    virtual void onClick(uint32_t button, bool down, const Vector2D& pos);
+    virtual void onHover(const Vector2D& pos);
 
     void         onGotSessionEntryAsset(const std::string& sessionName);
 
@@ -48,6 +51,8 @@ class CSessionPicker : public IWidget {
 
     Vector2D                   m_biggestEntryAssetSize;
 
+    CBox                       m_box;
+
     struct {
         CHyprColor         inner;
         CHyprColor         selected;