Document filter order

Matrix multiplication is not commutative, so the order of filters
matters.

PR #5455 <https://github.com/Genymobile/scrcpy/pull/5455>

.github/workflows/release.yml

@@ -6,15 +6,11 @@ on:
       name:
         description: 'Version name (default is ref name)'
 
-env:
-  # $VERSION is used by release scripts
-  VERSION: ${{ github.event.inputs.name || github.ref_name }}
-
 jobs:
-  test-scrcpy-server:
+  build-scrcpy-server:
     runs-on: ubuntu-latest
     env:
-      GRADLE: gradle  # use native gradle instead of ./gradlew in scripts
+      GRADLE: gradle  # use native gradle instead of ./gradlew in release.mk
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -26,45 +22,16 @@ jobs:
           java-version: '17'
 
       - name: Test scrcpy-server
-        run: release/test_server.sh
+        run: make -f release.mk test-server
 
-  build-scrcpy-server:
-    runs-on: ubuntu-latest
-    env:
-      GRADLE: gradle  # use native gradle instead of ./gradlew in scripts
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - name: Build scrcpy-server
+        run: make -f release.mk build-server
 
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Build
-        run: release/build_server.sh
-
-      - name: Upload artifact
+      - name: Upload scrcpy-server artifact
         uses: actions/upload-artifact@v4
         with:
           name: scrcpy-server
-          path: release/work/build-server/server/scrcpy-server
-
-  test-build-scrcpy-server-without-gradle:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Build without gradle
-        run: server/build_without_gradle.sh
+          path: build-server/server/scrcpy-server
 
   test-client:
     runs-on: ubuntu-latest
@@ -74,52 +41,18 @@ 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 \
-             libv4l-dev
-
-      - name: Test
-        run: release/test_client.sh
-
-  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 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
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev
 
       - name: Build
-        run: release/build_linux.sh x86_64
-
-      # upload-artifact does not preserve permissions
-      - name: Tar
         run: |
-            cd release/work/build-linux-x86_64
-            mkdir dist-tar
-            cd dist-tar
-            tar -C .. -cvf dist.tar.gz dist/
+          meson setup d -Db_sanitize=address,undefined
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-linux-x86_64-intermediate
-          path: release/work/build-linux-x86_64/dist-tar/
+      - name: Test
+        run: |
+          meson test -Cd
 
   build-win32:
     runs-on: ubuntu-latest
@@ -129,6 +62,7 @@ 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 \
@@ -137,22 +71,14 @@ jobs:
       - name: Workaround for old meson version run by Github Actions
         run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt
 
-      - name: Build
-        run: release/build_windows.sh 32
+      - name: Build scrcpy win32
+        run: make -f release.mk build-win32
 
-      # upload-artifact does not preserve permissions
-      - name: Tar
-        run: |
-            cd release/work/build-win32
-            mkdir dist-tar
-            cd dist-tar
-            tar -C .. -cvf dist.tar.gz dist/
-
-      - name: Upload artifact
+      - name: Upload build-win32 artifact
         uses: actions/upload-artifact@v4
         with:
           name: build-win32-intermediate
-          path: release/work/build-win32/dist-tar/
+          path: build-win32/dist/
 
   build-win64:
     runs-on: ubuntu-latest
@@ -162,6 +88,7 @@ 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 \
@@ -170,137 +97,24 @@ jobs:
       - name: Workaround for old meson version run by Github Actions
         run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt
 
-      - name: Build
-        run: release/build_windows.sh 64
+      - name: Build scrcpy win64
+        run: make -f release.mk build-win64
 
-      # upload-artifact does not preserve permissions
-      - name: Tar
-        run: |
-            cd release/work/build-win64
-            mkdir dist-tar
-            cd dist-tar
-            tar -C .. -cvf dist.tar.gz dist/
-
-      - name: Upload artifact
+      - name: Upload build-win64 artifact
         uses: actions/upload-artifact@v4
         with:
           name: build-win64-intermediate
-          path: release/work/build-win64/dist-tar/
+          path: build-win64/dist/
 
-  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
-
-      - name: Install dependencies
-        run: |
-            brew install meson ninja nasm libiconv zlib automake autoconf \
-                libtool
-
-      - name: Build
-        run: release/build_macos.sh aarch64
-
-      # upload-artifact does not preserve permissions
-      - name: Tar
-        run: |
-            cd release/work/build-macos-aarch64
-            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-aarch64-intermediate
-          path: release/work/build-macos-aarch64/dist-tar/
-
-  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-x86_64
-    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-linux-x86_64
-        uses: actions/download-artifact@v4
-        with:
-          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-x86_64
-            tar xf dist-tar/dist.tar.gz
-
-      - name: Package
-        run: release/package_client.sh linux-x86_64 tar.gz
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-linux-x86_64
-          path: release/output/
-
-  package-win32:
+  package:
     needs:
       - build-scrcpy-server
       - build-win32
+      - build-win64
     runs-on: ubuntu-latest
+    env:
+      # $VERSION is used by release.mk
+      VERSION: ${{ github.event.inputs.name || github.ref_name }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -309,194 +123,25 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: scrcpy-server
-          path: release/work/build-server/server/
+          path: build-server/server/
 
       - name: Download build-win32
         uses: actions/download-artifact@v4
         with:
           name: build-win32-intermediate
-          path: release/work/build-win32/dist-tar/
-
-      # upload-artifact does not preserve permissions
-      - name: Detar
-        run: |
-            cd release/work/build-win32
-            tar xf dist-tar/dist.tar.gz
-
-      - name: Package
-        run: release/package_client.sh win32 zip
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-win32
-          path: release/output/
-
-  package-win64:
-    needs:
-      - build-scrcpy-server
-      - build-win64
-    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/
+          path: build-win32/dist/
 
       - name: Download build-win64
         uses: actions/download-artifact@v4
         with:
           name: build-win64-intermediate
-          path: release/work/build-win64/dist-tar/
-
-      # upload-artifact does not preserve permissions
-      - name: Detar
-        run: |
-            cd release/work/build-win64
-            tar xf dist-tar/dist.tar.gz
+          path: build-win64/dist/
 
       - name: Package
-        run: release/package_client.sh win64 zip
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-win64
-          path: release/output
-
-  package-macos-aarch64:
-    needs:
-      - build-scrcpy-server
-      - 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
-        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
-        uses: actions/download-artifact@v4
-        with:
-          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-x86_64
-            tar xf dist-tar/dist.tar.gz
-
-      - name: Package
-        run: release/package_client.sh macos-x86_64 tar.gz
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-macos-x86_64
-          path: release/output/
-
-  release:
-    needs:
-      - build-scrcpy-server
-      - package-linux-x86_64
-      - package-win32
-      - package-win64
-      - package-macos-aarch64
-      - package-macos-x86_64
-    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 release-linux-x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: release-linux-x86_64
-          path: release/output/
-
-      - name: Download release-win32
-        uses: actions/download-artifact@v4
-        with:
-          name: release-win32
-          path: release/output/
-
-      - name: Download release-win64
-        uses: actions/download-artifact@v4
-        with:
-          name: release-win64
-          path: release/output/
-
-      - name: Download release-macos-aarch64
-        uses: actions/download-artifact@v4
-        with:
-          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
-        run: release/package_server.sh
-
-      - name: Generate checksums
-        run: release/generate_checksums.sh
+        run: make -f release.mk package
 
       - name: Upload release artifact
         uses: actions/upload-artifact@v4
         with:
           name: scrcpy-release-${{ env.VERSION }}
-          path: release/output
+          path: release-${{ env.VERSION }}

LICENSE

@@ -188,7 +188,7 @@
       identification within third-party archives.
 
    Copyright (C) 2018 Genymobile
-   Copyright (C) 2018-2025 Romain Vimont
+   Copyright (C) 2018-2024 Romain Vimont
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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.1)
+# scrcpy (v2.7)
 
 <img src="app/data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
 
@@ -74,20 +74,10 @@ Note that USB debugging is not required to run scrcpy in [OTG mode](doc/otg.md).
 ## Get the app
 
  - [Linux](doc/linux.md)
