162 Commits

Author SHA1 Message Date
piotr
71ce3b5d75 Merge remote-tracking branch 'origin/main' 2024-02-06 03:40:14 +01:00
piotr
b056b4c436 bump to 0.4.6 2024-02-06 03:39:35 +01:00
Piotr Miller
42b55d41df Merge pull request #113 from nwg-piotr/touch
Don't launch if the window has been scrolled
2024-02-06 03:38:09 +01:00
piotr
ec0ce767d9 get proper adjustment 2024-02-06 03:35:29 +01:00
piotr
ec3caa02d2 add comments #110 2024-02-06 03:33:12 +01:00
piotr
6b39eba14c check if window scrolled #110 2024-02-06 03:21:42 +01:00
piotr
631b651eed bump to 0.4.5 2024-02-05 01:02:34 +01:00
piotr
df644f4196 gotk3 -> 0.6.3 2024-02-05 01:01:30 +01:00
piotr
be89ff4b97 update README.md 2024-02-03 16:44:55 +01:00
piotr
5cab646d08 update README.md 2024-02-03 16:40:57 +01:00
piotr
f93e6923d0 update README.md 2024-02-03 16:39:34 +01:00
Piotr Miller
2d114e58bc Update README.md 2024-02-03 15:53:10 +01:00
piotr
11f2f67184 update README.md 2024-02-03 04:26:49 +01:00
piotr
038fddc9da update README.md 2024-02-03 04:23:30 +01:00
piotr
945f73adbf Merge remote-tracking branch 'origin/main' 2024-02-03 04:15:05 +01:00
Piotr Miller
f8572b3db8 Update README.md 2024-02-03 04:14:35 +01:00
piotr
9012a45be4 update README.md 2024-02-03 04:12:06 +01:00
piotr
fe311ced2a bump to 0.4.4 2024-02-03 04:06:01 +01:00
Piotr Miller
bd12c281b1 Merge pull request #112 from nwg-piotr/power
add optional PowerBar
2024-02-02 02:06:56 +01:00
piotr
ff34cf8194 fix finding userDirsFile 2024-02-02 01:39:58 +01:00
piotr
8e02b59f83 clear status label on button exit 2024-02-01 18:24:14 +01:00
Piotr Miller
7b2ed76fac update lock icon 2024-02-01 09:48:06 +01:00
piotr
b0dc1404e7 formatting 2024-02-01 04:14:42 +01:00
piotr
6da6787272 add powerButton size argument 2024-02-01 04:09:31 +01:00
piotr
01c26ba092 add powerButton function 2024-02-01 03:52:56 +01:00
piotr
db265ccf6a update dependencies 2024-02-01 01:09:57 +01:00
piotr
ffc256ba87 fix Makefile; modify icons 2024-02-01 01:09:13 +01:00
Piotr Miller
b5f1713c3e add power icons 2024-01-31 10:50:44 +01:00
piotr
b1908537d1 cp README.md, LICENSE 2024-01-27 14:52:34 +01:00
piotr
664917c105 update README.md 2024-01-27 04:15:17 +01:00
piotr
bf66683a09 update README.md 2024-01-27 03:31:21 +01:00
piotr
ff8e2435b6 rename variable 2023-11-27 00:18:03 +01:00
Piotr Miller
223e16f77c Merge pull request #106 from nwg-piotr/otput-hypr
Make binding to an output work on Hyprland
2023-11-26 23:40:28 +01:00
piotr
55c095c053 fix -wm help 2023-11-26 23:34:48 +01:00
piotr
ee2008348f bump to 0.4.3 2023-11-26 23:17:00 +01:00
piotr
0570f90bec update help 2023-11-26 23:16:39 +01:00
piotr
a2917d68dd support output assignment on Hyprland 2023-11-26 23:14:18 +01:00
piotr
b05b0f484a improve help 2023-11-25 15:54:05 +01:00
piotr
b61e665c71 bump to 0.4.2 2023-11-22 01:23:59 +01:00
piotr
8408c669ef remove unused function 2023-11-22 01:13:48 +01:00
Piotr Miller
d66066c3b6 Merge pull request #105 from nwg-piotr/fix-wm
remove `XDG_CURRENT_DESKTOP` as default `-wm` value; allow capitalized `Hyprland`
2023-11-21 14:53:22 +01:00
piotr
dac55cdd0d remove setting XDG_CURRENT_DESKTOP as dafault -wm value; allow capitalized Hyprland value 2023-11-21 14:26:04 +01:00
Piotr Miller
03365d24e5 Merge pull request #104 from Schuldkroete/main
Make the description line at the bottom of the drawer themable
2023-11-21 14:20:22 +01:00
Schuldkröte
8e58654336 add gtk name property to statusLineWrapper and statusLabel 2023-11-21 11:47:01 +01:00
piotr
33e0032725 bump to 0.4.1 2023-11-18 01:41:53 +01:00
Piotr Miller
c05fff189d Merge pull request #103 from gouvinb/main
Change command execution logic and use `/usr/bin/env` command
2023-11-18 01:40:09 +01:00
gouvinb
57d130ca51 Restore the code to trim % and everything that follows 2023-11-09 15:49:50 +01:00
gouvinb
954a6ba9c9 change command execution logic and use env command 2023-11-09 04:24:41 +01:00
piotr
67b16ea6a6 bump to 0.4.0 2023-11-08 02:30:01 +01:00
piotr
3a02b16761 update versions 2023-11-08 02:25:43 +01:00
piotr
c67fef6671 fix line formatting 2023-11-08 02:24:41 +01:00
Piotr Miller
444617865e Merge pull request #102 from gouvinb/main
add support to hyprlandctl
2023-11-08 01:01:10 +01:00
gouvinb
e3de9cc67b make better log with -wm flag 2023-11-07 10:32:23 +01:00
gouvinb
1c11329581 Reworked command building.
Typical shell-supported command sets:

