adjust help descriptions

Add keyboard mode flag to support both: "on-demand" & "exclusive" GTK layer-shell modes

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: nwg-piotr

.gitignore

@@ -11,5 +11,11 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+# Binaries built with make
+bin
+nwg-drawer
+
+/.idea
+
 # Dependency directories (remove the comment below to include it)
-# vendor/
+vendor/

README.md

@@ -1,6 +1,8 @@
 # nwg-drawer
 
-This application is a part of the [nwg-shell](https://github.com/nwg-piotr/nwg-shell) project.
+This application is a part of the [nwg-shell](https://nwg-piotr.github.io/nwg-shell) project.
+
+**Contributing:** please read the [general contributing rules for the nwg-shell project](https://nwg-piotr.github.io/nwg-shell/contribution).
 
 Nwg-drawer is a golang replacement to the `nwggrid` command
 (a part of [nwg-launchers](https://github.com/nwg-piotr/nwg-launchers)). It's being developed with
@@ -15,9 +17,9 @@ You may pin applications by right-clicking them. Pinned items will appear above
 a pinned item to unpin it. The pinned items cache is shared with [nwg-menu](https://github.com/nwg-piotr/nwg-menu)
 and `nwggrid`.
 
-![screenshot-01.png](https://scrot.cloud/images/2021/05/30/screenshot-01.png)
+![screenshot.png](https://raw.githubusercontent.com/nwg-piotr/nwg-shell-resources/master/images/nwg-shell/nwg-drawer.png)
 
-[more screenshots](https://scrot.cloud/album/nwg-drawer.Bogd) | [see on YouTube](https://youtu.be/iIgxJQhCQf0)
+[see on YouTube](https://youtu.be/iIgxJQhCQf0)
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/nwg-drawer.svg)](https://repology.org/project/nwg-drawer/versions)
 
@@ -32,7 +34,7 @@ To close the window w/o running a program, you may use `Esc` key, or right-click
 
 ### Dependencies
 
-- go >=1.16 (just to build)
+- go >=1.20 (just to build)
 - gtk3
 - gtk-layer-shell
 - xdg-utils
@@ -52,9 +54,6 @@ confirmed to work well with the program. Also see **Files** below.
 3. `make build`
 4. `sudo make install`
 
-Building the gotk3 library takes quite a lot of time. If your machine is x86_64, you may skip steps 2-3, and
-install the provided binary by executing step 4.
-
 ## Command line arguments
 
 ```text
@@ -69,10 +68,25 @@ Usage of nwg-drawer:
     	File Search result COLumns (default 2)
   -fslen int
     	File Search name LENgth Limit (default 80)
+  -ft
+    	Force Theme for libadwaita apps, by adding 'GTK_THEME=<default-gtk-theme>' env var
+  -g string
+    	GTK theme name
+  -i string
+    	GTK icon theme name
   -is int
     	Icon Size (default 64)
+  -k	set GTK layer shell Keyboard interactivity to 'on-demand' mode
   -lang string
     	force lang, e.g. "en", "pl"
+  -mb int
+    	Margin Bottom
+  -ml int
+    	Margin Left
+  -mr int
+    	Margin Right
+  -mt int
+    	Margin Top
   -nocats
     	Disable filtering by category
   -nofs
@@ -87,7 +101,7 @@ Usage of nwg-drawer:
   -spacing uint
     	icon spacing (default 20)
   -term string
-    	Terminal emulator (default "alacritty")
+    	Terminal emulator (default "foot")
   -v	display Version information
   ```
 
@@ -135,7 +149,7 @@ Edit `~/.config/nwg-drawer/drawer.css` to your taste.
 
 When the search phrase is at least 3 characters long, your XDG user directories are being searched.
 
-![screenshot-03.png](https://scrot.cloud/images/2021/05/30/screenshot-03.png)
+![screenshot-02.png](https://raw.githubusercontent.com/nwg-piotr/nwg-shell/main/images/nwg-drawer/search.png)
 
 Use the **left mouse button** to open a file with the `xdg-open` command. As configuring file associations for it is
 PITA, you may override them, by creating the `~/.config/nwg-panel/preferred-apps.json` file with your own definitions.

go.mod

@@ -1,12 +1,19 @@
 module github.com/nwg-piotr/nwg-drawer
 
-go 1.16
+go 1.20
 
 require (
 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
-	github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7
-	github.com/fsnotify/fsnotify v1.5.1
-	github.com/gotk3/gotk3 v0.6.1
-	github.com/joshuarubin/go-sway v0.0.4
-	github.com/sirupsen/logrus v1.8.1
+	github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872
+	github.com/fsnotify/fsnotify v1.6.0
+	github.com/gotk3/gotk3 v0.6.2
+	github.com/joshuarubin/go-sway v1.2.0
+	github.com/sirupsen/logrus v1.9.3
+)
+
+require (
+	github.com/joshuarubin/lifecycle v1.1.4 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
 )

go.sum

@@ -3,30 +3,37 @@ github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37/go.m
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7 h1:LDo0kwt+oW9a4lWlj2OakIgMW1ySXXVRGFt8GHUdYYA=
-github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/gotk3/gotk3 v0.6.1 h1:GJ400a0ecEEWrzjBvzBzH+pB/esEMIGdB9zPSmBdoeo=
+github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872 h1:16qcNl+UgbvudN7wPv+zq4mmDSYJWdLv5jbVhS7+OVI=
+github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/gotk3/gotk3 v0.6.1/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
-github.com/joshuarubin/go-sway v0.0.4 h1:dpmIwQ/LytG+oMrjmaVKdk1aPdW2feXK/+wAcLKIx4A=
-github.com/joshuarubin/go-sway v0.0.4/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
-github.com/joshuarubin/lifecycle v1.0.0 h1:N/lPEC8f+dBZ1Tn99vShqp36LwB+LI7XNAiNadZeLUQ=
+github.com/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8=
+github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+github.com/joshuarubin/go-sway v1.2.0 h1:t3eqW504//uj9PDwFf0+IVfkD+WoOGaDX5gYIe0BHyM=
+github.com/joshuarubin/go-sway v1.2.0/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
 github.com/joshuarubin/lifecycle v1.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54=
+github.com/joshuarubin/lifecycle v1.1.4 h1:9ZjvYSsWax9DC3Jpz6vGf/0KnU8FNMjh0/vJ3SpSBRQ=
+github.com/joshuarubin/lifecycle v1.1.4/go.mod h1:QqHrqwMPMA9dbJY3XgIyVLhzHMSGOFrcCAQ59bke1mo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84 h1:IqXQ59gzdXv58Jmm2xn0tSOR9i6HqroaOFRQ3wR/dJQ=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

main.go

@@ -21,7 +21,7 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
-const version = "0.2.5"
+const version = "0.3.9"
 
 var (
 	appDirs         []string
@@ -100,9 +100,8 @@ var (
 	statusLabel             *gtk.Label
 	status                  string
 	ignore                  string
-	showWindowTrigger       bool
 	desktopTrigger          bool
-	pinnedTrigger           bool
+	pinnedItemsChanged      chan interface{} = make(chan interface{}, 1)
 )
 
 func defaultStringIfBlank(s, fallback string) string {
@@ -119,9 +118,17 @@ func defaultStringIfBlank(s, fallback string) string {
 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 displayVersion = flag.Bool("v", false, "display Version information")
+var keyboard = flag.Bool("k", false, "set GTK layer shell Keyboard interactivity to 'on-demand' mode")
 var overlay = flag.Bool("ovl", false, "use OVerLay layer")
+var gtkTheme = flag.String("g", "", "GTK theme name")
+var gtkIconTheme = flag.String("i", "", "GTK icon theme name")
 var iconSize = flag.Int("is", 64, "Icon Size")
+var marginTop = flag.Int("mt", 0, "Margin Top")
+var marginLeft = flag.Int("ml", 0, "Margin Left")
+var marginRight = flag.Int("mr", 0, "Margin Right")
+var marginBottom = flag.Int("mb", 0, "Margin Bottom")
 var fsColumns = flag.Uint("fscol", 2, "File Search result COLumns")
+var forceTheme = flag.Bool("ft", false, "Force Theme for libadwaita apps, by adding 'GTK_THEME=<default-gtk-theme>' env var")
 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\"")
@@ -148,6 +155,7 @@ func main() {
 
 	// 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)
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1)
 
@@ -164,7 +172,7 @@ func main() {
 					// let's just set e helper variable here. We'll be checking it with glib.TimeoutAdd.
 					if !win.IsVisible() {
 						log.Debug("SIGUSR1 received, showing the window")
-						showWindowTrigger = true
+						showWindowChannel <- struct{}{}
 					} else {
 						log.Debug("SIGUSR1 received, hiding the window")
 						restoreStateAndHide()
@@ -174,7 +182,7 @@ func main() {
 					gtk.MainQuit()
 				}
 			default:
-				log.Info("Unknown signal")
+				log.Infof("Unknown signal: %s", s.String())
 			}
 		}
 	}()
@@ -184,7 +192,7 @@ func main() {
 	// Otherwise the command may behave in two ways:
 	// 	1. kill the running non-residennt instance and exit;
 	// 	2. die if a resident instance found.
-	lockFilePath := path.Join(tempDir(), "nwg-drawer.lock")
+	lockFilePath := path.Join(dataDir(), "nwg-drawer.lock")
 	lockFile, err := singleinstance.CreateLockFile(lockFilePath)
 	if err != nil {
 		pid, err := readTextFile(lockFilePath)
@@ -195,7 +203,10 @@ func main() {
 					log.Warnf("Resident instance already running (PID %v)", i)
 				} else {
 					log.Infof("Showing resident instance (PID %v)", i)
-					syscall.Kill(i, syscall.SIGUSR1)
+					err := syscall.Kill(i, syscall.SIGUSR1)
+					if err != nil {
+						return
+					}
 				}
 			}
 		}
@@ -238,7 +249,10 @@ func main() {
 
 	// Copy default style sheet if not found
 	if !pathExists(filepath.Join(configDirectory, "drawer.css")) {
-		copyFile(filepath.Join(getDataHome(), "nwg-drawer/drawer.css"), filepath.Join(configDirectory, "drawer.css"))
+		err := copyFile("/usr/share/nwg-drawer/drawer.css", filepath.Join(configDirectory, "drawer.css"))
+		if err != nil {
+			log.Errorf("Failed copying 'drawer.css' file: %s", err)
+		}
 	}
 
 	cacheDirectory := cacheDir()
@@ -298,6 +312,32 @@ func main() {
 	// USER INTERFACE
 	gtk.Init(nil)
 
+	settings, _ := gtk.SettingsGetDefault()
+	if *gtkTheme != "" {
+		err = settings.SetProperty("gtk-theme-name", *gtkTheme)
+		if err != nil {
+			log.Error("Unable to set theme:", err)
+		} else {
+			log.Infof("User demanded theme: %s", *gtkTheme)
+		}
+	} else {
+		err := settings.SetProperty("gtk-application-prefer-dark-theme", true)
+		if err != nil {
+			log.Error("Error setting 'gtk-application-prefer-dark-theme' property")
+			return
+		}
+		log.Info("Preferring dark theme variants")
+	}
+
+	if *gtkIconTheme != "" {
+		err = settings.SetProperty("gtk-icon-theme-name", *gtkIconTheme)
+		if err != nil {
+			log.Error("Unable to set icon theme:", err)
+		} else {
+			log.Infof("User demanded icon theme: %s", *gtkIconTheme)
+		}
+	}
+
 	cssProvider, _ := gtk.CssProviderNew()
 
 	err = cssProvider.LoadFromPath(*cssFileName)
@@ -343,14 +383,26 @@ func main() {
 			layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_TOP)
 		}
 
-		layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
+		layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_TOP, *marginTop)
+		layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_LEFT, *marginLeft)
+		layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_RIGHT, *marginRight)
+		layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_BOTTOM, *marginBottom)
+
+		if *keyboard {
+			log.Info("Setting GTK layer shell keyboard mode to: on-demand")
+			layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_ON_DEMAND)
+		} else {
+			log.Info("Setting GTK layer shell keyboard mode to default: exclusive")
+			layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
+		}
+
 	}
 
 	win.Connect("destroy", func() {
 		gtk.MainQuit()
 	})
 
-	win.Connect("key-release-event", func(window *gtk.Window, event *gdk.Event) bool {
+	win.Connect("key-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
 		key := &gdk.EventKey{Event: event}
 		if key.KeyVal() == gdk.KEY_Escape {
 			s, _ := searchEntry.GetText()
@@ -369,7 +421,7 @@ func main() {
 		return false
 	})
 
-	win.Connect("key-press-event", func(window *gtk.Window, event *gdk.Event) bool {
+	win.Connect("key-press-event", func(_ *gtk.Window, event *gdk.Event) bool {
 		key := &gdk.EventKey{Event: event}
 		switch key.KeyVal() {
 		case gdk.KEY_downarrow, gdk.KEY_Up, gdk.KEY_Down, gdk.KEY_Left, gdk.KEY_Right, gdk.KEY_Tab,
@@ -424,8 +476,8 @@ func main() {
 	resultWindow.SetEvents(int(gdk.ALL_EVENTS_MASK))
 	resultWindow.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
-	resultWindow.Connect("button-release-event", func(sw *gtk.ScrolledWindow, e *gdk.Event) bool {
-		btnEvent := gdk.EventButtonNewFromEvent(e)
+	resultWindow.Connect("button-release-event", func(_ *gtk.ScrolledWindow, event *gdk.Event) bool {
+		btnEvent := gdk.EventButtonNewFromEvent(event)
 		if btnEvent.Button() == 3 {
 			if !*resident {
 				gtk.MainQuit()
@@ -457,6 +509,7 @@ func main() {
 	}
 
 	userDirsMap = mapXdgUserDirs()
+	log.Debugf("User dirs map: %s", userDirsMap)
 
 	placeholder, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
 	resultsWrapper.PackStart(placeholder, true, true, 0)
@@ -492,39 +545,55 @@ func main() {
 	log.Info(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
 
 	// Check if showing the window has been requested (SIGUSR1)
-	glib.TimeoutAdd(uint(1), func() bool {
-		if showWindowTrigger && win != nil && !win.IsVisible() {
-			win.ShowAll()
-			fileSearchResultWrapper.Hide()
-			// focus 1st element
-			b := appFlowBox.GetChildAtIndex(0)
-			if b != nil {
-				button, err := b.GetChild()
-				if err == nil {
-					button.ToWidget().GrabFocus()
-				}
+	go func() {
+		for {
+			select {
+			case <-showWindowChannel:
+				log.Debug("Showing window")
+				glib.TimeoutAdd(0, func() bool {
+					if win != nil && !win.IsVisible() {
+
+						// Refresh files before displaying the root window
+						// some .desktop file changed
+						if desktopTrigger {
+							log.Debug(".desktop file changed")
+							desktopFiles = listDesktopFiles()
+							status = parseDesktopFiles(desktopFiles)
+							appFlowBox = setUpAppsFlowBox(nil, "")
+							desktopTrigger = false
+						}
+
+						// Show window and focus the search box
+						win.ShowAll()
+						if fileSearchResultWrapper != nil {
+							fileSearchResultWrapper.Hide()
+						}
+						// focus 1st element
+						var button gtk.IWidget
+						if pinnedFlowBox.GetChildren().Length() > 0 {
+							button, err = pinnedFlowBox.GetChildAtIndex(0).GetChild()
+						} else {
+							button, err = appFlowBox.GetChildAtIndex(0).GetChild()
+						}
+						if err == nil {
+							button.ToWidget().GrabFocus()
+						}
+					}
+
+					return false
+				})
+
+			case <-pinnedItemsChanged:
+				glib.TimeoutAdd(0, func() bool {
+					log.Debug("pinned file changed")
+					pinned, _ = loadTextFile(pinnedFile)
+					pinnedFlowBox = setUpPinnedFlowBox()
+
+					return false
+				})
 			}
 		}
-		showWindowTrigger = false
-
-		// some .desktop file changed
-		if desktopTrigger {
-			log.Debug(".desktop file changed")
-			desktopFiles = listDesktopFiles()
-			status = parseDesktopFiles(desktopFiles)
-			appFlowBox = setUpAppsFlowBox(nil, "")
-			desktopTrigger = false
-		}
-
-		// pinned file changed
-		if pinnedTrigger {
-			log.Debug("pinned file changed")
-			pinnedTrigger = false
-			pinned, _ = loadTextFile(pinnedFile)
-			pinnedFlowBox = setUpPinnedFlowBox()
-		}
-		return true
-	})
+	}()
 
 	go watchFiles()
 
@@ -533,7 +602,9 @@ func main() {
 
 func restoreStateAndHide() {
 	timeStart1 := time.Now()
-	win.Hide()
+	if win != nil {
+		win.Hide()
+	}
 
 	// clear search
 	searchEntry.SetText("")
@@ -546,7 +617,9 @@ func restoreStateAndHide() {
 	}
 
 	// scroll to the top
-	resultWindow.GetVAdjustment().SetValue(0)
+	if resultWindow != nil {
+		resultWindow.GetVAdjustment().SetValue(0)
+	}
 
 	t := time.Now()
 	log.Debugf(fmt.Sprintf("UI hidden and restored in the backgroud in %v ms", t.Sub(timeStart1).Milliseconds()))

tools.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -15,6 +14,7 @@ import (
 	"regexp"
 	"sort"
 	"strings"
+	"syscall"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -78,8 +78,9 @@ func mapXdgUserDirs() map[string]string {
 	result["pictures"] = filepath.Join(home, "Pictures")
 	result["videos"] = filepath.Join(home, "Videos")
 
-	userDirsFile := filepath.Join(home, ".config/user-dirs.dirs")
+	userDirsFile := filepath.Join(filepath.Join(os.Getenv("XDG_CONFIG_HOME"), "user-dirs.dirs"))
 	if pathExists(userDirsFile) {
+		log.Debugf("userDirsFile found: %s", userDirsFile)
 		log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile))
 		lines, _ := loadTextFile(userDirsFile)
 		for _, l := range lines {
@@ -104,7 +105,7 @@ func mapXdgUserDirs() map[string]string {
 			}
 		}
 	} else {
-		log.Warnf("%s file not found, using defaults", userDirsFile)
+		log.Warnf("userDirsFile %s not found, using defaults", userDirsFile)
 	}
 
 	return result
@@ -120,29 +121,18 @@ func getUserDir(home, line string) string {
 }
 
 func cacheDir() string {
-	if os.Getenv("XDG_CACHE_HOME") != "" {
-		return os.Getenv("XDG_CONFIG_HOME")
+	if xdgCache := os.Getenv("XDG_CACHE_HOME"); xdgCache != "" {
+		return xdgCache
 	}
-	if os.Getenv("HOME") != "" && pathExists(filepath.Join(os.Getenv("HOME"), ".cache")) {
-		p := filepath.Join(os.Getenv("HOME"), ".cache")
+	if home := os.Getenv("HOME"); home != "" && pathExists(filepath.Join(home, ".cache")) {
+		p := filepath.Join(home, ".cache")
 		return p
 	}
 	return ""
 }
 
-func tempDir() string {
-	if os.Getenv("TMPDIR") != "" {
-		return os.Getenv("TMPDIR")
-	} else if os.Getenv("TEMP") != "" {
-		return os.Getenv("TEMP")
-	} else if os.Getenv("TMP") != "" {
-		return os.Getenv("TMP")
-	}
-	return "/tmp"
-}
-
 func readTextFile(path string) (string, error) {
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		return "", err
 	}
@@ -151,11 +141,11 @@ func readTextFile(path string) (string, error) {
 }
 
 func oldConfigDir() (string, error) {
-	if os.Getenv("XDG_CONFIG_HOME") != "" {
-		dir := path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-panel")
+	if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
+		dir := path.Join(xdgConfig, "nwg-panel")
 		return dir, nil
-	} else if os.Getenv("HOME") != "" {
-		dir := path.Join(os.Getenv("HOME"), ".config/nwg-panel")
+	} else if home := os.Getenv("HOME"); home != "" {
+		dir := path.Join(home, ".config/nwg-panel")
 		return dir, nil
 	}
 
@@ -164,10 +154,10 @@ func oldConfigDir() (string, error) {
 
 func configDir() string {
 	var dir string
-	if os.Getenv("XDG_CONFIG_HOME") != "" {
-		dir = path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-drawer")
-	} else if os.Getenv("HOME") != "" {
-		dir = path.Join(os.Getenv("HOME"), ".config/nwg-drawer")
+	if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
+		dir = path.Join(xdgConfig, "nwg-drawer")
+	} else if home := os.Getenv("HOME"); home != "" {
+		dir = path.Join(home, ".config/nwg-drawer")
 	}
 
 	log.Infof("Config dir: %s", dir)
@@ -176,6 +166,20 @@ func configDir() string {
 	return dir
 }
 
+func dataDir() string {
+	var dir string
+	if xdgData := os.Getenv("XDG_DATA_HOME"); xdgData != "" {
+		dir = path.Join(xdgData, "nwg-drawer")
+	} else if home := os.Getenv("HOME"); home != "" {
+		dir = path.Join(home, ".local/share/nwg-drawer")
+	}
+
+	log.Infof("Data dir: %s", dir)
+	createDir(dir)
+
+	return dir
+}
+
 func createDir(dir string) {
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err := os.MkdirAll(dir, os.ModePerm)
@@ -196,12 +200,22 @@ func copyFile(src, dst string) error {
 	if srcfd, err = os.Open(src); err != nil {
 		return err
 	}
-	defer srcfd.Close()
+	defer func(srcfd *os.File) {
+		err := srcfd.Close()
+		if err != nil {
+			log.Errorf("Error closing file: %v", srcfd)
+		}
+	}(srcfd)
 
 	if dstfd, err = os.Create(dst); err != nil {
 		return err
 	}
-	defer dstfd.Close()
+	defer func(dstfd *os.File) {
+		err := dstfd.Close()
+		if err != nil {
+			log.Errorf("Error closing file: %v", dstfd)
+		}
+	}(dstfd)
 
 	if _, err = io.Copy(dstfd, srcfd); err != nil {
 		return err
@@ -212,22 +226,13 @@ func copyFile(src, dst string) error {
 	return os.Chmod(dst, srcinfo.Mode())
 }
 
-func getDataHome() string {
-	if os.Getenv("XDG_DATA_HOME") != "" {
-		return os.Getenv("XDG_DATA_HOME")
-	}
-	return "/usr/share/"
-}
-
 func getAppDirs() []string {
 	var dirs []string
-	xdgDataDirs := ""
 
 	home := os.Getenv("HOME")
 	xdgDataHome := os.Getenv("XDG_DATA_HOME")
-	if os.Getenv("XDG_DATA_DIRS") != "" {
-		xdgDataDirs = os.Getenv("XDG_DATA_DIRS")
-	} else {
+	xdgDataDirs := os.Getenv("XDG_DATA_DIRS")
+	if xdgDataDirs == "" {
 		xdgDataDirs = "/usr/local/share/:/usr/share/"
 	}
 	if xdgDataHome != "" {
@@ -260,12 +265,20 @@ func loadPreferredApps(path string) (map[string]interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer jsonFile.Close()
+	defer func(jsonFile *os.File) {
+		err := jsonFile.Close()
+		if err != nil {
+			log.Errorf("Error closing file: %v", jsonFile)
+		}
+	}(jsonFile)
 
-	byteValue, _ := ioutil.ReadAll(jsonFile)
+	byteValue, _ := io.ReadAll(jsonFile)
 
 	var result map[string]interface{}
-	json.Unmarshal([]byte(byteValue), &result)
+	err = json.Unmarshal(byteValue, &result)
+	if err != nil {
+		return nil, err
+	}
 
 	if len(result) == 0 {
 		return nil, errors.New("json invalid or empty")
@@ -274,8 +287,8 @@ func loadPreferredApps(path string) (map[string]interface{}, error) {
 	return result, nil
 }
 
-func listFiles(dir string) ([]fs.FileInfo, error) {
-	files, err := ioutil.ReadDir(dir)
+func listFiles(dir string) ([]fs.DirEntry, error) {
+	files, err := os.ReadDir(dir)
 	if err == nil {
 		return files, nil
 	}
@@ -299,12 +312,12 @@ func listDesktopFiles() []string {
 }
 
 func setUpCategories() {
-	path := filepath.Join(getDataHome(), "nwg-drawer/desktop-directories")
 	var other category
 
 	for _, cName := range categoryNames {
 		fileName := fmt.Sprintf("%s.directory", cName)
-		lines, err := loadTextFile(filepath.Join(path, fileName))
+		fp := filepath.Join("/usr/share/nwg-drawer/desktop-directories", fileName)
+		lines, err := loadTextFile(fp)
 		if err == nil {
 			var cat category
 			cat.Name = cName
@@ -349,6 +362,8 @@ func setUpCategories() {
 			} else {
 				other = cat
 			}
+		} else {
+			log.Errorf("Couldn't open %s", fp)
 		}
 	}
 	sort.Slice(categories, func(i, j int) bool {
@@ -462,7 +477,7 @@ func pathExists(name string) bool {
 }
 
 func loadTextFile(path string) ([]string, error) {
-	bytes, err := ioutil.ReadFile(path)
+	bytes, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
@@ -513,20 +528,35 @@ func savePinned() {
 		log.Fatal(err)
 	}
 
-	defer f.Close()
+	defer func(f *os.File) {
+		err := f.Close()
+		if err != nil {
+			log.Errorf("Error closing file: %v", f)
+		}
+	}(f)
 
 	for _, line := range pinned {
-		if line != "" {
+		//skip invalid lines
+		if line != "" && id2entry[line].DesktopID != "" {
 			_, err := f.WriteString(line + "\n")
 
 			if err != nil {
-				log.Errorf("Error saving pinned", err)
+				log.Error("Error saving pinned", err)
 			}
 		}
 	}
 }
 
 func launch(command string, terminal bool) {
+	themeToPrepend := ""
+	// add "GTK_THEME=<default_gtk_theme>" environment variable
+	if *forceTheme {
+		settings, _ := gtk.SettingsGetDefault()
+		th, err := settings.GetProperty("gtk-theme-name")
+		if err == nil {
+			themeToPrepend = th.(string)
+		}
+	}
 	// trim % and everything afterwards
 	if strings.Contains(command, "%") {
 		cutAt := strings.Index(command, "%")
@@ -556,6 +586,10 @@ func launch(command string, terminal bool) {
 		cmdIdx = 0
 	}
 
+	if themeToPrepend != "" {
+		envVars = append(envVars, fmt.Sprintf("GTK_THEME=%s", themeToPrepend))
+	}
+
 	cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)
 
 	if terminal {
@@ -578,7 +612,19 @@ func launch(command string, terminal bool) {
 	msg := fmt.Sprintf("env vars: %s; command: '%s'; args: %s\n", envVars, elements[cmdIdx], elements[1+cmdIdx:])
 	log.Info(msg)
 
-	cmd.Start()
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setsid: true,
+	}
+
+	if cmd.Start() != nil {
+		log.Warn("Unable to launch terminal emulator!")
+	} else {
+		// Collect the exit code of the child process to prevent zombies
+		// if the drawer runs in resident mode
+		go func() {
+			_ = cmd.Wait()
+		}()
+	}
 
 	if *resident {
 		restoreStateAndHide()
@@ -604,7 +650,15 @@ func open(filePath string, xdgOpen bool) {
 	}
 	log.Infof("Executing: %s", cmd)
 
-	cmd.Start()
+	if cmd.Start() != nil {
+		log.Warn("Unable to execute command!")
+	} else {
+		// Collect the exit code of the child process to prevent zombies
+		// if the drawer runs in resident mode
+		go func() {
+			_ = cmd.Wait()
+		}()
+	}
 
 	if *resident {
 		restoreStateAndHide()
@@ -648,3 +702,19 @@ func mapOutputs() (map[string]*gdk.Monitor, error) {
 	}
 	return result, nil
 }
+
+// KAdot / https://stackoverflow.com/a/38537764/4040598 - thanks!
+func substring(s string, start int, end int) string {
+	startStrIdx := 0
+	i := 0
+	for j := range s {
+		if i == start {
+			startStrIdx = j
+		}
+		if i == end {
+			return s[startStrIdx:j]
+		}
+		i++
+	}
+	return s[startStrIdx:]
+}

uicomponents.go

@@ -32,6 +32,10 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 	if len(pinned) > 0 {
 		for _, desktopID := range pinned {
 			entry := id2entry[desktopID]
+			if entry.DesktopID == "" {
+				log.Debugf("Pinned item doesn't seem to exist: %s", desktopID)
+				continue
+			}
 
 			btn, _ := gtk.ButtonNew()
 
@@ -54,9 +58,8 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 				name = entry.Name
 			}
 			if len(name) > 20 {
-				r := []rune(name)
-				name = string(r[:17])
-				name = fmt.Sprintf("%s…", name)
+				r := substring(name, 0, 17)
+				name = fmt.Sprintf("%s…", string(r))
 			}
 			btn.SetLabel(name)
 
@@ -248,9 +251,8 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	button.SetImagePosition(gtk.POS_TOP)
 	name := entry.NameLoc
 	if len(name) > 20 {
-		r := []rune(name)
-		name = string(r[:17])
-		name = fmt.Sprintf("%s…", name)
+		r := substring(name, 0, 17)
+		name = fmt.Sprintf("%s…", string(r))
 	}
 	button.SetLabel(name)
 
@@ -258,6 +260,10 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	exec := entry.Exec
 	terminal := entry.Terminal
 	desc := entry.CommentLoc
+	if len(desc) > 120 {
+		r := substring(desc, 0, 117)
+		desc = fmt.Sprintf("%s…", string(r))
+	}
 	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
 		btnEvent := gdk.EventButtonNewFromEvent(e)
 		if btnEvent.Button() == 1 {
@@ -425,6 +431,7 @@ func searchUserDir(dir string) {
 		fileSearchResultFlowBox.Add(btn)
 
 		for _, path := range fileSearchResults {
+			log.Debugf("Path: %s", path)
 			partOfPathToShow := strings.Split(path, userDirsMap[dir])[1]
 			if partOfPathToShow != "" {
 				if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) {

watcher.go

@@ -20,12 +20,12 @@ func watchFiles() {
 	defer watcher.Close()
 
 	if err := watcher.Add(pinnedFile); err != nil {
-		log.Errorf("ERROR", err)
+		log.Errorf("ERROR: %s", err)
 	}
 
 	for _, fp := range appDirs {
 		if err := filepath.Walk(fp, watchDir); err != nil {
-			log.Errorf("ERROR", err)
+			log.Errorf("ERROR: %s", err)
 		}
 	}
 
@@ -41,11 +41,13 @@ func watchFiles() {
 						event.Op.String() == "RENAME") {
 					desktopTrigger = true
 				} else if event.Name == pinnedFile {
-					pinnedTrigger = true
+					// TODO: This can be used to propagate information about the changed file to the
+					//       GUI to avoid recreating everything
+					pinnedItemsChanged <- struct{}{}
 				}
 
 			case err := <-watcher.Errors:
-				log.Errorf("ERROR", err)
+				log.Errorf("ERROR: %s", err)
 			}
 		}
 	}()

xdgdesktop_parser.go

@@ -54,7 +54,34 @@ func parseDesktopEntry(id string, in io.Reader) (entry desktopEntry, err error)
 		case "Terminal":
 			entry.Terminal, _ = strconv.ParseBool(value)
 		case "NoDisplay":
-			entry.NoDisplay, _ = strconv.ParseBool(value)
+			if !entry.NoDisplay {
+				entry.NoDisplay, _ = strconv.ParseBool(value)
+			}
+		case "Hidden":
+			if !entry.NoDisplay {
+				entry.NoDisplay, _ = strconv.ParseBool(value)
+			}
+		case "OnlyShowIn":
+			if !entry.NoDisplay {
+				entry.NoDisplay = true
+				currentDesktop := os.Getenv("XDG_CURRENT_DESKTOP")
+				if currentDesktop != "" {
+					for _, ele := range strings.Split(value, ";") {
+						if ele == currentDesktop && ele != "" {
+							entry.NoDisplay = false
+						}
+					}
+				}
+			}
+		case "NotShowIn":
+			currentDesktop := os.Getenv("XDG_CURRENT_DESKTOP")
+			if !entry.NoDisplay && currentDesktop != "" {
+				for _, ele := range strings.Split(value, ";") {
+					if ele == currentDesktop && ele != "" {
+						entry.NoDisplay = true
+					}
+				}
+			}
 		case "Exec":
 			entry.Exec = cleanexec.Replace(value)
 		}