- - [Windows](doc/windows.md) (read [how to run](doc/windows.md#run))
+ - [Windows](doc/windows.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.
@@ -151,7 +141,7 @@ documented in the following pages:
  - [Device](doc/device.md)
  - [Window](doc/window.md)
  - [Recording](doc/recording.md)
- - [Virtual display](doc/virtual_display.md)
+ - [Virtual display](doc/virtual_displays.md)
  - [Tunnels](doc/tunnels.md)
  - [OTG](doc/otg.md)
  - [Camera](doc/camera.md)
@@ -191,7 +181,6 @@ 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)
 
 
@@ -210,7 +199,7 @@ work][donate]:
 ## Licence
 
     Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2025 Romain Vimont
+    Copyright (C) 2018-2024 Romain Vimont
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/data/bash-completion/scrcpy

@@ -57,8 +57,6 @@ _scrcpy() {
         --no-mipmaps
         --no-mouse-hover
         --no-power-on
-        --no-vd-destroy-content
-        --no-vd-system-decorations
         --no-video
         --no-video-playback
         --orientation=
@@ -196,7 +194,6 @@ _scrcpy() {
         |--display-id \
         |--max-fps \
         |-m|--max-size \
-        |--new-display \
         |-p|--port \
         |--push-target \
         |--rotation \

app/data/zsh-completion/_scrcpy

@@ -63,8 +63,6 @@ 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]'
     '--orientation=[Set the video orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'

app/deps/adb.sh

@@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common
 
-VERSION=35.0.2
-FILENAME=platform-tools_r$VERSION-win.zip
-PROJECT_DIR=platform-tools-$VERSION-windows
-SHA256SUM=2975a3eac0b19182748d64195375ad056986561d994fffbdc64332a516300bb9
+VERSION=35.0.0
+FILENAME=platform-tools_r$VERSION-windows.zip
+PROJECT_DIR=platform-tools-$VERSION
+SHA256SUM=7ab78a8f8b305ae4d0de647d99c43599744de61a0838d3a47bda0cdffefee87e
 
 cd "$SOURCES_DIR"
 
@@ -27,6 +27,6 @@ else
     rmdir "$ZIP_PREFIX"
 fi
 
-mkdir -p "$INSTALL_DIR/adb-windows"
-cd "$INSTALL_DIR/adb-windows"
-cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/adb-windows/"
+mkdir -p "$INSTALL_DIR/$HOST/bin"
+cd "$INSTALL_DIR/$HOST/bin"
+cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/$HOST/bin/"

app/deps/adb_linux.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DEPS_DIR"
-. common
-
-VERSION=35.0.2
-FILENAME=platform-tools_r$VERSION-linux.zip
-PROJECT_DIR=platform-tools-$VERSION-linux
-SHA256SUM=acfdcccb123a8718c46c46c059b2f621140194e5ec1ac9d81715be3d6ab6cd0a
-
-cd "$SOURCES_DIR"
-
-if [[ -d "$PROJECT_DIR" ]]
-then
-    echo "$PWD/$PROJECT_DIR" found
-else
-    get_file "https://dl.google.com/android/repository/$FILENAME" "$FILENAME" "$SHA256SUM"
-    mkdir -p "$PROJECT_DIR"
-    cd "$PROJECT_DIR"
-    ZIP_PREFIX=platform-tools
-    unzip "../$FILENAME" "$ZIP_PREFIX"/adb
-    mv "$ZIP_PREFIX"/* .
-    rmdir "$ZIP_PREFIX"
-fi
-
-mkdir -p "$INSTALL_DIR/adb-linux"
-cd "$INSTALL_DIR/adb-linux"
-cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/adb-linux/"

app/deps/adb_macos.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
-cd "$DEPS_DIR"
-. common
-
-VERSION=35.0.2
-FILENAME=platform-tools_r$VERSION-darwin.zip
-PROJECT_DIR=platform-tools-$VERSION-darwin
-SHA256SUM=1820078db90bf21628d257ff052528af1c61bb48f754b3555648f5652fa35d78
-
-cd "$SOURCES_DIR"
-
-if [[ -d "$PROJECT_DIR" ]]
-then
-    echo "$PWD/$PROJECT_DIR" found
-else
-    get_file "https://dl.google.com/android/repository/$FILENAME" "$FILENAME" "$SHA256SUM"
-    mkdir -p "$PROJECT_DIR"
-    cd "$PROJECT_DIR"
-    ZIP_PREFIX=platform-tools
-    unzip "../$FILENAME" "$ZIP_PREFIX"/adb
-    mv "$ZIP_PREFIX"/* .
-    rmdir "$ZIP_PREFIX"
-fi
-
-mkdir -p "$INSTALL_DIR/adb-macos"
-cd "$INSTALL_DIR/adb-macos"
-cp -r "$SOURCES_DIR/$PROJECT_DIR"/. "$INSTALL_DIR/adb-macos/"

app/deps/common

@@ -1,47 +1,25 @@
 #!/usr/bin/env bash
 # This file is intended to be sourced by other scripts, not executed
 
-process_args() {
-    if [[ $# != 3 ]]
-    then
-        # <host>: win32 or win64
-        # <build_type>: native or cross
-        # <link_type>: static or shared
-        echo "Syntax: $0 <host> <build_type> <link_type>" >&2
-        exit 1
-    fi
+if [[ $# != 1 ]]
+then
+    # <host>: win32 or win64
+    echo "Syntax: $0 <host>" >&2
+    exit 1
+fi
 
-    HOST="$1"
-    BUILD_TYPE="$2" # native or cross
-    LINK_TYPE="$3" # static or shared
-    DIRNAME="$HOST-$BUILD_TYPE-$LINK_TYPE"
+HOST="$1"
 
-    if [[ "$BUILD_TYPE" != native && "$BUILD_TYPE" != cross ]]
-    then
-        echo "Unsupported build type (expected native or cross): $BUILD_TYPE" >&2
-        exit 1
-    fi
-
-    if [[ "$LINK_TYPE" != static && "$LINK_TYPE" != shared ]]
-    then
-        echo "Unsupported link type (expected static or shared): $LINK_TYPE" >&2
-        exit 1
-    fi
-
-    if [[ "$BUILD_TYPE" == cross ]]
-    then
-        if [[ "$HOST" = win32 ]]
-        then
-            HOST_TRIPLET=i686-w64-mingw32
-        elif [[ "$HOST" = win64 ]]
-        then
-            HOST_TRIPLET=x86_64-w64-mingw32
-        else
-            echo "Unsupported cross-build to host: $HOST" >&2
-            exit 1
-        fi
-    fi
-}
+if [[ "$HOST" = win32 ]]
+then
+    HOST_TRIPLET=i686-w64-mingw32
+elif [[ "$HOST" = win64 ]]
+then
+    HOST_TRIPLET=x86_64-w64-mingw32
+else
+    echo "Unsupported host: $HOST" >&2
+    exit 1
+fi
 
 DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
@@ -59,7 +37,7 @@ checksum() {
     local file="$1"
     local sum="$2"
     echo "$file: verifying checksum..."
-    echo "$sum  $file" | shasum -a256 -c
+    echo "$sum  $file" | sha256sum -c
 }
 
 get_file() {

app/deps/dav1d.sh

@@ -1,68 +0,0 @@
-#!/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

app/deps/ffmpeg.sh

@@ -3,12 +3,11 @@ set -ex
 DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common
-process_args "$@"
 
-VERSION=7.1
+VERSION=7.0.2
 FILENAME=ffmpeg-$VERSION.tar.xz
 PROJECT_DIR=ffmpeg-$VERSION
-SHA256SUM=40973D44970DBC83EF302B0609F2E74982BE2D85916DD2EE7472D30678A7ABE6
+SHA256SUM=8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389
 
 cd "$SOURCES_DIR"
 
@@ -23,121 +22,68 @@ fi
 mkdir -p "$BUILD_DIR/$PROJECT_DIR"
 cd "$BUILD_DIR/$PROJECT_DIR"
 
-if [[ -d "$DIRNAME" ]]
+if [[ "$HOST" = win32 ]]
 then
-    echo "'$PWD/$DIRNAME' already exists, not reconfigured"
-    cd "$DIRNAME"
+    ARCH=x86
+elif [[ "$HOST" = win64 ]]
+then
+    ARCH=x86_64
 else
-    mkdir "$DIRNAME"
-    cd "$DIRNAME"
+    echo "Unsupported host: $HOST" >&2
+    exit 1
+fi
 
-    if [[ "$HOST" == win* ]]
-    then
-        # -static-libgcc to avoid missing libgcc_s_dw2-1.dll
-        # -static to avoid dynamic dependency to zlib
-        export CFLAGS='-static-libgcc -static'
-        export CXXFLAGS="$CFLAGS"
-        export LDFLAGS='-static-libgcc -static'
-    elif [[ "$HOST" == "macos" ]]
-    then
-        export PKG_CONFIG_PATH="/opt/homebrew/opt/zlib/lib/pkgconfig"
-    fi
+# -static-libgcc to avoid missing libgcc_s_dw2-1.dll
+# -static to avoid dynamic dependency to zlib
+export CFLAGS='-static-libgcc -static'
+export CXXFLAGS="$CFLAGS"
+export LDFLAGS='-static-libgcc -static'
 
-    export PKG_CONFIG_PATH="$INSTALL_DIR/$DIRNAME/lib/pkgconfig:$PKG_CONFIG_PATH"
+if [[ -d "$HOST" ]]
+then
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
+else
+    mkdir "$HOST"
+    cd "$HOST"
 
-    conf=(
-        --prefix="$INSTALL_DIR/$DIRNAME"
-        --pkg-config-flags="--static"
-        --extra-cflags="-O2 -fPIC"
-        --disable-programs
-        --disable-doc
-        --disable-swscale
-        --disable-postproc
-        --disable-avfilter
-        --disable-network
-        --disable-everything
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --enable-cross-compile \
+        --target-os=mingw32 \
+        --arch="$ARCH" \
+        --cross-prefix="${HOST_TRIPLET}-" \
+        --cc="${HOST_TRIPLET}-gcc" \
+        --extra-cflags="-O2 -fPIC" \
+        --enable-shared \
+        --disable-static \
+        --disable-programs \
+        --disable-doc \
+        --disable-swscale \
+        --disable-postproc \
+        --disable-avfilter \
+        --disable-avdevice \
+        --disable-network \
+        --disable-everything \
+        --enable-swresample \
+        --enable-decoder=h264 \
+        --enable-decoder=hevc \
+        --enable-decoder=av1 \
+        --enable-decoder=pcm_s16le \
+        --enable-decoder=opus \
+        --enable-decoder=aac \
+        --enable-decoder=flac \
+        --enable-decoder=png \
+        --enable-protocol=file \
+        --enable-demuxer=image2 \
+        --enable-parser=png \
+        --enable-zlib \
+        --enable-muxer=matroska \
+        --enable-muxer=mp4 \
+        --enable-muxer=opus \
+        --enable-muxer=flac \
+        --enable-muxer=wav \
         --disable-vulkan
-        --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
-        --enable-decoder=flac
-        --enable-decoder=png
-        --enable-protocol=file
-        --enable-demuxer=image2
-        --enable-parser=png
-        --enable-zlib
-        --enable-muxer=matroska
-        --enable-muxer=mp4
-        --enable-muxer=opus
-        --enable-muxer=flac
-        --enable-muxer=wav
-    )
-
-    if [[ "$HOST" == linux ]]
-    then
-        conf+=(
-            --enable-libv4l2
-            --enable-outdev=v4l2
-            --enable-encoder=rawvideo
-        )
-    else
-        # libavdevice is only used for V4L2 on Linux
-        conf+=(
-            --disable-avdevice
-        )
-    fi
-
-    if [[ "$LINK_TYPE" == static ]]
-    then
-        conf+=(
-            --enable-static
-            --disable-shared
-        )
-    else
-        conf+=(
-            --disable-static
-            --enable-shared
-        )
-    fi
-
-    if [[ "$BUILD_TYPE" == cross ]]
-    then
-        conf+=(
-            --enable-cross-compile
-            --cross-prefix="${HOST_TRIPLET}-"
-            --cc="${HOST_TRIPLET}-gcc"
-        )
-
-        case "$HOST" in
-            win32)
-                conf+=(
-                    --target-os=mingw32
-                    --arch=x86
-                )
-                ;;
-
-            win64)
-                conf+=(
-                    --target-os=mingw32
-                    --arch=x86_64
-                )
-                ;;
-
-            *)
-                echo "Unsupported host: $HOST" >&2
-                exit 1
-        esac
-    fi
-
-    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
 fi
 
 make -j

app/deps/libusb.sh

@@ -3,7 +3,6 @@ set -ex
 DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common
-process_args "$@"
 
 VERSION=1.0.27
 FILENAME=libusb-$VERSION.tar.gz
@@ -26,40 +25,20 @@ cd "$BUILD_DIR/$PROJECT_DIR"
 export CFLAGS='-O2'
 export CXXFLAGS="$CFLAGS"
 
-if [[ -d "$DIRNAME" ]]
+if [[ -d "$HOST" ]]
 then
-    echo "'$PWD/$DIRNAME' already exists, not reconfigured"
-    cd "$DIRNAME"
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
 else
-    mkdir "$DIRNAME"
-    cd "$DIRNAME"
-
-    conf=(
-        --prefix="$INSTALL_DIR/$DIRNAME"
-    )
-
-    if [[ "$LINK_TYPE" == static ]]
-    then
-        conf+=(
-            --enable-static
-            --disable-shared
-        )
-    else
-        conf+=(
-            --disable-static
-            --enable-shared
-        )
-    fi
-
-    if [[ "$BUILD_TYPE" == cross ]]
-    then
-        conf+=(
-            --host="$HOST_TRIPLET"
-        )
-    fi
+    mkdir "$HOST"
+    cd "$HOST"
 
     "$SOURCES_DIR/$PROJECT_DIR"/bootstrap.sh
-    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --host="$HOST_TRIPLET" \
+        --enable-shared \
+        --disable-static
 fi
 
 make -j

app/deps/sdl.sh

@@ -3,12 +3,11 @@ set -ex
 DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
 cd "$DEPS_DIR"
 . common
-process_args "$@"
 
-VERSION=2.30.10
+VERSION=2.30.7
 FILENAME=SDL-$VERSION.tar.gz
 PROJECT_DIR=SDL-release-$VERSION
-SHA256SUM=35a8b9c4f3635d85762b904ac60ca4e0806bff89faeb269caafbe80860d67168
+SHA256SUM=1578c96f62c9ae36b64e431b2aa0e0b0fd07c275dedbc694afc38e19056688f5
 
 cd "$SOURCES_DIR"
 
@@ -26,54 +25,23 @@ cd "$BUILD_DIR/$PROJECT_DIR"
 export CFLAGS='-O2'
 export CXXFLAGS="$CFLAGS"
 
-if [[ -d "$DIRNAME" ]]
+if [[ -d "$HOST" ]]
 then
-    echo "'$PWD/$HDIRNAME' already exists, not reconfigured"
-    cd "$DIRNAME"
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
 else
-    mkdir "$DIRNAME"
-    cd "$DIRNAME"
+    mkdir "$HOST"
+    cd "$HOST"
 
-    conf=(
-        --prefix="$INSTALL_DIR/$DIRNAME"
-    )
-
-    if [[ "$HOST" == linux ]]
-    then
-        conf+=(
-            --enable-video-wayland
-            --enable-video-x11
-        )
-    fi
-
-    if [[ "$LINK_TYPE" == static ]]
-    then
-        conf+=(
-            --enable-static
-            --disable-shared
-        )
-    else
-        conf+=(
-            --disable-static
-            --enable-shared
-        )
-    fi
-
-    if [[ "$BUILD_TYPE" == cross ]]
-    then
-        conf+=(
-            --host="$HOST_TRIPLET"
-        )
-    fi
-
-    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --host="$HOST_TRIPLET" \
+        --enable-shared \
+        --disable-static
 fi
 
 make -j
 # There is no "make install-strip"
 make install
 # Strip manually
-if [[ "$LINK_TYPE" == shared && "$HOST" == win* ]]
-then
-    ${HOST_TRIPLET}-strip "$INSTALL_DIR/$DIRNAME/bin/SDL2.dll"
-fi
+${HOST_TRIPLET}-strip "$INSTALL_DIR/$HOST/bin/SDL2.dll"

app/meson.build

@@ -46,7 +46,6 @@ 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',
@@ -110,22 +109,20 @@ endif
 
 cc = meson.get_compiler('c')
 
-static = get_option('static')
-
 dependencies = [
-    dependency('libavformat', version: '>= 57.33', static: static),
-    dependency('libavcodec', version: '>= 57.37', static: static),
-    dependency('libavutil', static: static),
-    dependency('libswresample', static: static),
-    dependency('sdl2', version: '>= 2.0.5', static: static),
+    dependency('libavformat', version: '>= 57.33'),
+    dependency('libavcodec', version: '>= 57.37'),
+    dependency('libavutil'),
+    dependency('libswresample'),
+    dependency('sdl2', version: '>= 2.0.5'),
 ]
 
 if v4l2_support
-    dependencies += dependency('libavdevice', static: static)
+    dependencies += dependency('libavdevice')
 endif
 
 if usb_support
-    dependencies += dependency('libusb-1.0', static: static)
+    dependencies += dependency('libusb-1.0')
 endif
 
 if host_machine.system() == 'windows'
@@ -170,6 +167,9 @@ conf.set('DEFAULT_LOCAL_PORT_RANGE_LAST', '27199')
 # run a server debugger and wait for a client to be attached
 conf.set('SERVER_DEBUGGER', get_option('server_debugger'))
 
+# select the debugger method ('old' for Android < 9, 'new' for Android >= 9)
+conf.set('SERVER_DEBUGGER_METHOD_NEW', get_option('server_debugger_method') == 'new')
+
 # enable V4L2 support (linux only)
 conf.set('HAVE_V4L2', v4l2_support)
 

app/scrcpy-windows.rc

@@ -13,7 +13,7 @@ BEGIN
       VALUE "LegalCopyright", "Romain Vimont, Genymobile"
       VALUE "OriginalFilename", "scrcpy.exe"
       VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "3.1"
+      VALUE "ProductVersion", "2.7"
     END
   END
   BLOCK "VarFileInfo"

app/scrcpy.1

@@ -97,18 +97,6 @@ Select the camera size by its aspect ratio (+/- 10%).
 
 Possible values are "sensor" (use the camera sensor aspect ratio), "\fInum\fR:\fIden\fR" (e.g. "4:3") and "\fIvalue\fR" (e.g. "1.6").
 
-.TP
-.BI "\-\-camera\-facing " facing
-Select the device camera by its facing direction.
-
-Possible values are "front", "back" and "external".
-
-.TP
-.BI "\-\-camera\-fps " fps
-Specify the camera capture frame rate.
-
-If not specified, Android's default frame rate (30 fps) is used.
-
 .TP
 .B \-\-camera\-high\-speed
 Enable high-speed camera capture mode.
@@ -121,6 +109,18 @@ Specify the device camera id to mirror.
 
 The available camera ids can be listed by \fB\-\-list\-cameras\fR.
 
+.TP
+.BI "\-\-camera\-facing " facing
+Select the device camera by its facing direction.
+
+Possible values are "front", "back" and "external".
+
+.TP
+.BI "\-\-camera\-fps " fps
+Specify the camera capture frame rate.
+
+If not specified, Android's default frame rate (30 fps) is used.
+
 .TP
 .BI "\-\-camera\-size " width\fRx\fIheight
 Specify an explicit camera capture size.
@@ -318,13 +318,14 @@ Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video
 
 .TP
 \fB\-\-new\-display\fR[=[\fIwidth\fRx\fIheight\fR][/\fIdpi\fR]]
-Create a new display with the specified resolution and density. If not provided, they default to the main display dimensions and DPI.
+Create a new display with the specified resolution and density. If not provided, they default to the main display dimensions and DPI, and \fB\-\-max\-size\fR is considered.
 
 Examples:
 
     \-\-new\-display=1920x1080
     \-\-new\-display=1920x1080/420
     \-\-new\-display         # main display size and density
+    \-\-new\-display -m1920  # scaled to fit a max size of 1920
     \-\-new\-display=/240    # main display size and 240 dpi
 
 .TP
@@ -369,16 +370,6 @@ 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.
-
 .TP
 .B \-\-no\-video
 Disable video forwarding.
@@ -524,15 +515,13 @@ 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 connect the device over TCP/IP.
+.BI "\-\-tcpip\fR[=\fIip\fR[:\fIport\fR]]
+Configure and reconnect 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.
@@ -829,7 +818,7 @@ Report bugs to <https://github.com/Genymobile/scrcpy/issues>.
 .SH COPYRIGHT
 Copyright \(co 2018 Genymobile <https://www.genymobile.com>
 
-Copyright \(co 2018\-2025 Romain Vimont <rom@rom1v.com>
+Copyright \(co 2018\-2024 Romain Vimont <rom@rom1v.com>
 
 Licensed under the Apache License, Version 2.0.
 

app/src/adb/adb.c

@@ -7,7 +7,6 @@
 
 #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"
@@ -25,45 +24,15 @@
  */
 #define SC_ADB_COMMAND(...) { sc_adb_get_executable(), __VA_ARGS__, NULL }
 
-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);
-}
+static const char *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;
 }
 