- `cmd`
- `cmd --arg`
- `cmd --arg=value`
- `ENV_VAR="value" cmd`
- `ENV_VAR="value" cmd --arg`
- `ENV_VAR="value" cmd --arg=value`

The listed commands above are now better managed.

Initially, the command types `cmd --arg=value` or `ENV_VAR="value" cmd --arg=value` were not correctly parsed. After finding a solution to this problem, I conducted further tests and discovered cases that were not currently handled. These cases are as follows:

- `cmd "arg with space"`
- `ENV_VAR="value with space" cmd`
2023-11-06 15:35:42 +01:00
gouvinb
87ee23afe2 print the correct executed command (prefix supported) 2023-11-06 12:40:10 +01:00
gouvinb
808fd032a0 fix prefix command with hypr or hyprland and update -wm description 2023-11-06 00:05:16 +01:00
gouvinb
1d3f023dc8 add support to hyprlandctl
BREAKING CHANGE: '-swaymsg' removed, use '-wm sway' instead
2023-11-05 23:36:18 +01:00
Piotr Miller
ccfe7776c6 Merge pull request #101 from gouvinb/main
Add the `swaymsg` flag to launch a program with `swaymsg exec` and prevent potential involuntary closing with Jetbrains IDEs
2023-11-05 14:03:26 +01:00
gouvinb
5a7dbefeb0 adds the "swaymsg" flag to launch a program with "swaymsg exec" and prevent potential involuntary closing with Jetbrains IDEs 2023-11-01 00:44:50 +01:00
piotr
fd26bb39e8 adjust help descriptions 2023-07-28 01:18:08 +02:00
piotr
bc74ebc927 update usage 2023-07-28 01:15:31 +02:00
piotr
d65d075bdb update usage 2023-07-28 01:13:57 +02:00
Piotr Miller
58ea8ea8db Merge pull request #95 from trinitronx/add-keyboard-mode-flag
Add keyboard mode flag to support both: "on-demand" & "exclusive" GTK layer-shell modes
2023-07-28 00:51:52 +02:00
Piotr Miller
94b8b8d7f0 Merge pull request #96 from nwg-piotr/theme
Force GTK_THEME for libadwaita apps
2023-07-28 00:49:47 +02:00
piotr
ebfaba1881 undo version bump 2023-07-28 00:47:27 +02:00
piotr
6656568c6a update -ft description 2023-07-27 03:44:29 +02:00
piotr
b3fa492b44 bump to 0.3.10 2023-07-27 03:27:56 +02:00
piotr
c0faecdb8b add -ft argument 2023-07-27 03:27:27 +02:00
James Cuzella
830edefa22 Refactor -k flag as Bool to toggle keyboard mode on-demand / exclusive 2023-07-24 20:48:35 -06:00
James Cuzella
aeeb4e4890 Fix warn messages for short -k flag 2023-07-23 22:49:52 -06:00
James Cuzella
6bbfbea1a8 Handle empty string passed to --keyboard/-k flag 2023-07-23 22:45:16 -06:00
James Cuzella
d88d9795d1 Document --keyboard/-k flag in README 2023-07-23 22:22:41 -06:00
James Cuzella
f85356bdc7 Drop keyboard mode: 'none' b/c it doesn't make sense with this app to not have keyboard input at all 2023-07-23 20:30:14 -06:00
James Cuzella
37c9c2d520 Add --keyboard/-k flag to set GTK layer shell keyboard mode (default: exclusive) 2023-07-23 20:26:09 -06:00
Piotr Miller
2903abd831 Merge pull request #94 from 6543-forks/smal_code_refactor
smal code refactors
2023-07-07 22:48:39 +02:00
Piotr Miller
9cc81fa38a Merge pull request #93 from 6543-forks/fix_lint_errors
log actual error message too
2023-07-07 22:45:03 +02:00
Piotr Miller
edf4c81f85 Merge pull request #92 from 6543-forks/reduce_syscalls
Save result of os.Getenv()
2023-07-07 22:43:50 +02:00
Piotr Miller
9582726cb9 Merge pull request #90 from 6543-forks/update_go_deps
update golang lib dependencies
2023-07-07 22:26:53 +02:00
6543
7a6ae82a75 log the unknown signal 2023-07-06 18:03:28 +02:00
6543
22ddb71603 declare unused var with _ and always name event the same 2023-07-06 17:56:40 +02:00
6543
ea7813761a gitignore vendor directory 2023-07-06 17:16:26 +02:00
6543
0cafb3c3ad save result of os.Getenv and use that if possible to reduce some syscalls 2023-07-06 17:15:49 +02:00
6543
89cffad81d log actual error message too 2023-07-06 17:14:55 +02:00
6543
1e854558cf update golang lib dependencies 2023-07-06 16:10:31 +02:00
Piotr Miller
3df7a30533 Update README.md 2023-03-11 02:10:14 +01:00
piotr
e383f7a470 bump to 0.3.9 (go 1.20) 2023-02-06 01:57:11 +01:00
Piotr Miller
820848d984 Merge pull request #85 from nwg-piotr/add84
Add `-i` flag to force an icon theme
2023-01-22 22:41:42 +01:00
piotr
fa01d5bb32 bump to 0.3.8 2023-01-22 22:35:00 +01:00
piotr
8be1fc1ea2 allow forcing icon theme #84 2023-01-22 22:30:09 +01:00
Piotr Miller
0e5d38907f Merge pull request #83 from nwg-piotr/fix82
fixed trimming strings on non-ASCII characters
2023-01-12 22:50:59 +01:00
piotr
7ba7abd817 bump to 0.3.7 2023-01-12 22:48:52 +01:00
piotr
cedcf8619f fix cutting utf-8 strings #82 2023-01-12 02:27:27 +01:00
Piotr Miller
8ff2d5c89c Create FUNDING.yml 2022-12-15 12:05:39 +01:00
Piotr Miller
c4629e0c28 Merge pull request #80 from nwg-piotr/lockfile
Move lock file to XDG_DATA_HOME/nwg-drawer/
2022-12-11 23:21:32 +01:00
piotr
ab5e2ea6ae move lock file to dataDir #79 2022-12-11 23:05:57 +01:00
piotr
63117e2605 bump to 0.3.6 2022-12-11 21:44:01 +01:00
Piotr Miller
d22609f403 Merge pull request #77 from nwg-piotr/debu68
fix #68
2022-12-01 00:12:46 +01:00
piotr
cb6a7f44fe go-sway -> 1.2.0 2022-12-01 00:03:17 +01:00
piotr
85cc2d78ee fix userDirsFile path #68 2022-11-28 23:39:36 +01:00
piotr
d3a0fd04a4 log if userDirsFile found #68 2022-11-28 23:26:19 +01:00
piotr
52e63667c9 print userDirsMap -> log.Debugf #68 2022-11-28 23:03:12 +01:00
piotr
f399f589fb add a line to debug #68 2022-11-18 01:40:50 +01:00
Piotr Miller
2058f124fd Merge pull request #75 from nwg-piotr/fix74
sanitize no longer valid pinned items #74
2022-11-12 15:40:14 +01:00
piotr
ebdbe71ac6 hide and delete invalid pinned items #74 2022-11-12 03:41:24 +01:00
Piotr Miller
3fe6d71234 Merge pull request #73 from nwg-piotr/fix-72
Fix inconsistent behaviour of normal resident instance
2022-10-30 23:54:41 +01:00
piotr
0e5b1cf659 bump to 0.3.3 2022-10-30 22:58:19 +01:00
piotr
6494557979 focus 1st pinned if any, or focus 1st appBox entry; fixes #72 2022-10-30 22:53:06 +01:00
Piotr Miller
f68678f687 Merge pull request #71 from nwg-piotr/fix-45-revisited
Fix 45 revisited
2022-10-26 02:13:02 +02:00
piotr
e31df6e721 bump to 0.3.2 2022-10-25 04:06:30 +02:00
piotr
9509a65625 attempt to fix #45 (revisited) 2022-10-25 04:02:05 +02:00
Piotr Miller
bc84a05378 Merge pull request #70 from nwg-piotr/check69
Fix #69
2022-09-25 20:24:41 +02:00
piotr
a249c37612 del redundant type conversion 2022-09-21 00:56:09 +02:00
piotr
c7fa6e836a fix log line formatting 2022-09-21 00:54:42 +02:00
piotr
87a62e7bb6 handle error closing file 2022-09-21 00:53:48 +02:00
piotr
11241cef0b replace deprecated types 2022-09-21 00:48:28 +02:00
piotr
87d2a74db0 fix setting data dir #69 2022-09-21 00:32:29 +02:00
piotr
41f7d58edf debug #69 2022-09-20 23:01:35 +02:00
piotr
583ddfde0b update .gitignore 2022-06-23 00:16:56 +02:00
Piotr Miller
383869906a Merge pull request #65 from SPFabGerman/OnlyShowIn
Added support for Hidden, OnlyShowIn and NotShowIn
2022-06-11 00:19:45 +02:00
SPFabGerman
54553ffae1 Added support for Hidden, OnlyShowIn and NotShowIn 2022-06-09 21:32:38 +02:00
Piotr Miller
d8e7e0f6c2 Merge pull request #63 from nwg-piotr/fix62
Fixes accidental crash on trimming long descriptions
2022-05-16 22:27:54 +02:00
piotr
7230d82be3 fix trimming names as well #62 2022-05-16 01:16:02 +02:00
piotr
02b3930ef9 trim string, not runes #62 2022-05-16 01:01:25 +02:00
piotr
f3b3635bd8 trim comments > 120 chars #61 2022-05-08 01:43:16 +02:00
nwg-piotr
bb84a2fc46 remove accidental binary 2022-04-13 11:36:19 +02:00
Piotr Miller
93587a47db Merge pull request #60 from nwg-piotr/dark
prefer dark theme
2022-04-13 11:22:15 +02:00
nwg-piotr
afe99b42f0 prefer dark theme 2022-04-13 11:14:50 +02:00
Piotr Miller
e052a86b12 Merge pull request #58 from jovanlanik/main
Support for changing GTK theme
2022-03-18 02:06:06 +01:00
Jovan Lanik
45cb286296 Add support for changing GTK theme 2022-03-13 21:58:42 +01:00
piotr
d050598086 bump to 0.2.8 2022-02-15 01:19:30 +01:00
Piotr Miller
42ddd815f4 Merge pull request #52 from snehrbass/main
Add flags to set window margins
2022-02-15 01:02:48 +01:00
Ste_ph_en
8b1dfb4421 Add flags to set margins 2022-02-14 18:57:57 -05:00
Piotr Miller
d572c1125d Merge pull request #54 from Raffy23/51-fix-zombie-processes
Collect signals of child processes
2022-02-15 00:42:56 +01:00
Piotr Miller
6b055bb48a Merge pull request #53 from Raffy23/50-fix-high-cpu-load
Fix high CPU load
2022-02-15 00:37:54 +01:00
Raphael Ludwig
165b925da2 Fix regression that prevented pinned items to update while window is open 2022-02-14 20:59:48 +01:00
Raphael Ludwig
058f8684aa Use a channel and a goroutine instead of busy polling a boolean flag to reduce cpu consumption 2022-02-13 23:21:21 +01:00
Raphael Ludwig
f4b51b0706 Collect signals of child processes
Add logging if starting of a process was not successful
2022-02-13 23:06:21 +01:00
Piotr Miller
b781f58097 Update README.md 2022-02-04 11:45:17 +01:00
Piotr Miller
68137935a9 Update README.md 2022-02-02 14:47:28 +01:00
piotr
98efb36614 bump version 2022-01-15 23:58:23 +01:00
Piotr Miller
59533536b1 Merge pull request #48 from nightly-brew/detach-from-process-group
Use Setsid when spawning programs
2022-01-15 03:58:52 +01:00
nightly-brew
07821f39b7 Use Setsid when starting the selected program to make sure it's not killed by signals sent to the drawer's process group. 2022-01-15 02:36:07 +01:00
piotr
4ea160e524 update README 2022-01-13 23:58:10 +01:00
Piotr Miller
8fb4209a97 Merge pull request #47 from nwg-piotr/not-wayland
remove bin
2022-01-13 23:46:57 +01:00
piotr
c85c364ba5 ignore bin 2022-01-13 23:42:42 +01:00
piotr
8239254485 remove bin #40 2022-01-13 23:42:31 +01:00
Piotr Miller
7681055a23 Merge pull request #46 from nwg-piotr/fix45
check if fileSearchResultWrapper exists #45
2022-01-12 11:17:56 +01:00
piotr
15c9029935 check if fileSearchResultWrapper exists #45 2022-01-12 11:06:05 +01:00
Piotr Miller
f67f1a9950 Merge pull request #43 from nwg-piotr/fix-pinned
create empty pinned file if not found on startup (and some other minor issues)
2022-01-11 14:41:39 +01:00
piotr
2c63e256ba update readme 2022-01-11 14:36:56 +01:00
piotr
92095d5b97 hide fileSearchResultWrapper initially 2022-01-11 12:31:47 +01:00
piotr
a6977d9444 create pinned file if not found 2022-01-11 11:45:05 +01:00
Piotr Miller
378aa33cf3 Merge pull request #42 from nwg-piotr/issue36
Close on RMB only #36
2022-01-10 23:55:16 +01:00
piotr
9d6d572f72 close on LMB only #36 2022-01-10 22:04:58 +01:00
piotr
8fdb174643 hot fix to #41 2022-01-09 23:20:48 +01:00
piotr
0810250b3a default temt -> foot; consume Esc key event 2022-01-09 14:30:59 +01:00
piotr
6e76f49729 fix #38 @nightly-brew 2022-01-09 12:56:51 +01:00
Piotr Miller
94c94b8b1e Merge pull request #35 from nwg-piotr/term
support for the foot terminal
2021-11-29 00:47:33 +01:00
piotr
3d6f3e6e3c support foot terminal 2021-11-21 21:45:10 +01:00
piotr
2e305e6e52 bump to 0.2.1 2021-10-01 00:40:27 +02:00
Piotr Miller
0b28592f0f Merge pull request #32 from nwg-piotr/fix31
Hide resident window on SIGUSR1 if visible
2021-10-01 00:03:39 +02:00
piotr
8daf645e3b close resident on SIGUSR1 if visible #31 2021-09-30 12:33:39 +02:00
17 changed files with 980 additions and 236 deletions

