From 1d3f023dc80f56fa56579b4695490a05164003ae Mon Sep 17 00:00:00 2001
From: gouvinb <brunogouvinhas@gmail.com>
Date: Sun, 5 Nov 2023 23:36:18 +0100
Subject: [PATCH] add support to hyprlandctl

BREAKING CHANGE: '-swaymsg' removed, use '-wm sway' instead
---
 main.go  | 23 +++++++++++++++--------
 tools.go |  6 +++++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/main.go b/main.go
index be17702..32e0a94 100644
--- a/main.go
+++ b/main.go
@@ -104,7 +104,7 @@ var (
 	pinnedItemsChanged      chan interface{} = make(chan interface{}, 1)
 )
 
-func defaultStringIfBlank(s, fallback string) string {
+func defaultTermIfBlank(s, fallback string) string {
 	s = strings.TrimSpace(s)
 	// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started
 	// from a key binding defined in the config file. See #23.
@@ -114,14 +114,19 @@ func defaultStringIfBlank(s, fallback string) string {
 	return s
 }
 
-func defaultBoolIfBlank(s string, fallback bool) bool {
+func defaultStringIfBlank(s, fallback string) string {
 	s = strings.TrimSpace(s)
-	// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started
-	// from a key binding defined in the config file. See #23.
-	if s != "sway" {
+	if s == "" {
 		return fallback
 	}
-	return true
+	return s
+}
+
+func validateWm() {
+	if !(*wm == "sway" || *wm == "hyprland") && *wm != "" {
+		*wm = ""
+		log.Warn("nwg-drawer support only `swaymsg` or `hyprland`.")
+	}
 }
 
 // Flags
@@ -143,8 +148,8 @@ var columnsNumber = flag.Uint("c", 6, "number of Columns")
 var itemSpacing = flag.Uint("spacing", 20, "icon spacing")
 var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
 var fileManager = flag.String("fm", "thunar", "File Manager")
-var term = flag.String("term", defaultStringIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
-var swaymsg = flag.Bool("swaymsg", defaultBoolIfBlank(os.Getenv("XDG_CURRENT_DESKTOP"), false), "Use swaymsg (sway only)")
+var term = flag.String("term", defaultTermIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
+var wm = flag.String("wm", defaultStringIfBlank(os.Getenv("XDG_CURRENT_DESKTOP"), ""), "Use swaymsg or hyprlandctl")
 var nameLimit = flag.Int("fslen", 80, "File Search name LENgth Limit")
 var noCats = flag.Bool("nocats", false, "Disable filtering by category")
 var noFS = flag.Bool("nofs", false, "Disable file search")
@@ -164,6 +169,8 @@ func main() {
 		os.Exit(0)
 	}
 
+	validateWm()
+
 	// Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85
 	// v0.2: we also need to support SIGUSR from now on
 	showWindowChannel := make(chan interface{}, 1)
diff --git a/tools.go b/tools.go
index 8d1a48c..9bbe7b8 100644
--- a/tools.go
+++ b/tools.go
@@ -602,10 +602,14 @@ func launch(command string, terminal bool) {
 			args = []string{elements[cmdIdx]}
 		}
 		cmd = exec.Command(prefixCommand, args...)
-	} else if *swaymsg {
+	} else if *wm == "sway" {
 		prefixCommand = "swaymsg"
 		args = []string{"exec", elements[cmdIdx]}
 		cmd = exec.Command(prefixCommand, args...)
+	} else if *wm == "hyprland" {
+		prefixCommand = "hyprlandctl"
+		args = []string{"dispatch", "exec", elements[cmdIdx]}
+		cmd = exec.Command(prefixCommand, args...)
 	}
 
 	// set env variables