@@ -412,7 +381,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" or "already connected".
+    // "connected".
     char buf[128];
     ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
     sc_pipe_close(pout);
@@ -429,8 +398,7 @@ 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)
-        || !strncmp("already connected", buf, sizeof("already connected") - 1);
+    ok = !strncmp("connected", buf, sizeof("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.
@@ -771,21 +739,3 @@ sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {
 
     return sc_adb_parse_device_ip(buf);
 }
-
-uint16_t
-sc_adb_get_device_sdk_version(struct sc_intr *intr, const char *serial) {
-    char *sdk_version =
-        sc_adb_getprop(intr, serial, "ro.build.version.sdk", SC_ADB_SILENT);
-    if (!sdk_version) {
-        return 0;
-    }
-
-    long value;
-    bool ok = sc_str_parse_integer(sdk_version, &value);
-    free(sdk_version);
-    if (!ok || value < 0 || value > 0xFFFF) {
-        return 0;
-    }
-
-    return value;
-}

app/src/adb/adb.h

@@ -15,12 +15,6 @@
 
 #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);
 
@@ -120,10 +114,4 @@ sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
 char *
 sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags);
 
-/**
- * Return the device SDK version.
- */
-uint16_t
-sc_adb_get_device_sdk_version(struct sc_intr *intr, const char *serial);
-
 #endif

app/src/cli.c

@@ -109,8 +109,6 @@ enum {
     OPT_SCREEN_OFF_TIMEOUT,
     OPT_CAPTURE_ORIENTATION,
     OPT_ANGLE,
-    OPT_NO_VD_SYSTEM_DECORATIONS,
-    OPT_NO_VD_DESTROY_CONTENT,
 };
 
 struct sc_option {
@@ -256,6 +254,14 @@ static const struct sc_option options[] = {
                 "ratio), \"<num>:<den>\" (e.g. \"4:3\") or \"<value>\" (e.g. "
                 "\"1.6\")."
     },
+    {
+        .longopt_id = OPT_CAMERA_ID,
+        .longopt = "camera-id",
+        .argdesc = "id",
+        .text = "Specify the device camera id to mirror.\n"
+                "The available camera ids can be listed by:\n"
+                "    scrcpy --list-cameras",
+    },
     {
         .longopt_id = OPT_CAMERA_FACING,
         .longopt = "camera-facing",
@@ -263,14 +269,6 @@ static const struct sc_option options[] = {
         .text = "Select the device camera by its facing direction.\n"
                 "Possible values are \"front\", \"back\" and \"external\".",
     },
-    {
-        .longopt_id = OPT_CAMERA_FPS,
-        .longopt = "camera-fps",
-        .argdesc = "value",
-        .text = "Specify the camera capture frame rate.\n"
-                "If not specified, Android's default frame rate (30 fps) is "
-                "used.",
-    },
     {
         .longopt_id = OPT_CAMERA_HIGH_SPEED,
         .longopt = "camera-high-speed",
@@ -278,14 +276,6 @@ static const struct sc_option options[] = {
                 "This mode is restricted to specific resolutions and frame "
                 "rates, listed by --list-camera-sizes.",
     },
-    {
-        .longopt_id = OPT_CAMERA_ID,
-        .longopt = "camera-id",
-        .argdesc = "id",
-        .text = "Specify the device camera id to mirror.\n"
-                "The available camera ids can be listed by:\n"
-                "    scrcpy --list-cameras",
-    },
     {
         .longopt_id = OPT_CAMERA_SIZE,
         .longopt = "camera-size",
@@ -293,21 +283,12 @@ static const struct sc_option options[] = {
         .text = "Specify an explicit camera capture size.",
     },
     {
-        .longopt_id = OPT_CAPTURE_ORIENTATION,
-        .longopt = "capture-orientation",
+        .longopt_id = OPT_CAMERA_FPS,
+        .longopt = "camera-fps",
         .argdesc = "value",
-        .text = "Set the capture video orientation.\n"
-                "Possible values are 0, 90, 180, 270, flip0, flip90, flip180 "
-                "and flip270, possibly prefixed by '@'.\n"
-                "The number represents the clockwise rotation in degrees; the "
-                "flip\" keyword applies a horizontal flip before the "
-                "rotation.\n"
-                "If a leading '@' is passed (@90) for display capture, then "
-                "the rotation is locked, and is relative to the natural device "
-                "orientation.\n"
-                "If '@' is passed alone, then the rotation is locked to the "
-                "initial device orientation.\n"
-                "Default is 0.",
+        .text = "Specify the camera capture frame rate.\n"
+                "If not specified, Android's default frame rate (30 fps) is "
+                "used.",
     },
     {
         // Not really deprecated (--codec has never been released), but without
@@ -497,6 +478,23 @@ static const struct sc_option options[] = {
         .longopt = "list-encoders",
         .text = "List video and audio encoders available on the device.",
     },
+    {
+        .longopt_id = OPT_CAPTURE_ORIENTATION,
+        .longopt = "capture-orientation",
+        .argdesc = "value",
+        .text = "Set the capture video orientation.\n"
+                "Possible values are 0, 90, 180, 270, flip0, flip90, flip180 "
+                "and flip270, possibly prefixed by '@'.\n"
+                "The number represents the clockwise rotation in degrees; the "
+                "flip\" keyword applies a horizontal flip before the "
+                "rotation.\n"
+                "If a leading '@' is passed (@90) for display capture, then "
+                "the rotation is locked, and is relative to the natural device "
+                "orientation.\n"
+                "If '@' is passed alone, then the rotation is locked to the "
+                "initial device orientation.\n"
+                "Default is 0.",
+    },
     {
         // deprecated
         .longopt_id = OPT_LOCK_VIDEO_ORIENTATION,
@@ -591,11 +589,12 @@ static const struct sc_option options[] = {
         .optional_arg = true,
         .text = "Create a new display with the specified resolution and "
                 "density. If not provided, they default to the main display "
-                "dimensions and DPI.\n"
+                "dimensions and DPI, and --max-size is considered.\n"
                 "Examples:\n"
                 "    --new-display=1920x1080\n"
                 "    --new-display=1920x1080/420  # force 420 dpi\n"
                 "    --new-display         # main display size and density\n"
+                "    --new-display -m1920  # scaled to fit a max size of 1920\n"
                 "    --new-display=/240    # main display size and 240 dpi",
     },
     {
@@ -660,20 +659,6 @@ 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",
-        .text = "Disable virtual display system decorations flag.",
-    },
     {
         .longopt_id = OPT_NO_VIDEO,
         .longopt = "no-video",
@@ -870,17 +855,16 @@ static const struct sc_option options[] = {
     {
         .longopt_id = OPT_TCPIP,
         .longopt = "tcpip",
-        .argdesc = "[+]ip[:port]",
+        .argdesc = "ip[:port]",
         .optional_arg = true,
-        .text = "Configure and connect the device over TCP/IP.\n"
+        .text = "Configure and reconnect 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.\n"
-                "Prefix the address with a '+' to force a reconnection.",
+                "this address before starting.",
     },
     {
         .longopt_id = OPT_TIME_LIMIT,
@@ -2715,12 +2699,6 @@ 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 = false;
-                break;
             default:
                 // getopt prints the error message on stderr
                 return false;
@@ -2904,6 +2882,13 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             LOGE("--new-display is incompatible with --no-video");
             return false;
         }
+
+        if (opts->max_size && opts->new_display[0] != '\0'
+                           && opts->new_display[0] != '/') {
+            // An explicit size is defined (not "" nor "/<dpi>")
+            LOGE("Cannot specify both --new-display size and -m/--max-size");
+            return false;
+        }
     }
 
     if (otg) {

app/src/control_msg.c

@@ -152,10 +152,8 @@ 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 = 7;
+            size_t index = 3;
             index += write_string_tiny(&buf[index], msg->uhid_create.name, 127);
 
             sc_write16be(&buf[index], msg->uhid_create.report_desc_size);
@@ -280,13 +278,9 @@ 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 "] %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);
+            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);
             break;
         }
         case SC_CONTROL_MSG_TYPE_UHID_INPUT: {

app/src/control_msg.h

@@ -94,8 +94,6 @@ 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

app/src/hid/hid_event.h

@@ -15,6 +15,7 @@ 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;
 };

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 (Rx)  Right stick x
-    0x09, 0x33,
-    // Usage (Ry)  Right stick y
-    0x09, 0x34,
+    // Usage (Z)   Right stick x
+    0x09, 0x32,
+    // Usage (Rz)  Right stick y
+    0x09, 0x35,
     // 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): 4x2 bytes (X, Y, Z, Rz)
+    // Input (Data, Variable, Absolute): 4 bytes (X, Y, Z, Rz)
     0x81, 0x02,
 
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Z)
-    0x09, 0x32,
-    // Usage (Rz)
-    0x09, 0x35,
+    // Usage Page (Simulation Controls)
+    0x05, 0x02,
+    // Usage (Brake)
+    0x09, 0xC5,
+    // Usage (Accelerator)
+    0x09, 0xC4,
     // 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): 2x2 bytes (L2, R2)
+    // Input (Data, Variable, Absolute): 2 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 0 . . . .| hat switch (dpad) position (0-8)
+ *        byte 14:  |0 0 0 . . . . .| hat switch (dpad) position (0-8)
  *                  +---------------+
  *                     9 possible positions and their values:
  *                             8 1 2
@@ -191,19 +191,16 @@ 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 = 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_x = 0;
+    slot->axis_left_y = 0;
+    slot->axis_right_x = 0;
+    slot->axis_right_y = 0;
     slot->axis_left_trigger = 0;
     slot->axis_right_trigger = 0;
 }
@@ -246,8 +243,14 @@ 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);
 
@@ -420,6 +423,8 @@ 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);

app/src/hid/hid_keyboard.c

@@ -335,6 +335,7 @@ 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);
 }

app/src/hid/hid_mouse.c

@@ -190,6 +190,7 @@ 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);
 }

