Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0eb0965a8 | ||
|
|
c940139fd9 | ||
|
|
10b1b2a1e6 | ||
|
|
b4b7d3486a | ||
|
|
61a5595d84 | ||
|
|
cb44c7215f | ||
|
|
e7fafebf55 | ||
|
|
702cbb1c5c | ||
|
|
7de2854041 | ||
|
|
be6b71673d | ||
|
|
9c48c585b7 | ||
|
|
3977c4fc7c | ||
|
|
46a526ced8 | ||
|
|
12da77fbfc | ||
|
|
484c6ccb29 | ||
|
|
7aac5a4f52 | ||
|
|
44e4c95900 | ||
|
|
86a3398bc3 | ||
|
|
c4a268332a | ||
|
|
e77d189f4a | ||
|
|
e3cb0af2bd | ||
|
|
1015f4c48f | ||
|
|
86c92328cd | ||
|
|
4afa9f1aa3 | ||
|
|
0bce8cf971 | ||
|
|
e6a1130524 |
21
README.md
21
README.md
@@ -172,7 +172,7 @@ Edit `~/.config/nwg-drawer/drawer.css` to your taste.
|
|||||||
When the search phrase is at least 3 characters long, your XDG user directories are being searched.
|
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
|
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.
|
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
|
### Sample `preferred-apps.json` file content
|
||||||
|
|
||||||
@@ -199,13 +199,29 @@ I've noy yet tried other file managers.
|
|||||||
### File search exclusions
|
### File search exclusions
|
||||||
|
|
||||||
You may want to exclude some paths inside your XDG user directories from searching. If so, define exclusions in the
|
You may want to exclude some paths inside your XDG user directories from searching. If so, define exclusions in the
|
||||||
`~/.config/nwg-panel/excluded-dirs` file, e.g. like this:
|
`~/.config/nwg-drawer/excluded-dirs` file, e.g. like this:
|
||||||
|
|
||||||
```text
|
```text
|
||||||
# exclude all paths containing 'node_modules'
|
# exclude all paths containing 'node_modules'
|
||||||
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
|
## Credits
|
||||||
|
|
||||||
This program uses some great libraries:
|
This program uses some great libraries:
|
||||||
@@ -217,3 +233,4 @@ Copyright (c) 2015-2018 gotk3 contributors
|
|||||||
- [go-singleinstance](github.com/allan-simon/go-singleinstance) Copyright (c) 2015 Allan Simon
|
- [go-singleinstance](github.com/allan-simon/go-singleinstance) Copyright (c) 2015 Allan Simon
|
||||||
- [logrus](https://github.com/sirupsen/logrus) Copyright (c) 2014 Simon Eskildsen
|
- [logrus](https://github.com/sirupsen/logrus) Copyright (c) 2014 Simon Eskildsen
|
||||||
- [fsnotify](https://github.com/fsnotify/fsnotify) Copyright (c) 2012-2019 fsnotify Authors
|
- [fsnotify](https://github.com/fsnotify/fsnotify) Copyright (c) 2012-2019 fsnotify Authors
|
||||||
|
- [expr](https://github.com/expr-lang/expr) Copyright (c) 2018 Anton Medvedev
|
||||||
|
|||||||
@@ -32,3 +32,9 @@ button:hover {
|
|||||||
border: 1px dotted gray;
|
border: 1px dotted gray;
|
||||||
border-radius: 15px
|
border-radius: 15px
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* math operation result label */
|
||||||
|
#math-label {
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 16px
|
||||||
|
}
|
||||||
|
|||||||
9
go.mod
9
go.mod
@@ -1,19 +1,20 @@
|
|||||||
module github.com/nwg-piotr/nwg-drawer
|
module github.com/nwg-piotr/nwg-drawer
|
||||||
|
|
||||||
go 1.22
|
go 1.23
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
|
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
|
||||||
github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
|
github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
|
||||||
github.com/fsnotify/fsnotify v1.7.0
|
github.com/fsnotify/fsnotify v1.7.0
|
||||||
github.com/gotk3/gotk3 v0.6.3
|
github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
|
||||||
github.com/joshuarubin/go-sway v1.2.0
|
github.com/joshuarubin/go-sway v1.2.0
|
||||||
github.com/sirupsen/logrus v1.9.3
|
github.com/sirupsen/logrus v1.9.3
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
github.com/expr-lang/expr v1.16.9 // indirect
|
||||||
github.com/joshuarubin/lifecycle v1.1.4 // indirect
|
github.com/joshuarubin/lifecycle v1.1.4 // indirect
|
||||||
go.uber.org/multierr v1.11.0 // indirect
|
go.uber.org/multierr v1.11.0 // indirect
|
||||||
golang.org/x/sync v0.7.0 // indirect
|
golang.org/x/sync v0.8.0 // indirect
|
||||||
golang.org/x/sys v0.21.0 // indirect
|
golang.org/x/sys v0.26.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
38
go.sum
38
go.sum
@@ -3,23 +3,15 @@ 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.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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
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/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f h1:qDnUQAD7tVX/gnL6uSgouzfGNA4xXH+B/fd6Ko19GgM=
|
|
||||||
github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
|
|
||||||
github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774 h1:o87OVL4olQBlVwN3+NSVQpS6gj9FWUYtxOfHXWZigUE=
|
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/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
|
||||||
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
|
github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
|
||||||
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
|
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 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
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.1/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
|
||||||
github.com/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8=
|
github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56 h1:eR+xxC8qqKuPMTucZqaklBxLIT7/4L7dzhlwKMrDbj8=
|
||||||
github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
|
github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
|
||||||
github.com/gotk3/gotk3 v0.6.3 h1:+Ke4WkM1TQUNOlM2TZH6szqknqo+zNbX3BZWVXjSHYw=
|
|
||||||
github.com/gotk3/gotk3 v0.6.3/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
|
|
||||||
github.com/gotk3/gotk3 v0.6.4 h1:5ur/PRr86PwCG8eSj98D1eXvhrNNK6GILS2zq779dCg=
|
|
||||||
github.com/gotk3/gotk3 v0.6.4/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 h1:t3eqW504//uj9PDwFf0+IVfkD+WoOGaDX5gYIe0BHyM=
|
||||||
github.com/joshuarubin/go-sway v1.2.0/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
|
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.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54=
|
||||||
@@ -38,26 +30,18 @@ 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 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
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.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.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
|
|
||||||
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
|
||||||
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
|
|
||||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
|
||||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
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.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-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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
|
|
||||||
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
|
|
||||||
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
|
|
||||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
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.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=
|
||||||
|
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
|
||||||
|
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
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.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 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
27
main.go
27
main.go
@@ -3,6 +3,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/expr-lang/expr"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path"
|
"path"
|
||||||
@@ -21,7 +22,7 @@ import (
|
|||||||
"github.com/gotk3/gotk3/gtk"
|
"github.com/gotk3/gotk3/gtk"
|
||||||
)
|
)
|
||||||
|
|
||||||
const version = "0.4.9"
|
const version = "0.5.2"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
appDirs []string
|
appDirs []string
|
||||||
@@ -171,7 +172,7 @@ var itemSpacing = flag.Uint("spacing", 20, "icon spacing")
|
|||||||
var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
|
var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"")
|
||||||
var fileManager = flag.String("fm", "thunar", "File Manager")
|
var fileManager = flag.String("fm", "thunar", "File Manager")
|
||||||
var term = flag.String("term", defaultTermIfBlank(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') to launch programs")
|
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 nameLimit = flag.Int("fslen", 80, "File Search name LENgth Limit")
|
||||||
var noCats = flag.Bool("nocats", false, "Disable filtering by category")
|
var noCats = flag.Bool("nocats", false, "Disable filtering by category")
|
||||||
var noFS = flag.Bool("nofs", false, "Disable file search")
|
var noFS = flag.Bool("nofs", false, "Disable file search")
|
||||||
@@ -419,7 +420,6 @@ func main() {
|
|||||||
err = cssProvider.LoadFromPath(*cssFileName)
|
err = cssProvider.LoadFromPath(*cssFileName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
|
log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
|
||||||
log.Errorf("%s", err)
|
|
||||||
} else {
|
} else {
|
||||||
log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
|
log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
|
||||||
screen, _ := gdk.ScreenGetDefault()
|
screen, _ := gdk.ScreenGetDefault()
|
||||||
@@ -433,12 +433,13 @@ func main() {
|
|||||||
|
|
||||||
if wayland() {
|
if wayland() {
|
||||||
layershell.InitForWindow(win)
|
layershell.InitForWindow(win)
|
||||||
|
layershell.SetNamespace(win, "nwg-drawer")
|
||||||
|
|
||||||
var output2mon map[string]*gdk.Monitor
|
var output2mon map[string]*gdk.Monitor
|
||||||
if *targetOutput != "" {
|
if *targetOutput != "" {
|
||||||
// We want to assign layershell to a monitor, but we only know the output name!
|
// We want to assign layershell to a monitor, but we only know the output name!
|
||||||
output2mon, err = mapOutputs()
|
output2mon, err = mapOutputs()
|
||||||
fmt.Println(">>>", output2mon)
|
log.Debugf("output2mon: %s", output2mon)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
monitor := output2mon[*targetOutput]
|
monitor := output2mon[*targetOutput]
|
||||||
layershell.SetMonitor(win, monitor)
|
layershell.SetMonitor(win, monitor)
|
||||||
@@ -494,12 +495,26 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
|
|
||||||
} else if key.KeyVal() == gdk.KEY_Tab {
|
} else if key.KeyVal() == gdk.KEY_Tab {
|
||||||
if firstPowerBtn != nil {
|
if firstPowerBtn != nil {
|
||||||
firstPowerBtn.ToWidget().GrabFocus()
|
firstPowerBtn.ToWidget().GrabFocus()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} else if key.KeyVal() == gdk.KEY_Return {
|
||||||
|
s, _ := searchEntry.GetText()
|
||||||
|
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, err := expr.Eval(s, nil)
|
||||||
|
if err == nil {
|
||||||
|
log.Debugf("Setting up mathemathical operation result window. Operation: %s, result: %v", s, result)
|
||||||
|
setUpOperationResultWindow(s, fmt.Sprintf("%v", result))
|
||||||
}
|
}
|
||||||
return false
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
win.Connect("key-press-event", func(_ *gtk.Window, event *gdk.Event) bool {
|
win.Connect("key-press-event", func(_ *gtk.Window, event *gdk.Event) bool {
|
||||||
@@ -513,8 +528,8 @@ func main() {
|
|||||||
if !searchEntry.IsFocus() {
|
if !searchEntry.IsFocus() {
|
||||||
searchEntry.GrabFocusWithoutSelecting()
|
searchEntry.GrabFocusWithoutSelecting()
|
||||||
}
|
}
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
return false
|
||||||
})
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
32
tools.go
32
tools.go
@@ -571,7 +571,7 @@ func savePinned() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func launch(command string, terminal bool) {
|
func launch(command string, terminal bool, terminate bool) {
|
||||||
// trim % and everything afterwards
|
// trim % and everything afterwards
|
||||||
if strings.Contains(command, "%") {
|
if strings.Contains(command, "%") {
|
||||||
cutAt := strings.Index(command, "%")
|
cutAt := strings.Index(command, "%")
|
||||||
@@ -611,9 +611,11 @@ func launch(command string, terminal bool) {
|
|||||||
cmd = exec.Command("swaymsg", "exec", strings.Join(elements, " "))
|
cmd = exec.Command("swaymsg", "exec", strings.Join(elements, " "))
|
||||||
} else if *wm == "hyprland" || *wm == "Hyprland" {
|
} else if *wm == "hyprland" || *wm == "Hyprland" {
|
||||||
cmd = exec.Command("hyprctl", "dispatch", "exec", strings.Join(elements, " "))
|
cmd = exec.Command("hyprctl", "dispatch", "exec", strings.Join(elements, " "))
|
||||||
|
} else if *wm == "river" {
|
||||||
|
cmd = exec.Command("riverctl", "spawn", strings.Join(elements, " "))
|
||||||
}
|
}
|
||||||
|
|
||||||
msg := fmt.Sprintf("command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
|
msg := fmt.Sprintf("Executing command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
|
||||||
log.Info(msg)
|
log.Info(msg)
|
||||||
|
|
||||||
cmd.SysProcAttr = &syscall.SysProcAttr{
|
cmd.SysProcAttr = &syscall.SysProcAttr{
|
||||||
@@ -630,12 +632,14 @@ func launch(command string, terminal bool) {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if terminate {
|
||||||
if *resident {
|
if *resident {
|
||||||
restoreStateAndHide()
|
restoreStateAndHide()
|
||||||
} else {
|
} else {
|
||||||
gtk.MainQuit()
|
gtk.MainQuit()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func open(filePath string, xdgOpen bool) {
|
func open(filePath string, xdgOpen bool) {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
@@ -687,14 +691,9 @@ func mapOutputs() (map[string]*gdk.Monitor, error) {
|
|||||||
num := display.GetNMonitors()
|
num := display.GetNMonitors()
|
||||||
for i := 0; i < num; i++ {
|
for i := 0; i < num; i++ {
|
||||||
mon, _ := display.GetMonitor(i)
|
mon, _ := display.GetMonitor(i)
|
||||||
geometry := mon.GetGeometry()
|
output := hyprlandMonitors[i]
|
||||||
// assign output to monitor on the basis of the same x, y coordinates
|
|
||||||
for _, output := range hyprlandMonitors {
|
|
||||||
if int(output.X) == geometry.GetX() && int(output.Y) == geometry.GetY() {
|
|
||||||
result[output.Name] = mon
|
result[output.Name] = mon
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -721,14 +720,9 @@ func mapOutputs() (map[string]*gdk.Monitor, error) {
|
|||||||
num := display.GetNMonitors()
|
num := display.GetNMonitors()
|
||||||
for i := 0; i < num; i++ {
|
for i := 0; i < num; i++ {
|
||||||
mon, _ := display.GetMonitor(i)
|
mon, _ := display.GetMonitor(i)
|
||||||
geometry := mon.GetGeometry()
|
output := outputs[i]
|
||||||
// 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] = mon
|
result[output.Name] = mon
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return nil, errors.New("output assignment only supported on sway and Hyprland")
|
return nil, errors.New("output assignment only supported on sway and Hyprland")
|
||||||
}
|
}
|
||||||
@@ -754,7 +748,15 @@ func substring(s string, start int, end int) string {
|
|||||||
|
|
||||||
func hyprctl(cmd string) ([]byte, error) {
|
func hyprctl(cmd string) ([]byte, error) {
|
||||||
his := os.Getenv("HYPRLAND_INSTANCE_SIGNATURE")
|
his := os.Getenv("HYPRLAND_INSTANCE_SIGNATURE")
|
||||||
socketFile := fmt.Sprintf("/tmp/hypr/%s/.socket.sock", his)
|
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)
|
conn, err := net.Dial("unix", socketFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"github.com/dlasky/gotk3-layershell/layershell"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -66,7 +67,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
|||||||
btn.Connect("button-release-event", func(row *gtk.Button, e *gdk.Event) bool {
|
btn.Connect("button-release-event", func(row *gtk.Button, e *gdk.Event) bool {
|
||||||
btnEvent := gdk.EventButtonNewFromEvent(e)
|
btnEvent := gdk.EventButtonNewFromEvent(e)
|
||||||
if btnEvent.Button() == 1 {
|
if btnEvent.Button() == 1 {
|
||||||
launch(entry.Exec, entry.Terminal)
|
launch(entry.Exec, entry.Terminal, true)
|
||||||
return true
|
return true
|
||||||
} else if btnEvent.Button() == 3 {
|
} else if btnEvent.Button() == 3 {
|
||||||
unpinItem(entry.DesktopID)
|
unpinItem(entry.DesktopID)
|
||||||
@@ -75,7 +76,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
|||||||
return false
|
return false
|
||||||
})
|
})
|
||||||
btn.Connect("activate", func() {
|
btn.Connect("activate", func() {
|
||||||
launch(entry.Exec, entry.Terminal)
|
launch(entry.Exec, entry.Terminal, true)
|
||||||
})
|
})
|
||||||
btn.Connect("enter-notify-event", func() {
|
btn.Connect("enter-notify-event", func() {
|
||||||
statusLabel.SetText(entry.CommentLoc)
|
statusLabel.SetText(entry.CommentLoc)
|
||||||
@@ -274,7 +275,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
|
|||||||
btnEvent := gdk.EventButtonNewFromEvent(e)
|
btnEvent := gdk.EventButtonNewFromEvent(e)
|
||||||
if btnEvent.Button() == 1 {
|
if btnEvent.Button() == 1 {
|
||||||
if !beenScrolled {
|
if !beenScrolled {
|
||||||
launch(exec, terminal)
|
launch(exec, terminal, true)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
} else if btnEvent.Button() == 3 {
|
} else if btnEvent.Button() == 3 {
|
||||||
@@ -284,7 +285,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
|
|||||||
return false
|
return false
|
||||||
})
|
})
|
||||||
button.Connect("activate", func() {
|
button.Connect("activate", func() {
|
||||||
launch(exec, terminal)
|
launch(exec, terminal, true)
|
||||||
})
|
})
|
||||||
button.Connect("enter-notify-event", func() {
|
button.Connect("enter-notify-event", func() {
|
||||||
statusLabel.SetText(desc)
|
statusLabel.SetText(desc)
|
||||||
@@ -322,13 +323,13 @@ func powerButton(iconPathOrName, command string) *gtk.Button {
|
|||||||
button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
|
button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
|
||||||
btnEvent := gdk.EventButtonNewFromEvent(e)
|
btnEvent := gdk.EventButtonNewFromEvent(e)
|
||||||
if btnEvent.Button() == 1 {
|
if btnEvent.Button() == 1 {
|
||||||
launch(command, false)
|
launch(command, false, true)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
})
|
})
|
||||||
button.Connect("activate", func() {
|
button.Connect("activate", func() {
|
||||||
launch(command, false)
|
launch(command, false, true)
|
||||||
})
|
})
|
||||||
button.Connect("enter-notify-event", func() {
|
button.Connect("enter-notify-event", func() {
|
||||||
statusLabel.SetText(command)
|
statusLabel.SetText(command)
|
||||||
@@ -584,3 +585,54 @@ func setUpUserFileSearchResultButton(fileName, filePath string) *gtk.Box {
|
|||||||
box.PackStart(button, false, true, 0)
|
box.PackStart(button, false, true, 0)
|
||||||
return box
|
return box
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func setUpOperationResultWindow(operation string, result string) {
|
||||||
|
win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("Unable to create result window:", err)
|
||||||
|
}
|
||||||
|
win.SetModal(true)
|
||||||
|
|
||||||
|
if wayland() {
|
||||||
|
layershell.InitForWindow(win)
|
||||||
|
layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_OVERLAY)
|
||||||
|
layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
|
||||||
|
}
|
||||||
|
|
||||||
|
// any key to close the window
|
||||||
|
win.Connect("key-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
|
||||||
|
win.Destroy()
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
// any button to close the window
|
||||||
|
win.Connect("button-release-event", func(_ *gtk.Window, event *gdk.Event) bool {
|
||||||
|
win.Destroy()
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
outerVBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 6)
|
||||||
|
win.Add(outerVBox)
|
||||||
|
|
||||||
|
vBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 5)
|
||||||
|
outerVBox.PackStart(vBox, true, true, 6)
|
||||||
|
lbl, _ := gtk.LabelNew(fmt.Sprintf("%s = %s", operation, result))
|
||||||
|
lbl.SetProperty("name", "math-label")
|
||||||
|
vBox.PackStart(lbl, true, true, 12)
|
||||||
|
|
||||||
|
mRefProvider, _ := gtk.CssProviderNew()
|
||||||
|
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, _ := win.GetStyleContext()
|
||||||
|
ctx.AddProvider(mRefProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
|
||||||
|
|
||||||
|
win.ShowAll()
|
||||||
|
|
||||||
|
if wayland() {
|
||||||
|
cmd := fmt.Sprintf("wl-copy %v", result)
|
||||||
|
launch(cmd, false, false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user