i3: improve default config

- do not attempt to start networkmanager etc
- make volume buttons useful on netbsd

bump PKGREVISION

4 files changed, 81 insertions, 3 deletions

diff --git a/wm/i3/Makefile b/wm/i3/Makefile
index 56d8fd9a277..cfd0d62776e 100644
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2020/08/31 18:12:29 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2020/09/25 12:35:47 nia Exp $
 
 DISTNAME=	i3-4.18.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm
 MASTER_SITES=	https://i3wm.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/i3/distinfo b/wm/i3/distinfo
index 100b0103214..67d4f3ee23b 100644
--- a/wm/i3/distinfo
+++ b/wm/i3/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.18 2020/08/08 22:02:37 nia Exp $
+$NetBSD: distinfo,v 1.19 2020/09/25 12:35:47 nia Exp $
 
 SHA1 (i3-4.18.2.tar.bz2) = f31ca8fb7f23ccc8f8a331a948ec223769e688e1
 RMD160 (i3-4.18.2.tar.bz2) = 08315c629d42dc40340d3039a9c7bfb48f01071f
 SHA512 (i3-4.18.2.tar.bz2) = 997c7cdf32f95ba25cfcd483a09f7e37e5219e4501baefa5c1865ddffd206bc9725211e4082663fab4174dc947b663ff454d343a7e30340ac3ea451f999417fc
 Size (i3-4.18.2.tar.bz2) = 1218440 bytes
 SHA1 (patch-Makefile.in) = 9908543534c88946dd8a430cd208814cae0a03a1
+SHA1 (patch-etc_config) = 6f2cbf0005219c236fdedf38addf296515c1feb2
+SHA1 (patch-etc_config.keycodes) = b3eeac13d118e823809f997ce05725ad0d0188a5
 SHA1 (patch-src_log.c) = 776031960fc912477f88a943ba99d6128e76c330
 SHA1 (patch-src_main.c) = ee24742f40126f3b4f1c3e145ad19d97a05c2384
diff --git a/wm/i3/patches/patch-etc_config b/wm/i3/patches/patch-etc_config
new file mode 100644
index 00000000000..0f3a25614b4
--- /dev/null
+++ b/wm/i3/patches/patch-etc_config
@@ -0,0 +1,38 @@
+$NetBSD: patch-etc_config,v 1.1 2020/09/25 12:35:48 nia Exp $
+
+Useful default volume controls for NetBSD.
+
+--- etc/config.orig	2020-07-26 08:11:37.000000000 +0000
++++ etc/config
+@@ -22,18 +22,24 @@ font pango:monospace 8
+ 
+ # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
+ # screen before suspend. Use loginctl lock-session to lock your screen.
+-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
++#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+ 
+ # NetworkManager is the most popular way to manage wireless networks on Linux,
+ # and nm-applet is a desktop environment-independent system tray GUI for it.
+-exec --no-startup-id nm-applet
++#exec --no-startup-id nm-applet
+ 
+-# Use pactl to adjust volume in PulseAudio.
++# Use mixerctl to adjust volume in NetBSD.
+ set $refresh_i3status killall -SIGUSR1 i3status
+-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
++bindsym XF86AudioRaiseVolume exec --no-startup-id mixerctl -w outputs.master+=15 && $refresh_i3status
++bindsym XF86AudioLowerVolume exec --no-startup-id mixerctl -w outputs.master-=15 && $refresh_i3status
++bindsym XF86AudioMute exec --no-startup-id mixerctl -w outputs.master=0 && $refresh_i3status
++bindsym XF86AudioMicMute exec --no-startup-id mixerctl -w inputs.reclevel=0 && $refresh_i3status
++
++# Use pactl to adjust volume in PulseAudio.
++#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
++#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
++#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
++#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+ 
+ # use these keys for focus, movement, and resize directions when reaching for
+ # the arrows is not convenient
diff --git a/wm/i3/patches/patch-etc_config.keycodes b/wm/i3/patches/patch-etc_config.keycodes
new file mode 100644
index 00000000000..965e9bb2771
--- /dev/null
+++ b/wm/i3/patches/patch-etc_config.keycodes
@@ -0,0 +1,38 @@
+$NetBSD: patch-etc_config.keycodes,v 1.1 2020/09/25 12:35:48 nia Exp $
+
+Useful default volume controls for NetBSD.
+
+--- etc/config.keycodes.orig	2020-07-26 08:11:37.000000000 +0000
++++ etc/config.keycodes
+@@ -23,18 +23,24 @@ font pango:monospace 8
+ 
+ # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
+ # screen before suspend. Use loginctl lock-session to lock your screen.
+-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
++#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+ 
+ # NetworkManager is the most popular way to manage wireless networks on Linux,
+ # and nm-applet is a desktop environment-independent system tray GUI for it.
+-exec --no-startup-id nm-applet
++#exec --no-startup-id nm-applet
+ 
+-# Use pactl to adjust volume in PulseAudio.
++# Use mixerctl to adjust volume in NetBSD.
+ set $refresh_i3status killall -SIGUSR1 i3status
+-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
++bindsym XF86AudioRaiseVolume exec --no-startup-id mixerctl -w outputs.master+=5 && $refresh_i3status
++bindsym XF86AudioLowerVolume exec --no-startup-id mixerctl -w outputs.master-=5 && $refresh_i3status
++bindsym XF86AudioMute exec --no-startup-id mixerctl -w outputs.master=0 && $refresh_i3status
++bindsym XF86AudioMicMute exec --no-startup-id mixerctl -w inputs.reclevel=0 && $refresh_i3status
++
++# Use pactl to adjust volume in PulseAudio.
++#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
++#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
++#bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
++#bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+ 
+ # Use Mouse+$mod to drag floating windows to their wanted position
+ floating_modifier $mod