adds the "swaymsg" flag to launch a program with "swaymsg exec" and prevent potential involuntary closing with Jetbrains IDEs

This commit is contained in:
gouvinb
2023-11-01 00:44:50 +01:00
parent fd26bb39e8
commit 5a7dbefeb0
2 changed files with 19 additions and 3 deletions

11
main.go
View File

@@ -114,6 +114,16 @@ func defaultStringIfBlank(s, fallback string) string {
return s return s
} }
func defaultBoolIfBlank(s string, fallback bool) bool {
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" {
return fallback
}
return true
}
// Flags // Flags
var cssFileName = flag.String("s", "drawer.css", "Styling: css file name") var cssFileName = flag.String("s", "drawer.css", "Styling: css file name")
var targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway only)") var targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway only)")
@@ -134,6 +144,7 @@ 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", defaultStringIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
var swaymsg = flag.Bool("swaymsg", defaultBoolIfBlank(os.Getenv("XDG_CURRENT_DESKTOP"), false), "Use swaymsg (sway only)")
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")

View File

@@ -592,15 +592,20 @@ func launch(command string, terminal bool) {
cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...) cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)
var prefixCommand string
var args []string
if terminal { if terminal {
var args []string prefixCommand = *term
if *term != "foot" { if *term != "foot" {
args = []string{"-e", elements[cmdIdx]} args = []string{"-e", elements[cmdIdx]}
} else { } else {
args = []string{elements[cmdIdx]} args = []string{elements[cmdIdx]}
} }
cmd = exec.Command(prefixCommand, args...)
cmd = exec.Command(*term, args...) } else if *swaymsg {
prefixCommand = "swaymsg"
args = []string{"exec", elements[cmdIdx]}
cmd = exec.Command(prefixCommand, args...)
} }
// set env variables // set env variables