trim comments > 120 chars #61

prefer dark theme

.gitignore

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

Makefile

@@ -5,11 +5,15 @@ get:
 	go get github.com/dlasky/gotk3-layershell/layershell
 	go get github.com/joshuarubin/go-sway
 	go get github.com/allan-simon/go-singleinstance
+	go get "github.com/sirupsen/logrus"
+	go get github.com/fsnotify/fsnotify
 
 build:
-	go build -o bin/nwg-drawer *.go
+	go build -o bin/nwg-drawer .
 
 install:
+	-pkill -f nwg-drawer
+	sleep 1
 	mkdir -p /usr/share/nwg-drawer
 	cp -r desktop-directories /usr/share/nwg-drawer
 	cp drawer.css /usr/share/nwg-drawer
@@ -20,4 +24,4 @@ uninstall:
 	rm /usr/bin/nwg-drawer
 
 run:
-	go run *.go
+	go run .

README.md

@@ -5,7 +5,8 @@ This application is a part of the [nwg-shell](https://github.com/nwg-piotr/nwg-s
 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
 [sway](https://github.com/swaywm/sway) in mind, but should also work with other wlroots-based Wayland compositors.
-X Window System is not supported.
+X Window System is not officially supported, but you should be able to use the drawer on some floating
+window managers (tested on Openbox).
 
 The `nwg-drawer` command displays the application grid. The search entry allows to look for installed applications,
 and for files in XDG user directories. The grid view may also be filtered by categories.
@@ -14,27 +15,35 @@ 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)
 
+To close the window w/o running a program, you may use `Esc` key, or right-click the window next to the icons.
+
+## v0.2.x note
+
+1. Placing config files in the nwg-panel config directory was a mistake, sorry. The 0.2.0 version migrates them to `~/.config/nwg-drawer`.
+2. From now on you may run the program residently, which should speed it up (but also occupy some resources!). See "Running" below.
+
 ## Installation
 
 ### Dependencies
 
-- go 1.16 (just to build)
+- go >=1.16 (just to build)
 - gtk3
 - gtk-layer-shell
+- xdg-utils
 
 Optional (recommended):
 
 - thunar
-- alacritty
+- foot
 
-You may use another file manager and terminal emulator (see command line arguments), but for now the program has
+You may use another file manager and terminal emulator (see command line arguments), but mentioned above have been
- only been tested with the two mentioned above.
+confirmed to work well with the program. Also see **Files** below.
 
 ### Steps
 
@@ -43,9 +52,6 @@ You may use another file manager and terminal emulator (see command line argumen
 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
@@ -53,20 +59,28 @@ $ nwg-drawer -h
 Usage of nwg-drawer:
   -c uint
     	number of Columns (default 6)
+  -d	Turn on Debug messages
   -fm string
     	File Manager (default "thunar")
   -fscol uint
     	File Search result COLumns (default 2)
   -fslen int
-    	File Search name length Limit (default 80)
+    	File Search name LENgth Limit (default 80)
+  -g string
+    	GTK theme name, eg. "Adwaita-dark"
   -is int
     	Icon Size (default 64)
   -lang string
     	force lang, e.g. "en", "pl"
+  -nocats
+    	Disable filtering by category
+  -nofs
+    	Disable file search
   -o string
     	name of the Output to display the drawer on (sway only)
   -ovl
     	use OVerLay layer
+  -r	Leave the program resident in memory
   -s string
     	Styling: css file name (default "drawer.css")
   -spacing uint
@@ -76,9 +90,86 @@ Usage of nwg-drawer:
   -v	display Version information
   ```
 
+  *NOTE: the `$TERM` environment variable overrides the `-term` argument if defined.*
+
+## Running
+
+Since v0.2.x you may use the drawer in two ways:
+
+1. Simply run the `nwg-drawer` command, by adding a key binding to your sway config file, e.g.:
+
+```text
+bindsym Mod1+F1 exec nwg-drawer
+```
+
+2. Run a resident instance on startup, and use the `nwg-drawer` command to show the window, e.g.:
+
+```text
+exec_always nwg-drawer -r
+bindsym Mod1+F1 exec nwg-drawer
+```
+
+The second line does nothing but `pkill -USR1 nwg-drawer`, so you may just use this command instead. Actually
+this should be a little bit faster.
+
+Running a resident instance should speed up use of the drawer significantly. Pay attention to the fact, that you
+need to `pkill -f nwg-drawer` and reload sway to apply any new arguments!
+
+## Logging
+
+In case you encounter an issue, you may need debug messages. If you use the resident instance, you'll see nothing
+in the terminal. Please edit your sway config file:
+
+```text
+exec nwg-drawer -r -d 2> ~/drawer.log
+```
+
+exit sway, launch it again and include the `drawer.log` content in the GitHub issue. Do not use `exec_always` here: it'll destroy the log file content on sway reload.
+
 ## Styling
 
-Edit `~/.config/nwg-panel/drawer.css` to your taste.
+Edit `~/.config/nwg-drawer/drawer.css` to your taste.
+
+## Files
+
+When the search phrase is at least 3 characters long, your XDG user directories are being searched.
+
+![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.
+
+### Sample `preferred-apps.json` file content
+
+```json
+{
+  "\\.pdf$": "atril",
+  "\\.svg$": "inkscape",
+  "\\.(jpg|png|tiff|gif)$": "feh",
+  "\\.(mp3|ogg|flac|wav|wma)$": "audacious",
+  "\\.(avi|mp4|mkv|mov|wav)$": "mpv",
+  "\\.(doc|docx|xls|xlsx)$": "libreoffice"
+}
+```
+
+Use the **right mouse button** to open the file with your file manager (see `-fm` argument). The result depends
+on the file manager you use.
+
+- thunar will open the file location
+- pcmanfm will open the file with its associated program
+- caja won't open anything, except for directories
+
+I've noy yet tried other file managers.
+
+### File search exclusions
+
+You may want to exclude some paths inside your XDG user directories from searching. If so, define exclusions in the
+`~/.config/nwg-panel/excluded-dirs` file, e.g. like this:
+
+```text
+# exclude all paths containing 'node_modules'
+node_modules
+```
 
 ## Credits
 
@@ -89,3 +180,5 @@ Copyright (c) 2015-2018 gotk3 contributors
 - [gotk3-layershell](https://github.com/dlasky/gotk3-layershell) by [@dlasky](https://github.com/dlasky/gotk3-layershell/commits?author=dlasky) - many thanks for writing this software, and for patience with my requests!
 - [go-sway](https://github.com/joshuarubin/go-sway) Copyright (c) 2019 Joshua Rubin
 - [go-singleinstance](github.com/allan-simon/go-singleinstance) Copyright (c) 2015 Allan Simon
+- [logrus](https://github.com/sirupsen/logrus) Copyright (c) 2014 Simon Eskildsen
+- [fsnotify](https://github.com/fsnotify/fsnotify) Copyright (c) 2012-2019 fsnotify Authors

go.mod

@@ -4,7 +4,9 @@ go 1.16
 
 require (
 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
-	github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261
+	github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7
-	github.com/gotk3/gotk3 v0.6.0
+	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
 )

go.sum

@@ -1,19 +1,24 @@
 github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 h1:28uU3TtuvQ6KRndxg9TrC868jBWmSKgh0GTXkACCXmA=
 github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37/go.mod h1:6AXRstqK+32jeFmw89QGL2748+dj34Av4xc/I9oo9BY=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261 h1:eoXn91ckLWKMXmQKX34UHEF2XMyQpRnnP80fDiu+kys=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261/go.mod h1:d56Gslp3IaiT8lqxD/lO1Msz1wYgD8D/HTKHgSdg9tU=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gotk3/gotk3 v0.5.3-0.20210223154815-289cfb6dbf32/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7 h1:LDo0kwt+oW9a4lWlj2OakIgMW1ySXXVRGFt8GHUdYYA=
-github.com/gotk3/gotk3 v0.6.0 h1:Aqlq4/6VabNwtCyA9M9zFNad5yHAqCi5heWnZ9y+3dA=
+github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
-github.com/gotk3/gotk3 v0.6.0/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+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/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/joshuarubin/lifecycle v1.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54=
 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/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=
@@ -22,3 +27,6 @@ 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=
 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=

main.go

@@ -3,15 +3,17 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"syscall"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/allan-simon/go-singleinstance"
 	"github.com/dlasky/gotk3-layershell/layershell"
 	"github.com/gotk3/gotk3/gdk"
@@ -19,15 +21,16 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
-const version = "0.1.4"
+const version = "0.3.0"
 
 var (
 	appDirs         []string
 	configDirectory string
 	pinnedFile      string
 	pinned          []string
-	src             glib.SourceHandle
 	id2entry        map[string]desktopEntry
+	preferredApps   map[string]interface{}
+	exclusions      []string
 )
 
 var categoryNames = [...]string{
@@ -58,6 +61,7 @@ type desktopEntry struct {
 	CommentLoc string
 	Icon       string
 	Exec       string
+	Category   string
 	Terminal   bool
 	NoDisplay  bool
 }
@@ -79,6 +83,7 @@ var desktopEntries []desktopEntry
 
 // UI elements
 var (
+	win                     *gtk.Window
 	resultWindow            *gtk.ScrolledWindow
 	fileSearchResults       []string
 	searchEntry             *gtk.SearchEntry
@@ -90,73 +95,153 @@ var (
 	fileSearchResultWrapper *gtk.Box
 	pinnedFlowBox           *gtk.FlowBox
 	pinnedFlowBoxWrapper    *gtk.Box
+	categoriesWrapper       *gtk.Box
 	catButtons              []*gtk.Button
 	statusLabel             *gtk.Label
 	status                  string
 	ignore                  string
+	desktopTrigger          bool
+	pinnedItemsChanged      chan interface{} = make(chan interface{}, 1)
 )
 
+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 == "" || s == "linux" {
+		return fallback
+	}
+	return s
+}
+
 // Flags
 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 overlay = flag.Bool("ovl", false, "use OVerLay layer")
+var gtkTheme = flag.String("g", "", "GTK 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 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", "alacritty", "Terminal emulator")
+var term = flag.String("term", defaultStringIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
-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 noFS = flag.Bool("nofs", false, "Disable file search")
+var resident = flag.Bool("r", false, "Leave the program resident in memory")
+var debug = flag.Bool("d", false, "Turn on Debug messages")
 
 func main() {
 	timeStart := time.Now()
 	flag.Parse()
 
+	if *debug {
+		log.SetLevel(log.DebugLevel)
+	}
+
 	if *displayVersion {
 		fmt.Printf("nwg-drawer version %s\n", version)
 		os.Exit(0)
 	}
 
 	// 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)
+	signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1)
+
 	go func() {
 		for {
 			s := <-signalChan
-			if s == syscall.SIGTERM {
+			switch s {
-				println("SIGTERM received, bye bye!")
+			case syscall.SIGTERM:
+				log.Info("SIGTERM received, bye bye")
 				gtk.MainQuit()
+			case syscall.SIGUSR1:
+				if *resident {
+					// As win.Show() called from inside a goroutine randomly crashes GTK,
+					// 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")
+						showWindowChannel <- struct{}{}
+					} else {
+						log.Debug("SIGUSR1 received, hiding the window")
+						restoreStateAndHide()
+					}
+				} else {
+					log.Info("SIGUSR1 received, and I'm not resident, bye bye")
+					gtk.MainQuit()
+				}
+			default:
+				log.Info("Unknown signal")
 			}
 		}
 	}()
 
-	// We want the same key/mouse binding to turn the dock off: kill the running instance and exit.
+	// If running instance found, we want it to show the window. The new instance will send SIGUSR1 and die
-	lockFilePath := fmt.Sprintf("%s/nwg-drawer.lock", tempDir())
+	// (equivalent of `pkill -USR1 nwg-drawer`).
+	// 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")
 	lockFile, err := singleinstance.CreateLockFile(lockFilePath)
 	if err != nil {
 		pid, err := readTextFile(lockFilePath)
 		if err == nil {
 			i, err := strconv.Atoi(pid)
 			if err == nil {
-				println("Running instance found, sending SIGTERM and exiting...")
+				if *resident {
-				syscall.Kill(i, syscall.SIGTERM)
+					log.Warnf("Resident instance already running (PID %v)", i)
+				} else {
+					log.Infof("Showing resident instance (PID %v)", i)
+					syscall.Kill(i, syscall.SIGUSR1)
+				}
 			}
 		}
 		os.Exit(0)
 	}
 	defer lockFile.Close()
 
+	log.Infof("term: %s", *term)
+
 	// LANGUAGE
 	if *lang == "" && os.Getenv("LANG") != "" {
 		*lang = strings.Split(os.Getenv("LANG"), ".")[0]
 	}
-	println(fmt.Sprintf("lang: %s", *lang))
+	log.Info(fmt.Sprintf("lang: %s", *lang))
 
 	// ENVIRONMENT
 	configDirectory = configDir()
 
+	// Placing the drawer config files in the nwg-panel config directory was a mistake.
+	// Let's move them to their own location.
+	oldConfigDirectory, err := oldConfigDir()
+	if err == nil {
+		for _, p := range []string{"drawer.css", "preferred-apps.json"} {
+			if pathExists(path.Join(oldConfigDirectory, p)) {
+				log.Infof("File %s found in stale location, moving to %s", p, configDirectory)
+				if !pathExists(path.Join(configDirectory, p)) {
+					err = os.Rename(path.Join(oldConfigDirectory, p), path.Join(configDirectory, p))
+					if err == nil {
+						log.Info("Success")
+					} else {
+						log.Warn(err)
+					}
+				} else {
+					log.Warnf("Failed moving %s to %s: path already exists!", path.Join(oldConfigDirectory, p), path.Join(configDirectory, p))
+				}
+
+			}
+		}
+	}
+
+	// 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"))
 	}
@@ -171,36 +256,79 @@ func main() {
 	pinned, err = loadTextFile(pinnedFile)
 	if err != nil {
 		pinned = nil
+		savePinned()
 	}
-	println(fmt.Sprintf("Found %v pinned items", len(pinned)))
+	log.Info(fmt.Sprintf("Found %v pinned items", len(pinned)))
 
-	cssFile := filepath.Join(configDirectory, *cssFileName)
+	if !strings.HasPrefix(*cssFileName, "/") {
+		*cssFileName = filepath.Join(configDirectory, *cssFileName)
+	}
 
 	appDirs = getAppDirs()
 
 	setUpCategories()
 
 	desktopFiles := listDesktopFiles()
-	println(fmt.Sprintf("Found %v desktop files", len(desktopFiles)))
+	log.Info(fmt.Sprintf("Found %v desktop files", len(desktopFiles)))
 
 	status = parseDesktopFiles(desktopFiles)
 
+	// For opening files we use xdg-open. As its configuration is PITA, we may override some associations
+	// in the ~/.config/nwg-panel/preferred-apps.json file.
+	paFile := path.Join(configDirectory, "preferred-apps.json")
+	if pathExists(paFile) {
+		preferredApps, err = loadPreferredApps(paFile)
+		if err != nil {
+			log.Infof("Custom associations file %s not found or invalid", paFile)
+		} else {
+			log.Infof("Found %v associations in %s", len(preferredApps), paFile)
+		}
+	} else {
+		log.Infof("%s file not found", paFile)
+	}
+
+	// Load user-defined paths excluded from file search
+	exFile := path.Join(configDirectory, "excluded-dirs")
+	if pathExists(exFile) {
+		exclusions, err = loadTextFile(exFile)
+		if err != nil {
+			log.Infof("Search exclusions file %s not found %s", exFile, err)
+		} else {
+			log.Infof("Found %v search exclusions in %s", len(exclusions), exFile)
+		}
+	} else {
+		log.Infof("%s file not found", exFile)
+	}
+
 	// 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 {
+		settings.SetProperty("gtk-application-prefer-dark-theme", true)
+		log.Info("Preferring dark theme variants")
+	}
+
 	cssProvider, _ := gtk.CssProviderNew()
 
-	err = cssProvider.LoadFromPath(cssFile)
+	err = cssProvider.LoadFromPath(*cssFileName)
 	if err != nil {
-		println(fmt.Sprintf("ERROR: %s css file not found or erroneous. Using GTK styling.", cssFile))
+		log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
-		println(fmt.Sprintf(">>> %s", err))
+		log.Errorf("%s", err)
 	} else {
-		println(fmt.Sprintf("Using style from %s", cssFile))
+		log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
 		screen, _ := gdk.ScreenGetDefault()
 		gtk.AddProviderForScreen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 	}
 
-	win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	win, err = gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
 	if err != nil {
 		log.Fatal("Unable to create window:", err)
 	}
@@ -217,7 +345,7 @@ func main() {
 				layershell.SetMonitor(win, monitor)
 
 			} else {
-				println(err)
+				log.Errorf("%s", err)
 			}
 		}
 
@@ -233,6 +361,11 @@ func main() {
 			layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_TOP)
 		}
 
+		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)
+
 		layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
 	}
 
@@ -240,50 +373,47 @@ func main() {
 		gtk.MainQuit()
 	})
 
-	win.Connect("key-press-event", func(window *gtk.Window, event *gdk.Event) bool {
+	win.Connect("key-release-event", func(window *gtk.Window, event *gdk.Event) bool {
 		key := &gdk.EventKey{Event: event}
-		switch key.KeyVal() {
+		if key.KeyVal() == gdk.KEY_Escape {
-		case gdk.KEY_Escape:
 			s, _ := searchEntry.GetText()
 			if s != "" {
 				searchEntry.GrabFocus()
 				searchEntry.SetText("")
 			} else {
-				gtk.MainQuit()
+				if !*resident {
+					gtk.MainQuit()
+				} else {
+					restoreStateAndHide()
+				}
 			}
-			return false
+			return true
+		}
+		return false
+	})
+
+	win.Connect("key-press-event", func(window *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,
 			gdk.KEY_Return, gdk.KEY_Page_Up, gdk.KEY_Page_Down, gdk.KEY_Home, gdk.KEY_End:
-			//searchEntry.SetText("")
 			return false
 
 		default:
 			if !searchEntry.IsFocus() {
-				searchEntry.GrabFocus()
+				searchEntry.GrabFocusWithoutSelecting()
 			}
 			return false
 		}
 	})
 
-	// Close the window on leave, but not immediately, to avoid accidental closes
-	win.Connect("leave-notify-event", func() {
-		src = glib.TimeoutAdd(uint(500), func() bool {
-			gtk.MainQuit()
-			return false
-		})
-	})
-
-	win.Connect("enter-notify-event", func() {
-		cancelClose()
-	})
-
 	/*
 		In case someone REALLY needed to use X11 - for some stupid Zoom meeting or something, this allows
 		the drawer to behave properly on Openbox, and possibly somewhere else. For sure not on i3.
 		This feature is not really supported and will stay undocumented.
 	*/
 	if !wayland() {
-		println("Not Wayland, oh really?")
+		log.Info("Not Wayland, oh really?")
 		win.SetDecorated(false)
 		win.Maximize()
 	}
@@ -299,10 +429,12 @@ func main() {
 	searchEntry.SetMaxWidthChars(30)
 	searchBoxWrapper.PackStart(searchEntry, true, false, 0)
 
-	categoriesWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	if !*noCats {
-	categoriesButtonBox := setUpCategoriesButtonBox()
+		categoriesWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
-	categoriesWrapper.PackStart(categoriesButtonBox, true, false, 0)
+		categoriesButtonBox := setUpCategoriesButtonBox()
-	outerVBox.PackStart(categoriesWrapper, false, false, 0)
+		categoriesWrapper.PackStart(categoriesButtonBox, true, false, 0)
+		outerVBox.PackStart(categoriesWrapper, false, false, 0)
+	}
 
 	pinnedWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	outerVBox.PackStart(pinnedWrapper, false, false, 0)
@@ -312,9 +444,20 @@ func main() {
 	pinnedFlowBox = setUpPinnedFlowBox()
 
 	resultWindow, _ = gtk.ScrolledWindowNew(nil, nil)
+	resultWindow.SetEvents(int(gdk.ALL_EVENTS_MASK))
 	resultWindow.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-	resultWindow.Connect("enter-notify-event", func() {
+
-		cancelClose()
+	resultWindow.Connect("button-release-event", func(sw *gtk.ScrolledWindow, e *gdk.Event) bool {
+		btnEvent := gdk.EventButtonNewFromEvent(e)
+		if btnEvent.Button() == 3 {
+			if !*resident {
+				gtk.MainQuit()
+			} else {
+				restoreStateAndHide()
+			}
+			return true
+		}
+		return false
 	})
 	outerVBox.PackStart(resultWindow, true, true, 10)
 
@@ -342,11 +485,13 @@ func main() {
 	resultsWrapper.PackStart(placeholder, true, true, 0)
 	placeholder.SetSizeRequest(20, 20)
 
-	wrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	if !*noFS {
-	fileSearchResultWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+		wrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
-	fileSearchResultWrapper.SetProperty("name", "files-box")
+		fileSearchResultWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
-	wrapper.PackStart(fileSearchResultWrapper, true, false, 0)
+		fileSearchResultWrapper.SetProperty("name", "files-box")
-	resultsWrapper.PackEnd(wrapper, false, false, 10)
+		wrapper.PackStart(fileSearchResultWrapper, true, false, 0)
+		resultsWrapper.PackEnd(wrapper, false, false, 10)
+	}
 
 	statusLineWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	outerVBox.PackStart(statusLineWrapper, false, false, 10)
@@ -354,11 +499,92 @@ func main() {
 	statusLineWrapper.PackStart(statusLabel, true, false, 0)
 
 	win.ShowAll()
-	fileSearchResultWrapper.SetSizeRequest(appFlowBox.GetAllocatedWidth(), 1)
+
-	categoriesWrapper.SetSizeRequest(1, categoriesWrapper.GetAllocatedHeight()*2)
+	if !*noFS {
-	fileSearchResultWrapper.Hide()
+		fileSearchResultWrapper.SetSizeRequest(appFlowBox.GetAllocatedWidth(), 1)
+		fileSearchResultWrapper.Hide()
+	}
+	if !*noCats {
+		categoriesWrapper.SetSizeRequest(1, categoriesWrapper.GetAllocatedHeight()*2)
+	}
+	if *resident {
+		win.Hide()
+	}
 
 	t := time.Now()
-	println(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
+	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)
+	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
+						b := appFlowBox.GetChildAtIndex(0)
+						if b != nil {
+							button, err := b.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
+				})
+			}
+		}
+	}()
+
+	go watchFiles()
+
 	gtk.Main()
 }
+
+func restoreStateAndHide() {
+	timeStart1 := time.Now()
+	win.Hide()
+
+	// clear search
+	searchEntry.SetText("")
+
+	// clear category filter (in gotk3 it means: rebuild, as we have no filtering here)
+	appFlowBox = setUpAppsFlowBox(nil, "")
+	for _, btn := range catButtons {
+		btn.SetImagePosition(gtk.POS_LEFT)
+		btn.SetSizeRequest(0, 0)
+	}
+
+	// scroll to the top
+	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

@@ -2,20 +2,25 @@ package main
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"io/fs"
 	"io/ioutil"
-	"log"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
+	"regexp"
 	"sort"
 	"strings"
+	"syscall"
 	"time"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/gotk3/gotk3/gdk"
-	"github.com/gotk3/gotk3/glib"
 	"github.com/gotk3/gotk3/gtk"
 	"github.com/joshuarubin/go-sway"
 )
@@ -24,19 +29,6 @@ func wayland() bool {
 	return os.Getenv("WAYLAND_DISPLAY") != "" || os.Getenv("XDG_SESSION_TYPE") == "wayland"
 }
 
-/*
-Window leave-notify-event event quits the program with glib Timeout 500 ms.
-We might have left the window by accident, so let's clear the timeout if window re-entered.
-Furthermore - hovering a widget triggers window leave-notify-event event, and the timeout
-needs to be cleared as well.
-*/
-func cancelClose() {
-	if src > 0 {
-		glib.SourceRemove(src)
-		src = 0
-	}
-}
-
 func createPixbuf(icon string, size int) (*gdk.Pixbuf, error) {
 	iconTheme, err := gtk.IconThemeGetDefault()
 	if err != nil {
@@ -46,7 +38,7 @@ func createPixbuf(icon string, size int) (*gdk.Pixbuf, error) {
 	if strings.Contains(icon, "/") {
 		pixbuf, err := gdk.PixbufNewFromFileAtSize(icon, size, size)
 		if err != nil {
-			println(err)
+			log.Errorf("%s", err)
 			return nil, err
 		}
 		return pixbuf, nil
@@ -89,7 +81,7 @@ func mapXdgUserDirs() map[string]string {
 
 	userDirsFile := filepath.Join(home, ".config/user-dirs.dirs")
 	if pathExists(userDirsFile) {
-		println(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile))
+		log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile))
 		lines, _ := loadTextFile(userDirsFile)
 		for _, l := range lines {
 			if strings.HasPrefix(l, "XDG_DOCUMENTS_DIR") {
@@ -113,7 +105,7 @@ func mapXdgUserDirs() map[string]string {
 			}
 		}
 	} else {
-		println(fmt.Sprintf("%s file not found, using defaults", userDirsFile))
+		log.Warnf("%s file not found, using defaults", userDirsFile)
 	}
 
 	return result
@@ -159,14 +151,29 @@ func readTextFile(path string) (string, error) {
 	return string(bytes), nil
 }
 
-func configDir() string {
+func oldConfigDir() (string, error) {
 	if os.Getenv("XDG_CONFIG_HOME") != "" {
-		dir := fmt.Sprintf("%s/nwg-panel", os.Getenv("XDG_CONFIG_HOME"))
+		dir := path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-panel")
-		createDir(dir)
+		return dir, nil
-		return (fmt.Sprintf("%s/nwg-panel", os.Getenv("XDG_CONFIG_HOME")))
+	} else if os.Getenv("HOME") != "" {
+		dir := path.Join(os.Getenv("HOME"), ".config/nwg-panel")
+		return dir, nil
 	}
-	dir := fmt.Sprintf("%s/.config/nwg-panel", os.Getenv("HOME"))
+
+	return "", errors.New("old config dir not found")
+}
+
+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")
+	}
+
+	log.Infof("Config dir: %s", dir)
 	createDir(dir)
+
 	return dir
 }
 
@@ -174,13 +181,13 @@ func createDir(dir string) {
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
 		err := os.MkdirAll(dir, os.ModePerm)
 		if err == nil {
-			fmt.Println("Creating dir:", dir)
+			log.Infof("Creating dir: %s", dir)
 		}
 	}
 }
 
 func copyFile(src, dst string) error {
-	fmt.Println("Copying file:", dst)
+	log.Infof("Copying file: %s", dst)
 
 	var err error
 	var srcfd *os.File
@@ -236,11 +243,36 @@ func getAppDirs() []string {
 		"/var/lib/flatpak/exports/share/applications"}
 
 	for _, d := range flatpakDirs {
-		if !isIn(dirs, d) {
+		if pathExists(d) && !isIn(dirs, d) {
 			dirs = append(dirs, d)
 		}
 	}
-	return dirs
+	var confirmedDirs []string
+	for _, d := range dirs {
+		if pathExists(d) {
+			confirmedDirs = append(confirmedDirs, d)
+		}
+	}
+	return confirmedDirs
+}
+
+func loadPreferredApps(path string) (map[string]interface{}, error) {
+	jsonFile, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer jsonFile.Close()
+
+	byteValue, _ := ioutil.ReadAll(jsonFile)
+
+	var result map[string]interface{}
+	json.Unmarshal([]byte(byteValue), &result)
+
+	if len(result) == 0 {
+		return nil, errors.New("json invalid or empty")
+	}
+
+	return result, nil
 }
 
 func listFiles(dir string) ([]fs.FileInfo, error) {
@@ -327,110 +359,37 @@ func setUpCategories() {
 }
 
 func parseDesktopFiles(desktopFiles []string) string {
+	desktopEntries = nil
 	id2entry = make(map[string]desktopEntry)
-	var added []string
 	skipped := 0
 	hidden := 0
 	for _, file := range desktopFiles {
-		lines, err := loadTextFile(file)
+		id := filepath.Base(file)
-		if err == nil {
+		if _, ok := id2entry[id]; ok {
-			parts := strings.Split(file, "/")
+			skipped++
-			desktopID := parts[len(parts)-1]
+			continue
-			name := ""
-			nameLoc := ""
-			comment := ""
-			commentLoc := ""
-			icon := ""
-			exec := ""
-			terminal := false
-			noDisplay := false
-
-			categories := ""
-
-			for _, l := range lines {
-				if strings.HasPrefix(l, "[") && l != "[Desktop Entry]" {
-					break
-				}
-				if strings.HasPrefix(l, "Name=") {
-					name = strings.Split(l, "=")[1]
-					continue
-				}
-				if strings.HasPrefix(l, fmt.Sprintf("Name[%s]=", strings.Split(*lang, "_")[0])) {
-					nameLoc = strings.Split(l, "=")[1]
-					continue
-				}
-				if strings.HasPrefix(l, "Comment=") {
-					comment = strings.Split(l, "=")[1]
-					continue
-				}
-				if strings.HasPrefix(l, fmt.Sprintf("Comment[%s]=", strings.Split(*lang, "_")[0])) {
-					commentLoc = strings.Split(l, "=")[1]
-					continue
-				}
-				if strings.HasPrefix(l, "Icon=") {
-					icon = strings.Split(l, "=")[1]
-					continue
-				}
-				if strings.HasPrefix(l, "Exec=") {
-					exec = strings.Split(l, "Exec=")[1]
-					disallowed := [2]string{"\"", "'"}
-					for _, char := range disallowed {
-						exec = strings.Replace(exec, char, "", -1)
-					}
-					continue
-				}
-				if strings.HasPrefix(l, "Categories=") {
-					categories = strings.Split(l, "Categories=")[1]
-					continue
-				}
-				if l == "Terminal=true" {
-					terminal = true
-					continue
-				}
-				if l == "NoDisplay=true" {
-					noDisplay = true
-					hidden++
-					continue
-				}
-			}
-
-			// if name[ln] not found, let's try to find name[ln_LN]
-			if nameLoc == "" {
-				nameLoc = name
-			}
-			if commentLoc == "" {
-				commentLoc = comment
-			}
-
-			if !isIn(added, desktopID) {
-				added = append(added, desktopID)
-
-				var entry desktopEntry
-				entry.DesktopID = desktopID
-				entry.Name = name
-				entry.NameLoc = nameLoc
-				entry.Comment = comment
-				entry.CommentLoc = commentLoc
-				entry.Icon = icon
-				entry.Exec = exec
-				entry.Terminal = terminal
-				entry.NoDisplay = noDisplay
-				desktopEntries = append(desktopEntries, entry)
-
-				id2entry[entry.DesktopID] = entry
-
-				assignToLists(entry.DesktopID, categories)
-
-			} else {
-				skipped++
-			}
 		}
+
+		entry, err := parseDesktopEntryFile(id, file)
+		if err != nil {
+			continue
+		}
+
+		if entry.NoDisplay {
+			hidden++
+			// We still need hidden entries, so `continue` is disallowed here
+			// Fixes bug introduced in #19
+		}
+
+		id2entry[entry.DesktopID] = entry
+		desktopEntries = append(desktopEntries, entry)
+		assignToLists(entry.DesktopID, entry.Category)
 	}
 	sort.Slice(desktopEntries, func(i, j int) bool {
 		return desktopEntries[i].NameLoc < desktopEntries[j].NameLoc
 	})
 	summary := fmt.Sprintf("%v entries (+%v hidden)", len(desktopEntries)-hidden, hidden)
-	println(fmt.Sprintf("Skipped %v duplicates; %v .desktop entries hidden by \"NoDisplay=true\"", skipped, hidden))
+	log.Infof("Skipped %v duplicates; %v .desktop entries hidden by \"NoDisplay=true\"", skipped, hidden)
 	return summary
 }
 
@@ -512,7 +471,7 @@ func loadTextFile(path string) ([]string, error) {
 	var output []string
 	for _, line := range lines {
 		line = strings.TrimSpace(line)
-		if line != "" {
+		if line != "" && !strings.HasPrefix(line, "#") {
 			output = append(output, line)
 		}
 
@@ -523,20 +482,20 @@ func loadTextFile(path string) ([]string, error) {
 func pinItem(itemID string) {
 	for _, item := range pinned {
 		if item == itemID {
-			println(item, "already pinned")
+			log.Warnf("%s already pinned", itemID)
 			return
 		}
 	}
 	pinned = append(pinned, itemID)
 	savePinned()
-	println(itemID, "pinned")
+	log.Infof("%s pinned", itemID)
 }
 
 func unpinItem(itemID string) {
 	if isIn(pinned, itemID) {
 		pinned = remove(pinned, itemID)
 		savePinned()
-		println(itemID, "unpinned")
+		log.Infof("%s unpinned", itemID)
 	}
 }
 
@@ -562,7 +521,7 @@ func savePinned() {
 			_, err := f.WriteString(line + "\n")
 
 			if err != nil {
-				println("Error saving pinned", err)
+				log.Errorf("Error saving pinned", err)
 			}
 		}
 	}
@@ -583,23 +542,31 @@ func launch(command string, terminal bool) {
 	envVarsNum := strings.Count(command, "=")
 	var envVars []string
 
-	cmdIdx := 0
+	cmdIdx := -1
-	lastEnvVarIdx := 0
 
 	if envVarsNum > 0 {
 		for idx, item := range elements {
 			if strings.Contains(item, "=") {
-				lastEnvVarIdx = idx
 				envVars = append(envVars, item)
+			} else if !strings.HasPrefix(item, "-") && cmdIdx == -1 {
+				cmdIdx = idx
 			}
 		}
-		cmdIdx = lastEnvVarIdx + 1
+	}
+	if cmdIdx == -1 {
+		cmdIdx = 0
 	}
 
 	cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)
 
 	if terminal {
-		args := []string{"-e", elements[cmdIdx]}
+		var args []string
+		if *term != "foot" {
+			args = []string{"-e", elements[cmdIdx]}
+		} else {
+			args = []string{elements[cmdIdx]}
+		}
+
 		cmd = exec.Command(*term, args...)
 	}
 
@@ -610,24 +577,61 @@ func launch(command string, terminal bool) {
 	}
 
 	msg := fmt.Sprintf("env vars: %s; command: '%s'; args: %s\n", envVars, elements[cmdIdx], elements[1+cmdIdx:])
-	println(msg)
+	log.Info(msg)
 
-	go cmd.Run()
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setsid: true,
+	}
 
-	glib.TimeoutAdd(uint(150), func() bool {
+	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()
+	} else {
 		gtk.MainQuit()
-		return false
+	}
-	})
 }
 
-func open(filePath string) {
+func open(filePath string, xdgOpen bool) {
-	cmd := exec.Command(*fileManager, filePath)
+	var cmd *exec.Cmd
-	go cmd.Run()
+	if xdgOpen {
+		cmd = exec.Command("xdg-open", filePath)
+		// Look for possible custom file association
+		for key, element := range preferredApps {
+			r, err := regexp.Compile(key)
+			if err == nil && r.MatchString(filePath) {
+				cmd = exec.Command(fmt.Sprintf("%v", element), filePath)
+				break
+			}
+		}
+	} else {
+		cmd = exec.Command(*fileManager, filePath)
+	}
+	log.Infof("Executing: %s", cmd)
 
-	glib.TimeoutAdd(uint(150), func() bool {
+	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()
+	} else {
 		gtk.MainQuit()
-		return false
+	}
-	})
 }
 
 // Returns map output name -> gdk.Monitor

uicomponents.go

@@ -6,6 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/gotk3/gotk3/gdk"
 	"github.com/gotk3/gotk3/gtk"
 )
@@ -65,7 +67,6 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 					return true
 				} else if btnEvent.Button() == 3 {
 					unpinItem(entry.DesktopID)
-					pinnedFlowBox = setUpPinnedFlowBox()
 					return true
 				}
 				return false
@@ -76,6 +77,9 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 			btn.Connect("enter-notify-event", func() {
 				statusLabel.SetText(entry.CommentLoc)
 			})
+			btn.Connect("focus-in-event", func() {
+				statusLabel.SetText(entry.CommentLoc)
+			})
 			flowBox.Add(btn)
 		}
 		pinnedFlowBoxWrapper.PackStart(flowBox, true, false, 0)
@@ -85,10 +89,6 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 			item.(*gtk.Widget).SetCanFocus(false)
 		})
 	}
-	flowBox.Connect("enter-notify-event", func() {
-		cancelClose()
-	})
-
 	flowBox.ShowAll()
 
 	return flowBox
@@ -108,9 +108,7 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 	}
 
 	eventBox, _ := gtk.EventBoxNew()
-	eventBox.Connect("enter-notify-event", func() {
+
-		cancelClose()
-	})
 	hBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	eventBox.Add(hBox)
 	button, _ := gtk.ButtonNewWithLabel("All")
@@ -131,6 +129,7 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 			button.SetProperty("name", "category-button")
 			catButtons = append(catButtons, button)
 			button.SetLabel(cat.DisplayName)
+			button.SetAlwaysShowImage(true)
 			hBox.PackStart(button, false, false, 0)
 			name := cat.Name
 			b := *button
@@ -144,7 +143,9 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 				w := b.GetAllocatedWidth()
 				b.SetImagePosition(gtk.POS_TOP)
 				b.SetSizeRequest(w, 0)
-				fileSearchResultWrapper.Hide()
+				if fileSearchResultWrapper != nil {
+					fileSearchResultWrapper.Hide()
+				}
 			})
 		}
 	}
@@ -229,13 +230,19 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	button, _ := gtk.ButtonNew()
 	button.SetAlwaysShowImage(true)
 
+	var pixbuf *gdk.Pixbuf
 	var img *gtk.Image
+	var err error
 	if entry.Icon != "" {
-		pixbuf, _ := createPixbuf(entry.Icon, *iconSize)
+		pixbuf, err = createPixbuf(entry.Icon, *iconSize)
-		img, _ = gtk.ImageNewFromPixbuf(pixbuf)
 	} else {
-		img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
+		log.Warnf("Undefined icon for %s", entry.Name)
+		pixbuf, err = createPixbuf("image-missing", *iconSize)
 	}
+	if err != nil {
+		pixbuf, _ = createPixbuf("unknown", *iconSize)
+	}
+	img, _ = gtk.ImageNewFromPixbuf(pixbuf)
 
 	button.SetImage(img)
 	button.SetImagePosition(gtk.POS_TOP)
@@ -251,6 +258,11 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	exec := entry.Exec
 	terminal := entry.Terminal
 	desc := entry.CommentLoc
+	if len(desc) > 120 {
+		r := []rune(desc)
+		desc = string(r[:117])
+		desc = fmt.Sprintf("%s…", desc)
+	}
 	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
 		btnEvent := gdk.EventButtonNewFromEvent(e)
 		if btnEvent.Button() == 1 {
@@ -258,7 +270,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 			return true
 		} else if btnEvent.Button() == 3 {
 			pinItem(ID)
-			pinnedFlowBox = setUpPinnedFlowBox()
+			return true
 		}
 		return false
 	})
@@ -268,6 +280,9 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	button.Connect("enter-notify-event", func() {
 		statusLabel.SetText(desc)
 	})
+	button.Connect("focus-in-event", func() {
+		statusLabel.SetText(desc)
+	})
 	return button
 }
 
@@ -277,9 +292,6 @@ func setUpFileSearchResultContainer() *gtk.FlowBox {
 	}
 	flowBox, _ := gtk.FlowBoxNew()
 	flowBox.SetProperty("orientation", gtk.ORIENTATION_VERTICAL)
-	flowBox.Connect("enter-notify-event", func() {
-		cancelClose()
-	})
 	fileSearchResultWrapper.PackStart(flowBox, false, false, 10)
 
 	return flowBox
@@ -291,7 +303,19 @@ func walk(path string, d fs.DirEntry, e error) error {
 	}
 	// don't search leading part of the path, as e.g. '/home/user/Pictures'
 	toSearch := strings.Split(path, ignore)[1]
-	if strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
+
+	// Remaing part of the path (w/o file name) must be checked against being present in excluded dirs
+	doSearch := true
+	parts := strings.Split(toSearch, "/")
+	remainingPart := ""
+	if len(parts) > 1 {
+		remainingPart = strings.Join(parts[:len(parts)-1], "/")
+	}
+	if remainingPart != "" && isExcluded(remainingPart) {
+		doSearch = false
+	}
+
+	if doSearch && strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
 		// mark directories
 		if d.IsDir() {
 			fileSearchResults = append(fileSearchResults, fmt.Sprintf("#is_dir#%s", path))
@@ -299,15 +323,16 @@ func walk(path string, d fs.DirEntry, e error) error {
 			fileSearchResults = append(fileSearchResults, path)
 		}
 	}
+
 	return nil
 }
 
 func setUpSearchEntry() *gtk.SearchEntry {
 	searchEntry, _ := gtk.SearchEntryNew()
 	searchEntry.SetPlaceholderText("Type to search")
-	searchEntry.Connect("enter-notify-event", func() {
+	/*searchEntry.Connect("enter-notify-event", func() {
 		cancelClose()
-	})
+	})*/
 	searchEntry.Connect("search-changed", func() {
 		for _, btn := range catButtons {
 			btn.SetImagePosition(gtk.POS_LEFT)
@@ -317,13 +342,17 @@ func setUpSearchEntry() *gtk.SearchEntry {
 		phrase, _ = searchEntry.GetText()
 		if len(phrase) > 0 {
 
+			// search apps
 			appFlowBox = setUpAppsFlowBox(nil, phrase)
 
-			if len(phrase) > 2 {
+			// search files
+			if !*noFS && len(phrase) > 2 {
 				if fileSearchResultFlowBox != nil {
 					fileSearchResultFlowBox.Destroy()
 				}
+
 				fileSearchResultFlowBox = setUpFileSearchResultContainer()
+
 				for key := range userDirsMap {
 					if key != "home" {
 						fileSearchResults = nil
@@ -335,26 +364,62 @@ func setUpSearchEntry() *gtk.SearchEntry {
 					statusLabel.SetText("0 results")
 				}
 			} else {
+				// search phrase too short
 				if fileSearchResultFlowBox != nil {
 					fileSearchResultFlowBox.Destroy()
 				}
-				fileSearchResultWrapper.Hide()
+				if fileSearchResultWrapper != nil {
+					fileSearchResultWrapper.Hide()
+				}
+			}
+			// focus 1st search result #17
+			var w *gtk.Widget
+			if appFlowBox != nil {
+				b := appFlowBox.GetChildAtIndex(0)
+				if b != nil {
+					button, err := b.GetChild()
+					if err == nil {
+						button.ToWidget().GrabFocus()
+						w = button.ToWidget()
+					}
+				}
+			}
+			if w == nil && fileSearchResultFlowBox != nil {
+				f := fileSearchResultFlowBox.GetChildAtIndex(0)
+				if f != nil {
+					button, err := f.GetChild()
+					if err == nil {
+						button.ToWidget().SetCanFocus(true)
+						button.ToWidget().GrabFocus()
+					}
+				}
 			}
 		} else {
+			// clear search results
+			appFlowBox = setUpAppsFlowBox(nil, "")
+
 			if fileSearchResultFlowBox != nil {
 				fileSearchResultFlowBox.Destroy()
 			}
-			appFlowBox = setUpAppsFlowBox(nil, "")
+
-			fileSearchResultWrapper.Hide()
+			if fileSearchResultWrapper != nil {
+				fileSearchResultWrapper.Hide()
+			}
 		}
 	})
-	searchEntry.Connect("focus-in-event", func() {
-		searchEntry.SetText("")
-	})
 
 	return searchEntry
 }
 
+func isExcluded(dir string) bool {
+	for _, exclusion := range exclusions {
+		if strings.Contains(dir, exclusion) {
+			return true
+		}
+	}
+	return false
+}
+
 func searchUserDir(dir string) {
 	fileSearchResults = nil
 	ignore = userDirsMap[dir]
@@ -367,13 +432,17 @@ func searchUserDir(dir string) {
 		for _, path := range fileSearchResults {
 			partOfPathToShow := strings.Split(path, userDirsMap[dir])[1]
 			if partOfPathToShow != "" {
-				btn := setUpUserFileSearchResultButton(partOfPathToShow, path)
+				if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) {
-				fileSearchResultFlowBox.Add(btn)
+					btn := setUpUserFileSearchResultButton(partOfPathToShow, path)
+					fileSearchResultFlowBox.Add(btn)
+				}
+
 			}
 		}
 		fileSearchResultFlowBox.Hide()
 
-		statusLabel.SetText(fmt.Sprintf("%v results", fileSearchResultFlowBox.GetChildren().Length()))
+		statusLabel.SetText(fmt.Sprintf("%v results | LMB: xdg-open | RMB: file manager",
+			fileSearchResultFlowBox.GetChildren().Length()))
 		num := uint(fileSearchResultFlowBox.GetChildren().Length() / *fsColumns)
 		fileSearchResultFlowBox.SetMinChildrenPerLine(num + 1)
 		fileSearchResultFlowBox.SetMaxChildrenPerLine(num + 1)
@@ -392,6 +461,7 @@ func setUpUserDirButton(iconName, displayName, entryName string, userDirsMap map
 	}
 	box, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	button, _ := gtk.ButtonNew()
+	button.SetAlwaysShowImage(true)
 	img, _ := gtk.ImageNewFromIconName(iconName, gtk.ICON_SIZE_MENU)
 	button.SetImage(img)
 
@@ -400,8 +470,16 @@ func setUpUserDirButton(iconName, displayName, entryName string, userDirsMap map
 	}
 	button.SetLabel(displayName)
 
-	button.Connect("clicked", func() {
+	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
-		launch(fmt.Sprintf("%s %s", *fileManager, userDirsMap[entryName]), false)
+		btnEvent := gdk.EventButtonNewFromEvent(e)
+		if btnEvent.Button() == 1 {
+			open(userDirsMap[entryName], true)
+			return true
+		} else if btnEvent.Button() == 3 {
+			open(userDirsMap[entryName], false)
+			return true
+		}
+		return false
 	})
 
 	box.PackStart(button, false, true, 0)
@@ -416,6 +494,7 @@ func setUpUserFileSearchResultButton(fileName, filePath string) *gtk.Box {
 	if strings.HasPrefix(filePath, "#is_dir#") {
 		filePath = filePath[8:]
 		img, _ := gtk.ImageNewFromIconName("folder", gtk.ICON_SIZE_MENU)
+		button.SetAlwaysShowImage(true)
 		button.SetImage(img)
 	}
 
@@ -429,8 +508,20 @@ func setUpUserFileSearchResultButton(fileName, filePath string) *gtk.Box {
 		button.SetTooltipText(tooltipText)
 	}
 
-	button.Connect("clicked", func() {
+	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
-		open(filePath)
+		btnEvent := gdk.EventButtonNewFromEvent(e)
+		if btnEvent.Button() == 1 {
+			open(filePath, true)
+			return true
+		} else if btnEvent.Button() == 3 {
+			open(filePath, false)
+			return true
+		}
+		return false
+	})
+
+	button.Connect("activate", func() {
+		open(filePath, true)
 	})
 
 	box.PackStart(button, false, true, 0)

watcher.go

@@ -0,0 +1,64 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/fsnotify/fsnotify"
+)
+
+// Thanks to Steve Domino https://medium.com/@skdomino/watch-this-file-watching-in-go-5b5a247cf71f
+var watcher *fsnotify.Watcher
+
+func watchFiles() {
+
+	// creates a new file watcher
+	watcher, _ = fsnotify.NewWatcher()
+	defer watcher.Close()
+
+	if err := watcher.Add(pinnedFile); err != nil {
+		log.Errorf("ERROR", err)
+	}
+
+	for _, fp := range appDirs {
+		if err := filepath.Walk(fp, watchDir); err != nil {
+			log.Errorf("ERROR", err)
+		}
+	}
+
+	done := make(chan bool)
+
+	go func() {
+		for {
+			select {
+			case event := <-watcher.Events:
+				if strings.HasSuffix(event.Name, ".desktop") &&
+					(event.Op.String() == "CREATE" ||
+						event.Op.String() == "REMOVE" ||
+						event.Op.String() == "RENAME") {
+					desktopTrigger = true
+				} else if event.Name == pinnedFile {
+					// 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)
+			}
+		}
+	}()
+
+	<-done
+}
+
+func watchDir(path string, fi os.FileInfo, err error) error {
+	if fi.Mode().IsDir() {
+		return watcher.Add(path)
+	}
+
+	return nil
+}

xdgdesktop_parser.go

@@ -0,0 +1,78 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func parseDesktopEntryFile(id string, path string) (e desktopEntry, err error) {
+	o, err := os.Open(path)
+	if err != nil {
+		return e, err
+	}
+	defer o.Close()
+
+	return parseDesktopEntry(id, o)
+}
+
+func parseDesktopEntry(id string, in io.Reader) (entry desktopEntry, err error) {
+	cleanexec := strings.NewReplacer("\"", "", "'", "")
+	entry.DesktopID = id
+	localizedName := fmt.Sprintf("Name[%s]", strings.Split(*lang, "_")[0])
+	localizedComment := fmt.Sprintf("Comment[%s]", strings.Split(*lang, "_")[0])
+	scanner := bufio.NewScanner(in)
+	scanner.Split(bufio.ScanLines)
+
+	for scanner.Scan() {
+		l := scanner.Text()
+		if strings.HasPrefix(l, "[") && l != "[Desktop Entry]" {
+			break
+		}
+
+		name, value := parseKeypair(l)
+		if value == "" {
+			continue
+		}
+
+		switch name {
+		case "Name":
+			entry.Name = value
+		case localizedName:
+			entry.NameLoc = value
+		case "Comment":
+			entry.Comment = value
+		case localizedComment:
+			entry.CommentLoc = value
+		case "Icon":
+			entry.Icon = value
+		case "Categories":
+			entry.Category = value
+		case "Terminal":
+			entry.Terminal, _ = strconv.ParseBool(value)
+		case "NoDisplay":
+			entry.NoDisplay, _ = strconv.ParseBool(value)
+		case "Exec":
+			entry.Exec = cleanexec.Replace(value)
+		}
+	}
+
+	// if name[ln] not found, let's try to find name[ln_LN]
+	if entry.NameLoc == "" {
+		entry.NameLoc = entry.Name
+	}
+	if entry.CommentLoc == "" {
+		entry.CommentLoc = entry.Comment
+	}
+	return entry, err
+}
+
+func parseKeypair(s string) (string, string) {
+	if idx := strings.IndexRune(s, '='); idx > 0 {
+		return strings.TrimSpace(s[:idx]), strings.TrimSpace(s[idx+1:])
+	}
+	return s, ""
+}

xdgdesktop_parser_test.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	"strings"
+	"testing"
+)
+
+var result desktopEntry
+
+func BenchmarkDesktopEntryParser(b *testing.B) {
+	var entry desktopEntry
+	for n := 0; n < b.N; n++ {
+		entry, _ = parseDesktopEntryFile("id", "./desktop-directories/game.directory")
+	}
+	result = entry
+}
+
+func TestWhitespaceHandling(t *testing.T) {
+	const whitespace = `[Desktop Entry]
+	Categories = Debugger; Development; Git; IDE; Programming; TextEditor; 
+	Comment = Editor for building and debugging modern web and cloud applications
+	Exec = bash -c "code-insiders ~/Workspaces/Linux/Flutter.code-workspace"
+	GenericName = Text Editor
+	Icon = vscode-flutter
+	Keywords = editor; IDE; plaintext; text; write; 
+	MimeType = application/x-shellscript; inode/directory; text/english; text/plain; text/x-c; text/x-c++; text/x-c++hdr; text/x-c++src; text/x-chdr; text/x-csrc; text/x-java; text/x-makefile; text/x-moc; text/x-pascal; text/x-tcl; text/x-tex; 
+	Name = VSCode Insiders with Flutter
+	Name[pt] = VSCode Insiders com Flutter
+	StartupNotify = true
+	StartupWMClass = code - insiders
+	Terminal = false
+	NoDisplay = false
+	Type = Application
+	Version = 1.0`
+
+	*lang = "pt"
+	entry, err := parseDesktopEntry("id", strings.NewReader(whitespace))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if entry.Name != "VSCode Insiders with Flutter" {
+		t.Error("failed to parse desktop entry name")
+	}
+
+	if entry.NameLoc != "VSCode Insiders com Flutter" {
+		t.Error("failed to parse localized name")
+	}
+
+	if entry.NoDisplay {
+		t.Error("failed to parse desktop entry no display")
+	}
+}