Merge pull request #140 from nwg-piotr/diamond

Migrate to diamondburned gtk3 bindings

.github/FUNDING.yml

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

.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/

Makefile

@@ -1,23 +1,31 @@
 get:
-	go get github.com/gotk3/gotk3
+	go get github.com/diamondburned/gotk4/pkg/gdk/v3
-	go get github.com/gotk3/gotk3/gdk
+	go get github.com/diamondburned/gotk4/pkg/glib/v2
-	go get github.com/gotk3/gotk3/glib
+	go get github.com/diamondburned/gotk4/pkg/gtk/v3
-	go get github.com/dlasky/gotk3-layershell/layershell
+	go get github.com/diamondburned/gotk4-layer-shell/pkg/gtklayershell
 	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 -v -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 -r img /usr/share/nwg-drawer
 	cp drawer.css /usr/share/nwg-drawer
 	cp bin/nwg-drawer /usr/bin
 
+	install -Dm 644 -t "/usr/share/licenses/nwg-drawer" LICENSE
+	install -Dm 644 -t "/usr/share/doc/nwg-drawer" README.md
+
 uninstall:
 	rm -r /usr/share/nwg-drawer
 	rm /usr/bin/nwg-drawer
 
 run:
-	go run *.go
+	go run .

README.md

@@ -1,40 +1,44 @@
-# nwg-drawer
+<img src="https://github.com/nwg-piotr/nwg-drawer/assets/20579136/1a7578e8-5332-4e4c-bdce-9b9bf875c0e7" width="90" style="margin-right:10px" align=left alt="logo">
+<H1>nwg-drawer</H1><br>
 
-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.
 
