Compare commits
193 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be89ff4b97 | ||
|
|
5cab646d08 | ||
|
|
f93e6923d0 | ||
|
|
2d114e58bc | ||
|
|
11f2f67184 | ||
|
|
038fddc9da | ||
|
|
945f73adbf | ||
|
|
f8572b3db8 | ||
|
|
9012a45be4 | ||
|
|
fe311ced2a | ||
|
|
bd12c281b1 | ||
|
|
ff34cf8194 | ||
|
|
8e02b59f83 | ||
|
|
7b2ed76fac | ||
|
|
b0dc1404e7 | ||
|
|
6da6787272 | ||
|
|
01c26ba092 | ||
|
|
db265ccf6a | ||
|
|
ffc256ba87 | ||
|
|
b5f1713c3e | ||
|
|
b1908537d1 | ||
|
|
664917c105 | ||
|
|
bf66683a09 | ||
|
|
ff8e2435b6 | ||
|
|
223e16f77c | ||
|
|
55c095c053 | ||
|
|
ee2008348f | ||
|
|
0570f90bec | ||
|
|
a2917d68dd | ||
|
|
b05b0f484a | ||
|
|
b61e665c71 | ||
|
|
8408c669ef | ||
|
|
d66066c3b6 | ||
|
|
dac55cdd0d | ||
|
|
03365d24e5 | ||
|
|
8e58654336 | ||
|
|
33e0032725 | ||
|
|
c05fff189d | ||
|
|
57d130ca51 | ||
|
|
954a6ba9c9 | ||
|
|
67b16ea6a6 | ||
|
|
3a02b16761 | ||
|
|
c67fef6671 | ||
|
|
444617865e | ||
|
|
e3de9cc67b | ||
|
|
1c11329581 | ||
|
|
87ee23afe2 | ||
|
|
808fd032a0 | ||
|
|
1d3f023dc8 | ||
|
|
ccfe7776c6 | ||
|
|
5a7dbefeb0 | ||
|
|
fd26bb39e8 | ||
|
|
bc74ebc927 | ||
|
|
d65d075bdb | ||
|
|
58ea8ea8db | ||
|
|
94b8b8d7f0 | ||
|
|
ebfaba1881 | ||
|
|
6656568c6a | ||
|
|
b3fa492b44 | ||
|
|
c0faecdb8b | ||
|
|
830edefa22 | ||
|
|
aeeb4e4890 | ||
|
|
6bbfbea1a8 | ||
|
|
d88d9795d1 | ||
|
|
f85356bdc7 | ||
|
|
37c9c2d520 | ||
|
|
2903abd831 | ||
|
|
9cc81fa38a | ||
|
|
edf4c81f85 | ||
|
|
9582726cb9 | ||
|
|
7a6ae82a75 | ||
|
|
22ddb71603 | ||
|
|
ea7813761a | ||
|
|
0cafb3c3ad | ||
|
|
89cffad81d | ||
|
|
1e854558cf | ||
|
|
3df7a30533 | ||
|
|
e383f7a470 | ||
|
|
820848d984 | ||
|
|
fa01d5bb32 | ||
|
|
8be1fc1ea2 | ||
|
|
0e5d38907f | ||
|
|
7ba7abd817 | ||
|
|
cedcf8619f | ||
|
|
8ff2d5c89c | ||
|
|
c4629e0c28 | ||
|
|
ab5e2ea6ae | ||
|
|
63117e2605 | ||
|
|
d22609f403 | ||
|
|
cb6a7f44fe | ||
|
|
85cc2d78ee | ||
|
|
d3a0fd04a4 | ||
|
|
52e63667c9 | ||
|
|
f399f589fb | ||
|
|
2058f124fd | ||
|
|
ebdbe71ac6 | ||
|
|
3fe6d71234 | ||
|
|
0e5b1cf659 | ||
|
|
6494557979 | ||
|
|
f68678f687 | ||
|
|
e31df6e721 | ||
|
|
9509a65625 | ||
|
|
bc84a05378 | ||
|
|
a249c37612 | ||
|
|
c7fa6e836a | ||
|
|
87a62e7bb6 | ||
|
|
11241cef0b | ||
|
|
87d2a74db0 | ||
|
|
41f7d58edf | ||
|
|
583ddfde0b | ||
|
|
383869906a | ||
|
|
54553ffae1 | ||
|
|
d8e7e0f6c2 | ||
|
|
7230d82be3 | ||
|
|
02b3930ef9 | ||
|
|
f3b3635bd8 | ||
|
|
bb84a2fc46 | ||
|
|
93587a47db | ||
|
|
afe99b42f0 | ||
|
|
e052a86b12 | ||
|
|
45cb286296 | ||
|
|
d050598086 | ||
|
|
42ddd815f4 | ||
|
|
8b1dfb4421 | ||
|
|
d572c1125d | ||
|
|
6b055bb48a | ||
|
|
165b925da2 | ||
|
|
058f8684aa | ||
|
|
f4b51b0706 | ||
|
|
b781f58097 | ||
|
|
68137935a9 | ||
|
|
98efb36614 | ||
|
|
59533536b1 | ||
|
|
07821f39b7 | ||
|
|
4ea160e524 | ||
|
|
8fb4209a97 | ||
|
|
c85c364ba5 | ||
|
|
8239254485 | ||
|
|
7681055a23 | ||
|
|
15c9029935 | ||
|
|
f67f1a9950 | ||
|
|
2c63e256ba | ||
|
|
92095d5b97 | ||
|
|
a6977d9444 | ||
|
|
378aa33cf3 | ||
|
|
9d6d572f72 | ||
|
|
8fdb174643 | ||
|
|
0810250b3a | ||
|
|
6e76f49729 | ||
|
|
94c94b8b1e | ||
|
|
3d6f3e6e3c | ||
|
|
2e305e6e52 | ||
|
|
0b28592f0f | ||
|
|
8daf645e3b | ||
|
|
1c7a481108 | ||
|
|
2043ed3af5 | ||
|
|
53a1c895e9 | ||
|
|
63bc6eb3b2 | ||
|
|
6f10951238 | ||
|
|
9e2bbf155c | ||
|
|
26cd4fb0cf | ||
|
|
8c0d158e3d | ||
|
|
875c8078d6 | ||
|
|
1f91ade8e6 | ||
|
|
a9fe4a7371 | ||
|
|
941764ee9f | ||
|
|
00fd88275e | ||
|
|
419c991b95 | ||
|
|
fa3a8d9bb7 | ||
|
|
fb00364e51 | ||
|
|
62b7b4f90e | ||
|
|
97c0e0c972 | ||
|
|
2ad8a8c241 | ||
|
|
920d95e6e1 | ||
|
|
c19814256f | ||
|
|
e341759b9e | ||
|
|
e6088e7345 | ||
|
|
bd1aa18506 | ||
|
|
5fcc6239b6 | ||
|
|
c974593f77 | ||
|
|
aa9d4ea97a | ||
|
|
80f8d2eb03 | ||
|
|
0a6fcf6e95 | ||
|
|
54e880df47 | ||
|
|
a1bb05c816 | ||
|
|
7b76c271d9 | ||
|
|
1df4c1a812 | ||
|
|
3768e21b61 | ||
|
|
c1a807615f | ||
|
|
b6dd4099fd | ||
|
|
6ca8e6a175 | ||
|
|
f12be46583 | ||
|
|
9d50258042 |
1
.github/FUNDING.yml
vendored
Normal file
1
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
github: nwg-piotr
|
||||
8
.gitignore
vendored
8
.gitignore
vendored
@@ -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/
|
||||
|
||||
12
Makefile
12
Makefile
@@ -5,19 +5,27 @@ get:
|
||||
go get github.com/dlasky/gotk3-layershell/layershell
|
||||
go get github.com/joshuarubin/go-sway
|
||||
go get github.com/allan-simon/go-singleinstance
|
||||
go get "github.com/sirupsen/logrus"
|
||||
go get github.com/fsnotify/fsnotify
|
||||
|
||||
build:
|
||||
go build -o bin/nwg-drawer *.go
|
||||
go build -o bin/nwg-drawer .
|
||||
|
||||
install:
|
||||
-pkill -f nwg-drawer
|
||||
sleep 1
|
||||
mkdir -p /usr/share/nwg-drawer
|
||||
cp -r desktop-directories /usr/share/nwg-drawer
|
||||
cp -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 .
|
||||
|
||||
134
README.md
134
README.md
@@ -1,31 +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://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
|
||||
(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).
|
||||
|
||||

