diff options
| -rwxr-xr-x | bin/gnome-move-windows | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/bin/gnome-move-windows b/bin/gnome-move-windows index 4611759..705f1a7 100755 --- a/bin/gnome-move-windows +++ b/bin/gnome-move-windows @@ -2,10 +2,9 @@ # Move windows according to my workflow. Check bin/gnome-set-config to # see its key-binding. # -# GNOME on Wayland does not expose native windows to wmctrl. Prefer the -# Workspace Router GNOME Shell extension, which runs inside Shell and can -# see both Wayland and Xwayland windows. Fall back to wmctrl for sessions -# where the extension is unavailable. +# Prefer the Workspace Router GNOME Shell extension, which runs inside Shell +# and can see both Wayland and Xwayland windows. Fall back to wmctrl when the +# extension is unavailable. workspace_router_call() { method="$1" @@ -19,12 +18,6 @@ workspace_router_call() { --method "name.rbenencia.WorkspaceRouter.$method" } -is_x11_session() { - [ "${XDG_SESSION_TYPE:-}" = "x11" ] || { - [ -n "${DISPLAY:-}" ] && [ -z "${WAYLAND_DISPLAY:-}" ] - } -} - is_wayland_session() { [ "${XDG_SESSION_TYPE:-}" = "wayland" ] || [ -n "${WAYLAND_DISPLAY:-}" ] } @@ -58,7 +51,7 @@ print_diagnostics() { warn_wayland_fallback() { echo "gnome-move-windows: Workspace Router is unavailable on Wayland; falling back to wmctrl, which only sees some windows" >&2 - echo "gnome-move-windows: Run 'gnome-move-windows --diagnose' and ensure the workspace-router-cli GNOME extension is enabled" >&2 + echo "gnome-move-windows: Run 'gnome-move-windows --diagnose' and ensure the Workspace Router GNOME extension is enabled" >&2 } case "$1" in @@ -72,7 +65,7 @@ case "$1" in ;; esac -if [ -z "$GNOME_MOVE_WINDOWS_FORCE_WMCTRL" ] && ! is_x11_session; then +if [ -z "$GNOME_MOVE_WINDOWS_FORCE_WMCTRL" ]; then if workspace_router_call RouteWindows >/dev/null 2>&1; then exit 0 fi |