oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support to hyprlandctl

Browse Source 
BREAKING CHANGE: '-swaymsg' removed, use '-wm sway' instead
This commit is contained in:
gouvinb
2023-11-05 23:36:18 +01:00
parent ccfe7776c6
commit 1d3f023dc8
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main.go
View File

@@ -104,7 +104,7 @@ var (
pinnedItemsChanged chan interface{} = make(chan interface{}, 1) pinnedItemsChanged chan interface{} = make(chan interface{}, 1)
) )
func defaultStringIfBlank(s, fallback string) string { func defaultTermIfBlank(s, fallback string) string {
s = strings.TrimSpace(s) s = strings.TrimSpace(s)
// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started // 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. // from a key binding defined in the config file. See #23.
@@ -114,14 +114,19 @@ func defaultStringIfBlank(s, fallback string) string {
return s return s
} }
func defaultBoolIfBlank(s string, fallback bool) bool { func defaultStringIfBlank(s, fallback string) string {
s = strings.TrimSpace(s) s = strings.TrimSpace(s)
// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started if s == "" {
// from a key binding defined in the config file. See #23.
if s != "sway" {
return fallback 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 // Flags
@@ -143,8 +148,8 @@ var columnsNumber = flag.Uint("c", 6, "number of Columns")
var itemSpacing = flag.Uint("spacing", 20, "icon spacing") var itemSpacing = flag.Uint("spacing", 20, "icon spacing")
var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"") var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
var fileManager = flag.String("fm", "thunar", "File Manager") var fileManager = flag.String("fm", "thunar", "File Manager")
var term = flag.String("term", defaultStringIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator") var term = flag.String("term", defaultTermIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
var swaymsg = flag.Bool("swaymsg", defaultBoolIfBlank(os.Getenv("XDG_CURRENT_DESKTOP"), false), "Use swaymsg (sway only)") 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 nameLimit = flag.Int("fslen", 80, "File Search name LENgth Limit")
var noCats = flag.Bool("nocats", false, "Disable filtering by category") var noCats = flag.Bool("nocats", false, "Disable filtering by category")
var noFS = flag.Bool("nofs", false, "Disable file search") var noFS = flag.Bool("nofs", false, "Disable file search")
@@ -164,6 +169,8 @@ func main() {
os.Exit(0) os.Exit(0)
} }
validateWm()
// Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85 // Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85
// v0.2: we also need to support SIGUSR from now on // v0.2: we also need to support SIGUSR from now on
showWindowChannel := make(chan interface{}, 1) showWindowChannel := make(chan interface{}, 1)

6
tools.go
View File

@@ -602,10 +602,14 @@ func launch(command string, terminal bool) {
args = []string{elements[cmdIdx]} args = []string{elements[cmdIdx]}
} }
cmd = exec.Command(prefixCommand, args...) cmd = exec.Command(prefixCommand, args...)
} else if *swaymsg { } else if *wm == "sway" {
prefixCommand = "swaymsg" prefixCommand = "swaymsg"
args = []string{"exec", elements[cmdIdx]} args = []string{"exec", elements[cmdIdx]}
cmd = exec.Command(prefixCommand, args...) 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 // set env variables