i3-mousedrag: sync some bits with i3
This commit is contained in:
sthen
parent
f23cf92dca
commit
b75132b3fe
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.8 2021/02/09 11:52:48 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.9 2021/02/12 23:14:30 sthen Exp $
|
||||
|
||||
# see https://github.com/i3/i3/issues/3085 / orestisfl:issue-2643
|
||||
COMMENT= improved dynamic tiling window manager, fork with mouse drag
|
||||
@ -8,6 +8,7 @@ GH_PROJECT= i3
|
||||
GH_COMMIT= 1b0585ddf8f2e2206effbd106cb028cac6ffe6d9
|
||||
|
||||
DISTNAME= i3-mousedrag-4.19.1pl20210102
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= x11
|
||||
|
||||
@ -27,9 +28,6 @@ COMPILER_LANGS= c
|
||||
|
||||
DEBUG_PACKAGES= ${BUILD_PACKAGES}
|
||||
|
||||
BUILD_DEPENDS= textproc/asciidoc \
|
||||
textproc/xmlto
|
||||
|
||||
LIB_DEPENDS= devel/libev \
|
||||
devel/libyajl>=2.0.0 \
|
||||
devel/pango \
|
||||
@ -47,12 +45,15 @@ NO_TEST= Yes
|
||||
|
||||
MODULES= devel/meson
|
||||
|
||||
# needed for git builds, possibly not release builds
|
||||
CONFIGURE_ARGS= -Dmans=true \
|
||||
-Ddocs=true
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
|
||||
|
||||
# only needed for git builds; release builds use pre-generated docs
|
||||
CONFIGURE_ARGS= -Dmans=true \
|
||||
-Ddocs=true
|
||||
BUILD_DEPENDS= textproc/asciidoc \
|
||||
textproc/xmlto
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/etc/config \
|
||||
${WRKSRC}/etc/config.keycodes \
|
||||
|
||||
@ -1,8 +1,34 @@
|
||||
$OpenBSD: patch-etc_config,v 1.3 2021/02/03 14:24:57 sthen Exp $
|
||||
$OpenBSD: patch-etc_config,v 1.4 2021/02/12 23:14:30 sthen Exp $
|
||||
|
||||
Index: etc/config
|
||||
--- etc/config.orig
|
||||
+++ etc/config
|
||||
@@ -22,18 +22,18 @@ 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.
|
||||
-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
|
||||
+#set $refresh_i3status pkill -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
|
||||
|
||||
# use these keys for focus, movement, and resize directions when reaching for
|
||||
# the arrows is not convenient
|
||||
@@ -46,13 +46,13 @@ set $right semicolon
|
||||
floating_modifier Mod1
|
||||
|
||||
@ -17,5 +43,5 @@ Index: etc/config
|
||||
-bindsym Mod1+d exec --no-startup-id dmenu_run
|
||||
+bindsym Mod1+d exec --no-startup-id ${LOCALBASE}/bin/dmenu_run
|
||||
# A more modern dmenu replacement is rofi:
|
||||
# bindsym Mod1+d exec rofi -modi drun,run -show drun
|
||||
# bindsym Mod1+d exec "rofi -modi drun,run -show drun"
|
||||
# There also is i3-dmenu-desktop which only displays applications shipping a
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-etc_config_keycodes,v 1.3 2021/02/03 14:24:57 sthen Exp $
|
||||
$OpenBSD: patch-etc_config_keycodes,v 1.4 2021/02/12 23:14:30 sthen Exp $
|
||||
|
||||
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
|
||||
different between Linux and OpenBSD.
|
||||
@ -6,7 +6,31 @@ different between Linux and OpenBSD.
|
||||
Index: etc/config.keycodes
|
||||
--- etc/config.keycodes.orig
|
||||
+++ etc/config.keycodes
|
||||
@@ -40,13 +40,13 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl se
|
||||
@@ -23,30 +23,30 @@ 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.
|
||||
-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
|
||||
+#set $refresh_i3status pkill -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
|
||||
|
||||
# Use Mouse+$mod to drag floating windows to their wanted position
|
||||
floating_modifier $mod
|
||||
|
||||
# start a terminal
|
||||
@ -20,7 +44,7 @@ Index: etc/config.keycodes
|
||||
-bindcode $mod+40 exec --no-startup-id dmenu_run
|
||||
+bindcode $mod+40 exec --no-startup-id ${LOCALBASE}/bin/dmenu_run
|
||||
# A more modern dmenu replacement is rofi:
|
||||
# bindcode $mod+40 exec rofi -modi drun,run -show drun
|
||||
# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
|
||||
# There also is i3-dmenu-desktop which only displays applications shipping a
|
||||
@@ -60,10 +60,10 @@ bindcode $mod+46 focus up
|
||||
bindcode $mod+47 focus right
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user