-Nwg-drawer is a golang replacement to the `nwggrid` command
+**Nwg-drawer** is an application launcher. It's being developed with [sway](https://github.com/swaywm/sway) and 
-(a part of [nwg-launchers](https://github.com/nwg-piotr/nwg-launchers)). It's being developed with
+[Hyprland](https://github.com/hyprwm/Hyprland) in mind, but should also work with other wlroots-based Wayland 
-[sway](https://github.com/swaywm/sway) in mind, but should also work with other wlroots-based Wayland compositors.
+compositors.
-X Window System is not supported.
 
 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.
 
 You may pin applications by right-clicking them. Pinned items will appear above the application grid. Right-click
-a pinned item to unpin it. The pinned items cache is shared with [nwg-menu](https://github.com/nwg-piotr/nwg-menu)
+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)
+Below the grid there is the **power bar** - a row of buttons to lock the screen, exit the compositor, reboot, suspend 
+and power the machine off. For each button to appear, you need to provide a corresponding command. See "Command line 
+arguments" below. If the power bar is present, pressing **Tab** will move focus to its first button.
 
-[more screenshots](https://scrot.cloud/album/nwg-drawer.Bogd) | [see on YouTube](https://youtu.be/iIgxJQhCQf0)
+<img src="https://github.com/nwg-piotr/nwg-drawer/assets/20579136/8f4eacb4-5395-4350-889b-a9037aa34f08" width=640 alt="screenshot"><br>
 
-[![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 the `Esc` key, or right-click the window next to the grid.
 
 ## Installation
 
+[![Packaging status](https://repology.org/badge/vertical-allrepos/nwg-drawer.svg)](https://repology.org/project/nwg-drawer/versions)
+
 ### Dependencies
 
-- go 1.16 (just to build)
+- go
 - 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 +47,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,39 +54,181 @@ $ nwg-drawer -h
 Usage of nwg-drawer:
   -c uint
     	number of Columns (default 6)
+  -close
+    	close drawer of existing instance
+  -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)
+  -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
+    	Disable file search
   -o string
-    	name of the Output to display the drawer on (sway only)
+    	name of the Output to display the drawer on (sway & Hyprland only)
+  -open
+    	open drawer of existing instance
   -ovl
     	use OVerLay layer
+  -pbexit string
+    	command for the Exit power bar icon
+  -pblock string
+    	command for the Lock power bar icon
+  -pbpoweroff string
+    	command for the Poweroff power bar icon
+  -pbreboot string
+    	command for the Reboot power bar icon
+  -pbsize int
+    	power bar icon size (only works w/ built-in icons) (default 64)
+  -pbsleep string
+    	command for the sleep power bar icon
+  -pbuseicontheme
+    	use icon theme instead of built-in icons in power bar
+  -r	Leave the program resident in memory
   -s string
     	Styling: css file name (default "drawer.css")
   -spacing uint
     	icon spacing (default 20)
   -term string
-    	Terminal emulator (default "alacritty")
+    	Terminal emulator (default "foot")
   -v	display Version information
+  -wm string
+    	use swaymsg exec (with 'sway' argument) or hyprctl dispatch exec (with 'hyprland') to launch programs
   ```
 
+  *NOTE: the `$TERM` environment variable overrides the `-term` argument.*
+
+## Running
+
+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 the compositor to apply any new arguments!
+
+If you want to explicitly specify commands to open and close the resident instance, which can be helpful for touchpad gestures, please use the `-open` and `-close` parameters. Similarly, some signals can also be use: pkill -USR2 nwg-drawer to open and pkill -SIGRTMIN+3 nwg-drawer to close.
+
+For a MacOS-style three-finger pinch:
+
+```text
+bindgesture pinch:4:inward exec pkill -SIGUSR2 nwg-drawer
+bindgesture pinch:4:outward exec pkill -SIGRTMIN+3 nwg-drawer
+```
+
+## 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.
+
+## File search
+
+When the search phrase is at least 3 characters long, your XDG user directories are being searched.
+
+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-drawer/preferred-apps.json` file with your own definitions.
+
+### Sample `preferred-apps.json` file content
+
+```json
+{
+  "\\.pdf$": "atril",
+  "\\.svg$": "inkscape",
+  "\\.(jpg|png|tiff|gif)$": "swayimg",
+  "\\.(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-drawer/excluded-dirs` file, e.g. like this:
+
+```text
+# exclude all paths containing 'node_modules'
+node_modules
+```
+
+### Calculations in the search box
+
+If the search box is not empty, and you press Enter, the search box content will be evaluated as an arithmetic operation.
+If the result is not an error, it will be displayed in a small window, and copied to the clipboard with wl-copy.
+Press any key to close the window.
+
+You may change the result label styling e.g. like this:
+
+```css
+/* math operation result label */
+#math-label {
+    font-weight: bold;
+    font-size: 16px
+}
+```
 
 ## Credits
 
 This program uses some great libraries:
 
-- [gotk3](https://github.com/gotk3/gotk3) Copyright (c) 2013-2014 Conformal Systems LLC,
+- [gotk4](https://github.com/diamondburned/gotk4) by [diamondburned](https://github.com/diamondburned) released under [GNU Affero General Public License v3.0](https://github.com/diamondburned/gotk4/blob/4/LICENSE.md)
-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
+- [expr](https://github.com/expr-lang/expr) Copyright (c) 2018 Anton Medvedev

drawer.css

@@ -1,5 +1,5 @@
 window {
-    background-color: rgba (36, 47, 79, 0.95);
+    background-color: rgba(36, 47, 79, 0.95);
     color: #eeeeee
 }
 
@@ -32,3 +32,9 @@ button:hover {
     border: 1px dotted gray;
     border-radius: 15px
 }
+
+/* math operation result label */
+#math-label {
+    font-weight: bold;
+    font-size: 16px
+}

go.mod

@@ -1,10 +1,22 @@
 module github.com/nwg-piotr/nwg-drawer
 
-go 1.16
+go 1.23
 
 require (
 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
-	github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261
+	github.com/diamondburned/gotk4-layer-shell/pkg v0.0.0-20240109211357-6efa9f6dc438
-	github.com/gotk3/gotk3 v0.6.0
+	github.com/diamondburned/gotk4/pkg v0.3.1
-	github.com/joshuarubin/go-sway v0.0.4
+	github.com/expr-lang/expr v1.16.9
+	github.com/fsnotify/fsnotify v1.8.0
+	github.com/joshuarubin/go-sway v1.2.0
+	github.com/sirupsen/logrus v1.9.3
+)
+
+require (
+	github.com/KarpelesLab/weak v0.1.1 // indirect
+	github.com/joshuarubin/lifecycle v1.1.4 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
+	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sys v0.27.0 // indirect
 )

go.sum

@@ -1,24 +1,50 @@
+github.com/KarpelesLab/weak v0.1.1 h1:fNnlPo3aypS9tBzoEQluY13XyUfd/eWaSE/vMvo9s4g=
+github.com/KarpelesLab/weak v0.1.1/go.mod h1:pzXsWs5f2bf+fpgHayTlBE1qJpO3MpJKo5sRaLu1XNw=
 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/diamondburned/gotk4-layer-shell/pkg v0.0.0-20240109211357-6efa9f6dc438 h1:Ymnl4B+Fn4srLxXbRV2RY1iHT2SH3oAkOfxeEeMI3Fg=
-github.com/gotk3/gotk3 v0.6.0 h1:Aqlq4/6VabNwtCyA9M9zFNad5yHAqCi5heWnZ9y+3dA=
+github.com/diamondburned/gotk4-layer-shell/pkg v0.0.0-20240109211357-6efa9f6dc438/go.mod h1:AjrxxF6teeNWgaEg0zIUwoqFtXlVTHlEGZvrOn7RXaQ=
-github.com/gotk3/gotk3 v0.6.0/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+github.com/diamondburned/gotk4/pkg v0.3.1 h1:uhkXSUPUsCyz3yujdvl7DSN8jiLS2BgNTQE95hk6ygg=
-github.com/joshuarubin/go-sway v0.0.4 h1:dpmIwQ/LytG+oMrjmaVKdk1aPdW2feXK/+wAcLKIx4A=
+github.com/diamondburned/gotk4/pkg v0.3.1/go.mod h1:DqeOW+MxSZFg9OO+esk4JgQk0TiUJJUBfMltKhG+ub4=
-github.com/joshuarubin/go-sway v0.0.4/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
+github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
-github.com/joshuarubin/lifecycle v1.0.0 h1:N/lPEC8f+dBZ1Tn99vShqp36LwB+LI7XNAiNadZeLUQ=
+github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+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.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.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=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 h1:lGdhQUN/cnWdSH3291CUuxSEqc+AsGTiDxPP3r2J0l4=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
+golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

img/exit.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48"
+   sodipodi:docname="exit1.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="9.4201949"
+     inkscape:cx="17.197096"
+     inkscape:cy="24.256398"
+     inkscape:window-width="2552"
+     inkscape:window-height="1372"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     showgrid="false"
+     showguides="true">
+    <sodipodi:guide
+       position="-17.76063,69.315161"
+       orientation="0,-1"
+       id="guide1"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path831"
+     style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+     d="M 24 4 C 12.954338 4 4 12.954338 4 24 C 4 35.045662 12.954338 44 24 44 C 31.79942 44 38.549265 39.531179 41.845703 33.017578 L 40.427734 33.017578 C 37.240509 38.816001 31.084255 42.75 24 42.75 C 13.644691 42.75 5.25 34.355309 5.25 24 C 5.25 13.644691 13.644691 5.25 24 5.25 C 31.084255 5.25 37.240509 9.1839991 40.427734 14.982422 L 41.845703 14.982422 C 38.549265 8.4688214 31.79942 4 24 4 z " />
+  <path
+     id="path5"
+     style="color:#000000;fill:#f2f2f2;fill-opacity:1;stroke-linejoin:bevel;-inkscape-stroke:none"
+     d="M 34.980469,18.517578 V 19.8125 l 6.347656,3.591797 -16.929687,-0.115235 -0.0078,1.125 18.927734,0.128907 v -1.304688 z" />
+</svg>

img/lock.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="lock.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.208306"
+     inkscape:cx="18.447332"
+     inkscape:cy="19.43448"
+     inkscape:window-width="1912"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     showgrid="false" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.75238;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 117.78998,28.062266 -1.08641,0.0064 2e-5,0.0024 -37.799575,0.0816 -0.007,-1.249983 37.379655,-0.0791 c -1.83062,-8.704176 -9.52473,-14.924431 -18.41926,-14.890941 -8.428083,0.0507 -15.786638,5.718662 -17.987023,13.854598 l -1.291486,0.0077 C 80.806771,16.95191 88.730946,10.732773 97.849919,10.670451 107.928,10.61958 116.47101,18.070836 117.78998,28.062266 Z m -0.43153,7.507607 C 115.13057,44.412889 107.20639,50.632007 98.087432,50.694325 88.009353,50.745197 79.466338,43.293941 78.147368,33.30251 l 1.086411,-0.0064 -1.4e-5,-0.0024 38.306055,-0.0816 0.007,1.249983 -37.886139,0.0791 c 1.830589,8.704029 9.524477,14.924242 18.418861,14.890942 8.428078,-0.0507 15.786638,-5.718664 17.987018,-13.854598 z"
+     id="path817"
+     sodipodi:nodetypes="cccccccccccccccccccccc" />
+  <path
+     id="path2"
+     style="color:#000000;opacity:1;fill:#f2f2f2;fill-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;-inkscape-stroke:none"
+     d="M 4.28125 20.666016 C 4.0995845 21.748484 4 22.858366 4 23.992188 C 4 35.02783 12.958497 43.986328 23.994141 43.986328 C 35.029785 43.986328 43.988281 35.02783 43.988281 23.992188 C 43.988281 22.858366 43.888701 21.748484 43.707031 20.666016 L 43.542969 20.666016 L 42.566406 20.666016 L 5.421875 20.666016 L 4.5546875 20.666016 L 4.28125 20.666016 z M 5.2597656 21.791016 L 42.728516 21.791016 C 42.813924 22.51349 42.863281 23.246468 42.863281 23.992188 C 42.863281 34.419838 34.421791 42.861328 23.994141 42.861328 C 13.566489 42.861328 5.125 34.419838 5.125 23.992188 C 5.125 23.246468 5.1743575 22.51349 5.2597656 21.791016 z " />
+  <path
+     style="color:#000000;fill:#f2f2f2;fill-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;-inkscape-stroke:none"
+     d="m 23.880859,30.039062 c -1.679508,0 -3.048828,1.369321 -3.048828,3.048829 v 1.808593 c 0,1.679508 1.36932,3.048828 3.048828,3.048828 h 0.226563 c 1.679508,0 3.048828,-1.36932 3.048828,-3.048828 v -1.808593 c 0,-1.679508 -1.36932,-3.048829 -3.048828,-3.048829 z m 0,1.125 h 0.226563 c 1.075718,0 1.923828,0.848111 1.923828,1.923829 v 1.808593 c 0,1.075718 -0.84811,1.923828 -1.923828,1.923828 h -0.226563 c -1.075718,0 -1.923828,-0.84811 -1.923828,-1.923828 v -1.808593 c 0,-1.075718 0.84811,-1.923828 1.923828,-1.923829 z"
+     id="rect2" />
+  <path
+     id="path3"
+     style="color:#000000;fill:#f2f2f2;-inkscape-stroke:none;fill-opacity:1"
+     d="M 23.994141 4 C 16.432673 4 10.050669 9.0735967 8.0585938 15.998047 L 9.2265625 15.998047 C 11.17813 9.6962096 17.046647 5.125 23.994141 5.125 C 30.941634 5.125 36.810151 9.6962096 38.761719 15.998047 L 39.929688 15.998047 C 37.937612 9.0735967 31.555607 4 23.994141 4 z " />
+</svg>

img/poweroff.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48"
+   sodipodi:docname="poweroff.svg"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="6.9411765"
+     inkscape:cx="16.927966"
+     inkscape:cy="16.927966"
+     inkscape:window-width="2552"
+     inkscape:window-height="1372"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     id="path822"
+     d="M 20.25,4 V 19 H 21.5 V 4 Z m 6.25,0 v 15 h 1.25 V 4 Z M 14,6.7319336 C 7.9628546,10.218607 4.0033064,16.702931 4,24 4,35.045695 12.954305,44 24,44 35.045695,44 44,35.045695 44,24 43.994912,16.704586 40.035832,10.222562 34,6.7368164 V 8.1870117 C 39.351053,11.561829 42.735765,17.485293 42.75,24 42.75,34.355339 34.355339,42.75 24,42.75 13.644661,42.75 5.25,34.355339 5.25,24 5.2650811,17.48603 8.6494321,11.563781 14,8.1894531 Z"
+     style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill" />
+</svg>

img/reboot.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="reboot.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="6.9411765"
+     inkscape:cx="16.927966"
+     inkscape:cy="16.927966"
+     inkscape:window-width="2552"
+     inkscape:window-height="1372"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     showgrid="false" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="matrix(-1.2507463,0,0,1.2508411,44.011945,-356.92327)"
+     style="fill:#f2f2f2">
+    <path
+       style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.00189;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+       d="M 19.001953,1.1308594 V 2 H 19 v 11 h 1 V 2.3359375 A 15,15 45 0 1 32,17 15,15 45 0 1 21.001953,31.455078 v 1.033203 A 16.009488,16.010701 45 0 0 33.009766,17 16.009488,16.010701 45 0 0 19.001953,1.1308594 Z M 12.998047,1.5117188 A 16.009488,16.010701 45 0 0 0.99023438,17 16.009488,16.010701 45 0 0 14.998047,32.869141 V 32 H 15 V 21 H 14 V 31.664062 A 15,15 45 0 1 2,17 15,15 45 0 1 12.998047,2.5449219 Z"
+       transform="matrix(0.70668771,-0.70663419,0.70668771,0.70663419,-8.0273788,304.53335)"
+       id="path817" />
+  </g>
+</svg>

img/sleep.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 48 48"
+   height="48"
+   width="48"
+   sodipodi:docname="sleep.svg"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="6.9411765"
+     inkscape:cx="16.927966"
+     inkscape:cy="16.927966"
+     inkscape:window-width="2552"
+     inkscape:window-height="1372"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+     d="M 24,4 C 12.954305,4 4,12.954305 4,24 4,35.045695 12.954305,44 24,44 35.045695,44 44,35.045695 44,24 44,12.954305 35.045695,4 24,4 Z m 0,1.25 C 34.355339,5.25 42.75,13.644661 42.75,24 42.75,34.355339 34.355339,42.75 24,42.75 13.644661,42.75 5.25,34.355339 5.25,24 5.25,13.644661 13.644661,5.25 24,5.25 Z M 19,16.5 v 15 h 1.25 v -15 z m 8.75,0 v 15 H 29 v -15 z"
+     id="path831" />
+</svg>

main.go

@@ -3,9 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
+	"github.com/diamondburned/gotk4-layer-shell/pkg/gtklayershell"
+	"github.com/expr-lang/expr"
 	"os"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -13,21 +15,27 @@ import (
 	"time"
 
 	"github.com/allan-simon/go-singleinstance"
-	"github.com/dlasky/gotk3-layershell/layershell"
+	log "github.com/sirupsen/logrus"
-	"github.com/gotk3/gotk3/gdk"
+
-	"github.com/gotk3/gotk3/glib"
+	"github.com/diamondburned/gotk4/pkg/gdk/v3"
-	"github.com/gotk3/gotk3/gtk"
+	"github.com/diamondburned/gotk4/pkg/glib/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v3"
 )
 
-const version = "0.1.4"
+const version = "0.6.0"
 
 var (
-	appDirs         []string
+	appDirs          []string
-	configDirectory string
+	configDirectory  string
-	pinnedFile      string
+	dataDirectory    string
-	pinned          []string
+	pinnedFile       string
-	src             glib.SourceHandle
+	pinned           []string
-	id2entry        map[string]desktopEntry
+	id2entry         map[string]desktopEntry
+	preferredApps    map[string]interface{}
+	exclusions       []string
+	hyprlandMonitors []monitor
+	beenScrolled     bool
+	firstPowerBtn    *gtk.Button
 )
 
 var categoryNames = [...]string{
@@ -58,10 +66,35 @@ type desktopEntry struct {
 	CommentLoc string
 	Icon       string
 	Exec       string
+	Category   string
 	Terminal   bool
 	NoDisplay  bool
 }
 
+type monitor struct {
+	Id              int     `json:"id"`
+	Name            string  `json:"name"`
+	Description     string  `json:"description"`
+	Make            string  `json:"make"`
+	Model           string  `json:"model"`
+	Serial          string  `json:"serial"`
+	Width           int     `json:"width"`
+	Height          int     `json:"height"`
+	RefreshRate     float64 `json:"refreshRate"`
+	X               int     `json:"x"`
+	Y               int     `json:"y"`
+	ActiveWorkspace struct {
+		Id   int    `json:"id"`
+		Name string `json:"name"`
+	} `json:"activeWorkspace"`
+	Reserved   []int   `json:"reserved"`
+	Scale      float64 `json:"scale"`
+	Transform  int     `json:"transform"`
+	Focused    bool    `json:"focused"`
+	DpmsStatus bool    `json:"dpmsStatus"`
+	Vrr        bool    `json:"vrr"`
+}
+
 // slices below will hold DesktopID strings
 var (
 	listUtility            []string
@@ -79,6 +112,7 @@ var desktopEntries []desktopEntry
 
 // UI elements
 var (
+	win                     *gtk.Window
 	resultWindow            *gtk.ScrolledWindow
 	fileSearchResults       []string
 	searchEntry             *gtk.SearchEntry
@@ -90,75 +124,212 @@ 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 defaultTermIfBlank(s, fallback string) string {
+	s = strings.TrimSpace(s)
+	// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started
+	// from a key binding defined in the config file. See #23.
+	if s == "" || s == "linux" {
+		return fallback
+	}
+	return s
+}
+
+func validateWm() {
+	if !(*wm == "sway" || *wm == "hyprland" || *wm == "Hyprland") && *wm != "" {
+		*wm = ""
+		log.Warn("-wm argument supports only 'sway' or 'hyprland' string.")
+	}
+}
+
 // 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 targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway & Hyprland 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 flagDrawerOpen = flag.Bool("open", false, "open drawer of existing instance")
+var flagDrawerClose = flag.Bool("close", false, "close drawer of existing instance")
+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\"")
 var fileManager = flag.String("fm", "thunar", "File Manager")
-var term = flag.String("term", "alacritty", "Terminal emulator")
+var term = flag.String("term", defaultTermIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
-var nameLimit = flag.Int("fslen", 80, "File Search name length Limit")
+var wm = flag.String("wm", "", "use swaymsg exec (with 'sway' argument) or hyprctl dispatch exec (with 'hyprland') or riverctl spawn (with 'river') to launch programs")
+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 pbExit = flag.String("pbexit", "", "command for the Exit power bar icon")
+var pbLock = flag.String("pblock", "", "command for the Lock power bar icon")
+var pbPoweroff = flag.String("pbpoweroff", "", "command for the Poweroff power bar icon")
+var pbReboot = flag.String("pbreboot", "", "command for the Reboot power bar icon")
+var pbSleep = flag.String("pbsleep", "", "command for the sleep power bar icon")
+var pbSize = flag.Int("pbsize", 64, "power bar icon size (only works w/ built-in icons)")
+var pbUseIconTheme = flag.Bool("pbuseicontheme", false, "use icon theme instead of built-in icons in power bar")
+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)
 	}
 
+	validateWm()
+
 	// Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85
+	// v0.2: we also need to support SIGUSR from now on
+	showWindowChannel := make(chan interface{}, 1)
 	signalChan := make(chan os.Signal, 1)
-	signal.Notify(signalChan, syscall.SIGTERM)
+	const (
+		SIG25 = syscall.Signal(0x25) // Which is SIGRTMIN+3 on Linux, it's not used by the system
+	)
+	signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1, syscall.SIGUSR2, SIG25)
 	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: // toggle drawer
+				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()
+				}
+			case syscall.SIGUSR2: // open drawer
+				if *resident {
+					log.Debug("SIGUSR2 received, showing the window")
+					showWindowChannel <- struct{}{}
+				} else {
+					log.Info("SIGUSR2 received, and I'm not resident but I'm still here, doing nothing")
+				}
+			case SIG25: // close drawer
+				if *resident {
+					log.Debug("SIG25 received, hiding the window")
+					if win.IsVisible() {
+						restoreStateAndHide()
+					}
+				} else {
+					log.Info("A signal received, and I'm not resident, bye bye")
+					gtk.MainQuit()
+				}
+			default:
+				log.Infof("Unknown signal: %s", s.String())
 			}
 		}
 	}()
 
-	// 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-resident instance and exit;
+	// 	2. die if a resident instance found.
+	lockFilePath := path.Join(dataHome(), "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 {
+					var err error
+					if *flagDrawerClose {
+						log.Infof("Closing resident instance (PID %v)", i)
+						err = syscall.Kill(i, SIG25)
+					} else if *flagDrawerOpen {
+						log.Infof("Showing resident instance (PID %v)", i)
+						err = syscall.Kill(i, syscall.SIGUSR2)
+					} else {
+						log.Infof("Toggling resident instance (PID %v)", i)
+						err = syscall.Kill(i, syscall.SIGUSR1)
+					}
+					if err != nil {
+						return
+					}
+				}
 			}
 		}
 		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()
+	dataDirectory = dataDir()
 
+	// 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"))
+		err := copyFile(filepath.Join(dataDirectory, "drawer.css"), filepath.Join(configDirectory, "drawer.css"))
+		if err != nil {
+			log.Errorf("Failed copying 'drawer.css' file: %s", err)
+		}
 	}
 
 	cacheDirectory := cacheDir()
@@ -171,110 +342,184 @@ 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)
 
-	// USER INTERFACE
+	// For opening files we use xdg-open. As its configuration is PITA, we may override some associations
-	gtk.Init(nil)
+	// in the ~/.config/nwg-panel/preferred-apps.json file.
-
+	paFile := path.Join(configDirectory, "preferred-apps.json")
-	cssProvider, _ := gtk.CssProviderNew()
+	if pathExists(paFile) {
-
+		preferredApps, err = loadPreferredApps(paFile)
-	err = cssProvider.LoadFromPath(cssFile)
+		if err != nil {
-	if err != nil {
+			log.Infof("Custom associations file %s not found or invalid", paFile)
-		println(fmt.Sprintf("ERROR: %s css file not found or erroneous. Using GTK styling.", cssFile))
+		} else {
-		println(fmt.Sprintf(">>> %s", err))
+			log.Infof("Found %v associations in %s", len(preferredApps), paFile)
+		}
 	} else {
-		println(fmt.Sprintf("Using style from %s", cssFile))
+		log.Infof("%s file not found", paFile)
-		screen, _ := gdk.ScreenGetDefault()
-		gtk.AddProviderForScreen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
 	}
 
-	win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
+	// 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()
+
+	settings := gtk.SettingsGetDefault()
+	if *gtkTheme != "" {
+		settings.SetObjectProperty("gtk-theme-name", *gtkTheme)
+		log.Infof("User demanded theme: %s", *gtkTheme)
+	} else {
+		settings.SetObjectProperty("gtk-application-prefer-dark-theme", true)
+		log.Info("Preferring dark theme variants")
+	}
+
+	if *gtkIconTheme != "" {
+		settings.SetObjectProperty("gtk-icon-theme-name", *gtkIconTheme)
+		log.Infof("User demanded icon theme: %s", *gtkIconTheme)
+	}
+
+	cssProvider := gtk.NewCSSProvider()
+
+	err = cssProvider.LoadFromPath(*cssFileName)
+	if err != nil {
+		log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
+	} else {
+		log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
+		screen := gdk.ScreenGetDefault()
+		gtk.StyleContextAddProviderForScreen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+	}
+
+	win = gtk.NewWindow(gtk.WindowToplevel)
 	if err != nil {
 		log.Fatal("Unable to create window:", err)
 	}
 
 	if wayland() {
-		layershell.InitForWindow(win)
+		gtklayershell.InitForWindow(win)
+		gtklayershell.SetNamespace(win, "nwg-drawer")
 
 		var output2mon map[string]*gdk.Monitor
 		if *targetOutput != "" {
 			// We want to assign layershell to a monitor, but we only know the output name!
 			output2mon, err = mapOutputs()
+			log.Debugf("output2mon: %v", output2mon)
 			if err == nil {
-				monitor := output2mon[*targetOutput]
+				mon := output2mon[*targetOutput]
-				layershell.SetMonitor(win, monitor)
+				gtklayershell.SetMonitor(win, mon)
 
 			} else {
-				println(err)
+				log.Errorf("%s", err)
 			}
 		}
 
-		layershell.SetAnchor(win, layershell.LAYER_SHELL_EDGE_BOTTOM, true)
+		gtklayershell.SetAnchor(win, gtklayershell.LayerShellEdgeBottom, true)
-		layershell.SetAnchor(win, layershell.LAYER_SHELL_EDGE_TOP, true)
+		gtklayershell.SetAnchor(win, gtklayershell.LayerShellEdgeTop, true)
-		layershell.SetAnchor(win, layershell.LAYER_SHELL_EDGE_LEFT, true)
+		gtklayershell.SetAnchor(win, gtklayershell.LayerShellEdgeLeft, true)
-		layershell.SetAnchor(win, layershell.LAYER_SHELL_EDGE_RIGHT, true)
+		gtklayershell.SetAnchor(win, gtklayershell.LayerShellEdgeRight, true)
 
 		if *overlay {
-			layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_OVERLAY)
+			gtklayershell.SetLayer(win, gtklayershell.LayerShellLayerOverlay)
-			layershell.SetExclusiveZone(win, -1)
+			gtklayershell.SetExclusiveZone(win, -1)
 		} else {
-			layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_TOP)
+			gtklayershell.SetLayer(win, gtklayershell.LayerShellLayerTop)
+		}
+
+		gtklayershell.SetMargin(win, gtklayershell.LayerShellEdgeTop, *marginTop)
+		gtklayershell.SetMargin(win, gtklayershell.LayerShellEdgeLeft, *marginLeft)
+		gtklayershell.SetMargin(win, gtklayershell.LayerShellEdgeRight, *marginRight)
+		gtklayershell.SetMargin(win, gtklayershell.LayerShellEdgeBottom, *marginBottom)
+
+		if *keyboard {
+			log.Info("Setting GTK layer shell keyboard mode to: on-demand")
+			gtklayershell.SetKeyboardMode(win, gtklayershell.LayerShellKeyboardModeOnDemand)
+		} else {
+			log.Info("Setting GTK layer shell keyboard mode to default: exclusive")
+			gtklayershell.SetKeyboardMode(win, gtklayershell.LayerShellKeyboardModeExclusive)
 		}
 
-		layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
 	}
 
 	win.Connect("destroy", func() {
 		gtk.MainQuit()
 	})
 
-	win.Connect("key-press-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}
+		//key := &gdk.EventKey{Event: event}
-		switch key.KeyVal() {
+		key := event.AsKey()
-		case gdk.KEY_Escape:
+		if key.Keyval() == gdk.KEY_Escape {
-			s, _ := searchEntry.GetText()
+			s := searchEntry.Text()
 			if s != "" {
 				searchEntry.GrabFocus()
 				searchEntry.SetText("")
 			} else {
-				gtk.MainQuit()
+				if !*resident {
+					gtk.MainQuit()
+				} else {
+					restoreStateAndHide()
+				}
 			}
-			return false
+			return true
+
+		} else if key.Keyval() == gdk.KEY_Tab {
+			if firstPowerBtn != nil {
+				firstPowerBtn.GrabFocus()
+			}
+
+		} else if key.Keyval() == gdk.KEY_Return {
+			s := searchEntry.Text()
+			if s != "" {
+				// Check if the search box content is an arithmetic expression. If so, display the result
+				// and copy to the clipboard with wl-copy.
+				result, e := expr.Eval(s, nil)
+				if e == nil {
+					log.Debugf("Setting up mathemathical operation result window. Operation: %s, result: %v", s, result)
+					setUpOperationResultWindow(s, fmt.Sprintf("%v", result))
+				}
+			}
+			return true
+		}
+		return true
+	})
+
+	win.Connect("key-press-event", func(_ *gtk.Window, event *gdk.Event) bool {
+		//key := &gdk.EventKey{Event: event}
+		key := event.AsKey()
+		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
 		}
-	})
+		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()
 	})
 
 	/*
@@ -283,82 +528,263 @@ func main() {
 		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()
 	}
 
 	// Set up UI
-	outerVBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
+	outerVBox := gtk.NewBox(gtk.OrientationVertical, 0)
 	win.Add(outerVBox)
 
-	searchBoxWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	searchBoxWrapper := gtk.NewBox(gtk.OrientationHorizontal, 0)
 	outerVBox.PackStart(searchBoxWrapper, false, false, 10)
 
 	searchEntry = setUpSearchEntry()
 	searchEntry.SetMaxWidthChars(30)
 	searchBoxWrapper.PackStart(searchEntry, true, false, 0)
 
-	categoriesWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	if !*noCats {
-	categoriesButtonBox := setUpCategoriesButtonBox()
+		categoriesWrapper = gtk.NewBox(gtk.OrientationHorizontal, 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)
+	pinnedWrapper := gtk.NewBox(gtk.OrientationHorizontal, 0)
 	outerVBox.PackStart(pinnedWrapper, false, false, 0)
 
-	pinnedFlowBoxWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	pinnedFlowBoxWrapper = gtk.NewBox(gtk.OrientationHorizontal, 0)
 	outerVBox.PackStart(pinnedFlowBoxWrapper, false, false, 0)
 	pinnedFlowBox = setUpPinnedFlowBox()
 
-	resultWindow, _ = gtk.ScrolledWindowNew(nil, nil)
+	resultWindow = gtk.NewScrolledWindow(nil, nil)
-	resultWindow.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+	resultWindow.SetEvents(int(gdk.AllEventsMask))
-	resultWindow.Connect("enter-notify-event", func() {
+	resultWindow.SetPolicy(gtk.PolicyAutomatic, gtk.PolicyAutomatic)
-		cancelClose()
+
+	// On touch screen we don't want the button-release-event to launch the app if the user just wanted to scroll the
+	// window. Let's forbid doing so if the content has been scrolled. We will reset the value on button-press-event.
+	// Resolves https://github.com/nwg-piotr/nwg-drawer/issues/110
+	vAdj := resultWindow.VAdjustment()
+	vAdj.Connect("value-changed", func() {
+		beenScrolled = true
+	})
+	hAdj := resultWindow.HAdjustment()
+	hAdj.Connect("value-changed", func() {
+		beenScrolled = true
+	})
+
+	resultWindow.Connect("button-release-event", func(_ *gtk.ScrolledWindow, event *gdk.Event) bool {
+		//btnEvent := gdk.EventButtonNewFromEvent(event)
+		btnEvent := event.AsButton()
+		if btnEvent.Button() == 3 {
+			if !*resident {
+				gtk.MainQuit()
+			} else {
+				restoreStateAndHide()
+			}
+			return true
+		}
+		return false
 	})
 	outerVBox.PackStart(resultWindow, true, true, 10)
 
-	resultsWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
+	resultsWrapper := gtk.NewBox(gtk.OrientationVertical, 0)
 	resultWindow.Add(resultsWrapper)
 
-	appSearchResultWrapper, _ = gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
+	appSearchResultWrapper = gtk.NewBox(gtk.OrientationVertical, 0)
 	resultsWrapper.PackStart(appSearchResultWrapper, false, false, 0)
 	appFlowBox = setUpAppsFlowBox(nil, "")
 
 	// Focus 1st pinned item if any, otherwise focus 1st found app icon
-	var button gtk.IWidget
+	var button gtk.Widget
-	if pinnedFlowBox.GetChildren().Length() > 0 {
+	if len(pinnedFlowBox.Children()) > 0 {
-		button, err = pinnedFlowBox.GetChildAtIndex(0).GetChild()
+		button = pinnedFlowBox.ChildAtIndex(0).Widget
 	} else {
-		button, err = appFlowBox.GetChildAtIndex(0).GetChild()
+		button = appFlowBox.ChildAtIndex(0).Widget
 	}
 	if err == nil {
-		button.ToWidget().GrabFocus()
+		button.GrabFocus()
 	}
 
 	userDirsMap = mapXdgUserDirs()
+	log.Debugf("User dirs map: %s", userDirsMap)
 
-	placeholder, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
+	placeholder := gtk.NewBox(gtk.OrientationVertical, 0)
 	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.NewBox(gtk.OrientationHorizontal, 0)
-	fileSearchResultWrapper.SetProperty("name", "files-box")
+		fileSearchResultWrapper = gtk.NewBox(gtk.OrientationHorizontal, 0)
-	wrapper.PackStart(fileSearchResultWrapper, true, false, 0)
+		fileSearchResultWrapper.SetObjectProperty("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)
+	// Power Button Bar
+	if dataDirectory != "" {
+		if *pbExit != "" || *pbLock != "" || *pbPoweroff != "" || *pbReboot != "" || *pbSleep != "" {
+			powerBarWrapper := gtk.NewBox(gtk.OrientationHorizontal, 0)
+			outerVBox.PackStart(powerBarWrapper, false, false, 0)
+			powerButtonsWrapper := gtk.NewBox(gtk.OrientationHorizontal, 0)
+			powerBarWrapper.PackStart(powerButtonsWrapper, true, false, 12)
+
+			if *pbPoweroff != "" {
+				btn := gtk.NewButton()
+				if !*pbUseIconTheme {
+					btn = powerButton(filepath.Join(dataDirectory, "img/poweroff.svg"), *pbPoweroff)
+				} else {
+					btn = powerButton("system-shutdown-symbolic", *pbPoweroff)
+				}
+				powerButtonsWrapper.PackEnd(btn, true, false, 0)
+				firstPowerBtn = btn
+			}
+			if *pbSleep != "" {
+				btn := gtk.NewButton()
+				if !*pbUseIconTheme {
+					btn = powerButton(filepath.Join(dataDirectory, "img/sleep.svg"), *pbSleep)
+				} else {
+					btn = powerButton("face-yawn-symbolic", *pbSleep)
+				}
+				powerButtonsWrapper.PackEnd(btn, true, false, 0)
+				firstPowerBtn = btn
+			}
+			if *pbReboot != "" {
+				btn := gtk.NewButton()
+				if !*pbUseIconTheme {
+					btn = powerButton(filepath.Join(dataDirectory, "img/reboot.svg"), *pbReboot)
+				} else {
+					btn = powerButton("system-reboot-symbolic", *pbReboot)
+				}
+				powerButtonsWrapper.PackEnd(btn, true, false, 0)
+				firstPowerBtn = btn
+			}
+			if *pbExit != "" {
+				btn := gtk.NewButton()
+				if !*pbUseIconTheme {
+					btn = powerButton(filepath.Join(dataDirectory, "img/exit.svg"), *pbExit)
+				} else {
+					btn = powerButton("system-log-out-symbolic", *pbExit)
+				}
+				powerButtonsWrapper.PackEnd(btn, true, false, 0)
+				firstPowerBtn = btn
+			}
+			if *pbLock != "" {
+				btn := gtk.NewButton()
+				if !*pbUseIconTheme {
+					btn = powerButton(filepath.Join(dataDirectory, "img/lock.svg"), *pbLock)
+				} else {
+					btn = powerButton("system-lock-screen-symbolic", *pbLock)
+				}
+				powerButtonsWrapper.PackEnd(btn, true, false, 0)
+				firstPowerBtn = btn
+			}
+		}
+	} else {
+		log.Warn("Couldn't find data dir, power bar icons unavailable")
+	}
+
+	statusLineWrapper := gtk.NewBox(gtk.OrientationHorizontal, 0)
+	statusLineWrapper.SetObjectProperty("name", "status-line-wrapper")
 	outerVBox.PackStart(statusLineWrapper, false, false, 10)
-	statusLabel, _ = gtk.LabelNew(status)
+	statusLabel = gtk.NewLabel(status)
+	statusLabel.SetObjectProperty("name", "status-label")
 	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.AllocatedWidth(), 1)
+		fileSearchResultWrapper.Hide()
+	}
+	if !*noCats {
+		categoriesWrapper.SetSizeRequest(1, categoriesWrapper.AllocatedHeight()*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
+						var button gtk.Widget
+						if len(pinnedFlowBox.Children()) > 0 {
+							button = pinnedFlowBox.ChildAtIndex(0).Widget
+						} else {
+							button = appFlowBox.ChildAtIndex(0).Widget
+						}
+						if err == nil {
+							button.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()
+	if win != nil {
+		win.Hide()
+	}
+
+	// clear search
+	searchEntry.SetText("")
+
+	// One day or another we'll add SetFilterFunction here; it was impossible on the gotk3 library
+	appFlowBox = setUpAppsFlowBox(nil, "")
+	for _, btn := range catButtons {
+		btn.SetImagePosition(gtk.PosLeft)
+		btn.SetSizeRequest(0, 0)
+	}
+
+	// scroll to the top
+	if resultWindow != nil {
+		resultWindow.VAdjustment().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,51 +2,40 @@ package main
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
+	"github.com/joshuarubin/go-sway"
+	log "github.com/sirupsen/logrus"
 	"io"
 	"io/fs"
-	"io/ioutil"
+	"net"
-	"log"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
+	"regexp"
 	"sort"
 	"strings"
+	"syscall"
 	"time"
 
-	"github.com/gotk3/gotk3/gdk"
+	"github.com/diamondburned/gotk4/pkg/gdk/v3"
-	"github.com/gotk3/gotk3/glib"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
-	"github.com/gotk3/gotk3/gtk"
+	"github.com/diamondburned/gotk4/pkg/gtk/v3"
-	"github.com/joshuarubin/go-sway"
 )
 
 func wayland() bool {
 	return os.Getenv("WAYLAND_DISPLAY") != "" || os.Getenv("XDG_SESSION_TYPE") == "wayland"
 }
 
-/*
+func createPixbuf(icon string, size int) (*gdkpixbuf.Pixbuf, error) {
-Window leave-notify-event event quits the program with glib Timeout 500 ms.
+	iconTheme := gtk.IconThemeGetDefault()
-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 {
-		log.Fatal("Couldn't get default theme: ", err)
-	}
 
 	if strings.Contains(icon, "/") {
-		pixbuf, err := gdk.PixbufNewFromFileAtSize(icon, size, size)
+		pixbuf, err := gdkpixbuf.NewPixbufFromFileAtSize(icon, size, size)
 		if err != nil {
-			println(err)
+			log.Errorf("%s", err)
 			return nil, err
 		}
 		return pixbuf, nil
@@ -56,18 +45,18 @@ func createPixbuf(icon string, size int) (*gdk.Pixbuf, error) {
 		icon = strings.Split(icon, ".")[0]
 	}
 
-	pixbuf, err := iconTheme.LoadIcon(icon, size, gtk.ICON_LOOKUP_FORCE_SIZE)
+	pixbuf, err := iconTheme.LoadIcon(icon, size, gtk.IconLookupForceSize)
 
 	if err != nil {
 		if strings.HasPrefix(icon, "/") {
-			pixbuf, err := gdk.PixbufNewFromFileAtSize(icon, size, size)
+			pixbuf, e := gdkpixbuf.NewPixbufFromFileAtSize(icon, size, size)
-			if err != nil {
+			if e != nil {
-				return nil, err
+				return nil, e
 			}
 			return pixbuf, nil
 		}
 
-		pixbuf, err := iconTheme.LoadIcon(icon, size, gtk.ICON_LOOKUP_FORCE_SIZE)
+		pixbuf, err := iconTheme.LoadIcon(icon, size, gtk.IconLookupForceSize)
 		if err != nil {
 			return nil, err
 		}
@@ -87,9 +76,10 @@ 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(configHome(), "user-dirs.dirs"))
 	if pathExists(userDirsFile) {
-		println(fmt.Sprintf("Using XDG user dirs from %s", 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 {
 			if strings.HasPrefix(l, "XDG_DOCUMENTS_DIR") {
@@ -113,7 +103,7 @@ func mapXdgUserDirs() map[string]string {
 			}
 		}
 	} else {
-		println(fmt.Sprintf("%s file not found, using defaults", userDirsFile))
+		log.Warnf("userDirsFile %s not found, using defaults", userDirsFile)
 	}
 
 	return result
@@ -129,29 +119,18 @@ func getUserDir(home, line string) string {
 }
 
 func cacheDir() string {
-	if os.Getenv("XDG_CACHE_HOME") != "" {
+	if xdgCache := os.Getenv("XDG_CACHE_HOME"); xdgCache != "" {
-		return os.Getenv("XDG_CONFIG_HOME")
+		return xdgCache
 	}
-	if os.Getenv("HOME") != "" && pathExists(filepath.Join(os.Getenv("HOME"), ".cache")) {
+	if home := os.Getenv("HOME"); home != "" && pathExists(filepath.Join(home, ".cache")) {
-		p := filepath.Join(os.Getenv("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
 	}
@@ -159,14 +138,50 @@ func readTextFile(path string) (string, error) {
 	return string(bytes), nil
 }
 
-func configDir() string {
+func oldConfigDir() (string, error) {
-	if os.Getenv("XDG_CONFIG_HOME") != "" {
+	if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
-		dir := fmt.Sprintf("%s/nwg-panel", os.Getenv("XDG_CONFIG_HOME"))
+		dir := path.Join(xdgConfig, "nwg-panel")
-		createDir(dir)
+		return dir, nil
-		return (fmt.Sprintf("%s/nwg-panel", os.Getenv("XDG_CONFIG_HOME")))
+	} else if home := os.Getenv("HOME"); home != "" {
+		dir := path.Join(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 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)
 	createDir(dir)
+
+	return dir
+}
+
+func configHome() string {
+	if os.Getenv("XDG_CONFIG_HOME") != "" {
+		return os.Getenv("XDG_CONFIG_HOME")
+	}
+	return path.Join(os.Getenv("HOME"), ".config")
+}
+
+func dataHome() 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.Debugf("Data home: %s", dir)
+	createDir(dir)
+
 	return dir
 }
 
@@ -174,13 +189,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: '%s' => '%s'", src, dst)
 
 	var err error
 	var srcfd *os.File
@@ -190,12 +205,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
@@ -206,22 +231,30 @@ func copyFile(src, dst string) error {
 	return os.Chmod(dst, srcinfo.Mode())
 }
 
-func getDataHome() string {
+func dataDir() string {
-	if os.Getenv("XDG_DATA_HOME") != "" {
+	xdgDataDirs := os.Getenv("XDG_DATA_DIRS")
-		return os.Getenv("XDG_DATA_HOME")
+	if xdgDataDirs == "" {
+		xdgDataDirs = "/usr/local/share/:/usr/share/"
 	}
-	return "/usr/share/"
+	for _, d := range strings.Split(xdgDataDirs, ":") {
+		p := filepath.Join(d, "nwg-drawer")
+		q := filepath.Join(p, "desktop-directories")
+		if pathExists(q) {
+			log.Infof("Data dir: %v", p)
+			return p
+		}
+	}
+	log.Warnf("Data dir not found")
+	return ""
 }
 
 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")
-		xdgDataDirs = os.Getenv("XDG_DATA_DIRS")
+	if xdgDataDirs == "" {
-	} else {
 		xdgDataDirs = "/usr/local/share/:/usr/share/"
 	}
 	if xdgDataHome != "" {
@@ -236,15 +269,48 @@ 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 listFiles(dir string) ([]fs.FileInfo, error) {
+func loadPreferredApps(path string) (map[string]interface{}, error) {
-	files, err := ioutil.ReadDir(dir)
+	jsonFile, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer func(jsonFile *os.File) {
+		err := jsonFile.Close()
+		if err != nil {
+			log.Errorf("Error closing file: %v", jsonFile)
+		}
+	}(jsonFile)
+
+	byteValue, _ := io.ReadAll(jsonFile)
+
+	var result map[string]interface{}
+	err = json.Unmarshal(byteValue, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(result) == 0 {
+		return nil, errors.New("json invalid or empty")
+	}
+
+	return result, nil
+}
+
+func listFiles(dir string) ([]fs.DirEntry, error) {
+	files, err := os.ReadDir(dir)
 	if err == nil {
 		return files, nil
 	}
@@ -268,12 +334,13 @@ func listDesktopFiles() []string {
 }
 
 func setUpCategories() {
-	path := filepath.Join(getDataHome(), "nwg-drawer/desktop-directories")
 	var other category
 
+	dDir := dataDir()
 	for _, cName := range categoryNames {
 		fileName := fmt.Sprintf("%s.directory", cName)
-		lines, err := loadTextFile(filepath.Join(path, fileName))
+		fp := filepath.Join(dDir, "desktop-directories", fileName)
+		lines, err := loadTextFile(fp)
 		if err == nil {
 			var cat category
 			cat.Name = cName
@@ -318,6 +385,8 @@ func setUpCategories() {
 			} else {
 				other = cat
 			}
+		} else {
+			log.Errorf("Couldn't open %s", fp)
 		}
 	}
 	sort.Slice(categories, func(i, j int) bool {
@@ -327,110 +396,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
+		return strings.ToLower(desktopEntries[i].NameLoc) < strings.ToLower(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
 }
 
@@ -504,7 +500,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
 	}
@@ -512,7 +508,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 +519,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)
 	}
 }
 
@@ -555,20 +551,26 @@ 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 {
-				println("Error saving pinned", err)
+				log.Error("Error saving pinned", err)
 			}
 		}
 	}
 }
 
-func launch(command string, terminal bool) {
+func launch(command string, terminal bool, terminate bool) {
 	// trim % and everything afterwards
 	if strings.Contains(command, "%") {
 		cutAt := strings.Index(command, "%")
@@ -577,91 +579,206 @@ func launch(command string, terminal bool) {
 		}
 	}
 
-	elements := strings.Split(command, " ")
+	themeToPrepend := ""
-
+	//add "GTK_THEME=<default_gtk_theme>" environment variable
-	// find prepended env variables, if any
+	if *forceTheme {
-	envVarsNum := strings.Count(command, "=")
+		settings := gtk.SettingsGetDefault()
-	var envVars []string
+		th := settings.ObjectProperty("gtk-theme-name")
-
+		themeToPrepend = th.(string)
-	cmdIdx := 0
-	lastEnvVarIdx := 0
-
-	if envVarsNum > 0 {
-		for idx, item := range elements {
-			if strings.Contains(item, "=") {
-				lastEnvVarIdx = idx
-				envVars = append(envVars, item)
-			}
-		}
-		cmdIdx = lastEnvVarIdx + 1
 	}
 
-	cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)
+	if themeToPrepend != "" {
+		command = fmt.Sprintf("GTK_THEME=%q %s", themeToPrepend, command)
+	}
+
+	var elements = []string{"/usr/bin/env", "-S", command}
+
+	cmd := exec.Command(elements[0], elements[1:]...)
 
 	if terminal {
-		args := []string{"-e", elements[cmdIdx]}
+		var prefixCommand = *term
-		cmd = exec.Command(*term, args...)
+		var args []string
+		if prefixCommand != "foot" {
+			args = []string{"-e", command}
+		} else {
+			args = elements
+		}
+		cmd = exec.Command(prefixCommand, args...)
+	} else if *wm == "sway" {
+		cmd = exec.Command("swaymsg", "exec", strings.Join(elements, " "))
+	} else if *wm == "hyprland" || *wm == "Hyprland" {
+		cmd = exec.Command("hyprctl", "dispatch", "exec", strings.Join(elements, " "))
+	} else if *wm == "river" {
+		cmd = exec.Command("riverctl", "spawn", strings.Join(elements, " "))
 	}
 
-	// set env variables
+	msg := fmt.Sprintf("Executing command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
-	if len(envVars) > 0 {
+	log.Info(msg)
-		cmd.Env = os.Environ()
+
-		cmd.Env = append(cmd.Env, envVars...)
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setsid: true,
 	}
 
-	msg := fmt.Sprintf("env vars: %s; command: '%s'; args: %s\n", envVars, elements[cmdIdx], elements[1+cmdIdx:])
+	if cmd.Start() != nil {
-	println(msg)
+		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()
+		}()
+	}
 
-	go cmd.Run()
+	if terminate {
-
+		if *resident {
-	glib.TimeoutAdd(uint(150), func() bool {
+			restoreStateAndHide()
-		gtk.MainQuit()
+		} else {
-		return false
+			gtk.MainQuit()
-	})
+		}
+	}
 }
 
-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
 func mapOutputs() (map[string]*gdk.Monitor, error) {
 	result := make(map[string]*gdk.Monitor)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+	if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
-	defer cancel()
+		err := listHyprlandMonitors()
+		if err == nil {
 
-	client, err := sway.New(ctx)
+			display := gdk.DisplayGetDefault()
-	if err != nil {
-		return nil, err
-	}
 
-	outputs, err := client.GetOutputs(ctx)
+			num := display.NMonitors()
-	if err != nil {
+			for i := 0; i < num; i++ {
-		return nil, err
+				mon := display.Monitor(i)
-	}
+				output := hyprlandMonitors[i]
-
+				result[output.Name] = mon
-	display, err := gdk.DisplayGetDefault()
-	if err != nil {
-		return nil, err
-	}
-
-	num := display.GetNMonitors()
-	for i := 0; i < num; i++ {
-		monitor, _ := display.GetMonitor(i)
-		geometry := monitor.GetGeometry()
-		// assign output to monitor on the basis of the same x, y coordinates
-		for _, output := range outputs {
-			if int(output.Rect.X) == geometry.GetX() && int(output.Rect.Y) == geometry.GetY() {
-				result[output.Name] = monitor
 			}
+		} else {
+			return nil, err
 		}
+
+	} else if os.Getenv("SWAYSOCK") != "" {
+		ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+		defer cancel()
+
+		client, err := sway.New(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		outputs, err := client.GetOutputs(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		display := gdk.DisplayGetDefault()
+		if err != nil {
+			return nil, err
+		}
+
+		num := display.NMonitors()
+		for i := 0; i < num; i++ {
+			mon := display.Monitor(i)
+			output := outputs[i]
+			result[output.Name] = mon
+		}
+	} else {
+		return nil, errors.New("output assignment only supported on sway and Hyprland")
 	}
+
 	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:]
+}
+
+func hyprctl(cmd string) ([]byte, error) {
+	his := os.Getenv("HYPRLAND_INSTANCE_SIGNATURE")
+	xdgRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
+	hyprDir := ""
+	if xdgRuntimeDir != "" {
+		hyprDir = fmt.Sprintf("%s/hypr", xdgRuntimeDir)
+	} else {
+		hyprDir = "/tmp/hypr"
+	}
+
+	socketFile := fmt.Sprintf("%s/%s/.socket.sock", hyprDir, his)
+	conn, err := net.Dial("unix", socketFile)
+	if err != nil {
+		return nil, err
+	}
+
+	message := []byte(cmd)
+	_, err = conn.Write(message)
+	if err != nil {
+		return nil, err
+	}
+
+	reply := make([]byte, 102400)
+	n, err := conn.Read(reply)
+	if err != nil {
+		return nil, err
+	}
+
+	defer conn.Close()
+
+	return reply[:n], nil
+}
+
+func listHyprlandMonitors() error {
+	reply, err := hyprctl("j/monitors")
+	if err != nil {
+		return err
+	} else {
+		err = json.Unmarshal([]byte(reply), &hyprlandMonitors)
+	}
+	return err
+}

uicomponents.go

@@ -2,19 +2,23 @@ package main
 
 import (
 	"fmt"
+	"github.com/diamondburned/gotk4-layer-shell/pkg/gtklayershell"
 	"io/fs"
 	"path/filepath"
 	"strings"
 
-	"github.com/gotk3/gotk3/gdk"
+	log "github.com/sirupsen/logrus"
-	"github.com/gotk3/gotk3/gtk"
+
+	"github.com/diamondburned/gotk4/pkg/gdk/v3"
+	"github.com/diamondburned/gotk4/pkg/gdkpixbuf/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v3"
 )
 
 func setUpPinnedFlowBox() *gtk.FlowBox {
 	if pinnedFlowBox != nil {
 		pinnedFlowBox.Destroy()
 	}
-	flowBox, _ := gtk.FlowBoxNew()
+	flowBox := gtk.NewFlowBox()
 	if uint(len(pinned)) >= *columnsNumber {
 		flowBox.SetMaxChildrenPerLine(*columnsNumber)
 	} else if len(pinned) > 0 {
@@ -24,26 +28,30 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 	flowBox.SetColumnSpacing(*itemSpacing)
 	flowBox.SetRowSpacing(*itemSpacing)
 	flowBox.SetHomogeneous(true)
-	flowBox.SetProperty("name", "pinned-box")
+	flowBox.SetObjectProperty("name", "pinned-box")
-	flowBox.SetSelectionMode(gtk.SELECTION_NONE)
+	flowBox.SetSelectionMode(gtk.SelectionNone)
 
 	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()
+			btn := gtk.NewButton()
 
 			var img *gtk.Image
 			if entry.Icon != "" {
 				pixbuf, _ := createPixbuf(entry.Icon, *iconSize)
-				img, _ = gtk.ImageNewFromPixbuf(pixbuf)
+				img = gtk.NewImageFromPixbuf(pixbuf)
 			} else {
-				img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
+				img = gtk.NewImageFromIconName("image-missing", int(gtk.IconSizeInvalid))
 			}
 
 			btn.SetImage(img)
 			btn.SetAlwaysShowImage(true)
-			btn.SetImagePosition(gtk.POS_TOP)
+			btn.SetImagePosition(gtk.PosTop)
 
 			name := ""
 			if entry.NameLoc != "" {
@@ -52,43 +60,36 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 				name = entry.Name
 			}
 			if len(name) > 20 {
-				r := []rune(name)
+				r := substring(name, 0, 17)
-				name = string(r[:17])
+				name = fmt.Sprintf("%s…", r)
-				name = fmt.Sprintf("%s…", name)
 			}
 			btn.SetLabel(name)
 
-			btn.Connect("button-release-event", func(row *gtk.Button, e *gdk.Event) bool {
+			btn.Connect("button-release-event", func(row *gtk.Button, event *gdk.Event) bool {
-				btnEvent := gdk.EventButtonNewFromEvent(e)
+				btnEvent := event.AsButton()
 				if btnEvent.Button() == 1 {
-					launch(entry.Exec, entry.Terminal)
+					launch(entry.Exec, entry.Terminal, true)
 					return true
 				} else if btnEvent.Button() == 3 {
 					unpinItem(entry.DesktopID)
-					pinnedFlowBox = setUpPinnedFlowBox()
 					return true
 				}
 				return false
 			})
 			btn.Connect("activate", func() {
-				launch(entry.Exec, entry.Terminal)
+				launch(entry.Exec, entry.Terminal, true)
 			})
 			btn.Connect("enter-notify-event", func() {
 				statusLabel.SetText(entry.CommentLoc)
 			})
+			btn.Connect("focus-in-event", func() {
+				statusLabel.SetText(entry.CommentLoc)
+			})
 			flowBox.Add(btn)
+			btn.Parent().(*gtk.FlowBoxChild).SetCanFocus(false)
 		}
 		pinnedFlowBoxWrapper.PackStart(flowBox, true, false, 0)
-
-		//While moving focus with arrow keys we want buttons to get focus directly
-		flowBox.GetChildren().Foreach(func(item interface{}) {
-			item.(*gtk.Widget).SetCanFocus(false)
-		})
 	}
-	flowBox.Connect("enter-notify-event", func() {
-		cancelClose()
-	})
-
 	flowBox.ShowAll()
 
 	return flowBox
@@ -107,19 +108,17 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 		"other":                listOther,
 	}
 
-	eventBox, _ := gtk.EventBoxNew()
+	eventBox := gtk.NewEventBox()
-	eventBox.Connect("enter-notify-event", func() {
+
-		cancelClose()
+	hBox := gtk.NewBox(gtk.OrientationHorizontal, 0)
-	})
-	hBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	eventBox.Add(hBox)
-	button, _ := gtk.ButtonNewWithLabel("All")
+	button := gtk.NewButtonWithLabel("All")
-	button.SetProperty("name", "category-button")
+	button.SetObjectProperty("name", "category-button")
 	button.Connect("clicked", func(item *gtk.Button) {
 		searchEntry.SetText("")
 		appFlowBox = setUpAppsFlowBox(nil, "")
 		for _, btn := range catButtons {
-			btn.SetImagePosition(gtk.POS_LEFT)
+			btn.SetImagePosition(gtk.PosLeft)
 			btn.SetSizeRequest(0, 0)
 		}
 	})
@@ -127,24 +126,27 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 
 	for _, cat := range categories {
 		if isSupposedToShowUp(cat.Name) {
-			button, _ = gtk.ButtonNewFromIconName(cat.Icon, gtk.ICON_SIZE_MENU)
+			button = gtk.NewButtonFromIconName(cat.Icon, int(gtk.IconSizeMenu))
-			button.SetProperty("name", "category-button")
+			button.SetObjectProperty("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
 			button.Connect("clicked", func(item *gtk.Button) {
 				searchEntry.SetText("")
-				// !!! since gotk3 FlowBox type does not implement set_filter_func, we need to rebuild appFlowBox
+				// One day or another we'll add SetFilterFunction here; it was impossible on the gotk3 library
 				appFlowBox = setUpAppsFlowBox(lists[name], "")
 				for _, btn := range catButtons {
-					btn.SetImagePosition(gtk.POS_LEFT)
+					btn.SetImagePosition(gtk.PosLeft)
 				}
-				w := b.GetAllocatedWidth()
+				w := b.AllocatedWidth()
-				b.SetImagePosition(gtk.POS_TOP)
+				b.SetImagePosition(gtk.PosTop)
 				b.SetSizeRequest(w, 0)
-				fileSearchResultWrapper.Hide()
+				if fileSearchResultWrapper != nil {
+					fileSearchResultWrapper.Hide()
+				}
 			})
 		}
 	}
@@ -182,13 +184,13 @@ func setUpAppsFlowBox(categoryList []string, searchPhrase string) *gtk.FlowBox {
 	if appFlowBox != nil {
 		appFlowBox.Destroy()
 	}
-	flowBox, _ := gtk.FlowBoxNew()
+	flowBox := gtk.NewFlowBox()
 	flowBox.SetMinChildrenPerLine(*columnsNumber)
 	flowBox.SetMaxChildrenPerLine(*columnsNumber)
 	flowBox.SetColumnSpacing(*itemSpacing)
 	flowBox.SetRowSpacing(*itemSpacing)
 	flowBox.SetHomogeneous(true)
-	flowBox.SetSelectionMode(gtk.SELECTION_NONE)
+	flowBox.SetSelectionMode(gtk.SelectionNone)
 
 	for _, entry := range desktopEntries {
 		if searchPhrase == "" {
@@ -201,6 +203,7 @@ func setUpAppsFlowBox(categoryList []string, searchPhrase string) *gtk.FlowBox {
 				} else {
 					button := flowBoxButton(entry)
 					flowBox.Add(button)
+					button.Parent().(*gtk.FlowBoxChild).SetCanFocus(false)
 				}
 			}
 		} else {
@@ -210,40 +213,43 @@ func setUpAppsFlowBox(categoryList []string, searchPhrase string) *gtk.FlowBox {
 				strings.Contains(strings.ToLower(entry.Exec), strings.ToLower(searchPhrase))) {
 				button := flowBoxButton(entry)
 				flowBox.Add(button)
+				button.Parent().(*gtk.FlowBoxChild).SetCanFocus(false)
 			}
 		}
 	}
-	hWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	hWrapper := gtk.NewBox(gtk.OrientationHorizontal, 0)
 	appSearchResultWrapper.PackStart(hWrapper, false, false, 0)
 	hWrapper.PackStart(flowBox, true, false, 0)
-	// While moving focus with arrow keys we want buttons to get focus directly
+
-	flowBox.GetChildren().Foreach(func(item interface{}) {
-		item.(*gtk.Widget).SetCanFocus(false)
-	})
 	resultWindow.ShowAll()
 
 	return flowBox
 }
 
 func flowBoxButton(entry desktopEntry) *gtk.Button {
-	button, _ := gtk.ButtonNew()
+	button := gtk.NewButton()
 	button.SetAlwaysShowImage(true)
 
+	var pixbuf *gdkpixbuf.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.NewImageFromPixbuf(pixbuf)
 
 	button.SetImage(img)
-	button.SetImagePosition(gtk.POS_TOP)
+	button.SetImagePosition(gtk.PosTop)
 	name := entry.NameLoc
 	if len(name) > 20 {
-		r := []rune(name)
+		r := substring(name, 0, 17)
-		name = string(r[:17])
+		name = fmt.Sprintf("%s…", r)
-		name = fmt.Sprintf("%s…", name)
 	}
 	button.SetLabel(name)
 
@@ -251,23 +257,85 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	exec := entry.Exec
 	terminal := entry.Terminal
 	desc := entry.CommentLoc
-	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
+	if len(desc) > 120 {
-		btnEvent := gdk.EventButtonNewFromEvent(e)
+		r := substring(desc, 0, 117)
+		desc = fmt.Sprintf("%s…", r)
+	}
+
+	button.Connect("button-press-event", func() {
+		// if not scrolled from now on, we will allow launching apps on button-release-event
+		beenScrolled = false
+	})
+
+	button.Connect("button-release-event", func(btn *gtk.Button, event *gdk.Event) bool {
+		btnEvent := event.AsButton()
 		if btnEvent.Button() == 1 {
-			launch(exec, terminal)
+			if !beenScrolled {
-			return true
+				launch(exec, terminal, true)
+				return true
+			}
 		} else if btnEvent.Button() == 3 {
 			pinItem(ID)
-			pinnedFlowBox = setUpPinnedFlowBox()
+			return true
 		}
 		return false
 	})
 	button.Connect("activate", func() {
-		launch(exec, terminal)
+		launch(exec, terminal, true)
 	})
 	button.Connect("enter-notify-event", func() {
 		statusLabel.SetText(desc)
 	})
+	button.Connect("leave-notify-event", func() {
+		statusLabel.SetText("")
+	})
+	button.Connect("focus-in-event", func() {
+		statusLabel.SetText(desc)
+	})
+	return button
+}
+
+func powerButton(iconPathOrName, command string) *gtk.Button {
+	button := gtk.NewButton()
+	button.SetAlwaysShowImage(true)
+
+	var pixbuf *gdkpixbuf.Pixbuf
+	var img *gtk.Image
+	var err error
+	if !*pbUseIconTheme {
+		pixbuf, err = gdkpixbuf.NewPixbufFromFileAtSize(iconPathOrName, *pbSize, *pbSize)
+		if err != nil {
+			pixbuf, _ = createPixbuf("unknown", *pbSize)
+			log.Warnf("Couldn't find icon %s", iconPathOrName)
+		}
+		img = gtk.NewImageFromPixbuf(pixbuf)
+	} else {
+		img = gtk.NewImageFromIconName(iconPathOrName, int(gtk.IconSizeDialog))
+	}
+
+	button.SetImage(img)
+	button.SetImagePosition(gtk.PosTop)
+
+	button.Connect("button-release-event", func(btn *gtk.Button, event *gdk.Event) bool {
+		btnEvent := event.AsButton()
+		if btnEvent.Button() == 1 {
+			launch(command, false, true)
+			return true
+		}
+		return false
+	})
+	button.Connect("activate", func() {
+		launch(command, false, true)
+	})
+	button.Connect("enter-notify-event", func() {
+		statusLabel.SetText(command)
+	})
+	button.Connect("leave-notify-event", func() {
+		statusLabel.SetText("")
+	})
+	button.Connect("focus-in-event", func() {
+		statusLabel.SetText(command)
+	})
 	return button
 }
 
@@ -275,11 +343,8 @@ func setUpFileSearchResultContainer() *gtk.FlowBox {
 	if fileSearchResultFlowBox != nil {
 		fileSearchResultFlowBox.Destroy()
 	}
-	flowBox, _ := gtk.FlowBoxNew()
+	flowBox := gtk.NewFlowBox()
-	flowBox.SetProperty("orientation", gtk.ORIENTATION_VERTICAL)
+	flowBox.SetObjectProperty("orientation", gtk.OrientationVertical)
-	flowBox.Connect("enter-notify-event", func() {
-		cancelClose()
-	})
 	fileSearchResultWrapper.PackStart(flowBox, false, false, 10)
 
 	return flowBox
@@ -291,7 +356,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)) {
+
+	// Remaining 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,60 +376,95 @@ func walk(path string, d fs.DirEntry, e error) error {
 			fileSearchResults = append(fileSearchResults, path)
 		}
 	}
+
 	return nil
 }
 
 func setUpSearchEntry() *gtk.SearchEntry {
-	searchEntry, _ := gtk.SearchEntryNew()
+	sEntry := gtk.NewSearchEntry()
-	searchEntry.SetPlaceholderText("Type to search")
+	sEntry.SetPlaceholderText("Type to search")
-	searchEntry.Connect("enter-notify-event", func() {
+	sEntry.Connect("search-changed", func() {
-		cancelClose()
-	})
-	searchEntry.Connect("search-changed", func() {
 		for _, btn := range catButtons {
-			btn.SetImagePosition(gtk.POS_LEFT)
+			btn.SetImagePosition(gtk.PosLeft)
 			btn.SetSizeRequest(0, 0)
 		}
 
-		phrase, _ = searchEntry.GetText()
+		phrase = sEntry.Text()
 		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
 						searchUserDir(key)
 					}
 				}
-				if fileSearchResultFlowBox.GetChildren().Length() == 0 {
+				if len(fileSearchResultFlowBox.Children()) == 0 {
 					fileSearchResultWrapper.Hide()
 					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.Button
+			if appFlowBox != nil {
+				b := appFlowBox.ChildAtIndex(0)
+				if b != nil {
+					button := b.Child().(*gtk.Button)
+					button.SetCanFocus(true)
+					button.GrabFocus()
+					w = button
+				}
+			}
+			if w == nil && fileSearchResultFlowBox != nil {
+				f := fileSearchResultFlowBox.ChildAtIndex(0)
+				if f != nil {
+					button := f.Child().(*gtk.Box)
+					button.SetCanFocus(true)
+					button.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
+	return sEntry
+}
+
+func isExcluded(dir string) bool {
+	for _, exclusion := range exclusions {
+		if strings.Contains(dir, exclusion) {
+			return true
+		}
+	}
+	return false
 }
 
 func searchUserDir(dir string) {
@@ -363,24 +475,28 @@ func searchUserDir(dir string) {
 	if len(fileSearchResults) > 0 {
 		btn := setUpUserDirButton(fmt.Sprintf("folder-%s", dir), "", dir, userDirsMap)
 		fileSearchResultFlowBox.Add(btn)
+		btn.Parent().(*gtk.FlowBoxChild).SetCanFocus(false)
 
 		for _, path := range fileSearchResults {
+			log.Debugf("Path: %s", path)
 			partOfPathToShow := strings.Split(path, userDirsMap[dir])[1]
 			if partOfPathToShow != "" {
-				btn := setUpUserFileSearchResultButton(partOfPathToShow, path)
+				if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) {
-				fileSearchResultFlowBox.Add(btn)
+					button := setUpUserFileSearchResultButton(partOfPathToShow, path)
+					fileSearchResultFlowBox.Add(button)
+					button.Parent().(*gtk.FlowBoxChild).SetCanFocus(false)
+				}
+
 			}
 		}
 		fileSearchResultFlowBox.Hide()
 
-		statusLabel.SetText(fmt.Sprintf("%v results", fileSearchResultFlowBox.GetChildren().Length()))
+		statusLabel.SetText(fmt.Sprintf("%v results | LMB: xdg-open | RMB: file manager",
-		num := uint(fileSearchResultFlowBox.GetChildren().Length() / *fsColumns)
+			len(fileSearchResultFlowBox.Children())))
+		num := uint(len(fileSearchResultFlowBox.Children())) / *fsColumns
 		fileSearchResultFlowBox.SetMinChildrenPerLine(num + 1)
 		fileSearchResultFlowBox.SetMaxChildrenPerLine(num + 1)
-		//While moving focus with arrow keys we want buttons to get focus directly
+
-		fileSearchResultFlowBox.GetChildren().Foreach(func(item interface{}) {
-			item.(*gtk.Widget).SetCanFocus(false)
-		})
 		fileSearchResultFlowBox.ShowAll()
 	}
 }
@@ -390,9 +506,10 @@ func setUpUserDirButton(iconName, displayName, entryName string, userDirsMap map
 		parts := strings.Split(userDirsMap[entryName], "/")
 		displayName = parts[(len(parts) - 1)]
 	}
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	box := gtk.NewBox(gtk.OrientationHorizontal, 0)
-	button, _ := gtk.ButtonNew()
+	button := gtk.NewButton()
-	img, _ := gtk.ImageNewFromIconName(iconName, gtk.ICON_SIZE_MENU)
+	button.SetAlwaysShowImage(true)
+	img := gtk.NewImageFromIconName(iconName, int(gtk.IconSizeMenu))
 	button.SetImage(img)
 
 	if len(displayName) > *nameLimit {
@@ -400,8 +517,20 @@ func setUpUserDirButton(iconName, displayName, entryName string, userDirsMap map
 	}
 	button.SetLabel(displayName)
 
-	button.Connect("clicked", func() {
+	button.Connect("button-release-event", func(btn *gtk.Button, event *gdk.Event) bool {
-		launch(fmt.Sprintf("%s %s", *fileManager, userDirsMap[entryName]), false)
+		btnEvent := event.AsButton()
+		if btnEvent.Button() == 1 {
+			open(userDirsMap[entryName], true)
+			return true
+		} else if btnEvent.Button() == 3 {
+			open(userDirsMap[entryName], false)
+			return true
+		}
+		return false
+	})
+
+	button.Connect("activate", func() {
+		open(userDirsMap[entryName], true)
 	})
 
 	box.PackStart(button, false, true, 0)
@@ -409,13 +538,14 @@ func setUpUserDirButton(iconName, displayName, entryName string, userDirsMap map
 }
 
 func setUpUserFileSearchResultButton(fileName, filePath string) *gtk.Box {
-	box, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	box := gtk.NewBox(gtk.OrientationHorizontal, 0)
-	button, _ := gtk.ButtonNew()
+	button := gtk.NewButton()
 
 	// in the walk function we've marked directories with the '#is_dir#' prefix
 	if strings.HasPrefix(filePath, "#is_dir#") {
 		filePath = filePath[8:]
-		img, _ := gtk.ImageNewFromIconName("folder", gtk.ICON_SIZE_MENU)
+		img := gtk.NewImageFromIconName("folder", int(gtk.IconSizeMenu))
+		button.SetAlwaysShowImage(true)
 		button.SetImage(img)
 	}
 
@@ -429,10 +559,69 @@ func setUpUserFileSearchResultButton(fileName, filePath string) *gtk.Box {
 		button.SetTooltipText(tooltipText)
 	}
 
-	button.Connect("clicked", func() {
+	button.Connect("button-release-event", func(btn *gtk.Button, event *gdk.Event) bool {
-		open(filePath)
+		btnEvent := event.AsButton()
+		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)
 	return box
 }
+
+func setUpOperationResultWindow(operation string, result string) {
+	window := gtk.NewWindow(gtk.WindowToplevel)
+	window.SetModal(true)
+
+	if wayland() {
+		gtklayershell.InitForWindow(window)
+		gtklayershell.SetLayer(window, gtklayershell.LayerShellLayerOverlay)
+		gtklayershell.SetKeyboardMode(window, gtklayershell.LayerShellKeyboardModeExclusive)
+	}
+
+	// any key to close the window
+	window.Connect("key-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
+		window.Destroy()
+		return true
+	})
+
+	// any button to close the window
+	window.Connect("button-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
+		window.Destroy()
+		return true
+	})
+
+	outerVBox := gtk.NewBox(gtk.OrientationVertical, 6)
+	window.Add(outerVBox)
+
+	vBox := gtk.NewBox(gtk.OrientationHorizontal, 5)
+	outerVBox.PackStart(vBox, true, true, 6)
+	lbl := gtk.NewLabel(fmt.Sprintf("%s = %s", operation, result))
+	lbl.SetObjectProperty("name", "math-label")
+	vBox.PackStart(lbl, true, true, 12)
+
+	mRefProvider := gtk.NewCSSProvider()
+	css := "window { background-color: rgba (0, 0, 0, 255); color: #fff; border: solid 1px grey; border-radius: 5px}"
+	err := mRefProvider.LoadFromData(css)
+	if err != nil {
+		log.Warn(err)
+	}
+	ctx := window.StyleContext()
+	ctx.AddProvider(mRefProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+	window.ShowAll()
+
+	if wayland() {
+		cmd := fmt.Sprintf("wl-copy %v", result)
+		launch(cmd, false, false)
+	}
+}

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: %s", err)
+	}
+
+	for _, fp := range appDirs {
+		if err := filepath.Walk(fp, watchDir); err != nil {
+			log.Errorf("ERROR: %s", 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: %s", 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,105 @@
+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":
+			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)
+		}
+	}
+
+	// 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")
+	}
+}