app/src/icon.c

@@ -9,7 +9,6 @@
 
 #include "config.h"
 #include "compat.h"
-#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/str.h"
@@ -20,22 +19,35 @@
 
 static char *
 get_icon_path(void) {
-    char *icon_path = sc_get_env("SCRCPY_ICON_PATH");
-    if (icon_path) {
+#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) {
         // 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);
-    icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
+    char *icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
     if (!icon_path) {
         LOG_OOM();
         return NULL;
     }
 #else
-    icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
+    char *icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
     if (!icon_path) {
         LOGE("Could not get icon path");
         return NULL;

app/src/input_events.h

@@ -412,12 +412,18 @@ 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;
 };
 
@@ -497,6 +503,16 @@ 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) {

app/src/input_manager.c

@@ -908,6 +908,7 @@ 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) {
@@ -922,12 +923,9 @@ sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
             return;
         }
 
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_JoystickInstanceID(joystick),
-        };
-        im->gp->ops->process_gamepad_added(im->gp, &evt);
+        id = SDL_JoystickInstanceID(joystick);
     } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        SDL_JoystickID id = event->which;
+        id = event->which;
 
         SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
         if (gc) {
@@ -935,15 +933,16 @@ 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

app/src/options.c

@@ -108,8 +108,6 @@ const struct scrcpy_options scrcpy_options_default = {
     .new_display = NULL,
     .start_app = NULL,
     .angle = NULL,
-    .vd_destroy_content = true,
-    .vd_system_decorations = true,
 };
 
 enum sc_orientation

app/src/options.h

@@ -310,8 +310,6 @@ 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;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/scrcpy.c

@@ -458,8 +458,6 @@ 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,
     };
 

app/src/server.c

@@ -9,7 +9,6 @@
 
 #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"
@@ -26,22 +25,35 @@
 
 static char *
 get_server_path(void) {
-    char *server_path = sc_get_env("SCRCPY_SERVER_PATH");
-    if (server_path) {
+#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) {
         // 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);
-    server_path = strdup(SC_SERVER_PATH_DEFAULT);
+    char *server_path = strdup(SC_SERVER_PATH_DEFAULT);
     if (!server_path) {
         LOG_OOM();
         return NULL;
     }
 #else
-    server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
+    char *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");
@@ -189,31 +201,18 @@ execute_server(struct sc_server *server,
     cmd[count++] = "app_process";
 
 #ifdef SERVER_DEBUGGER
-    uint16_t sdk_version = sc_adb_get_device_sdk_version(&server->intr, serial);
-    if (!sdk_version) {
-        LOGE("Could not determine SDK version");
-        return 0;
-    }
-
 # define SERVER_DEBUGGER_PORT "5005"
-    const char *dbg;
-    if (sdk_version < 28) {
-        // Android < 9
-        dbg = "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
-              SERVER_DEBUGGER_PORT;
-    } else if (sdk_version < 30) {
-        // Android >= 9 && Android < 11
-        dbg = "-XjdwpProvider:internal -XjdwpOptions:transport=dt_socket,"
-              "suspend=y,server=y,address=" SERVER_DEBUGGER_PORT;
-    } else {
-        // Android >= 11
-        // Contrary to the other methods, this does not suspend on start.
-        // <https://github.com/Genymobile/scrcpy/pull/5466>
-        dbg = "-XjdwpProvider:adbconnection";
-    }
-    cmd[count++] = dbg;
+    cmd[count++] =
+# ifdef SERVER_DEBUGGER_METHOD_NEW
+        /* Android 9 and above */
+        "-XjdwpProvider:internal -XjdwpOptions:transport=dt_socket,suspend=y,"
+        "server=y,address="
+# else
+        /* Android 8 and below */
+        "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
+# endif
+            SERVER_DEBUGGER_PORT;
 #endif
-
     cmd[count++] = "/"; // unused
     cmd[count++] = "com.genymobile.scrcpy.Server";
     cmd[count++] = SCRCPY_VERSION;
@@ -377,12 +376,6 @@ 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");
-    }
     if (params->list & SC_OPTION_LIST_ENCODERS) {
         ADD_PARAM("list_encoders=true");
     }
@@ -404,14 +397,10 @@ execute_server(struct sc_server *server,
     cmd[count++] = NULL;
 
 #ifdef SERVER_DEBUGGER
-    LOGI("Server debugger listening%s...",
-         sdk_version < 30 ? " on port " SERVER_DEBUGGER_PORT : "");
-    // For Android < 11, from the computer:
-    //     - run `adb forward tcp:5005 tcp:5005`
-    // For Android >= 11:
-    //     - execute `adb jdwp` to get the jdwp port
-    //     - run `adb forward tcp:5005 jdwp:XXXX` (replace XXXX)
-    //
+    LOGI("Server debugger waiting for a client on device port "
+         SERVER_DEBUGGER_PORT "...");
+    // From the computer, run
+    //     adb forward tcp:5005 tcp:5005
     // Then, from Android Studio: Run > Debug > Edit configurations...
     // On the left, click on '+', "Remote", with:
     //     Host: localhost
@@ -488,21 +477,14 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
     // end of the program
     server->params = *params;
 
-    bool ok = sc_adb_init();
+    bool ok = sc_mutex_init(&server->mutex);
     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;
     }
 
@@ -510,7 +492,6 @@ 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;
     }
 
@@ -832,14 +813,11 @@ 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,
-                           bool disconnect) {
+sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port) {
     struct sc_intr *intr = &server->intr;
 
-    if (disconnect) {
-        // Error expected if not connected, do not report any error
-        sc_adb_disconnect(intr, ip_port, SC_ADB_SILENT);
-    }
+    // 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);
 
@@ -855,7 +833,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, bool disconnect) {
+                                        const char *addr) {
     // Append ":5555" if no port is present
     bool contains_port = strchr(addr, ':');
     char *ip_port = contains_port ? strdup(addr)
@@ -866,7 +844,7 @@ sc_server_configure_tcpip_known_address(struct sc_server *server,
     }
 
     server->serial = ip_port;
-    return sc_server_connect_to_tcpip(server, ip_port, disconnect);
+    return sc_server_connect_to_tcpip(server, ip_port);
 }
 
 static bool
@@ -891,7 +869,7 @@ sc_server_configure_tcpip_unknown_address(struct sc_server *server,
     }
 
     server->serial = ip_port;
-    return sc_server_connect_to_tcpip(server, ip_port, false);
+    return sc_server_connect_to_tcpip(server, ip_port);
 }
 
 static void
@@ -978,13 +956,7 @@ run_server(void *data) {
             sc_adb_device_destroy(&device);
         }
     } else {
-        // 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);
+        ok = sc_server_configure_tcpip_known_address(server, params->tcpip_dst);
         if (!ok) {
             goto error_connection_failed;
         }
@@ -1161,6 +1133,4 @@ 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();
 }

app/src/server.h

@@ -69,8 +69,6 @@ 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;
 };
 

app/src/sys/unix/file.c

@@ -6,9 +6,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifdef __APPLE__
-# include <mach-o/dyld.h> // for _NSGetExecutablePath()
-#endif
 
 #include "util/log.h"
 
@@ -63,22 +60,11 @@ 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
-    // "_" 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);
+    // 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;
 #endif
 }
 

app/src/trait/gamepad_processor.h

