Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add keyboard mode flag to support both: "on-demand" & "exclusive" GTK layer-shell modes #95

Merged
merged 6 commits into from
Jul 27, 2023
Merged

Add keyboard mode flag to support both: "on-demand" & "exclusive" GTK layer-shell modes #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37c9c2d
Add --keyboard/-k flag to set GTK layer shell keyboard mode (default:…
trinitronx Jul 24, 2023
f85356b
Drop keyboard mode: 'none' b/c it doesn't make sense with this app to…
trinitronx Jul 24, 2023
d88d979
Document --keyboard/-k flag in README
trinitronx Jul 24, 2023
6bbfbea
Handle empty string passed to --keyboard/-k flag
trinitronx Jul 24, 2023
aeeb4e4
Fix warn messages for short -k flag
trinitronx Jul 24, 2023
830edef
Refactor -k flag as Bool to toggle keyboard mode on-demand / exclusive
trinitronx Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ Usage of nwg-drawer:
GTK theme name, eg. "Adwaita-dark"
-is int
Icon Size (default 64)
-k
Set GTK layer shell keyboard interactivity to "on-demand" mode (default "exclusive")
-lang string
force lang, e.g. "en", "pl"
-nocats
Expand Down
10 changes: 9 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ func defaultStringIfBlank(s, fallback string) string {
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 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")
Expand Down Expand Up @@ -386,7 +387,14 @@ func main() {
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_RIGHT, *marginRight)
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_BOTTOM, *marginBottom)

layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
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() {
Expand Down