Merge pull request #130 from nwg-piotr/backports

Merge pull request #129 from nwg-piotr/main
2024-09-22 14:05:20 +02:00 · 2024-09-22 14:04:33 +02:00 · 2024-09-22 13:57:01 +02:00 · 2024-09-22 13:54:32 +02:00 · 2024-09-22 13:51:46 +02:00 · 2024-09-22 13:44:02 +02:00
13 changed files with 747 additions and 145 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
 github: nwg-piotr
+liberapay: nwg
--- a/6
+++ b/6
@@ -9,16 +9,20 @@ get:
 	go get github.com/fsnotify/fsnotify

 build:
-	go build -o bin/nwg-drawer .
+	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
--- a/README.md
+++ b/README.md
@@ -1,40 +1,33 @@
-# 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://nwg-piotr.github.io/nwg-shell) project.

-**Contributing:** please read the [general contributing rules for the nwg-shell project](https://nwg-piotr.github.io/nwg-shell/contribution).
-
-Nwg-drawer is a golang replacement to the `nwggrid` command
-(a part of [nwg-launchers](https://github.com/nwg-piotr/nwg-launchers)). It's being developed with
-[sway](https://github.com/swaywm/sway) in mind, but should also work with other wlroots-based Wayland compositors.
-X Window System is not officially supported, but you should be able to use the drawer on some floating
-window managers (tested on Openbox).
+**Nwg-drawer** is an application launcher. It's being developed with [sway](https://github.com/swaywm/sway) and 
+[Hyprland](https://github.com/hyprwm/Hyprland) in mind, but should also work with other wlroots-based Wayland 
+compositors.

 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)
-and `nwggrid`.
+a pinned item to unpin it. The pinned items cache is shared with [nwg-menu](https://github.com/nwg-piotr/nwg-menu).

-![screenshot.png](https://raw.githubusercontent.com/nwg-piotr/nwg-shell-resources/master/images/nwg-shell/nwg-drawer.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.

-[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 `Esc` key, or right-click the window next to the icons.
-
-## v0.2.x note
-
-1. Placing config files in the nwg-panel config directory was a mistake, sorry. The 0.2.0 version migrates them to `~/.config/nwg-drawer`.
-2. From now on you may run the program residently, which should speed it up (but also occupy some resources!). See "Running" below.
+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.20 (just to build)
+- go
 - gtk3
 - gtk-layer-shell
 - xdg-utils
@@ -61,6 +54,8 @@ $ 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")
@@ -92,9 +87,25 @@ Usage of nwg-drawer:
  -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")
@@ -103,13 +114,15 @@ Usage of nwg-drawer:
  -term string
    	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 if defined.*
+  *NOTE: the `$TERM` environment variable overrides the `-term` argument.*

 ## Running

-Since v0.2.x you may use the drawer in two ways:
+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.:

@@ -128,7 +141,16 @@ The second line does nothing but `pkill -USR1 nwg-drawer`, so you may just use t
 this should be a little bit faster.

 Running a resident instance should speed up use of the drawer significantly. Pay attention to the fact, that you
-need to `pkill -f nwg-drawer` and reload sway to apply any new arguments!
+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

@@ -145,12 +167,10 @@ exit sway, launch it again and include the `drawer.log` content in the GitHub is

 Edit `~/.config/nwg-drawer/drawer.css` to your taste.

-## Files
+## File search

 When the search phrase is at least 3 characters long, your XDG user directories are being searched.

-![screenshot-02.png](https://raw.githubusercontent.com/nwg-piotr/nwg-shell/main/images/nwg-drawer/search.png)
-
 Use the **left mouse button** to open a file with the `xdg-open` command. As configuring file associations for it is
 PITA, you may override them, by creating the `~/.config/nwg-panel/preferred-apps.json` file with your own definitions.

@@ -160,7 +180,7 @@ PITA, you may override them, by creating the `~/.config/nwg-panel/preferred-apps
 {
  "\\.pdf$": "atril",
  "\\.svg$": "inkscape",
-  "\\.(jpg|png|tiff|gif)$": "feh",
+  "\\.(jpg|png|tiff|gif)$": "swayimg",
  "\\.(mp3|ogg|flac|wav|wma)$": "audacious",
  "\\.(avi|mp4|mkv|mov|wav)$": "mpv",
  "\\.(doc|docx|xls|xlsx)$": "libreoffice"
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
 module github.com/nwg-piotr/nwg-drawer

-go 1.20
+go 1.22

 require (
 	github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
-	github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872
-	github.com/fsnotify/fsnotify v1.6.0
-	github.com/gotk3/gotk3 v0.6.2
+	github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
+	github.com/fsnotify/fsnotify v1.7.0
+	github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
 	github.com/joshuarubin/go-sway v1.2.0
 	github.com/sirupsen/logrus v1.9.3
 )
@@ -14,6 +14,6 @@ require (
 require (
 	github.com/joshuarubin/lifecycle v1.1.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -3,13 +3,13 @@ github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37/go.m
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872 h1:16qcNl+UgbvudN7wPv+zq4mmDSYJWdLv5jbVhS7+OVI=
-github.com/dlasky/gotk3-layershell v0.0.0-20221218201547-1f6674a3f872/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774 h1:o87OVL4olQBlVwN3+NSVQpS6gj9FWUYtxOfHXWZigUE=
+github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
+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/gotk3/gotk3 v0.6.1/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
-github.com/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8=
-github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56 h1:eR+xxC8qqKuPMTucZqaklBxLIT7/4L7dzhlwKMrDbj8=
+github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
 github.com/joshuarubin/go-sway v1.2.0 h1:t3eqW504//uj9PDwFf0+IVfkD+WoOGaDX5gYIe0BHyM=
 github.com/joshuarubin/go-sway v1.2.0/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
 github.com/joshuarubin/lifecycle v1.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54=
@@ -28,12 +28,16 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.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.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.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=
--- a/img/exit.svg
+++ b/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>
--- a/img/lock.svg
+++ b/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>
--- a/img/poweroff.svg
+++ b/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>
--- a/img/reboot.svg
+++ b/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>
--- a/img/sleep.svg
+++ b/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>
--- a/main.go
+++ b/main.go
@@ -21,16 +21,20 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )

-const version = "0.3.9"
+const version = "0.5.0"

 var (
-	appDirs         []string
-	configDirectory string
-	pinnedFile      string
-	pinned          []string
-	id2entry        map[string]desktopEntry
-	preferredApps   map[string]interface{}
-	exclusions      []string
+	appDirs          []string
+	configDirectory  string
+	dataDirectory    string
+	pinnedFile       string
+	pinned           []string
+	id2entry         map[string]desktopEntry
+	preferredApps    map[string]interface{}
+	exclusions       []string
+	hyprlandMonitors []monitor
+	beenScrolled     bool
+	firstPowerBtn    *gtk.Button
 )

 var categoryNames = [...]string{
@@ -66,6 +70,30 @@ type desktopEntry struct {
 	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
@@ -104,7 +132,7 @@ var (
 	pinnedItemsChanged      chan interface{} = make(chan interface{}, 1)
 )

-func defaultStringIfBlank(s, fallback string) string {
+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.
@@ -114,12 +142,21 @@ func defaultStringIfBlank(s, fallback string) string {
 	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")
@@ -133,11 +170,19 @@ 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", defaultStringIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
+var term = flag.String("term", defaultTermIfBlank(os.Getenv("TERM"), "foot"), "Terminal emulator")
+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() {
@@ -153,12 +198,16 @@ func main() {
 		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, syscall.SIGUSR1)
-
+	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
@@ -166,7 +215,7 @@ func main() {
 			case syscall.SIGTERM:
 				log.Info("SIGTERM received, bye bye")
 				gtk.MainQuit()
-			case syscall.SIGUSR1:
+			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.
@@ -181,6 +230,23 @@ func main() {
 					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())
 			}
@@ -189,10 +255,10 @@ func main() {

 	// If running instance found, we want it to show the window. The new instance will send SIGUSR1 and die
 	// (equivalent of `pkill -USR1 nwg-drawer`).
-	// Otherwise the command may behave in two ways:
-	// 	1. kill the running non-residennt instance and exit;
+	// 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(dataDir(), "nwg-drawer.lock")
+	lockFilePath := path.Join(dataHome(), "nwg-drawer.lock")
 	lockFile, err := singleinstance.CreateLockFile(lockFilePath)
 	if err != nil {
 		pid, err := readTextFile(lockFilePath)
@@ -202,8 +268,17 @@ func main() {
 				if *resident {
 					log.Warnf("Resident instance already running (PID %v)", i)
 				} else {
-					log.Infof("Showing resident instance (PID %v)", i)
-					err := syscall.Kill(i, syscall.SIGUSR1)
+					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
 					}
@@ -224,6 +299,7 @@ func main() {

 	// 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.
@@ -249,7 +325,7 @@ func main() {

 	// Copy default style sheet if not found
 	if !pathExists(filepath.Join(configDirectory, "drawer.css")) {
-		err := copyFile("/usr/share/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)
 		}
@@ -343,7 +419,6 @@ func main() {
 	err = cssProvider.LoadFromPath(*cssFileName)
 	if err != nil {
 		log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
-		log.Errorf("%s", err)
 	} else {
 		log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
 		screen, _ := gdk.ScreenGetDefault()
@@ -362,6 +437,7 @@ func main() {
 		if *targetOutput != "" {
 			// We want to assign layershell to a monitor, but we only know the output name!
 			output2mon, err = mapOutputs()
+			log.Debugf("output2mon: %s", output2mon)
 			if err == nil {
 				monitor := output2mon[*targetOutput]
 				layershell.SetMonitor(win, monitor)
@@ -417,6 +493,10 @@ func main() {
 				}
 			}
 			return true
+		} else if key.KeyVal() == gdk.KEY_Tab {
+			if firstPowerBtn != nil {
+				firstPowerBtn.ToWidget().GrabFocus()
+			}
 		}
 		return false
 	})
@@ -476,6 +556,18 @@ func main() {
 	resultWindow.SetEvents(int(gdk.ALL_EVENTS_MASK))
 	resultWindow.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)

+	// 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.GetVAdjustment()
+	vAdj.Connect("value-changed", func() {
+		beenScrolled = true
+	})
+	hAdj := resultWindow.GetHAdjustment()
+	hAdj.Connect("value-changed", func() {
+		beenScrolled = true
+	})
+
 	resultWindow.Connect("button-release-event", func(_ *gtk.ScrolledWindow, event *gdk.Event) bool {
 		btnEvent := gdk.EventButtonNewFromEvent(event)
 		if btnEvent.Button() == 3 {
@@ -523,9 +615,74 @@ func main() {
 		resultsWrapper.PackEnd(wrapper, false, false, 10)
 	}

+	// Power Button Bar
+	if dataDirectory != "" {
+		if *pbExit != "" || *pbLock != "" || *pbPoweroff != "" || *pbReboot != "" || *pbSleep != "" {
+			powerBarWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+			outerVBox.PackStart(powerBarWrapper, false, false, 0)
+			powerButtonsWrapper, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+			powerBarWrapper.PackStart(powerButtonsWrapper, true, false, 12)
+
+			if *pbPoweroff != "" {
+				btn, _ := gtk.ButtonNew()
+				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.ButtonNew()
+				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.ButtonNew()
+				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.ButtonNew()
+				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.ButtonNew()
+				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.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
+	statusLineWrapper.SetProperty("name", "status-line-wrapper")
 	outerVBox.PackStart(statusLineWrapper, false, false, 10)
 	statusLabel, _ = gtk.LabelNew(status)
+	statusLabel.SetProperty("name", "status-label")
 	statusLineWrapper.PackStart(statusLabel, true, false, 0)

 	win.ShowAll()
--- a/tools.go
+++ b/tools.go
@@ -5,8 +5,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/joshuarubin/go-sway"
+	log "github.com/sirupsen/logrus"
 	"io"
 	"io/fs"
+	"net"
 	"os"
 	"os/exec"
 	"path"
@@ -17,11 +20,8 @@ import (
 	"syscall"
 	"time"

-	log "github.com/sirupsen/logrus"
-
 	"github.com/gotk3/gotk3/gdk"
 	"github.com/gotk3/gotk3/gtk"
-	"github.com/joshuarubin/go-sway"
 )

 func wayland() bool {
@@ -78,7 +78,7 @@ func mapXdgUserDirs() map[string]string {
 	result["pictures"] = filepath.Join(home, "Pictures")
 	result["videos"] = filepath.Join(home, "Videos")

-	userDirsFile := filepath.Join(filepath.Join(os.Getenv("XDG_CONFIG_HOME"), "user-dirs.dirs"))
+	userDirsFile := filepath.Join(filepath.Join(configHome(), "user-dirs.dirs"))
 	if pathExists(userDirsFile) {
 		log.Debugf("userDirsFile found: %s", userDirsFile)
 		log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile))
@@ -166,7 +166,14 @@ func configDir() string {
 	return dir
 }

-func dataDir() string {
+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")
@@ -174,7 +181,7 @@ func dataDir() string {
 		dir = path.Join(home, ".local/share/nwg-drawer")
 	}

-	log.Infof("Data dir: %s", dir)
+	log.Debugf("Data home: %s", dir)
 	createDir(dir)

 	return dir
@@ -190,7 +197,7 @@ func createDir(dir string) {
 }

 func copyFile(src, dst string) error {
-	log.Infof("Copying file: %s", dst)
+	log.Infof("Copying: '%s' => '%s'", src, dst)

 	var err error
 	var srcfd *os.File
@@ -226,6 +233,22 @@ func copyFile(src, dst string) error {
 	return os.Chmod(dst, srcinfo.Mode())
 }

+func dataDir() string {
+	xdgDataDirs := os.Getenv("XDG_DATA_DIRS")
+	if xdgDataDirs == "" {
+		xdgDataDirs = "/usr/local/share/:/usr/share/"
+	}
+	for _, d := range strings.Split(xdgDataDirs, ":") {
+		p := filepath.Join(d, "nwg-drawer")
+		if pathExists(p) {
+			log.Infof("Data dir: %v", p)
+			return p
+		}
+	}
+	log.Warnf("Data dir not found")
+	return ""
+}
+
 func getAppDirs() []string {
 	var dirs []string

@@ -314,9 +337,10 @@ func listDesktopFiles() []string {
 func setUpCategories() {
 	var other category

+	dDir := dataDir()
 	for _, cName := range categoryNames {
 		fileName := fmt.Sprintf("%s.directory", cName)
-		fp := filepath.Join("/usr/share/nwg-drawer/desktop-directories", fileName)
+		fp := filepath.Join(dDir, "desktop-directories", fileName)
 		lines, err := loadTextFile(fp)
 		if err == nil {
 			var cat category
@@ -548,6 +572,14 @@ func savePinned() {
 }

 func launch(command string, terminal bool) {
+	// trim % and everything afterwards
+	if strings.Contains(command, "%") {
+		cutAt := strings.Index(command, "%")
+		if cutAt != -1 {
+			command = command[:cutAt-1]
+		}
+	}
+
 	themeToPrepend := ""
 	// add "GTK_THEME=<default_gtk_theme>" environment variable
 	if *forceTheme {
@@ -557,59 +589,33 @@ func launch(command string, terminal bool) {
 			themeToPrepend = th.(string)
 		}
 	}
-	// trim % and everything afterwards
-	if strings.Contains(command, "%") {
-		cutAt := strings.Index(command, "%")
-		if cutAt != -1 {
-			command = command[:cutAt-1]
-		}
-	}
-
-	elements := strings.Split(command, " ")
-
-	// find prepended env variables, if any
-	envVarsNum := strings.Count(command, "=")
-	var envVars []string
-
-	cmdIdx := -1
-
-	if envVarsNum > 0 {
-		for idx, item := range elements {
-			if strings.Contains(item, "=") {
-				envVars = append(envVars, item)
-			} else if !strings.HasPrefix(item, "-") && cmdIdx == -1 {
-				cmdIdx = idx
-			}
-		}
-	}
-	if cmdIdx == -1 {
-		cmdIdx = 0
-	}

 	if themeToPrepend != "" {
-		envVars = append(envVars, fmt.Sprintf("GTK_THEME=%s", themeToPrepend))
+		command = fmt.Sprintf("GTK_THEME=%q %s", themeToPrepend, command)
 	}

-	cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...)
+	var elements = []string{"/usr/bin/env", "-S", command}
+
+	cmd := exec.Command(elements[0], elements[1:]...)

 	if terminal {
+		var prefixCommand = *term
 		var args []string
-		if *term != "foot" {
-			args = []string{"-e", elements[cmdIdx]}
+		if prefixCommand != "foot" {
+			args = []string{"-e", command}
 		} else {
-			args = []string{elements[cmdIdx]}
+			args = elements
 		}
-
-		cmd = exec.Command(*term, args...)
+		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
-	if len(envVars) > 0 {
-		cmd.Env = os.Environ()
-		cmd.Env = append(cmd.Env, envVars...)
-	}
-
-	msg := fmt.Sprintf("env vars: %s; command: '%s'; args: %s\n", envVars, elements[cmdIdx], elements[1+cmdIdx:])
+	msg := fmt.Sprintf("command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
 	log.Info(msg)

 	cmd.SysProcAttr = &syscall.SysProcAttr{
@@ -671,35 +677,54 @@ func open(filePath string, xdgOpen bool) {
 func mapOutputs() (map[string]*gdk.Monitor, error) {
 	result := make(map[string]*gdk.Monitor)

-	ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	defer cancel()
+	if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
+		err := listHyprlandMonitors()
+		if err == nil {

-	client, err := sway.New(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	outputs, err := client.GetOutputs(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	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
+			display, err := gdk.DisplayGetDefault()
+			if err != nil {
+				return nil, err
 			}
+
+			num := display.GetNMonitors()
+			for i := 0; i < num; i++ {
+				mon, _ := display.GetMonitor(i)
+				output := hyprlandMonitors[i]
+				result[output.Name] = mon
+			}
+		} 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, err := gdk.DisplayGetDefault()
+		if err != nil {
+			return nil, err
+		}
+
+		num := display.GetNMonitors()
+		for i := 0; i < num; i++ {
+			mon, _ := display.GetMonitor(i)
+			output := outputs[i]
+			result[output.Name] = mon
+		}
+	} else {
+		return nil, errors.New("output assignment only supported on sway and Hyprland")
 	}
+
 	return result, nil
 }

@@ -718,3 +743,46 @@ func substring(s string, start int, end int) string {
 	}
 	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
+}
--- a/uicomponents.go
+++ b/uicomponents.go
@@ -264,11 +264,19 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 		r := substring(desc, 0, 117)
 		desc = fmt.Sprintf("%s…", string(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, e *gdk.Event) bool {
 		btnEvent := gdk.EventButtonNewFromEvent(e)
 		if btnEvent.Button() == 1 {
-			launch(exec, terminal)
-			return true
+			if !beenScrolled {
+				launch(exec, terminal)
+				return true
+			}
 		} else if btnEvent.Button() == 3 {
 			pinItem(ID)
 			return true
@@ -281,12 +289,59 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	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.ButtonNew()
+	button.SetAlwaysShowImage(true)
+
+	var pixbuf *gdk.Pixbuf
+	var img *gtk.Image
+	var err error
+	if !*pbUseIconTheme {
+		pixbuf, err = gdk.PixbufNewFromFileAtSize(iconPathOrName, *pbSize, *pbSize)
+		if err != nil {
+			pixbuf, _ = createPixbuf("unknown", *pbSize)
+			log.Warnf("Couldn't find icon %s", iconPathOrName)
+		}
+		img, _ = gtk.ImageNewFromPixbuf(pixbuf)
+	} else {
+		img, _ = gtk.ImageNewFromIconName(iconPathOrName, gtk.ICON_SIZE_DIALOG)
+	}
+
+	button.SetImage(img)
+	button.SetImagePosition(gtk.POS_TOP)
+
+	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
+		btnEvent := gdk.EventButtonNewFromEvent(e)
+		if btnEvent.Button() == 1 {
+			launch(command, false)
+			return true
+		}
+		return false
+	})
+	button.Connect("activate", func() {
+		launch(command, false)
+	})
+	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
+}
+
 func setUpFileSearchResultContainer() *gtk.FlowBox {
 	if fileSearchResultFlowBox != nil {
 		fileSearchResultFlowBox.Destroy()
Author	SHA1	Message	Date
Piotr Miller	44e4c95900	Merge pull request #130 from nwg-piotr/backports Merge pull request #129 from nwg-piotr/main	2024-09-22 14:05:20 +02:00
Piotr Miller	86a3398bc3	Merge pull request #129 from nwg-piotr/main A bunch of fixes	2024-09-22 14:04:33 +02:00
piotr	c4a268332a	bump to 0.5.0	2024-09-22 13:57:01 +02:00
piotr	e77d189f4a	println -> log.Debug	2024-09-22 13:54:32 +02:00
piotr	e3cb0af2bd	println -> log.Debug	2024-09-22 13:51:46 +02:00
piotr	1015f4c48f	fix hyprclt & mapping output->monitor	2024-09-22 13:44:02 +02:00
piotr	86c92328cd	update dependencies	2024-09-22 13:29:07 +02:00
piotr	4afa9f1aa3	add `riverctl spawn`	2024-09-22 13:26:18 +02:00
Piotr Miller	0bce8cf971	Merge pull request #127 from mattkae/main Update gotk3 to the latest version to avoid build failures	2024-08-11 22:20:16 +02:00
Matthew Kosarek	e6a1130524	Update gotk3 to the latest version to avoid build failures	2024-08-11 15:59:14 -04:00
Piotr Miller	433c05ca1e	Merge pull request #125 from nwg-piotr/icon-theme update README.md	2024-06-29 20:20:34 +02:00
piotr	cd06a981cb	update README.md	2024-06-29 20:19:12 +02:00
Piotr Miller	0f6f92433e	Merge pull request #124 from nwg-piotr/icon-theme Add the `-pbuseicontheme` flagIcon theme	2024-06-29 03:01:20 +02:00
piotr	3ffd09b5d7	add more desc	2024-06-29 02:40:01 +02:00
piotr	071841da46	bump to 0.4.9	2024-06-29 02:38:43 +02:00
piotr	c7a0b564c0	improve description	2024-06-29 02:34:41 +02:00
piotr	6862711010	add pbUseIconTheme flag #122	2024-06-29 02:32:27 +02:00
piotr	6d671062df	change logging level	2024-06-17 02:16:52 +02:00
piotr	9aebff5d98	fix typos	2024-06-17 02:10:03 +02:00
piotr	051590ce4b	revert gotk3 to v0.6.3	2024-06-17 02:03:39 +02:00
piotr	16be4ff00d	bump to 0.4.8	2024-06-17 02:01:20 +02:00
piotr	9f0f708cae	Merge remote-tracking branch 'origin/main'	2024-06-17 01:53:43 +02:00
piotr	4e04e7a4f4	update dependencies	2024-06-17 01:53:25 +02:00
Piotr Miller	85a0b87024	Merge pull request #121 from RRRRRm/open_close Add -open and -close options	2024-06-17 01:52:21 +02:00
RRRRRm	6649dcefdb	Correct the default terminal	2024-06-17 00:31:52 +01:00
Zijia Xiong	e501038c64	Merge branch 'open_close' of github.com:RRRRRm/nwg-drawer into open_close	2024-06-16 19:04:31 +01:00
Zijia Xiong	008f31278d	Fix logic about receive signals	2024-06-16 19:01:26 +01:00
RRRRRm	69e3b06b39	Update README.md, Add some information about new flags `-open` and `-close`	2024-06-16 18:35:01 +01:00
Zijia Xiong	99765402d7	Change usage of SIGINT to SIGRTMIN+3	2024-06-14 00:48:10 +01:00
Zijia Xiong	3fb70fc0cb	Fix bug of -open and -close	2024-06-13 23:30:58 +01:00
Zijia Xiong	04a04c1417	Add -close and -open options.	2024-06-13 19:09:33 +01:00
Piotr Miller	a54a56c4b9	Update FUNDING.yml	2024-02-16 13:17:28 +01:00
piotr	0cd48d1631	unhardcode desktop-directories path	2024-02-08 03:12:17 +01:00
piotr	943ca39055	update README.md	2024-02-08 02:51:16 +01:00
piotr	42b279ee02	update README.md	2024-02-08 02:49:57 +01:00
Piotr Miller	42f15ec2cb	Merge pull request #116 from nwg-piotr/data un-hardcode data dir	2024-02-08 02:35:16 +01:00
piotr	936f793be4	update README.md	2024-02-08 02:28:21 +01:00
piotr	b59058c5c2	focus 1st power button on Tab key	2024-02-08 02:23:34 +01:00
piotr	3ea4a7824c	bump to 0.4.7	2024-02-08 01:32:37 +01:00
piotr	701d4e62f2	unhardcode data dir again #115	2024-02-08 01:31:22 +01:00
piotr	d4996af84a	unhardcode data dir #115	2024-02-08 01:20:03 +01:00
piotr	71ce3b5d75	Merge remote-tracking branch 'origin/main'	2024-02-06 03:40:14 +01:00
piotr	b056b4c436	bump to 0.4.6	2024-02-06 03:39:35 +01:00
Piotr Miller	42b55d41df	Merge pull request #113 from nwg-piotr/touch Don't launch if the window has been scrolled	2024-02-06 03:38:09 +01:00
piotr	ec0ce767d9	get proper adjustment	2024-02-06 03:35:29 +01:00
piotr	ec3caa02d2	add comments #110	2024-02-06 03:33:12 +01:00
piotr	6b39eba14c	check if window scrolled #110	2024-02-06 03:21:42 +01:00
piotr	631b651eed	bump to 0.4.5	2024-02-05 01:02:34 +01:00
piotr	df644f4196	gotk3 -> 0.6.3	2024-02-05 01:01:30 +01:00
piotr	be89ff4b97	update README.md	2024-02-03 16:44:55 +01:00
piotr	5cab646d08	update README.md	2024-02-03 16:40:57 +01:00
piotr	f93e6923d0	update README.md	2024-02-03 16:39:34 +01:00
Piotr Miller	2d114e58bc	Update README.md	2024-02-03 15:53:10 +01:00
piotr	11f2f67184	update README.md	2024-02-03 04:26:49 +01:00
piotr	038fddc9da	update README.md	2024-02-03 04:23:30 +01:00
piotr	945f73adbf	Merge remote-tracking branch 'origin/main'	2024-02-03 04:15:05 +01:00
Piotr Miller	f8572b3db8	Update README.md	2024-02-03 04:14:35 +01:00
piotr	9012a45be4	update README.md	2024-02-03 04:12:06 +01:00
piotr	fe311ced2a	bump to 0.4.4	2024-02-03 04:06:01 +01:00
Piotr Miller	bd12c281b1	Merge pull request #112 from nwg-piotr/power add optional PowerBar	2024-02-02 02:06:56 +01:00
piotr	ff34cf8194	fix finding userDirsFile	2024-02-02 01:39:58 +01:00
piotr	8e02b59f83	clear status label on button exit	2024-02-01 18:24:14 +01:00
Piotr Miller	7b2ed76fac	update lock icon	2024-02-01 09:48:06 +01:00
piotr	b0dc1404e7	formatting	2024-02-01 04:14:42 +01:00
piotr	6da6787272	add powerButton size argument	2024-02-01 04:09:31 +01:00
piotr	01c26ba092	add powerButton function	2024-02-01 03:52:56 +01:00
piotr	db265ccf6a	update dependencies	2024-02-01 01:09:57 +01:00
piotr	ffc256ba87	fix Makefile; modify icons	2024-02-01 01:09:13 +01:00
Piotr Miller	b5f1713c3e	add power icons	2024-01-31 10:50:44 +01:00
piotr	b1908537d1	cp README.md, LICENSE	2024-01-27 14:52:34 +01:00
piotr	664917c105	update README.md	2024-01-27 04:15:17 +01:00
piotr	bf66683a09	update README.md	2024-01-27 03:31:21 +01:00
piotr	ff8e2435b6	rename variable	2023-11-27 00:18:03 +01:00
Piotr Miller	223e16f77c	Merge pull request #106 from nwg-piotr/otput-hypr Make binding to an output work on Hyprland	2023-11-26 23:40:28 +01:00
piotr	55c095c053	fix -wm help	2023-11-26 23:34:48 +01:00
piotr	ee2008348f	bump to 0.4.3	2023-11-26 23:17:00 +01:00
piotr	0570f90bec	update help	2023-11-26 23:16:39 +01:00
piotr	a2917d68dd	support output assignment on Hyprland	2023-11-26 23:14:18 +01:00
piotr	b05b0f484a	improve help	2023-11-25 15:54:05 +01:00
piotr	b61e665c71	bump to 0.4.2	2023-11-22 01:23:59 +01:00
piotr	8408c669ef	remove unused function	2023-11-22 01:13:48 +01:00
Piotr Miller	d66066c3b6	Merge pull request #105 from nwg-piotr/fix-wm remove `XDG_CURRENT_DESKTOP` as default `-wm` value; allow capitalized `Hyprland`	2023-11-21 14:53:22 +01:00
piotr	dac55cdd0d	remove setting `XDG_CURRENT_DESKTOP` as dafault `-wm` value; allow capitalized `Hyprland` value	2023-11-21 14:26:04 +01:00
Piotr Miller	03365d24e5	Merge pull request #104 from Schuldkroete/main Make the description line at the bottom of the drawer themable	2023-11-21 14:20:22 +01:00
Schuldkröte	8e58654336	add gtk name property to statusLineWrapper and statusLabel	2023-11-21 11:47:01 +01:00
piotr	33e0032725	bump to 0.4.1	2023-11-18 01:41:53 +01:00
Piotr Miller	c05fff189d	Merge pull request #103 from gouvinb/main Change command execution logic and use `/usr/bin/env` command	2023-11-18 01:40:09 +01:00
gouvinb	57d130ca51	Restore the code to trim % and everything that follows	2023-11-09 15:49:50 +01:00
gouvinb	954a6ba9c9	change command execution logic and use env command	2023-11-09 04:24:41 +01:00
piotr	67b16ea6a6	bump to 0.4.0	2023-11-08 02:30:01 +01:00
piotr	3a02b16761	update versions	2023-11-08 02:25:43 +01:00
piotr	c67fef6671	fix line formatting	2023-11-08 02:24:41 +01:00
Piotr Miller	444617865e	Merge pull request #102 from gouvinb/main add support to hyprlandctl	2023-11-08 01:01:10 +01:00
gouvinb	e3de9cc67b	make better log with -wm flag	2023-11-07 10:32:23 +01:00
gouvinb	1c11329581	Reworked command building. Typical shell-supported command sets: - `cmd` - `cmd --arg` - `cmd --arg=value` - `ENV_VAR="value" cmd` - `ENV_VAR="value" cmd --arg` - `ENV_VAR="value" cmd --arg=value` The listed commands above are now better managed. Initially, the command types `cmd --arg=value` or `ENV_VAR="value" cmd --arg=value` were not correctly parsed. After finding a solution to this problem, I conducted further tests and discovered cases that were not currently handled. These cases are as follows: - `cmd "arg with space"` - `ENV_VAR="value with space" cmd`	2023-11-06 15:35:42 +01:00
gouvinb	87ee23afe2	print the correct executed command (prefix supported)	2023-11-06 12:40:10 +01:00
gouvinb	808fd032a0	fix prefix command with hypr or hyprland and update `-wm` description	2023-11-06 00:05:16 +01:00
gouvinb	1d3f023dc8	add support to hyprlandctl BREAKING CHANGE: '-swaymsg' removed, use '-wm sway' instead	2023-11-05 23:36:18 +01:00
Piotr Miller	ccfe7776c6	Merge pull request #101 from gouvinb/main Add the `swaymsg` flag to launch a program with `swaymsg exec` and prevent potential involuntary closing with Jetbrains IDEs	2023-11-05 14:03:26 +01:00
gouvinb	5a7dbefeb0	adds the "swaymsg" flag to launch a program with "swaymsg exec" and prevent potential involuntary closing with Jetbrains IDEs	2023-11-01 00:44:50 +01:00