feat: use optionals rather than empty strings for on created empty ru…

…n cmd
hyprwm · Oct 22, 2023 · 0f0711f · 0f0711f
1 parent d8d258e
commit 0f0711f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/Compositor.cpp b/src/Compositor.cpp
@@ -1216,8 +1216,8 @@ void CCompositor::sanityCheckWorkspaces() {
                 continue;
             }
             if (!WORKSPACE->m_bOnCreatedEmptyExecuted) {
-                if (!WORKSPACERULE.onCreatedEmptyRunCmd.empty())
-                    g_pKeybindManager->spawn(WORKSPACERULE.onCreatedEmptyRunCmd);
+                if (auto cmd = WORKSPACERULE.onCreatedEmptyRunCmd)
+                    g_pKeybindManager->spawn(*cmd);
 
                 WORKSPACE->m_bOnCreatedEmptyExecuted = true;
             }

diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp
@@ -49,7 +49,7 @@ struct SWorkspaceRule {
     std::optional<int>     rounding;
     std::optional<int>     decorate;
     std::optional<int>     shadow;
-    std::string            onCreatedEmptyRunCmd;
+    std::optional<std::string> onCreatedEmptyRunCmd;
 };
 
 struct SMonitorAdditionalReservedArea {

diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
@@ -2,6 +2,7 @@
 #include "../defines.hpp"
 #include <algorithm>
 #include "../Compositor.hpp"
+#include <optional>
 #include <set>
 #include <sys/utsname.h>
 #include <iomanip>
@@ -503,7 +504,7 @@ int getWorkspaceIDFromString(const std::string& in, std::string& outName) {
     return result;
 }
 
-std::string cleanCmdForWorkspace(const std::string& inWorkspaceName, std::string dirtyCmd) {
+std::optional<std::string> cleanCmdForWorkspace(const std::string& inWorkspaceName, std::string dirtyCmd) {
 
 
     std::string cmd = removeBeginEndSpacesTabs(dirtyCmd);
@@ -535,10 +536,10 @@ std::string cleanCmdForWorkspace(const std::string& inWorkspaceName, std::string
             rules = "[" + workspaceRule + "]";
         }
 
-        return rules + " " + cmd;
+        return std::optional<std::string>(rules + " " + cmd);
     }
 
-    return "";
+    return std::nullopt;
 }
 
 float vecToRectDistanceSquared(const Vector2D& vec, const Vector2D& p1, const Vector2D& p2) {

diff --git a/src/helpers/MiscFunctions.hpp b/src/helpers/MiscFunctions.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <optional>
 #include <string>
 #include <wayland-server.h>
 #include <wlr/util/box.h>
@@ -20,7 +21,7 @@ std::string                      removeBeginEndSpacesTabs(std::string);
 bool                             isNumber(const std::string&, bool allowfloat = false);
 bool                             isDirection(const std::string&);
 int                              getWorkspaceIDFromString(const std::string&, std::string&);
-std::string                      cleanCmdForWorkspace(const std::string&, std::string);
+std::optional<std::string>       cleanCmdForWorkspace(const std::string&, std::string);
 float                            vecToRectDistanceSquared(const Vector2D& vec, const Vector2D& p1, const Vector2D& p2);
 void                             logSystemInfo();
 std::string                      execAndGet(const char*);