config: allow mon description for monitor value (#216)

* config: allow mon description for `monitor` value * rename field
hyprwm · Mar 23, 2024 · 2448774 · 2448774
1 parent 230f8aa
commit 2448774
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/core/Output.cpp b/src/core/Output.cpp
@@ -46,8 +46,9 @@ static void handleName(void* data, wl_output* output, const char* name) {
 }
 
 static void handleDescription(void* data, wl_output* output, const char* description) {
-    const auto POUTPUT = (COutput*)data;
-    Debug::log(LOG, "output {} description {}", POUTPUT->name, description ? description : "");
+    const auto POUTPUT  = (COutput*)data;
+    POUTPUT->stringDesc = description ? std::string{description} : "";
+    Debug::log(LOG, "output {} description {}", POUTPUT->name, POUTPUT->stringDesc);
 }
 
 static const wl_output_listener outputListener = {
@@ -61,4 +62,4 @@ static const wl_output_listener outputListener = {
 
 COutput::COutput(wl_output* output, uint32_t name) : name(name), output(output) {
     wl_output_add_listener(output, &outputListener, this);
-}
+}
diff --git a/src/core/Output.hpp b/src/core/Output.hpp
@@ -16,10 +16,11 @@ class COutput {
     int                                  scale      = 1;
     std::string                          stringName = "";
     std::string                          stringPort = "";
+    std::string                          stringDesc = "";
 
     std::unique_ptr<CSessionLockSurface> sessionLockSurface;
 
     wl_output*                           output = nullptr;
 
   private:
-};
+};
diff --git a/src/renderer/AsyncResourceGatherer.cpp b/src/renderer/AsyncResourceGatherer.cpp
@@ -42,7 +42,8 @@ CAsyncResourceGatherer::CAsyncResourceGatherer() {
     }
 
     for (auto& mon : mons) {
-        const auto MON = std::find_if(g_pHyprlock->m_vOutputs.begin(), g_pHyprlock->m_vOutputs.end(), [mon](const auto& other) { return other->stringPort == mon; });
+        const auto MON = std::find_if(g_pHyprlock->m_vOutputs.begin(), g_pHyprlock->m_vOutputs.end(),
+                                      [mon](const auto& other) { return other->stringPort == mon || other->stringDesc.starts_with(mon); });
 
         if (MON == g_pHyprlock->m_vOutputs.end())
             continue;
@@ -65,7 +66,7 @@ void CAsyncResourceGatherer::recheckDMAFramesFor(COutput* output) {
         if (std::string{std::any_cast<Hyprlang::STRING>(c.values.at("path"))} != "screenshot")
             continue;
 
-        if (c.monitor.empty() || c.monitor == output->stringPort) {
+        if (c.monitor.empty() || c.monitor == output->stringPort || output->stringDesc.starts_with(c.monitor)) {
             shouldMake = true;
             break;
         }

diff --git a/src/renderer/Renderer.cpp b/src/renderer/Renderer.cpp
@@ -306,7 +306,7 @@ std::vector<std::unique_ptr<IWidget>>* CRenderer::getOrCreateWidgetsFor(const CS
         const auto CWIDGETS = g_pConfigManager->getWidgetConfigs();
 
         for (auto& c : CWIDGETS) {
-            if (!c.monitor.empty() && c.monitor != surf->output->stringPort)
+            if (!c.monitor.empty() && c.monitor != surf->output->stringPort && !surf->output->stringDesc.starts_with(c.monitor))
                 continue;
 
             // by type