|
||||
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.
|
||||
|
||||
[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>
|
||||
|
||||
[](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
|
||||
|
||||
[](https://repology.org/project/nwg-drawer/versions)
|
||||
|
||||
### Dependencies
|
||||
|
||||
- go >=1.16 (just to build)
|
||||
- go >=1.20 (just to build)
|
||||
- gtk3
|
||||
- gtk-layer-shell
|
||||
- xdg-utils
|
||||
@@ -33,7 +35,7 @@ and `nwggrid`.
|
||||
Optional (recommended):
|
||||
|
||||
- thunar
|
||||
- alacritty
|
||||
- foot
|
||||
|
||||
You may use another file manager and terminal emulator (see command line arguments), but mentioned above have been
|
||||
confirmed to work well with the program. Also see **Files** below.
|
||||
@@ -45,73 +47,133 @@ confirmed to work well with the program. Also see **Files** below.
|
||||
3. `make build`
|
||||
4. `sudo make install`
|
||||
|
||||
Building the gotk3 library takes quite a lot of time. If your machine is x86_64, you may skip steps 2-3, and
|
||||
install the provided binary by executing step 4.
|
||||
|
||||
## Command line arguments
|
||||
|
||||
```text
|
||||
$ nwg-drawer -h
|
||||
Usage of nwg-drawer:
|
||||
Usage of /tmp/go-build3511850078/b001/exe/nwg-drawer:
|
||||
-c uint
|
||||
number of Columns (default 6)
|
||||
-d Turn on Debug messages
|
||||
-fm string
|
||||
File Manager (default "thunar")
|
||||
-fscol uint
|
||||
File Search result COLumns (default 2)
|
||||
-fslen int
|
||||
File Search name length Limit (default 80)
|
||||
File Search name LENgth Limit (default 80)
|
||||
-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)
|
||||
-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 (default 64)
|
||||
-pbsleep string
|
||||
command for the sleep power bar icon
|
||||
-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 if defined.*
|
||||
*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!
|
||||
|
||||
## Logging
|
||||
|
||||
In case you encounter an issue, you may need debug messages. If you use the resident instance, you'll see nothing
|
||||
in the terminal. Please edit your sway config file:
|
||||
|
||||
```text
|
||||
exec nwg-drawer -r -d 2> ~/drawer.log
|
||||
```
|
||||
|
||||
exit sway, launch it again and include the `drawer.log` content in the GitHub issue. Do not use `exec_always` here: it'll destroy the log file content on sway reload.
|
||||
|
||||
## Styling
|
||||
|
||||
Edit `~/.config/nwg-panel/drawer.css` to your taste.
|
||||
Edit `~/.config/nwg-drawer/drawer.css` to your taste.
|
||||
|
||||
## Files
|
||||
## 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-panel/preferred-apps.json` file with your own definitions.
|
||||
|
||||
### Sample file content
|
||||
### Sample `preferred-apps.json` file content
|
||||
|
||||
```json
|
||||
{
|
||||
"\\.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"
|
||||
}
|
||||
```
|
||||
|
||||
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.
|
||||
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
|
||||
@@ -119,6 +181,16 @@ file manager you use.
|
||||
|
||||
I've noy yet tried other file managers.
|
||||
|
||||
### File search exclusions
|
||||
|
||||
You may want to exclude some paths inside your XDG user directories from searching. If so, define exclusions in the
|
||||
`~/.config/nwg-panel/excluded-dirs` file, e.g. like this:
|
||||
|
||||
```text
|
||||
# exclude all paths containing 'node_modules'
|
||||
node_modules
|
||||
```
|
||||
|
||||
## Credits
|
||||
|
||||
This program uses some great libraries:
|
||||
@@ -128,3 +200,5 @@ Copyright (c) 2015-2018 gotk3 contributors
|
||||
- [gotk3-layershell](https://github.com/dlasky/gotk3-layershell) by [@dlasky](https://github.com/dlasky/gotk3-layershell/commits?author=dlasky) - many thanks for writing this software, and for patience with my requests!
|
||||
- [go-sway](https://github.com/joshuarubin/go-sway) Copyright (c) 2019 Joshua Rubin
|
||||
- [go-singleinstance](github.com/allan-simon/go-singleinstance) Copyright (c) 2015 Allan Simon
|
||||
- [logrus](https://github.com/sirupsen/logrus) Copyright (c) 2014 Simon Eskildsen
|
||||
- [fsnotify](https://github.com/fsnotify/fsnotify) Copyright (c) 2012-2019 fsnotify Authors
|
||||
|
||||
BIN
bin/nwg-drawer
BIN
bin/nwg-drawer
Binary file not shown.
17
go.mod
17
go.mod
@@ -1,10 +1,19 @@
|
||||
module github.com/nwg-piotr/nwg-drawer
|
||||
|
||||
go 1.16
|
||||
go 1.21
|
||||
|
||||
require (
|
||||
github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37
|
||||
github.com/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261
|
||||
github.com/gotk3/gotk3 v0.6.0
|
||||
github.com/joshuarubin/go-sway v0.0.4
|
||||
github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f
|
||||
github.com/fsnotify/fsnotify v1.7.0
|
||||
github.com/gotk3/gotk3 v0.6.2
|
||||
github.com/joshuarubin/go-sway v1.2.0
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/joshuarubin/lifecycle v1.1.4 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
golang.org/x/sync v0.6.0 // indirect
|
||||
golang.org/x/sys v0.16.0 // indirect
|
||||
)
|
||||
|
||||
53
go.sum
53
go.sum
@@ -1,24 +1,51 @@
|
||||
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/dlasky/gotk3-layershell v0.0.0-20210331230524-5cca0b819261/go.mod h1:d56Gslp3IaiT8lqxD/lO1Msz1wYgD8D/HTKHgSdg9tU=
|
||||
github.com/gotk3/gotk3 v0.5.3-0.20210223154815-289cfb6dbf32/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
|
||||
github.com/gotk3/gotk3 v0.6.0 h1:Aqlq4/6VabNwtCyA9M9zFNad5yHAqCi5heWnZ9y+3dA=
|
||||
github.com/gotk3/gotk3 v0.6.0/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
|
||||
github.com/joshuarubin/go-sway v0.0.4 h1:dpmIwQ/LytG+oMrjmaVKdk1aPdW2feXK/+wAcLKIx4A=
|
||||
github.com/joshuarubin/go-sway v0.0.4/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k=
|
||||
github.com/joshuarubin/lifecycle v1.0.0 h1:N/lPEC8f+dBZ1Tn99vShqp36LwB+LI7XNAiNadZeLUQ=
|
||||
github.com/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/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/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
|
||||
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
|
||||
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/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=
|
||||
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/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=
|
||||
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=
|
||||
|
||||
64
img/exit.svg
Normal file
64
img/exit.svg
Normal file
@@ -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>
|
||||
|
After Width: | Height: | Size: 2.5 KiB |
66
img/lock.svg
Normal file
66
img/lock.svg
Normal file
@@ -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>
|
||||
|
After Width: | Height: | Size: 4.3 KiB |
52
img/poweroff.svg
Normal file
52
img/poweroff.svg
Normal file
@@ -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>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
59
img/reboot.svg
Normal file
59
img/reboot.svg
Normal file
@@ -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>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
52
img/sleep.svg
Normal file
52
img/sleep.svg
Normal file
@@ -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>
|
||||
|
After Width: | Height: | Size: 2.0 KiB |
424
main.go
424
main.go
@@ -3,15 +3,17 @@ package main
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/allan-simon/go-singleinstance"
|
||||
"github.com/dlasky/gotk3-layershell/layershell"
|
||||
"github.com/gotk3/gotk3/gdk"
|
||||
@@ -19,16 +21,17 @@ import (
|
||||
"github.com/gotk3/gotk3/gtk"
|
||||
)
|
||||
|
||||
const version = "0.1.10"
|
||||
const version = "0.4.4"
|
||||
|
||||
var (
|
||||
appDirs []string
|
||||
configDirectory string
|
||||
pinnedFile string
|
||||
pinned []string
|
||||
src glib.SourceHandle
|
||||
id2entry map[string]desktopEntry
|
||||
preferredApps map[string]interface{}
|
||||
appDirs []string
|
||||
configDirectory string
|
||||
pinnedFile string
|
||||
pinned []string
|
||||
id2entry map[string]desktopEntry
|
||||
preferredApps map[string]interface{}
|
||||
exclusions []string
|
||||
hyprlandMonitors []monitor
|
||||
)
|
||||
|
||||
var categoryNames = [...]string{
|
||||
@@ -64,6 +67,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
|
||||
@@ -81,6 +108,7 @@ var desktopEntries []desktopEntry
|
||||
|
||||
// UI elements
|
||||
var (
|
||||
win *gtk.Window
|
||||
resultWindow *gtk.ScrolledWindow
|
||||
fileSearchResults []string
|
||||
searchEntry *gtk.SearchEntry
|
||||
@@ -97,81 +125,175 @@ var (
|
||||
statusLabel *gtk.Label
|
||||
status string
|
||||
ignore string
|
||||
desktopTrigger bool
|
||||
pinnedItemsChanged chan interface{} = make(chan interface{}, 1)
|
||||
)
|
||||
|
||||
func defaultStringIfBlank(s, fallback string) string {
|
||||
func defaultTermIfBlank(s, fallback string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
if 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 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", defaultStringIfBlank(os.Getenv("TERM"), "alacritty"), "Terminal emulator")
|
||||
var nameLimit = flag.Int("fslen", 80, "File Search name length Limit")
|
||||
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 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")
|
||||
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)
|
||||
signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1)
|
||||
|
||||
go func() {
|
||||
for {
|
||||
s := <-signalChan
|
||||
if s == syscall.SIGTERM {
|
||||
println("SIGTERM received, bye bye!")
|
||||
switch s {
|
||||
case syscall.SIGTERM:
|
||||
log.Info("SIGTERM received, bye bye")
|
||||
gtk.MainQuit()
|
||||
case syscall.SIGUSR1:
|
||||
if *resident {
|
||||
// As win.Show() called from inside a goroutine randomly crashes GTK,
|
||||
// let's just set e helper variable here. We'll be checking it with glib.TimeoutAdd.
|
||||
if !win.IsVisible() {
|
||||
log.Debug("SIGUSR1 received, showing the window")
|
||||
showWindowChannel <- struct{}{}
|
||||
} else {
|
||||
log.Debug("SIGUSR1 received, hiding the window")
|
||||
restoreStateAndHide()
|
||||
}
|
||||
} else {
|
||||
log.Info("SIGUSR1 received, and I'm not resident, bye bye")
|
||||
gtk.MainQuit()
|
||||
}
|
||||
default:
|
||||
log.Infof("Unknown signal: %s", s.String())
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
// We want the same key/mouse binding to turn the dock off: kill the running instance and exit.
|
||||
lockFilePath := fmt.Sprintf("%s/nwg-drawer.lock", tempDir())
|
||||
// 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;
|
||||
// 2. die if a resident instance found.
|
||||
lockFilePath := path.Join(dataDir(), "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...")
|
||||
syscall.Kill(i, syscall.SIGTERM)
|
||||
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)
|
||||
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()
|
||||
|
||||
// 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("/usr/share/nwg-drawer/drawer.css", filepath.Join(configDirectory, "drawer.css"))
|
||||
if err != nil {
|
||||
log.Errorf("Failed copying 'drawer.css' file: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
cacheDirectory := cacheDir()
|
||||
@@ -184,46 +306,92 @@ func main() {
|
||||
pinned, err = loadTextFile(pinnedFile)
|
||||
if err != nil {
|
||||
pinned = nil
|
||||
savePinned()
|
||||
}
|
||||
println(fmt.Sprintf("Found %v pinned items", len(pinned)))
|
||||
log.Info(fmt.Sprintf("Found %v pinned items", len(pinned)))
|
||||
|
||||
cssFile := filepath.Join(configDirectory, *cssFileName)
|
||||
if !strings.HasPrefix(*cssFileName, "/") {
|
||||
*cssFileName = filepath.Join(configDirectory, *cssFileName)
|
||||
}
|
||||
|
||||
appDirs = getAppDirs()
|
||||
|
||||
setUpCategories()
|
||||
|
||||
desktopFiles := listDesktopFiles()
|
||||
println(fmt.Sprintf("Found %v desktop files", len(desktopFiles)))
|
||||
log.Info(fmt.Sprintf("Found %v desktop files", len(desktopFiles)))
|
||||
|
||||
status = parseDesktopFiles(desktopFiles)
|
||||
|
||||
// For opening files we use xdg-open. As its configuration is PITA, we may override some associations
|
||||
// in the ~/.config/nwg-panel/preferred-apps.json file.
|
||||
paFile := filepath.Join(configDirectory, "preferred-apps.json")
|
||||
preferredApps, err = loadPreferredApps(paFile)
|
||||
if err != nil {
|
||||
println(fmt.Sprintf("Custom associations file %s not found or invalid", paFile))
|
||||
paFile := path.Join(configDirectory, "preferred-apps.json")
|
||||
if pathExists(paFile) {
|
||||
preferredApps, err = loadPreferredApps(paFile)
|
||||
if err != nil {
|
||||
log.Infof("Custom associations file %s not found or invalid", paFile)
|
||||
} else {
|
||||
log.Infof("Found %v associations in %s", len(preferredApps), paFile)
|
||||
}
|
||||
} else {
|
||||
println(fmt.Sprintf("Found %v associations in %s", len(preferredApps), paFile))
|
||||
log.Infof("%s file not found", paFile)
|
||||
}
|
||||
|
||||
// Load user-defined paths excluded from file search
|
||||
exFile := path.Join(configDirectory, "excluded-dirs")
|
||||
if pathExists(exFile) {
|
||||
exclusions, err = loadTextFile(exFile)
|
||||
if err != nil {
|
||||
log.Infof("Search exclusions file %s not found %s", exFile, err)
|
||||
} else {
|
||||
log.Infof("Found %v search exclusions in %s", len(exclusions), exFile)
|
||||
}
|
||||
} else {
|
||||
log.Infof("%s file not found", exFile)
|
||||
}
|
||||
|
||||
// USER INTERFACE
|
||||
gtk.Init(nil)
|
||||
|
||||
settings, _ := gtk.SettingsGetDefault()
|
||||
if *gtkTheme != "" {
|
||||
err = settings.SetProperty("gtk-theme-name", *gtkTheme)
|
||||
if err != nil {
|
||||
log.Error("Unable to set theme:", err)
|
||||
} else {
|
||||
log.Infof("User demanded theme: %s", *gtkTheme)
|
||||
}
|
||||
} else {
|
||||
err := settings.SetProperty("gtk-application-prefer-dark-theme", true)
|
||||
if err != nil {
|
||||
log.Error("Error setting 'gtk-application-prefer-dark-theme' property")
|
||||
return
|
||||
}
|
||||
log.Info("Preferring dark theme variants")
|
||||
}
|
||||
|
||||
if *gtkIconTheme != "" {
|
||||
err = settings.SetProperty("gtk-icon-theme-name", *gtkIconTheme)
|
||||
if err != nil {
|
||||
log.Error("Unable to set icon theme:", err)
|
||||
} else {
|
||||
log.Infof("User demanded icon theme: %s", *gtkIconTheme)
|
||||
}
|
||||
}
|
||||
|
||||
cssProvider, _ := gtk.CssProviderNew()
|
||||
|
||||
err = cssProvider.LoadFromPath(cssFile)
|
||||
err = cssProvider.LoadFromPath(*cssFileName)
|
||||
if err != nil {
|
||||
println(fmt.Sprintf("ERROR: %s css file not found or erroneous. Using GTK styling.", cssFile))
|
||||
println(fmt.Sprintf("%s", err))
|
||||
log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
|
||||
log.Errorf("%s", err)
|
||||
} else {
|
||||
println(fmt.Sprintf("Using style from %s", cssFile))
|
||||
log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
|
||||
screen, _ := gdk.ScreenGetDefault()
|
||||
gtk.AddProviderForScreen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
|
||||
}
|
||||
|
||||
win, err := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
|
||||
win, err = gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
|
||||
if err != nil {
|
||||
log.Fatal("Unable to create window:", err)
|
||||
}
|
||||
@@ -235,12 +403,13 @@ func main() {
|
||||
if *targetOutput != "" {
|
||||
// We want to assign layershell to a monitor, but we only know the output name!
|
||||
output2mon, err = mapOutputs()
|
||||
fmt.Println(">>>", output2mon)
|
||||
if err == nil {
|
||||
monitor := output2mon[*targetOutput]
|
||||
layershell.SetMonitor(win, monitor)
|
||||
|
||||
} else {
|
||||
println(fmt.Sprintf("%s", err))
|
||||
log.Errorf("%s", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -256,25 +425,47 @@ func main() {
|
||||
layershell.SetLayer(win, layershell.LAYER_SHELL_LAYER_TOP)
|
||||
}
|
||||
|
||||
layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
|
||||
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_TOP, *marginTop)
|
||||
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_LEFT, *marginLeft)
|
||||
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_RIGHT, *marginRight)
|
||||
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_BOTTOM, *marginBottom)
|
||||
|
||||
if *keyboard {
|
||||
log.Info("Setting GTK layer shell keyboard mode to: on-demand")
|
||||
layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_ON_DEMAND)
|
||||
} else {
|
||||
log.Info("Setting GTK layer shell keyboard mode to default: exclusive")
|
||||
layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
win.Connect("destroy", func() {
|
||||
gtk.MainQuit()
|
||||
})
|
||||
|
||||
win.Connect("key-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}
|
||||
switch key.KeyVal() {
|
||||
case gdk.KEY_Escape:
|
||||
if key.KeyVal() == gdk.KEY_Escape {
|
||||
s, _ := searchEntry.GetText()
|
||||
if s != "" {
|
||||
searchEntry.GrabFocus()
|
||||
searchEntry.SetText("")
|
||||
} else {
|
||||
gtk.MainQuit()
|
||||
if !*resident {
|
||||
gtk.MainQuit()
|
||||
} else {
|
||||
restoreStateAndHide()
|
||||
}
|
||||
}
|
||||
return false
|
||||
return true
|
||||
}
|
||||
return false
|
||||
})
|
||||
|
||||
win.Connect("key-press-event", func(_ *gtk.Window, event *gdk.Event) bool {
|
||||
key := &gdk.EventKey{Event: event}
|
||||
switch key.KeyVal() {
|
||||
case gdk.KEY_downarrow, gdk.KEY_Up, gdk.KEY_Down, gdk.KEY_Left, gdk.KEY_Right, gdk.KEY_Tab,
|
||||
gdk.KEY_Return, gdk.KEY_Page_Up, gdk.KEY_Page_Down, gdk.KEY_Home, gdk.KEY_End:
|
||||
return false
|
||||
@@ -287,25 +478,13 @@ func main() {
|
||||
}
|
||||
})
|
||||
|
||||
// Close the window on leave, but not immediately, to avoid accidental closes
|
||||
win.Connect("leave-notify-event", func() {
|
||||
src = glib.TimeoutAdd(uint(500), func() bool {
|
||||
gtk.MainQuit()
|
||||
return false
|
||||
})
|
||||
})
|
||||
|
||||
win.Connect("enter-notify-event", func() {
|
||||
cancelClose()
|
||||
})
|
||||
|
||||
/*
|
||||
In case someone REALLY needed to use X11 - for some stupid Zoom meeting or something, this allows
|
||||
the drawer to behave properly on Openbox, and possibly somewhere else. For sure not on i3.
|
||||
This feature is not really supported and will stay undocumented.
|
||||
*/
|
||||
if !wayland() {
|
||||
println("Not Wayland, oh really?")
|
||||
log.Info("Not Wayland, oh really?")
|
||||
win.SetDecorated(false)
|
||||
win.Maximize()
|
||||
}
|
||||
@@ -338,13 +517,15 @@ func main() {
|
||||
resultWindow, _ = gtk.ScrolledWindowNew(nil, nil)
|
||||
resultWindow.SetEvents(int(gdk.ALL_EVENTS_MASK))
|
||||
resultWindow.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
|
||||
resultWindow.Connect("enter-notify-event", func() {
|
||||
cancelClose()
|
||||
})
|
||||
resultWindow.Connect("button-release-event", func(sw *gtk.ScrolledWindow, e *gdk.Event) bool {
|
||||
btnEvent := gdk.EventButtonNewFromEvent(e)
|
||||
if btnEvent.Button() == 1 || btnEvent.Button() == 3 {
|
||||
gtk.MainQuit()
|
||||
|
||||
resultWindow.Connect("button-release-event", func(_ *gtk.ScrolledWindow, event *gdk.Event) bool {
|
||||
btnEvent := gdk.EventButtonNewFromEvent(event)
|
||||
if btnEvent.Button() == 3 {
|
||||
if !*resident {
|
||||
gtk.MainQuit()
|
||||
} else {
|
||||
restoreStateAndHide()
|
||||
}
|
||||
return true
|
||||
}
|
||||
return false
|
||||
@@ -370,6 +551,7 @@ func main() {
|
||||
}
|
||||
|
||||
userDirsMap = mapXdgUserDirs()
|
||||
log.Debugf("User dirs map: %s", userDirsMap)
|
||||
|
||||
placeholder, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
|
||||
resultsWrapper.PackStart(placeholder, true, true, 0)
|
||||
@@ -383,12 +565,44 @@ func main() {
|
||||
resultsWrapper.PackEnd(wrapper, false, false, 10)
|
||||
}
|
||||
|
||||
// Power Button Bar
|
||||
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 *pbLock != "" {
|
||||
btn := powerButton("/usr/share/nwg-drawer/img/lock.svg", *pbLock)
|
||||
powerButtonsWrapper.PackStart(btn, true, false, 0)
|
||||
}
|
||||
if *pbExit != "" {
|
||||
btn := powerButton("/usr/share/nwg-drawer/img/exit.svg", *pbExit)
|
||||
powerButtonsWrapper.PackStart(btn, true, false, 0)
|
||||
}
|
||||
if *pbReboot != "" {
|
||||
btn := powerButton("/usr/share/nwg-drawer/img/reboot.svg", *pbReboot)
|
||||
powerButtonsWrapper.PackStart(btn, true, false, 0)
|
||||
}
|
||||
if *pbSleep != "" {
|
||||
btn := powerButton("/usr/share/nwg-drawer/img/sleep.svg", *pbSleep)
|
||||
powerButtonsWrapper.PackStart(btn, true, false, 0)
|
||||
}
|
||||
if *pbPoweroff != "" {
|
||||
btn := powerButton("/usr/share/nwg-drawer/img/poweroff.svg", *pbPoweroff)
|
||||
powerButtonsWrapper.PackStart(btn, true, false, 0)
|
||||
}
|
||||
}
|
||||
|
||||
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()
|
||||
|
||||
if !*noFS {
|
||||
fileSearchResultWrapper.SetSizeRequest(appFlowBox.GetAllocatedWidth(), 1)
|
||||
fileSearchResultWrapper.Hide()
|
||||
@@ -396,8 +610,90 @@ func main() {
|
||||
if !*noCats {
|
||||
categoriesWrapper.SetSizeRequest(1, categoriesWrapper.GetAllocatedHeight()*2)
|
||||
}
|
||||
if *resident {
|
||||
win.Hide()
|
||||
}
|
||||
|
||||
t := time.Now()
|
||||
println(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
|
||||
log.Info(fmt.Sprintf("UI created in %v ms. Thank you for your patience.", t.Sub(timeStart).Milliseconds()))
|
||||
|
||||
// Check if showing the window has been requested (SIGUSR1)
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case <-showWindowChannel:
|
||||
log.Debug("Showing window")
|
||||
glib.TimeoutAdd(0, func() bool {
|
||||
if win != nil && !win.IsVisible() {
|
||||
|
||||
// Refresh files before displaying the root window
|
||||
// some .desktop file changed
|
||||
if desktopTrigger {
|
||||
log.Debug(".desktop file changed")
|
||||
desktopFiles = listDesktopFiles()
|
||||
status = parseDesktopFiles(desktopFiles)
|
||||
appFlowBox = setUpAppsFlowBox(nil, "")
|
||||
desktopTrigger = false
|
||||
}
|
||||
|
||||
// Show window and focus the search box
|
||||
win.ShowAll()
|
||||
if fileSearchResultWrapper != nil {
|
||||
fileSearchResultWrapper.Hide()
|
||||
}
|
||||
// focus 1st element
|
||||
var button gtk.IWidget
|
||||
if pinnedFlowBox.GetChildren().Length() > 0 {
|
||||
button, err = pinnedFlowBox.GetChildAtIndex(0).GetChild()
|
||||
} else {
|
||||
button, err = appFlowBox.GetChildAtIndex(0).GetChild()
|
||||
}
|
||||
if err == nil {
|
||||
button.ToWidget().GrabFocus()
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
})
|
||||
|
||||
case <-pinnedItemsChanged:
|
||||
glib.TimeoutAdd(0, func() bool {
|
||||
log.Debug("pinned file changed")
|
||||
pinned, _ = loadTextFile(pinnedFile)
|
||||
pinnedFlowBox = setUpPinnedFlowBox()
|
||||
|
||||
return false
|
||||
})
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
go watchFiles()
|
||||
|
||||
gtk.Main()
|
||||
}
|
||||
|
||||
func restoreStateAndHide() {
|
||||
timeStart1 := time.Now()
|
||||
if win != nil {
|
||||
win.Hide()
|
||||
}
|
||||
|
||||
// clear search
|
||||
searchEntry.SetText("")
|
||||
|
||||
// clear category filter (in gotk3 it means: rebuild, as we have no filtering here)
|
||||
appFlowBox = setUpAppsFlowBox(nil, "")
|
||||
for _, btn := range catButtons {
|
||||
btn.SetImagePosition(gtk.POS_LEFT)
|
||||
btn.SetSizeRequest(0, 0)
|
||||
}
|
||||
|
||||
// scroll to the top
|
||||
if resultWindow != nil {
|
||||
resultWindow.GetVAdjustment().SetValue(0)
|
||||
}
|
||||
|
||||
t := time.Now()
|
||||
log.Debugf(fmt.Sprintf("UI hidden and restored in the backgroud in %v ms", t.Sub(timeStart1).Milliseconds()))
|
||||
}
|
||||
|
||||
410
tools.go
410
tools.go
@@ -5,41 +5,29 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/joshuarubin/go-sway"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"io"
|
||||
"io/fs"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/gotk3/gotk3/gdk"
|
||||
"github.com/gotk3/gotk3/glib"
|
||||
"github.com/gotk3/gotk3/gtk"
|
||||
"github.com/joshuarubin/go-sway"
|
||||
)
|
||||
|
||||
func wayland() bool {
|
||||
return os.Getenv("WAYLAND_DISPLAY") != "" || os.Getenv("XDG_SESSION_TYPE") == "wayland"
|
||||
}
|
||||
|
||||
/*
|
||||
Window leave-notify-event event quits the program with glib Timeout 500 ms.
|
||||
We might have left the window by accident, so let's clear the timeout if window re-entered.
|
||||
Furthermore - hovering a widget triggers window leave-notify-event event, and the timeout
|
||||
needs to be cleared as well.
|
||||
*/
|
||||
func cancelClose() {
|
||||
if src > 0 {
|
||||
glib.SourceRemove(src)
|
||||
src = 0
|
||||
}
|
||||
}
|
||||
|
||||
func createPixbuf(icon string, size int) (*gdk.Pixbuf, error) {
|
||||
iconTheme, err := gtk.IconThemeGetDefault()
|
||||
if err != nil {
|
||||
@@ -49,7 +37,7 @@ func createPixbuf(icon string, size int) (*gdk.Pixbuf, error) {
|
||||
if strings.Contains(icon, "/") {
|
||||
pixbuf, err := gdk.PixbufNewFromFileAtSize(icon, size, size)
|
||||
if err != nil {
|
||||
println(fmt.Sprintf("%s", err))
|
||||
log.Errorf("%s", err)
|
||||
return nil, err
|
||||
}
|
||||
return pixbuf, nil
|
||||
@@ -90,9 +78,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") {
|
||||
@@ -116,7 +105,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
|
||||
@@ -132,29 +121,18 @@ func getUserDir(home, line string) string {
|
||||
}
|
||||
|
||||
func cacheDir() string {
|
||||
if os.Getenv("XDG_CACHE_HOME") != "" {
|
||||
return os.Getenv("XDG_CONFIG_HOME")
|
||||
if xdgCache := os.Getenv("XDG_CACHE_HOME"); xdgCache != "" {
|
||||
return xdgCache
|
||||
}
|
||||
if os.Getenv("HOME") != "" && pathExists(filepath.Join(os.Getenv("HOME"), ".cache")) {
|
||||
p := filepath.Join(os.Getenv("HOME"), ".cache")
|
||||
if home := os.Getenv("HOME"); home != "" && pathExists(filepath.Join(home, ".cache")) {
|
||||
p := filepath.Join(home, ".cache")
|
||||
return p
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func tempDir() string {
|
||||
if os.Getenv("TMPDIR") != "" {
|
||||
return os.Getenv("TMPDIR")
|
||||
} else if os.Getenv("TEMP") != "" {
|
||||
return os.Getenv("TEMP")
|
||||
} else if os.Getenv("TMP") != "" {
|
||||
return os.Getenv("TMP")
|
||||
}
|
||||
return "/tmp"
|
||||
}
|
||||
|
||||
func readTextFile(path string) (string, error) {
|
||||
bytes, err := ioutil.ReadFile(path)
|
||||
bytes, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -162,14 +140,50 @@ func readTextFile(path string) (string, error) {
|
||||
return string(bytes), nil
|
||||
}
|
||||
|
||||
func configDir() string {
|
||||
if os.Getenv("XDG_CONFIG_HOME") != "" {
|
||||
dir := fmt.Sprintf("%s/nwg-panel", os.Getenv("XDG_CONFIG_HOME"))
|
||||
createDir(dir)
|
||||
return (fmt.Sprintf("%s/nwg-panel", os.Getenv("XDG_CONFIG_HOME")))
|
||||
func oldConfigDir() (string, error) {
|
||||
if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
|
||||
dir := path.Join(xdgConfig, "nwg-panel")
|
||||
return dir, nil
|
||||
} 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 dataDir() string {
|
||||
var dir string
|
||||
if xdgData := os.Getenv("XDG_DATA_HOME"); xdgData != "" {
|
||||
dir = path.Join(xdgData, "nwg-drawer")
|
||||
} else if home := os.Getenv("HOME"); home != "" {
|
||||
dir = path.Join(home, ".local/share/nwg-drawer")
|
||||
}
|
||||
|
||||
log.Infof("Data dir: %s", dir)
|
||||
createDir(dir)
|
||||
|
||||
return dir
|
||||
}
|
||||
|
||||
@@ -177,13 +191,13 @@ func createDir(dir string) {
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
err := os.MkdirAll(dir, os.ModePerm)
|
||||
if err == nil {
|
||||
fmt.Println("Creating dir:", dir)
|
||||
log.Infof("Creating dir: %s", dir)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func copyFile(src, dst string) error {
|
||||
fmt.Println("Copying file:", dst)
|
||||
log.Infof("Copying file: %s", dst)
|
||||
|
||||
var err error
|
||||
var srcfd *os.File
|
||||
@@ -193,12 +207,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
|
||||
@@ -209,22 +233,13 @@ func copyFile(src, dst string) error {
|
||||
return os.Chmod(dst, srcinfo.Mode())
|
||||
}
|
||||
|
||||
func getDataHome() string {
|
||||
if os.Getenv("XDG_DATA_HOME") != "" {
|
||||
return os.Getenv("XDG_DATA_HOME")
|
||||
}
|
||||
return "/usr/share/"
|
||||
}
|
||||
|
||||
func getAppDirs() []string {
|
||||
var dirs []string
|
||||
xdgDataDirs := ""
|
||||
|
||||
home := os.Getenv("HOME")
|
||||
xdgDataHome := os.Getenv("XDG_DATA_HOME")
|
||||
if os.Getenv("XDG_DATA_DIRS") != "" {
|
||||
xdgDataDirs = os.Getenv("XDG_DATA_DIRS")
|
||||
} else {
|
||||
xdgDataDirs := os.Getenv("XDG_DATA_DIRS")
|
||||
if xdgDataDirs == "" {
|
||||
xdgDataDirs = "/usr/local/share/:/usr/share/"
|
||||
}
|
||||
if xdgDataHome != "" {
|
||||
@@ -239,11 +254,17 @@ func getAppDirs() []string {
|
||||
"/var/lib/flatpak/exports/share/applications"}
|
||||
|
||||
for _, d := range flatpakDirs {
|
||||
if !isIn(dirs, d) {
|
||||
if pathExists(d) && !isIn(dirs, d) {
|
||||
dirs = append(dirs, d)
|
||||
}
|
||||
}
|
||||
return dirs
|
||||
var confirmedDirs []string
|
||||
for _, d := range dirs {
|
||||
if pathExists(d) {
|
||||
confirmedDirs = append(confirmedDirs, d)
|
||||
}
|
||||
}
|
||||
return confirmedDirs
|
||||
}
|
||||
|
||||
func loadPreferredApps(path string) (map[string]interface{}, error) {
|
||||
@@ -251,12 +272,20 @@ func loadPreferredApps(path string) (map[string]interface{}, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer jsonFile.Close()
|
||||
defer func(jsonFile *os.File) {
|
||||
err := jsonFile.Close()
|
||||
if err != nil {
|
||||
log.Errorf("Error closing file: %v", jsonFile)
|
||||
}
|
||||
}(jsonFile)
|
||||
|
||||
byteValue, _ := ioutil.ReadAll(jsonFile)
|
||||
byteValue, _ := io.ReadAll(jsonFile)
|
||||
|
||||
var result map[string]interface{}
|
||||
json.Unmarshal([]byte(byteValue), &result)
|
||||
err = json.Unmarshal(byteValue, &result)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(result) == 0 {
|
||||
return nil, errors.New("json invalid or empty")
|
||||
@@ -265,8 +294,8 @@ func loadPreferredApps(path string) (map[string]interface{}, error) {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func listFiles(dir string) ([]fs.FileInfo, error) {
|
||||
files, err := ioutil.ReadDir(dir)
|
||||
func listFiles(dir string) ([]fs.DirEntry, error) {
|
||||
files, err := os.ReadDir(dir)
|
||||
if err == nil {
|
||||
return files, nil
|
||||
}
|
||||
@@ -290,12 +319,12 @@ func listDesktopFiles() []string {
|
||||
}
|
||||
|
||||
func setUpCategories() {
|
||||
path := filepath.Join(getDataHome(), "nwg-drawer/desktop-directories")
|
||||
var other category
|
||||
|
||||
for _, cName := range categoryNames {
|
||||
fileName := fmt.Sprintf("%s.directory", cName)
|
||||
lines, err := loadTextFile(filepath.Join(path, fileName))
|
||||
fp := filepath.Join("/usr/share/nwg-drawer/desktop-directories", fileName)
|
||||
lines, err := loadTextFile(fp)
|
||||
if err == nil {
|
||||
var cat category
|
||||
cat.Name = cName
|
||||
@@ -340,6 +369,8 @@ func setUpCategories() {
|
||||
} else {
|
||||
other = cat
|
||||
}
|
||||
} else {
|
||||
log.Errorf("Couldn't open %s", fp)
|
||||
}
|
||||
}
|
||||
sort.Slice(categories, func(i, j int) bool {
|
||||
@@ -349,6 +380,7 @@ func setUpCategories() {
|
||||
}
|
||||
|
||||
func parseDesktopFiles(desktopFiles []string) string {
|
||||
desktopEntries = nil
|
||||
id2entry = make(map[string]desktopEntry)
|
||||
skipped := 0
|
||||
hidden := 0
|
||||
@@ -366,7 +398,8 @@ func parseDesktopFiles(desktopFiles []string) string {
|
||||
|
||||
if entry.NoDisplay {
|
||||
hidden++
|
||||
continue
|
||||
// We still need hidden entries, so `continue` is disallowed here
|
||||
// Fixes bug introduced in #19
|
||||
}
|
||||
|
||||
id2entry[entry.DesktopID] = entry
|
||||
@@ -377,7 +410,7 @@ func parseDesktopFiles(desktopFiles []string) string {
|
||||
return desktopEntries[i].NameLoc < desktopEntries[j].NameLoc
|
||||
})
|
||||
summary := fmt.Sprintf("%v entries (+%v hidden)", len(desktopEntries)-hidden, hidden)
|
||||
println(fmt.Sprintf("Skipped %v duplicates; %v .desktop entries hidden by \"NoDisplay=true\"", skipped, hidden))
|
||||
log.Infof("Skipped %v duplicates; %v .desktop entries hidden by \"NoDisplay=true\"", skipped, hidden)
|
||||
return summary
|
||||
}
|
||||
|
||||
@@ -451,7 +484,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
|
||||
}
|
||||
@@ -459,7 +492,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)
|
||||
}
|
||||
|
||||
@@ -470,20 +503,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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -502,14 +535,20 @@ 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -524,49 +563,61 @@ func launch(command string, terminal bool) {
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
themeToPrepend := ""
|
||||
// add "GTK_THEME=<default_gtk_theme>" environment variable
|
||||
if *forceTheme {
|
||||
settings, _ := gtk.SettingsGetDefault()
|
||||
th, err := settings.GetProperty("gtk-theme-name")
|
||||
if err == nil {
|
||||
themeToPrepend = th.(string)
|
||||
}
|
||||
}
|
||||
if cmdIdx == -1 {
|
||||
cmdIdx = 0
|
||||
|
||||
if 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 {
|
||||
args := []string{"-e", elements[cmdIdx]}
|
||||
cmd = exec.Command(*term, args...)
|
||||
var prefixCommand = *term
|
||||
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, " "))
|
||||
}
|
||||
|
||||
// set env variables
|
||||
if len(envVars) > 0 {
|
||||
cmd.Env = os.Environ()
|
||||
cmd.Env = append(cmd.Env, envVars...)
|
||||
msg := fmt.Sprintf("command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
|
||||
log.Info(msg)
|
||||
|
||||
cmd.SysProcAttr = &syscall.SysProcAttr{
|
||||
Setsid: true,
|
||||
}
|
||||
|
||||
msg := fmt.Sprintf("env vars: %s; command: '%s'; args: %s\n", envVars, elements[cmdIdx], elements[1+cmdIdx:])
|
||||
println(msg)
|
||||
if cmd.Start() != nil {
|
||||
log.Warn("Unable to launch terminal emulator!")
|
||||
} else {
|
||||
// Collect the exit code of the child process to prevent zombies
|
||||
// if the drawer runs in resident mode
|
||||
go func() {
|
||||
_ = cmd.Wait()
|
||||
}()
|
||||
}
|
||||
|
||||
go cmd.Run()
|
||||
|
||||
glib.TimeoutAdd(uint(150), func() bool {
|
||||
if *resident {
|
||||
restoreStateAndHide()
|
||||
} else {
|
||||
gtk.MainQuit()
|
||||
return false
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func open(filePath string, xdgOpen bool) {
|
||||
@@ -584,44 +635,137 @@ func open(filePath string, xdgOpen bool) {
|
||||
} else {
|
||||
cmd = exec.Command(*fileManager, filePath)
|
||||
}
|
||||
fmt.Printf("Executing: %s", cmd)
|
||||
cmd.Start()
|
||||
log.Infof("Executing: %s", cmd)
|
||||
|
||||
gtk.MainQuit()
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
||||
// 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)
|
||||
defer cancel()
|
||||
if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
|
||||
err := listHyprlandMonitors()
|
||||
if err == nil {
|
||||
|
||||
client, err := sway.New(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
display, err := gdk.DisplayGetDefault()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
outputs, err := client.GetOutputs(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
num := display.GetNMonitors()
|
||||
for i := 0; i < num; i++ {
|
||||
mon, _ := display.GetMonitor(i)
|
||||
geometry := mon.GetGeometry()
|
||||
// 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
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
display, err := gdk.DisplayGetDefault()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else if os.Getenv("SWAYSOCK") != "" {
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
|
||||
defer cancel()
|
||||
|
||||
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
|
||||
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)
|
||||
geometry := mon.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] = 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")
|
||||
socketFile := fmt.Sprintf("/tmp/hypr/%s/.socket.sock", 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
|
||||
}
|
||||
|
||||
135
uicomponents.go
135
uicomponents.go
@@ -6,6 +6,8 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
|
||||
"github.com/gotk3/gotk3/gdk"
|
||||
"github.com/gotk3/gotk3/gtk"
|
||||
)
|
||||
@@ -30,6 +32,10 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
||||
if len(pinned) > 0 {
|
||||
for _, desktopID := range pinned {
|
||||
entry := id2entry[desktopID]
|
||||
if entry.DesktopID == "" {
|
||||
log.Debugf("Pinned item doesn't seem to exist: %s", desktopID)
|
||||
continue
|
||||
}
|
||||
|
||||
btn, _ := gtk.ButtonNew()
|
||||
|
||||
@@ -52,9 +58,8 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
||||
name = entry.Name
|
||||
}
|
||||
if len(name) > 20 {
|
||||
r := []rune(name)
|
||||
name = string(r[:17])
|
||||
name = fmt.Sprintf("%s…", name)
|
||||
r := substring(name, 0, 17)
|
||||
name = fmt.Sprintf("%s…", string(r))
|
||||
}
|
||||
btn.SetLabel(name)
|
||||
|
||||
@@ -65,7 +70,6 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
||||
return true
|
||||
} else if btnEvent.Button() == 3 {
|
||||
unpinItem(entry.DesktopID)
|
||||
pinnedFlowBox = setUpPinnedFlowBox()
|
||||
return true
|
||||
}
|
||||
return false
|
||||
@@ -76,6 +80,9 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
||||
btn.Connect("enter-notify-event", func() {
|
||||
statusLabel.SetText(entry.CommentLoc)
|
||||
})
|
||||
btn.Connect("focus-in-event", func() {
|
||||
statusLabel.SetText(entry.CommentLoc)
|
||||
})
|
||||
flowBox.Add(btn)
|
||||
}
|
||||
pinnedFlowBoxWrapper.PackStart(flowBox, true, false, 0)
|
||||
@@ -85,10 +92,6 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
|
||||
item.(*gtk.Widget).SetCanFocus(false)
|
||||
})
|
||||
}
|
||||
flowBox.Connect("enter-notify-event", func() {
|
||||
cancelClose()
|
||||
})
|
||||
|
||||
flowBox.ShowAll()
|
||||
|
||||
return flowBox
|
||||
@@ -108,9 +111,7 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
|
||||
}
|
||||
|
||||
eventBox, _ := gtk.EventBoxNew()
|
||||
eventBox.Connect("enter-notify-event", func() {
|
||||
cancelClose()
|
||||
})
|
||||
|
||||
hBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
|
||||
eventBox.Add(hBox)
|
||||
button, _ := gtk.ButtonNewWithLabel("All")
|
||||
@@ -131,7 +132,6 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
|
||||
button.SetProperty("name", "category-button")
|
||||
catButtons = append(catButtons, button)
|
||||
button.SetLabel(cat.DisplayName)
|
||||
// fix #8
|
||||
button.SetAlwaysShowImage(true)
|
||||
hBox.PackStart(button, false, false, 0)
|
||||
name := cat.Name
|
||||
@@ -233,21 +233,26 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
|
||||
button, _ := gtk.ButtonNew()
|
||||
button.SetAlwaysShowImage(true)
|
||||
|
||||
var pixbuf *gdk.Pixbuf
|
||||
var img *gtk.Image
|
||||
var err error
|
||||
if entry.Icon != "" {
|
||||
pixbuf, _ := createPixbuf(entry.Icon, *iconSize)
|
||||
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
|
||||
pixbuf, err = createPixbuf(entry.Icon, *iconSize)
|
||||
} else {
|
||||
img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
|
||||
log.Warnf("Undefined icon for %s", entry.Name)
|
||||
pixbuf, err = createPixbuf("image-missing", *iconSize)
|
||||
}
|
||||
if err != nil {
|
||||
pixbuf, _ = createPixbuf("unknown", *iconSize)
|
||||
}
|
||||
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
|
||||
|
||||
button.SetImage(img)
|
||||
button.SetImagePosition(gtk.POS_TOP)
|
||||
name := entry.NameLoc
|
||||
if len(name) > 20 {
|
||||
r := []rune(name)
|
||||
name = string(r[:17])
|
||||
name = fmt.Sprintf("%s…", name)
|
||||
r := substring(name, 0, 17)
|
||||
name = fmt.Sprintf("%s…", string(r))
|
||||
}
|
||||
button.SetLabel(name)
|
||||
|
||||
@@ -255,6 +260,10 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
|
||||
exec := entry.Exec
|
||||
terminal := entry.Terminal
|
||||
desc := entry.CommentLoc
|
||||
if len(desc) > 120 {
|
||||
r := substring(desc, 0, 117)
|
||||
desc = fmt.Sprintf("%s…", string(r))
|
||||
}
|
||||
button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
|
||||
btnEvent := gdk.EventButtonNewFromEvent(e)
|
||||
if btnEvent.Button() == 1 {
|
||||
@@ -262,7 +271,7 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
|
||||
return true
|
||||
} else if btnEvent.Button() == 3 {
|
||||
pinItem(ID)
|
||||
pinnedFlowBox = setUpPinnedFlowBox()
|
||||
return true
|
||||
}
|
||||
return false
|
||||
})
|
||||
@@ -272,6 +281,51 @@ 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(iconPath, command string) *gtk.Button {
|
||||
button, _ := gtk.ButtonNew()
|
||||
button.SetAlwaysShowImage(true)
|
||||
|
||||
var pixbuf *gdk.Pixbuf
|
||||
var img *gtk.Image
|
||||
var err error
|
||||
pixbuf, err = gdk.PixbufNewFromFileAtSize(iconPath, *pbSize, *pbSize)
|
||||
if err != nil {
|
||||
pixbuf, _ = createPixbuf("unknown", *pbSize)
|
||||
log.Warnf("Couldn't find icon %s", iconPath)
|
||||
}
|
||||
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
|
||||
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
|
||||
}
|
||||
|
||||
@@ -281,9 +335,6 @@ func setUpFileSearchResultContainer() *gtk.FlowBox {
|
||||
}
|
||||
flowBox, _ := gtk.FlowBoxNew()
|
||||
flowBox.SetProperty("orientation", gtk.ORIENTATION_VERTICAL)
|
||||
flowBox.Connect("enter-notify-event", func() {
|
||||
cancelClose()
|
||||
})
|
||||
fileSearchResultWrapper.PackStart(flowBox, false, false, 10)
|
||||
|
||||
return flowBox
|
||||
@@ -295,7 +346,19 @@ func walk(path string, d fs.DirEntry, e error) error {
|
||||
}
|
||||
// don't search leading part of the path, as e.g. '/home/user/Pictures'
|
||||
toSearch := strings.Split(path, ignore)[1]
|
||||
if strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
|
||||
|
||||
// Remaing part of the path (w/o file name) must be checked against being present in excluded dirs
|
||||
doSearch := true
|
||||
parts := strings.Split(toSearch, "/")
|
||||
remainingPart := ""
|
||||
if len(parts) > 1 {
|
||||
remainingPart = strings.Join(parts[:len(parts)-1], "/")
|
||||
}
|
||||
if remainingPart != "" && isExcluded(remainingPart) {
|
||||
doSearch = false
|
||||
}
|
||||
|
||||
if doSearch && strings.Contains(strings.ToLower(toSearch), strings.ToLower(phrase)) {
|
||||
// mark directories
|
||||
if d.IsDir() {
|
||||
fileSearchResults = append(fileSearchResults, fmt.Sprintf("#is_dir#%s", path))
|
||||
@@ -303,15 +366,16 @@ func walk(path string, d fs.DirEntry, e error) error {
|
||||
fileSearchResults = append(fileSearchResults, path)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func setUpSearchEntry() *gtk.SearchEntry {
|
||||
searchEntry, _ := gtk.SearchEntryNew()
|
||||
searchEntry.SetPlaceholderText("Type to search")
|
||||
searchEntry.Connect("enter-notify-event", func() {
|
||||
/*searchEntry.Connect("enter-notify-event", func() {
|
||||
cancelClose()
|
||||
})
|
||||
})*/
|
||||
searchEntry.Connect("search-changed", func() {
|
||||
for _, btn := range catButtons {
|
||||
btn.SetImagePosition(gtk.POS_LEFT)
|
||||
@@ -366,7 +430,6 @@ func setUpSearchEntry() *gtk.SearchEntry {
|
||||
if w == nil && fileSearchResultFlowBox != nil {
|
||||
f := fileSearchResultFlowBox.GetChildAtIndex(0)
|
||||
if f != nil {
|
||||
//f.SetCanFocus(false)
|
||||
button, err := f.GetChild()
|
||||
if err == nil {
|
||||
button.ToWidget().SetCanFocus(true)
|
||||
@@ -387,13 +450,19 @@ func setUpSearchEntry() *gtk.SearchEntry {
|
||||
}
|
||||
}
|
||||
})
|
||||
/*searchEntry.Connect("focus-in-event", func() {
|
||||
searchEntry.SetText("")
|
||||
})*/
|
||||
|
||||
return searchEntry
|
||||
}
|
||||
|
||||
func isExcluded(dir string) bool {
|
||||
for _, exclusion := range exclusions {
|
||||
if strings.Contains(dir, exclusion) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func searchUserDir(dir string) {
|
||||
fileSearchResults = nil
|
||||
ignore = userDirsMap[dir]
|
||||
@@ -404,10 +473,14 @@ func searchUserDir(dir string) {
|
||||
fileSearchResultFlowBox.Add(btn)
|
||||
|
||||
for _, path := range fileSearchResults {
|
||||
log.Debugf("Path: %s", path)
|
||||
partOfPathToShow := strings.Split(path, userDirsMap[dir])[1]
|
||||
if partOfPathToShow != "" {
|
||||
btn := setUpUserFileSearchResultButton(partOfPathToShow, path)
|
||||
fileSearchResultFlowBox.Add(btn)
|
||||
if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) {
|
||||
btn := setUpUserFileSearchResultButton(partOfPathToShow, path)
|
||||
fileSearchResultFlowBox.Add(btn)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
fileSearchResultFlowBox.Hide()
|
||||
|
||||
64
watcher.go
Normal file
64
watcher.go
Normal file
@@ -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
|
||||
}
|
||||
@@ -54,7 +54,34 @@ func parseDesktopEntry(id string, in io.Reader) (entry desktopEntry, err error)
|
||||
case "Terminal":
|
||||
entry.Terminal, _ = strconv.ParseBool(value)
|
||||
case "NoDisplay":
|
||||
entry.NoDisplay, _ = strconv.ParseBool(value)
|
||||
if !entry.NoDisplay {
|
||||
entry.NoDisplay, _ = strconv.ParseBool(value)
|
||||
}
|
||||
case "Hidden":
|
||||
if !entry.NoDisplay {
|
||||
entry.NoDisplay, _ = strconv.ParseBool(value)
|
||||
}
|
||||
case "OnlyShowIn":
|
||||
if !entry.NoDisplay {
|
||||
entry.NoDisplay = true
|
||||
currentDesktop := os.Getenv("XDG_CURRENT_DESKTOP")
|
||||
if currentDesktop != "" {
|
||||
for _, ele := range strings.Split(value, ";") {
|
||||
if ele == currentDesktop && ele != "" {
|
||||
entry.NoDisplay = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
case "NotShowIn":
|
||||
currentDesktop := os.Getenv("XDG_CURRENT_DESKTOP")
|
||||
if !entry.NoDisplay && currentDesktop != "" {
|
||||
for _, ele := range strings.Split(value, ";") {
|
||||
if ele == currentDesktop && ele != "" {
|
||||
entry.NoDisplay = true
|
||||
}
|
||||
}
|
||||
}
|
||||
case "Exec":
|
||||
entry.Exec = cleanexec.Replace(value)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user