@@ -20,22 +20,13 @@ struct sc_gamepad_processor {
 struct sc_gamepad_processor_ops {
 
     /**
-     * Process a gamepad device added event
+     * Process a gamepad device added or removed
      *
      * This function is mandatory.
      */
     void
-    (*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_gamepad_device)(struct sc_gamepad_processor *gp,
+                              const struct sc_gamepad_device_event *event);
 
     /**
      * Process a gamepad axis event

app/src/uhid/gamepad_uhid.c

@@ -7,11 +7,6 @@
 /** 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,
@@ -35,9 +30,7 @@ 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.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.name = hid_open->name;
     msg.uhid_create.report_desc = hid_open->report_desc;
     msg.uhid_create.report_desc_size = hid_open->report_desc_size;
 
@@ -59,39 +52,29 @@ sc_gamepad_uhid_send_close(struct sc_gamepad_uhid *gamepad,
 }
 
 static void
-sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
+sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
                                 const struct sc_gamepad_device_event *event) {
     struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
 
-    struct sc_hid_open hid_open;
-    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                      event->gamepad_id)) {
-        return;
+    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);
     }
-
-    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
@@ -131,8 +114,7 @@ sc_gamepad_uhid_init(struct sc_gamepad_uhid *gamepad,
     gamepad->controller = controller;
 
     static const struct sc_gamepad_processor_ops ops = {
-        .process_gamepad_added = sc_gamepad_processor_process_gamepad_added,
-        .process_gamepad_removed = sc_gamepad_processor_process_gamepad_removed,
+        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
         .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
         .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
     };

app/src/uhid/keyboard_uhid.c

@@ -141,9 +141,7 @@ 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.vendor_id = 0;
-    msg.uhid_create.product_id = 0;
-    msg.uhid_create.name = NULL;
+    msg.uhid_create.name = hid_open.name;
     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)) {

app/src/uhid/mouse_uhid.c

@@ -81,9 +81,7 @@ 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.vendor_id = 0;
-    msg.uhid_create.product_id = 0;
-    msg.uhid_create.name = NULL;
+    msg.uhid_create.name = hid_open.name;
     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)) {

app/src/usb/gamepad_aoa.c

@@ -7,35 +7,33 @@
 #define DOWNCAST(GP) container_of(GP, struct sc_gamepad_aoa, gamepad_processor)
 
 static void
-sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
+sc_gamepad_processor_process_gamepad_device(struct sc_gamepad_processor *gp,
                                 const struct sc_gamepad_device_event *event) {
     struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);
 
-    struct sc_hid_open hid_open;
-    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                      event->gamepad_id)) {
-        return;
-    }
+    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;
+        }
 
-    // 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)");
-    }
-}
+        // 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);
 
-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);
+        struct sc_hid_close hid_close;
+        if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
+                                           event->gamepad_id)) {
+            return;
+        }
 
-    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)");
+        if (!sc_aoa_push_close(gamepad->aoa, &hid_close)) {
+            LOGW("Could not push AOA HID close (gamepad)");
+        }
     }
 }
 
@@ -78,8 +76,7 @@ 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_added = sc_gamepad_processor_process_gamepad_added,
-        .process_gamepad_removed = sc_gamepad_processor_process_gamepad_removed,
+        .process_gamepad_device = sc_gamepad_processor_process_gamepad_device,
         .process_gamepad_axis = sc_gamepad_processor_process_gamepad_axis,
         .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
     };

app/src/usb/scrcpy_otg.c

@@ -95,14 +95,9 @@ 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)...");
-    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");
-    }
+    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);
 #endif
 
     static const struct sc_usb_callbacks cbs = {

app/src/usb/screen_otg.c

@@ -175,6 +175,7 @@ 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) {
@@ -189,12 +190,9 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
             return;
         }
 
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_JoystickInstanceID(joystick),
-        };
-        gp->ops->process_gamepad_added(gp, &evt);
+        id = SDL_JoystickInstanceID(joystick);
     } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        SDL_JoystickID id = event->which;
+        id = event->which;
 
         SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
         if (gc) {
@@ -202,12 +200,16 @@ sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
         } else {
             LOGW("Unknown gamepad device removed");
         }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = id,
-        };
-        gp->ops->process_gamepad_removed(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,
+    };
+    gp->ops->process_gamepad_device(gp, &evt);
 }
 
 static void

app/src/util/env.c

@@ -1,29 +0,0 @@
-#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
-}

app/src/util/env.h

@@ -1,12 +0,0 @@
-#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

app/src/util/net.c

@@ -9,6 +9,8 @@
 #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>
@@ -21,6 +23,8 @@
   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
@@ -43,26 +47,17 @@ 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 SC_SOCKET_CLOSE_ON_INTERRUPT
-    if (sock == SC_RAW_SOCKET_NONE) {
+#ifdef _WIN32
+    if (sock == INVALID_SOCKET) {
         return SC_SOCKET_NONE;
     }
 
-    struct sc_socket_wrapper *socket = malloc(sizeof(*socket));
+    struct sc_socket_windows *socket = malloc(sizeof(*socket));
     if (!socket) {
         LOG_OOM();
-        sc_raw_socket_close(sock);
+        closesocket(sock);
         return SC_SOCKET_NONE;
     }
 
@@ -77,9 +72,9 @@ wrap(sc_raw_socket sock) {
 
 static inline sc_raw_socket
 unwrap(sc_socket socket) {
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+#ifdef _WIN32
     if (socket == SC_SOCKET_NONE) {
-        return SC_RAW_SOCKET_NONE;
+        return INVALID_SOCKET;
     }
 
     return socket->socket;
@@ -88,6 +83,17 @@ 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
@@ -242,9 +248,9 @@ net_interrupt(sc_socket socket) {
 
     sc_raw_socket raw_sock = unwrap(socket);
 
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+#ifdef _WIN32
     if (!atomic_flag_test_and_set(&socket->closed)) {
-        return sc_raw_socket_close(raw_sock);
+        return !closesocket(raw_sock);
     }
     return true;
 #else
@@ -256,15 +262,15 @@ bool
 net_close(sc_socket socket) {
     sc_raw_socket raw_sock = unwrap(socket);
 
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+#ifdef _WIN32
     bool ret = true;
     if (!atomic_flag_test_and_set(&socket->closed)) {
-        ret = sc_raw_socket_close(raw_sock);
+        ret = !closesocket(raw_sock);
     }
     free(socket);
     return ret;
 #else
-    return sc_raw_socket_close(raw_sock);
+    return !close(raw_sock);
 #endif
 }
 

app/src/util/net.h

@@ -7,36 +7,21 @@
 #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_wrapper {
-      sc_raw_socket socket;
+  typedef struct sc_socket_windows {
+      SOCKET socket;
       atomic_flag closed;
   } *sc_socket;
-#else
+
+#else // not _WIN32
+
+# include <sys/socket.h>
 # define SC_SOCKET_NONE -1
-  typedef sc_raw_socket sc_socket;
+  typedef int sc_socket;
+
 #endif
 
 #define IPV4_LOCALHOST 0x7F000001

app/tests/test_control_msg_serialize.c

@@ -329,8 +329,6 @@ 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,
@@ -339,13 +337,11 @@ 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 == 24);
+    assert(size == 20);
 
     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

doc/build.md

@@ -77,7 +77,7 @@ pip3 install meson
 sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
 
 # client build dependencies
-sudo dnf install SDL2-devel ffms2-devel libusb1-devel libavdevice-free-devel meson gcc make
+sudo dnf install SDL2-devel ffms2-devel libusb1-devel meson gcc make
 
 # server build dependencies
 sudo dnf install java-devel
@@ -233,10 +233,10 @@ install` must be run as root)._
 
 #### Option 2: Use prebuilt server
 
- - [`scrcpy-server-v3.1`][direct-scrcpy-server]  
-   <sub>SHA-256: `958f0944a62f23b1f33a16e9eb14844c1a04b882ca175a738c16d23cb22b86c0`</sub>
+ - [`scrcpy-server-v2.7`][direct-scrcpy-server]  
+   <sub>SHA-256: `a23c5659f36c260f105c022d27bcb3eafffa26070e7baa9eda66d01377a1adba`</sub>
 
-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-server-v3.1
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-server-v2.7
 
 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:

doc/connection.md

@@ -85,12 +85,6 @@ 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
 
@@ -113,17 +107,16 @@ 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 you to
-bypass having to physically connect your device to your computer.
+Since Android 11, a [wireless debugging option][adb-wireless] allows to bypass
+having to physically connect your device directly 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 you 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 to run arbitrary commands whenever a
+new Android device is connected: [AutoAdb]. It can be used to start scrcpy:
 
 ```bash
 autoadb scrcpy -s '{}'

doc/control.md

@@ -23,20 +23,14 @@ To control the device without mirroring:
 scrcpy --no-video --no-audio
 ```
 
-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
-```
+By default, mouse mode is switched to UHID if video mirroring is disabled (a
+relative mouse mode is required).
 
 To also use a UHID keyboard, set it explicitly:
 
 ```bash
-scrcpy --no-video --no-audio --mouse=uhid --keyboard=uhid
-scrcpy --no-video --no-audio -MK  # short version
+scrcpy --no-video --no-audio --keyboard=uhid
+scrcpy --no-video --no-audio -K  # short version
 ```
 
 To use AOA instead (over USB only):

doc/develop.md

@@ -461,30 +461,26 @@ meson setup x -Dserver_debugger=true
 meson configure x -Dserver_debugger=true
 ```
 
-Then recompile, and run scrcpy.
+If your device runs Android 8 or below, set the `server_debugger_method` to
+`old` in addition:
 
-For Android < 11, it will start a debugger on port 5005 on the device and wait:
+```bash
+meson setup x -Dserver_debugger=true -Dserver_debugger_method=old
+# or, if x is already configured
+meson configure x -Dserver_debugger=true -Dserver_debugger_method=old
+```
+
+Then recompile.
+
+When you start scrcpy, it will start a debugger on port 5005 on the device.
 Redirect that port to the computer:
 
 ```bash
 adb forward tcp:5005 tcp:5005
 ```
 
-For Android >= 11, first find the listening port:
-
-```bash
-adb jdwp
-# press Ctrl+C to interrupt
-```
-
-Then redirect the resulting PID:
-
-```bash
-adb forward tcp:5005 jdwp:XXXX  # replace XXXX
-```
-
-In Android Studio, _Run_ > _Debug_ > _Edit configurations..._ On the left, click
-on `+`, _Remote_, and fill the form:
+In Android Studio, _Run_ > _Debug_ > _Edit configurations..._ On the left, click on
+`+`, _Remote_, and fill the form:
 
  - Host: `localhost`
  - Port: `5005`

doc/device.md

@@ -34,31 +34,6 @@ 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
@@ -96,6 +71,31 @@ 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

doc/linux.md

@@ -2,23 +2,6 @@
 
 ## Install
 
-### From the official release
-
-Download a static build of the [latest release]:
-
- - [`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-x86_64]: https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-linux-x86_64-v3.1.tar.gz
-
-and extract it.
-
-_Static builds of scrcpy for Linux are still experimental._
-
-
-### From your package manager
-
 <a href="https://repology.org/project/scrcpy/versions"><img src="https://repology.org/badge/vertical-allrepos/scrcpy.svg" alt="Packaging status" align="right"></a>
 
 Scrcpy is packaged in several distributions and package managers:
@@ -30,10 +13,10 @@ Scrcpy is packaged in several distributions and package managers:
  - Snap: `snap install scrcpy`
  - … (see [repology](https://repology.org/project/scrcpy/versions))
 
+### Latest version
 
-### From an install script
-
-To install the latest release from `master`, follow this simplified process.
+However, the packaged version is not always the latest release. To install the
+latest release from `master`, follow this simplified process.
 
 First, you need to install the required packages:
 

doc/macos.md

@@ -2,27 +2,6 @@
 
 ## Install
 
-### From the official release
-
-Download a static build of the [latest release]:
-
- - [`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-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.
-
-_Static builds of scrcpy for macOS are still experimental._
-
-
-### From a package manager
-
 Scrcpy is available in [Homebrew]:
 
 ```bash
@@ -34,7 +13,7 @@ brew install scrcpy
 You need `adb`, accessible from your `PATH`. If you don't have it yet:
 
 ```bash
-brew install --cask android-platform-tools
+brew install android-platform-tools
 ```
 
 Alternatively, Scrcpy is also available in [MacPorts], which sets up `adb` for you:

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:

doc/video.md

@@ -96,7 +96,7 @@ Sometimes, the default encoder may have issues or even crash, so it is useful to
 try another one:
 
 ```bash
-scrcpy --video-codec=h264 --video-encoder=OMX.qcom.video.encoder.avc
+scrcpy --video-codec=h264 --video-encoder='OMX.qcom.video.encoder.avc'
 ```
 
 
@@ -193,9 +193,9 @@ phone, landscape for a tablet).
 
 Cropping is performed before `--capture-orientation` and `--angle`.
 
-For display mirroring, `--max-size` is applied after cropping. For camera,
-`--max-size` is applied first (because it selects the source size rather than
-resizing the content).
+For screen mirroring, `--max-size` is applied after cropping. For camera and
+virtual display mirroring, `--max-size` is applied first (because it selects the
+source size rather than resizing it).
 
 
 ## Display
@@ -216,8 +216,6 @@ scrcpy --list-displays
 A secondary display may only be controlled if the device runs at least Android
 10 (otherwise it is mirrored as read-only).
 
-It is also possible to create a [virtual display](virtual_display.md).
-
 
 ## Buffering
 

doc/virtual_display.md

@@ -8,6 +8,7 @@ To mirror a new virtual display instead of the device screen:
 scrcpy --new-display=1920x1080
 scrcpy --new-display=1920x1080/420  # force 420 dpi
 scrcpy --new-display         # use the main display size and density
+scrcpy --new-display -m1920  # ... scaled to fit a max size of 1920
 scrcpy --new-display=/240    # use the main display size and 240 dpi
 ```
 
@@ -15,49 +16,11 @@ 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 (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).
+When no launcher is available, the virtual display is empty. In that case, you
+must [start an Android app](device.md#start-android-app).
 
 For example:
 
 ```bash
 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. To disable them, use
-`--no-vd-system-decorations`:
-
-```
-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
-```

doc/windows.md

@@ -2,45 +2,35 @@
 
 ## Install
 
-### From the official release
-
 Download the [latest release]:
 
- - [`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>
+ - [`scrcpy-win64-v2.7.zip`][direct-win64] (64-bit)  
+   <sub>SHA-256: `5910bc18d5a16f42d84185ddc7e16a4cee6a6f5f33451559c1a1d6d0099bd5f5`</sub>
+ - [`scrcpy-win32-v2.7.zip`][direct-win32] (32-bit)  
+   <sub>SHA-256: `ef4daf89d500f33d78b830625536ecb18481429dd94433e7634c824292059d06`</sub>
 
 [latest release]: https://github.com/Genymobile/scrcpy/releases/latest
-[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
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-win64-v2.7.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-win32-v2.7.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]:
+Alternatively, you could install it from packages manager, like [Chocolatey]:
 
 ```bash
 choco install scrcpy
 choco install adb    # if you don't have it yet
 ```
 
-From [Scoop]:
+or [Scoop]:
+
 
 ```bash
 scoop install scrcpy
 scoop install adb    # if you don't have it yet
 ```
 
-[WinGet]: https://github.com/microsoft/winget-cli
+[Winget]: https://github.com/microsoft/winget-cli
 [Chocolatey]: https://chocolatey.org/
 [Scoop]: https://scoop.sh
 

install_release.sh

@@ -2,8 +2,8 @@
 set -e
 
 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v3.1/scrcpy-server-v3.1
-PREBUILT_SERVER_SHA256=958f0944a62f23b1f33a16e9eb14844c1a04b882ca175a738c16d23cb22b86c0
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v2.7/scrcpy-server-v2.7
+PREBUILT_SERVER_SHA256=a23c5659f36c260f105c022d27bcb3eafffa26070e7baa9eda66d01377a1adba
 
 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server

meson.build

@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '3.1',
+        version: '2.7',
         meson_version: '>= 0.48',
         default_options: [
             'c_std=c11',

meson_options.txt

@@ -2,7 +2,7 @@ option('compile_app', type: 'boolean', value: true, description: 'Build the clie
 option('compile_server', type: 'boolean', value: true, description: 'Build the server')
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
-option('static', type: 'boolean', value: false, description: 'Use static dependencies')
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
+option('server_debugger_method', type: 'combo', choices: ['old', 'new'], value: 'new', description: 'Select the debugger method (Android < 9: "old", Android >= 9: "new")')
 option('v4l2', type: 'boolean', value: true, description: 'Enable V4L2 feature when supported')
 option('usb', type: 'boolean', value: true, description: 'Enable HID/OTG features when supported')

release.mk

@@ -0,0 +1,141 @@
+# This makefile provides recipes to build a "portable" version of scrcpy for
+# Windows.
+#
+# Here, "portable" means that the client and server binaries are expected to be
+# anywhere, but in the same directory, instead of well-defined separate
+# locations (e.g. /usr/bin/scrcpy and /usr/share/scrcpy/scrcpy-server).
+#
+# In particular, this implies to change the location from where the client push
+# the server to the device.
+
+.PHONY: default clean \
+	test test-client test-server \
+	build-server \
+	prepare-deps-win32 prepare-deps-win64 \
+	build-win32 build-win64 \
+	zip-win32 zip-win64 \
+	package release
+
+GRADLE ?= ./gradlew
+
+TEST_BUILD_DIR := build-test
+SERVER_BUILD_DIR := build-server
+WIN32_BUILD_DIR := build-win32
+WIN64_BUILD_DIR := build-win64
+
+VERSION ?= $(shell git describe --tags --exclude='*install-release' --always)
+
+ZIP := zip
+WIN32_TARGET_DIR := scrcpy-win32-$(VERSION)
+WIN64_TARGET_DIR := scrcpy-win64-$(VERSION)
+WIN32_TARGET := $(WIN32_TARGET_DIR).zip
+WIN64_TARGET := $(WIN64_TARGET_DIR).zip
+
+RELEASE_DIR := release-$(VERSION)
+
+release: clean test build-server build-win32 build-win64 package
+
+clean:
+	$(GRADLE) clean
+	rm -rf "$(ZIP)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \
+		"$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)"
+
+test-client:
+	[ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \
+		meson setup "$(TEST_BUILD_DIR)" -Db_sanitize=address )
+	ninja -C "$(TEST_BUILD_DIR)"
+
+test-server:
+	$(GRADLE) -p server check
+
+test: test-client test-server
+
+build-server:
+	$(GRADLE) -p server assembleRelease
+	mkdir -p "$(SERVER_BUILD_DIR)/server"
+	cp server/build/outputs/apk/release/server-release-unsigned.apk \
+		"$(SERVER_BUILD_DIR)/server/scrcpy-server"
+
+prepare-deps-win32:
+	@app/deps/adb.sh win32
+	@app/deps/sdl.sh win32
+	@app/deps/ffmpeg.sh win32
+	@app/deps/libusb.sh win32
+
+prepare-deps-win64:
+	@app/deps/adb.sh win64
+	@app/deps/sdl.sh win64
+	@app/deps/ffmpeg.sh win64
+	@app/deps/libusb.sh win64
+
+build-win32: prepare-deps-win32
+	rm -rf "$(WIN32_BUILD_DIR)"
+	mkdir -p "$(WIN32_BUILD_DIR)/local"
+	meson setup "$(WIN32_BUILD_DIR)" \
+		--pkg-config-path="app/deps/work/install/win32/lib/pkgconfig" \
+		-Dc_args="-I$(PWD)/app/deps/work/install/win32/include" \
+		-Dc_link_args="-L$(PWD)/app/deps/work/install/win32/lib" \
+		--cross-file=cross_win32.txt \
+		--buildtype=release --strip -Db_lto=true \
+		-Dcompile_server=false \
+		-Dportable=true
+	ninja -C "$(WIN32_BUILD_DIR)"
+	# Group intermediate outputs into a 'dist' directory
+	mkdir -p "$(WIN32_BUILD_DIR)/dist"
+	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-console.bat "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-noconsole.vbs "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/icon.png "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/open_a_terminal_here.bat "$(WIN32_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win32/bin/*.dll "$(WIN32_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win32/bin/adb.exe "$(WIN32_BUILD_DIR)/dist/"
+
+build-win64: prepare-deps-win64
+	rm -rf "$(WIN64_BUILD_DIR)"
+	mkdir -p "$(WIN64_BUILD_DIR)/local"
+	meson setup "$(WIN64_BUILD_DIR)" \
+		--pkg-config-path="app/deps/work/install/win64/lib/pkgconfig" \
+		-Dc_args="-I$(PWD)/app/deps/work/install/win64/include" \
+		-Dc_link_args="-L$(PWD)/app/deps/work/install/win64/lib" \
+		--cross-file=cross_win64.txt \
+		--buildtype=release --strip -Db_lto=true \
+		-Dcompile_server=false \
+		-Dportable=true
+	ninja -C "$(WIN64_BUILD_DIR)"
+	# Group intermediate outputs into a 'dist' directory
+	mkdir -p "$(WIN64_BUILD_DIR)/dist"
+	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-console.bat "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-noconsole.vbs "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/icon.png "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/open_a_terminal_here.bat "$(WIN64_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win64/bin/*.dll "$(WIN64_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win64/bin/adb.exe "$(WIN64_BUILD_DIR)/dist/"
+
+zip-win32:
+	mkdir -p "$(ZIP)/$(WIN32_TARGET_DIR)"
+	cp -r "$(WIN32_BUILD_DIR)/dist/." "$(ZIP)/$(WIN32_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(ZIP)/$(WIN32_TARGET_DIR)/"
+	cd "$(ZIP)"; \
+		zip -r "$(WIN32_TARGET)" "$(WIN32_TARGET_DIR)"
+	rm -rf "$(ZIP)/$(WIN32_TARGET_DIR)"
+
+zip-win64:
+	mkdir -p "$(ZIP)/$(WIN64_TARGET_DIR)"
+	cp -r "$(WIN64_BUILD_DIR)/dist/." "$(ZIP)/$(WIN64_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(ZIP)/$(WIN64_TARGET_DIR)/"
+	cd "$(ZIP)"; \
+		zip -r "$(WIN64_TARGET)" "$(WIN64_TARGET_DIR)"
+	rm -rf "$(ZIP)/$(WIN64_TARGET_DIR)"
+
+package: zip-win32 zip-win64
+	mkdir -p "$(RELEASE_DIR)"
+	cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \
+		"$(RELEASE_DIR)/scrcpy-server-$(VERSION)"
+	cp "$(ZIP)/$(WIN32_TARGET)" "$(RELEASE_DIR)"
+	cp "$(ZIP)/$(WIN64_TARGET)" "$(RELEASE_DIR)"
+	cd "$(RELEASE_DIR)" && \
+		sha256sum "scrcpy-server-$(VERSION)" \
+			"scrcpy-win32-$(VERSION).zip" \
+			"scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt
+	@echo "Release generated in $(RELEASE_DIR)/"

release.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+make -f release.mk

release/.gitignore

@@ -1,2 +0,0 @@
-/work
-/output

release/build_common

@@ -1,5 +0,0 @@
-# This file must be sourced from the release scripts directory
-WORK_DIR="$PWD/work"
-OUTPUT_DIR="$PWD/output"
-
-VERSION="${VERSION:-$(git describe --tags --always)}"

release/build_linux.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-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
-
-DEPS_INSTALL_DIR="$PWD/app/deps/work/install/linux-native-static"
-ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-linux"
-
-rm -rf "$LINUX_BUILD_DIR"
-meson setup "$LINUX_BUILD_DIR" \
-    --pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \
-    -Dc_args="-I$DEPS_INSTALL_DIR/include" \
-    -Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
-    --buildtype=release \
-    --strip \
-    -Db_lto=true \
-    -Dcompile_server=false \
-    -Dportable=true \
-    -Dstatic=true
-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/"
-cp app/data/icon.png "$LINUX_BUILD_DIR/dist/"
-cp app/scrcpy.1 "$LINUX_BUILD_DIR/dist/"
-cp -r "$ADB_INSTALL_DIR"/. "$LINUX_BUILD_DIR/dist/"

release/build_macos.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-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
-
-DEPS_INSTALL_DIR="$PWD/app/deps/work/install/macos-native-static"
-ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-macos"
-
-rm -rf "$MACOS_BUILD_DIR"
-meson setup "$MACOS_BUILD_DIR" \
-    --pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \
-    -Dc_args="-I$DEPS_INSTALL_DIR/include" \
-    -Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
-    --buildtype=release \
-    --strip \
-    -Db_lto=true \
-    -Dcompile_server=false \
-    -Dportable=true \
-    -Dstatic=true
-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/"
-cp app/data/icon.png "$MACOS_BUILD_DIR/dist/"
-cp app/scrcpy.1 "$MACOS_BUILD_DIR/dist/"
-cp -r "$ADB_INSTALL_DIR"/. "$MACOS_BUILD_DIR/dist/"

release/build_server.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-GRADLE="${GRADLE:-./gradlew}"
-SERVER_BUILD_DIR="$WORK_DIR/build-server"
-
-rm -rf "$SERVER_BUILD_DIR"
-"$GRADLE" -p server assembleRelease
-mkdir -p "$SERVER_BUILD_DIR/server"
-cp server/build/outputs/apk/release/server-release-unsigned.apk \
-    "$SERVER_BUILD_DIR/server/scrcpy-server"

release/build_windows.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-set -ex
-
-case "$1" in
-    32)
-        WINXX=win32
-        ;;
-    64)
-        WINXX=win64
-        ;;
-    *)
-        echo "ERROR: $0 must be called with one argument: 32 or 64" >&2
-        exit 1
-        ;;
-esac
-
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-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
-
-DEPS_INSTALL_DIR="$PWD/app/deps/work/install/$WINXX-cross-shared"
-ADB_INSTALL_DIR="$PWD/app/deps/work/install/adb-windows"
-
-rm -rf "$WINXX_BUILD_DIR"
-meson setup "$WINXX_BUILD_DIR" \
-    --pkg-config-path="$DEPS_INSTALL_DIR/lib/pkgconfig" \
-    -Dc_args="-I$DEPS_INSTALL_DIR/include" \
-    -Dc_link_args="-L$DEPS_INSTALL_DIR/lib" \
-    --cross-file=cross_$WINXX.txt \
-    --buildtype=release \
-    --strip \
-    -Db_lto=true \
-    -Dcompile_server=false \
-    -Dportable=true
-ninja -C "$WINXX_BUILD_DIR"
-
-# Group intermediate outputs into a 'dist' directory
-mkdir -p "$WINXX_BUILD_DIR/dist"
-cp "$WINXX_BUILD_DIR"/app/scrcpy.exe "$WINXX_BUILD_DIR/dist/"
-cp app/data/scrcpy-console.bat "$WINXX_BUILD_DIR/dist/"
-cp app/data/scrcpy-noconsole.vbs "$WINXX_BUILD_DIR/dist/"
-cp app/data/icon.png "$WINXX_BUILD_DIR/dist/"
-cp app/data/open_a_terminal_here.bat "$WINXX_BUILD_DIR/dist/"
-cp "$DEPS_INSTALL_DIR"/bin/*.dll "$WINXX_BUILD_DIR/dist/"
-cp -r "$ADB_INSTALL_DIR"/. "$WINXX_BUILD_DIR/dist/"

release/generate_checksums.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-
-cd "$OUTPUT_DIR"
-sha256sum "scrcpy-server-$VERSION" \
-    "scrcpy-linux-x86_64-$VERSION.tar.gz" \
-    "scrcpy-win32-$VERSION.zip" \
-    "scrcpy-win64-$VERSION.zip" \
-    "scrcpy-macos-aarch64-$VERSION.tar.gz" \
-    "scrcpy-macos-x86_64-$VERSION.tar.gz" \
-        | tee SHA256SUMS.txt
-echo "Release checksums generated in $PWD/SHA256SUMS.txt"

release/package_client.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-if [[ $# != 2 ]]
-then
-    # <target_name>: for example win64
-    # <format>: zip or tar.gz
-    echo "Syntax: $0 <target> <format>" >&2
-    exit 1
-fi
-
-FORMAT=$2
-
-if [[ "$FORMAT" != zip && "$FORMAT" != tar.gz ]]
-then
-    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_DIRNAME="scrcpy-$1-$VERSION"
-
-rm -rf "$ARCHIVE_DIR/$TARGET_DIRNAME"
-mkdir -p "$ARCHIVE_DIR/$TARGET_DIRNAME"
-
-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_DIRNAME.$FORMAT"
-
-case "$FORMAT" in
-    zip)
-        zip -r "$OUTPUT_DIR/$TARGET_DIRNAME.zip" "$TARGET_DIRNAME"
-        ;;
-    tar.gz)
-        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_DIRNAME"
-cd -
-echo "Generated '$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT'"

release/package_server.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-OUTPUT_DIR="$PWD/output"
-. build_common
-cd .. # root project dir
-
-mkdir -p "$OUTPUT_DIR"
-cp "$WORK_DIR/build-server/server/scrcpy-server" "$OUTPUT_DIR/scrcpy-server-$VERSION"
-echo "Generated '$OUTPUT_DIR/scrcpy-server-$VERSION'"

release/release.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-# To customize the version name:
-#     VERSION=myversion ./release.sh
-set -e
-
-cd "$(dirname ${BASH_SOURCE[0]})"
-rm -rf output
-
-./test_server.sh
-./test_client.sh
-
-./build_server.sh
-./build_windows.sh 32
-./build_windows.sh 64
-./build_linux.sh x86_64
-
-./package_server.sh
-./package_client.sh win32 zip
-./package_client.sh win64 zip
-./package_client.sh linux-x86_64 tar.gz
-
-./generate_checksums.sh
-
-echo "Release generated in $PWD/output"

release/test_client.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-TEST_BUILD_DIR="$WORK_DIR/build-test"
-
-rm -rf "$TEST_BUILD_DIR"
-meson setup "$TEST_BUILD_DIR" -Dcompile_server=false \
-    -Db_sanitize=address,undefined
-ninja -C "$TEST_BUILD_DIR" test

release/test_server.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -ex
-cd "$(dirname ${BASH_SOURCE[0]})"
-. build_common
-cd .. # root project dir
-
-GRADLE="${GRADLE:-./gradlew}"
-
-"$GRADLE" -p server check

server/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 30100
-        versionName "3.1"
+        versionCode 20700
+        versionName "2.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

server/build_without_gradle.sh

@@ -12,11 +12,10 @@
 set -e
 
 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=3.1
+SCRCPY_VERSION_NAME=2.7
 
 PLATFORM=${ANDROID_PLATFORM:-35}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-35.0.0}
-PLATFORM_TOOLS="$ANDROID_HOME/platforms/android-$PLATFORM"
 BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"
 
 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
@@ -24,8 +23,7 @@ CLASSES_DIR="$BUILD_DIR/classes"
 GEN_DIR="$BUILD_DIR/gen"
 SERVER_DIR=$(dirname "$0")
 SERVER_BINARY=scrcpy-server
-ANDROID_JAR="$PLATFORM_TOOLS/android.jar"
-ANDROID_AIDL="$PLATFORM_TOOLS/framework.aidl"
+ANDROID_JAR="$ANDROID_HOME/platforms/android-$PLATFORM/android.jar"
 LAMBDA_JAR="$BUILD_TOOLS_DIR/core-lambda-stubs.jar"
 
 echo "Platform: android-$PLATFORM"
@@ -51,8 +49,6 @@ cd "$SERVER_DIR/src/main/aidl"
 "$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" -I. \
     android/content/IOnPrimaryClipChangedListener.aidl
 "$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" -I. android/view/IDisplayFoldListener.aidl
-"$BUILD_TOOLS_DIR/aidl" -o"$GEN_DIR" -I. -p "$ANDROID_AIDL" \
-    android/view/IDisplayWindowListener.aidl
 
 # Fake sources to expose hidden Android types to the project
 FAKE_SRC=( \

server/src/main/java/com/genymobile/scrcpy/CleanUp.java

@@ -6,8 +6,6 @@ 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;
@@ -26,7 +24,6 @@ public final class CleanUp {
     private boolean pendingRestoreDisplayPower;
 
     private Thread thread;
-    private boolean interrupted;
 
     private CleanUp(Options options) {
         thread = new Thread(() -> runCleanUp(options), "cleanup");
@@ -37,10 +34,8 @@ public final class CleanUp {
         return new CleanUp(options);
     }
 
-    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 interrupt() {
+        thread.interrupt();
     }
 
     public void join() throws InterruptedException {
@@ -102,13 +97,15 @@ 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 {
+            throws IOException, InterruptedException {
         String[] cmd = {
                 "app_process",
                 "/",
@@ -129,15 +126,8 @@ public final class CleanUp {
             int localPendingChanges;
             boolean localPendingRestoreDisplayPower;
             synchronized (this) {
-                while (!interrupted && pendingChanges == 0) {
-                    try {
-                        wait();
-                    } catch (InterruptedException e) {
-                        throw new AssertionError("Clean up thread MUST NOT be interrupted");
-                    }
-                }
-                if (interrupted) {
-                    break;
+                while (pendingChanges == 0) {
+                    wait();
                 }
                 localPendingChanges = pendingChanges;
                 localPendingRestoreDisplayPower = pendingRestoreDisplayPower;
@@ -165,12 +155,6 @@ 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]);
@@ -223,15 +207,13 @@ public final class CleanUp {
             }
         }
 
-        // 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 (displayId != Device.DISPLAY_ID_NONE && Device.isScreenOn(displayId)) {
             if (powerOffScreen) {
                 Ln.i("Power off screen");
-                Device.powerOffScreen(targetDisplayId);
+                Device.powerOffScreen(displayId);
             } else if (restoreDisplayPower) {
                 Ln.i("Restoring display power");
-                Device.setDisplayPower(targetDisplayId, true);
+                Device.setDisplayPower(displayId, true);
             }
         }
 

server/src/main/java/com/genymobile/scrcpy/Options.java

@@ -60,8 +60,6 @@ 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;
     private Orientation captureOrientation = Orientation.Orient0;
@@ -234,14 +232,6 @@ public class Options {
         return captureOrientationLock;
     }
 
-    public boolean getVDDestroyContent() {
-        return vdDestroyContent;
-    }
-
-    public boolean getVDSystemDecorations() {
-        return vdSystemDecorations;
-    }
-
     public boolean getList() {
         return listEncoders || listDisplays || listCameras || listCameraSizes || listApps;
     }
@@ -471,12 +461,6 @@ 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;
                 case "capture_orientation":
                     Pair<Orientation.Lock, Orientation> pair = parseCaptureOrientation(value);
                     options.captureOrientationLock = pair.first;

server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java

@@ -51,8 +51,6 @@ public final class ControlMessage {
     private int id;
     private byte[] data;
     private boolean on;
-    private int vendorId;
-    private int productId;
 
     private ControlMessage() {
     }
@@ -133,12 +131,10 @@ public final class ControlMessage {
         return msg;
     }
 
-    public static ControlMessage createUhidCreate(int id, int vendorId, int productId, String name, byte[] reportDesc) {
+    public static ControlMessage createUhidCreate(int id, 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;
@@ -241,12 +237,4 @@ public final class ControlMessage {
     public boolean getOn() {
         return on;
     }
-
-    public int getVendorId() {
-        return vendorId;
-    }
-
-    public int getProductId() {
-        return productId;
-    }
 }

server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java

@@ -142,11 +142,9 @@ 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, vendorId, productId, name, data);
+        return ControlMessage.createUhidCreate(id, name, data);
     }
 
     private ControlMessage parseUhidInput() throws IOException {

server/src/main/java/com/genymobile/scrcpy/control/Controller.java

@@ -21,7 +21,6 @@ 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;
@@ -282,7 +281,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 setClipboard(msg.getText(), msg.getPaste(), msg.getSequence());
                 break;
             case ControlMessage.TYPE_SET_DISPLAY_POWER:
-                if (supportsInputEvents) {
+                if (supportsInputEvents && displayId != Device.DISPLAY_ID_NONE) {
                     setDisplayPower(msg.getOn());
                 }
                 break;
@@ -290,7 +289,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 Device.rotateDevice(getActionDisplayId());
                 break;
             case ControlMessage.TYPE_UHID_CREATE:
-                getUhidManager().open(msg.getId(), msg.getVendorId(), msg.getProductId(), msg.getText(), msg.getData());
+                getUhidManager().open(msg.getId(), msg.getText(), msg.getData());
                 break;
             case ControlMessage.TYPE_UHID_INPUT:
                 getUhidManager().writeInput(msg.getId(), msg.getData());
@@ -351,47 +350,24 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
         return successCount;
     }
 
-    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();
-        // 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;
-        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) {
+        // 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";
+
+        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 + ")");
+            }
             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");
@@ -445,7 +421,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, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(downEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -456,7 +432,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(pressEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(pressEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(pressEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -470,7 +446,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(releaseEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(releaseEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -478,7 +454,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, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(upEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -489,20 +465,27 @@ 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, targetDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
     }
 
     private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
         long now = SystemClock.uptimeMillis();
 
-        Pair<Point, Integer> pair = getEventPointAndDisplayId(position);
-        if (pair == null) {
+        // 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 + ")");
+            }
             return false;
         }
 
-        Point point = pair.first;
-        int targetDisplayId = pair.second;
-
         MotionEvent.PointerProperties props = pointerProperties[0];
         props.id = 0;
 
@@ -514,7 +497,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, targetDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
     }
 
     /**
@@ -708,12 +691,9 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
     }
 
     private void setDisplayPower(boolean on) {
-        // 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);
+        boolean setDisplayPowerOk = Device.setDisplayPower(displayId, on);
         if (setDisplayPowerOk) {
-            // Do not keep display power off for virtual displays: MOD+p must wake up the physical device
-            keepDisplayPowerOff = displayId != Device.DISPLAY_ID_NONE && !on;
+            keepDisplayPowerOff = !on;
             Ln.i("Device display turned " + (on ? "on" : "off"));
             if (cleanUp != null) {
                 boolean mustRestoreOnExit = !on;

server/src/main/java/com/genymobile/scrcpy/control/UhidManager.java

@@ -48,7 +48,7 @@ public final class UhidManager {
         }
     }
 
-    public void open(int id, int vendorId, int productId, String name, byte[] reportDesc) throws IOException {
+    public void open(int id, 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(vendorId, productId, name, reportDesc);
+                byte[] req = buildUhidCreate2Req(name, reportDesc);
                 Os.write(fd, req, 0, req.length);
 
                 registerUhidListener(id, fd);
@@ -148,7 +148,7 @@ public final class UhidManager {
         }
     }
 
-    private static byte[] buildUhidCreate2Req(int vendorId, int productId, String name, byte[] reportDesc) {
+    private static byte[] buildUhidCreate2Req(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" : name;
+        String actualName = name.isEmpty() ? "scrcpy" : "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(vendorId);
-        buf.putInt(productId);
+        buf.putInt(0); // vendor id
+        buf.putInt(0); // product id
         buf.putInt(0); // version
         buf.putInt(0); // country;
         buf.put(reportDesc);

server/src/main/java/com/genymobile/scrcpy/device/Device.java

@@ -40,10 +40,6 @@ 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
     }
@@ -131,7 +127,7 @@ public final class Device {
     public static boolean setDisplayPower(int displayId, boolean on) {
         assert displayId != Device.DISPLAY_ID_NONE;
 
-        if (USE_ANDROID_15_DISPLAY_POWER && Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
+        if (Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
             return ServiceManager.getDisplayManager().requestDisplayPower(displayId, on);
         }
 

server/src/main/java/com/genymobile/scrcpy/device/Orientation.java

@@ -42,6 +42,6 @@ public enum Orientation {
     }
 
     public int getRotation() {
-        return ordinal() & 3;
+        return this.ordinal() & 3;
     }
 }

server/src/main/java/com/genymobile/scrcpy/device/Size.java

@@ -60,7 +60,7 @@ public final class Size {
      * @return The current size rounded.
      */
     public Size round8() {
-        if (isMultipleOf8()) {
+        if ((width & 7) == 0 && (height & 7) == 0) {
             // Already a multiple of 8
             return this;
         }
@@ -80,10 +80,6 @@ public final class Size {
         return new Size(w, h);
     }
 
-    public boolean isMultipleOf8() {
-        return (width & 7) == 0 && (height & 7) == 0;
-    }
-
     public Rect toRect() {
         return new Rect(0, 0, width, height);
     }

server/src/main/java/com/genymobile/scrcpy/opengl/AffineOpenGLFilter.java

@@ -22,7 +22,7 @@ public class AffineOpenGLFilter implements OpenGLFilter {
     private int userMatrixLoc;
 
     public AffineOpenGLFilter(AffineMatrix transform) {
-        userMatrix = transform.to4x4();
+        this.userMatrix = transform.to4x4();
     }
 
     @Override

server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLFilter.java

@@ -10,12 +10,12 @@ public interface OpenGLFilter {
     void init() throws OpenGLException;
 
     /**
-     * Render a frame (call for each frame).
+     * Render a frame (call for each frame)
      */
     void draw(int textureId, float[] texMatrix);
 
     /**
-     * Release resources.
+     * Release resources
      */
     void release();
 }

server/src/main/java/com/genymobile/scrcpy/util/AffineMatrix.java

@@ -185,7 +185,7 @@ public class AffineMatrix {
     }
 
     /**
-     * Return this transform applied from the center (0.5, 0.5).
+     * Return this transform apply from the center (0.5, 0.5).
      *
      * @return the resulting matrix
      */

server/src/main/java/com/genymobile/scrcpy/util/IO.java

@@ -72,8 +72,4 @@ 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);
-    }
 }

server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java

@@ -48,13 +48,11 @@ public class NewDisplayCapture extends SurfaceCapture {
 
     private Size mainDisplaySize;
     private int mainDisplayDpi;
-    private int maxSize;
+    private int maxSize; // only used if newDisplay.getSize() != null
     private final Rect crop;
     private final boolean captureOrientationLocked;
     private final Orientation captureOrientation;
     private final float angle;
-    private final boolean vdDestroyContent;
-    private final boolean vdSystemDecorations;
 
     private VirtualDisplay virtualDisplay;
     private Size videoSize;
@@ -74,8 +72,6 @@ public class NewDisplayCapture extends SurfaceCapture {
         this.captureOrientation = options.getCaptureOrientation();
         assert captureOrientation != null;
         this.angle = options.getAngle();
-        this.vdDestroyContent = options.getVDDestroyContent();
-        this.vdSystemDecorations = options.getVDSystemDecorations();
     }
 
     @Override
@@ -103,7 +99,7 @@ public class NewDisplayCapture extends SurfaceCapture {
         int displayRotation;
         if (virtualDisplay == null) {
             if (!newDisplay.hasExplicitSize()) {
-                displaySize = mainDisplaySize;
+                displaySize = mainDisplaySize.limit(maxSize).round8();
             }
             if (!newDisplay.hasExplicitDpi()) {
                 dpi = scaleDpi(mainDisplaySize, mainDisplayDpi, displaySize);
@@ -130,19 +126,10 @@ public class NewDisplayCapture extends SurfaceCapture {
         filter.addOrientation(displayRotation, captureOrientationLocked, captureOrientation);
         filter.addAngle(angle);
 
-        Size filteredSize = filter.getOutputSize();
-        if (!filteredSize.isMultipleOf8() || (maxSize != 0 && filteredSize.getMax() > maxSize)) {
-            if (maxSize != 0) {
-                filteredSize = filteredSize.limit(maxSize);
-            }
-            filteredSize = filteredSize.round8();
-            filter.addResize(filteredSize);
-        }
-
         eventTransform = filter.getInverseTransform();
 
         // DisplayInfo gives the oriented size (so videoSize includes the display rotation)
-        videoSize = filter.getOutputSize();
+        videoSize = filter.getOutputSize().limit(maxSize).round8();
 
         // But the virtual display video always remains in the origin orientation (the video itself is not rotated, so it must rotated manually).
         // This additional display rotation must not be included in the input events transform (the expected coordinates are already in the
@@ -156,7 +143,7 @@ public class NewDisplayCapture extends SurfaceCapture {
         displayFilter.addRotation(displayRotation);
         AffineMatrix displayRotationMatrix = displayFilter.getInverseTransform();
 
-        // Take care of multiplication order:
+        // Take care or multiplication order:
         //   displayTransform = (FILTER_MATRIX * DISPLAY_FILTER_MATRIX)⁻¹
         //                    = DISPLAY_FILTER_MATRIX⁻¹ * FILTER_MATRIX⁻¹
         //                    = displayRotationMatrix * eventTransform
@@ -169,13 +156,9 @@ 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;
-            if (vdDestroyContent) {
-                flags |= VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL;
-            }
-            if (vdSystemDecorations) {
-                flags |= VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS;
-            }
+                    | VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT
+                    | VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
+                    | VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS;
             if (Build.VERSION.SDK_INT >= AndroidVersions.API_33_ANDROID_13) {
                 flags |= VIRTUAL_DISPLAY_FLAG_TRUSTED
                         | VIRTUAL_DISPLAY_FLAG_OWN_DISPLAY_GROUP
@@ -244,6 +227,11 @@ public class NewDisplayCapture extends SurfaceCapture {
 
     @Override
     public synchronized boolean setMaxSize(int newMaxSize) {
+        if (newDisplay.hasExplicitSize()) {
+            // Cannot retry with a different size if the display size was explicitly provided
+            return false;
+        }
+
         maxSize = newMaxSize;
         return true;
     }

server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java

@@ -124,9 +124,15 @@ 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 {
@@ -134,7 +140,11 @@ 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);
@@ -144,18 +154,6 @@ 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);
         }
     }

server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java

@@ -112,12 +112,8 @@ 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 | 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());
+                } catch (IllegalStateException | IllegalArgumentException e) {
+                    Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
                     if (!prepareRetry(size)) {
                         throw e;
                     }

server/src/main/java/com/genymobile/scrcpy/video/VideoFilter.java

@@ -78,7 +78,6 @@ public class VideoFilter {
             size = size.rotate();
         }
     }
-
     public void addOrientation(Orientation captureOrientation) {
         if (captureOrientation.isFlipped()) {
             transform = AffineMatrix.hflip().multiply(transform);
@@ -103,17 +102,4 @@ public class VideoFilter {
         double ccwAngle = -cwAngle;
         transform = AffineMatrix.rotate(ccwAngle).withAspectRatio(size).fromCenter().multiply(transform);
     }
-
-    public void addResize(Size targetSize) {
-        if (size.equals(targetSize)) {
-            return;
-        }
-
-        if (transform == null) {
-            // The requested scaling is performed by the viewport (by changing the output size), but the OpenGL filter must still run, even if
-            // resizing is not performed by the shader. So transform MUST NOT be null.
-            transform = AffineMatrix.IDENTITY;
-        }
-        size = targetSize;
-    }
 }

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayControl.java

@@ -6,7 +6,6 @@ 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;
 
@@ -22,9 +21,7 @@ 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);
-
-            String systemServerClasspath = Os.getenv("SYSTEMSERVERCLASSPATH");
-            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, systemServerClasspath, null, null,
+            ClassLoader classLoader = (ClassLoader) createClassLoaderMethod.invoke(null, "/system/framework/services.jar", null, null,
                     ClassLoader.getSystemClassLoader(), 0, true, null);
 
             displayControlClass = classLoader.loadClass("com.android.server.display.DisplayControl");

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java

@@ -192,9 +192,6 @@ public final class DisplayManager {
                         if ("onDisplayChanged".equals(method.getName())) {
                             listener.onDisplayChanged((int) args[0]);
                         }
-                        if ("toString".equals(method.getName())) {
-                            return "DisplayListener";
-                        }
                         return null;
                     });
             try {

server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java

@@ -322,8 +322,6 @@ 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};
@@ -337,8 +335,6 @@ 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());