Happy new year 2025!

Fix some grammatical issues in documentation
PR #5722 <https://github.com/Genymobile/scrcpy/pull/5722> Signed-off-by: Romain Vimont <rom@rom1v.com>
2025-01-01 15:01:18 +01:00 · 2025-01-01 14:59:11 +01:00 · 2024-12-19 18:34:20 +01:00 · 2024-12-17 13:09:24 +01:00 · 2024-12-17 12:24:50 +01:00 · 2024-12-17 12:21:57 +01:00
75 changed files with 912 additions and 440 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -42,10 +42,10 @@ jobs:
          distribution: 'zulu'
          java-version: '17'

-      - name: Build scrcpy-server
+      - name: Build
        run: release/build_server.sh

-      - name: Upload scrcpy-server artifact
+      - name: Upload artifact
        uses: actions/upload-artifact@v4
        with:
          name: scrcpy-server
@ -63,7 +63,7 @@ jobs:
          distribution: 'zulu'
          java-version: '17'

-      - name: Build scrcpy-server without gradle
+      - name: Build without gradle
        run: server/build_without_gradle.sh

  test-client:
@ -74,7 +74,6 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@ -83,36 +82,44 @@ jobs:
      - name: Test
        run: release/test_client.sh

-  build-linux:
+  build-linux-x86_64:
    runs-on: ubuntu-latest
    steps:
+      - name: Check architecture
+        run: |
+            arch=$(uname -m)
+            if [[ "$arch" != x86_64 ]]
+            then
+                echo "Unexpected architecture: $arch" >&2
+                exit 1
+            fi
+
      - name: Checkout code
        uses: actions/checkout@v4

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             libv4l-dev

-      - name: Build linux
-        run: release/build_linux.sh
+      - name: Build
+        run: release/build_linux.sh x86_64

      # upload-artifact does not preserve permissions
      - name: Tar
        run: |
-            cd release/work/build-linux
+            cd release/work/build-linux-x86_64
            mkdir dist-tar
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload build-linux artifact
+      - name: Upload artifact
        uses: actions/upload-artifact@v4
        with:
-          name: build-linux-intermediate
-          path: release/work/build-linux/dist-tar/
+          name: build-linux-x86_64-intermediate
+          path: release/work/build-linux-x86_64/dist-tar/

  build-win32:
    runs-on: ubuntu-latest
@ -122,7 +129,6 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@ -131,7 +137,7 @@ jobs:
      - name: Workaround for old meson version run by Github Actions
        run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt

-      - name: Build win32
+      - name: Build
        run: release/build_windows.sh 32

      # upload-artifact does not preserve permissions
@ -142,7 +148,7 @@ jobs:
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload build-win32 artifact
+      - name: Upload artifact
        uses: actions/upload-artifact@v4
        with:
          name: build-win32-intermediate
@ -156,7 +162,6 @@ jobs:

      - name: Install dependencies
        run: |
-          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@ -165,7 +170,7 @@ jobs:
      - name: Workaround for old meson version run by Github Actions
        run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt

-      - name: Build win64
+      - name: Build
        run: release/build_windows.sh 64

      # upload-artifact does not preserve permissions
@ -176,15 +181,24 @@ jobs:
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload build-win64 artifact
+      - name: Upload artifact
        uses: actions/upload-artifact@v4
        with:
          name: build-win64-intermediate
          path: release/work/build-win64/dist-tar/

-  build-macos:
+  build-macos-aarch64:
    runs-on: macos-latest
    steps:
+      - name: Check architecture
+        run: |
+            arch=$(uname -m)
+            if [[ "$arch" != arm64 ]]
+            then
+                echo "Unexpected architecture: $arch" >&2
+                exit 1
+            fi
+
      - name: Checkout code
        uses: actions/checkout@v4

@ -193,27 +207,63 @@ jobs:
            brew install meson ninja nasm libiconv zlib automake autoconf \
                libtool

-      - name: Build macOS
-        run: release/build_macos.sh
+      - name: Build
+        run: release/build_macos.sh aarch64

      # upload-artifact does not preserve permissions
      - name: Tar
        run: |
-            cd release/work/build-macos
+            cd release/work/build-macos-aarch64
            mkdir dist-tar
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload build-macos artifact
+      - name: Upload artifact
        uses: actions/upload-artifact@v4
        with:
-          name: build-macos-intermediate
-          path: release/work/build-macos/dist-tar/
+          name: build-macos-aarch64-intermediate
+          path: release/work/build-macos-aarch64/dist-tar/

-  package-linux:
+  build-macos-x86_64:
+    runs-on: macos-13
+    steps:
+      - name: Check architecture
+        run: |
+            arch=$(uname -m)
+            if [[ "$arch" != x86_64 ]]
+            then
+                echo "Unexpected architecture: $arch" >&2
+                exit 1
+            fi
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: brew install meson ninja nasm libiconv zlib automake
+             # autoconf and libtool are already installed on macos-13
+
+      - name: Build
+        run: release/build_macos.sh x86_64
+
+      # upload-artifact does not preserve permissions
+      - name: Tar
+        run: |
+            cd release/work/build-macos-x86_64
+            mkdir dist-tar
+            cd dist-tar
+            tar -C .. -cvf dist.tar.gz dist/
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-macos-x86_64-intermediate
+          path: release/work/build-macos-x86_64/dist-tar/
+
+  package-linux-x86_64:
    needs:
      - build-scrcpy-server
-      - build-linux
+      - build-linux-x86_64
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -225,25 +275,25 @@ jobs:
          name: scrcpy-server
          path: release/work/build-server/server/

-      - name: Download build-linux
+      - name: Download build-linux-x86_64
        uses: actions/download-artifact@v4
        with:
-          name: build-linux-intermediate
-          path: release/work/build-linux/dist-tar/
+          name: build-linux-x86_64-intermediate
+          path: release/work/build-linux-x86_64/dist-tar/

      # upload-artifact does not preserve permissions
      - name: Detar
        run: |
-            cd release/work/build-linux
+            cd release/work/build-linux-x86_64
            tar xf dist-tar/dist.tar.gz

-      - name: Package linux
-        run: release/package_client.sh linux tar.gz
+      - name: Package
+        run: release/package_client.sh linux-x86_64 tar.gz

-      - name: Upload linux release
+      - name: Upload release
        uses: actions/upload-artifact@v4
        with:
-          name: release-linux
+          name: release-linux-x86_64
          path: release/output/

  package-win32:
@ -273,10 +323,10 @@ jobs:
            cd release/work/build-win32
            tar xf dist-tar/dist.tar.gz

-      - name: Package win32
+      - name: Package
        run: release/package_client.sh win32 zip

-      - name: Upload win32 release
+      - name: Upload release
        uses: actions/upload-artifact@v4
        with:
          name: release-win32
@ -309,19 +359,55 @@ jobs:
            cd release/work/build-win64
            tar xf dist-tar/dist.tar.gz

-      - name: Package win64
+      - name: Package
        run: release/package_client.sh win64 zip

-      - name: Upload win64 release
+      - name: Upload release
        uses: actions/upload-artifact@v4
        with:
          name: release-win64
          path: release/output

-  package-macos:
+  package-macos-aarch64:
    needs:
      - build-scrcpy-server
-      - build-macos
+      - build-macos-aarch64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download scrcpy-server
+        uses: actions/download-artifact@v4
+        with:
+          name: scrcpy-server
+          path: release/work/build-server/server/
+
+      - name: Download build-macos-aarch64
+        uses: actions/download-artifact@v4
+        with:
+          name: build-macos-aarch64-intermediate
+          path: release/work/build-macos-aarch64/dist-tar/
+
+      # upload-artifact does not preserve permissions
+      - name: Detar
+        run: |
+            cd release/work/build-macos-aarch64
+            tar xf dist-tar/dist.tar.gz
+
+      - name: Package
+        run: release/package_client.sh macos-aarch64 tar.gz
+
+      - name: Upload release
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-macos-aarch64
+          path: release/output/
+
+  package-macos-x86_64:
+    needs:
+      - build-scrcpy-server
+      - build-macos-x86_64
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -336,31 +422,32 @@ jobs:
      - name: Download build-macos
        uses: actions/download-artifact@v4
        with:
-          name: build-macos-intermediate
-          path: release/work/build-macos/dist-tar/
+          name: build-macos-x86_64-intermediate
+          path: release/work/build-macos-x86_64/dist-tar/

      # upload-artifact does not preserve permissions
      - name: Detar
        run: |
-            cd release/work/build-macos
+            cd release/work/build-macos-x86_64
            tar xf dist-tar/dist.tar.gz

-      - name: Package macos
-        run: release/package_client.sh macos tar.gz
+      - name: Package
+        run: release/package_client.sh macos-x86_64 tar.gz

-      - name: Upload macos release
+      - name: Upload release
        uses: actions/upload-artifact@v4
        with:
-          name: release-macos
+          name: release-macos-x86_64
          path: release/output/

  release:
    needs:
      - build-scrcpy-server
-      - package-linux
+      - package-linux-x86_64
      - package-win32
      - package-win64
-      - package-macos
+      - package-macos-aarch64
+      - package-macos-x86_64
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -372,10 +459,10 @@ jobs:
          name: scrcpy-server
          path: release/work/build-server/server/

-      - name: Download release-linux
+      - name: Download release-linux-x86_64
        uses: actions/download-artifact@v4
        with:
-          name: release-linux
+          name: release-linux-x86_64
          path: release/output/

      - name: Download release-win32
@ -390,10 +477,16 @@ jobs:
          name: release-win64
          path: release/output/

-      - name: Download release-macos
+      - name: Download release-macos-aarch64
        uses: actions/download-artifact@v4
        with:
-          name: release-macos
+          name: release-macos-aarch64
+          path: release/output/
+
+      - name: Download release-macos-x86_64
+        uses: actions/download-artifact@v4
+        with:
+          name: release-macos-x86_64
          path: release/output/

      - name: Package server
--- a/2
+++ b/2
@ -188,7 +188,7 @@
      identification within third-party archives.

   Copyright (C) 2018 Genymobile
-   Copyright (C) 2018-2024 Romain Vimont
+   Copyright (C) 2018-2025 Romain Vimont

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@
 source for the project. Do not download releases from random websites, even if
 their name contains `scrcpy`.**

-# scrcpy (v3.0)
+# scrcpy (v3.1)

 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />

@ -78,6 +78,16 @@ Note that USB debugging is not required to run scrcpy in [OTG mode](doc/otg.md).
 - [macOS](doc/macos.md)