1
.github/FUNDING.yml vendored Normal file
View File

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

8
.gitignore vendored
View File

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

View File

@@ -9,16 +9,20 @@ get:
go get github.com/fsnotify/fsnotify
build:
go build -o bin/nwg-drawer .
go build -v -o bin/nwg-drawer .
install:
-pkill -f nwg-drawer
sleep 1
mkdir -p /usr/share/nwg-drawer
cp -r desktop-directories /usr/share/nwg-drawer
cp -r img /usr/share/nwg-drawer
cp drawer.css /usr/share/nwg-drawer
cp bin/nwg-drawer /usr/bin
install -Dm 644 -t "/usr/share/licenses/nwg-drawer" LICENSE
install -Dm 644 -t "/usr/share/doc/nwg-drawer" README.md
uninstall:
rm -r /usr/share/nwg-drawer
rm /usr/bin/nwg-drawer

View File

@@ -1,36 +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).
![screenshot-01.png](https://scrot.cloud/images/2021/05/30/screenshot-01.png)
Below the grid there is the power bar - a row of buttons to lock the screen, exit the compositor, reboot, suspend and power
the machine off. For each button to appear, you need to provide a corresponding command. See "Command line arguments"
below.
[more screenshots](https://scrot.cloud/album/nwg-drawer.Bogd) | [see on YouTube](https://youtu.be/iIgxJQhCQf0)
<img src="https://github.com/nwg-piotr/nwg-drawer/assets/20579136/8f4eacb4-5395-4350-889b-a9037aa34f08" width=640 alt="screenshot"><br>
[![Packaging status](https://repology.org/badge/vertical-allrepos/nwg-drawer.svg)](https://repology.org/project/nwg-drawer/versions)
## v0.2.x note
1. Placing config files in the nwg-panel config directory was a mistake, sorry. The 0.2.0 version migrates them to `~/.config/nwg-drawer`.
2. From now on you may run the program residently, which should speed it up. See "Running" below.
To close the window w/o running a program, you may use the `Esc` key, or right-click the window next to the grid.
## Installation
[![Packaging status](https://repology.org/badge/vertical-allrepos/nwg-drawer.svg)](https://repology.org/project/nwg-drawer/versions)
### Dependencies
- go >=1.16 (just to build)
- go >=1.20 (just to build)
- gtk3
- gtk-layer-shell
- xdg-utils
@@ -38,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.
@@ -50,14 +47,11 @@ 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
@@ -67,33 +61,62 @@ Usage of nwg-drawer:
File Search result COLumns (default 2)
-fslen int
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
Since v0.2.x you may use the drawer in two ways:
You may use the drawer in two ways:
1. Simply run the `nwg-drawer` command, by adding a key binding to your sway config file, e.g.:
@@ -112,7 +135,7 @@ The second line does nothing but `pkill -USR1 nwg-drawer`, so you may just use t
this should be a little bit faster.
Running a resident instance should speed up use of the drawer significantly. Pay attention to the fact, that you
need to `pkill -f nwg-drawer` and reload sway to apply any new arguments!
need to `pkill -f nwg-drawer` and reload the compositor to apply any new arguments!
## Logging
@@ -129,12 +152,10 @@ exit sway, launch it again and include the `drawer.log` content in the GitHub is
Edit `~/.config/nwg-drawer/drawer.css` to your taste.
## Files
## File search
When the search phrase is at least 3 characters long, your XDG user directories are being searched.
![screenshot-03.png](https://scrot.cloud/images/2021/05/30/screenshot-03.png)
Use the **left mouse button** to open a file with the `xdg-open` command. As configuring file associations for it is
PITA, you may override them, by creating the `~/.config/nwg-panel/preferred-apps.json` file with your own definitions.
@@ -144,7 +165,7 @@ PITA, you may override them, by creating the `~/.config/nwg-panel/preferred-apps
{
"\\.pdf$": "atril",
"\\.svg$": "inkscape",
"\\.(jpg|png|tiff|gif)$": "feh",
"\\.(jpg|png|tiff|gif)$": "swayimg",
"\\.(mp3|ogg|flac|wav|wma)$": "audacious",
"\\.(avi|mp4|mkv|mov|wav)$": "mpv",
"\\.(doc|docx|xls|xlsx)$": "libreoffice"

Binary file not shown.

19
go.mod
View File

@@ -1,12 +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-20210827021656-e6ecab2731f7
github.com/fsnotify/fsnotify v1.5.1
github.com/gotk3/gotk3 v0.6.1
github.com/joshuarubin/go-sway v0.0.4
github.com/sirupsen/logrus v1.8.1
github.com/dlasky/gotk3-layershell v0.0.0-20230802002603-b0c42cd8474f
github.com/fsnotify/fsnotify v1.7.0
github.com/gotk3/gotk3 v0.6.3
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
)

57
go.sum
View File

@@ -3,30 +3,51 @@ github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37/go.m
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7 h1:LDo0kwt+oW9a4lWlj2OakIgMW1ySXXVRGFt8GHUdYYA=
github.com/dlasky/gotk3-layershell v0.0.0-20210827021656-e6ecab2731f7/go.mod h1:JHLx2Wz4mAPVwn4PFhC69ydwyHP4A3wQvlg7HKVVc1U=
github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
github.com/gotk3/gotk3 v0.6.1 h1:GJ400a0ecEEWrzjBvzBzH+pB/esEMIGdB9zPSmBdoeo=
github.com/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/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/gotk3/gotk3 v0.6.2 h1:sx/PjaKfKULJPTPq8p2kn2ZbcNFxpOJqi4VLzMbEOO8=
github.com/gotk3/gotk3 v0.6.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
github.com/gotk3/gotk3 v0.6.3 h1:+Ke4WkM1TQUNOlM2TZH6szqknqo+zNbX3BZWVXjSHYw=
github.com/gotk3/gotk3 v0.6.3/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.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
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.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
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/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
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
View 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
View 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
View 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
View 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
View 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

290
main.go
View File

@@ -21,16 +21,18 @@ import (
"github.com/gotk3/gotk3/gtk"
)
const version = "0.2.0"
const version = "0.4.6"
var (
appDirs []string
configDirectory string
pinnedFile string
pinned []string
id2entry map[string]desktopEntry
preferredApps map[string]interface{}
exclusions []string
appDirs []string
configDirectory string
pinnedFile string
pinned []string
id2entry map[string]desktopEntry
preferredApps map[string]interface{}
exclusions []string
hyprlandMonitors []monitor
beenScrolled bool
)
var categoryNames = [...]string{
@@ -66,6 +68,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
@@ -100,12 +126,11 @@ var (
statusLabel *gtk.Label
status string
ignore string
showWindowTrigger bool
desktopTrigger bool
pinnedTrigger bool
pinnedItemsChanged chan interface{} = make(chan interface{}, 1)
)
func defaultStringIfBlank(s, fallback string) string {
func defaultTermIfBlank(s, fallback string) string {
s = strings.TrimSpace(s)
// os.Getenv("TERM") returns "linux" instead of empty string, if program has been started
// from a key binding defined in the config file. See #23.
@@ -115,22 +140,44 @@ func defaultStringIfBlank(s, fallback string) string {
return s
}
func validateWm() {
if !(*wm == "sway" || *wm == "hyprland" || *wm == "Hyprland") && *wm != "" {
*wm = ""
log.Warn("-wm argument supports only 'sway' or 'hyprland' string.")
}
}
// Flags
var cssFileName = flag.String("s", "drawer.css", "Styling: css file name")
var targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway only)")
var targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway & Hyprland only)")
var displayVersion = flag.Bool("v", false, "display Version information")
var keyboard = flag.Bool("k", false, "set GTK layer shell Keyboard interactivity to 'on-demand' mode")
var overlay = flag.Bool("ovl", false, "use OVerLay layer")
var 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 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() {
@@ -146,8 +193,11 @@ func main() {
os.Exit(0)
}
validateWm()
// Gentle SIGTERM handler thanks to reiki4040 https://gist.github.com/reiki4040/be3705f307d3cd136e85
// v0.2: we also need to support SIGUSR from now on
showWindowChannel := make(chan interface{}, 1)
signalChan := make(chan os.Signal, 1)
signal.Notify(signalChan, syscall.SIGTERM, syscall.SIGUSR1)
@@ -162,14 +212,19 @@ func main() {
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.
log.Debug("SIGUSR1 received, showing the window")
showWindowTrigger = true
if !win.IsVisible() {
log.Debug("SIGUSR1 received, showing the window")
showWindowChannel <- struct{}{}
} else {
log.Debug("SIGUSR1 received, hiding the window")
restoreStateAndHide()
}
} else {
log.Info("SIGUSR1 received, and I'm not resident, bye bye")
gtk.MainQuit()
}
default:
log.Info("Unknown signal")
log.Infof("Unknown signal: %s", s.String())
}
}
}()
@@ -179,7 +234,7 @@ func main() {
// Otherwise the command may behave in two ways:
// 1. kill the running non-residennt instance and exit;
// 2. die if a resident instance found.
lockFilePath := path.Join(tempDir(), "nwg-drawer.lock")
lockFilePath := path.Join(dataDir(), "nwg-drawer.lock")
lockFile, err := singleinstance.CreateLockFile(lockFilePath)
if err != nil {
pid, err := readTextFile(lockFilePath)
@@ -190,7 +245,10 @@ func main() {
log.Warnf("Resident instance already running (PID %v)", i)
} else {
log.Infof("Showing resident instance (PID %v)", i)
syscall.Kill(i, syscall.SIGUSR1)
err := syscall.Kill(i, syscall.SIGUSR1)
if err != nil {
return
}
}
}
}
@@ -233,7 +291,10 @@ func main() {
// 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()
@@ -246,6 +307,7 @@ func main() {
pinned, err = loadTextFile(pinnedFile)
if err != nil {
pinned = nil
savePinned()
}
log.Info(fmt.Sprintf("Found %v pinned items", len(pinned)))
@@ -292,6 +354,32 @@ func main() {
// 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(*cssFileName)
@@ -316,6 +404,7 @@ 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)
@@ -337,17 +426,28 @@ 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()
@@ -359,7 +459,14 @@ func main() {
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
@@ -412,9 +519,21 @@ func main() {
resultWindow.SetEvents(int(gdk.ALL_EVENTS_MASK))
resultWindow.SetPolicy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
resultWindow.Connect("button-release-event", func(sw *gtk.ScrolledWindow, e *gdk.Event) bool {
btnEvent := gdk.EventButtonNewFromEvent(e)
if btnEvent.Button() == 1 || btnEvent.Button() == 3 {
// On touch screen we don't want the button-release-event to launch the app if the user just wanted to scroll the
// window. Let's forbid doing so if the content has been scrolled. We will reset the value on button-press-event.
// Resolves https://github.com/nwg-piotr/nwg-drawer/issues/110
vAdj := resultWindow.GetVAdjustment()
vAdj.Connect("value-changed", func() {
beenScrolled = true
})
hAdj := resultWindow.GetHAdjustment()
hAdj.Connect("value-changed", func() {
beenScrolled = true
})
resultWindow.Connect("button-release-event", func(_ *gtk.ScrolledWindow, event *gdk.Event) bool {
btnEvent := gdk.EventButtonNewFromEvent(event)
if btnEvent.Button() == 3 {
if !*resident {
gtk.MainQuit()
} else {
@@ -445,6 +564,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)
@@ -458,9 +578,40 @@ 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()
@@ -480,38 +631,55 @@ func main() {
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)
glib.TimeoutAdd(uint(1), func() bool {
if showWindowTrigger && win != nil && !win.IsVisible() {
win.ShowAll()
// focus 1st element
b := appFlowBox.GetChildAtIndex(0)
if b != nil {
button, err := b.GetChild()
if err == nil {
button.ToWidget().GrabFocus()
}
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
})
}
}
showWindowTrigger = false
// some .desktop file changed
if desktopTrigger {
log.Debug(".desktop file changed")
desktopFiles = listDesktopFiles()
status = parseDesktopFiles(desktopFiles)
appFlowBox = setUpAppsFlowBox(nil, "")
desktopTrigger = false
}
// pinned file changed
if pinnedTrigger {
log.Debug("pinned file changed")
pinnedTrigger = false
pinned, _ = loadTextFile(pinnedFile)
pinnedFlowBox = setUpPinnedFlowBox()
}
return true
})
}()
go watchFiles()
@@ -520,7 +688,9 @@ func main() {
func restoreStateAndHide() {
timeStart1 := time.Now()
win.Hide()
if win != nil {
win.Hide()
}
// clear search
searchEntry.SetText("")
@@ -533,7 +703,9 @@ func restoreStateAndHide() {
}
// scroll to the top
resultWindow.GetVAdjustment().SetValue(0)
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()))

337
tools.go
View File

@@ -5,9 +5,11 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/joshuarubin/go-sway"
log "github.com/sirupsen/logrus"
"io"
"io/fs"
"io/ioutil"
"net"
"os"
"os/exec"
"path"
@@ -15,13 +17,11 @@ import (
"regexp"
"sort"
"strings"
"syscall"
"time"
log "github.com/sirupsen/logrus"
"github.com/gotk3/gotk3/gdk"
"github.com/gotk3/gotk3/gtk"
"github.com/joshuarubin/go-sway"
)
func wayland() bool {
@@ -78,8 +78,9 @@ 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) {
log.Debugf("userDirsFile found: %s", userDirsFile)
log.Info(fmt.Sprintf("Using XDG user dirs from %s", userDirsFile))
lines, _ := loadTextFile(userDirsFile)
for _, l := range lines {
@@ -104,7 +105,7 @@ func mapXdgUserDirs() map[string]string {
}
}
} else {
log.Warnf("%s file not found, using defaults", userDirsFile)
log.Warnf("userDirsFile %s not found, using defaults", userDirsFile)
}
return result
@@ -120,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
}
@@ -151,11 +141,11 @@ func readTextFile(path string) (string, error) {
}
func oldConfigDir() (string, error) {
if os.Getenv("XDG_CONFIG_HOME") != "" {
dir := path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-panel")
if xdgConfig := os.Getenv("XDG_CONFIG_HOME"); xdgConfig != "" {
dir := path.Join(xdgConfig, "nwg-panel")
return dir, nil
} else if os.Getenv("HOME") != "" {
dir := path.Join(os.Getenv("HOME"), ".config/nwg-panel")
} else if home := os.Getenv("HOME"); home != "" {
dir := path.Join(home, ".config/nwg-panel")
return dir, nil
}
@@ -164,10 +154,10 @@ func oldConfigDir() (string, error) {
func configDir() string {
var dir string
if os.Getenv("XDG_CONFIG_HOME") != "" {
dir = path.Join(os.Getenv("XDG_CONFIG_HOME"), "nwg-drawer")
} else if os.Getenv("HOME") != "" {
dir = path.Join(os.Getenv("HOME"), ".config/nwg-drawer")
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)
@@ -176,6 +166,27 @@ func configDir() string {
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
}
func createDir(dir string) {
if _, err := os.Stat(dir); os.IsNotExist(err) {
err := os.MkdirAll(dir, os.ModePerm)
@@ -196,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
@@ -212,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 != "" {
@@ -260,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")
@@ -274,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
}
@@ -299,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
@@ -349,6 +369,8 @@ func setUpCategories() {
} else {
other = cat
}
} else {
log.Errorf("Couldn't open %s", fp)
}
}
sort.Slice(categories, func(i, j int) bool {
@@ -462,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
}
@@ -513,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 {
log.Errorf("Error saving pinned", err)
log.Error("Error saving pinned", err)
}
}
}
@@ -535,44 +563,55 @@ 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("env vars: %s; command: '%s'; args: %s\n", envVars, elements[cmdIdx], elements[1+cmdIdx:])
msg := fmt.Sprintf("command: %q; args: %q\n", cmd.Args[0], cmd.Args[1:])
log.Info(msg)
cmd.Start()
cmd.SysProcAttr = &syscall.SysProcAttr{
Setsid: true,
}
if cmd.Start() != nil {
log.Warn("Unable to launch terminal emulator!")
} else {
// Collect the exit code of the child process to prevent zombies
// if the drawer runs in resident mode
go func() {
_ = cmd.Wait()
}()
}
if *resident {
restoreStateAndHide()
@@ -598,7 +637,15 @@ func open(filePath string, xdgOpen bool) {
}
log.Infof("Executing: %s", cmd)
cmd.Start()
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()
@@ -611,34 +658,114 @@ func open(filePath string, xdgOpen bool) {
func mapOutputs() (map[string]*gdk.Monitor, error) {
result := make(map[string]*gdk.Monitor)
ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
defer cancel()
if os.Getenv("HYPRLAND_INSTANCE_SIGNATURE") != "" {
err := listHyprlandMonitors()
if err == nil {
client, err := sway.New(ctx)
if err != nil {
return nil, err
}
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
}

View File

@@ -32,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()
@@ -54,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)
@@ -77,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)
@@ -245,9 +251,8 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
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,11 +260,23 @@ 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-press-event", func() {
// if not scrolled from now on, we will allow launching apps on button-release-event
beenScrolled = false
})
button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
btnEvent := gdk.EventButtonNewFromEvent(e)
if btnEvent.Button() == 1 {
launch(exec, terminal)
return true
if !beenScrolled {
launch(exec, terminal)
return true
}
} else if btnEvent.Button() == 3 {
pinItem(ID)
return true
@@ -272,6 +289,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
}
@@ -419,6 +481,7 @@ 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 != "" {
if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) {

View File

@@ -20,12 +20,12 @@ func watchFiles() {
defer watcher.Close()
if err := watcher.Add(pinnedFile); err != nil {
log.Errorf("ERROR", err)
log.Errorf("ERROR: %s", err)
}
for _, fp := range appDirs {
if err := filepath.Walk(fp, watchDir); err != nil {
log.Errorf("ERROR", err)
log.Errorf("ERROR: %s", err)
}
}
@@ -41,11 +41,13 @@ func watchFiles() {
event.Op.String() == "RENAME") {
desktopTrigger = true
} else if event.Name == pinnedFile {
pinnedTrigger = true
// TODO: This can be used to propagate information about the changed file to the
// GUI to avoid recreating everything
pinnedItemsChanged <- struct{}{}
}
case err := <-watcher.Errors:
log.Errorf("ERROR", err)
log.Errorf("ERROR: %s", err)
}
}
}()

View File

@@ -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)
}