diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/.config/sway/config | 3 | ||||
| -rwxr-xr-x | home/.config/sway/display-toggle.sh | 29 |
2 files changed, 4 insertions, 28 deletions
diff --git a/home/.config/sway/config b/home/.config/sway/config index 854cb39..bbd2eb0 100644 --- a/home/.config/sway/config +++ b/home/.config/sway/config @@ -42,7 +42,6 @@ output * bg #282828 solid_color for_window [class="feh"] floating enable for_window [app_id="imv"] floating enable for_window [class="Tor Browser"] floating enable -for_window [app_id="at.yrlf.wl_mirror"] fullscreen enable # ── Standard keybinds (sway defaults) ───────────────────────────────────────── bindsym $mod+Return exec $term @@ -144,7 +143,7 @@ bindsym $mod+n exec makoctl dismiss bindsym $mod+Shift+n exec makoctl dismiss --all # Display mode switching -bindsym F7 exec ~/.config/sway/display-toggle.sh +bindsym --no-repeat F7 exec ~/.config/sway/display-toggle.sh # ── Bar ─────────────────────────────────────────────────────────────────────── bar { diff --git a/home/.config/sway/display-toggle.sh b/home/.config/sway/display-toggle.sh index a3a11e7..f39bf9b 100755 --- a/home/.config/sway/display-toggle.sh +++ b/home/.config/sway/display-toggle.sh @@ -1,10 +1,8 @@ #!/bin/sh -# Cycle display mode: laptop-off → side-by-side → mirror -# Usage: display-toggle.sh [init] +# Toggle display mode: laptop-off ↔ side-by-side # Bound to F7 in sway config; also runs at startup with "init" STATE_FILE="${XDG_RUNTIME_DIR:-/tmp}/display-mode" -MIRROR_PID="${XDG_RUNTIME_DIR:-/tmp}/wl-mirror.pid" OUTPUTS=$(swaymsg -t get_outputs -r) LAPTOP=$(echo "$OUTPUTS" | jq -r '[.[] | select(.name | test("^eDP")) | .name] | first // empty') @@ -15,43 +13,22 @@ if [ -z "$EXTERNAL" ]; then exit 0 fi -if [ -z "$LAPTOP" ]; then - exit 0 -fi - -# Stop any running wl-mirror -if [ -f "$MIRROR_PID" ]; then - kill "$(cat "$MIRROR_PID")" 2>/dev/null || true - rm -f "$MIRROR_PID" -fi +[ -z "$LAPTOP" ] && exit 0 -LAPTOP_WIDTH=$(echo "$OUTPUTS" | jq -r ".[] | select(.name == \"$LAPTOP\") | .current_mode.width") +LAPTOP_WIDTH=$(echo "$OUTPUTS" | jq -r ".[] | select(.name == \"$LAPTOP\") | .current_mode.width // .modes[0].width") [ -z "$LAPTOP_WIDTH" ] && LAPTOP_WIDTH=1920 -# On init, go straight to laptop-off; otherwise cycle if [ "$1" = "init" ]; then NEXT="laptop-off" else CURRENT=$(cat "$STATE_FILE" 2>/dev/null || echo "laptop-off") case "$CURRENT" in laptop-off) NEXT="side-by-side" ;; - side-by-side) NEXT="mirror" ;; *) NEXT="laptop-off" ;; esac fi case "$NEXT" in - mirror) - swaymsg output "$LAPTOP" enable || true - swaymsg output "$EXTERNAL" enable || true - swaymsg focus output "$EXTERNAL" || true - wl-mirror "$LAPTOP" & - echo $! > "$MIRROR_PID" - sleep 0.3 - swaymsg focus output "$LAPTOP" || true - echo "mirror" > "$STATE_FILE" - [ -z "$1" ] && notify-send "Display" "Mirror mode" - ;; laptop-off) swaymsg output "$LAPTOP" disable || true swaymsg output "$EXTERNAL" enable || true |