+## Must-know tips
+
+ - [Reducing resolution](doc/video.md#size) may greatly improve performance
+   (`scrcpy -m1024`)
+ - [_Right-click_](doc/mouse.md#mouse-bindings) triggers `BACK`
+ - [_Middle-click_](doc/mouse.md#mouse-bindings) triggers `HOME`
+ - <kbd>Alt</kbd>+<kbd>f</kbd> toggles [fullscreen](doc/window.md#fullscreen)
+ - There are many other [shortcuts](doc/shortcuts.md)
+
+
 ## Usage examples

 There are a lot of options, [documented](#user-documentation) in separate pages.
@ -141,7 +151,7 @@ documented in the following pages:
 - [Device](doc/device.md)
 - [Window](doc/window.md)
 - [Recording](doc/recording.md)
- - [Virtual display](doc/virtual_displays.md)
+ - [Virtual display](doc/virtual_display.md)
 - [Tunnels](doc/tunnels.md)
 - [OTG](doc/otg.md)
 - [Camera](doc/camera.md)
@ -181,6 +191,7 @@ to your problem immediately.
 You can also use:

 - Reddit: [`r/scrcpy`](https://www.reddit.com/r/scrcpy)
+ - BlueSky: [`@scrcpy.bsky.social`](https://bsky.app/profile/scrcpy.bsky.social)
 - Twitter: [`@scrcpy_app`](https://twitter.com/scrcpy_app)


@ -199,7 +210,7 @@ work][donate]:
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2024 Romain Vimont
+    Copyright (C) 2018-2025 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@ -57,6 +57,7 @@ _scrcpy() {
        --no-mipmaps
        --no-mouse-hover
        --no-power-on
+        --no-vd-destroy-content
        --no-vd-system-decorations
        --no-video
        --no-video-playback
--- a/app/data/scrcpy_static_wrapper.sh
+++ b/app/data/scrcpy_static_wrapper.sh
@ -1,6 +0,0 @@
-#!/bin/bash
-cd "$(dirname ${BASH_SOURCE[0]})"
-export ADB="${ADB:-./adb}"
-export SCRCPY_SERVER_PATH="${SCRCPY_SERVER_PATH:-./scrcpy-server}"
-export SCRCPY_ICON_PATH="${SCRCPY_ICON_PATH:-./icon.png}"
-./scrcpy_bin "$@"
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@ -63,6 +63,7 @@ arguments=(
    '--no-mipmaps[Disable the generation of mipmaps]'
    '--no-mouse-hover[Do not forward mouse hover events]'
    '--no-power-on[Do not power on the device on start]'
+    '--no-vd-destroy-content[Disable virtual display "destroy content on removal" flag]'
    '--no-vd-system-decorations[Disable virtual display system decorations flag]'
    '--no-video[Disable video forwarding]'
    '--no-video-playback[Disable video playback]'
--- a/app/deps/dav1d.sh
+++ b/app/deps/dav1d.sh
@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+set -ex
+DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
+cd "$DEPS_DIR"
+. common
+process_args "$@"
+
+VERSION=1.5.0
+FILENAME=dav1d-$VERSION.tar.gz
+PROJECT_DIR=dav1d-$VERSION
+SHA256SUM=78b15d9954b513ea92d27f39362535ded2243e1b0924fde39f37a31ebed5f76b
+
+cd "$SOURCES_DIR"
+
+if [[ -d "$PROJECT_DIR" ]]
+then
+    echo "$PWD/$PROJECT_DIR" found
+else
+    get_file "https://code.videolan.org/videolan/dav1d/-/archive/$VERSION/$FILENAME" "$FILENAME" "$SHA256SUM"
+    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
+fi
+
+mkdir -p "$BUILD_DIR/$PROJECT_DIR"
+cd "$BUILD_DIR/$PROJECT_DIR"
+
+if [[ -d "$DIRNAME" ]]
+then
+    echo "'$PWD/$DIRNAME' already exists, not reconfigured"
+    cd "$DIRNAME"
+else
+    mkdir "$DIRNAME"
+    cd "$DIRNAME"
+
+    conf=(
+        --prefix="$INSTALL_DIR/$DIRNAME"
+        --libdir=lib
+        -Denable_tests=false
+        -Denable_tools=false
+        # Always build dav1d statically
+        --default-library=static
+    )
+
+    if [[ "$BUILD_TYPE" == cross ]]
+    then
+        case "$HOST" in
+            win32)
+                conf+=(
+                    --cross-file="$SOURCES_DIR/$PROJECT_DIR/package/crossfiles/i686-w64-mingw32.meson"
+                )
+                ;;
+
+            win64)
+                conf+=(
+                    --cross-file="$SOURCES_DIR/$PROJECT_DIR/package/crossfiles/x86_64-w64-mingw32.meson"
+                )
+                ;;
+
+            *)
+                echo "Unsupported host: $HOST" >&2
+                exit 1
+        esac
+    fi
+
+    meson setup . "$SOURCES_DIR/$PROJECT_DIR" "${conf[@]}"
+fi
+
+ninja
+ninja install
--- a/app/deps/ffmpeg.sh
+++ b/app/deps/ffmpeg.sh
@ -40,16 +40,14 @@ else
        export LDFLAGS='-static-libgcc -static'
    elif [[ "$HOST" == "macos" ]]
    then
-        export LDFLAGS="$LDFLAGS -L/opt/homebrew/opt/zlib/lib"
-        export CPPFLAGS="$CPPFLAGS -I/opt/homebrew/opt/zlib/include"
-
-        export LDFLAGS="$LDFLAGS-L/opt/homebrew/opt/libiconv/lib"
-        export CPPFLAGS="$CPPFLAGS -I/opt/homebrew/opt/libiconv/include"
        export PKG_CONFIG_PATH="/opt/homebrew/opt/zlib/lib/pkgconfig"
    fi

+    export PKG_CONFIG_PATH="$INSTALL_DIR/$DIRNAME/lib/pkgconfig:$PKG_CONFIG_PATH"
+
    conf=(
        --prefix="$INSTALL_DIR/$DIRNAME"
+        --pkg-config-flags="--static"
        --extra-cflags="-O2 -fPIC"
        --disable-programs
        --disable-doc
@ -62,9 +60,11 @@ else
        --disable-vaapi
        --disable-vdpau
        --enable-swresample
+        --enable-libdav1d
        --enable-decoder=h264
        --enable-decoder=hevc
        --enable-decoder=av1
+        --enable-decoder=libdav1d
        --enable-decoder=pcm_s16le
        --enable-decoder=opus
        --enable-decoder=aac
--- a/app/deps/sdl.sh
+++ b/app/deps/sdl.sh
@ -5,10 +5,10 @@ cd "$DEPS_DIR"
 . common
 process_args "$@"

-VERSION=2.30.9
+VERSION=2.30.10
 FILENAME=SDL-$VERSION.tar.gz
 PROJECT_DIR=SDL-release-$VERSION
-SHA256SUM=682a055004081e37d81a7d4ce546c3ee3ef2e0e6a675ed2651e430ccd14eb407
+SHA256SUM=35a8b9c4f3635d85762b904ac60ca4e0806bff89faeb269caafbe80860d67168

 cd "$SOURCES_DIR"

--- a/app/meson.build
+++ b/app/meson.build
@ -46,6 +46,7 @@ src = [
    'src/util/acksync.c',
    'src/util/audiobuf.c',
    'src/util/average.c',
+    'src/util/env.c',
    'src/util/file.c',
    'src/util/intmap.c',
    'src/util/intr.c',
--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@ -13,7 +13,7 @@ BEGIN
      VALUE "LegalCopyright", "Romain Vimont, Genymobile"
      VALUE "OriginalFilename", "scrcpy.exe"
      VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "3.0"
+      VALUE "ProductVersion", "3.1"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@ -369,6 +369,12 @@ Do not forward mouse hover (mouse motion without any clicks) events.
 .B \-\-no\-power\-on
 Do not power on the device on start.

+.TP
+.B \-\-no\-vd\-destroy\-content
+Disable virtual display "destroy content on removal" flag.
+
+With this option, when the virtual display is closed, the running apps are moved to the main display rather than being destroyed.
+
 .TP
 .B \-\-no\-vd\-system\-decorations
 Disable virtual display system decorations flag.
@ -518,13 +524,15 @@ Enable "show touches" on start, restore the initial value on exit.
 It only shows physical touches (not clicks from scrcpy).

 .TP
-.BI "\-\-tcpip\fR[=\fIip\fR[:\fIport\fR]]
-Configure and reconnect the device over TCP/IP.
+.BI "\-\-tcpip\fR[=[+]\fIip\fR[:\fIport\fR]]
+Configure and connect the device over TCP/IP.

 If a destination address is provided, then scrcpy connects to this address before starting. The device must listen on the given TCP port (default is 5555).

 If no destination address is provided, then scrcpy attempts to find the IP address and adb port of the current device (typically connected over USB), enables TCP/IP mode if necessary, then connects to this address before starting.

+Prefix the address with a '+' to force a reconnection.
+
 .TP
 .BI "\-\-time\-limit " seconds
 Set the maximum mirroring time, in seconds.
@ -821,7 +829,7 @@ Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
 .SH COPYRIGHT
 Copyright \(co 2018 Genymobile <https://www.genymobile.com>

-Copyright \(co 2018\-2024 Romain Vimont <rom@rom1v.com>
+Copyright \(co 2018\-2025 Romain Vimont <rom@rom1v.com>

 Licensed under the Apache License, Version 2.0.

--- a/app/src/adb/adb.c
+++ b/app/src/adb/adb.c
@ -7,6 +7,7 @@

 #include "adb_device.h"
 #include "adb_parser.h"
+#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/process_intr.h"
@ -24,15 +25,45 @@
 */
 #define SC_ADB_COMMAND(...) { sc_adb_get_executable(), __VA_ARGS__, NULL }

-static const char *adb_executable;
+static char *adb_executable;
+
+bool
+sc_adb_init(void) {
+    adb_executable = sc_get_env("ADB");
+    if (adb_executable) {
+        LOGD("Using adb: %s", adb_executable);
+        return true;
+    }
+
+#if !defined(PORTABLE) || defined(_WIN32)
+    adb_executable = strdup("adb");
+    if (!adb_executable) {
+        LOG_OOM();
+        return false;
+    }
+#else
+    // For portable builds, use the absolute path to the adb executable
+    // in the same directory as scrcpy (except on Windows, where "adb"
+    // is sufficient)
+    adb_executable = sc_file_get_local_path("adb");
+    if (!adb_executable) {
+        // Error already logged
+        return false;
+    }
+
+    LOGD("Using adb (portable): %s", adb_executable);
+#endif
+
+    return true;
+}
+
+void
+sc_adb_destroy(void) {
+    free(adb_executable);
+}

 const char *
 sc_adb_get_executable(void) {
-    if (!adb_executable) {
-        adb_executable = getenv("ADB");
-        if (!adb_executable)
-            adb_executable = "adb";
-    }
    return adb_executable;
 }

@ -381,7 +412,7 @@ sc_adb_connect(struct sc_intr *intr, const char *ip_port, unsigned flags) {

    // "adb connect" always returns successfully (with exit code 0), even in
    // case of failure. As a workaround, check if its output starts with
-    // "connected".
+    // "connected" or "already connected".
    char buf[128];
    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
    sc_pipe_close(pout);
@ -398,7 +429,8 @@ sc_adb_connect(struct sc_intr *intr, const char *ip_port, unsigned flags) {
    assert((size_t) r < sizeof(buf));
    buf[r] = '\0';

-    ok = !strncmp("connected", buf, sizeof("connected") - 1);
+    ok = !strncmp("connected", buf, sizeof("connected") - 1)
+        || !strncmp("already connected", buf, sizeof("already connected") - 1);
    if (!ok && !(flags & SC_ADB_NO_STDERR)) {
        // "adb connect" also prints errors to stdout. Since we capture it,
        // re-print the error to stderr.
--- a/app/src/adb/adb.h
+++ b/app/src/adb/adb.h
@ -15,6 +15,12 @@

 #define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)

+bool
+sc_adb_init(void);
+
+void
+sc_adb_destroy(void);
+
 const char *
 sc_adb_get_executable(void);

--- a/app/src/cli.c
+++ b/app/src/cli.c
@ -110,6 +110,7 @@ enum {
    OPT_CAPTURE_ORIENTATION,
    OPT_ANGLE,
    OPT_NO_VD_SYSTEM_DECORATIONS,
+    OPT_NO_VD_DESTROY_CONTENT,
 };

 struct sc_option {
@ -659,6 +660,15 @@ static const struct sc_option options[] = {
        .longopt = "no-power-on",
        .text = "Do not power on the device on start.",
    },
+    {
+        .longopt_id = OPT_NO_VD_DESTROY_CONTENT,
+        .longopt = "no-vd-destroy-content",
+        .text = "Disable virtual display \"destroy content on removal\" "
+                "flag.\n"
+                "With this option, when the virtual display is closed, the "
+                "running apps are moved to the main display rather than being "
+                "destroyed.",
+    },
    {
        .longopt_id = OPT_NO_VD_SYSTEM_DECORATIONS,
        .longopt = "no-vd-system-decorations",
@ -860,16 +870,17 @@ static const struct sc_option options[] = {
    {
        .longopt_id = OPT_TCPIP,
        .longopt = "tcpip",
-        .argdesc = "ip[:port]",
+        .argdesc = "[+]ip[:port]",
        .optional_arg = true,
-        .text = "Configure and reconnect the device over TCP/IP.\n"
+        .text = "Configure and connect the device over TCP/IP.\n"
                "If a destination address is provided, then scrcpy connects to "
                "this address before starting. The device must listen on the "
                "given TCP port (default is 5555).\n"
                "If no destination address is provided, then scrcpy attempts "
                "to find the IP address of the current device (typically "
                "connected over USB), enables TCP/IP mode, then connects to "
-                "this address before starting.",
+                "this address before starting.\n"
+                "Prefix the address with a '+' to force a reconnection.",
    },
    {
        .longopt_id = OPT_TIME_LIMIT,
@ -2704,8 +2715,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_ANGLE:
                opts->angle = optarg;
                break;
+            case OPT_NO_VD_DESTROY_CONTENT:
+                opts->vd_destroy_content = false;
+                break;
            case OPT_NO_VD_SYSTEM_DECORATIONS:
-                opts->vd_system_decorations = optarg;
+                opts->vd_system_decorations = false;
                break;
            default:
                // getopt prints the error message on stderr
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@ -152,8 +152,10 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
            return 2;
        case SC_CONTROL_MSG_TYPE_UHID_CREATE:
            sc_write16be(&buf[1], msg->uhid_create.id);
+            sc_write16be(&buf[3], msg->uhid_create.vendor_id);
+            sc_write16be(&buf[5], msg->uhid_create.product_id);

-            size_t index = 3;
+            size_t index = 7;
            index += write_string_tiny(&buf[index], msg->uhid_create.name, 127);

            sc_write16be(&buf[index], msg->uhid_create.report_desc_size);
@ -278,9 +280,13 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
            // Quote only if name is not null
            const char *name = msg->uhid_create.name;
            const char *quote = name ? "\"" : "";
-            LOG_CMSG("UHID create [%" PRIu16 "] name=%s%s%s "
-                     "report_desc_size=%" PRIu16, msg->uhid_create.id,
-                     quote, name, quote, msg->uhid_create.report_desc_size);
+            LOG_CMSG("UHID create [%" PRIu16 "] %04" PRIx16 ":%04" PRIx16
+                     " name=%s%s%s report_desc_size=%" PRIu16,
+                     msg->uhid_create.id,
+                     msg->uhid_create.vendor_id,
+                     msg->uhid_create.product_id,
+                     quote, name, quote,
+                     msg->uhid_create.report_desc_size);
            break;
        }
        case SC_CONTROL_MSG_TYPE_UHID_INPUT: {
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@ -94,6 +94,8 @@ struct sc_control_msg {
        } set_display_power;
        struct {
            uint16_t id;
+            uint16_t vendor_id;
+            uint16_t product_id;
            const char *name; // pointer to static data
            uint16_t report_desc_size;
            const uint8_t *report_desc; // pointer to static data
--- a/app/src/hid/hid_event.h
+++ b/app/src/hid/hid_event.h
@ -15,7 +15,6 @@ struct sc_hid_input {

 struct sc_hid_open {
    uint16_t hid_id;
-    const char *name; // pointer to static memory
    const uint8_t *report_desc; // pointer to static memory
    size_t report_desc_size;
 };
--- a/app/src/hid/hid_gamepad.c
+++ b/app/src/hid/hid_gamepad.c
@ -52,10 +52,10 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
    0x09, 0x30,
    // Usage (Y)   Left stick y
    0x09, 0x31,
-    // Usage (Z)   Right stick x
-    0x09, 0x32,
-    // Usage (Rz)  Right stick y
-    0x09, 0x35,
+    // Usage (Rx)  Right stick x
+    0x09, 0x33,
+    // Usage (Ry)  Right stick y
+    0x09, 0x34,
    // Logical Minimum (0)
    0x15, 0x00,
    // Logical Maximum (65535)
@ -65,15 +65,15 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
    0x75, 0x10,
    // Report Count (4)
    0x95, 0x04,
-    // Input (Data, Variable, Absolute): 4 bytes (X, Y, Z, Rz)
+    // Input (Data, Variable, Absolute): 4x2 bytes (X, Y, Z, Rz)
    0x81, 0x02,

-    // Usage Page (Simulation Controls)
-    0x05, 0x02,
-    // Usage (Brake)
-    0x09, 0xC5,
-    // Usage (Accelerator)
-    0x09, 0xC4,
+    // Usage Page (Generic Desktop)
+    0x05, 0x01,
+    // Usage (Z)
+    0x09, 0x32,
+    // Usage (Rz)
+    0x09, 0x35,
    // Logical Minimum (0)
    0x15, 0x00,
    // Logical Maximum (32767)
@ -82,7 +82,7 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
    0x75, 0x10,
    // Report Count (2)
    0x95, 0x02,
-    // Input (Data, Variable, Absolute): 2 bytes (L2, R2)
+    // Input (Data, Variable, Absolute): 2x2 bytes (L2, R2)
    0x81, 0x02,

    // Usage Page (Buttons)
@ -182,7 +182,7 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
 *                     `------------- SC_GAMEPAD_BUTTON_RIGHT_STICK
 *
 *                  +---------------+
- *        byte 14:  |0 0 0 . . . . .| hat switch (dpad) position (0-8)
+ *        byte 14:  |0 0 0 0 . . . .| hat switch (dpad) position (0-8)
 *                  +---------------+
 *                     9 possible positions and their values:
 *                             8 1 2
@ -191,16 +191,19 @@ static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
 *                     (8 is top-left, 1 is top, 2 is top-right, etc.)
 */

+// [-32768 to 32767] -> [0 to 65535]
+#define AXIS_RESCALE(V) (uint16_t) (((int32_t) V) + 0x8000)
+
 static void
 sc_hid_gamepad_slot_init(struct sc_hid_gamepad_slot *slot,
                         uint32_t gamepad_id) {
    assert(gamepad_id != SC_GAMEPAD_ID_INVALID);
    slot->gamepad_id = gamepad_id;
    slot->buttons = 0;
-    slot->axis_left_x = 0;
-    slot->axis_left_y = 0;
-    slot->axis_right_x = 0;
-    slot->axis_right_y = 0;
+    slot->axis_left_x = AXIS_RESCALE(0);
+    slot->axis_left_y = AXIS_RESCALE(0);
+    slot->axis_right_x = AXIS_RESCALE(0);
+    slot->axis_right_y = AXIS_RESCALE(0);
    slot->axis_left_trigger = 0;
    slot->axis_right_trigger = 0;
 }
@ -243,14 +246,8 @@ sc_hid_gamepad_generate_open(struct sc_hid_gamepad *hid,

    sc_hid_gamepad_slot_init(&hid->slots[slot_idx], gamepad_id);

-    SDL_GameController* game_controller =
-        SDL_GameControllerFromInstanceID(gamepad_id);
-    assert(game_controller);
-    const char *name = SDL_GameControllerName(game_controller);
-
    uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
    hid_open->hid_id = hid_id;
-    hid_open->name = name;
    hid_open->report_desc = SC_HID_GAMEPAD_REPORT_DESC;
    hid_open->report_desc_size = sizeof(SC_HID_GAMEPAD_REPORT_DESC);

@ -423,8 +420,6 @@ sc_hid_gamepad_generate_input_from_axis(struct sc_hid_gamepad *hid,

    struct sc_hid_gamepad_slot *slot = &hid->slots[slot_idx];

-// [-32768 to 32767] -> [0 to 65535]
-#define AXIS_RESCALE(V) (uint16_t) (((int32_t) V) + 0x8000)
    switch (event->axis) {
        case SC_GAMEPAD_AXIS_LEFTX:
            slot->axis_left_x = AXIS_RESCALE(event->value);
--- a/app/src/hid/hid_keyboard.c
+++ b/app/src/hid/hid_keyboard.c
@ -335,7 +335,6 @@ sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,

 void sc_hid_keyboard_generate_open(struct sc_hid_open *hid_open) {
    hid_open->hid_id = SC_HID_ID_KEYBOARD;
-    hid_open->name = NULL; // No name specified after "scrcpy"
    hid_open->report_desc = SC_HID_KEYBOARD_REPORT_DESC;
    hid_open->report_desc_size = sizeof(SC_HID_KEYBOARD_REPORT_DESC);
 }
--- a/app/src/hid/hid_mouse.c
+++ b/app/src/hid/hid_mouse.c
@ -190,7 +190,6 @@ sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,

 void sc_hid_mouse_generate_open(struct sc_hid_open *hid_open) {
    hid_open->hid_id = SC_HID_ID_MOUSE;
-    hid_open->name = NULL; // No name specified after "scrcpy"
    hid_open->report_desc = SC_HID_MOUSE_REPORT_DESC;
    hid_open->report_desc_size = sizeof(SC_HID_MOUSE_REPORT_DESC);
 }
--- a/app/src/icon.c
+++ b/app/src/icon.c
@ -9,6 +9,7 @@

 #include "config.h"
 #include "compat.h"
+#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/str.h"
@ -19,35 +20,22 @@

 static char *
 get_icon_path(void) {
-#ifdef __WINDOWS__
-    const wchar_t *icon_path_env = _wgetenv(L"SCRCPY_ICON_PATH");
-#else
-    const char *icon_path_env = getenv("SCRCPY_ICON_PATH");
-#endif
-    if (icon_path_env) {
+    char *icon_path = sc_get_env("SCRCPY_ICON_PATH");
+    if (icon_path) {
        // if the envvar is set, use it
-#ifdef __WINDOWS__
-        char *icon_path = sc_str_from_wchars(icon_path_env);
-#else
-        char *icon_path = strdup(icon_path_env);
-#endif
-        if (!icon_path) {
-            LOG_OOM();
-            return NULL;
-        }
        LOGD("Using SCRCPY_ICON_PATH: %s", icon_path);
        return icon_path;
    }

 #ifndef PORTABLE
    LOGD("Using icon: " SCRCPY_DEFAULT_ICON_PATH);
-    char *icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
+    icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
    if (!icon_path) {
        LOG_OOM();
        return NULL;
    }
 #else
-    char *icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
+    icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
    if (!icon_path) {
        LOGE("Could not get icon path");
        return NULL;
--- a/app/src/input_events.h
+++ b/app/src/input_events.h
@ -412,18 +412,12 @@ struct sc_touch_event {
    float pressure;
 };

-enum sc_gamepad_device_event_type {
-    SC_GAMEPAD_DEVICE_ADDED,
-    SC_GAMEPAD_DEVICE_REMOVED,
-};
-
 // As documented in <https://wiki.libsdl.org/SDL2/SDL_JoystickID>:
 // The ID value starts at 0 and increments from there. The value -1 is an
 // invalid ID.
 #define SC_GAMEPAD_ID_INVALID UINT32_C(-1)

 struct sc_gamepad_device_event {
-    enum sc_gamepad_device_event_type type;
    uint32_t gamepad_id;
 };

@ -503,16 +497,6 @@ sc_mouse_buttons_state_from_sdl(uint32_t buttons_state) {
    return buttons_state;
 }

-static inline enum sc_gamepad_device_event_type
-sc_gamepad_device_event_type_from_sdl_type(uint32_t type) {
-    assert(type == SDL_CONTROLLERDEVICEADDED
-        || type == SDL_CONTROLLERDEVICEREMOVED);
-    if (type == SDL_CONTROLLERDEVICEADDED) {
-        return SC_GAMEPAD_DEVICE_ADDED;
-    }
-    return SC_GAMEPAD_DEVICE_REMOVED;
-}
-
 static inline enum sc_gamepad_axis
 sc_gamepad_axis_from_sdl(uint8_t axis) {
    if (axis <= SDL_CONTROLLER_AXIS_TRIGGERRIGHT) {
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@ -908,7 +908,6 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
 static void
 sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
                                       const SDL_ControllerDeviceEvent *event) {
-    SDL_JoystickID id;
    if (event->type == SDL_CONTROLLERDEVICEADDED) {
        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
        if (!gc) {
@ -923,9 +922,12 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
            return;
        }

-        id = SDL_JoystickInstanceID(joystick);
+        struct sc_gamepad_device_event evt = {
+            .gamepad_id = SDL_JoystickInstanceID(joystick),
+        };
+        im->gp->ops->process_gamepad_added(im->gp, &evt);
    } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        id = event->which;
+        SDL_JoystickID id = event->which;

        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
        if (gc) {
@ -933,16 +935,15 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
        } else {
            LOGW("Unknown gamepad device removed");
        }
+
+        struct sc_gamepad_device_event evt = {
+            .gamepad_id = id,
+        };
+        im->gp->ops->process_gamepad_removed(im->gp, &evt);
    } else {
        // Nothing to do
        return;
    }
-
-    struct sc_gamepad_device_event evt = {
-        .type = sc_gamepad_device_event_type_from_sdl_type(event->type),
-        .gamepad_id = id,
-    };
-    im->gp->ops->process_gamepad_device(im->gp, &evt);
 }

 static void
--- a/app/src/options.c
+++ b/app/src/options.c
@ -108,6 +108,7 @@ const struct scrcpy_options scrcpy_options_default = {
    .new_display = NULL,
    .start_app = NULL,
    .angle = NULL,
+    .vd_destroy_content = true,
    .vd_system_decorations = true,
 };

--- a/app/src/options.h
+++ b/app/src/options.h
@ -310,6 +310,7 @@ struct scrcpy_options {
    bool audio_dup;
    const char *new_display; // [<width>x<height>][/<dpi>] parsed by the server
    const char *start_app;
+    bool vd_destroy_content;
    bool vd_system_decorations;
 };

--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@ -458,6 +458,7 @@ scrcpy(struct scrcpy_options *options) {
        .power_on = options->power_on,
        .kill_adb_on_close = options->kill_adb_on_close,
        .camera_high_speed = options->camera_high_speed,
+        .vd_destroy_content = options->vd_destroy_content,
        .vd_system_decorations = options->vd_system_decorations,
        .list = options->list,
    };
--- a/app/src/server.c
+++ b/app/src/server.c
@ -9,6 +9,7 @@

 #include "adb/adb.h"
 #include "util/binary.h"
+#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/net_intr.h"
@ -25,35 +26,22 @@

 static char *
 get_server_path(void) {
-#ifdef __WINDOWS__
-    const wchar_t *server_path_env = _wgetenv(L"SCRCPY_SERVER_PATH");
-#else
-    const char *server_path_env = getenv("SCRCPY_SERVER_PATH");
-#endif
-    if (server_path_env) {
+    char *server_path = sc_get_env("SCRCPY_SERVER_PATH");
+    if (server_path) {
        // if the envvar is set, use it
-#ifdef __WINDOWS__
-        char *server_path = sc_str_from_wchars(server_path_env);
-#else
-        char *server_path = strdup(server_path_env);
-#endif
-        if (!server_path) {
-            LOG_OOM();
-            return NULL;
-        }
        LOGD("Using SCRCPY_SERVER_PATH: %s", server_path);
        return server_path;
    }

 #ifndef PORTABLE
    LOGD("Using server: " SC_SERVER_PATH_DEFAULT);
-    char *server_path = strdup(SC_SERVER_PATH_DEFAULT);
+    server_path = strdup(SC_SERVER_PATH_DEFAULT);
    if (!server_path) {
        LOG_OOM();
        return NULL;
    }
 #else
-    char *server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
+    server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
    if (!server_path) {
        LOGE("Could not get local file path, "
             "using " SC_SERVER_FILENAME " from current directory");
@ -389,6 +377,9 @@ execute_server(struct sc_server *server,
        VALIDATE_STRING(params->new_display);
        ADD_PARAM("new_display=%s", params->new_display);
    }
+    if (!params->vd_destroy_content) {
+        ADD_PARAM("vd_destroy_content=false");
+    }
    if (!params->vd_system_decorations) {
        ADD_PARAM("vd_system_decorations=false");
    }
@ -497,14 +488,21 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
    // end of the program
    server->params = *params;

-    bool ok = sc_mutex_init(&server->mutex);
+    bool ok = sc_adb_init();
    if (!ok) {
        return false;
    }

+    ok = sc_mutex_init(&server->mutex);
+    if (!ok) {
+        sc_adb_destroy();
+        return false;
+    }
+
    ok = sc_cond_init(&server->cond_stopped);
    if (!ok) {
        sc_mutex_destroy(&server->mutex);
+        sc_adb_destroy();
        return false;
    }

@ -512,6 +510,7 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
    if (!ok) {
        sc_cond_destroy(&server->cond_stopped);
        sc_mutex_destroy(&server->mutex);
+        sc_adb_destroy();
        return false;
    }

@ -833,11 +832,14 @@ sc_server_switch_to_tcpip(struct sc_server *server, const char *serial) {
 }

 static bool
-sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port) {
+sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port,
+                           bool disconnect) {
    struct sc_intr *intr = &server->intr;

-    // Error expected if not connected, do not report any error
-    sc_adb_disconnect(intr, ip_port, SC_ADB_SILENT);
+    if (disconnect) {
+        // Error expected if not connected, do not report any error
+        sc_adb_disconnect(intr, ip_port, SC_ADB_SILENT);
+    }

    LOGI("Connecting to %s...", ip_port);

@ -853,7 +855,7 @@ sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port) {

 static bool
 sc_server_configure_tcpip_known_address(struct sc_server *server,
-                                        const char *addr) {
+                                        const char *addr, bool disconnect) {
    // Append ":5555" if no port is present
    bool contains_port = strchr(addr, ':');
    char *ip_port = contains_port ? strdup(addr)
@ -864,7 +866,7 @@ sc_server_configure_tcpip_known_address(struct sc_server *server,
    }

    server->serial = ip_port;
-    return sc_server_connect_to_tcpip(server, ip_port);
+    return sc_server_connect_to_tcpip(server, ip_port, disconnect);
 }

 static bool
@ -889,7 +891,7 @@ sc_server_configure_tcpip_unknown_address(struct sc_server *server,
    }

    server->serial = ip_port;
-    return sc_server_connect_to_tcpip(server, ip_port);
+    return sc_server_connect_to_tcpip(server, ip_port, false);
 }

 static void
@ -976,7 +978,13 @@ run_server(void *data) {
            sc_adb_device_destroy(&device);
        }
    } else {
-        ok = sc_server_configure_tcpip_known_address(server, params->tcpip_dst);
+        // If the user passed a '+' (--tcpip=+ip), then disconnect first
+        const char *tcpip_dst = params->tcpip_dst;
+        bool plus = tcpip_dst[0] == '+';
+        if (plus) {
+            ++tcpip_dst;
+        }
+        ok = sc_server_configure_tcpip_known_address(server, tcpip_dst, plus);
        if (!ok) {
            goto error_connection_failed;
        }
@ -1153,4 +1161,6 @@ sc_server_destroy(struct sc_server *server) {
    sc_intr_destroy(&server->intr);
    sc_cond_destroy(&server->cond_stopped);
    sc_mutex_destroy(&server->mutex);
+
+    sc_adb_destroy();
 }
--- a/app/src/server.h
+++ b/app/src/server.h
@ -69,6 +69,7 @@ struct sc_server_params {
    bool power_on;
    bool kill_adb_on_close;
    bool camera_high_speed;
+    bool vd_destroy_content;
    bool vd_system_decorations;
    uint8_t list;
 };
--- a/app/src/sys/unix/file.c
+++ b/app/src/sys/unix/file.c
@ -6,6 +6,9 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef __APPLE__
+# include <mach-o/dyld.h> // for _NSGetExecutablePath()
+#endif

 #include "util/log.h"

@ -60,11 +63,22 @@ sc_file_get_executable_path(void) {
    }
    buf[len] = '\0';
    return strdup(buf);
+#elif defined(__APPLE__)
+    char buf[PATH_MAX];
+    uint32_t bufsize = PATH_MAX;
+    if (_NSGetExecutablePath(buf, &bufsize) != 0) {
+        LOGE("Executable path buffer too small; need %u bytes", bufsize);
+        return NULL;
+    }
+    return realpath(buf, NULL);
 #else
-    // in practice, we only need this feature for portable builds, only used on
-    // Windows, so we don't care implementing it for every platform
-    // (it's useful to have a working version on Linux for debugging though)
-    return NULL;
+    // "_" is often used to store the full path of the command being executed
+    char *path = getenv("_");
+    if (!path) {
+        LOGE("Could not determine executable path");
+        return NULL;
+    }
+    return strdup(path);
 #endif
 }

--- a/app/src/trait/gamepad_processor.h
+++ b/app/src/trait/gamepad_processor.h
@ -20,13 +20,22 @@ struct sc_gamepad_processor {
 struct sc_gamepad_processor_ops {

    /**
-     * Process a gamepad device added or removed
+     * Process a gamepad device added event
     *
     * This function is mandatory.
     */
    void
-    (*process_gamepad_device)(struct sc_gamepad_processor *gp,
-                              const struct sc_gamepad_device_event *event);
+    (*process_gamepad_added)(struct sc_gamepad_processor *gp,
+                             const struct sc_gamepad_device_event *event);
+
+    /**
+     * Process a gamepad device removed event
+     *
+     * This function is mandatory.
+     */
+    void
+    (*process_gamepad_removed)(struct sc_gamepad_processor *gp,
+                               const struct sc_gamepad_device_event *event);

    /**
     * Process a gamepad axis event
--- a/app/src/uhid/gamepad_uhid.c
+++ b/app/src/uhid/gamepad_uhid.c
@ -7,6 +7,11 @@
 /** Downcast gamepad processor to sc_gamepad_uhid */
 #define DOWNCAST(GP) container_of(GP, struct sc_gamepad_uhid, gamepad_processor)

+// Xbox 360
+#define SC_GAMEPAD_UHID_VENDOR_ID UINT16_C(0x045e)
+#define SC_GAMEPAD_UHID_PRODUCT_ID UINT16_C(0x028e)
+#define SC_GAMEPAD_UHID_NAME "Microsoft X-Box 360 Pad"
+
 static void
 sc_gamepad_uhid_send_input(struct sc_gamepad_uhid *gamepad,
                           const struct sc_hid_input *hid_input,
@ -30,7 +35,9 @@ sc_gamepad_uhid_send_open(struct sc_gamepad_uhid *gamepad,
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
    msg.uhid_create.id = hid_open->hid_id;
-    msg.uhid_create.name = hid_open->name;
+    msg.uhid_create.vendor_id = SC_GAMEPAD_UHID_VENDOR_ID;
+    msg.uhid_create.product_id = SC_GAMEPAD_UHID_PRODUCT_ID;
+    msg.uhid_create.name = SC_GAMEPAD_UHID_NAME;
    msg.uhid_create.report_desc = hid_open->report_desc;
    msg.uhid_create.report_desc_size = hid_open->report_desc_size;

@ -52,29 +59,39 @@ sc_gamepad_uhid_send_close(struct sc_gamepad_uhid *gamepad,
 }

 static void
-sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
+sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
                                const struct sc_gamepad_device_event *event) {
    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);

-    if (event->type == SC_GAMEPAD_DEVICE_ADDED) {
-        struct sc_hid_open hid_open;
-        if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                          event->gamepad_id)) {
-            return;
-        }
-
-        sc_gamepad_uhid_send_open(gamepad, &hid_open);
-    } else {
-        assert(event->type == SC_GAMEPAD_DEVICE_REMOVED);
-
-        struct sc_hid_close hid_close;
-        if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
-                                           event->gamepad_id)) {
-            return;
-        }
-
-        sc_gamepad_uhid_send_close(gamepad, &hid_close);
+    struct sc_hid_open hid_open;
+    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
+                                      event->gamepad_id)) {
+        return;
    }
+
+    SDL_GameController* game_controller =
+        SDL_GameControllerFromInstanceID(event->gamepad_id);
+    assert(game_controller);
+    const char *name = SDL_GameControllerName(game_controller);
+    LOGI("Gamepad added: [%" PRIu32 "] %s", event->gamepad_id, name);
+
+    sc_gamepad_uhid_send_open(gamepad, &hid_open);
+}
+
+static void
+sc_gamepad_processor_process_gamepad_removed(struct sc_gamepad_processor *gp,
+                                const struct sc_gamepad_device_event *event) {
+    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
+
+    struct sc_hid_close hid_close;
+    if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
+                                       event->gamepad_id)) {
+        return;
+    }
+
+    LOGI("Gamepad removed: [%" PRIu32 "]", event->gamepad_id);
+
+    sc_gamepad_uhid_send_close(gamepad, &hid_close);
 }

 static void
@ -114,7 +131,8 @@ sc_gamepad_uhid_init(struct sc_gamepad_uhid *gamepad,
    gamepad->controller = controller;

    static const struct sc_gamepad_processor_ops ops = {
-        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
+        .process_gamepad_added = sc_gamepad_processor_process_gamepad_added,
+        .process_gamepad_removed = sc_gamepad_processor_process_gamepad_removed,
        .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
    };
--- a/app/src/uhid/keyboard_uhid.c
+++ b/app/src/uhid/keyboard_uhid.c
@ -141,7 +141,9 @@ sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
    msg.uhid_create.id = SC_HID_ID_KEYBOARD;
-    msg.uhid_create.name = hid_open.name;
+    msg.uhid_create.vendor_id = 0;
+    msg.uhid_create.product_id = 0;
+    msg.uhid_create.name = NULL;
    msg.uhid_create.report_desc = hid_open.report_desc;
    msg.uhid_create.report_desc_size = hid_open.report_desc_size;
    if (!sc_controller_push_msg(controller, &msg)) {
--- a/app/src/uhid/mouse_uhid.c
+++ b/app/src/uhid/mouse_uhid.c
@ -81,7 +81,9 @@ sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_CREATE;
    msg.uhid_create.id = SC_HID_ID_MOUSE;
-    msg.uhid_create.name = hid_open.name;
+    msg.uhid_create.vendor_id = 0;
+    msg.uhid_create.product_id = 0;
+    msg.uhid_create.name = NULL;
    msg.uhid_create.report_desc = hid_open.report_desc;
    msg.uhid_create.report_desc_size = hid_open.report_desc_size;
    if (!sc_controller_push_msg(controller, &msg)) {
--- a/app/src/usb/gamepad_aoa.c
+++ b/app/src/usb/gamepad_aoa.c
@ -7,33 +7,35 @@
 #define DOWNCAST(GP) container_of(GP, struct sc_gamepad_aoa, gamepad_processor)

 static void
-sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
+sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
                                const struct sc_gamepad_device_event *event) {
    struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);

-    if (event->type == SC_GAMEPAD_DEVICE_ADDED) {
-        struct sc_hid_open hid_open;
-        if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                          event->gamepad_id)) {
-            return;
-        }
+    struct sc_hid_open hid_open;
+    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
+                                      event->gamepad_id)) {
+        return;
+    }

-        // exit_on_error: false (a gamepad open failure should not exit scrcpy)
-        if (!sc_aoa_push_open(gamepad->aoa, &hid_open, false)) {
-            LOGW("Could not push AOA HID open (gamepad)");
-        }
-    } else {
-        assert(event->type == SC_GAMEPAD_DEVICE_REMOVED);
+    // exit_on_error: false (a gamepad open failure should not exit scrcpy)
+    if (!sc_aoa_push_open(gamepad->aoa, &hid_open, false)) {
+        LOGW("Could not push AOA HID open (gamepad)");
+    }
+}

-        struct sc_hid_close hid_close;
-        if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
-                                           event->gamepad_id)) {
-            return;
-        }
+static void
+sc_gamepad_processor_process_gamepad_removed(struct sc_gamepad_processor *gp,
+                                const struct sc_gamepad_device_event *event) {
+    struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);

-        if (!sc_aoa_push_close(gamepad->aoa, &hid_close)) {
-            LOGW("Could not push AOA HID close (gamepad)");
-        }
+    struct sc_hid_close hid_close;
+    if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
+                                       event->gamepad_id)) {
+        return;
+    }
+
+    if (!sc_aoa_push_close(gamepad->aoa, &hid_close)) {
+        LOGW("Could not push AOA HID close (gamepad)");
    }
 }

@ -76,7 +78,8 @@ sc_gamepad_aoa_init(struct sc_gamepad_aoa *gamepad, struct sc_aoa *aoa) {
    sc_hid_gamepad_init(&gamepad->hid);

    static const struct sc_gamepad_processor_ops ops = {
-        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
+        .process_gamepad_added = sc_gamepad_processor_process_gamepad_added,
+        .process_gamepad_removed = sc_gamepad_processor_process_gamepad_removed,
        .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
    };
--- a/app/src/usb/scrcpy_otg.c
+++ b/app/src/usb/scrcpy_otg.c
@ -95,9 +95,14 @@ scrcpy_otg(struct scrcpy_options *options) {
    // On Windows, only one process could open a USB device
    // <https://github.com/Genymobile/scrcpy/issues/2773>
    LOGI("Killing adb server (if any)...");
-    unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR;
-    // uninterruptible (intr == NULL), but in practice it's very quick
-    sc_adb_kill_server(NULL, flags);
+    if (sc_adb_init()) {
+        unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR;
+        // uninterruptible (intr == NULL), but in practice it's very quick
+        sc_adb_kill_server(NULL, flags);
+        sc_adb_destroy();
+    } else {
+        LOGW("Could not call adb executable, adb server not killed");
+    }
 #endif

    static const struct sc_usb_callbacks cbs = {
--- a/app/src/usb/screen_otg.c
+++ b/app/src/usb/screen_otg.c
@ -175,7 +175,6 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
    assert(screen->gamepad);
    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;

-    SDL_JoystickID id;
    if (event->type == SDL_CONTROLLERDEVICEADDED) {
        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
        if (!gc) {
@ -190,9 +189,12 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
            return;
        }

-        id = SDL_JoystickInstanceID(joystick);
+        struct sc_gamepad_device_event evt = {
+            .gamepad_id = SDL_JoystickInstanceID(joystick),
+        };
+        gp->ops->process_gamepad_added(gp, &evt);
    } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        id = event->which;
+        SDL_JoystickID id = event->which;

        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
        if (gc) {
@ -200,16 +202,12 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
        } else {
            LOGW("Unknown gamepad device removed");
        }
-    } else {
-        // Nothing to do
-        return;
-    }

-    struct sc_gamepad_device_event evt = {
-        .type = sc_gamepad_device_event_type_from_sdl_type(event->type),
-        .gamepad_id = id,
-    };
-    gp->ops->process_gamepad_device(gp, &evt);
+        struct sc_gamepad_device_event evt = {
+            .gamepad_id = id,
+        };
+        gp->ops->process_gamepad_removed(gp, &evt);
+    }
 }

 static void
--- a/app/src/util/env.c
+++ b/app/src/util/env.c
@ -0,0 +1,29 @@
+#include "env.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include "util/str.h"
+
+char *
+sc_get_env(const char *varname) {
+#ifdef _WIN32
+    wchar_t *w_varname = sc_str_to_wchars(varname);
+    if (!w_varname) {
+         return NULL;
+    }
+    const wchar_t *value = _wgetenv(w_varname);
+    free(w_varname);
+    if (!value) {
+        return NULL;
+    }
+
+    return sc_str_from_wchars(value);
+#else
+    const char *value = getenv(varname);
+    if (!value) {
+        return NULL;
+    }
+
+    return strdup(value);
+#endif
+}
--- a/app/src/util/env.h
+++ b/app/src/util/env.h
@ -0,0 +1,12 @@
+#ifndef SC_ENV_H
+#define SC_ENV_H
+
+#include "common.h"
+
+// Return the value of the environment variable (may be NULL).
+//
+// The returned value must be freed by the caller.
+char *
+sc_get_env(const char *varname);
+
+#endif
--- a/app/src/util/net.c
+++ b/app/src/util/net.c
@ -9,8 +9,6 @@
 #ifdef _WIN32
 # include <ws2tcpip.h>
  typedef int socklen_t;
-  typedef SOCKET sc_raw_socket;
-# define SC_RAW_SOCKET_NONE INVALID_SOCKET
 #else
 # include <sys/types.h>
 # include <sys/socket.h>
@ -23,8 +21,6 @@
  typedef struct sockaddr_in SOCKADDR_IN;
  typedef struct sockaddr SOCKADDR;
  typedef struct in_addr IN_ADDR;
-  typedef int sc_raw_socket;
-# define SC_RAW_SOCKET_NONE -1
 #endif

 bool
@ -47,17 +43,26 @@ net_cleanup(void) {
 #endif
 }

+static inline bool
+sc_raw_socket_close(sc_raw_socket raw_sock) {
+#ifndef _WIN32
+    return !close(raw_sock);
+#else
+    return !closesocket(raw_sock);
+#endif
+}
+
 static inline sc_socket
 wrap(sc_raw_socket sock) {
-#ifdef _WIN32
-    if (sock == INVALID_SOCKET) {
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+    if (sock == SC_RAW_SOCKET_NONE) {
        return SC_SOCKET_NONE;
    }

-    struct sc_socket_windows *socket = malloc(sizeof(*socket));
+    struct sc_socket_wrapper *socket = malloc(sizeof(*socket));
    if (!socket) {
        LOG_OOM();
-        closesocket(sock);
+        sc_raw_socket_close(sock);
        return SC_SOCKET_NONE;
    }

@ -72,9 +77,9 @@ wrap(sc_raw_socket sock) {

 static inline sc_raw_socket
 unwrap(sc_socket socket) {
-#ifdef _WIN32
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
    if (socket == SC_SOCKET_NONE) {
-        return INVALID_SOCKET;
+        return SC_RAW_SOCKET_NONE;
    }

    return socket->socket;
@ -83,17 +88,6 @@ unwrap(sc_socket socket) {
 #endif
 }

-#ifndef HAVE_SOCK_CLOEXEC // avoid unused-function warning
-static inline bool
-sc_raw_socket_close(sc_raw_socket raw_sock) {
-#ifndef _WIN32
-    return !close(raw_sock);
-#else
-    return !closesocket(raw_sock);
-#endif
-}
-#endif
-
 #ifndef HAVE_SOCK_CLOEXEC
 // If SOCK_CLOEXEC does not exist, the flag must be set manually once the
 // socket is created
@ -248,9 +242,9 @@ net_interrupt(sc_socket socket) {

    sc_raw_socket raw_sock = unwrap(socket);

-#ifdef _WIN32
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
    if (!atomic_flag_test_and_set(&socket->closed)) {
-        return !closesocket(raw_sock);
+        return sc_raw_socket_close(raw_sock);
    }
    return true;
 #else
@ -262,15 +256,15 @@ bool
 net_close(sc_socket socket) {
    sc_raw_socket raw_sock = unwrap(socket);

-#ifdef _WIN32
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
    bool ret = true;
    if (!atomic_flag_test_and_set(&socket->closed)) {
-        ret = !closesocket(raw_sock);
+        ret = sc_raw_socket_close(raw_sock);
    }
    free(socket);
    return ret;
 #else
-    return !close(raw_sock);
+    return sc_raw_socket_close(raw_sock);
 #endif
 }

--- a/app/src/util/net.h
+++ b/app/src/util/net.h
@ -7,21 +7,36 @@
 #include <stdint.h>

 #ifdef _WIN32
-
 # include <winsock2.h>
+  typedef SOCKET sc_raw_socket;
+# define SC_RAW_SOCKET_NONE INVALID_SOCKET
+#else // not _WIN32
+# include <sys/socket.h>
+  typedef int sc_raw_socket;
+# define SC_RAW_SOCKET_NONE -1
+#endif
+
+#if defined(_WIN32) || defined(__APPLE__)
+// On Windows and macOS, shutdown() does not interrupt accept() or read()
+// calls, so net_interrupt() must call close() instead, and net_close() must
+// behave accordingly.
+// This causes a small race condition (once the socket is closed, its
+// handle becomes invalid and may in theory be reassigned before another
+// thread calls accept() or read()), but it is deemed acceptable as a
+// workaround.
+# define SC_SOCKET_CLOSE_ON_INTERRUPT
+#endif
+
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
 # include <stdatomic.h>
 # define SC_SOCKET_NONE NULL
-  typedef struct sc_socket_windows {
-      SOCKET socket;
+  typedef struct sc_socket_wrapper {
+      sc_raw_socket socket;
      atomic_flag closed;
  } *sc_socket;
-
-#else // not _WIN32
-
-# include <sys/socket.h>
+#else
 # define SC_SOCKET_NONE -1
-  typedef int sc_socket;
-
+  typedef sc_raw_socket sc_socket;
 #endif

 #define IPV4_LOCALHOST 0x7F000001
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@ -329,6 +329,8 @@ static void test_serialize_uhid_create(void) {
        .type = SC_CONTROL_MSG_TYPE_UHID_CREATE,
        .uhid_create = {
            .id = 42,
+            .vendor_id = 0x1234,
+            .product_id = 0x5678,
            .name = "ABC",
            .report_desc_size = sizeof(report_desc),
            .report_desc = report_desc,
@ -337,11 +339,13 @@ static void test_serialize_uhid_create(void) {

    uint8_t buf[SC_CONTROL_MSG_MAX_SIZE];
    size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 20);
+    assert(size == 24);

    const uint8_t expected[] = {
        SC_CONTROL_MSG_TYPE_UHID_CREATE,
        0, 42, // id
+        0x12, 0x34, // vendor id
+        0x56, 0x78, // product id
        3, // name size
        65, 66, 67, // "ABC"
        0, 11, // report desc size
--- a/doc/build.md
+++ b/doc/build.md
@ -233,10 +233,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v3.0`][direct-scrcpy-server]  
-   <sub>SHA-256: `800044c62a94d5fc16f5ab9c86d45b1050eae3eb436514d1b0d2fe2646b894ea`</sub>
+ - [`scrcpy-server-v3.1`][direct-scrcpy-server]  
+   <sub>SHA-256: `958f0944a62f23b1f33a16e9eb14844c1a04b882ca175a738c16d23cb22b86c0`</sub>

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.0/scrcpy-server-v3.0
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-server-v3.1

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/doc/connection.md
+++ b/doc/connection.md
@ -85,6 +85,12 @@ scrcpy --tcpip=192.168.1.1       # default port is 5555
 scrcpy --tcpip=192.168.1.1:5555
 ```

+Prefix the address with a '+' to force a reconnection:
+
+```bash
+scrcpy --tcpip=+192.168.1.1
+```
+

 ### Manual

@ -107,16 +113,17 @@ with the device IP address you found)_.
 7. Run `scrcpy` as usual.
 8. Run `adb disconnect` once you're done.

-Since Android 11, a [wireless debugging option][adb-wireless] allows to bypass
-having to physically connect your device directly to your computer.
+Since Android 11, a [wireless debugging option][adb-wireless] allows you to
+bypass having to physically connect your device to your computer.

 [adb-wireless]: https://developer.android.com/studio/command-line/adb#wireless-android11-command-line


 ## Autostart

-A small tool (by the scrcpy author) allows to run arbitrary commands whenever a
-new Android device is connected: [AutoAdb]. It can be used to start scrcpy:
+A small tool (by the scrcpy author) allows you to run arbitrary commands
+whenever a new Android device is connected: [AutoAdb]. It can be used to start
+scrcpy:

 ```bash
 autoadb scrcpy -s '{}'
--- a/doc/control.md
+++ b/doc/control.md
@ -23,14 +23,20 @@ To control the device without mirroring:
 scrcpy --no-video --no-audio
 ```

-By default, mouse mode is switched to UHID if video mirroring is disabled (a
-relative mouse mode is required).
+By default, the mouse is disabled when video playback is turned off.
+
+To control the device using a relative mouse, enable UHID mouse mode:
+
+```bash
+scrcpy --no-video --no-audio --mouse=uhid
+scrcpy --no-video --no-audio -M  # short version
+```

 To also use a UHID keyboard, set it explicitly:

 ```bash
-scrcpy --no-video --no-audio --keyboard=uhid
-scrcpy --no-video --no-audio -K  # short version
+scrcpy --no-video --no-audio --mouse=uhid --keyboard=uhid
+scrcpy --no-video --no-audio -MK  # short version
 ```

 To use AOA instead (over USB only):
--- a/doc/device.md
+++ b/doc/device.md
@ -34,6 +34,31 @@ adb shell settings put global stay_on_while_plugged_in 0
 ```


+## Screen off timeout
+
+The Android screen automatically turns off after some delay.
+
+To change this delay while scrcpy is running:
+
+```bash
+scrcpy --screen-off-timeout=300  # 300 seconds (5 minutes)
+```
+
+The initial value is restored on exit.
+
+It is possible to change this setting manually:
+
+```bash
+# get the current screen_off_timeout value
+adb shell settings get system screen_off_timeout
+# set a new value (in milliseconds)
+adb shell settings put system screen_off_timeout 30000
+```
+
+Note that the Android value is in milliseconds, but the scrcpy command line
+argument is in seconds.
+
+
 ## Turn screen off

 It is possible to turn the device screen off while mirroring on start with a
@ -71,31 +96,6 @@ adb shell cmd display power-on 0
 ```


-## Screen off timeout
-
-The Android screen automatically turns off after some delay.
-
-To change this delay while scrcpy is running:
-
-```bash
-scrcpy --screen-off-timeout=300  # 300 seconds (5 minutes)
-```
-
-The initial value is restored on exit.
-
-It is possible to change this setting manually:
-
-```bash
-# get the current screen_off_timeout value
-adb shell settings get system screen_off_timeout
-# set a new value (in milliseconds)
-adb shell settings put system screen_off_timeout 30000
-```
-
-Note that the Android value is in milliseconds, but the scrcpy command line
-argument is in seconds.
-
-
 ## Show touches

 For presentations, it may be useful to show physical touches (on the physical
--- a/doc/linux.md
+++ b/doc/linux.md
@ -6,11 +6,11 @@

 Download a static build of the [latest release]:

- - [`scrcpy-linux-v3.0.tar.gz`][direct-linux] (x86_64)  
-   <sub>SHA-256: `06cb74e22f758228c944cea048b78e42b2925c2affe2b5aca901cfd6a649e503`</sub>
+ - [`scrcpy-linux-x86_64-v3.1.tar.gz`][direct-linux-x86_64] (x86_64)  
+   <sub>SHA-256: `37dba54092ed9ec6b2f8f95432f61b8ea124aec9f1e9f2b3d22d4b10bb04c59a`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-linux]: https://github.com/Genymobile/scrcpy/releases/download/v3.0/scrcpy-linux-v3.0.tar.gz
+[direct-linux-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-linux-x86_64-v3.1.tar.gz

 and extract it.

--- a/doc/macos.md
+++ b/doc/macos.md
@ -6,11 +6,15 @@

 Download a static build of the [latest release]:

- - [`scrcpy-macos-v3.0.tar.gz`][direct-macos] (arm64)  
-   <sub>SHA-256: `5db9821918537eb3aaf0333cdd05baf85babdd851972d5f1b71f86da0530b4bf`</sub>
+ - [`scrcpy-macos-aarch64-v3.1.tar.gz`][direct-macos-aarch64] (aarch64)  
+   <sub>SHA-256: `478618d940421e5f57942f5479d493ecbb38210682937a200f712aee5f235daf`</sub>
+
+ - [`scrcpy-macos-x86_64-v3.1.tar.gz`][direct-macos-x86_64] (x86_64)  
+   <sub>SHA-256: `acde98e29c273710ffa469371dbca4a728a44c41c380381f8a54e5b5301b9e87`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-macos]: https://github.com/Genymobile/scrcpy/releases/download/v3.0/scrcpy-macos-v3.0.tar.gz
+[direct-macos-aarch64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-macos-aarch64-v3.1.tar.gz
+[direct-macos-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-macos-x86_64-v3.1.tar.gz

 and extract it.

--- a/doc/mouse.md
+++ b/doc/mouse.md
@ -83,9 +83,9 @@ process like the _adb daemon_).
 ## Mouse bindings

 By default, with SDK mouse:
- - right-click triggers BACK (or POWER on)
- - middle-click triggers HOME
- - the 4th click triggers APP_SWITCH
+ - right-click triggers `BACK` (or `POWER` on)
+ - middle-click triggers `HOME`
+ - the 4th click triggers `APP_SWITCH`
 - the 5th click expands the notification panel

 The secondary clicks may be forwarded to the device instead by pressing the
@ -121,9 +121,9 @@ Each character must be one of the following:

 - `+`: forward the click to the device
 - `-`: ignore the click
- - `b`: trigger shortcut BACK (or turn screen on if off)
- - `h`: trigger shortcut HOME
- - `s`: trigger shortcut APP_SWITCH
+ - `b`: trigger shortcut `BACK` (or turn screen on if off)
+ - `h`: trigger shortcut `HOME`
+ - `s`: trigger shortcut `APP_SWITCH`
 - `n`: trigger shortcut "expand notification panel"

 For example:
--- a/doc/virtual_display.md
+++ b/doc/virtual_display.md
@ -15,8 +15,10 @@ scrcpy --new-display=/240    # use the main display size and 240 dpi

 On some devices, a launcher is available in the virtual display.

-When no launcher is available, the virtual display is empty. In that case, you
-must [start an Android app](device.md#start-android-app).
+When no launcher is available (or if is explicitly disabled by
+[`--no-vd-system-decorations`](#system-decorations)), the virtual display is
+empty. In that case, you must [start an Android
+app](device.md#start-android-app).

 For example:

@ -24,12 +26,38 @@ For example:
 scrcpy --new-display=1920x1080 --start-app=org.videolan.vlc
 ```

+The app may itself be a launcher. For example, to run the open source [Fossify
+Launcher]:
+
+```bash
+scrcpy --new-display=1920x1080 --no-vd-system-decorations --start-app=org.fossify.home
+```
+
+[Fossify Launcher]: https://f-droid.org/en/packages/org.fossify.home/
+
+
 ## System decorations

-By default, virtual display system decorations are enabled. But some devices
-might display a broken UI;
+By default, virtual display system decorations are enabled. To disable them, use
+`--no-vd-system-decorations`:

-Use `--no-vd-system-decorations` to disable it.
+```
+scrcpy --new-display --no-vd-system-decorations
+```
+
+This is useful for some devices which might display a broken UI, or to disable
+any default launcher UI available in virtual displays.

 Note that if no app is started, no content will be rendered, so no video frame
 will be produced at all.
+
+
+## Destroy on close
+
+By default, when the virtual display is closed, the running apps are destroyed.
+
+To move them to the main display instead, use:
+
+```
+scrcpy --new-display --no-vd-destroy-content
+```
--- a/doc/windows.md
+++ b/doc/windows.md
@ -6,20 +6,26 @@

 Download the [latest release]:

- - [`scrcpy-win64-v3.0.zip`][direct-win64] (64-bit)  
-   <sub>SHA-256: `dfbe8a8fef6535197acc506936bfd59d0aa0427e9b44fb2e5c550eae642f72be`</sub>
- - [`scrcpy-win32-v3.0.zip`][direct-win32] (32-bit)  
-   <sub>SHA-256: `7cbf8d7a6ebfdca7b3b161e29a481c11088305f3e0a89d28e8e62f70c7bd0028`</sub>
+ - [`scrcpy-win64-v3.1.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `0c05ea395d95cfe36bee974eeb435a3db87ea5594ff738370d5dc3068a9538ca`</sub>
+ - [`scrcpy-win32-v3.1.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `2b4674ef76719680ac5a9b482d1943bdde3fa25821ad2e98f3c40c347d00d560`</sub>

 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v3.0/scrcpy-win64-v3.0.zip
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v3.0/scrcpy-win32-v3.0.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-win64-v3.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-win32-v3.1.zip

 and extract it.


 ### From a package manager

+From [WinGet] (ADB and other dependencies will be installed alongside scrcpy):
+
+```bash
+winget install --exact Genymobile.scrcpy
+```
+
 From [Chocolatey]:

 ```bash
@ -29,12 +35,12 @@ choco install adb    # if you don't have it yet

 From [Scoop]:

-
 ```bash
 scoop install scrcpy
 scoop install adb    # if you don't have it yet
 ```

+[WinGet]: https://github.com/microsoft/winget-cli
 [Chocolatey]: https://chocolatey.org/
 [Scoop]: https://scoop.sh

--- a/install_release.sh
+++ b/install_release.sh
@ -2,8 +2,8 @@
 set -e

 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.0/scrcpy-server-v3.0
-PREBUILT_SERVER_SHA256=800044c62a94d5fc16f5ab9c86d45b1050eae3eb436514d1b0d2fe2646b894ea
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-server-v3.1
+PREBUILT_SERVER_SHA256=958f0944a62f23b1f33a16e9eb14844c1a04b882ca175a738c16d23cb22b86c0

 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server
--- a/meson.build
+++ b/meson.build
@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '3.0',
+        version: '3.1',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/release/build_linux.sh
+++ b/release/build_linux.sh
@ -4,10 +4,18 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir

-LINUX_BUILD_DIR="$WORK_DIR/build-linux"
+if [[ $# != 1 ]]
+then
+    echo "Syntax: $0 <arch>" >&2
+    exit 1
+fi
+
+ARCH="$1"
+LINUX_BUILD_DIR="$WORK_DIR/build-linux-$ARCH"

 app/deps/adb_linux.sh
 app/deps/sdl.sh linux native static
+app/deps/dav1d.sh linux native static
 app/deps/ffmpeg.sh linux native static
 app/deps/libusb.sh linux native static

@ -29,8 +37,7 @@ ninja -C "$LINUX_BUILD_DIR"

 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$LINUX_BUILD_DIR/dist"
-cp "$LINUX_BUILD_DIR"/app/scrcpy "$LINUX_BUILD_DIR/dist/scrcpy_bin"
+cp "$LINUX_BUILD_DIR"/app/scrcpy "$LINUX_BUILD_DIR/dist/"
 cp app/data/icon.png "$LINUX_BUILD_DIR/dist/"
-cp app/data/scrcpy_static_wrapper.sh "$LINUX_BUILD_DIR/dist/scrcpy"
 cp app/scrcpy.1 "$LINUX_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$LINUX_BUILD_DIR/dist/"
--- a/release/build_macos.sh
+++ b/release/build_macos.sh
@ -4,10 +4,18 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir

-MACOS_BUILD_DIR="$WORK_DIR/build-macos"
+if [[ $# != 1 ]]
+then
+    echo "Syntax: $0 <arch>" >&2
+    exit 1
+fi
+
+ARCH="$1"
+MACOS_BUILD_DIR="$WORK_DIR/build-macos-$ARCH"

 app/deps/adb_macos.sh
 app/deps/sdl.sh macos native static
+app/deps/dav1d.sh macos native static
 app/deps/ffmpeg.sh macos native static
 app/deps/libusb.sh macos native static

@ -29,8 +37,7 @@ ninja -C "$MACOS_BUILD_DIR"

 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$MACOS_BUILD_DIR/dist"
-cp "$MACOS_BUILD_DIR"/app/scrcpy "$MACOS_BUILD_DIR/dist/scrcpy_bin"
+cp "$MACOS_BUILD_DIR"/app/scrcpy "$MACOS_BUILD_DIR/dist/"
 cp app/data/icon.png "$MACOS_BUILD_DIR/dist/"
-cp app/data/scrcpy_static_wrapper.sh "$MACOS_BUILD_DIR/dist/scrcpy"
 cp app/scrcpy.1 "$MACOS_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$MACOS_BUILD_DIR/dist/"
--- a/release/build_windows.sh
+++ b/release/build_windows.sh
@ -22,6 +22,7 @@ WINXX_BUILD_DIR="$WORK_DIR/build-$WINXX"

 app/deps/adb_windows.sh
 app/deps/sdl.sh $WINXX cross shared
+app/deps/dav1d.sh $WINXX cross shared
 app/deps/ffmpeg.sh $WINXX cross shared
 app/deps/libusb.sh $WINXX cross shared

--- a/release/generate_checksums.sh
+++ b/release/generate_checksums.sh
@ -5,9 +5,10 @@ cd "$(dirname ${BASH_SOURCE[0]})"

 cd "$OUTPUT_DIR"
 sha256sum "scrcpy-server-$VERSION" \
-    "scrcpy-linux-$VERSION.tar.gz" \
+    "scrcpy-linux-x86_64-$VERSION.tar.gz" \
    "scrcpy-win32-$VERSION.zip" \
    "scrcpy-win64-$VERSION.zip" \
-    "scrcpy-macos-$VERSION.tar.gz" \
+    "scrcpy-macos-aarch64-$VERSION.tar.gz" \
+    "scrcpy-macos-x86_64-$VERSION.tar.gz" \
        | tee SHA256SUMS.txt
 echo "Release checksums generated in $PWD/SHA256SUMS.txt"
--- a/release/package_client.sh
+++ b/release/package_client.sh
@ -14,39 +14,39 @@ fi

 FORMAT=$2

-if [[ "$2" != zip && "$2" != tar.gz ]]
+if [[ "$FORMAT" != zip && "$FORMAT" != tar.gz ]]
 then
-    echo "Invalid format (expected zip or tar.gz): $2" >&2
+    echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2
    exit 1
 fi

 BUILD_DIR="$WORK_DIR/build-$1"
 ARCHIVE_DIR="$BUILD_DIR/release-archive"
-TARGET="scrcpy-$1-$VERSION"
+TARGET_DIRNAME="scrcpy-$1-$VERSION"

-rm -rf "$ARCHIVE_DIR/$TARGET"
-mkdir -p "$ARCHIVE_DIR/$TARGET"
+rm -rf "$ARCHIVE_DIR/$TARGET_DIRNAME"
+mkdir -p "$ARCHIVE_DIR/$TARGET_DIRNAME"

-cp -r "$BUILD_DIR/dist/." "$ARCHIVE_DIR/$TARGET/"
-cp "$WORK_DIR/build-server/server/scrcpy-server" "$ARCHIVE_DIR/$TARGET/"
+cp -r "$BUILD_DIR/dist/." "$ARCHIVE_DIR/$TARGET_DIRNAME/"
+cp "$WORK_DIR/build-server/server/scrcpy-server" "$ARCHIVE_DIR/$TARGET_DIRNAME/"

 mkdir -p "$OUTPUT_DIR"

 cd "$ARCHIVE_DIR"
-rm -f "$OUTPUT_DIR/$TARGET.$FORMAT"
+rm -f "$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT"

 case "$FORMAT" in
    zip)
-        zip -r "$OUTPUT_DIR/$TARGET.zip" "$TARGET"
+        zip -r "$OUTPUT_DIR/$TARGET_DIRNAME.zip" "$TARGET_DIRNAME"
        ;;
    tar.gz)
-        tar cvf "$OUTPUT_DIR/$TARGET.tar.gz" "$TARGET"
+        tar cvzf "$OUTPUT_DIR/$TARGET_DIRNAME.tar.gz" "$TARGET_DIRNAME"
        ;;
    *)
        echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2
        exit 1
 esac

-rm -rf "$TARGET"
+rm -rf "$TARGET_DIRNAME"
 cd -
-echo "Generated '$OUTPUT_DIR/$TARGET.$FORMAT'"
+echo "Generated '$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT'"
--- a/release/release.sh
+++ b/release/release.sh
@ -12,12 +12,12 @@ rm -rf output
 ./build_server.sh
 ./build_windows.sh 32
 ./build_windows.sh 64
-./build_linux.sh
+./build_linux.sh x86_64

 ./package_server.sh
 ./package_client.sh win32 zip
 ./package_client.sh win64 zip
-./package_client.sh linux tar.gz
+./package_client.sh linux-x86_64 tar.gz

 ./generate_checksums.sh

--- a/server/build.gradle
+++ b/server/build.gradle
@ -7,8 +7,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 35
-        versionCode 30000
-        versionName "3.0"
+        versionCode 30100
+        versionName "3.1"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@ -12,7 +12,7 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=3.0
+SCRCPY_VERSION_NAME=3.1

 PLATFORM=${ANDROID_PLATFORM:-35}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-35.0.0}
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@ -6,6 +6,8 @@ import com.genymobile.scrcpy.util.Settings;
 import com.genymobile.scrcpy.util.SettingsException;

 import android.os.BatteryManager;
+import android.system.ErrnoException;
+import android.system.Os;

 import java.io.File;
 import java.io.IOException;
@ -24,6 +26,7 @@ public final class CleanUp {
    private boolean pendingRestoreDisplayPower;

    private Thread thread;
+    private boolean interrupted;

    private CleanUp(Options options) {
        thread = new Thread(() -> runCleanUp(options), "cleanup");
@ -34,8 +37,10 @@ public final class CleanUp {
        return new CleanUp(options);
    }

-    public void interrupt() {
-        thread.interrupt();
+    public synchronized void interrupt() {
+        // Do not use thread.interrupt() because only the wait() call must be interrupted, not Command.exec()
+        interrupted = true;
+        notify();
    }

    public void join() throws InterruptedException {
@ -97,15 +102,13 @@ public final class CleanUp {

        try {
            run(displayId, restoreStayOn, disableShowTouches, powerOffScreen, restoreScreenOffTimeout);
-        } catch (InterruptedException e) {
-            // ignore
        } catch (IOException e) {
            Ln.e("Clean up I/O exception", e);
        }
    }

    private void run(int displayId, int restoreStayOn, boolean disableShowTouches, boolean powerOffScreen, int restoreScreenOffTimeout)
-            throws IOException, InterruptedException {
+            throws IOException {
        String[] cmd = {
                "app_process",
                "/",
@ -126,8 +129,15 @@ public final class CleanUp {
            int localPendingChanges;
            boolean localPendingRestoreDisplayPower;
            synchronized (this) {
-                while (pendingChanges == 0) {
-                    wait();
+                while (!interrupted && pendingChanges == 0) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        throw new AssertionError("Clean up thread MUST NOT be interrupted");
+                    }
+                }
+                if (interrupted) {
+                    break;
                }
                localPendingChanges = pendingChanges;
                localPendingRestoreDisplayPower = pendingRestoreDisplayPower;
@ -155,6 +165,12 @@ public final class CleanUp {
    }

    public static void main(String... args) {
+        try {
+            // Start a new session to avoid being terminated along with the server process on some devices
+            Os.setsid();
+        } catch (ErrnoException e) {
+            Ln.e("setsid() failed", e);
+        }
        unlinkSelf();

        int displayId = Integer.parseInt(args[0]);
@ -207,7 +223,7 @@ public final class CleanUp {
            }
        }

-        // Change the display power of the main display when mirroring a virtual display
+        // Change the power of the main display when mirroring a virtual display
        int targetDisplayId = displayId != Device.DISPLAY_ID_NONE ? displayId : 0;
        if (Device.isScreenOn(targetDisplayId)) {
            if (powerOffScreen) {
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@ -60,6 +60,7 @@ public class Options {
    private boolean powerOn = true;

    private NewDisplay newDisplay;
+    private boolean vdDestroyContent = true;
    private boolean vdSystemDecorations = true;

    private Orientation.Lock captureOrientationLock = Orientation.Lock.Unlocked;
@ -233,6 +234,10 @@ public class Options {
        return captureOrientationLock;
    }

+    public boolean getVDDestroyContent() {
+        return vdDestroyContent;
+    }
+
    public boolean getVDSystemDecorations() {
        return vdSystemDecorations;
    }
@ -466,6 +471,9 @@ public class Options {
                case "new_display":
                    options.newDisplay = parseNewDisplay(value);
                    break;
+                case "vd_destroy_content":
+                    options.vdDestroyContent = Boolean.parseBoolean(value);
+                    break;
                case "vd_system_decorations":
                    options.vdSystemDecorations = Boolean.parseBoolean(value);
                    break;
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
@ -51,6 +51,8 @@ public final class ControlMessage {
    private int id;
    private byte[] data;
    private boolean on;
+    private int vendorId;
+    private int productId;

    private ControlMessage() {
    }
@ -131,10 +133,12 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createUhidCreate(int id, String name, byte[] reportDesc) {
+    public static ControlMessage createUhidCreate(int id, int vendorId, int productId, String name, byte[] reportDesc) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_UHID_CREATE;
        msg.id = id;
+        msg.vendorId = vendorId;
+        msg.productId = productId;
        msg.text = name;
        msg.data = reportDesc;
        return msg;
@ -237,4 +241,12 @@ public final class ControlMessage {
    public boolean getOn() {
        return on;
    }
+
+    public int getVendorId() {
+        return vendorId;
+    }
+
+    public int getProductId() {
+        return productId;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@ -142,9 +142,11 @@ public class ControlMessageReader {

    private ControlMessage parseUhidCreate() throws IOException {
        int id = dis.readUnsignedShort();
+        int vendorId = dis.readUnsignedShort();
+        int productId = dis.readUnsignedShort();
        String name = parseString(1);
        byte[] data = parseByteArray(2);
-        return ControlMessage.createUhidCreate(id, name, data);
+        return ControlMessage.createUhidCreate(id, vendorId, productId, name, data);
    }

    private ControlMessage parseUhidInput() throws IOException {
--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@ -21,6 +21,7 @@ import android.content.IOnPrimaryClipChangedListener;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
+import android.util.Pair;
 import android.view.InputDevice;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
@ -289,7 +290,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                Device.rotateDevice(getActionDisplayId());
                break;
            case ControlMessage.TYPE_UHID_CREATE:
-                getUhidManager().open(msg.getId(), msg.getText(), msg.getData());
+                getUhidManager().open(msg.getId(), msg.getVendorId(), msg.getProductId(), msg.getText(), msg.getData());
                break;
            case ControlMessage.TYPE_UHID_INPUT:
                getUhidManager().writeInput(msg.getId(), msg.getData());
@ -350,24 +351,47 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        return successCount;
    }

-    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int actionButton, int buttons) {
-        long now = SystemClock.uptimeMillis();
-
+    private Pair<Point, Integer> getEventPointAndDisplayId(Position position) {
        // it hides the field on purpose, to read it with atomic access
        @SuppressWarnings("checkstyle:HiddenField")
        DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a touch event without a display";
+        // In scrcpy, displayData should never be null (a touch event can only be generated from the client when a video frame is present).
+        // However, it is possible to send events without video playback when using scrcpy-server alone (except for virtual displays).
+        assert displayData != null || displayId != Device.DISPLAY_ID_NONE : "Cannot receive a positional event without a display";

-        Point point = displayData.positionMapper.map(position);
-        if (point == null) {
-            if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                Size eventSize = position.getScreenSize();
-                Size currentSize = displayData.positionMapper.getVideoSize();
-                Ln.v("Ignore touch event generated for size " + eventSize + " (current size is " + currentSize + ")");
+        Point point;
+        int targetDisplayId;
+        if (displayData != null) {
+            point = displayData.positionMapper.map(position);
+            if (point == null) {
+                if (Ln.isEnabled(Ln.Level.VERBOSE)) {
+                    Size eventSize = position.getScreenSize();
+                    Size currentSize = displayData.positionMapper.getVideoSize();
+                    Ln.v("Ignore positional event generated for size " + eventSize + " (current size is " + currentSize + ")");
+                }
+                return null;
            }
+            targetDisplayId = displayData.virtualDisplayId;
+        } else {
+            // No display, use the raw coordinates
+            point = position.getPoint();
+            targetDisplayId = displayId;
+        }
+
+        return Pair.create(point, targetDisplayId);
+    }
+
+    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int actionButton, int buttons) {
+        long now = SystemClock.uptimeMillis();
+
+        Pair<Point, Integer> pair = getEventPointAndDisplayId(position);
+        if (pair == null) {
            return false;
        }

+        Point point = pair.first;
+        int targetDisplayId = pair.second;
+
        int pointerIndex = pointersState.getPointerIndex(pointerId);
        if (pointerIndex == -1) {
            Ln.w("Too many pointers for touch event");
@ -421,7 +445,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                    // First button pressed: ACTION_DOWN
                    MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
                            pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(downEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(downEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                        return false;
                    }
                }
@ -432,7 +456,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                if (!InputManager.setActionButton(pressEvent, actionButton)) {
                    return false;
                }
-                if (!Device.injectEvent(pressEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(pressEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                    return false;
                }

@ -446,7 +470,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                    return false;
                }
-                if (!Device.injectEvent(releaseEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(releaseEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                    return false;
                }

@ -454,7 +478,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                    // Last button released: ACTION_UP
                    MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
                            pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(upEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(upEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
                        return false;
                    }
                }
@ -465,27 +489,20 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                DEFAULT_DEVICE_ID, 0, source, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, targetDisplayId, Device.INJECT_MODE_ASYNC);
    }

    private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
        long now = SystemClock.uptimeMillis();

-        // it hides the field on purpose, to read it with atomic access
-        @SuppressWarnings("checkstyle:HiddenField")
-        DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a scroll event without a display";
-
-        Point point = displayData.positionMapper.map(position);
-        if (point == null) {
-            if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                Size eventSize = position.getScreenSize();
-                Size currentSize = displayData.positionMapper.getVideoSize();
-                Ln.v("Ignore scroll event generated for size " + eventSize + " (current size is " + currentSize + ")");
-            }
+        Pair<Point, Integer> pair = getEventPointAndDisplayId(position);
+        if (pair == null) {
            return false;
        }

+        Point point = pair.first;
+        int targetDisplayId = pair.second;
+
        MotionEvent.PointerProperties props = pointerProperties[0];
        props.id = 0;

@ -497,7 +514,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                DEFAULT_DEVICE_ID, 0, InputDevice.SOURCE_MOUSE, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, targetDisplayId, Device.INJECT_MODE_ASYNC);
    }

    /**
@ -691,11 +708,12 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    }

    private void setDisplayPower(boolean on) {
-        // Change the display power of the main display when mirroring a virtual display
+        // Change the power of the main display when mirroring a virtual display
        int targetDisplayId = displayId != Device.DISPLAY_ID_NONE ? displayId : 0;
        boolean setDisplayPowerOk = Device.setDisplayPower(targetDisplayId, on);
        if (setDisplayPowerOk) {
-            keepDisplayPowerOff = !on;
+            // Do not keep display power off for virtual displays: MOD+p must wake up the physical device
+            keepDisplayPowerOff = displayId != Device.DISPLAY_ID_NONE && !on;
            Ln.i("Device display turned " + (on ? "on" : "off"));
            if (cleanUp != null) {
                boolean mustRestoreOnExit = !on;
--- a/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java
@ -48,7 +48,7 @@ public final class UhidManager {
        }
    }

-    public void open(int id, String name, byte[] reportDesc) throws IOException {
+    public void open(int id, int vendorId, int productId, String name, byte[] reportDesc) throws IOException {
        try {
            FileDescriptor fd = Os.open("/dev/uhid", OsConstants.O_RDWR, 0);
            try {
@ -58,7 +58,7 @@ public final class UhidManager {
                    close(old);
                }

-                byte[] req = buildUhidCreate2Req(name, reportDesc);
+                byte[] req = buildUhidCreate2Req(vendorId, productId, name, reportDesc);
                Os.write(fd, req, 0, req.length);

                registerUhidListener(id, fd);
@ -148,7 +148,7 @@ public final class UhidManager {
        }
    }

-    private static byte[] buildUhidCreate2Req(String name, byte[] reportDesc) {
+    private static byte[] buildUhidCreate2Req(int vendorId, int productId, String name, byte[] reportDesc) {
        /*
         * struct uhid_event {
         *     uint32_t type;
@ -174,7 +174,7 @@ public final class UhidManager {
        ByteBuffer buf = ByteBuffer.allocate(280 + reportDesc.length).order(ByteOrder.nativeOrder());
        buf.putInt(UHID_CREATE2);

-        String actualName = name.isEmpty() ? "scrcpy" : "scrcpy: " + name;
+        String actualName = name.isEmpty() ? "scrcpy" : name;
        byte[] utf8Name = actualName.getBytes(StandardCharsets.UTF_8);
        int len = StringUtils.getUtf8TruncationIndex(utf8Name, 127);
        assert len <= 127;
@ -183,8 +183,8 @@ public final class UhidManager {

        buf.putShort((short) reportDesc.length);
        buf.putShort(BUS_VIRTUAL);
-        buf.putInt(0); // vendor id
-        buf.putInt(0); // product id
+        buf.putInt(vendorId);
+        buf.putInt(productId);
        buf.putInt(0); // version
        buf.putInt(0); // country;
        buf.put(reportDesc);
--- a/server/src/main/java/com/genymobile/scrcpy/device/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Device.java
@ -40,6 +40,10 @@ public final class Device {
    public static final int INJECT_MODE_WAIT_FOR_RESULT = InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_RESULT;
    public static final int INJECT_MODE_WAIT_FOR_FINISH = InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH;

+    // The new display power method introduced in Android 15 does not work as expected:
+    // <https://github.com/Genymobile/scrcpy/issues/5530>
+    private static final boolean USE_ANDROID_15_DISPLAY_POWER = false;
+
    private Device() {
        // not instantiable
    }
@ -127,7 +131,7 @@ public final class Device {
    public static boolean setDisplayPower(int displayId, boolean on) {
        assert displayId != Device.DISPLAY_ID_NONE;

-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
+        if (USE_ANDROID_15_DISPLAY_POWER && Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
            return ServiceManager.getDisplayManager().requestDisplayPower(displayId, on);
        }

--- a/server/src/main/java/com/genymobile/scrcpy/util/IO.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/IO.java
@ -72,4 +72,8 @@ public final class IO {
        Throwable cause = e.getCause();
        return cause instanceof ErrnoException && ((ErrnoException) cause).errno == OsConstants.EPIPE;
    }
+
+    public static boolean isBrokenPipe(Exception e) {
+        return e instanceof IOException && isBrokenPipe((IOException) e);
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
@ -53,6 +53,7 @@ public class NewDisplayCapture extends SurfaceCapture {
    private final boolean captureOrientationLocked;
    private final Orientation captureOrientation;
    private final float angle;
+    private final boolean vdDestroyContent;
    private final boolean vdSystemDecorations;

    private VirtualDisplay virtualDisplay;
@ -73,6 +74,7 @@ public class NewDisplayCapture extends SurfaceCapture {
        this.captureOrientation = options.getCaptureOrientation();
        assert captureOrientation != null;
        this.angle = options.getAngle();
+        this.vdDestroyContent = options.getVDDestroyContent();
        this.vdSystemDecorations = options.getVDSystemDecorations();
    }

@ -167,8 +169,10 @@ public class NewDisplayCapture extends SurfaceCapture {
            int flags = VIRTUAL_DISPLAY_FLAG_PUBLIC
                    | VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
                    | VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH
-                    | VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT
-                    | VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;
+                    | VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT;
+            if (vdDestroyContent) {
+                flags |= VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;
+            }
            if (vdSystemDecorations) {
                flags |= VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS;
            }
--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
@ -124,15 +124,9 @@ public class ScreenCapture extends SurfaceCapture {
            inputSize = videoSize;
        }

-        int virtualDisplayId;
-        PositionMapper positionMapper;
        try {
            virtualDisplay = ServiceManager.getDisplayManager()
                    .createVirtualDisplay("scrcpy", inputSize.getWidth(), inputSize.getHeight(), displayId, surface);
-            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
-
-            // The positions are relative to the virtual display, not the original display (so use inputSize, not deviceSize!)
-            positionMapper = PositionMapper.create(videoSize, transform, inputSize);
            Ln.d("Display: using DisplayManager API");
        } catch (Exception displayManagerException) {
            try {
@ -140,11 +134,7 @@ public class ScreenCapture extends SurfaceCapture {

                Size deviceSize = displayInfo.getSize();
                int layerStack = displayInfo.getLayerStack();
-
                setDisplaySurface(display, surface, deviceSize.toRect(), inputSize.toRect(), layerStack);
-                virtualDisplayId = displayId;
-
-                positionMapper = PositionMapper.create(videoSize, transform, deviceSize);
                Ln.d("Display: using SurfaceControl API");
            } catch (Exception surfaceControlException) {
                Ln.e("Could not create display using DisplayManager", displayManagerException);
@ -154,6 +144,18 @@ public class ScreenCapture extends SurfaceCapture {
        }

        if (vdListener != null) {
+            int virtualDisplayId;
+            PositionMapper positionMapper;
+            if (virtualDisplay == null || displayId == 0) {
+                // Surface control or main display: send all events to the original display, relative to the device size
+                Size deviceSize = displayInfo.getSize();
+                positionMapper = PositionMapper.create(videoSize, transform, deviceSize);
+                virtualDisplayId = displayId;
+            } else {
+                // The positions are relative to the virtual display, not the original display (so use inputSize, not deviceSize!)
+                positionMapper = PositionMapper.create(videoSize, transform, inputSize);
+                virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
+            }
            vdListener.onNewVirtualDisplay(virtualDisplayId, positionMapper);
        }
    }
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
@ -112,8 +112,12 @@ public class SurfaceEncoder implements AsyncProcessor {
                        // The capture might have been closed internally (for example if the camera is disconnected)
                        alive = !stopped.get() && !capture.isClosed();
                    }
-                } catch (IllegalStateException | IllegalArgumentException e) {
-                    Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
+                } catch (IllegalStateException | IllegalArgumentException | IOException e) {
+                    if (IO.isBrokenPipe(e)) {
+                        // Do not retry on broken pipe, which is expected on close because the socket is closed by the client
+                        throw e;
+                    }
+                    Ln.e("Capture/encoding error: " + e.getClass().getName() + ": " + e.getMessage());
                    if (!prepareRetry(size)) {
                        throw e;
                    }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java
@ -6,6 +6,7 @@ import com.genymobile.scrcpy.util.Ln;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.os.IBinder;
+import android.system.Os;

 import java.lang.reflect.Method;

@ -21,7 +22,9 @@ public final class DisplayControl {
            Class<?> classLoaderFactoryClass = Class.forName("com.android.internal.os.ClassLoaderFactory");
            Method createClassLoaderMethod = classLoaderFactoryClass.getDeclaredMethod("createClassLoader", String.class, String.class, String.class,
                    ClassLoader.class, int.class, boolean.class, String.class);
-            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, "/system/framework/services.jar", null, null,
+
+            String systemServerClasspath = Os.getenv("SYSTEMSERVERCLASSPATH");
+            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, systemServerClasspath, null, null,
                    ClassLoader.getSystemClassLoader(), 0, true, null);

            displayControlClass = classLoader.loadClass("com.android.server.display.DisplayControl");
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@ -192,6 +192,9 @@ public final class DisplayManager {
                        if ("onDisplayChanged".equals(method.getName())) {
                            listener.onDisplayChanged((int) args[0]);
                        }
+                        if ("toString".equals(method.getName())) {
+                            return "DisplayListener";
+                        }
                        return null;
                    });
            try {
--- a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
@ -322,6 +322,8 @@ public class ControlMessageReaderTest {
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_UHID_CREATE);
        dos.writeShort(42); // id
+        dos.writeShort(0x1234); // vendorId
+        dos.writeShort(0x5678); // productId
        dos.writeByte(3); // name size
        dos.write("ABC".getBytes(StandardCharsets.US_ASCII));
        byte[] data = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
@ -335,6 +337,8 @@ public class ControlMessageReaderTest {
        ControlMessage event = reader.read();
        Assert.assertEquals(ControlMessage.TYPE_UHID_CREATE, event.getType());
        Assert.assertEquals(42, event.getId());
+        Assert.assertEquals(0x1234, event.getVendorId());
+        Assert.assertEquals(0x5678, event.getProductId());
        Assert.assertEquals("ABC", event.getText());
        Assert.assertArrayEquals(data, event.getData());
Author	SHA1	Message	Date
Romain Vimont	cac8e9c821	Happy new year 2025!	2025-01-01 15:01:18 +01:00
Jaime J. Denizard	1c7680f689	Fix some grammatical issues in documentation PR #5722 <https://github.com/Genymobile/scrcpy/pull/5722> Signed-off-by: Romain Vimont <rom@rom1v.com>	2025-01-01 14:59:11 +01:00
Markus	5ae01749bf	Reintroduce WinGet install note This semantically reverts c27ab46efbcab0b9558a91e691d799ffef496c97. WinGet package has been fixed by: <https://github.com/microsoft/winget-pkgs/pull/196442> Refs #4027 <https://github.com/Genymobile/scrcpy/issues/4027> PR #5686 <https://github.com/Genymobile/scrcpy/pull/5686> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-12-19 18:34:20 +01:00
Romain Vimont	1fd57ede1f	Move "screen off timeout" section in documentation Place the "screen off timeout" section right after "stay awake", as they serve a similar purpose.	2024-12-17 13:09:24 +01:00
Romain Vimont	48fc18e380	Add must-know tips All users should be aware of the main shortcuts and the most important setting to improve performance.	2024-12-17 12:24:50 +01:00
Romain Vimont	ea6a94d355	Fix mouse documentation formatting Make the format consistent with the shortcuts documentation.	2024-12-17 12:21:57 +01:00
Romain Vimont	0e2d084751	Update links to 3.1	2024-12-09 22:42:34 +01:00
Romain Vimont	754f4fc6fe	Bump version to 3.1	2024-12-09 22:29:51 +01:00
Romain Vimont	aca6d30af5	Include dav1d in releases Scrcpy supports AV1, but no decoder was provided in binary releases. Include dav1d: - <https://www.videolan.org/projects/dav1d.html> - <https://code.videolan.org/videolan/dav1d> Fixes #4744 <https://github.com/Genymobile/scrcpy/issues/4744> PR #5644 <https://github.com/Genymobile/scrcpy/pull/5644>	2024-12-09 19:07:18 +01:00
Romain Vimont	f2018e026c	Remove broken macOS flags Due to a typo (a space was missing before the second '-L'), the resulting LDFLAGS value was broken: "-L/opt/homebrew/opt/zlib/lib-L/opt/homebrew/opt/libiconv/lib" This proves that the flag was useless. Remove it. Refs #5517 comment <https://github.com/Genymobile/scrcpy/pull/5517#issuecomment-2495522201> PR #5644 <https://github.com/Genymobile/scrcpy/pull/5644>	2024-12-09 19:07:03 +01:00
Simon Chan	a507b4f559	Fix DisplayControl classpath Use the full system server classpath to load DisplayControl, so that turning the screen off on Android 14+ does not crash on certain devices. Refs #4544 comment <https://github.com/Genymobile/scrcpy/issues/4544#issuecomment-2526999714> Fixes #4544 <https://github.com/Genymobile/scrcpy/issues/4544> Fixes #5274 <https://github.com/Genymobile/scrcpy/issues/5274> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-12-09 10:29:20 +01:00
Romain Vimont	a9aadc95df	Start cleanup process with setsid() Reimplement c59a3c3169973abb4ce236e06990d58ae6567481 using Os.setsid(). Refs #5613 comment <https://github.com/Genymobile/scrcpy/pull/5613#issuecomment-2527045669> Suggested-by: Simon Chan <1330321+yume-chan@users.noreply.github.com>	2024-12-09 09:33:08 +01:00
Romain Vimont	28b5bfb90e	Revert "Start cleanup process with setsid or nohup" This reverts commit c59a3c3169973abb4ce236e06990d58ae6567481. The next commit will use Os.setsid() instead.	2024-12-09 09:29:29 +01:00
Romain Vimont	65256d7cc7	Upgrade SDL (2.30.10)	2024-12-08 18:17:07 +01:00
Romain Vimont	328bb74f80	Log gamepad added/removed Add a log when a gamepad is added or removed. PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 18:16:57 +01:00
Withoutruless	7418fd0662	Use Xbox 360 gamepad name Some games do not work without a known gamepad name. Fixes #5362 <https://github.com/Genymobile/scrcpy/issues/5362> Refs #5623 comment <https://github.com/Genymobile/scrcpy/pull/5623#issuecomment-2525685323> PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-12-08 17:01:03 +01:00
Romain Vimont	0a09518a49	Use Xbox 360 gamepad USB ids Use the vendorId and productId of an Xbox 360 controller for better support (the HID gamepad protocol used in scrcpy is similar to that of the Xbox 360 controller). Fixes #5362 <https://github.com/Genymobile/scrcpy/issues/5362> PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 11:00:18 +01:00
Romain Vimont	27a5934a1d	Define UHID vendorId and productId from the client Let the client choose the USB ids, that it transmits in UHID_CREATE requests. PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 11:00:18 +01:00
Romain Vimont	86a68fac6c	Fix gamepad axis initial values By default, initialize axis to 0, which is represented by 0x8000 as a 16-bit unsigned value. PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 11:00:18 +01:00
Romain Vimont	1786f28e6f	Fix gamepad HID descriptor Use Z and Rz for L2/R2, which are more widely supported than Brake/Accelerator. The right stick must then be bound to Rx and Ry. Fixes #5362 <https://github.com/Genymobile/scrcpy/issues/5362> PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 11:00:18 +01:00
Romain Vimont	9cf4d52721	Fix HID gamepad comments PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 11:00:18 +01:00
Romain Vimont	4bd1c5981d	Split gamepad device added/removed events Use two separate callbacks for gamepad device added and gamepad device removed. It looks cleaner. PR #5623 <https://github.com/Genymobile/scrcpy/pull/5623>	2024-12-08 11:00:18 +01:00
Romain Vimont	c59a3c3169	Start cleanup process with setsid or nohup If available, start the cleanup process in a new session to reduce the likelihood of it being terminated along with the scrcpy server process on some devices. The binaries setsid and nohup are often available, but it is not guaranteed. Refs #5601 <https://github.com/Genymobile/scrcpy/issues/5601> PR #5613 <https://github.com/Genymobile/scrcpy/pull/5613>	2024-12-08 10:58:22 +01:00
Romain Vimont	2780e0bd7b	Do not interrupt cleanup configuration Some options, such as --show-touches or --stay-awake, modify Android settings and must be restored upon exit. If scrcpy terminates (e.g. due to an early error) in the middle of the clean up configuration, the device may be left in an inconsistent state (some settings might be changed but not restored). This issue can be reproduced with high probability by forcing scrcpy to fail: scrcpy --show-touches --video-encoder=fail To prevent this problem, ensure that the clean up thread is not interrupted until the clean up process is started. Refs #5601 <https://github.com/Genymobile/scrcpy/issues/5601> PR #5613 <https://github.com/Genymobile/scrcpy/pull/5613>	2024-12-08 10:58:07 +01:00
Romain Vimont	6c6607d404	Add --no-vd-destroy-content Add an option to disable the following flag for virtual displays: DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL With this option, when the virtual display is closed, the running apps are moved to the main display rather than being destroyed. PR #5615 <https://github.com/Genymobile/scrcpy/pull/5615>	2024-12-08 09:33:03 +01:00
Romain Vimont	988174805c	Fix boolean assignment On --no-vd-system-decoration, the boolean option must be set to false. It was wrongly assigned from optarg (this worked because optarg is NULL at this point, so it was converted to false). PR #5615 <https://github.com/Genymobile/scrcpy/pull/5615>	2024-12-08 09:26:53 +01:00
Romain Vimont	f90dc216d1	Refactor virtual display properties initialization Following the changes from the previous commit, the behavior is now identical when mirroring the main display or using the SurfaceControl API. Factorize the code to perform the initialization in a single location. Refs #5605 <https://github.com/Genymobile/scrcpy/issues/5605> PR #5614 <https://github.com/Genymobile/scrcpy/pull/5614>	2024-12-07 20:09:14 +01:00
Romain Vimont	97fa77c76c	Inject main display events to the original display When mirroring a secondary display, touch and scroll events must be sent to the mirroring virtual display id (with coordinates relative to the virtual display size), rather than to the original display (with coordinates relative to the original display size). This behavior, introduced by d19396718ee0c0ba7fb578f595a6553c0458da59, was also applied for the main display for consistency. However, it causes some UI elements to become unclickable. To minimize inconveniences, restore the previous behavior when mirroring the main display: send all events to the original display id (0) with coordinates relative to the original display size. Fixes #5545 <https://github.com/Genymobile/scrcpy/issues/5545> Fixes #5605 <https://github.com/Genymobile/scrcpy/issues/5605> Fixes #5616 <https://github.com/Genymobile/scrcpy/issues/5616> Refs #4598 <https://github.com/Genymobile/scrcpy/issues/4598> Refs #5137 <https://github.com/Genymobile/scrcpy/issues/5137> Refs #5370 <https://github.com/Genymobile/scrcpy/pull/5370> PR #5614 <https://github.com/Genymobile/scrcpy/pull/5614>	2024-12-07 20:08:49 +01:00
Romain Vimont	baa10ed0a3	Update links to 3.0.2	2024-12-04 22:48:27 +01:00
Romain Vimont	2ed2247e8f	Bump version to 3.0.2 The version was not bumped for 3.0.1.	2024-12-04 22:35:25 +01:00
Romain Vimont	5febb1e9fb	Update links to 3.0.1	2024-12-04 21:46:06 +01:00
Romain Vimont	5c3626ed47	Handle broken pipe errors specifically Since 9555d3a537a828731ad89ef5258ba537acf8cc11, a capture/encoding error was sometimes logged on exit.	2024-12-04 18:38:23 +01:00
Romain Vimont	0e473eb005	Reset TCP/IP connection with a '+' prefix When running scrcpy with --tcpip=xx.xx.xx.xx, to make sure a new working connection is established, it was first disconnected by a call to: adb disconnect <addr> However, this caused all running instances connected to that address to be killed. Running several instances of scrcpy on the same device is now useful with virtual displays, so change the default behavior to NOT disconnect. To force a reconnection, a '+' prefix can be added: scrcpy --tcpip=+192.168.0.x Fixes #5562 <https://github.com/Genymobile/scrcpy/issues/5562>	2024-12-04 13:16:51 +01:00
Romain Vimont	b26b4fb745	Document launchers in virtual displays Mention how to start a launcher in a virtual display. Refs #5592 <https://github.com/Genymobile/scrcpy/issues/5592>	2024-12-04 13:10:35 +01:00
Romain Vimont	9555d3a537	Retry capture on IOException If the capture fails with an IOException, retry with a lower resolution. Fixes #5539 <https://github.com/Genymobile/scrcpy/issues/5539>	2024-12-03 23:06:33 +01:00
Romain Vimont	aea6a371aa	Remove scrcpy wrapper script for static builds All portable builds now use the files located in the same directory as the scrcpy executable by default. PR #5560 <https://github.com/Genymobile/scrcpy/pull/5560>	2024-12-02 18:23:18 +01:00
Romain Vimont	dc6c279b1e	Log adb executable path Log the ADB executable path (at the DEBUG level) if it is not the default one. PR #5560 <https://github.com/Genymobile/scrcpy/pull/5560>	2024-12-02 18:23:18 +01:00
Romain Vimont	6d0ac3626d	Use local adb in portable builds For non-Windows portable builds, use the absolute path to the adb executable located in the same directory as scrcpy. On Windows, just use "adb", which is sufficient to use the local one. PR #5560 <https://github.com/Genymobile/scrcpy/pull/5560>	2024-12-02 18:23:18 +01:00
Romain Vimont	beee42fb06	Load ADB value using sc_get_env() Contrary to getenv(), the result of sc_get_env() is encoded in UTF-8 on all platforms. Since it is allocated, it requires an explicit init() and destroy() functions. PR #5560 <https://github.com/Genymobile/scrcpy/pull/5560>	2024-12-02 18:23:18 +01:00
Romain Vimont	131372d2c4	Expose sc_get_env() to read environment variable Contrary to getenv(), sc_get_env() returns an allocated string that is guaranteed to be encoded in UTF-8 on all platforms (it uses _wgetenv() internally on Windows and converts the strings). PR #5560 <https://github.com/Genymobile/scrcpy/pull/5560>	2024-12-02 18:23:18 +01:00
Genxster1998	0fd7534bd5	Add method to get executable path on MacOS PR #5560 <https://github.com/Genymobile/scrcpy/pull/5560> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-12-02 18:23:18 +01:00
Romain Vimont	36574d2ee7	Fix .tar.gz compression The generated .tar.gz releases were in fact non-gzipped tarballs. Fixes #5581 <https://github.com/Genymobile/scrcpy/issues/5581>	2024-12-02 08:54:57 +01:00
Romain Vimont	3b2b3625e4	Accept positional control events without display The position of touch and scroll must normally be "resolved" with a "position mapper" associated to the display. But to support the injection of such events with scrcpy-server alone without video, handle the case where there is no display. Fixes #5542 <https://github.com/Genymobile/scrcpy/issues/5542>	2024-12-01 17:22:47 +01:00
Romain Vimont	b2cdaa4bdc	Factorize position mapper resolution The code was duplicated for touch and scroll events. Extract it to a private function. Refs #5542 <https://github.com/Genymobile/scrcpy/issues/5542>	2024-12-01 17:22:47 +01:00
Romain Vimont	d01373c03c	Enable close-on-interrupt for macOS This behavior is also necessary on macOS. Fixes #5536 <https://github.com/Genymobile/scrcpy/issues/5536>	2024-11-28 21:02:51 +01:00
Romain Vimont	ff06b6dcc1	Split network macro conditions On Windows, interrupting a socket with shutdown() does not wake up accept() or read() calls, the socket must be closed. Introduce a new macro constant SC_SOCKET_CLOSE_ON_INTERRUPT, distinct of _WIN32, because Windows will not be the only platform exhibiting this behavior. Refs #5536 <https://github.com/Genymobile/scrcpy/issues/5536>	2024-11-28 21:02:31 +01:00
Romain Vimont	017a3672a4	Check GitHub runner architecture Make sure that the releases are built for the expected target arch.	2024-11-28 20:09:21 +01:00
Genxster1998	c1351b250e	Build macOS x86_64 release Add actions to build a release for macOS x86_64 in addition to the aarch64 version. PR #5526 <https://github.com/Genymobile/scrcpy/pull/5526> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-11-28 20:09:21 +01:00
Romain Vimont	618a978f5b	Specify architecture for Linux and macOS releases PR #5526 <https://github.com/Genymobile/scrcpy/pull/5526> Co-authored-by: Genxster1998 <ck.2229.ck@gmail.com>	2024-11-28 20:09:18 +01:00
Romain Vimont	acddd811bf	Rename TARGET to TARGET_DIRNAME This avoids confusion with "$1", which is also documented as "<target>". If "$1" (the target) is "linux", then TARGET_DIRNAME is "scrcpy-linux-v3.0".	2024-11-28 19:59:06 +01:00
Romain Vimont	ee9f7126ff	Use FORMAT variable name in package_client.sh The format is used several times, avoid using "$2" directly.	2024-11-28 19:58:41 +01:00
Romain Vimont	a18ed1ee7a	Simplify GitHub actions step descriptions Each step is executed within the context of an action, so mentioning the name of the action is unnecessary.	2024-11-28 19:58:08 +01:00
Romain Vimont	678025b316	Remove apt update on GitHub Actions Assume the image is up-to-date.	2024-11-28 19:40:47 +01:00
Romain Vimont	3e689020ba	Fix null return value in DisplayManager.toString() Ensure DisplayListener.toString() returns a non-null value to prevent a NullPointerException on certain devices. Fixes #5537 <https://github.com/Genymobile/scrcpy/issues/5537>	2024-11-27 07:45:35 +01:00
Romain Vimont	3d1f036c04	Rollback to old --turn-screen-off for Android 15 When the screen is turned off with the new display power method introduced in Android 15, video mirroring freezes. Use the Android 14 method for Android 15. Refs 58ba00fa060c9a1f439120f8869ed106e1c935f9 Refs #5418 <https://github.com/Genymobile/scrcpy/pull/5418> Fixes #5530 <https://github.com/Genymobile/scrcpy/issues/5530>	2024-11-26 15:55:16 +01:00
Romain Vimont	3d5294c1e5	Set main display power for virtual display Change the display power of the main display when mirroring a virtual display, to make it possible to turn off the screen. Fixes #5522 <https://github.com/Genymobile/scrcpy/issues/5522> Refs #5530 <https://github.com/Genymobile/scrcpy/issues/5530>	2024-11-26 15:43:41 +01:00
Romain Vimont	1d2f16dbb5	Fix documentation about default mouse mode When video playback is turned off, the default mouse mode has changed from "uhid" to "disabled" in 2c25fd7a8082307da19645a690c31403903fbb1e. Update the documentation accordingly. Refs #5410 <https://github.com/Genymobile/scrcpy/issues/5410> Refs #5542 <https://github.com/Genymobile/scrcpy/issues/5542>	2024-11-26 14:10:11 +01:00
Romain Vimont	7fef051976	Add BlueSky link Scrcpy now has a BlueSky account.	2024-11-25 20:06:32 +01:00
Wouter Schoot	da8ade88fd	Fix link to virtual display doc in README PR #5525 <https://github.com/Genymobile/scrcpy/pull/5525> Signed-off-by: Romain Vimont <rom@rom1v.com>	2024-11-25 08:21:06 +01:00