241 changed files with 4667 additions and 11511 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,3 +0,0 @@
-github: [rom1v]
-liberapay: rom1v
-custom: ["https://paypal.me/rom2v"]
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -7,25 +7,17 @@ assignees: ''

 ---

-_Please read the [prerequisites] to run scrcpy._
+ - [ ] I have read the [FAQ](https://github.com/Genymobile/scrcpy/blob/master/FAQ.md).
+ - [ ] I have searched in existing [issues](https://github.com/Genymobile/scrcpy/issues).

-[prerequisites]: https://github.com/Genymobile/scrcpy#prerequisites
-
-_Also read the [FAQ] and check if your [issue][issues] already exists._
-
-[FAQ]: https://github.com/Genymobile/scrcpy/blob/master/FAQ.md
-[issues]: https://github.com/Genymobile/scrcpy/issues
-
-## Environment
-
- - **OS:** [e.g. Debian, Windows, macOS...]
- - **Scrcpy version:** [e.g. 2.5]
- - **Installation method:** [e.g. manual build, apt, snap, brew, Windows release...]
- - **Device model:**
- - **Android version:** [e.g. 14]
-
-## Describe the bug
+**Environment**
+ - OS: [e.g. Debian, Windows, macOS...]
+ - scrcpy version: [e.g. 1.12.1]
+ - installation method: [e.g. manual build, apt, snap, brew, Windows release...]
+ - device model:
+ - Android version: [e.g. 10]

+**Describe the bug**
 A clear and concise description of what the bug is.

 On errors, please provide the output of the console (and `adb logcat` if relevant).
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@ -1,8 +0,0 @@
---
-name: Question
-about: Ask a question about scrcpy
-title: ''
-labels: ''
-assignees: ''
-
---
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,502 +0,0 @@
-name: Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      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:
-    runs-on: ubuntu-latest
-    env:
-      GRADLE: gradle  # use native gradle instead of ./gradlew in scripts
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Test scrcpy-server
-        run: release/test_server.sh
-
-  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: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Build
-        run: release/build_server.sh
-
-      - name: Upload 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
-
-  test-client:
-    runs-on: ubuntu-latest
-    steps:
-      - 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
-
-      - 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
-
-      - 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/
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-linux-x86_64-intermediate
-          path: release/work/build-linux-x86_64/dist-tar/
-
-  build-win32:
-    runs-on: ubuntu-latest
-    steps:
-      - 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 \
-             mingw-w64 mingw-w64-tools libz-mingw-w64-dev
-
-      - 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
-
-      # 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
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-win32-intermediate
-          path: release/work/build-win32/dist-tar/
-
-  build-win64:
-    runs-on: ubuntu-latest
-    steps:
-      - 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 \
-             mingw-w64 mingw-w64-tools libz-mingw-w64-dev
-
-      - 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
-
-      # 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
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-win64-intermediate
-          path: release/work/build-win64/dist-tar/
-
-  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:
-    needs:
-      - build-scrcpy-server
-      - build-win32
-    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-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/
-
-      - 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
-
-      - 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
-
-      - name: Upload release artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: scrcpy-release-${{ env.VERSION }}
-          path: release/output
--- a/2
+++ b/2
@ -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.
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@
 source for the project. Do not download releases from random websites, even if
 their name contains `scrcpy`.**

-# scrcpy (v3.1)
+# scrcpy (v2.4)

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

@ -31,14 +31,12 @@ It focuses on:
 Its features include:
 - [audio forwarding](doc/audio.md) (Android 11+)
 - [recording](doc/recording.md)
- - [virtual display](doc/virtual_display.md)
 - mirroring with [Android device screen off](doc/device.md#turn-screen-off)
 - [copy-paste](doc/control.md#copy-paste) in both directions
 - [configurable quality](doc/video.md)
 - [camera mirroring](doc/camera.md) (Android 12+)
 - [mirroring as a webcam (V4L2)](doc/v4l2.md) (Linux-only)
 - physical [keyboard][hid-keyboard] and [mouse][hid-mouse] simulation (HID)
- - [gamepad](doc/gamepad.md) support
 - [OTG mode](doc/otg.md)
 - and more…

@ -55,16 +53,10 @@ Make sure you [enabled USB debugging][enable-adb] on your device(s).

 [enable-adb]: https://developer.android.com/studio/debug/dev-options#enable

-On some devices (especially Xiaomi), you might get the following error:
-
-```
-java.lang.SecurityException: Injecting input events requires the caller (or the source of the instrumentation, if any) to have the INJECT_EVENTS permission.
-```
-
-In that case, you need to enable [an additional option][control] `USB debugging
-(Security Settings)` (this is an item different from `USB debugging`) to control
-it using a keyboard and mouse. Rebooting the device is necessary once this
-option is set.
+On some devices, you also need to enable [an additional option][control] `USB
+debugging (Security Settings)` (this is an item different from `USB debugging`)
+to control it using a keyboard and mouse. Rebooting the device is necessary once
+this option is set.

 [control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323

@ -74,20 +66,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.
@ -102,12 +84,6 @@ Here are just some common examples.
    scrcpy --video-codec=h265 -m1920 --max-fps=60 --no-audio -K  # short version
    ```

- - Start VLC in a new virtual display (separate from the device display):
-
-    ```bash
-    scrcpy --new-display=1920x1080 --start-app=org.videolan.vlc
-    ```
-
 - Record the device camera in H.265 at 1920x1080 (and microphone) to an MP4
   file:

@ -129,13 +105,6 @@ Here are just some common examples.
    scrcpy --otg
    ```

- - Control the device using gamepad controllers plugged into the computer:
-
-    ```bash
-    scrcpy --gamepad=uhid
-    scrcpy -G  # short version
-    ```
-
 ## User documentation

 The application provides a lot of features and configuration options. They are
@ -147,11 +116,9 @@ documented in the following pages:
 - [Control](doc/control.md)
 - [Keyboard](doc/keyboard.md)
 - [Mouse](doc/mouse.md)
- - [Gamepad](doc/gamepad.md)
 - [Device](doc/device.md)
 - [Window](doc/window.md)
 - [Recording](doc/recording.md)
- - [Virtual display](doc/virtual_display.md)
 - [Tunnels](doc/tunnels.md)
 - [OTG](doc/otg.md)
 - [Camera](doc/camera.md)
@ -181,17 +148,13 @@ documented in the following pages:

 ## Contact

-You can open an [issue] for bug reports, feature requests or general questions.
-
-For bug reports, please read the [FAQ](FAQ.md) first, you might find a solution
-to your problem immediately.
+If you encounter a bug, please read the [FAQ](FAQ.md) first, then open an [issue].

 [issue]: https://github.com/Genymobile/scrcpy/issues

-You can also use:
+For general questions or discussions, 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 +173,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.
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@ -2,12 +2,10 @@ _scrcpy() {
    local cur prev words cword
    local opts="
        --always-on-top
-        --angle
        --audio-bit-rate=
        --audio-buffer=
        --audio-codec=
        --audio-codec-options=
-        --audio-dup
        --audio-encoder=
        --audio-source=
        --audio-output-buffer=
@ -18,27 +16,26 @@ _scrcpy() {
        --camera-fps=
        --camera-high-speed
        --camera-size=
-        --capture-orientation=
        --crop=
        -d --select-usb
        --disable-screensaver
+        --display-buffer=
        --display-id=
        --display-orientation=
        -e --select-tcpip
        -f --fullscreen
        --force-adb-forward
-        -G
-        --gamepad=
        -h --help
        -K
        --keyboard=
        --kill-adb-on-close
        --legacy-paste
-        --list-apps
        --list-camera-sizes
        --list-cameras
        --list-displays
        --list-encoders
+        --lock-video-orientation
+        --lock-video-orientation=
        -m --max-size=
        -M
        --max-fps=
@ -46,8 +43,6 @@ _scrcpy() {
        --mouse-bind=
        -n --no-control
        -N --no-playback
-        --new-display
-        --new-display=
        --no-audio
        --no-audio-playback
        --no-cleanup
@ -55,10 +50,7 @@ _scrcpy() {
        --no-downsize-on-error
        --no-key-repeat
        --no-mipmaps
-        --no-mouse-hover
        --no-power-on
-        --no-vd-destroy-content
-        --no-vd-system-decorations
        --no-video
        --no-video-playback
        --orientation=
@ -79,9 +71,7 @@ _scrcpy() {
        --rotation=
        -s --serial=
        -S --turn-screen-off
-        --screen-off-timeout=
        --shortcut-mod=
-        --start-app=
        -t --show-touches
        --tcpip
        --tcpip=
@ -92,7 +82,6 @@ _scrcpy() {
        --v4l2-sink=
        -v --version
        -V --verbosity=
-        --video-buffer=
        --video-codec=
        --video-codec-options=
        --video-encoder=
@ -121,7 +110,7 @@ _scrcpy() {
            return
            ;;
        --audio-source)
-            COMPREPLY=($(compgen -W 'output mic playback' -- "$cur"))
+            COMPREPLY=($(compgen -W 'output mic' -- "$cur"))
            return
            ;;
        --camera-facing)
@ -136,14 +125,6 @@ _scrcpy() {
            COMPREPLY=($(compgen -W 'disabled sdk uhid aoa' -- "$cur"))
            return
            ;;
-        --gamepad)
-            COMPREPLY=($(compgen -W 'disabled uhid aoa' -- "$cur"))
-            return
-            ;;
-        --capture-orientation)
-            COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270 @0 @90 @180 @270 @flip0 @flip90 @flip180 @flip270' -- "$cur"))
-            return
-            ;;
        --orientation|--display-orientation)
            COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
            return
@ -152,6 +133,10 @@ _scrcpy() {
            COMPREPLY=($(compgen -W '0 90 180 270' -- "$cur"))
            return
            ;;
+        --lock-video-orientation)
+            COMPREPLY=($(compgen -W 'unlocked initial 0 90 180 270' -- "$cur"))
+            return
+            ;;
        --pause-on-exit)
            COMPREPLY=($(compgen -W 'true false if-error' -- "$cur"))
            return
@ -194,9 +179,9 @@ _scrcpy() {
        |--camera-size \
        |--crop \
        |--display-id \
+        |--display-buffer \
        |--max-fps \
        |-m|--max-size \
-        |--new-display \
        |-p|--port \
        |--push-target \
        |--rotation \
@ -204,7 +189,6 @@ _scrcpy() {
        |--tunnel-port \
        |--v4l2-buffer \
        |--v4l2-sink \
-        |--video-buffer \
        |--video-codec-options \
        |--video-encoder \
        |--tcpip \
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@ -9,14 +9,12 @@ local arguments

 arguments=(
    '--always-on-top[Make scrcpy window always on top \(above other windows\)]'
-    '--angle=[Rotate the video content by a custom angle, in degrees]'
    '--audio-bit-rate=[Encode the audio at the given bit-rate]'
    '--audio-buffer=[Configure the audio buffering delay (in milliseconds)]'
    '--audio-codec=[Select the audio codec]:codec:(opus aac flac raw)'
    '--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
-    '--audio-dup=[Duplicate audio]'
    '--audio-encoder=[Use a specific MediaCodec audio encoder]'
-    '--audio-source=[Select the audio source]:source:(output mic playback)'
+    '--audio-source=[Select the audio source]:source:(output mic)'
    '--audio-output-buffer=[Configure the size of the SDL audio output buffer (in milliseconds)]'
    {-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
    '--camera-ar=[Select the camera size by its aspect ratio]'
@ -25,35 +23,32 @@ arguments=(
    '--camera-facing=[Select the device camera by its facing direction]:facing:(front back external)'
    '--camera-fps=[Specify the camera capture frame rate]'
    '--camera-size=[Specify an explicit camera capture size]'
-    '--capture-orientation=[Set the capture video orientation]:orientation:(0 90 180 270 flip0 flip90 flip180 flip270 @0 @90 @180 @270 @flip0 @flip90 @flip180 @flip270)'
    '--crop=[\[width\:height\:x\:y\] Crop the device screen on the server]'
    {-d,--select-usb}'[Use USB device]'
    '--disable-screensaver[Disable screensaver while scrcpy is running]'
+    '--display-buffer=[Add a buffering delay \(in milliseconds\) before displaying]'
    '--display-id=[Specify the display id to mirror]'
    '--display-orientation=[Set the initial display orientation]:orientation values:(0 90 180 270 flip0 flip90 flip180 flip270)'
    {-e,--select-tcpip}'[Use TCP/IP device]'
    {-f,--fullscreen}'[Start in fullscreen]'
    '--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
-    '-G[Use UHID/AOA gamepad (same as --gamepad=uhid or --gamepad=aoa, depending on OTG mode)]'
-    '--gamepad=[Set the gamepad input mode]:mode:(disabled uhid aoa)'
    {-h,--help}'[Print the help]'
-    '-K[Use UHID/AOA keyboard (same as --keyboard=uhid or --keyboard=aoa, depending on OTG mode)]'
+    '-K[Use UHID keyboard (same as --keyboard=uhid)]'
    '--keyboard=[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'
    '--kill-adb-on-close[Kill adb when scrcpy terminates]'
    '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
-    '--list-apps[List Android apps installed on the device]'
    '--list-camera-sizes[List the valid camera capture sizes]'
    '--list-cameras[List cameras available on the device]'
    '--list-displays[List displays available on the device]'
    '--list-encoders[List video and audio encoders available on the device]'
+    '--lock-video-orientation=[Lock video orientation]:orientation:(unlocked initial 0 90 180 270)'
    {-m,--max-size=}'[Limit both the width and height of the video to value]'
-    '-M[Use UHID/AOA mouse (same as --mouse=uhid or --mouse=aoa, depending on OTG mode)]'
+    '-M[Use UHID mouse (same as --mouse=uhid)]'
    '--max-fps=[Limit the frame rate of screen capture]'
    '--mouse=[Set the mouse input mode]:mode:(disabled sdk uhid aoa)'
    '--mouse-bind=[Configure bindings of secondary clicks]'
    {-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
    {-N,--no-playback}'[Disable video and audio playback]'
-    '--new-display=[Create a new display]'
    '--no-audio[Disable audio forwarding]'
    '--no-audio-playback[Disable audio playback]'
    '--no-cleanup[Disable device cleanup actions on exit]'
@ -61,10 +56,7 @@ arguments=(
    '--no-downsize-on-error[Disable lowering definition on MediaCodec error]'
    '--no-key-repeat[Do not forward repeated key events when a key is held down]'
    '--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)'
@ -83,9 +75,7 @@ arguments=(
    '--require-audio=[Make scrcpy fail if audio is enabled but does not work]'
    {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
    {-S,--turn-screen-off}'[Turn the device screen off immediately]'
-    '--screen-off-timeout=[Set the screen off timeout in seconds]'
    '--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
-    '--start-app=[Start an Android app]'
    {-t,--show-touches}'[Show physical touches]'
    '--tcpip[\(optional \[ip\:port\]\) Configure and connect the device over TCP/IP]'
    '--time-limit=[Set the maximum mirroring time, in seconds]'
@ -95,7 +85,6 @@ arguments=(
    '--v4l2-sink=[\[\/dev\/videoN\] Output to v4l2loopback device]'
    {-v,--version}'[Print the version of scrcpy]'
    {-V,--verbosity=}'[Set the log level]:verbosity:(verbose debug info warn error)'
-    '--video-buffer=[Add a buffering delay \(in milliseconds\) before displaying video frames]'
    '--video-codec=[Select the video codec]:codec:(h264 h265 av1)'
    '--video-codec-options=[Set a list of comma-separated key\:type=value options for the device video encoder]'
    '--video-encoder=[Use a specific MediaCodec video encoder]'
--- a/app/deps/adb_windows.sh
+++ b/app/deps/adb_windows.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=34.0.5
+FILENAME=platform-tools_r$VERSION-windows.zip
+PROJECT_DIR=platform-tools-$VERSION
+SHA256SUM=3f8320152704377de150418a3c4c9d07d16d80a6c0d0d8f7289c22c499e33571

 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/"
--- a/app/deps/adb_linux.sh
+++ b/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/"
--- a/app/deps/adb_macos.sh
+++ b/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/"
--- a/app/deps/common
+++ b/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
+if [[ $# != 1 ]]
+then
    # <host>: win32 or win64
-        # <build_type>: native or cross
-        # <link_type>: static or shared
-        echo "Syntax: $0 <host> <build_type> <link_type>" >&2
+    echo "Syntax: $0 <host>" >&2
    exit 1
-    fi
+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
+if [[ "$HOST" = win32 ]]
+then
    HOST_TRIPLET=i686-w64-mingw32
-        elif [[ "$HOST" = win64 ]]
-        then
+elif [[ "$HOST" = win64 ]]
+then
    HOST_TRIPLET=x86_64-w64-mingw32
-        else
-            echo "Unsupported cross-build to host: $HOST" >&2
+else
+    echo "Unsupported host: $HOST" >&2
    exit 1
-        fi
-    fi
-}
+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() {
--- a/app/deps/dav1d.sh
+++ b/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
--- a/app/deps/ffmpeg.sh
+++ b/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=6.1.1
 FILENAME=ffmpeg-$VERSION.tar.xz
 PROJECT_DIR=ffmpeg-$VERSION
-SHA256SUM=40973D44970DBC83EF302B0609F2E74982BE2D85916DD2EE7472D30678A7ABE6
+SHA256SUM=8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968

 cd "$SOURCES_DIR"

@ -18,126 +17,74 @@ then
 else
    get_file "https://ffmpeg.org/releases/$FILENAME" "$FILENAME" "$SHA256SUM"
    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
+    patch -d "$PROJECT_DIR" -p1 < "$PATCHES_DIR"/ffmpeg-6.1-fix-build.patch
 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"
-
-    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
-
-    export PKG_CONFIG_PATH="$INSTALL_DIR/$DIRNAME/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-    conf=(
-        --prefix="$INSTALL_DIR/$DIRNAME"
-        --pkg-config-flags="--static"
-        --extra-cflags="-O2 -fPIC"
-        --disable-programs
-        --disable-doc
-        --disable-swscale
-        --disable-postproc
-        --disable-avfilter
-        --disable-network
-        --disable-everything
-        --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
+fi

-    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
+# -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'
+
+if [[ -d "$HOST" ]]
+then
+    echo "'$PWD/$HOST' already exists, not reconfigured"
+    cd "$HOST"
+else
+    mkdir "$HOST"
+    cd "$HOST"
+
+    "$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
 fi

 make -j
--- a/app/deps/libusb.sh
+++ b/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
--- a/app/deps/patches/ffmpeg-6.1-fix-build.patch
+++ b/app/deps/patches/ffmpeg-6.1-fix-build.patch
@ -0,0 +1,27 @@
+From 03c80197afb324da38c9b70254231e3fdcfa68fc Mon Sep 17 00:00:00 2001
+From: Romain Vimont <rom@rom1v.com>
+Date: Sun, 12 Nov 2023 17:58:50 +0100
+Subject: [PATCH] Fix FFmpeg 6.1 build
+
+Build failed on tag n6.1 With --enable-decoder=av1 but without
+--enable-muxer=av1.
+---
+ libavcodec/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 580a8d6b54..aff19b670c 100644
+--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
+@@ -249,7 +249,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER)       += atrac3plusdec.o atrac3plus.o \
+ OBJS-$(CONFIG_ATRAC9_DECODER)          += atrac9dec.o
+ OBJS-$(CONFIG_AURA_DECODER)            += cyuv.o
+ OBJS-$(CONFIG_AURA2_DECODER)           += aura.o
+-OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o
+OBJS-$(CONFIG_AV1_DECODER)             += av1dec.o av1_parse.o
+ OBJS-$(CONFIG_AV1_CUVID_DECODER)       += cuviddec.o
+ OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER)  += mediacodecdec.o
+ OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER)  += mediacodecenc.o
+-- 
+2.42.0
+
--- a/app/deps/sdl.sh
+++ b/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.28.5
 FILENAME=SDL-$VERSION.tar.gz
 PROJECT_DIR=SDL-release-$VERSION
-SHA256SUM=35a8b9c4f3635d85762b904ac60ca4e0806bff89faeb269caafbe80860d67168
+SHA256SUM=9f0556e4a24ef5b267010038ad9e9948b62f236d5bcc4b22179f95ef62d84023

 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+=(
+    "$SOURCES_DIR/$PROJECT_DIR"/configure \
+        --prefix="$INSTALL_DIR/$HOST" \
+        --host="$HOST_TRIPLET" \
+        --enable-shared \
        --disable-static
-            --enable-shared
-        )
-    fi
-
-    if [[ "$BUILD_TYPE" == cross ]]
-    then
-        conf+=(
-            --host="$HOST_TRIPLET"
-        )
-    fi
-
-    "$SOURCES_DIR/$PROJECT_DIR"/configure "${conf[@]}"
 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"
--- a/app/meson.build
+++ b/app/meson.build
@ -5,7 +5,6 @@ src = [
    'src/adb/adb_parser.c',
    'src/adb/adb_tunnel.c',
    'src/audio_player.c',
-    'src/audio_regulator.c',
    'src/cli.c',
    'src/clock.c',
    'src/compat.c',
@ -16,14 +15,12 @@ src = [
    'src/demuxer.c',
    'src/device_msg.c',
    'src/display.c',
-    'src/events.c',
    'src/icon.c',
    'src/file_pusher.c',
    'src/fps_counter.c',
    'src/frame_buffer.c',
    'src/input_manager.c',
    'src/keyboard_sdk.c',
-    'src/mouse_capture.c',
    'src/mouse_sdk.c',
    'src/opengl.c',
    'src/options.c',
@ -34,19 +31,16 @@ src = [
    'src/screen.c',
    'src/server.c',
    'src/version.c',
-    'src/hid/hid_gamepad.c',
    'src/hid/hid_keyboard.c',
    'src/hid/hid_mouse.c',
    'src/trait/frame_source.c',
    'src/trait/packet_source.c',
-    'src/uhid/gamepad_uhid.c',
    'src/uhid/keyboard_uhid.c',
    'src/uhid/mouse_uhid.c',
    'src/uhid/uhid_output.c',
    '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',
@ -99,7 +93,6 @@ usb_support = get_option('usb')
 if usb_support
    src += [
        'src/usb/aoa_hid.c',
-        'src/usb/gamepad_aoa.c',
        'src/usb/keyboard_aoa.c',
        'src/usb/mouse_aoa.c',
        'src/usb/scrcpy_otg.c',
@ -110,22 +103,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 +161,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)

--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@ -13,7 +13,7 @@ BEGIN
      VALUE "LegalCopyright", "Romain Vimont, Genymobile"
      VALUE "OriginalFilename", "scrcpy.exe"
      VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "3.1"
+      VALUE "ProductVersion", "2.4"
    END
  END
  BLOCK "VarFileInfo"
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@ -19,10 +19,6 @@ provides display and control of Android devices connected on USB (or over TCP/IP
 .B \-\-always\-on\-top
 Make scrcpy window always on top (above other windows).

-.TP
-.BI "\-\-angle " degrees
-Rotate the video content by a custom angle, in degrees (clockwise).
-
 .TP
 .BI "\-\-audio\-bit\-rate " value
 Encode the audio at the given bit rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
@ -33,7 +29,7 @@ Default is 128K (128000).
 .BI "\-\-audio\-buffer " ms
 Configure the audio buffering delay (in milliseconds).

-Lower values decrease the latency, but increase the likelihood of buffer underrun (causing audio glitches).
+Lower values decrease the latency, but increase the likelyhood of buffer underrun (causing audio glitches).

 Default is 50.

@ -53,12 +49,6 @@ The list of possible codec options is available in the Android documentation:

 <https://d.android.com/reference/android/media/MediaFormat>

-.TP
-.B \-\-audio\-dup
-Duplicate audio (capture and keep playing on the device).
-
-This feature is only available with --audio-source=playback.
-
 .TP
 .BI "\-\-audio\-encoder " name
 Use a specific MediaCodec audio encoder (depending on the codec provided by \fB\-\-audio\-codec\fR).
@ -67,13 +57,7 @@ The available encoders can be listed by \fB\-\-list\-encoders\fR.

 .TP
 .BI "\-\-audio\-source " source
-Select the audio source (output, mic or playback).
-
-The "output" source forwards the whole audio output, and disables playback on the device.
-
-The "playback" source captures the audio playback (Android apps can opt-out, so the whole output is not necessarily captured).
-
-The "mic" source captures the microphone.
+Select the audio source (output or mic).

 Default is output.

@ -97,18 +81,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.
@ -122,26 +94,28 @@ Specify the device camera id to mirror.
 The available camera ids can be listed by \fB\-\-list\-cameras\fR.

 .TP
-.BI "\-\-camera\-size " width\fRx\fIheight
-Specify an explicit camera capture size.
+.BI "\-\-camera\-facing " facing
+Select the device camera by its facing direction.
+
+Possible values are "front", "back" and "external".

 .TP
-.BI "\-\-capture\-orientation " value
-Possible values are 0, 90, 180, 270, flip0, flip90, flip180 and flip270, possibly prefixed by '@'.
+.BI "\-\-camera\-fps " fps
+Specify the camera capture frame rate.

-The number represents the clockwise rotation in degrees; the "flip" keyword applies a horizontal flip before the rotation.
+If not specified, Android's default frame rate (30 fps) is used.

-If a leading '@' is passed (@90) for display capture, then the rotation is locked, and is relative to the natural device orientation.
-
-If '@' is passed alone, then the rotation is locked to the initial device orientation.
-
-Default is 0.
+.TP
+.BI "\-\-camera\-size " width\fRx\fIheight
+Specify an explicit camera capture size.

 .TP
 .BI "\-\-crop " width\fR:\fIheight\fR:\fIx\fR:\fIy
 Crop the device screen on the server.

-The values are expressed in the device natural orientation (typically, portrait for a phone, landscape for a tablet).
+The values are expressed in the device natural orientation (typically, portrait for a phone, landscape for a tablet). Any
+.B \-\-max\-size
+value is computed on the cropped size.

 .TP
 .B \-d, \-\-select\-usb
@ -153,6 +127,12 @@ Also see \fB\-e\fR (\fB\-\-select\-tcpip\fR).
 .BI "\-\-disable\-screensaver"
 Disable screensaver while scrcpy is running.

+.TP
+.BI "\-\-display\-buffer " ms
+Add a buffering delay (in milliseconds) before displaying. This increases latency to compensate for jitter.
+
+Default is 0 (no buffering).
+
 .TP
 .BI "\-\-display\-id " id
 Specify the device display id to mirror.
@ -183,28 +163,13 @@ Start in fullscreen.
 .B \-\-force\-adb\-forward
 Do not attempt to use "adb reverse" to connect to the device.

-.TP
-.B \-G
-Same as \fB\-\-gamepad=uhid\fR, or \fB\-\-keyboard=aoa\fR if \fB\-\-otg\fR is set.
-
-.TP
-.BI "\-\-gamepad " mode
-Select how to send gamepad inputs to the device.
-
-Possible values are "disabled", "uhid" and "aoa":
-
- - "disabled" does not send gamepad inputs to the device.
- - "uhid" simulates physical HID gamepads using the Linux HID kernel module on the device.
- - "aoa" simulates physical HID gamepads using the AOAv2 protocol. It may only work over USB.
-
-Also see \fB\-\-keyboard\f and R\fB\-\-mouse\fR.
 .TP
 .B \-h, \-\-help
 Print this help.

 .TP
 .B \-K
-Same as \fB\-\-keyboard=uhid\fR, or \fB\-\-keyboard=aoa\fR if \fB\-\-otg\fR is set.
+Same as \fB\-\-keyboard=uhid\fR.

 .TP
 .BI "\-\-keyboard " mode
@ -223,7 +188,7 @@ For "uhid" and "aoa", the keyboard layout must be configured (once and for all)

 This option is only available when the HID keyboard is enabled (or a physical keyboard is connected).

-Also see \fB\-\-mouse\fR and \fB\-\-gamepad\fR.
+Also see \fB\-\-mouse\fR.

 .TP
 .B \-\-kill\-adb\-on\-close
@ -235,10 +200,6 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S

 This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.

-.TP
-.B \-\-list\-apps
-List Android apps installed on the device.
-
 .TP
 .B \-\-list\-camera\-sizes
 List the valid camera capture sizes.
@ -255,6 +216,16 @@ List video and audio encoders available on the device.
 .B \-\-list\-displays
 List displays available on the device.

+.TP
+\fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
+Lock capture video orientation to \fIvalue\fR.
+
+Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 90, 180, and 270. The values represent the clockwise rotation from the natural device orientation, in degrees.
+
+Default is "unlocked".
+
+Passing the option without argument is equivalent to passing "initial".
+
 .TP
 .BI "\-m, \-\-max\-size " value
 Limit both the width and height of the video to \fIvalue\fR. The other dimension is computed so that the device aspect\-ratio is preserved.
@ -263,7 +234,7 @@ Default is 0 (unlimited).

 .TP
 .B \-M
-Same as \fB\-\-mouse=uhid\fR, or \fB\-\-mouse=aoa\fR if \fB\-\-otg\fR is set.
+Same as \fB\-\-mouse=uhid\fR.

 .TP
 .BI "\-\-max\-fps " value
@ -284,17 +255,13 @@ In "uhid" and "aoa" modes, the computer mouse is captured to control the device

 LAlt, LSuper or RSuper toggle the capture mode, to give control of the mouse back to the computer.

-Also see \fB\-\-keyboard\fR and \fB\-\-gamepad\fR.
+Also see \fB\-\-keyboard\fR.

 .TP
-.BI "\-\-mouse\-bind " xxxx[:xxxx]
+.BI "\-\-mouse\-bind " xxxx
 Configure bindings of secondary clicks.

-The argument must be one or two sequences (separated by ':') of exactly 4 characters, one for each secondary click (in order: right click, middle click, 4th click, 5th click).
-
-The first sequence defines the primary bindings, used when a mouse button is pressed alone. The second sequence defines the secondary bindings, used when a mouse button is pressed while the Shift key is held.
-
-If the second sequence of bindings is omitted, then it is the same as the first one.
+The argument must be exactly 4 characters, one for each secondary click (in order: right click, middle click, 4th click, 5th click).

 Each character must be one of the following:

@ -305,7 +272,7 @@ Each character must be one of the following:
 - 's': trigger shortcut APP_SWITCH
 - 'n': trigger shortcut "expand notification panel"

-Default is 'bhsn:++++' for SDK mouse, and '++++:bhsn' for AOA and UHID.
+Default is 'bhsn' for SDK mouse, and '++++' for AOA and UHID.


 .TP
@ -316,17 +283,6 @@ Disable device control (mirror the device in read\-only).
 .B \-N, \-\-no\-playback
 Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video\-playback \-\-no\-audio\-playback\fR).

-.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.
-
-Examples:
-
-    \-\-new\-display=1920x1080
-    \-\-new\-display=1920x1080/420
-    \-\-new\-display         # main display size and density
-    \-\-new\-display=/240    # main display size and 240 dpi
-
 .TP
 .B \-\-no\-audio
 Disable audio forwarding.
@ -361,24 +317,10 @@ Do not forward repeated key events when a key is held down.
 .B \-\-no\-mipmaps
 If the renderer is OpenGL 3.0+ or OpenGL ES 2.0+, then mipmaps are automatically generated to improve downscaling quality. This option disables the generation of mipmaps.

-.TP
-.B \-\-no\-mouse\-hover
-Do not forward mouse hover (mouse motion without any clicks) events.
-
 .TP
 .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.
@ -407,7 +349,7 @@ If any of \fB\-\-hid\-keyboard\fR or \fB\-\-hid\-mouse\fR is set, only enable ke

 It may only work over USB.

-See \fB\-\-keyboard\fR, \fB\-\-mouse\fR and \fB\-\-gamepad\fR.
+See \fB\-\-hid\-keyboard\fR and \fB\-\-hid\-mouse\fR.

 .TP
 .BI "\-p, \-\-port " port\fR[:\fIport\fR]
@ -417,7 +359,7 @@ Default is 27183:27199.

 .TP
 \fB\-\-pause\-on\-exit\fR[=\fImode\fR]
-Configure pause on exit. Possible values are "true" (always pause on exit), "false" (never pause on exit) and "if-error" (pause only if an error occurred).
+Configure pause on exit. Possible values are "true" (always pause on exit), "false" (never pause on exit) and "if-error" (pause only if an error occured).

 This is useful to prevent the terminal window from automatically closing, so that error messages can be read.

@ -501,22 +443,6 @@ For example, to use either LCtrl or LSuper for scrcpy shortcuts, pass "lctrl,lsu

 Default is "lalt,lsuper" (left-Alt or left-Super).

-.TP
-.BI "\-\-start\-app " name
-Start an Android app, by its exact package name.
-
-Add a '?' prefix to select an app whose name starts with the given name, case-insensitive (retrieving app names on the device may take some time):
-
-    scrcpy --start-app=?firefox
-
-Add a '+' prefix to force-stop before starting the app:
-
-    scrcpy --new-display --start-app=+org.mozilla.firefox
-
-Both prefixes can be used, in that order:
-
-    scrcpy --start-app=+?firefox
-
 .TP
 .B \-t, \-\-show\-touches
 Enable "show touches" on start, restore the initial value on exit.
@ -524,15 +450,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.
@ -563,19 +487,13 @@ Default is "info" for release builds, "debug" for debug builds.
 .BI "\-\-v4l2-sink " /dev/videoN
 Output to v4l2loopback device.

+It requires to lock the video orientation (see \fB\-\-lock\-video\-orientation\fR).
+
 .TP
 .BI "\-\-v4l2-buffer " ms
 Add a buffering delay (in milliseconds) before pushing frames. This increases latency to compensate for jitter.

-This option is similar to \fB\-\-video\-buffer\fR, but specific to V4L2 sink.
-
-Default is 0 (no buffering).
-
-.TP
-.BI "\-\-video\-buffer " ms
-Add a buffering delay (in milliseconds) before displaying video frames.
-
-This increases latency to compensate for jitter.
+This option is similar to \fB\-\-display\-buffer\fR, but specific to V4L2 sink.

 Default is 0 (no buffering).

@ -684,10 +602,6 @@ Pause or re-pause display
 .B MOD+Shift+z
 Unpause display

-.TP
-.B MOD+Shift+r
-Reset video capture/encoding
-
 .TP
 .B MOD+g
 Resize window to 1:1 (pixel\-perfect)
@ -778,11 +692,7 @@ Pinch-to-zoom and rotate from the center of the screen

 .TP
 .B Shift+click-and-move
-Tilt vertically (slide with 2 fingers)
-
-.TP
-.B Ctrl+Shift+click-and-move
-Tilt horizontally (slide with 2 fingers)
+Tilt (slide vertically with two fingers)

 .TP
 .B Drag & drop APK file
@ -829,7 +739,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.

--- a/app/src/adb/adb.c
+++ b/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;
-}
--- a/app/src/adb/adb.h
+++ b/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
--- a/app/src/android/keycodes.h
+++ b/app/src/android/keycodes.h
@ -633,7 +633,7 @@ enum android_keycode {
     * Toggles between BS and CS digital satellite services. */
    AKEYCODE_TV_SATELLITE_SERVICE = 240,
    /** Toggle Network key.
-     * Toggles selecting broadcast services. */
+     * Toggles selecting broacast services. */
    AKEYCODE_TV_NETWORK      = 241,
    /** Antenna/Cable key.
     * Toggles broadcast input source between antenna and cable. */
--- a/app/src/audio_player.c
+++ b/app/src/audio_player.c
@ -1,23 +1,138 @@
 #include "audio_player.h"

+#include <libavcodec/avcodec.h>
+#include <libavutil/opt.h>
+
 #include "util/log.h"

+#define SC_AUDIO_PLAYER_NDEBUG // comment to debug
+
+/**
+ * Real-time audio player with configurable latency
+ *
+ * As input, the player regularly receives AVFrames of decoded audio samples.
+ * As output, an SDL callback regularly requests audio samples to be played.
+ * In the middle, an audio buffer stores the samples produced but not consumed
+ * yet.
+ *
+ * The goal of the player is to feed the audio output with a latency as low as
+ * possible while avoiding buffer underrun (i.e. not being able to provide
+ * samples when requested).
+ *
+ * The player aims to feed the audio output with as little latency as possible
+ * while avoiding buffer underrun. To achieve this, it attempts to maintain the
+ * average buffering (the number of samples present in the buffer) around a
+ * target value. If this target buffering is too low, then buffer underrun will
+ * occur frequently. If it is too high, then latency will become unacceptable.
+ * This target value is configured using the scrcpy option --audio-buffer.
+ *
+ * The player cannot adjust the sample input rate (it receives samples produced
+ * in real-time) or the sample output rate (it must provide samples as
+ * requested by the audio output callback). Therefore, it may only apply
+ * compensation by resampling (converting _m_ input samples to _n_ output
+ * samples).
+ *
+ * The compensation itself is applied by libswresample (FFmpeg). It is
+ * configured using swr_set_compensation(). An important work for the player
+ * is to estimate the compensation value regularly and apply it.
+ *
+ * The estimated buffering level is the result of averaging the "natural"
+ * buffering (samples are produced and consumed by blocks, so it must be
+ * smoothed), and making instant adjustments resulting of its own actions
+ * (explicit compensation and silence insertion on underflow), which are not
+ * smoothed.
+ *
+ * Buffer underflow events can occur when packets arrive too late. In that case,
+ * the player inserts silence. Once the packets finally arrive (late), one
+ * strategy could be to drop the samples that were replaced by silence, in
+ * order to keep a minimal latency. However, dropping samples in case of buffer
+ * underflow is inadvisable, as it would temporarily increase the underflow
+ * even more and cause very noticeable audio glitches.
+ *
+ * Therefore, the player doesn't drop any sample on underflow. The compensation
+ * mechanism will absorb the delay introduced by the inserted silence.
+ */
+
 /** Downcast frame_sink to sc_audio_player */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_audio_player, frame_sink)

+#define SC_AV_SAMPLE_FMT AV_SAMPLE_FMT_FLT
 #define SC_SDL_SAMPLE_FMT AUDIO_F32

+#define TO_BYTES(SAMPLES) sc_audiobuf_to_bytes(&ap->buf, (SAMPLES))
+#define TO_SAMPLES(BYTES) sc_audiobuf_to_samples(&ap->buf, (BYTES))
+
 static void SDLCALL
 sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
    struct sc_audio_player *ap = userdata;

+    // This callback is called with the lock used by SDL_LockAudioDevice()
+
    assert(len_int > 0);
    size_t len = len_int;
+    uint32_t count = TO_SAMPLES(len);

-    assert(len % ap->audioreg.sample_size == 0);
-    uint32_t out_samples = len / ap->audioreg.sample_size;
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+    LOGD("[Audio] SDL callback requests %" PRIu32 " samples", count);
+#endif

-    sc_audio_regulator_pull(&ap->audioreg, stream, out_samples);
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (!played) {
+        uint32_t buffered_samples = sc_audiobuf_can_read(&ap->buf);
+        // Wait until the buffer is filled up to at least target_buffering
+        // before playing
+        if (buffered_samples < ap->target_buffering) {
+            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
+                 " samples", count);
+            // Delay playback starting to reach the target buffering. Fill the
+            // whole buffer with silence (len is small compared to the
+            // arbitrary margin value).
+            memset(stream, 0, len);
+            return;
+        }
+    }
+
+    uint32_t read = sc_audiobuf_read(&ap->buf, stream, count);
+
+    if (read < count) {
+        uint32_t silence = count - read;
+        // Insert silence. In theory, the inserted silent samples replace the
+        // missing real samples, which will arrive later, so they should be
+        // dropped to keep the latency minimal. However, this would cause very
+        // audible glitches, so let the clock compensation restore the target
+        // latency.
+        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
+             silence);
+        memset(stream + TO_BYTES(read), 0, TO_BYTES(silence));
+
+        bool received = atomic_load_explicit(&ap->received,
+                                             memory_order_relaxed);
+        if (received) {
+            // Inserting additional samples immediately increases buffering
+            atomic_fetch_add_explicit(&ap->underflow, silence,
+                                      memory_order_relaxed);
+        }
+    }
+
+    atomic_store_explicit(&ap->played, true, memory_order_relaxed);
+}
+
+static uint8_t *
+sc_audio_player_get_swr_buf(struct sc_audio_player *ap, uint32_t min_samples) {
+    size_t min_buf_size = TO_BYTES(min_samples);
+    if (min_buf_size > ap->swr_buf_alloc_size) {
+        size_t new_size = min_buf_size + 4096;
+        uint8_t *buf = realloc(ap->swr_buf, new_size);
+        if (!buf) {
+            LOG_OOM();
+            // Could not realloc to the requested size
+            return NULL;
+        }
+        ap->swr_buf = buf;
+        ap->swr_buf_alloc_size = new_size;
+    }
+
+    return ap->swr_buf;
 }

 static bool
@ -25,21 +140,209 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
                                const AVFrame *frame) {
    struct sc_audio_player *ap = DOWNCAST(sink);

-    return sc_audio_regulator_push(&ap->audioreg, frame);
+    SwrContext *swr_ctx = ap->swr_ctx;
+
+    int64_t swr_delay = swr_get_delay(swr_ctx, ap->sample_rate);
+    // No need to av_rescale_rnd(), input and output sample rates are the same.
+    // Add more space (256) for clock compensation.
+    int dst_nb_samples = swr_delay + frame->nb_samples + 256;
+
+    uint8_t *swr_buf = sc_audio_player_get_swr_buf(ap, dst_nb_samples);
+    if (!swr_buf) {
+        return false;
+    }
+
+    int ret = swr_convert(swr_ctx, &swr_buf, dst_nb_samples,
+                          (const uint8_t **) frame->data, frame->nb_samples);
+    if (ret < 0) {
+        LOGE("Resampling failed: %d", ret);
+        return false;
+    }
+
+    // swr_convert() returns the number of samples which would have been
+    // written if the buffer was big enough.
+    uint32_t samples = MIN(ret, dst_nb_samples);
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
+#endif
+
+    uint32_t cap = sc_audiobuf_capacity(&ap->buf);
+    if (samples > cap) {
+        // Very very unlikely: a single resampled frame should never
+        // exceed the audio buffer size (or something is very wrong).
+        // Ignore the first bytes in swr_buf to avoid memory corruption anyway.
+        swr_buf += TO_BYTES(samples - cap);
+        samples = cap;
+    }
+
+    uint32_t skipped_samples = 0;
+
+    uint32_t written = sc_audiobuf_write(&ap->buf, swr_buf, samples);
+    if (written < samples) {
+        uint32_t remaining = samples - written;
+
+        // All samples that could be written without locking have been written,
+        // now we need to lock to drop/consume old samples
+        SDL_LockAudioDevice(ap->device);
+
+        // Retry with the lock
+        written += sc_audiobuf_write(&ap->buf,
+                                     swr_buf + TO_BYTES(written),
+                                     remaining);
+        if (written < samples) {
+            remaining = samples - written;
+            // Still insufficient, drop old samples to make space
+            skipped_samples = sc_audiobuf_read(&ap->buf, NULL, remaining);
+            assert(skipped_samples == remaining);
+        }
+
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (written < samples) {
+            // Now there is enough space
+            uint32_t w = sc_audiobuf_write(&ap->buf,
+                                           swr_buf + TO_BYTES(written),
+                                           remaining);
+            assert(w == remaining);
+            (void) w;
+        }
+    }
+
+    uint32_t underflow = 0;
+    uint32_t max_buffered_samples;
+    bool played = atomic_load_explicit(&ap->played, memory_order_relaxed);
+    if (played) {
+        underflow = atomic_exchange_explicit(&ap->underflow, 0,
+                                             memory_order_relaxed);
+
+        max_buffered_samples = ap->target_buffering
+                               + 12 * ap->output_buffer
+                               + ap->target_buffering / 10;
+    } else {
+        // SDL playback not started yet, do not accumulate more than
+        // max_initial_buffering samples, this would cause unnecessary delay
+        // (and glitches to compensate) on start.
+        max_buffered_samples = ap->target_buffering + 2 * ap->output_buffer;
+    }
+
+    uint32_t can_read = sc_audiobuf_can_read(&ap->buf);
+    if (can_read > max_buffered_samples) {
+        uint32_t skip_samples = 0;
+
+        SDL_LockAudioDevice(ap->device);
+        can_read = sc_audiobuf_can_read(&ap->buf);
+        if (can_read > max_buffered_samples) {
+            skip_samples = can_read - max_buffered_samples;
+            uint32_t r = sc_audiobuf_read(&ap->buf, NULL, skip_samples);
+            assert(r == skip_samples);
+            (void) r;
+            skipped_samples += skip_samples;
+        }
+        SDL_UnlockAudioDevice(ap->device);
+
+        if (skip_samples) {
+            if (played) {
+                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
+                     " samples", skip_samples);
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+            } else {
+                LOGD("[Audio] Playback not started, skipping %" PRIu32
+                     " samples", skip_samples);
+#endif
+            }
+        }
+    }
+
+    atomic_store_explicit(&ap->received, true, memory_order_relaxed);
+    if (!played) {
+        // Nothing more to do
+        return true;
+    }
+
+    // Number of samples added (or removed, if negative) for compensation
+    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
+    // Inserting silence instantly increases buffering
+    int32_t inserted_silence = (int32_t) underflow;
+    // Dropping input samples instantly decreases buffering
+    int32_t dropped = (int32_t) skipped_samples;
+
+    // The compensation must apply instantly, it must not be smoothed
+    ap->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
+    if (ap->avg_buffering.avg < 0) {
+        // Since dropping samples instantly reduces buffering, the difference
+        // is applied immediately to the average value, assuming that the delay
+        // between the producer and the consumer will be caught up.
+        //
+        // However, when this assumption is not valid, the average buffering
+        // may decrease indefinitely. Prevent it to become negative to limit
+        // the consequences.
+        ap->avg_buffering.avg = 0;
+    }
+
+    // However, the buffering level must be smoothed
+    sc_average_push(&ap->avg_buffering, can_read);
+
+#ifndef SC_AUDIO_PLAYER_NDEBUG
+    LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
+         can_read, sc_average_get(&ap->avg_buffering));
+#endif
+
+    ap->samples_since_resync += written;
+    if (ap->samples_since_resync >= ap->sample_rate) {
+        // Recompute compensation every second
+        ap->samples_since_resync = 0;
+
+        float avg = sc_average_get(&ap->avg_buffering);
+        int diff = ap->target_buffering - avg;
+
+        // Enable compensation when the difference exceeds +/- 4ms.
+        // Disable compensation when the difference is lower than +/- 1ms.
+        int threshold = ap->compensation != 0
+                      ? ap->sample_rate     / 1000  /* 1ms */
+                      : ap->sample_rate * 4 / 1000; /* 4ms */
+
+        if (abs(diff) < threshold) {
+            // Do not compensate for small values, the error is just noise
+            diff = 0;
+        } else if (diff < 0 && can_read < ap->target_buffering) {
+            // Do not accelerate if the instant buffering level is below the
+            // target, this would increase underflow
+            diff = 0;
+        }
+        // Compensate the diff over 4 seconds (but will be recomputed after 1
+        // second)
+        int distance = 4 * ap->sample_rate;
+        // Limit compensation rate to 2%
+        int abs_max_diff = distance / 50;
+        diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
+        LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
+             " compensation=%d", ap->target_buffering, avg, can_read, diff);
+
+        if (diff != ap->compensation) {
+            int ret = swr_set_compensation(swr_ctx, diff, distance);
+            if (ret < 0) {
+                LOGW("Resampling compensation failed: %d", ret);
+                // not fatal
+            } else {
+                ap->compensation = diff;
+            }
+        }
+    }
+
+    return true;
 }

 static bool
 sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
                                const AVCodecContext *ctx) {
    struct sc_audio_player *ap = DOWNCAST(sink);
-
 #ifdef SCRCPY_LAVU_HAS_CHLAYOUT
-    assert(ctx->ch_layout.nb_channels > 0 && ctx->ch_layout.nb_channels < 256);
-    uint8_t nb_channels = ctx->ch_layout.nb_channels;
+    assert(ctx->ch_layout.nb_channels > 0);
+    unsigned nb_channels = ctx->ch_layout.nb_channels;
 #else
    int tmp = av_get_channel_layout_nb_channels(ctx->channel_layout);
-    assert(tmp > 0 && tmp < 256);
-    uint8_t nb_channels = tmp;
+    assert(tmp > 0);
+    unsigned nb_channels = tmp;
 #endif

    assert(ctx->sample_rate > 0);
@ -47,19 +350,17 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
    int out_bytes_per_sample = av_get_bytes_per_sample(SC_AV_SAMPLE_FMT);
    assert(out_bytes_per_sample > 0);

-    uint32_t target_buffering_samples =
-        ap->target_buffering_delay * ctx->sample_rate / SC_TICK_FREQ;
+    ap->sample_rate = ctx->sample_rate;
+    ap->nb_channels = nb_channels;
+    ap->out_bytes_per_sample = out_bytes_per_sample;

-    size_t sample_size = nb_channels * out_bytes_per_sample;
-    bool ok = sc_audio_regulator_init(&ap->audioreg, sample_size, ctx,
-                                      target_buffering_samples);
-    if (!ok) {
-        return false;
-    }
+    ap->target_buffering = ap->target_buffering_delay * ap->sample_rate
+                                                      / SC_TICK_FREQ;

-    uint64_t aout_samples = ap->output_buffer_duration * ctx->sample_rate
+    uint64_t aout_samples = ap->output_buffer_duration * ap->sample_rate
                                                       / SC_TICK_FREQ;
    assert(aout_samples <= 0xFFFF);
+    ap->output_buffer = (uint16_t) aout_samples;

    SDL_AudioSpec desired = {
        .freq = ctx->sample_rate,
@ -74,10 +375,69 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
    ap->device = SDL_OpenAudioDevice(NULL, 0, &desired, &obtained, 0);
    if (!ap->device) {
        LOGE("Could not open audio device: %s", SDL_GetError());
-        sc_audio_regulator_destroy(&ap->audioreg);
        return false;
    }

+    SwrContext *swr_ctx = swr_alloc();
+    if (!swr_ctx) {
+        LOG_OOM();
+        goto error_close_audio_device;
+    }
+    ap->swr_ctx = swr_ctx;
+
+#ifdef SCRCPY_LAVU_HAS_CHLAYOUT
+    av_opt_set_chlayout(swr_ctx, "in_chlayout", &ctx->ch_layout, 0);
+    av_opt_set_chlayout(swr_ctx, "out_chlayout", &ctx->ch_layout, 0);
+#else
+    av_opt_set_channel_layout(swr_ctx, "in_channel_layout",
+                              ctx->channel_layout, 0);
+    av_opt_set_channel_layout(swr_ctx, "out_channel_layout",
+                              ctx->channel_layout, 0);
+#endif
+
+    av_opt_set_int(swr_ctx, "in_sample_rate", ctx->sample_rate, 0);
+    av_opt_set_int(swr_ctx, "out_sample_rate", ctx->sample_rate, 0);
+
+    av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", ctx->sample_fmt, 0);
+    av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", SC_AV_SAMPLE_FMT, 0);
+
+    int ret = swr_init(swr_ctx);
+    if (ret) {
+        LOGE("Failed to initialize the resampling context");
+        goto error_free_swr_ctx;
+    }
+
+    // Use a ring-buffer of the target buffering size plus 1 second between the
+    // producer and the consumer. It's too big on purpose, to guarantee that
+    // the producer and the consumer will be able to access it in parallel
+    // without locking.
+    uint32_t audiobuf_samples = ap->target_buffering + ap->sample_rate;
+
+    size_t sample_size = ap->nb_channels * ap->out_bytes_per_sample;
+    bool ok = sc_audiobuf_init(&ap->buf, sample_size, audiobuf_samples);
+    if (!ok) {
+        goto error_free_swr_ctx;
+    }
+
+    size_t initial_swr_buf_size = TO_BYTES(4096);
+    ap->swr_buf = malloc(initial_swr_buf_size);
+    if (!ap->swr_buf) {
+        LOG_OOM();
+        goto error_destroy_audiobuf;
+    }
+    ap->swr_buf_alloc_size = initial_swr_buf_size;
+
+    // Samples are produced and consumed by blocks, so the buffering must be
+    // smoothed to get a relatively stable value.
+    sc_average_init(&ap->avg_buffering, 128);
+    ap->samples_since_resync = 0;
+
+    ap->received = false;
+    atomic_init(&ap->played, false);
+    atomic_init(&ap->received, false);
+    atomic_init(&ap->underflow, 0);
+    ap->compensation = 0;
+
    // The thread calling open() is the thread calling push(), which fills the
    // audio buffer consumed by the SDL audio thread.
    ok = sc_thread_set_priority(SC_THREAD_PRIORITY_TIME_CRITICAL);
@ -89,6 +449,15 @@ sc_audio_player_frame_sink_open(struct sc_frame_sink *sink,
    SDL_PauseAudioDevice(ap->device, 0);

    return true;
+
+error_destroy_audiobuf:
+    sc_audiobuf_destroy(&ap->buf);
+error_free_swr_ctx:
+    swr_free(&ap->swr_ctx);
+error_close_audio_device:
+    SDL_CloseAudioDevice(ap->device);
+
+    return false;
 }

 static void
@ -99,7 +468,9 @@ sc_audio_player_frame_sink_close(struct sc_frame_sink *sink) {
    SDL_PauseAudioDevice(ap->device, 1);
    SDL_CloseAudioDevice(ap->device);

-    sc_audio_regulator_destroy(&ap->audioreg);
+    free(ap->swr_buf);
+    sc_audiobuf_destroy(&ap->buf);
+    swr_free(&ap->swr_ctx);
 }

 void
--- a/app/src/audio_player.h
+++ b/app/src/audio_player.h
@ -5,27 +5,76 @@

 #include <stdatomic.h>
 #include <stdbool.h>
+#include <libavformat/avformat.h>
+#include <libswresample/swresample.h>
 #include <SDL2/SDL.h>

-#include "audio_regulator.h"
 #include "trait/frame_sink.h"
+#include "util/audiobuf.h"
+#include "util/average.h"
+#include "util/thread.h"
 #include "util/tick.h"

 struct sc_audio_player {
    struct sc_frame_sink frame_sink;

+    SDL_AudioDeviceID device;
+
    // The target buffering between the producer and the consumer. This value
    // is directly use for compensation.
    // Since audio capture and/or encoding on the device typically produce
    // blocks of 960 samples (20ms) or 1024 samples (~21.3ms), this target
    // value should be higher.
    sc_tick target_buffering_delay;
+    uint32_t target_buffering; // in samples

-    // SDL audio output buffer size
+    // SDL audio output buffer size.
    sc_tick output_buffer_duration;
+    uint16_t output_buffer;

-    SDL_AudioDeviceID device;
-    struct sc_audio_regulator audioreg;
+    // Audio buffer to communicate between the receiver and the SDL audio
+    // callback
+    struct sc_audiobuf buf;
+
+    // Resampler (only used from the receiver thread)
+    struct SwrContext *swr_ctx;
+
+    // The sample rate is the same for input and output
+    unsigned sample_rate;
+    // The number of channels is the same for input and output
+    unsigned nb_channels;
+    // The number of bytes per sample for a single channel
+    size_t out_bytes_per_sample;
+
+    // Target buffer for resampling (only used by the receiver thread)
+    uint8_t *swr_buf;
+    size_t swr_buf_alloc_size;
+
+    // Number of buffered samples (may be negative on underflow) (only used by
+    // the receiver thread)
+    struct sc_average avg_buffering;
+    // Count the number of samples to trigger a compensation update regularly
+    // (only used by the receiver thread)
+    uint32_t samples_since_resync;
+
+    // Number of silence samples inserted since the last received packet
+    atomic_uint_least32_t underflow;
+
+    // Current applied compensation value (only used by the receiver thread)
+    int compensation;
+
+    // Set to true the first time a sample is received
+    atomic_bool received;
+
+    // Set to true the first time the SDL callback is called
+    atomic_bool played;
+
+    const struct sc_audio_player_callbacks *cbs;
+    void *cbs_userdata;
+};
+
+struct sc_audio_player_callbacks {
+    void (*on_ended)(struct sc_audio_player *ap, bool success, void *userdata);
 };

 void
--- a/app/src/audio_regulator.c
+++ b/app/src/audio_regulator.c
@ -1,413 +0,0 @@
-#include "audio_regulator.h"
-
-#include <libavcodec/avcodec.h>
-#include <libavutil/opt.h>
-
-#include "util/log.h"
-
-//#define SC_AUDIO_REGULATOR_DEBUG // uncomment to debug
-
-/**
- * Real-time audio regulator with configurable latency
- *
- * As input, the regulator regularly receives AVFrames of decoded audio samples.
- * As output, the audio player regularly requests audio samples to be played.
- * In the middle, an audio buffer stores the samples produced but not consumed
- * yet.
- *
- * The goal of the regulator is to feed the audio player with a latency as low
- * as possible while avoiding buffer underrun (i.e. not being able to provide
- * samples when requested).
- *
- * To achieve this, it attempts to maintain the average buffering (the number
- * of samples present in the buffer) around a target value. If this target
- * buffering is too low, then buffer underrun will occur frequently. If it is
- * too high, then latency will become unacceptable. This target value is
- * configured using the scrcpy option --audio-buffer.
- *
- * The regulator cannot adjust the sample input rate (it receives samples
- * produced in real-time) or the sample output rate (it must provide samples as
- * requested by the audio player). Therefore, it may only apply compensation by
- * resampling (converting _m_ input samples to _n_ output samples).
- *
- * The compensation itself is applied by libswresample (FFmpeg). It is
- * configured using swr_set_compensation(). An important work for the regulator
- * is to estimate the compensation value regularly and apply it.
- *
- * The estimated buffering level is the result of averaging the "natural"
- * buffering (samples are produced and consumed by blocks, so it must be
- * smoothed), and making instant adjustments resulting of its own actions
- * (explicit compensation and silence insertion on underflow), which are not
- * smoothed.
- *
- * Buffer underflow events can occur when packets arrive too late. In that case,
- * the regulator inserts silence. Once the packets finally arrive (late), one
- * strategy could be to drop the samples that were replaced by silence, in
- * order to keep a minimal latency. However, dropping samples in case of buffer
- * underflow is inadvisable, as it would temporarily increase the underflow
- * even more and cause very noticeable audio glitches.
- *
- * Therefore, the regulator doesn't drop any sample on underflow. The
- * compensation mechanism will absorb the delay introduced by the inserted
- * silence.
- */
-
-#define TO_BYTES(SAMPLES) sc_audiobuf_to_bytes(&ar->buf, (SAMPLES))
-#define TO_SAMPLES(BYTES) sc_audiobuf_to_samples(&ar->buf, (BYTES))
-
-void
-sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
-                        uint32_t out_samples) {
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] Audio regulator pulls %" PRIu32 " samples", out_samples);
-#endif
-
-    // A lock is necessary in the rare case where the producer needs to drop
-    // samples already pushed (when the buffer is full)
-    sc_mutex_lock(&ar->mutex);
-
-    bool played = atomic_load_explicit(&ar->played, memory_order_relaxed);
-    if (!played) {
-        uint32_t buffered_samples = sc_audiobuf_can_read(&ar->buf);
-        // Wait until the buffer is filled up to at least target_buffering
-        // before playing
-        if (buffered_samples < ar->target_buffering) {
-            LOGV("[Audio] Inserting initial buffering silence: %" PRIu32
-                 " samples", out_samples);
-            // Delay playback starting to reach the target buffering. Fill the
-            // whole buffer with silence (len is small compared to the
-            // arbitrary margin value).
-            memset(out, 0, out_samples * ar->sample_size);
-            sc_mutex_unlock(&ar->mutex);
-            return;
-        }
-    }
-
-    uint32_t read = sc_audiobuf_read(&ar->buf, out, out_samples);
-
-    sc_mutex_unlock(&ar->mutex);
-
-    if (read < out_samples) {
-        uint32_t silence = out_samples - read;
-        // Insert silence. In theory, the inserted silent samples replace the
-        // missing real samples, which will arrive later, so they should be
-        // dropped to keep the latency minimal. However, this would cause very
-        // audible glitches, so let the clock compensation restore the target
-        // latency.
-        LOGD("[Audio] Buffer underflow, inserting silence: %" PRIu32 " samples",
-             silence);
-        memset(out + TO_BYTES(read), 0, TO_BYTES(silence));
-
-        bool received = atomic_load_explicit(&ar->received,
-                                             memory_order_relaxed);
-        if (received) {
-            // Inserting additional samples immediately increases buffering
-            atomic_fetch_add_explicit(&ar->underflow, silence,
-                                      memory_order_relaxed);
-        }
-    }
-
-    atomic_store_explicit(&ar->played, true, memory_order_relaxed);
-}
-
-static uint8_t *
-sc_audio_regulator_get_swr_buf(struct sc_audio_regulator *ar,
-                               uint32_t min_samples) {
-    size_t min_buf_size = TO_BYTES(min_samples);
-    if (min_buf_size > ar->swr_buf_alloc_size) {
-        size_t new_size = min_buf_size + 4096;
-        uint8_t *buf = realloc(ar->swr_buf, new_size);
-        if (!buf) {
-            LOG_OOM();
-            // Could not realloc to the requested size
-            return NULL;
-        }
-        ar->swr_buf = buf;
-        ar->swr_buf_alloc_size = new_size;
-    }
-
-    return ar->swr_buf;
-}
-
-bool
-sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame) {
-    SwrContext *swr_ctx = ar->swr_ctx;
-
-    int64_t swr_delay = swr_get_delay(swr_ctx, ar->sample_rate);
-    // No need to av_rescale_rnd(), input and output sample rates are the same.
-    // Add more space (256) for clock compensation.
-    int dst_nb_samples = swr_delay + frame->nb_samples + 256;
-
-    uint8_t *swr_buf = sc_audio_regulator_get_swr_buf(ar, dst_nb_samples);
-    if (!swr_buf) {
-        return false;
-    }
-
-    int ret = swr_convert(swr_ctx, &swr_buf, dst_nb_samples,
-                          (const uint8_t **) frame->data, frame->nb_samples);
-    if (ret < 0) {
-        LOGE("Resampling failed: %d", ret);
-        return false;
-    }
-
-    // swr_convert() returns the number of samples which would have been
-    // written if the buffer was big enough.
-    uint32_t samples = MIN(ret, dst_nb_samples);
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] %" PRIu32 " samples written to buffer", samples);
-#endif
-
-    uint32_t cap = sc_audiobuf_capacity(&ar->buf);
-    if (samples > cap) {
-        // Very very unlikely: a single resampled frame should never
-        // exceed the audio buffer size (or something is very wrong).
-        // Ignore the first bytes in swr_buf to avoid memory corruption anyway.
-        swr_buf += TO_BYTES(samples - cap);
-        samples = cap;
-    }
-
-    uint32_t skipped_samples = 0;
-
-    uint32_t written = sc_audiobuf_write(&ar->buf, swr_buf, samples);
-    if (written < samples) {
-        uint32_t remaining = samples - written;
-
-        // All samples that could be written without locking have been written,
-        // now we need to lock to drop/consume old samples
-        sc_mutex_lock(&ar->mutex);
-
-        // Retry with the lock
-        written += sc_audiobuf_write(&ar->buf,
-                                     swr_buf + TO_BYTES(written),
-                                     remaining);
-        if (written < samples) {
-            remaining = samples - written;
-            // Still insufficient, drop old samples to make space
-            skipped_samples = sc_audiobuf_read(&ar->buf, NULL, remaining);
-            assert(skipped_samples == remaining);
-        }
-
-        sc_mutex_unlock(&ar->mutex);
-
-        if (written < samples) {
-            // Now there is enough space
-            uint32_t w = sc_audiobuf_write(&ar->buf,
-                                           swr_buf + TO_BYTES(written),
-                                           remaining);
-            assert(w == remaining);
-            (void) w;
-        }
-    }
-
-    uint32_t underflow = 0;
-    uint32_t max_buffered_samples;
-    bool played = atomic_load_explicit(&ar->played, memory_order_relaxed);
-    if (played) {
-        underflow = atomic_exchange_explicit(&ar->underflow, 0,
-                                             memory_order_relaxed);
-
-        max_buffered_samples = ar->target_buffering * 11 / 10
-                             + 60 * ar->sample_rate / 1000 /* 60 ms */;
-    } else {
-        // Playback not started yet, do not accumulate more than
-        // max_initial_buffering samples, this would cause unnecessary delay
-        // (and glitches to compensate) on start.
-        max_buffered_samples = ar->target_buffering
-                             + 10 * ar->sample_rate / 1000 /* 10 ms */;
-    }
-
-    uint32_t can_read = sc_audiobuf_can_read(&ar->buf);
-    if (can_read > max_buffered_samples) {
-        uint32_t skip_samples = 0;
-
-        sc_mutex_lock(&ar->mutex);
-        can_read = sc_audiobuf_can_read(&ar->buf);
-        if (can_read > max_buffered_samples) {
-            skip_samples = can_read - max_buffered_samples;
-            uint32_t r = sc_audiobuf_read(&ar->buf, NULL, skip_samples);
-            assert(r == skip_samples);
-            (void) r;
-            skipped_samples += skip_samples;
-        }
-        sc_mutex_unlock(&ar->mutex);
-
-        if (skip_samples) {
-            if (played) {
-                LOGD("[Audio] Buffering threshold exceeded, skipping %" PRIu32
-                     " samples", skip_samples);
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-            } else {
-                LOGD("[Audio] Playback not started, skipping %" PRIu32
-                     " samples", skip_samples);
-#endif
-            }
-        }
-    }
-
-    atomic_store_explicit(&ar->received, true, memory_order_relaxed);
-    if (!played) {
-        // Nothing more to do
-        return true;
-    }
-
-    // Number of samples added (or removed, if negative) for compensation
-    int32_t instant_compensation = (int32_t) written - frame->nb_samples;
-    // Inserting silence instantly increases buffering
-    int32_t inserted_silence = (int32_t) underflow;
-    // Dropping input samples instantly decreases buffering
-    int32_t dropped = (int32_t) skipped_samples;
-
-    // The compensation must apply instantly, it must not be smoothed
-    ar->avg_buffering.avg += instant_compensation + inserted_silence - dropped;
-    if (ar->avg_buffering.avg < 0) {
-        // Since dropping samples instantly reduces buffering, the difference
-        // is applied immediately to the average value, assuming that the delay
-        // between the producer and the consumer will be caught up.
-        //
-        // However, when this assumption is not valid, the average buffering
-        // may decrease indefinitely. Prevent it to become negative to limit
-        // the consequences.
-        ar->avg_buffering.avg = 0;
-    }
-
-    // However, the buffering level must be smoothed
-    sc_average_push(&ar->avg_buffering, can_read);
-
-#ifdef SC_AUDIO_REGULATOR_DEBUG
-    LOGD("[Audio] can_read=%" PRIu32 " avg_buffering=%f",
-         can_read, sc_average_get(&ar->avg_buffering));
-#endif
-
-    ar->samples_since_resync += written;
-    if (ar->samples_since_resync >= ar->sample_rate) {
-        // Recompute compensation every second
-        ar->samples_since_resync = 0;
-
-        float avg = sc_average_get(&ar->avg_buffering);
-        int diff = ar->target_buffering - avg;
-
-        // Enable compensation when the difference exceeds +/- 4ms.
-        // Disable compensation when the difference is lower than +/- 1ms.
-        int threshold = ar->compensation_active
-                      ? ar->sample_rate     / 1000  /* 1ms */
-                      : ar->sample_rate * 4 / 1000; /* 4ms */
-
-        if (abs(diff) < threshold) {
-            // Do not compensate for small values, the error is just noise
-            diff = 0;
-        } else if (diff < 0 && can_read < ar->target_buffering) {
-            // Do not accelerate if the instant buffering level is below the
-            // target, this would increase underflow
-            diff = 0;
-        }
-        // Compensate the diff over 4 seconds (but will be recomputed after 1
-        // second)
-        int distance = 4 * ar->sample_rate;
-        // Limit compensation rate to 2%
-        int abs_max_diff = distance / 50;
-        diff = CLAMP(diff, -abs_max_diff, abs_max_diff);
-        LOGV("[Audio] Buffering: target=%" PRIu32 " avg=%f cur=%" PRIu32
-             " compensation=%d", ar->target_buffering, avg, can_read, diff);
-
-        int ret = swr_set_compensation(swr_ctx, diff, distance);
-        if (ret < 0) {
-            LOGW("Resampling compensation failed: %d", ret);
-            // not fatal
-        } else {
-            ar->compensation_active = diff != 0;
-        }
-    }
-
-    return true;
-}
-
-bool
-sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
-                        const AVCodecContext *ctx, uint32_t target_buffering) {
-    SwrContext *swr_ctx = swr_alloc();
-    if (!swr_ctx) {
-        LOG_OOM();
-        return false;
-    }
-    ar->swr_ctx = swr_ctx;
-
-#ifdef SCRCPY_LAVU_HAS_CHLAYOUT
-    av_opt_set_chlayout(swr_ctx, "in_chlayout", &ctx->ch_layout, 0);
-    av_opt_set_chlayout(swr_ctx, "out_chlayout", &ctx->ch_layout, 0);
-#else
-    av_opt_set_channel_layout(swr_ctx, "in_channel_layout",
-                              ctx->channel_layout, 0);
-    av_opt_set_channel_layout(swr_ctx, "out_channel_layout",
-                              ctx->channel_layout, 0);
-#endif
-
-    av_opt_set_int(swr_ctx, "in_sample_rate", ctx->sample_rate, 0);
-    av_opt_set_int(swr_ctx, "out_sample_rate", ctx->sample_rate, 0);
-
-    av_opt_set_sample_fmt(swr_ctx, "in_sample_fmt", ctx->sample_fmt, 0);
-    av_opt_set_sample_fmt(swr_ctx, "out_sample_fmt", SC_AV_SAMPLE_FMT, 0);
-
-    int ret = swr_init(swr_ctx);
-    if (ret) {
-        LOGE("Failed to initialize the resampling context");
-        goto error_free_swr_ctx;
-    }
-
-    bool ok = sc_mutex_init(&ar->mutex);
-    if (!ok) {
-        goto error_free_swr_ctx;
-    }
-
-    ar->target_buffering = target_buffering;
-    ar->sample_size = sample_size;
-    ar->sample_rate = ctx->sample_rate;
-
-    // Use a ring-buffer of the target buffering size plus 1 second between the
-    // producer and the consumer. It's too big on purpose, to guarantee that
-    // the producer and the consumer will be able to access it in parallel
-    // without locking.
-    uint32_t audiobuf_samples = target_buffering + ar->sample_rate;
-
-    ok = sc_audiobuf_init(&ar->buf, sample_size, audiobuf_samples);
-    if (!ok) {
-        goto error_destroy_mutex;
-    }
-
-    size_t initial_swr_buf_size = TO_BYTES(4096);
-    ar->swr_buf = malloc(initial_swr_buf_size);
-    if (!ar->swr_buf) {
-        LOG_OOM();
-        goto error_destroy_audiobuf;
-    }
-    ar->swr_buf_alloc_size = initial_swr_buf_size;
-
-    // Samples are produced and consumed by blocks, so the buffering must be
-    // smoothed to get a relatively stable value.
-    sc_average_init(&ar->avg_buffering, 128);
-    ar->samples_since_resync = 0;
-
-    ar->received = false;
-    atomic_init(&ar->played, false);
-    atomic_init(&ar->received, false);
-    atomic_init(&ar->underflow, 0);
-    ar->compensation_active = false;
-
-    return true;
-
-error_destroy_audiobuf:
-    sc_audiobuf_destroy(&ar->buf);
-error_destroy_mutex:
-    sc_mutex_destroy(&ar->mutex);
-error_free_swr_ctx:
-    swr_free(&ar->swr_ctx);
-
-    return false;
-}
-
-void
-sc_audio_regulator_destroy(struct sc_audio_regulator *ar) {
-    free(ar->swr_buf);
-    sc_audiobuf_destroy(&ar->buf);
-    sc_mutex_destroy(&ar->mutex);
-    swr_free(&ar->swr_ctx);
-}
--- a/app/src/audio_regulator.h
+++ b/app/src/audio_regulator.h
@ -1,71 +0,0 @@
-#ifndef SC_AUDIO_REGULATOR_H
-#define SC_AUDIO_REGULATOR_H
-
-#include "common.h"
-
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <libavcodec/avcodec.h>
-#include <libswresample/swresample.h>
-#include "util/audiobuf.h"
-#include "util/average.h"
-#include "util/thread.h"
-
-#define SC_AV_SAMPLE_FMT AV_SAMPLE_FMT_FLT
-
-struct sc_audio_regulator {
-    sc_mutex mutex;
-
-    // Target buffering between the producer and the consumer (in samples)
-    uint32_t target_buffering;
-
-    // Audio buffer to communicate between the receiver and the player
-    struct sc_audiobuf buf;
-
-    // Resampler (only used from the receiver thread)
-    struct SwrContext *swr_ctx;
-
-    // The sample rate is the same for input and output
-    uint32_t sample_rate;
-    // The number of bytes per sample (for all channels)
-    size_t sample_size;
-
-    // Target buffer for resampling (only used by the receiver thread)
-    uint8_t *swr_buf;
-    size_t swr_buf_alloc_size;
-
-    // Number of buffered samples (may be negative on underflow) (only used by
-    // the receiver thread)
-    struct sc_average avg_buffering;
-    // Count the number of samples to trigger a compensation update regularly
-    // (only used by the receiver thread)
-    uint32_t samples_since_resync;
-
-    // Number of silence samples inserted since the last received packet
-    atomic_uint_least32_t underflow;
-
-    // Non-zero compensation applied (only used by the receiver thread)
-    bool compensation_active;
-
-    // Set to true the first time a sample is received
-    atomic_bool received;
-
-    // Set to true the first time samples are pulled by the player
-    atomic_bool played;
-};
-
-bool
-sc_audio_regulator_init(struct sc_audio_regulator *ar, size_t sample_size,
-                        const AVCodecContext *ctx, uint32_t target_buffering);
-
-void
-sc_audio_regulator_destroy(struct sc_audio_regulator *ar);
-
-bool
-sc_audio_regulator_push(struct sc_audio_regulator *ar, const AVFrame *frame);
-
-void
-sc_audio_regulator_pull(struct sc_audio_regulator *ar, uint8_t *out,
-                        uint32_t samples);
-
-#endif
--- a/app/src/cli.c
+++ b/app/src/cli.c
--- a/app/src/clock.c
+++ b/app/src/clock.c
@ -4,7 +4,7 @@

 #include "util/log.h"

-//#define SC_CLOCK_DEBUG // uncomment to debug
+#define SC_CLOCK_NDEBUG // comment to debug

 #define SC_CLOCK_RANGE 32

@ -21,12 +21,10 @@ sc_clock_update(struct sc_clock *clock, sc_tick system, sc_tick stream) {
    }

    sc_tick offset = system - stream;
-    unsigned clock_weight = clock->range - 1;
-    unsigned value_weight = SC_CLOCK_RANGE - clock->range + 1;
-    clock->offset = (clock->offset * clock_weight + offset * value_weight)
-                  / SC_CLOCK_RANGE;
+    clock->offset = ((clock->range - 1) * clock->offset + offset)
+                  / clock->range;

-#ifdef SC_CLOCK_DEBUG
+#ifndef SC_CLOCK_NDEBUG
    LOGD("Clock estimation: pts + %" PRItick, clock->offset);
 #endif
 }
--- a/app/src/compat.h
+++ b/app/src/compat.h
@ -8,7 +8,7 @@
 #include <libavutil/version.h>
 #include <SDL2/SDL_version.h>

-#ifndef _WIN32
+#ifndef __WIN32
 # define PRIu64_ PRIu64
 # define SC_PRIsizet "zu"
 #else
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@ -22,6 +22,9 @@
 #define MOTIONEVENT_ACTION_LABEL(value) \
    ENUM_TO_LABEL(android_motionevent_action_labels, value)

+#define SCREEN_POWER_MODE_LABEL(value) \
+    ENUM_TO_LABEL(screen_power_mode_labels, value)
+
 static const char *const android_keyevent_action_labels[] = {
    "down",
    "up",
@ -44,6 +47,14 @@ static const char *const android_motionevent_action_labels[] = {
    "btn-release",
 };

+static const char *const screen_power_mode_labels[] = {
+    "off",
+    "doze",
+    "normal",
+    "doze-suspend",
+    "suspend",
+};
+
 static const char *const copy_key_labels[] = {
    "none",
    "copy",
@ -53,11 +64,13 @@ static const char *const copy_key_labels[] = {
 static inline const char *
 get_well_known_pointer_id_name(uint64_t pointer_id) {
    switch (pointer_id) {
-        case SC_POINTER_ID_MOUSE:
+        case POINTER_ID_MOUSE:
            return "mouse";
-        case SC_POINTER_ID_GENERIC_FINGER:
+        case POINTER_ID_GENERIC_FINGER:
            return "finger";
-        case SC_POINTER_ID_VIRTUAL_FINGER:
+        case POINTER_ID_VIRTUAL_MOUSE:
+            return "vmouse";
+        case POINTER_ID_VIRTUAL_FINGER:
            return "vfinger";
        default:
            return NULL;
@ -72,34 +85,15 @@ write_position(uint8_t *buf, const struct sc_position *position) {
    sc_write16be(&buf[10], position->screen_size.height);
 }

-// Write truncated string, and return the size
+// write length (4 bytes) + string (non null-terminated)
 static size_t
-write_string_payload(uint8_t *payload, const char *utf8, size_t max_len) {
-    if (!utf8) {
-        return 0;
-    }
+write_string(const char *utf8, size_t max_len, uint8_t *buf) {
    size_t len = sc_str_utf8_truncation_index(utf8, max_len);
-    memcpy(payload, utf8, len);
-    return len;
-}
-
-// Write length (4 bytes) + string (non null-terminated)
-static size_t
-write_string(uint8_t *buf, const char *utf8, size_t max_len) {
-    size_t len = write_string_payload(buf + 4, utf8, max_len);
    sc_write32be(buf, len);
+    memcpy(&buf[4], utf8, len);
    return 4 + len;
 }

-// Write length (1 byte) + string (non null-terminated)
-static size_t
-write_string_tiny(uint8_t *buf, const char *utf8, size_t max_len) {
-    assert(max_len <= 0xFF);
-    size_t len = write_string_payload(buf + 1, utf8, max_len);
-    buf[0] = len;
-    return 1 + len;
-}
-
 size_t
 sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
    buf[0] = msg->type;
@ -111,8 +105,9 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
            sc_write32be(&buf[10], msg->inject_keycode.metastate);
            return 14;
        case SC_CONTROL_MSG_TYPE_INJECT_TEXT: {
-            size_t len = write_string(&buf[1], msg->inject_text.text,
-                                      SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
+            size_t len =
+                write_string(msg->inject_text.text,
+                             SC_CONTROL_MSG_INJECT_TEXT_MAX_LENGTH, &buf[1]);
            return 1 + len;
        }
        case SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT:
@ -144,46 +139,29 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
        case SC_CONTROL_MSG_TYPE_SET_CLIPBOARD:
            sc_write64be(&buf[1], msg->set_clipboard.sequence);
            buf[9] = !!msg->set_clipboard.paste;
-            size_t len = write_string(&buf[10], msg->set_clipboard.text,
-                                      SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH);
+            size_t len = write_string(msg->set_clipboard.text,
+                                      SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH,
+                                      &buf[10]);
            return 10 + len;
-        case SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER:
-            buf[1] = msg->set_display_power.on;
+        case SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
+            buf[1] = msg->set_screen_power_mode.mode;
            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;
-            index += write_string_tiny(&buf[index], msg->uhid_create.name, 127);
-
-            sc_write16be(&buf[index], msg->uhid_create.report_desc_size);
-            index += 2;
-
-            memcpy(&buf[index], msg->uhid_create.report_desc,
+            sc_write16be(&buf[3], msg->uhid_create.report_desc_size);
+            memcpy(&buf[5], msg->uhid_create.report_desc,
                            msg->uhid_create.report_desc_size);
-            index += msg->uhid_create.report_desc_size;
-
-            return index;
+            return 5 + msg->uhid_create.report_desc_size;
        case SC_CONTROL_MSG_TYPE_UHID_INPUT:
            sc_write16be(&buf[1], msg->uhid_input.id);
            sc_write16be(&buf[3], msg->uhid_input.size);
            memcpy(&buf[5], msg->uhid_input.data, msg->uhid_input.size);
            return 5 + msg->uhid_input.size;
-        case SC_CONTROL_MSG_TYPE_UHID_DESTROY:
-            sc_write16be(&buf[1], msg->uhid_destroy.id);
-            return 3;
-        case SC_CONTROL_MSG_TYPE_START_APP: {
-            size_t len = write_string_tiny(&buf[1], msg->start_app.name, 255);
-            return 1 + len;
-        }
        case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
        case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:
        case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
        case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
-        case SC_CONTROL_MSG_TYPE_RESET_VIDEO:
            // no additional data
            return 1;
        default:
@ -260,9 +238,9 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
                     msg->set_clipboard.paste ? "paste" : "nopaste",
                     msg->set_clipboard.text);
            break;
-        case SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER:
-            LOG_CMSG("display power %s",
-                     msg->set_display_power.on ? "on" : "off");
+        case SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
+            LOG_CMSG("power mode %s",
+                     SCREEN_POWER_MODE_LABEL(msg->set_screen_power_mode.mode));
            break;
        case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
            LOG_CMSG("expand notification panel");
@ -276,19 +254,10 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
        case SC_CONTROL_MSG_TYPE_ROTATE_DEVICE:
            LOG_CMSG("rotate device");
            break;
-        case SC_CONTROL_MSG_TYPE_UHID_CREATE: {
-            // 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);
+        case SC_CONTROL_MSG_TYPE_UHID_CREATE:
+            LOG_CMSG("UHID create [%" PRIu16 "] report_desc_size=%" PRIu16,
+                     msg->uhid_create.id, msg->uhid_create.report_desc_size);
            break;
-        }
        case SC_CONTROL_MSG_TYPE_UHID_INPUT: {
            char *hex = sc_str_to_hex_string(msg->uhid_input.data,
                                             msg->uhid_input.size);
@ -302,34 +271,15 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
            }
            break;
        }
-        case SC_CONTROL_MSG_TYPE_UHID_DESTROY:
-            LOG_CMSG("UHID destroy [%" PRIu16 "]", msg->uhid_destroy.id);
-            break;
        case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
            LOG_CMSG("open hard keyboard settings");
            break;
-        case SC_CONTROL_MSG_TYPE_START_APP:
-            LOG_CMSG("start app \"%s\"", msg->start_app.name);
-            break;
-        case SC_CONTROL_MSG_TYPE_RESET_VIDEO:
-            LOG_CMSG("reset video");
-            break;
        default:
            LOG_CMSG("unknown type: %u", (unsigned) msg->type);
            break;
    }
 }

-bool
-sc_control_msg_is_droppable(const struct sc_control_msg *msg) {
-    // Cannot drop UHID_CREATE messages, because it would cause all further
-    // UHID_INPUT messages for this device to be invalid.
-    // Cannot drop UHID_DESTROY messages either, because a further UHID_CREATE
-    // with the same id may fail.
-    return msg->type != SC_CONTROL_MSG_TYPE_UHID_CREATE
-        && msg->type != SC_CONTROL_MSG_TYPE_UHID_DESTROY;
-}
-
 void
 sc_control_msg_destroy(struct sc_control_msg *msg) {
    switch (msg->type) {
@ -339,9 +289,6 @@ sc_control_msg_destroy(struct sc_control_msg *msg) {
        case SC_CONTROL_MSG_TYPE_SET_CLIPBOARD:
            free(msg->set_clipboard.text);
            break;
-        case SC_CONTROL_MSG_TYPE_START_APP:
-            free(msg->start_app.name);
-            break;
        default:
            // do nothing
            break;
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@ -18,11 +18,12 @@
 // type: 1 byte; sequence: 8 bytes; paste flag: 1 byte; length: 4 bytes
 #define SC_CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (SC_CONTROL_MSG_MAX_SIZE - 14)

-#define SC_POINTER_ID_MOUSE UINT64_C(-1)
-#define SC_POINTER_ID_GENERIC_FINGER UINT64_C(-2)
+#define POINTER_ID_MOUSE UINT64_C(-1)
+#define POINTER_ID_GENERIC_FINGER UINT64_C(-2)

 // Used for injecting an additional virtual pointer for pinch-to-zoom
-#define SC_POINTER_ID_VIRTUAL_FINGER UINT64_C(-3)
+#define POINTER_ID_VIRTUAL_MOUSE UINT64_C(-3)
+#define POINTER_ID_VIRTUAL_FINGER UINT64_C(-4)

 enum sc_control_msg_type {
    SC_CONTROL_MSG_TYPE_INJECT_KEYCODE,
@ -35,14 +36,17 @@ enum sc_control_msg_type {
    SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS,
    SC_CONTROL_MSG_TYPE_GET_CLIPBOARD,
    SC_CONTROL_MSG_TYPE_SET_CLIPBOARD,
-    SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER,
+    SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
    SC_CONTROL_MSG_TYPE_ROTATE_DEVICE,
    SC_CONTROL_MSG_TYPE_UHID_CREATE,
    SC_CONTROL_MSG_TYPE_UHID_INPUT,
-    SC_CONTROL_MSG_TYPE_UHID_DESTROY,
    SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
-    SC_CONTROL_MSG_TYPE_START_APP,
-    SC_CONTROL_MSG_TYPE_RESET_VIDEO,
+};
+
+enum sc_screen_power_mode {
+    // see <https://android.googlesource.com/platform/frameworks/base.git/+/pie-release-2/core/java/android/view/SurfaceControl.java#305>
+    SC_SCREEN_POWER_MODE_OFF = 0,
+    SC_SCREEN_POWER_MODE_NORMAL = 2,
 };

 enum sc_copy_key {
@ -90,13 +94,10 @@ struct sc_control_msg {
            bool paste;
        } set_clipboard;
        struct {
-            bool on;
-        } set_display_power;
+            enum sc_screen_power_mode mode;
+        } set_screen_power_mode;
        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
        } uhid_create;
@ -105,12 +106,6 @@ struct sc_control_msg {
            uint16_t size;
            uint8_t data[SC_HID_MAX_SIZE];
        } uhid_input;
-        struct {
-            uint16_t id;
-        } uhid_destroy;
-        struct {
-            char *name;
-        } start_app;
    };
 };

@ -122,11 +117,6 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf);
 void
 sc_control_msg_log(const struct sc_control_msg *msg);

-// Even when the buffer is "full", some messages must absolutely not be dropped
-// to avoid inconsistencies.
-bool
-sc_control_msg_is_droppable(const struct sc_control_msg *msg);
-
 void
 sc_control_msg_destroy(struct sc_control_msg *msg);

--- a/app/src/controller.c
+++ b/app/src/controller.c
@ -4,17 +4,15 @@

 #include "util/log.h"

-// Drop droppable events above this limit
-#define SC_CONTROL_MSG_QUEUE_LIMIT 60
+#define SC_CONTROL_MSG_QUEUE_MAX 64

 static void
-sc_controller_receiver_on_ended(struct sc_receiver *receiver, bool error,
-                                void *userdata) {
+sc_controller_receiver_on_error(struct sc_receiver *receiver, void *userdata) {
    (void) receiver;

    struct sc_controller *controller = userdata;
    // Forward the event to the controller listener
-    controller->cbs->on_ended(controller, error, controller->cbs_userdata);
+    controller->cbs->on_error(controller, controller->cbs_userdata);
 }

 bool
@ -23,15 +21,13 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
                   void *cbs_userdata) {
    sc_vecdeque_init(&controller->queue);

-    // Add 4 to support 4 non-droppable events without re-allocation
-    bool ok = sc_vecdeque_reserve(&controller->queue,
-                                  SC_CONTROL_MSG_QUEUE_LIMIT + 4);
+    bool ok = sc_vecdeque_reserve(&controller->queue, SC_CONTROL_MSG_QUEUE_MAX);
    if (!ok) {
        return false;
    }

    static const struct sc_receiver_callbacks receiver_cbs = {
-        .on_ended = sc_controller_receiver_on_ended,
+        .on_error = sc_controller_receiver_on_error,
    };

    ok = sc_receiver_init(&controller->receiver, control_socket, &receiver_cbs,
@ -59,7 +55,7 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
    controller->control_socket = control_socket;
    controller->stopped = false;

-    assert(cbs && cbs->on_ended);
+    assert(cbs && cbs->on_error);
    controller->cbs = cbs;
    controller->cbs_userdata = cbs_userdata;

@ -96,59 +92,39 @@ sc_controller_push_msg(struct sc_controller *controller,
        sc_control_msg_log(msg);
    }

-    bool pushed = false;
-
    sc_mutex_lock(&controller->mutex);
-    size_t size = sc_vecdeque_size(&controller->queue);
-    if (size < SC_CONTROL_MSG_QUEUE_LIMIT) {
+    bool full = sc_vecdeque_is_full(&controller->queue);
+    if (!full) {
        bool was_empty = sc_vecdeque_is_empty(&controller->queue);
        sc_vecdeque_push_noresize(&controller->queue, *msg);
-        pushed = true;
        if (was_empty) {
            sc_cond_signal(&controller->msg_cond);
        }
-    } else if (!sc_control_msg_is_droppable(msg)) {
-        bool ok = sc_vecdeque_push(&controller->queue, *msg);
-        if (ok) {
-            pushed = true;
-        } else {
-            // A non-droppable event must be dropped anyway
-            LOG_OOM();
    }
-    }
-    // Otherwise, the msg is discarded
+    // Otherwise (if the queue is full), the msg is discarded

    sc_mutex_unlock(&controller->mutex);

-    return pushed;
+    return !full;
 }

 static bool
 process_msg(struct sc_controller *controller,
-            const struct sc_control_msg *msg, bool *eos) {
+            const struct sc_control_msg *msg) {
    static uint8_t serialized_msg[SC_CONTROL_MSG_MAX_SIZE];
    size_t length = sc_control_msg_serialize(msg, serialized_msg);
    if (!length) {
-        *eos = false;
        return false;
    }
-
    ssize_t w =
        net_send_all(controller->control_socket, serialized_msg, length);
-    if ((size_t) w != length) {
-        *eos = true;
-        return false;
-    }
-
-    return true;
+    return (size_t) w == length;
 }

 static int
 run_controller(void *data) {
    struct sc_controller *controller = data;

-    bool error = false;
-
    for (;;) {
        sc_mutex_lock(&controller->mutex);
        while (!controller->stopped
@ -158,7 +134,6 @@ run_controller(void *data) {
        if (controller->stopped) {
            // stop immediately, do not process further msgs
            sc_mutex_unlock(&controller->mutex);
-            LOGD("Controller stopped");
            break;
        }

@ -166,21 +141,20 @@ run_controller(void *data) {
        struct sc_control_msg msg = sc_vecdeque_pop(&controller->queue);
        sc_mutex_unlock(&controller->mutex);

-        bool eos;
-        bool ok = process_msg(controller, &msg, &eos);
+        bool ok = process_msg(controller, &msg);
        sc_control_msg_destroy(&msg);
        if (!ok) {
-            if (eos) {
-                LOGD("Controller stopped (socket closed)");
-            } // else error already logged
-            error = !eos;
-            break;
+            LOGD("Could not write msg to socket");
+            goto error;
        }
    }

-    controller->cbs->on_ended(controller, error, controller->cbs_userdata);
-
    return 0;
+
+error:
+    controller->cbs->on_error(controller, controller->cbs_userdata);
+
+    return 1; // ignored
 }

 bool
--- a/app/src/controller.h
+++ b/app/src/controller.h
@ -28,8 +28,7 @@ struct sc_controller {
 };

 struct sc_controller_callbacks {
-    void (*on_ended)(struct sc_controller *controller, bool error,
-                     void *userdata);
+    void (*on_error)(struct sc_controller *controller, void *userdata);
 };

 bool
--- a/app/src/delay_buffer.c
+++ b/app/src/delay_buffer.c
@ -8,6 +8,8 @@

 #include "util/log.h"

+#define SC_BUFFERING_NDEBUG // comment to debug
+
 /** Downcast frame_sink to sc_delay_buffer */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_delay_buffer, frame_sink)

@ -78,7 +80,7 @@ run_buffering(void *data) {
            goto stopped;
        }

-#ifdef SC_BUFFERING_DEBUG
+#ifndef SC_BUFFERING_NDEBUG
        LOGD("Buffering: %" PRItick ";%" PRItick ";%" PRItick,
             pts, dframe.push_date, sc_tick_now());
 #endif
@ -132,7 +134,6 @@ sc_delay_buffer_frame_sink_open(struct sc_frame_sink *sink,

    sc_clock_init(&db->clock);
    sc_vecdeque_init(&db->queue);
-    db->stopped = false;

    if (!sc_frame_source_sinks_open(&db->frame_source, ctx)) {
        goto error_destroy_wait_cond;
@ -205,7 +206,7 @@ sc_delay_buffer_frame_sink_push(struct sc_frame_sink *sink,
        return false;
    }

-#ifdef SC_BUFFERING_DEBUG
+#ifndef SC_BUFFERING_NDEBUG
    dframe.push_date = sc_tick_now();
 #endif

--- a/app/src/delay_buffer.h
+++ b/app/src/delay_buffer.h
@ -12,14 +12,12 @@
 #include "util/tick.h"
 #include "util/vecdeque.h"

-//#define SC_BUFFERING_DEBUG // uncomment to debug
-
 // forward declarations
 typedef struct AVFrame AVFrame;

 struct sc_delayed_frame {
    AVFrame *frame;
-#ifdef SC_BUFFERING_DEBUG
+#ifndef NDEBUG
    sc_tick push_date;
 #endif
 };
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@ -278,6 +278,7 @@ run_demuxer(void *data) {
 finally_close_sinks:
    sc_packet_source_sinks_close(&demuxer->packet_source);
 finally_free_context:
+    // This also calls avcodec_close() internally
    avcodec_free_context(&codec_ctx);
 end:
    demuxer->cbs->on_ended(demuxer, status, demuxer->cbs_userdata);
--- a/app/src/display.c
+++ b/app/src/display.c
@ -43,10 +43,6 @@ sc_display_init(struct sc_display *display, SDL_Window *window,

    display->mipmaps = false;

-#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-    display->gl_context = NULL;
-#endif
-
    // starts with "opengl"
    bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
    if (use_opengl) {
--- a/app/src/events.c
+++ b/app/src/events.c
@ -1,66 +0,0 @@
-#include "events.h"
-
-#include "util/log.h"
-#include "util/thread.h"
-
-bool
-sc_push_event_impl(uint32_t type, const char *name) {
-    SDL_Event event;
-    event.type = type;
-    int ret = SDL_PushEvent(&event);
-    // ret < 0: error (queue full)
-    // ret == 0: event was filtered
-    // ret == 1: success
-    if (ret != 1) {
-        LOGE("Could not post %s event: %s", name, SDL_GetError());
-        return false;
-    }
-
-    return true;
-}
-
-bool
-sc_post_to_main_thread(sc_runnable_fn run, void *userdata) {
-    SDL_Event event = {
-        .user = {
-            .type = SC_EVENT_RUN_ON_MAIN_THREAD,
-            .data1 = run,
-            .data2 = userdata,
-        },
-    };
-    int ret = SDL_PushEvent(&event);
-    // ret < 0: error (queue full)
-    // ret == 0: event was filtered
-    // ret == 1: success
-    if (ret != 1) {
-        if (ret == 0) {
-            // if ret == 0, this is expected on exit, log in debug mode
-            LOGD("Could not post runnable to main thread (filtered)");
-        } else {
-            assert(ret < 0);
-            LOGW("Could not post runnable to main thread: %s", SDL_GetError());
-        }
-        return false;
-    }
-
-    return true;
-}
-
-static int SDLCALL
-task_event_filter(void *userdata, SDL_Event *event) {
-    (void) userdata;
-
-    if (event->type == SC_EVENT_RUN_ON_MAIN_THREAD) {
-        // Reject this event type from now on
-        return 0;
-    }
-
-    return 1;
-}
-
-void
-sc_reject_new_runnables(void) {
-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
-
-    SDL_SetEventFilter(task_event_filter, NULL);
-}
--- a/app/src/events.h
+++ b/app/src/events.h
@ -1,38 +1,10 @@
-#ifndef SC_EVENTS_H
-#define SC_EVENTS_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <SDL2/SDL_events.h>
-
-enum {
-    SC_EVENT_NEW_FRAME = SDL_USEREVENT,
-    SC_EVENT_RUN_ON_MAIN_THREAD,
-    SC_EVENT_DEVICE_DISCONNECTED,
-    SC_EVENT_SERVER_CONNECTION_FAILED,
-    SC_EVENT_SERVER_CONNECTED,
-    SC_EVENT_USB_DEVICE_DISCONNECTED,
-    SC_EVENT_DEMUXER_ERROR,
-    SC_EVENT_RECORDER_ERROR,
-    SC_EVENT_SCREEN_INIT_SIZE,
-    SC_EVENT_TIME_LIMIT_REACHED,
-    SC_EVENT_CONTROLLER_ERROR,
-    SC_EVENT_AOA_OPEN_ERROR,
-};
-
-bool
-sc_push_event_impl(uint32_t type, const char *name);
-
-#define sc_push_event(TYPE) sc_push_event_impl(TYPE, # TYPE)
-
-typedef void (*sc_runnable_fn)(void *userdata);
-
-bool
-sc_post_to_main_thread(sc_runnable_fn run, void *userdata);
-
-void
-sc_reject_new_runnables(void);
-
-#endif
+#define SC_EVENT_NEW_FRAME                 SDL_USEREVENT
+#define SC_EVENT_DEVICE_DISCONNECTED      (SDL_USEREVENT + 1)
+#define SC_EVENT_SERVER_CONNECTION_FAILED (SDL_USEREVENT + 2)
+#define SC_EVENT_SERVER_CONNECTED         (SDL_USEREVENT + 3)
+#define SC_EVENT_USB_DEVICE_DISCONNECTED  (SDL_USEREVENT + 4)
+#define SC_EVENT_DEMUXER_ERROR            (SDL_USEREVENT + 5)
+#define SC_EVENT_RECORDER_ERROR           (SDL_USEREVENT + 6)
+#define SC_EVENT_SCREEN_INIT_SIZE         (SDL_USEREVENT + 7)
+#define SC_EVENT_TIME_LIMIT_REACHED       (SDL_USEREVENT + 8)
+#define SC_EVENT_CONTROLLER_ERROR         (SDL_USEREVENT + 9)
--- a/app/src/hid/hid_event.h
+++ b/app/src/hid/hid_event.h
@ -5,22 +5,11 @@

 #include <stdint.h>

-#define SC_HID_MAX_SIZE 15
+#define SC_HID_MAX_SIZE 8

-struct sc_hid_input {
-    uint16_t hid_id;
+struct sc_hid_event {
    uint8_t data[SC_HID_MAX_SIZE];
    uint8_t size;
 };

-struct sc_hid_open {
-    uint16_t hid_id;
-    const uint8_t *report_desc; // pointer to static memory
-    size_t report_desc_size;
-};
-
-struct sc_hid_close {
-    uint16_t hid_id;
-};
-
 #endif
--- a/app/src/hid/hid_gamepad.c
+++ b/app/src/hid/hid_gamepad.c
@ -1,452 +0,0 @@
-#include "hid_gamepad.h"
-
-#include <assert.h>
-#include <inttypes.h>
-
-#include "util/binary.h"
-#include "util/log.h"
-
-// 2x2 bytes for left stick (X, Y)
-// 2x2 bytes for right stick (Z, Rz)
-// 2x2 bytes for L2/R2 triggers
-// 2 bytes for buttons + padding,
-// 1 byte for hat switch (dpad) + padding
-#define SC_HID_GAMEPAD_EVENT_SIZE 15
-
-// The ->buttons field stores the state for all buttons, but only some of them
-// (the 16 LSB) must be transmitted "as is". The DPAD (hat switch) buttons are
-// stored locally in the MSB of this field, but not transmitted as is: they are
-// transformed to generate another specific byte.
-#define SC_HID_BUTTONS_MASK 0xFFFF
-
-// outside SC_HID_BUTTONS_MASK
-#define SC_GAMEPAD_BUTTONS_BIT_DPAD_UP    UINT32_C(0x10000)
-#define SC_GAMEPAD_BUTTONS_BIT_DPAD_DOWN  UINT32_C(0x20000)
-#define SC_GAMEPAD_BUTTONS_BIT_DPAD_LEFT  UINT32_C(0x40000)
-#define SC_GAMEPAD_BUTTONS_BIT_DPAD_RIGHT UINT32_C(0x80000)
-
-/**
- * Gamepad descriptor manually crafted to transmit the input reports.
- *
- * The HID specification is available here:
- * <https://www.usb.org/document-library/device-class-definition-hid-111>
- *
- * The HID Usage Tables is also useful:
- * <https://www.usb.org/document-library/hid-usage-tables-15>
- */
-static const uint8_t SC_HID_GAMEPAD_REPORT_DESC[] = {
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Gamepad)
-    0x09, 0x05,
-
-    // Collection (Application)
-    0xA1, 0x01,
-
-    // Collection (Physical)
-    0xA1, 0x00,
-
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (X)   Left stick x
-    0x09, 0x30,
-    // Usage (Y)   Left stick y
-    0x09, 0x31,
-    // Usage (Rx)  Right stick x
-    0x09, 0x33,
-    // Usage (Ry)  Right stick y
-    0x09, 0x34,
-    // Logical Minimum (0)
-    0x15, 0x00,
-    // Logical Maximum (65535)
-    // Cannot use 26 FF FF because 0xFFFF is interpreted as signed 16-bit
-    0x27, 0xFF, 0xFF, 0x00, 0x00, // little-endian
-    // Report Size (16)
-    0x75, 0x10,
-    // Report Count (4)
-    0x95, 0x04,
-    // Input (Data, Variable, Absolute): 4x2 bytes (X, Y, Z, Rz)
-    0x81, 0x02,
-
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Z)
-    0x09, 0x32,
-    // Usage (Rz)
-    0x09, 0x35,
-    // Logical Minimum (0)
-    0x15, 0x00,
-    // Logical Maximum (32767)
-    0x26, 0xFF, 0x7F,
-    // Report Size (16)
-    0x75, 0x10,
-    // Report Count (2)
-    0x95, 0x02,
-    // Input (Data, Variable, Absolute): 2x2 bytes (L2, R2)
-    0x81, 0x02,
-
-    // Usage Page (Buttons)
-    0x05, 0x09,
-    // Usage Minimum (1)
-    0x19, 0x01,
-    // Usage Maximum (16)
-    0x29, 0x10,
-    // Logical Minimum (0)
-    0x15, 0x00,
-    // Logical Maximum (1)
-    0x25, 0x01,
-    // Report Count (16)
-    0x95, 0x10,
-    // Report Size (1)
-    0x75, 0x01,
-    // Input (Data, Variable, Absolute): 16 buttons bits
-    0x81, 0x02,
-
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Hat switch)
-    0x09, 0x39,
-    // Logical Minimum (1)
-    0x15, 0x01,
-    // Logical Maximum (8)
-    0x25, 0x08,
-    // Report Size (4)
-    0x75, 0x04,
-    // Report Count (1)
-    0x95, 0x01,
-    // Input (Data, Variable, Null State): 4-bit value
-    0x81, 0x42,
-
-    // End Collection
-    0xC0,
-
-    // End Collection
-    0xC0,
-};
-
-/**
- * A gamepad HID input report is 15 bytes long:
- *  - bytes 0-3:   left stick state
- *  - bytes 4-7:   right stick state
- *  - bytes 8-11:  L2/R2 triggers state
- *  - bytes 12-13: buttons state
- *  - bytes 14:    hat switch position (dpad)
- *
- *                  +---------------+
- *         byte 0:  |. . . . . . . .|
- *                  |               | left stick x (0-65535, little-endian)
- *         byte 1:  |. . . . . . . .|
- *                  +---------------+
- *         byte 2:  |. . . . . . . .|
- *                  |               | left stick y (0-65535, little-endian)
- *         byte 3:  |. . . . . . . .|
- *                  +---------------+
- *         byte 4:  |. . . . . . . .|
- *                  |               | right stick x (0-65535, little-endian)
- *         byte 5:  |. . . . . . . .|
- *                  +---------------+
- *         byte 6:  |. . . . . . . .|
- *                  |               | right stick y (0-65535, little-endian)
- *         byte 7:  |. . . . . . . .|
- *                  +---------------+
- *         byte 8:  |. . . . . . . .|
- *                  |               | L2 trigger (0-32767, little-endian)
- *         byte 9:  |0 . . . . . . .|
- *                  +---------------+
- *        byte 10:  |. . . . . . . .|
- *                  |               | R2 trigger (0-32767, little-endian)
- *        byte 11:  |0 . . . . . . .|
- *                  +---------------+
- *
- *                   ,--------------- SC_GAMEPAD_BUTTON_RIGHT_SHOULDER
- *                   | ,------------- SC_GAMEPAD_BUTTON_LEFT_SHOULDER
- *                   | |
- *                   | |   ,--------- SC_GAMEPAD_BUTTON_NORTH
- *                   | |   | ,------- SC_GAMEPAD_BUTTON_WEST
- *                   | |   | |
- *                   | |   | |   ,--- SC_GAMEPAD_BUTTON_EAST
- *                   | |   | |   | ,- SC_GAMEPAD_BUTTON_SOUTH
- *                   v v   v v   v v
- *                  +---------------+
- *        byte 12:  |. . 0 . . 0 . .|
- *                  |               | Buttons (16-bit little-endian)
- *        byte 13:  |0 . . . . . 0 0|
- *                  +---------------+
- *                     ^ ^ ^ ^ ^
- *                     | | | | |
- *                     | | | | |
- *                     | | | | `----- SC_GAMEPAD_BUTTON_BACK
- *                     | | | `------- SC_GAMEPAD_BUTTON_START
- *                     | | `--------- SC_GAMEPAD_BUTTON_GUIDE
- *                     | `----------- SC_GAMEPAD_BUTTON_LEFT_STICK
- *                     `------------- SC_GAMEPAD_BUTTON_RIGHT_STICK
- *
- *                  +---------------+
- *        byte 14:  |0 0 0 0 . . . .| hat switch (dpad) position (0-8)
- *                  +---------------+
- *                     9 possible positions and their values:
- *                             8 1 2
- *                             7 0 3
- *                             6 5 4
- *                     (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_trigger = 0;
-    slot->axis_right_trigger = 0;
-}
-
-static ssize_t
-sc_hid_gamepad_slot_find(struct sc_hid_gamepad *hid, uint32_t gamepad_id) {
-    for (size_t i = 0; i < SC_MAX_GAMEPADS; ++i) {
-        if (gamepad_id == hid->slots[i].gamepad_id) {
-            // found
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-void
-sc_hid_gamepad_init(struct sc_hid_gamepad *hid) {
-    for (size_t i = 0; i < SC_MAX_GAMEPADS; ++i) {
-        hid->slots[i].gamepad_id = SC_GAMEPAD_ID_INVALID;
-    }
-}
-
-static inline uint16_t
-sc_hid_gamepad_slot_get_id(size_t slot_idx) {
-    assert(slot_idx < SC_MAX_GAMEPADS);
-    return SC_HID_ID_GAMEPAD_FIRST + slot_idx;
-}
-
-bool
-sc_hid_gamepad_generate_open(struct sc_hid_gamepad *hid,
-                             struct sc_hid_open *hid_open,
-                             uint32_t gamepad_id) {
-    assert(gamepad_id != SC_GAMEPAD_ID_INVALID);
-    ssize_t slot_idx = sc_hid_gamepad_slot_find(hid, SC_GAMEPAD_ID_INVALID);
-    if (slot_idx == -1) {
-        LOGW("No gamepad slot available for new gamepad %" PRIu32, gamepad_id);
-        return false;
-    }
-
-    sc_hid_gamepad_slot_init(&hid->slots[slot_idx], gamepad_id);
-
-    uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
-    hid_open->hid_id = hid_id;
-    hid_open->report_desc = SC_HID_GAMEPAD_REPORT_DESC;
-    hid_open->report_desc_size = sizeof(SC_HID_GAMEPAD_REPORT_DESC);
-
-    return true;
-}
-
-bool
-sc_hid_gamepad_generate_close(struct sc_hid_gamepad *hid,
-                              struct sc_hid_close *hid_close,
-                              uint32_t gamepad_id) {
-    assert(gamepad_id != SC_GAMEPAD_ID_INVALID);
-    ssize_t slot_idx = sc_hid_gamepad_slot_find(hid, gamepad_id);
-    if (slot_idx == -1) {
-        LOGW("Unknown gamepad removed %" PRIu32, gamepad_id);
-        return false;
-    }
-
-    hid->slots[slot_idx].gamepad_id = SC_GAMEPAD_ID_INVALID;
-
-    uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
-    hid_close->hid_id = hid_id;
-
-    return true;
-}
-
-static uint8_t
-sc_hid_gamepad_get_dpad_value(uint32_t buttons) {
-    // Value depending on direction:
-    //     8 1 2
-    //     7 0 3
-    //     6 5 4
-    if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_UP) {
-        if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_LEFT) {
-            return 8;
-        }
-        if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_RIGHT) {
-            return 2;
-        }
-        return 1;
-    }
-    if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_DOWN) {
-        if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_LEFT) {
-            return 6;
-        }
-        if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_RIGHT) {
-            return 4;
-        }
-        return 5;
-    }
-    if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_LEFT) {
-        return 7;
-    }
-    if (buttons & SC_GAMEPAD_BUTTONS_BIT_DPAD_RIGHT) {
-        return 3;
-    }
-
-    return 0;
-}
-
-static void
-sc_hid_gamepad_event_from_slot(uint16_t hid_id,
-                               const struct sc_hid_gamepad_slot *slot,
-                               struct sc_hid_input *hid_input) {
-    hid_input->hid_id = hid_id;
-    hid_input->size = SC_HID_GAMEPAD_EVENT_SIZE;
-
-    uint8_t *data = hid_input->data;
-    // Values must be written in little-endian
-    sc_write16le(data, slot->axis_left_x);
-    sc_write16le(data + 2, slot->axis_left_y);
-    sc_write16le(data + 4, slot->axis_right_x);
-    sc_write16le(data + 6, slot->axis_right_y);
-    sc_write16le(data + 8, slot->axis_left_trigger);
-    sc_write16le(data + 10, slot->axis_right_trigger);
-    sc_write16le(data + 12, slot->buttons & SC_HID_BUTTONS_MASK);
-    data[14] = sc_hid_gamepad_get_dpad_value(slot->buttons);
-}
-
-static uint32_t
-sc_hid_gamepad_get_button_id(enum sc_gamepad_button button) {
-    switch (button) {
-        case SC_GAMEPAD_BUTTON_SOUTH:
-            return 0x0001;
-        case SC_GAMEPAD_BUTTON_EAST:
-            return 0x0002;
-        case SC_GAMEPAD_BUTTON_WEST:
-            return 0x0008;
-        case SC_GAMEPAD_BUTTON_NORTH:
-            return 0x0010;
-        case SC_GAMEPAD_BUTTON_BACK:
-            return 0x0400;
-        case SC_GAMEPAD_BUTTON_GUIDE:
-            return 0x1000;
-        case SC_GAMEPAD_BUTTON_START:
-            return 0x0800;
-        case SC_GAMEPAD_BUTTON_LEFT_STICK:
-            return 0x2000;
-        case SC_GAMEPAD_BUTTON_RIGHT_STICK:
-            return 0x4000;
-        case SC_GAMEPAD_BUTTON_LEFT_SHOULDER:
-            return 0x0040;
-        case SC_GAMEPAD_BUTTON_RIGHT_SHOULDER:
-            return 0x0080;
-        case SC_GAMEPAD_BUTTON_DPAD_UP:
-            return SC_GAMEPAD_BUTTONS_BIT_DPAD_UP;
-        case SC_GAMEPAD_BUTTON_DPAD_DOWN:
-            return SC_GAMEPAD_BUTTONS_BIT_DPAD_DOWN;
-        case SC_GAMEPAD_BUTTON_DPAD_LEFT:
-            return SC_GAMEPAD_BUTTONS_BIT_DPAD_LEFT;
-        case SC_GAMEPAD_BUTTON_DPAD_RIGHT:
-            return SC_GAMEPAD_BUTTONS_BIT_DPAD_RIGHT;
-        default:
-            // unknown button, ignore
-            return 0;
-    }
-}
-
-bool
-sc_hid_gamepad_generate_input_from_button(struct sc_hid_gamepad *hid,
-                                          struct sc_hid_input *hid_input,
-                                const struct sc_gamepad_button_event *event) {
-    if ((event->button < 0) || (event->button > 15)) {
-        return false;
-    }
-
-    uint32_t gamepad_id = event->gamepad_id;
-
-    ssize_t slot_idx = sc_hid_gamepad_slot_find(hid, gamepad_id);
-    if (slot_idx == -1) {
-        LOGW("Axis event for unknown gamepad %" PRIu32, gamepad_id);
-        return false;
-    }
-
-    assert(slot_idx < SC_MAX_GAMEPADS);
-
-    struct sc_hid_gamepad_slot *slot = &hid->slots[slot_idx];
-
-    uint32_t button = sc_hid_gamepad_get_button_id(event->button);
-    if (!button) {
-        // unknown button, ignore
-        return false;
-    }
-
-    if (event->action == SC_ACTION_DOWN) {
-        slot->buttons |= button;
-    } else {
-        assert(event->action == SC_ACTION_UP);
-        slot->buttons &= ~button;
-    }
-
-    uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
-    sc_hid_gamepad_event_from_slot(hid_id, slot, hid_input);
-
-    return true;
-}
-
-bool
-sc_hid_gamepad_generate_input_from_axis(struct sc_hid_gamepad *hid,
-                                        struct sc_hid_input *hid_input,
-                                const struct sc_gamepad_axis_event *event) {
-    uint32_t gamepad_id = event->gamepad_id;
-
-    ssize_t slot_idx = sc_hid_gamepad_slot_find(hid, gamepad_id);
-    if (slot_idx == -1) {
-        LOGW("Button event for unknown gamepad %" PRIu32, gamepad_id);
-        return false;
-    }
-
-    assert(slot_idx < SC_MAX_GAMEPADS);
-
-    struct sc_hid_gamepad_slot *slot = &hid->slots[slot_idx];
-
-    switch (event->axis) {
-        case SC_GAMEPAD_AXIS_LEFTX:
-            slot->axis_left_x = AXIS_RESCALE(event->value);
-            break;
-        case SC_GAMEPAD_AXIS_LEFTY:
-            slot->axis_left_y = AXIS_RESCALE(event->value);
-            break;
-        case SC_GAMEPAD_AXIS_RIGHTX:
-            slot->axis_right_x = AXIS_RESCALE(event->value);
-            break;
-        case SC_GAMEPAD_AXIS_RIGHTY:
-            slot->axis_right_y = AXIS_RESCALE(event->value);
-            break;
-        case SC_GAMEPAD_AXIS_LEFT_TRIGGER:
-            // Trigger is always positive between 0 and 32767
-            slot->axis_left_trigger = MAX(0, event->value);
-            break;
-        case SC_GAMEPAD_AXIS_RIGHT_TRIGGER:
-            // Trigger is always positive between 0 and 32767
-            slot->axis_right_trigger = MAX(0, event->value);
-            break;
-        default:
-            return false;
-    }
-
-    uint16_t hid_id = sc_hid_gamepad_slot_get_id(slot_idx);
-    sc_hid_gamepad_event_from_slot(hid_id, slot, hid_input);
-
-    return true;
-}
--- a/app/src/hid/hid_gamepad.h
+++ b/app/src/hid/hid_gamepad.h
@ -1,53 +0,0 @@
-#ifndef SC_HID_GAMEPAD_H
-#define SC_HID_GAMEPAD_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include "hid/hid_event.h"
-#include "input_events.h"
-
-#define SC_MAX_GAMEPADS 8
-#define SC_HID_ID_GAMEPAD_FIRST 3
-#define SC_HID_ID_GAMEPAD_LAST (SC_HID_ID_GAMEPAD_FIRST + SC_MAX_GAMEPADS - 1)
-
-struct sc_hid_gamepad_slot {
-    uint32_t gamepad_id;
-    uint32_t buttons;
-    uint16_t axis_left_x;
-    uint16_t axis_left_y;
-    uint16_t axis_right_x;
-    uint16_t axis_right_y;
-    uint16_t axis_left_trigger;
-    uint16_t axis_right_trigger;
-};
-
-struct sc_hid_gamepad {
-    struct sc_hid_gamepad_slot slots[SC_MAX_GAMEPADS];
-};
-
-void
-sc_hid_gamepad_init(struct sc_hid_gamepad *hid);
-
-bool
-sc_hid_gamepad_generate_open(struct sc_hid_gamepad *hid,
-                             struct sc_hid_open *hid_open,
-                             uint32_t gamepad_id);
-
-bool
-sc_hid_gamepad_generate_close(struct sc_hid_gamepad *hid,
-                              struct sc_hid_close *hid_close,
-                              uint32_t gamepad_id);
-
-bool
-sc_hid_gamepad_generate_input_from_button(struct sc_hid_gamepad *hid,
-                                          struct sc_hid_input *hid_input,
-                                const struct sc_gamepad_button_event *event);
-
-bool
-sc_hid_gamepad_generate_input_from_axis(struct sc_hid_gamepad *hid,
-                                        struct sc_hid_input *hid_input,
-                                const struct sc_gamepad_axis_event *event);
-
-#endif
--- a/app/src/hid/hid_keyboard.c
+++ b/app/src/hid/hid_keyboard.c
@ -21,7 +21,7 @@
 // keyboard support, though OS could support more keys via modifying the report
 // desc. 6 should be enough for scrcpy.
 #define SC_HID_KEYBOARD_MAX_KEYS 6
-#define SC_HID_KEYBOARD_INPUT_SIZE \
+#define SC_HID_KEYBOARD_EVENT_SIZE \
    (SC_HID_KEYBOARD_INDEX_KEYS + SC_HID_KEYBOARD_MAX_KEYS)

 #define SC_HID_RESERVED 0x00
@ -31,16 +31,13 @@
 * For HID, only report descriptor is needed.
 *
 * The specification is available here:
- * <https://www.usb.org/document-library/device-class-definition-hid-111>
+ * <https://www.usb.org/sites/default/files/hid1_11.pdf>
 *
 * In particular, read:
- *  - §6.2.2 Report Descriptor
+ *  - 6.2.2 Report Descriptor
 *  - Appendix B.1 Protocol 1 (Keyboard)
 *  - Appendix C: Keyboard Implementation
 *
- * The HID Usage Tables is also useful:
- * <https://www.usb.org/document-library/hid-usage-tables-15>
- *
 * Normally a basic HID keyboard uses 8 bytes:
 *     Modifier Reserved Key Key Key Key Key Key
 *
@ -50,7 +47,7 @@
 *
 * (change vid:pid' to your device's vendor ID and product ID).
 */
-static const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
+const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
    // Usage Page (Generic Desktop)
    0x05, 0x01,
    // Usage (Keyboard)
@ -124,8 +121,11 @@ static const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
    0xC0
 };

+const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN =
+    sizeof(SC_HID_KEYBOARD_REPORT_DESC);
+
 /**
- * A keyboard HID input report is 8 bytes long:
+ * A keyboard HID event is 8 bytes long:
 *
 *  - byte 0: modifiers (1 flag per modifier key, 8 possible modifier keys)
 *  - byte 1: reserved (always 0)
@ -199,11 +199,10 @@ static const uint8_t SC_HID_KEYBOARD_REPORT_DESC[] = {
 */

 static void
-sc_hid_keyboard_input_init(struct sc_hid_input *hid_input) {
-    hid_input->hid_id = SC_HID_ID_KEYBOARD;
-    hid_input->size = SC_HID_KEYBOARD_INPUT_SIZE;
+sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
+    hid_event->size = SC_HID_KEYBOARD_EVENT_SIZE;

-    uint8_t *data = hid_input->data;
+    uint8_t *data = hid_event->data;

    data[SC_HID_KEYBOARD_INDEX_MODS] = SC_HID_MOD_NONE;
    data[1] = SC_HID_RESERVED;
@ -251,8 +250,8 @@ scancode_is_modifier(enum sc_scancode scancode) {
 }

 bool
-sc_hid_keyboard_generate_input_from_key(struct sc_hid_keyboard *hid,
-                                        struct sc_hid_input *hid_input,
+sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
+                               struct sc_hid_event *hid_event,
                               const struct sc_key_event *event) {
    enum sc_scancode scancode = event->scancode;
    assert(scancode >= 0);
@ -265,7 +264,7 @@ sc_hid_keyboard_generate_input_from_key(struct sc_hid_keyboard *hid,
        return false;
    }

-    sc_hid_keyboard_input_init(hid_input);
+    sc_hid_keyboard_event_init(hid_event);

    uint16_t mods = sc_hid_mod_from_sdl_keymod(event->mods_state);

@ -276,9 +275,9 @@ sc_hid_keyboard_generate_input_from_key(struct sc_hid_keyboard *hid,
             hid->keys[scancode] ? "true" : "false");
    }

-    hid_input->data[SC_HID_KEYBOARD_INDEX_MODS] = mods;
+    hid_event->data[SC_HID_KEYBOARD_INDEX_MODS] = mods;

-    uint8_t *keys_data = &hid_input->data[SC_HID_KEYBOARD_INDEX_KEYS];
+    uint8_t *keys_data = &hid_event->data[SC_HID_KEYBOARD_INDEX_KEYS];
    // Re-calculate pressed keys every time
    int keys_pressed_count = 0;
    for (int i = 0; i < SC_HID_KEYBOARD_KEYS; ++i) {
@ -309,7 +308,7 @@ end:
 }

 bool
-sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,
+sc_hid_keyboard_event_from_mods(struct sc_hid_event *event,
                                uint16_t mods_state) {
    bool capslock = mods_state & SC_MOD_CAPS;
    bool numlock = mods_state & SC_MOD_NUM;
@ -318,27 +317,17 @@ sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,
        return false;
    }

-    sc_hid_keyboard_input_init(hid_input);
+    sc_hid_keyboard_event_init(event);

    unsigned i = 0;
    if (capslock) {
-        hid_input->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
+        event->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
        ++i;
    }
    if (numlock) {
-        hid_input->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_NUMLOCK;
+        event->data[SC_HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_NUMLOCK;
        ++i;
    }

    return true;
 }
-
-void sc_hid_keyboard_generate_open(struct sc_hid_open *hid_open) {
-    hid_open->hid_id = SC_HID_ID_KEYBOARD;
-    hid_open->report_desc = SC_HID_KEYBOARD_REPORT_DESC;
-    hid_open->report_desc_size = sizeof(SC_HID_KEYBOARD_REPORT_DESC);
-}
-
-void sc_hid_keyboard_generate_close(struct sc_hid_close *hid_close) {
-    hid_close->hid_id = SC_HID_ID_KEYBOARD;
-}
--- a/app/src/hid/hid_keyboard.h
+++ b/app/src/hid/hid_keyboard.h
@ -14,7 +14,8 @@
 // 0x65 is Application, typically AT-101 Keyboard ends here.
 #define SC_HID_KEYBOARD_KEYS 0x66

-#define SC_HID_ID_KEYBOARD 1
+extern const uint8_t SC_HID_KEYBOARD_REPORT_DESC[];
+extern const size_t SC_HID_KEYBOARD_REPORT_DESC_LEN;

 /**
 * HID keyboard events are sequence-based, every time keyboard state changes
@ -35,19 +36,13 @@ struct sc_hid_keyboard {
 void
 sc_hid_keyboard_init(struct sc_hid_keyboard *hid);

-void
-sc_hid_keyboard_generate_open(struct sc_hid_open *hid_open);
-
-void
-sc_hid_keyboard_generate_close(struct sc_hid_close *hid_close);
-
 bool
-sc_hid_keyboard_generate_input_from_key(struct sc_hid_keyboard *hid,
-                                        struct sc_hid_input *hid_input,
+sc_hid_keyboard_event_from_key(struct sc_hid_keyboard *hid,
+                               struct sc_hid_event *hid_event,
                               const struct sc_key_event *event);

 bool
-sc_hid_keyboard_generate_input_from_mods(struct sc_hid_input *hid_input,
+sc_hid_keyboard_event_from_mods(struct sc_hid_event *event,
                                uint16_t mods_state);

 #endif
--- a/app/src/hid/hid_mouse.c
+++ b/app/src/hid/hid_mouse.c
@ -2,19 +2,19 @@

 // 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position,
 // 1 byte for wheel motion
-#define SC_HID_MOUSE_INPUT_SIZE 4
+#define HID_MOUSE_EVENT_SIZE 4

 /**
 * Mouse descriptor from the specification:
- * <https://www.usb.org/document-library/device-class-definition-hid-111>
+ * <https://www.usb.org/sites/default/files/hid1_11.pdf>
 *
 * Appendix E (p71): §E.10 Report Descriptor (Mouse)
 *
 * The usage tags (like Wheel) are listed in "HID Usage Tables":
- * <https://www.usb.org/document-library/hid-usage-tables-15>
- * §4 Generic Desktop Page (0x01) (p32)
+ * <https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf>
+ * §4 Generic Desktop Page (0x01) (p26)
 */
-static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
+const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
    // Usage Page (Generic Desktop)
    0x05, 0x01,
    // Usage (Mouse)
@ -62,9 +62,9 @@ static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
    0x09, 0x31,
    // Usage (Wheel)
    0x09, 0x38,
-    // Logical Minimum (-127)
+    // Local Minimum (-127)
    0x15, 0x81,
-    // Logical Maximum (127)
+    // Local Maximum (127)
    0x25, 0x7F,
    // Report Size (8)
    0x75, 0x08,
@ -80,8 +80,11 @@ static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
    0xC0,
 };

+const size_t SC_HID_MOUSE_REPORT_DESC_LEN =
+    sizeof(SC_HID_MOUSE_REPORT_DESC);
+
 /**
- * A mouse HID input report is 4 bytes long:
+ * A mouse HID event is 4 bytes long:
 *
 *  - byte 0: buttons state
 *  - byte 1: relative x motion (signed byte from -127 to 127)
@ -122,10 +125,10 @@ static const uint8_t SC_HID_MOUSE_REPORT_DESC[] = {
 */

 static void
-sc_hid_mouse_input_init(struct sc_hid_input *hid_input) {
-    hid_input->hid_id = SC_HID_ID_MOUSE;
-    hid_input->size = SC_HID_MOUSE_INPUT_SIZE;
-    // Leave ->data uninitialized, it will be fully initialized by callers
+sc_hid_mouse_event_init(struct sc_hid_event *hid_event) {
+    hid_event->size = HID_MOUSE_EVENT_SIZE;
+    // Leave hid_event->data uninitialized, it will be fully initialized by
+    // callers
 }

 static uint8_t
@ -150,11 +153,11 @@ sc_hid_buttons_from_buttons_state(uint8_t buttons_state) {
 }

 void
-sc_hid_mouse_generate_input_from_motion(struct sc_hid_input *hid_input,
+sc_hid_mouse_event_from_motion(struct sc_hid_event *hid_event,
                               const struct sc_mouse_motion_event *event) {
-    sc_hid_mouse_input_init(hid_input);
+    sc_hid_mouse_event_init(hid_event);

-    uint8_t *data = hid_input->data;
+    uint8_t *data = hid_event->data;
    data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
    data[1] = CLAMP(event->xrel, -127, 127);
    data[2] = CLAMP(event->yrel, -127, 127);
@ -162,11 +165,11 @@ sc_hid_mouse_generate_input_from_motion(struct sc_hid_input *hid_input,
 }

 void
-sc_hid_mouse_generate_input_from_click(struct sc_hid_input *hid_input,
+sc_hid_mouse_event_from_click(struct sc_hid_event *hid_event,
                              const struct sc_mouse_click_event *event) {
-    sc_hid_mouse_input_init(hid_input);
+    sc_hid_mouse_event_init(hid_event);

-    uint8_t *data = hid_input->data;
+    uint8_t *data = hid_event->data;
    data[0] = sc_hid_buttons_from_buttons_state(event->buttons_state);
    data[1] = 0; // no x motion
    data[2] = 0; // no y motion
@ -174,11 +177,11 @@ sc_hid_mouse_generate_input_from_click(struct sc_hid_input *hid_input,
 }

 void
-sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,
+sc_hid_mouse_event_from_scroll(struct sc_hid_event *hid_event,
                               const struct sc_mouse_scroll_event *event) {
-    sc_hid_mouse_input_init(hid_input);
+    sc_hid_mouse_event_init(hid_event);

-    uint8_t *data = hid_input->data;
+    uint8_t *data = hid_event->data;
    data[0] = 0; // buttons state irrelevant (and unknown)
    data[1] = 0; // no x motion
    data[2] = 0; // no y motion
@ -187,13 +190,3 @@ sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,
    data[3] = CLAMP(event->vscroll, -127, 127);
    // Horizontal scrolling ignored
 }
-
-void sc_hid_mouse_generate_open(struct sc_hid_open *hid_open) {
-    hid_open->hid_id = SC_HID_ID_MOUSE;
-    hid_open->report_desc = SC_HID_MOUSE_REPORT_DESC;
-    hid_open->report_desc_size = sizeof(SC_HID_MOUSE_REPORT_DESC);
-}
-
-void sc_hid_mouse_generate_close(struct sc_hid_close *hid_close) {
-    hid_close->hid_id = SC_HID_ID_MOUSE;
-}
--- a/app/src/hid/hid_mouse.h
+++ b/app/src/hid/hid_mouse.h
@ -1,6 +1,8 @@
 #ifndef SC_HID_MOUSE_H
 #define SC_HID_MOUSE_H

+#endif
+
 #include "common.h"

 #include <stdbool.h>
@ -8,24 +10,17 @@
 #include "hid/hid_event.h"
 #include "input_events.h"

-#define SC_HID_ID_MOUSE 2
+extern const uint8_t SC_HID_MOUSE_REPORT_DESC[];
+extern const size_t SC_HID_MOUSE_REPORT_DESC_LEN;

 void
-sc_hid_mouse_generate_open(struct sc_hid_open *hid_open);
-
-void
-sc_hid_mouse_generate_close(struct sc_hid_close *hid_close);
-
-void
-sc_hid_mouse_generate_input_from_motion(struct sc_hid_input *hid_input,
+sc_hid_mouse_event_from_motion(struct sc_hid_event *hid_event,
                               const struct sc_mouse_motion_event *event);

 void
-sc_hid_mouse_generate_input_from_click(struct sc_hid_input *hid_input,
+sc_hid_mouse_event_from_click(struct sc_hid_event *hid_event,
                              const struct sc_mouse_click_event *event);

 void
-sc_hid_mouse_generate_input_from_scroll(struct sc_hid_input *hid_input,
+sc_hid_mouse_event_from_scroll(struct sc_hid_event *hid_event,
                               const struct sc_mouse_scroll_event *event);
-
-#endif
--- a/app/src/icon.c
+++ b/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;
@ -105,21 +117,21 @@ decode_image(const char *path) {
    AVFrame *frame = av_frame_alloc();
    if (!frame) {
        LOG_OOM();
-        goto free_codec_ctx;
+        goto close_codec;
    }

    AVPacket *packet = av_packet_alloc();
    if (!packet) {
        LOG_OOM();
        av_frame_free(&frame);
-        goto free_codec_ctx;
+        goto close_codec;
    }

    if (av_read_frame(ctx, packet) < 0) {
        LOGE("Could not read frame");
        av_packet_free(&packet);
        av_frame_free(&frame);
-        goto free_codec_ctx;
+        goto close_codec;
    }

    int ret;
@ -127,20 +139,22 @@ decode_image(const char *path) {
        LOGE("Could not send icon packet: %d", ret);
        av_packet_free(&packet);
        av_frame_free(&frame);
-        goto free_codec_ctx;
+        goto close_codec;
    }

    if ((ret = avcodec_receive_frame(codec_ctx, frame)) != 0) {
        LOGE("Could not receive icon frame: %d", ret);
        av_packet_free(&packet);
        av_frame_free(&frame);
-        goto free_codec_ctx;
+        goto close_codec;
    }

    av_packet_free(&packet);

    result = frame;

+close_codec:
+    avcodec_close(codec_ctx);
 free_codec_ctx:
    avcodec_free_context(&codec_ctx);
 close_input:
--- a/app/src/input_events.h
+++ b/app/src/input_events.h
@ -323,38 +323,6 @@ enum sc_mouse_button {
    SC_MOUSE_BUTTON_X2 = SDL_BUTTON(SDL_BUTTON_X2),
 };

-// Use the naming from SDL3 for gamepad axis and buttons:
-// <https://wiki.libsdl.org/SDL3/README/migration>
-
-enum sc_gamepad_axis {
-    SC_GAMEPAD_AXIS_UNKNOWN = -1,
-    SC_GAMEPAD_AXIS_LEFTX = SDL_CONTROLLER_AXIS_LEFTX,
-    SC_GAMEPAD_AXIS_LEFTY = SDL_CONTROLLER_AXIS_LEFTY,
-    SC_GAMEPAD_AXIS_RIGHTX = SDL_CONTROLLER_AXIS_RIGHTX,
-    SC_GAMEPAD_AXIS_RIGHTY = SDL_CONTROLLER_AXIS_RIGHTY,
-    SC_GAMEPAD_AXIS_LEFT_TRIGGER = SDL_CONTROLLER_AXIS_TRIGGERLEFT,
-    SC_GAMEPAD_AXIS_RIGHT_TRIGGER = SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
-};
-
-enum sc_gamepad_button {
-    SC_GAMEPAD_BUTTON_UNKNOWN = -1,
-    SC_GAMEPAD_BUTTON_SOUTH = SDL_CONTROLLER_BUTTON_A,
-    SC_GAMEPAD_BUTTON_EAST = SDL_CONTROLLER_BUTTON_B,
-    SC_GAMEPAD_BUTTON_WEST = SDL_CONTROLLER_BUTTON_X,
-    SC_GAMEPAD_BUTTON_NORTH = SDL_CONTROLLER_BUTTON_Y,
-    SC_GAMEPAD_BUTTON_BACK = SDL_CONTROLLER_BUTTON_BACK,
-    SC_GAMEPAD_BUTTON_GUIDE = SDL_CONTROLLER_BUTTON_GUIDE,
-    SC_GAMEPAD_BUTTON_START = SDL_CONTROLLER_BUTTON_START,
-    SC_GAMEPAD_BUTTON_LEFT_STICK = SDL_CONTROLLER_BUTTON_LEFTSTICK,
-    SC_GAMEPAD_BUTTON_RIGHT_STICK = SDL_CONTROLLER_BUTTON_RIGHTSTICK,
-    SC_GAMEPAD_BUTTON_LEFT_SHOULDER = SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
-    SC_GAMEPAD_BUTTON_RIGHT_SHOULDER = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
-    SC_GAMEPAD_BUTTON_DPAD_UP = SDL_CONTROLLER_BUTTON_DPAD_UP,
-    SC_GAMEPAD_BUTTON_DPAD_DOWN = SDL_CONTROLLER_BUTTON_DPAD_DOWN,
-    SC_GAMEPAD_BUTTON_DPAD_LEFT = SDL_CONTROLLER_BUTTON_DPAD_LEFT,
-    SC_GAMEPAD_BUTTON_DPAD_RIGHT = SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
-};
-
 static_assert(sizeof(enum sc_mod) >= sizeof(SDL_Keymod),
              "SDL_Keymod must be convertible to sc_mod");

@ -412,27 +380,6 @@ struct sc_touch_event {
    float pressure;
 };

-// 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 {
-    uint32_t gamepad_id;
-};
-
-struct sc_gamepad_button_event {
-    uint32_t gamepad_id;
-    enum sc_action action;
-    enum sc_gamepad_button button;
-};
-
-struct sc_gamepad_axis_event {
-    uint32_t gamepad_id;
-    enum sc_gamepad_axis axis;
-    int16_t value;
-};
-
 static inline uint16_t
 sc_mods_state_from_sdl(uint16_t mods_state) {
    return mods_state;
@ -490,40 +437,25 @@ sc_mouse_button_from_sdl(uint8_t button) {
 }

 static inline uint8_t
-sc_mouse_buttons_state_from_sdl(uint32_t buttons_state) {
+sc_mouse_buttons_state_from_sdl(uint32_t buttons_state,
+                                const struct sc_mouse_bindings *mb) {
    assert(buttons_state < 0x100); // fits in uint8_t

-    // SC_MOUSE_BUTTON_* constants are initialized from SDL_BUTTON(index)
-    return buttons_state;
-}
-
-static inline enum sc_gamepad_axis
-sc_gamepad_axis_from_sdl(uint8_t axis) {
-    if (axis <= SDL_CONTROLLER_AXIS_TRIGGERRIGHT) {
-        // SC_GAMEPAD_AXIS_* constants are initialized from
-        // SDL_CONTROLLER_AXIS_*
-        return axis;
+    uint8_t mask = SC_MOUSE_BUTTON_LEFT;
+    if (!mb || mb->right_click == SC_MOUSE_BINDING_CLICK) {
+        mask |= SC_MOUSE_BUTTON_RIGHT;
    }
-    return SC_GAMEPAD_AXIS_UNKNOWN;
-}
-
-static inline enum sc_gamepad_button
-sc_gamepad_button_from_sdl(uint8_t button) {
-    if (button <= SDL_CONTROLLER_BUTTON_DPAD_RIGHT) {
-        // SC_GAMEPAD_BUTTON_* constants are initialized from
-        // SDL_CONTROLLER_BUTTON_*
-        return button;
+    if (!mb || mb->middle_click == SC_MOUSE_BINDING_CLICK) {
+        mask |= SC_MOUSE_BUTTON_MIDDLE;
    }
-    return SC_GAMEPAD_BUTTON_UNKNOWN;
-}
-
-static inline enum sc_action
-sc_action_from_sdl_controllerbutton_type(uint32_t type) {
-    assert(type == SDL_CONTROLLERBUTTONDOWN || type == SDL_CONTROLLERBUTTONUP);
-    if (type == SDL_CONTROLLERBUTTONDOWN) {
-        return SC_ACTION_DOWN;
+    if (!mb || mb->click4 == SC_MOUSE_BINDING_CLICK) {
+        mask |= SC_MOUSE_BUTTON_X1;
    }
-    return SC_ACTION_UP;
+    if (!mb || mb->click5 == SC_MOUSE_BINDING_CLICK) {
+        mask |= SC_MOUSE_BUTTON_X2;
+    }
+
+    return buttons_state & mask;
 }

 #endif
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@ -5,38 +5,88 @@

 #include "input_events.h"
 #include "screen.h"
-#include "shortcut_mod.h"
 #include "util/log.h"

+#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
+
+static inline uint16_t
+to_sdl_mod(uint8_t shortcut_mod) {
+    uint16_t sdl_mod = 0;
+    if (shortcut_mod & SC_SHORTCUT_MOD_LCTRL) {
+        sdl_mod |= KMOD_LCTRL;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RCTRL) {
+        sdl_mod |= KMOD_RCTRL;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_LALT) {
+        sdl_mod |= KMOD_LALT;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RALT) {
+        sdl_mod |= KMOD_RALT;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_LSUPER) {
+        sdl_mod |= KMOD_LGUI;
+    }
+    if (shortcut_mod & SC_SHORTCUT_MOD_RSUPER) {
+        sdl_mod |= KMOD_RGUI;
+    }
+    return sdl_mod;
+}
+
+static bool
+is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
+    // keep only the relevant modifier keys
+    sdl_mod &= SC_SDL_SHORTCUT_MODS_MASK;
+
+    // at least one shortcut mod pressed?
+    return sdl_mod & im->sdl_shortcut_mods;
+}
+
+static bool
+is_shortcut_key(struct sc_input_manager *im, SDL_Keycode keycode) {
+    return (im->sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
+        || (im->sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
+        || (im->sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
+        || (im->sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
+        || (im->sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
+        || (im->sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
+}
+
+static inline bool
+mouse_bindings_has_secondary_click(const struct sc_mouse_bindings *mb) {
+    return mb->right_click == SC_MOUSE_BINDING_CLICK
+        || mb->middle_click == SC_MOUSE_BINDING_CLICK
+        || mb->click4 == SC_MOUSE_BINDING_CLICK
+        || mb->click5 == SC_MOUSE_BINDING_CLICK;
+}
+
 void
 sc_input_manager_init(struct sc_input_manager *im,
                      const struct sc_input_manager_params *params) {
    // A key/mouse processor may not be present if there is no controller
-    assert((!params->kp && !params->mp && !params->gp) || params->controller);
+    assert((!params->kp && !params->mp) || params->controller);
    // A processor must have ops initialized
    assert(!params->kp || params->kp->ops);
    assert(!params->mp || params->mp->ops);
-    assert(!params->gp || params->gp->ops);

    im->controller = params->controller;
    im->fp = params->fp;
    im->screen = params->screen;
    im->kp = params->kp;
    im->mp = params->mp;
-    im->gp = params->gp;

    im->mouse_bindings = params->mouse_bindings;
+    im->has_secondary_click =
+        mouse_bindings_has_secondary_click(&im->mouse_bindings);
    im->legacy_paste = params->legacy_paste;
    im->clipboard_autosync = params->clipboard_autosync;

-    im->sdl_shortcut_mods = sc_shortcut_mods_to_sdl(params->shortcut_mods);
+    im->sdl_shortcut_mods = to_sdl_mod(params->shortcut_mods);

    im->vfinger_down = false;
    im->vfinger_invert_x = false;
    im->vfinger_invert_y = false;

-    im->mouse_buttons_state = 0;
-
    im->last_keycode = SDLK_UNKNOWN;
    im->last_mod = 0;
    im->key_repeat = 0;
@ -203,12 +253,13 @@ set_device_clipboard(struct sc_input_manager *im, bool paste,
 }

 static void
-set_display_power(struct sc_input_manager *im, bool on) {
+set_screen_power_mode(struct sc_input_manager *im,
+                      enum sc_screen_power_mode mode) {
    assert(im->controller);

    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER;
-    msg.set_display_power.on = on;
+    msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
+    msg.set_screen_power_mode.mode = mode;

    if (!sc_controller_push_msg(im->controller, &msg)) {
        LOGW("Could not request 'set screen power mode'");
@ -284,18 +335,6 @@ open_hard_keyboard_settings(struct sc_input_manager *im) {
    }
 }

-static void
-reset_video(struct sc_input_manager *im) {
-    assert(im->controller);
-
-    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_RESET_VIDEO;
-
-    if (!sc_controller_push_msg(im->controller, &msg)) {
-        LOGW("Could not request reset video");
-    }
-}
-
 static void
 apply_orientation_transform(struct sc_input_manager *im,
                            enum sc_orientation transform) {
@ -313,8 +352,7 @@ sc_input_manager_process_text_input(struct sc_input_manager *im,
        return;
    }

-    if (sc_shortcut_mods_is_shortcut_mod(im->sdl_shortcut_mods,
-                                         SDL_GetModState())) {
+    if (is_shortcut_mod(im, SDL_GetModState())) {
        // A shortcut must never generate text events
        return;
    }
@ -337,7 +375,9 @@ simulate_virtual_finger(struct sc_input_manager *im,
    msg.inject_touch_event.action = action;
    msg.inject_touch_event.position.screen_size = im->screen->frame_size;
    msg.inject_touch_event.position.point = point;
-    msg.inject_touch_event.pointer_id = SC_POINTER_ID_VIRTUAL_FINGER;
+    msg.inject_touch_event.pointer_id =
+        im->has_secondary_click ? POINTER_ID_VIRTUAL_MOUSE
+                                : POINTER_ID_VIRTUAL_FINGER;
    msg.inject_touch_event.pressure = up ? 0.0f : 1.0f;
    msg.inject_touch_event.action_button = 0;
    msg.inject_touch_event.buttons = 0;
@ -370,7 +410,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    bool paused = im->screen->paused;
    bool video = im->screen->video;

-    SDL_Keycode sdl_keycode = event->keysym.sym;
+    SDL_Keycode keycode = event->keysym.sym;
    uint16_t mod = event->keysym.mod;
    bool down = event->type == SDL_KEYDOWN;
    bool ctrl = event->keysym.mod & KMOD_CTRL;
@ -381,23 +421,22 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    // press/release is a modifier key.
    // The second condition is necessary to ignore the release of the modifier
    // key (because in this case mod is 0).
-    uint16_t mods = im->sdl_shortcut_mods;
-    bool is_shortcut = sc_shortcut_mods_is_shortcut_mod(mods, mod)
-                    || sc_shortcut_mods_is_shortcut_key(mods, sdl_keycode);
+    bool is_shortcut = is_shortcut_mod(im, mod)
+                    || is_shortcut_key(im, keycode);

    if (down && !repeat) {
-        if (sdl_keycode == im->last_keycode && mod == im->last_mod) {
+        if (keycode == im->last_keycode && mod == im->last_mod) {
            ++im->key_repeat;
        } else {
            im->key_repeat = 0;
-            im->last_keycode = sdl_keycode;
+            im->last_keycode = keycode;
            im->last_mod = mod;
        }
    }

    if (is_shortcut) {
        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
-        switch (sdl_keycode) {
+        switch (keycode) {
            case SDLK_h:
                if (im->kp && !shift && !repeat && !paused) {
                    action_home(im, action);
@ -426,8 +465,10 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                return;
            case SDLK_o:
                if (control && !repeat && down && !paused) {
-                    bool on = shift;
-                    set_display_power(im, on);
+                    enum sc_screen_power_mode mode = shift
+                                                   ? SC_SCREEN_POWER_MODE_NORMAL
+                                                   : SC_SCREEN_POWER_MODE_OFF;
+                    set_screen_power_mode(im, mode);
                }
                return;
            case SDLK_z:
@ -503,7 +544,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                return;
            case SDLK_f:
                if (video && !shift && !repeat && down) {
-                    sc_screen_toggle_fullscreen(im->screen);
+                    sc_screen_switch_fullscreen(im->screen);
                }
                return;
            case SDLK_w:
@ -533,13 +574,9 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_r:
-                if (control && !repeat && down && !paused) {
-                    if (shift) {
-                        reset_video(im);
-                    } else {
+                if (control && !shift && !repeat && down && !paused) {
                    rotate_device(im);
                }
-                }
                return;
            case SDLK_k:
                if (control && !shift && !repeat && down && !paused
@ -558,7 +595,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    }

    uint64_t ack_to_wait = SC_SEQUENCE_INVALID;
-    bool is_ctrl_v = ctrl && !shift && sdl_keycode == SDLK_v && down && !repeat;
+    bool is_ctrl_v = ctrl && !shift && keycode == SDLK_v && down && !repeat;
    if (im->clipboard_autosync && is_ctrl_v) {
        if (im->legacy_paste) {
            // inject the text as input events
@ -586,20 +623,10 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        }
    }

-    enum sc_keycode keycode = sc_keycode_from_sdl(sdl_keycode);
-    if (keycode == SC_KEYCODE_UNKNOWN) {
-        return;
-    }
-
-    enum sc_scancode scancode = sc_scancode_from_sdl(event->keysym.scancode);
-    if (scancode == SC_SCANCODE_UNKNOWN) {
-        return;
-    }
-
    struct sc_key_event evt = {
        .action = sc_action_from_sdl_keyboard_type(event->type),
-        .keycode = keycode,
-        .scancode = scancode,
+        .keycode = sc_keycode_from_sdl(event->keysym.sym),
+        .scancode = sc_scancode_from_sdl(event->keysym.scancode),
        .repeat = event->repeat,
        .mods_state = sc_mods_state_from_sdl(event->keysym.mod),
    };
@ -635,11 +662,12 @@ sc_input_manager_process_mouse_motion(struct sc_input_manager *im,

    struct sc_mouse_motion_event evt = {
        .position = sc_input_manager_get_position(im, event->x, event->y),
-        .pointer_id = im->vfinger_down ? SC_POINTER_ID_GENERIC_FINGER
-                                       : SC_POINTER_ID_MOUSE,
+        .pointer_id = im->has_secondary_click ? POINTER_ID_MOUSE
+                                              : POINTER_ID_GENERIC_FINGER,
        .xrel = event->xrel,
        .yrel = event->yrel,
-        .buttons_state = im->mouse_buttons_state,
+        .buttons_state =
+            sc_mouse_buttons_state_from_sdl(event->state, &im->mouse_bindings),
    };

    assert(im->mp->ops->process_mouse_motion);
@ -691,7 +719,7 @@ sc_input_manager_process_touch(struct sc_input_manager *im,
 }

 static enum sc_mouse_binding
-sc_input_manager_get_binding(const struct sc_mouse_binding_set *bindings,
+sc_input_manager_get_binding(const struct sc_mouse_bindings *bindings,
                             uint8_t sdl_button) {
    switch (sdl_button) {
        case SDL_BUTTON_LEFT:
@ -720,29 +748,11 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
    bool control = im->controller;
    bool paused = im->screen->paused;
    bool down = event->type == SDL_MOUSEBUTTONDOWN;
-
-    enum sc_mouse_button button = sc_mouse_button_from_sdl(event->button);
-    if (button == SC_MOUSE_BUTTON_UNKNOWN) {
-        return;
-    }
-
-    if (!down) {
-        // Mark the button as released
-        im->mouse_buttons_state &= ~button;
-    }
-
-    SDL_Keymod keymod = SDL_GetModState();
-    bool ctrl_pressed = keymod & KMOD_CTRL;
-    bool shift_pressed = keymod & KMOD_SHIFT;
-
    if (control && !paused) {
        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;

-        struct sc_mouse_binding_set *bindings = !shift_pressed
-                                              ? &im->mouse_bindings.pri
-                                              : &im->mouse_bindings.sec;
        enum sc_mouse_binding binding =
-            sc_input_manager_get_binding(bindings, event->button);
+            sc_input_manager_get_binding(&im->mouse_bindings, event->button);
        assert(binding != SC_MOUSE_BINDING_AUTO);
        switch (binding) {
            case SC_MOUSE_BINDING_DISABLED:
@ -801,23 +811,16 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
        return;
    }

-    if (down) {
-        // Mark the button as pressed
-        im->mouse_buttons_state |= button;
-    }
-
-    bool change_vfinger = event->button == SDL_BUTTON_LEFT &&
-            ((down && !im->vfinger_down && (ctrl_pressed || shift_pressed)) ||
-             (!down && im->vfinger_down));
-    bool use_finger = im->vfinger_down || change_vfinger;
+    uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);

    struct sc_mouse_click_event evt = {
        .position = sc_input_manager_get_position(im, event->x, event->y),
        .action = sc_action_from_sdl_mousebutton_type(event->type),
-        .button = button,
-        .pointer_id = use_finger ? SC_POINTER_ID_GENERIC_FINGER
-                                 : SC_POINTER_ID_MOUSE,
-        .buttons_state = im->mouse_buttons_state,
+        .button = sc_mouse_button_from_sdl(event->button),
+        .pointer_id = im->has_secondary_click ? POINTER_ID_MOUSE
+                                              : POINTER_ID_GENERIC_FINGER,
+        .buttons_state = sc_mouse_buttons_state_from_sdl(sdl_buttons_state,
+                                                         &im->mouse_bindings),
    };

    assert(im->mp->ops->process_mouse_click);
@ -839,28 +842,23 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
    // In other words, the center of the rotation/scaling is the center of the
    // screen.
    //
-    // To simulate a vertical tilt gesture (a vertical slide with two fingers),
-    // Shift can be used instead of Ctrl. The "virtual finger" has a position
+    // To simulate a tilt gesture (a vertical slide with two fingers), Shift
+    // can be used instead of Ctrl. The "virtual finger" has a position
    // inverted with respect to the vertical axis of symmetry in the middle of
    // the screen.
-    //
-    // To simulate a horizontal tilt gesture (a horizontal slide with two
-    // fingers), Ctrl+Shift can be used. The "virtual finger" has a position
-    // inverted with respect to the horizontal axis of symmetry in the middle
-    // of the screen. It is expected to be less frequently used, that's why the
-    // one-mod shortcuts are assigned to rotation and vertical tilt.
-    if (change_vfinger) {
+    const SDL_Keymod keymod = SDL_GetModState();
+    const bool ctrl_pressed = keymod & KMOD_CTRL;
+    const bool shift_pressed = keymod & KMOD_SHIFT;
+    if (event->button == SDL_BUTTON_LEFT &&
+            ((down && !im->vfinger_down &&
+              ((ctrl_pressed && !shift_pressed) ||
+               (!ctrl_pressed && shift_pressed))) ||
+             (!down && im->vfinger_down))) {
        struct sc_point mouse =
            sc_screen_convert_window_to_frame_coords(im->screen, event->x,
                                                                 event->y);
        if (down) {
-            // Ctrl  Shift     invert_x  invert_y
-            // ----  ----- ==> --------  --------
-            //   0     0           0         0      -
-            //   0     1           1         0      vertical tilt
-            //   1     0           1         1      rotate
-            //   1     1           0         1      horizontal tilt
-            im->vfinger_invert_x = ctrl_pressed ^ shift_pressed;
+            im->vfinger_invert_x = ctrl_pressed || shift_pressed;
            im->vfinger_invert_y = ctrl_pressed;
        }
        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size,
@ -888,7 +886,6 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
    int mouse_x;
    int mouse_y;
    uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);
-    (void) buttons; // Actual buttons are tracked manually to ignore shortcuts

    struct sc_mouse_scroll_event evt = {
        .position = sc_input_manager_get_position(im, mouse_x, mouse_y),
@ -899,85 +896,13 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
        .hscroll = CLAMP(event->x, -1, 1),
        .vscroll = CLAMP(event->y, -1, 1),
 #endif
-        .buttons_state = im->mouse_buttons_state,
+        .buttons_state = sc_mouse_buttons_state_from_sdl(buttons,
+                                                         &im->mouse_bindings),
    };

    im->mp->ops->process_mouse_scroll(im->mp, &evt);
 }

-static void
-sc_input_manager_process_gamepad_device(struct sc_input_manager *im,
-                                       const SDL_ControllerDeviceEvent *event) {
-    if (event->type == SDL_CONTROLLERDEVICEADDED) {
-        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
-        if (!gc) {
-            LOGW("Could not open game controller");
-            return;
-        }
-
-        SDL_Joystick *joystick = SDL_GameControllerGetJoystick(gc);
-        if (!joystick) {
-            LOGW("Could not get controller joystick");
-            SDL_GameControllerClose(gc);
-            return;
-        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_JoystickInstanceID(joystick),
-        };
-        im->gp->ops->process_gamepad_added(im->gp, &evt);
-    } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        SDL_JoystickID id = event->which;
-
-        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
-        if (gc) {
-            SDL_GameControllerClose(gc);
-        } 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;
-    }
-}
-
-static void
-sc_input_manager_process_gamepad_axis(struct sc_input_manager *im,
-                                      const SDL_ControllerAxisEvent *event) {
-    enum sc_gamepad_axis axis = sc_gamepad_axis_from_sdl(event->axis);
-    if (axis == SC_GAMEPAD_AXIS_UNKNOWN) {
-        return;
-    }
-
-    struct sc_gamepad_axis_event evt = {
-        .gamepad_id = event->which,
-        .axis = axis,
-        .value = event->value,
-    };
-    im->gp->ops->process_gamepad_axis(im->gp, &evt);
-}
-
-static void
-sc_input_manager_process_gamepad_button(struct sc_input_manager *im,
-                                       const SDL_ControllerButtonEvent *event) {
-    enum sc_gamepad_button button = sc_gamepad_button_from_sdl(event->button);
-    if (button == SC_GAMEPAD_BUTTON_UNKNOWN) {
-        return;
-    }
-
-    struct sc_gamepad_button_event evt = {
-        .gamepad_id = event->which,
-        .action = sc_action_from_sdl_controllerbutton_type(event->type),
-        .button = button,
-    };
-    im->gp->ops->process_gamepad_button(im->gp, &evt);
-}
-
 static bool
 is_apk(const char *file) {
    const char *ext = strrchr(file, '.');
@ -1050,27 +975,6 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
            }
            sc_input_manager_process_touch(im, &event->tfinger);
            break;
-        case SDL_CONTROLLERDEVICEADDED:
-        case SDL_CONTROLLERDEVICEREMOVED:
-            // Handle device added or removed even if paused
-            if (!im->gp) {
-                break;
-            }
-            sc_input_manager_process_gamepad_device(im, &event->cdevice);
-            break;
-        case SDL_CONTROLLERAXISMOTION:
-            if (!im->gp || paused) {
-                break;
-            }
-            sc_input_manager_process_gamepad_axis(im, &event->caxis);
-            break;
-        case SDL_CONTROLLERBUTTONDOWN:
-        case SDL_CONTROLLERBUTTONUP:
-            if (!im->gp || paused) {
-                break;
-            }
-            sc_input_manager_process_gamepad_button(im, &event->cbutton);
-            break;
        case SDL_DROPFILE: {
            if (!control) {
                break;
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@ -11,7 +11,6 @@
 #include "file_pusher.h"
 #include "fps_counter.h"
 #include "options.h"
-#include "trait/gamepad_processor.h"
 #include "trait/key_processor.h"
 #include "trait/mouse_processor.h"

@ -22,9 +21,9 @@ struct sc_input_manager {

    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;
-    struct sc_gamepad_processor *gp;

    struct sc_mouse_bindings mouse_bindings;
+    bool has_secondary_click;
    bool legacy_paste;
    bool clipboard_autosync;

@ -34,8 +33,6 @@ struct sc_input_manager {
    bool vfinger_invert_x;
    bool vfinger_invert_y;

-    uint8_t mouse_buttons_state; // OR of enum sc_mouse_button values
-
    // Tracks the number of identical consecutive shortcut key down events.
    // Not to be confused with event->repeat, which counts the number of
    // system-generated repeated key presses.
@ -52,7 +49,6 @@ struct sc_input_manager_params {
    struct sc_screen *screen;
    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;
-    struct sc_gamepad_processor *gp;

    struct sc_mouse_bindings mouse_bindings;
    bool legacy_paste;
--- a/app/src/keyboard_sdk.c
+++ b/app/src/keyboard_sdk.c
@ -45,10 +45,6 @@ convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
        {SC_KEYCODE_RCTRL,     AKEYCODE_CTRL_RIGHT},
        {SC_KEYCODE_LSHIFT,    AKEYCODE_SHIFT_LEFT},
        {SC_KEYCODE_RSHIFT,    AKEYCODE_SHIFT_RIGHT},
-        {SC_KEYCODE_LALT,      AKEYCODE_ALT_LEFT},
-        {SC_KEYCODE_RALT,      AKEYCODE_ALT_RIGHT},
-        {SC_KEYCODE_LGUI,      AKEYCODE_META_LEFT},
-        {SC_KEYCODE_RGUI,      AKEYCODE_META_RIGHT},
    };

    // Numpad navigation keys.
@ -170,7 +166,11 @@ convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
        return false;
    }

-    // Handle letters and space
+    if (mod & (SC_MOD_LALT | SC_MOD_RALT | SC_MOD_LGUI | SC_MOD_RGUI)) {
+        return false;
+    }
+
+    // if ALT and META are not pressed, also handle letters and space
    entry = SC_INTMAP_FIND_ENTRY(alphaspace_keys, from);
    if (entry) {
        *to = entry->value;
--- a/app/src/main.c
+++ b/app/src/main.c
@ -16,7 +16,6 @@
 #include "usb/scrcpy_otg.h"
 #include "util/log.h"
 #include "util/net.h"
-#include "util/thread.h"
 #include "version.h"

 #ifdef _WIN32
@ -68,9 +67,6 @@ main_scrcpy(int argc, char *argv[]) {
        goto end;
    }

-    // The current thread is the main thread
-    SC_MAIN_THREAD_ID = sc_thread_get_id();
-
 #ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
    av_register_all();
 #endif
--- a/app/src/mouse_capture.c
+++ b/app/src/mouse_capture.c
@ -1,123 +0,0 @@
-#include "mouse_capture.h"
-
-#include "shortcut_mod.h"
-#include "util/log.h"
-
-void
-sc_mouse_capture_init(struct sc_mouse_capture *mc, SDL_Window *window,
-                      uint8_t shortcut_mods) {
-    mc->window = window;
-    mc->sdl_mouse_capture_keys = sc_shortcut_mods_to_sdl(shortcut_mods);
-    mc->mouse_capture_key_pressed = SDLK_UNKNOWN;
-}
-
-static inline bool
-sc_mouse_capture_is_capture_key(struct sc_mouse_capture *mc, SDL_Keycode key) {
-    return sc_shortcut_mods_is_shortcut_key(mc->sdl_mouse_capture_keys, key);
-}
-
-bool
-sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
-                              const SDL_Event *event) {
-    switch (event->type) {
-        case SDL_WINDOWEVENT:
-            if (event->window.event == SDL_WINDOWEVENT_FOCUS_LOST) {
-                sc_mouse_capture_set_active(mc, false);
-                return true;
-            }
-            break;
-        case SDL_KEYDOWN: {
-            SDL_Keycode key = event->key.keysym.sym;
-            if (sc_mouse_capture_is_capture_key(mc, key)) {
-                if (!mc->mouse_capture_key_pressed) {
-                    mc->mouse_capture_key_pressed = key;
-                } else {
-                    // Another mouse capture key has been pressed, cancel
-                    // mouse (un)capture
-                    mc->mouse_capture_key_pressed = 0;
-                }
-                // Mouse capture keys are never forwarded to the device
-                return true;
-            }
-            break;
-        }
-        case SDL_KEYUP: {
-            SDL_Keycode key = event->key.keysym.sym;
-            SDL_Keycode cap = mc->mouse_capture_key_pressed;
-            mc->mouse_capture_key_pressed = 0;
-            if (sc_mouse_capture_is_capture_key(mc, key)) {
-                if (key == cap) {
-                    // A mouse capture key has been pressed then released:
-                    // toggle the capture mouse mode
-                    sc_mouse_capture_toggle(mc);
-                }
-                // Mouse capture keys are never forwarded to the device
-                return true;
-            }
-            break;
-        }
-        case SDL_MOUSEWHEEL:
-        case SDL_MOUSEMOTION:
-        case SDL_MOUSEBUTTONDOWN:
-            if (!sc_mouse_capture_is_active(mc)) {
-                // The mouse will be captured on SDL_MOUSEBUTTONUP, so consume
-                // the event
-                return true;
-            }
-            break;
-        case SDL_MOUSEBUTTONUP:
-            if (!sc_mouse_capture_is_active(mc)) {
-                sc_mouse_capture_set_active(mc, true);
-                return true;
-            }
-            break;
-        case SDL_FINGERMOTION:
-        case SDL_FINGERDOWN:
-        case SDL_FINGERUP:
-            // Touch events are not compatible with relative mode
-            // (coordinates are not relative), so consume the event
-            return true;
-    }
-
-    return false;
-}
-
-void
-sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture) {
-#ifdef __APPLE__
-    // Workaround for SDL bug on macOS:
-    // <https://github.com/libsdl-org/SDL/issues/5340>
-    if (capture) {
-        int mouse_x, mouse_y;
-        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
-
-        int x, y, w, h;
-        SDL_GetWindowPosition(mc->window, &x, &y);
-        SDL_GetWindowSize(mc->window, &w, &h);
-
-        bool outside_window = mouse_x < x || mouse_x >= x + w
-                           || mouse_y < y || mouse_y >= y + h;
-        if (outside_window) {
-            SDL_WarpMouseInWindow(mc->window, w / 2, h / 2);
-        }
-    }
-#else
-    (void) mc;
-#endif
-    if (SDL_SetRelativeMouseMode(capture)) {
-        LOGE("Could not set relative mouse mode to %s: %s",
-             capture ? "true" : "false", SDL_GetError());
-    }
-}
-
-bool
-sc_mouse_capture_is_active(struct sc_mouse_capture *mc) {
-    (void) mc;
-    return SDL_GetRelativeMouseMode();
-}
-
-void
-sc_mouse_capture_toggle(struct sc_mouse_capture *mc) {
-    bool new_value = !sc_mouse_capture_is_active(mc);
-    sc_mouse_capture_set_active(mc, new_value);
-}
--- a/app/src/mouse_capture.h
+++ b/app/src/mouse_capture.h
@ -1,38 +0,0 @@
-#ifndef SC_MOUSE_CAPTURE_H
-#define SC_MOUSE_CAPTURE_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include <SDL2/SDL.h>
-
-struct sc_mouse_capture {
-    SDL_Window *window;
-    uint16_t sdl_mouse_capture_keys;
-
-    // To enable/disable mouse capture, a mouse capture key (LALT, LGUI or
-    // RGUI) must be pressed. This variable tracks the pressed capture key.
-    SDL_Keycode mouse_capture_key_pressed;
-
-};
-
-void
-sc_mouse_capture_init(struct sc_mouse_capture *mc, SDL_Window *window,
-                      uint8_t shortcut_mods);
-
-void
-sc_mouse_capture_set_active(struct sc_mouse_capture *mc, bool capture);
-
-bool
-sc_mouse_capture_is_active(struct sc_mouse_capture *mc);
-
-void
-sc_mouse_capture_toggle(struct sc_mouse_capture *mc);
-
-// Return true if it consumed the event
-bool
-sc_mouse_capture_handle_event(struct sc_mouse_capture *mc,
-                              const SDL_Event *event);
-
-#endif
--- a/app/src/mouse_sdk.c
+++ b/app/src/mouse_sdk.c
@ -58,18 +58,17 @@ convert_touch_action(enum sc_touch_action action) {
 static void
 sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_motion_event *event) {
-    struct sc_mouse_sdk *m = DOWNCAST(mp);
-
-    if (!m->mouse_hover && !event->buttons_state) {
+    if (!event->buttons_state) {
        // Do not send motion events when no click is pressed
        return;
    }

+    struct sc_mouse_sdk *m = DOWNCAST(mp);
+
    struct sc_control_msg msg = {
        .type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
        .inject_touch_event = {
-            .action = event->buttons_state ? AMOTION_EVENT_ACTION_MOVE
-                                           : AMOTION_EVENT_ACTION_HOVER_MOVE,
+            .action = AMOTION_EVENT_ACTION_MOVE,
            .pointer_id = event->pointer_id,
            .position = event->position,
            .pressure = 1.f,
@ -146,10 +145,8 @@ sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
 }

 void
-sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller,
-                  bool mouse_hover) {
+sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller) {
    m->controller = controller;
-    m->mouse_hover = mouse_hover;

    static const struct sc_mouse_processor_ops ops = {
        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
--- a/app/src/mouse_sdk.h
+++ b/app/src/mouse_sdk.h
@ -13,11 +13,9 @@ struct sc_mouse_sdk {
    struct sc_mouse_processor mouse_processor; // mouse processor trait

    struct sc_controller *controller;
-    bool mouse_hover;
 };

 void
-sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller,
-                  bool mouse_hover);
+sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller);

 #endif
--- a/app/src/options.c
+++ b/app/src/options.c
@ -23,21 +23,12 @@ const struct scrcpy_options scrcpy_options_default = {
    .record_format = SC_RECORD_FORMAT_AUTO,
    .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_AUTO,
    .mouse_input_mode = SC_MOUSE_INPUT_MODE_AUTO,
-    .gamepad_input_mode = SC_GAMEPAD_INPUT_MODE_DISABLED,
    .mouse_bindings = {
-        .pri = {
        .right_click = SC_MOUSE_BINDING_AUTO,
        .middle_click = SC_MOUSE_BINDING_AUTO,
        .click4 = SC_MOUSE_BINDING_AUTO,
        .click5 = SC_MOUSE_BINDING_AUTO,
    },
-        .sec = {
-            .right_click = SC_MOUSE_BINDING_AUTO,
-            .middle_click = SC_MOUSE_BINDING_AUTO,
-            .click4 = SC_MOUSE_BINDING_AUTO,
-            .click5 = SC_MOUSE_BINDING_AUTO,
-        },
-    },
    .camera_facing = SC_CAMERA_FACING_ANY,
    .port_range = {
        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
@ -49,9 +40,8 @@ const struct scrcpy_options scrcpy_options_default = {
    .max_size = 0,
    .video_bit_rate = 0,
    .audio_bit_rate = 0,
-    .max_fps = NULL,
-    .capture_orientation = SC_ORIENTATION_0,
-    .capture_orientation_lock = SC_ORIENTATION_UNLOCKED,
+    .max_fps = 0,
+    .lock_video_orientation = SC_LOCK_VIDEO_ORIENTATION_UNLOCKED,
    .display_orientation = SC_ORIENTATION_0,
    .record_orientation = SC_ORIENTATION_0,
    .window_x = SC_WINDOW_POSITION_UNDEFINED,
@ -59,11 +49,10 @@ const struct scrcpy_options scrcpy_options_default = {
    .window_width = 0,
    .window_height = 0,
    .display_id = 0,
-    .video_buffer = 0,
+    .display_buffer = 0,
    .audio_buffer = -1, // depends on the audio format,
    .audio_output_buffer = SC_TICK_FROM_MS(5),
    .time_limit = 0,
-    .screen_off_timeout = -1,
 #ifdef HAVE_V4L2
    .v4l2_device = NULL,
    .v4l2_buffer = 0,
@ -103,13 +92,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .camera_high_speed = false,
    .list = 0,
    .window = true,
-    .mouse_hover = true,
-    .audio_dup = false,
-    .new_display = NULL,
-    .start_app = NULL,
-    .angle = NULL,
-    .vd_destroy_content = true,
-    .vd_system_decorations = true,
 };

 enum sc_orientation
--- a/app/src/options.h
+++ b/app/src/options.h
@ -59,7 +59,6 @@ enum sc_audio_source {
    SC_AUDIO_SOURCE_AUTO, // OUTPUT for video DISPLAY, MIC for video CAMERA
    SC_AUDIO_SOURCE_OUTPUT,
    SC_AUDIO_SOURCE_MIC,
-    SC_AUDIO_SOURCE_PLAYBACK,
 };

 enum sc_camera_facing {
@ -84,12 +83,6 @@ enum sc_orientation {         // v v v
    SC_ORIENTATION_FLIP_270,  // 1 1 1
 };

-enum sc_orientation_lock {
-    SC_ORIENTATION_UNLOCKED,
-    SC_ORIENTATION_LOCKED_VALUE,   // lock to specified orientation
-    SC_ORIENTATION_LOCKED_INITIAL, // lock to initial device orientation
-};
-
 static inline bool
 sc_orientation_is_mirror(enum sc_orientation orientation) {
    assert(!(orientation & ~7));
@ -136,9 +129,18 @@ sc_orientation_get_name(enum sc_orientation orientation) {
    }
 }

+enum sc_lock_video_orientation {
+    SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
+    // lock the current orientation when scrcpy starts
+    SC_LOCK_VIDEO_ORIENTATION_INITIAL = -2,
+    SC_LOCK_VIDEO_ORIENTATION_0 = 0,
+    SC_LOCK_VIDEO_ORIENTATION_90 = 3,
+    SC_LOCK_VIDEO_ORIENTATION_180 = 2,
+    SC_LOCK_VIDEO_ORIENTATION_270 = 1,
+};
+
 enum sc_keyboard_input_mode {
    SC_KEYBOARD_INPUT_MODE_AUTO,
-    SC_KEYBOARD_INPUT_MODE_UHID_OR_AOA, // normal vs otg mode
    SC_KEYBOARD_INPUT_MODE_DISABLED,
    SC_KEYBOARD_INPUT_MODE_SDK,
    SC_KEYBOARD_INPUT_MODE_UHID,
@ -147,20 +149,12 @@ enum sc_keyboard_input_mode {

 enum sc_mouse_input_mode {
    SC_MOUSE_INPUT_MODE_AUTO,
-    SC_MOUSE_INPUT_MODE_UHID_OR_AOA, // normal vs otg mode
    SC_MOUSE_INPUT_MODE_DISABLED,
    SC_MOUSE_INPUT_MODE_SDK,
    SC_MOUSE_INPUT_MODE_UHID,
    SC_MOUSE_INPUT_MODE_AOA,
 };

-enum sc_gamepad_input_mode {
-    SC_GAMEPAD_INPUT_MODE_DISABLED,
-    SC_GAMEPAD_INPUT_MODE_UHID_OR_AOA, // normal vs otg mode
-    SC_GAMEPAD_INPUT_MODE_UHID,
-    SC_GAMEPAD_INPUT_MODE_AOA,
-};
-
 enum sc_mouse_binding {
    SC_MOUSE_BINDING_AUTO,
    SC_MOUSE_BINDING_DISABLED,
@ -171,18 +165,13 @@ enum sc_mouse_binding {
    SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL,
 };

-struct sc_mouse_binding_set {
+struct sc_mouse_bindings {
    enum sc_mouse_binding right_click;
    enum sc_mouse_binding middle_click;
    enum sc_mouse_binding click4;
    enum sc_mouse_binding click5;
 };

-struct sc_mouse_bindings {
-    struct sc_mouse_binding_set pri;
-    struct sc_mouse_binding_set sec; // When Shift is pressed
-};
-
 enum sc_key_inject_mode {
    // Inject special keys, letters and space as key events.
    // Inject numbers and punctuation as text events.
@ -236,7 +225,6 @@ struct scrcpy_options {
    enum sc_record_format record_format;
    enum sc_keyboard_input_mode keyboard_input_mode;
    enum sc_mouse_input_mode mouse_input_mode;
-    enum sc_gamepad_input_mode gamepad_input_mode;
    struct sc_mouse_bindings mouse_bindings;
    enum sc_camera_facing camera_facing;
    struct sc_port_range port_range;
@ -246,10 +234,8 @@ struct scrcpy_options {
    uint16_t max_size;
    uint32_t video_bit_rate;
    uint32_t audio_bit_rate;
-    const char *max_fps; // float to be parsed by the server
-    const char *angle; // float to be parsed by the server
-    enum sc_orientation capture_orientation;
-    enum sc_orientation_lock capture_orientation_lock;
+    uint16_t max_fps;
+    enum sc_lock_video_orientation lock_video_orientation;
    enum sc_orientation display_orientation;
    enum sc_orientation record_orientation;
    int16_t window_x; // SC_WINDOW_POSITION_UNDEFINED for "auto"
@ -257,11 +243,10 @@ struct scrcpy_options {
    uint16_t window_width;
    uint16_t window_height;
    uint32_t display_id;
-    sc_tick video_buffer;
+    sc_tick display_buffer;
    sc_tick audio_buffer;
    sc_tick audio_output_buffer;
    sc_tick time_limit;
-    sc_tick screen_off_timeout;
 #ifdef HAVE_V4L2
    const char *v4l2_device;
    sc_tick v4l2_buffer;
@ -303,15 +288,8 @@ struct scrcpy_options {
 #define SC_OPTION_LIST_DISPLAYS 0x2
 #define SC_OPTION_LIST_CAMERAS 0x4
 #define SC_OPTION_LIST_CAMERA_SIZES 0x8
-#define SC_OPTION_LIST_APPS 0x10
    uint8_t list;
    bool window;
-    bool mouse_hover;
-    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;
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@ -6,17 +6,8 @@
 #include <SDL2/SDL_clipboard.h>

 #include "device_msg.h"
-#include "events.h"
 #include "util/log.h"
 #include "util/str.h"
-#include "util/thread.h"
-
-struct sc_uhid_output_task_data {
-    struct sc_uhid_devices *uhid_devices;
-    uint16_t id;
-    uint16_t size;
-    uint8_t *data;
-};

 bool
 sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
@ -30,7 +21,7 @@ sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
    receiver->acksync = NULL;
    receiver->uhid_devices = NULL;

-    assert(cbs && cbs->on_ended);
+    assert(cbs && cbs->on_error);
    receiver->cbs = cbs;
    receiver->cbs_userdata = cbs_userdata;

@ -42,52 +33,20 @@ sc_receiver_destroy(struct sc_receiver *receiver) {
    sc_mutex_destroy(&receiver->mutex);
 }

-static void
-task_set_clipboard(void *userdata) {
-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
-
-    char *text = userdata;
-
-    char *current = SDL_GetClipboardText();
-    bool same = current && !strcmp(current, text);
-    SDL_free(current);
-    if (same) {
-        LOGD("Computer clipboard unchanged");
-    } else {
-        LOGI("Device clipboard copied");
-        SDL_SetClipboardText(text);
-    }
-
-    free(text);
-}
-
-static void
-task_uhid_output(void *userdata) {
-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
-
-    struct sc_uhid_output_task_data *data = userdata;
-
-    sc_uhid_devices_process_hid_output(data->uhid_devices, data->id, data->data,
-                                       data->size);
-
-    free(data->data);
-    free(data);
-}
-
 static void
 process_msg(struct sc_receiver *receiver, struct sc_device_msg *msg) {
    switch (msg->type) {
        case DEVICE_MSG_TYPE_CLIPBOARD: {
-            // Take ownership of the text (do not destroy the msg)
-            char *text = msg->clipboard.text;
-
-            bool ok = sc_post_to_main_thread(task_set_clipboard, text);
-            if (!ok) {
-                LOGW("Could not post clipboard to main thread");
-                free(text);
+            char *current = SDL_GetClipboardText();
+            bool same = current && !strcmp(current, msg->clipboard.text);
+            SDL_free(current);
+            if (same) {
+                LOGD("Computer clipboard unchanged");
                return;
            }

+            LOGI("Device clipboard copied");
+            SDL_SetClipboardText(msg->clipboard.text);
            break;
        }
        case DEVICE_MSG_TYPE_ACK_CLIPBOARD:
@ -105,7 +64,6 @@ process_msg(struct sc_receiver *receiver, struct sc_device_msg *msg) {
            }

            sc_acksync_ack(receiver->acksync, msg->ack_clipboard.sequence);
-            // No allocation to free in the msg
            break;
        case DEVICE_MSG_TYPE_UHID_OUTPUT:
            if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
@ -121,35 +79,26 @@ process_msg(struct sc_receiver *receiver, struct sc_device_msg *msg) {
                }
            }

+            // This is a programming error to receive this message if there is
+            // no uhid_devices instance
+            assert(receiver->uhid_devices);
+
+            // Also check at runtime (do not trust the server)
            if (!receiver->uhid_devices) {
                LOGE("Received unexpected HID output message");
-                sc_device_msg_destroy(msg);
                return;
            }

-            struct sc_uhid_output_task_data *data = malloc(sizeof(*data));
-            if (!data) {
-                LOG_OOM();
-                return;
+            struct sc_uhid_receiver *uhid_receiver =
+                sc_uhid_devices_get_receiver(receiver->uhid_devices,
+                                             msg->uhid_output.id);
+            if (uhid_receiver) {
+                uhid_receiver->ops->process_output(uhid_receiver,
+                                                   msg->uhid_output.data,
+                                                   msg->uhid_output.size);
+            } else {
+                LOGW("No UHID receiver for id %" PRIu16, msg->uhid_output.id);
            }
-
-            // It is guaranteed that these pointers will still be valid when
-            // the main thread will process them (the main thread will stop
-            // processing SC_EVENT_RUN_ON_MAIN_THREAD on exit, when everything
-            // gets deinitialized)
-            data->uhid_devices = receiver->uhid_devices;
-            data->id = msg->uhid_output.id;
-            data->data = msg->uhid_output.data; // take ownership
-            data->size = msg->uhid_output.size;
-
-            bool ok = sc_post_to_main_thread(task_uhid_output, data);
-            if (!ok) {
-                LOGW("Could not post UHID output to main thread");
-                free(data->data);
-                free(data);
-                return;
-            }
-
            break;
    }
 }
@ -168,7 +117,7 @@ process_msgs(struct sc_receiver *receiver, const uint8_t *buf, size_t len) {
        }

        process_msg(receiver, &msg);
-        // the device msg must be destroyed by process_msg()
+        sc_device_msg_destroy(&msg);

        head += r;
        assert(head <= len);
@ -185,15 +134,12 @@ run_receiver(void *data) {
    static uint8_t buf[DEVICE_MSG_MAX_SIZE];
    size_t head = 0;

-    bool error = false;
-
    for (;;) {
        assert(head < DEVICE_MSG_MAX_SIZE);
        ssize_t r = net_recv(receiver->control_socket, buf + head,
                             DEVICE_MSG_MAX_SIZE - head);
        if (r <= 0) {
            LOGD("Receiver stopped");
-            // device disconnected: keep error=false
            break;
        }

@ -201,7 +147,6 @@ run_receiver(void *data) {
        ssize_t consumed = process_msgs(receiver, buf, head);
        if (consumed == -1) {
            // an error occurred
-            error = true;
            break;
        }

@ -212,7 +157,7 @@ run_receiver(void *data) {
        }
    }

-    receiver->cbs->on_ended(receiver, error, receiver->cbs_userdata);
+    receiver->cbs->on_error(receiver, receiver->cbs_userdata);

    return 0;
 }
--- a/app/src/receiver.h
+++ b/app/src/receiver.h
@ -25,7 +25,7 @@ struct sc_receiver {
 };

 struct sc_receiver_callbacks {
-    void (*on_ended)(struct sc_receiver *receiver, bool error, void *userdata);
+    void (*on_error)(struct sc_receiver *receiver, void *userdata);
 };

 bool
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@ -143,14 +143,8 @@ sc_recorder_open_output_file(struct sc_recorder *recorder) {
        return false;
    }

-    char *file_url = sc_str_concat("file:", recorder->filename);
-    if (!file_url) {
-        avformat_free_context(recorder->ctx);
-        return false;
-    }
-
-    int ret = avio_open(&recorder->ctx->pb, file_url, AVIO_FLAG_WRITE);
-    free(file_url);
+    int ret = avio_open(&recorder->ctx->pb, recorder->filename,
+                        AVIO_FLAG_WRITE);
    if (ret < 0) {
        LOGE("Failed to open output file: %s", recorder->filename);
        avformat_free_context(recorder->ctx);
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@ -25,12 +25,10 @@
 #include "recorder.h"
 #include "screen.h"
 #include "server.h"
-#include "uhid/gamepad_uhid.h"
 #include "uhid/keyboard_uhid.h"
 #include "uhid/mouse_uhid.h"
 #ifdef HAVE_USB
 # include "usb/aoa_hid.h"
-# include "usb/gamepad_aoa.h"
 # include "usb/keyboard_aoa.h"
 # include "usb/mouse_aoa.h"
 # include "usb/usb.h"
@ -53,7 +51,7 @@ struct scrcpy {
    struct sc_decoder video_decoder;
    struct sc_decoder audio_decoder;
    struct sc_recorder recorder;
-    struct sc_delay_buffer video_buffer;
+    struct sc_delay_buffer display_buffer;
 #ifdef HAVE_V4L2
    struct sc_v4l2_sink v4l2_sink;
    struct sc_delay_buffer v4l2_buffer;
@ -65,8 +63,8 @@ struct scrcpy {
    struct sc_aoa aoa;
    // sequence/ack helper to synchronize clipboard and Ctrl+v via HID
    struct sc_acksync acksync;
-#endif
    struct sc_uhid_devices uhid_devices;
+#endif
    union {
        struct sc_keyboard_sdk keyboard_sdk;
        struct sc_keyboard_uhid keyboard_uhid;
@ -79,21 +77,27 @@ struct scrcpy {
        struct sc_mouse_uhid mouse_uhid;
 #ifdef HAVE_USB
        struct sc_mouse_aoa mouse_aoa;
-#endif
-    };
-    union {
-        struct sc_gamepad_uhid gamepad_uhid;
-#ifdef HAVE_USB
-        struct sc_gamepad_aoa gamepad_aoa;
 #endif
    };
    struct sc_timeout timeout;
 };

+static inline void
+push_event(uint32_t type, const char *name) {
+    SDL_Event event;
+    event.type = type;
+    int ret = SDL_PushEvent(&event);
+    if (ret < 0) {
+        LOGE("Could not post %s event: %s", name, SDL_GetError());
+        // What could we do?
+    }
+}
+#define PUSH_EVENT(TYPE) push_event(TYPE, # TYPE)
+
 #ifdef _WIN32
 static BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
    if (ctrl_type == CTRL_C_EVENT) {
-        sc_push_event(SDL_QUIT);
+        PUSH_EVENT(SDL_QUIT);
        return TRUE;
    }
    return FALSE;
@ -136,10 +140,6 @@ sdl_set_hints(const char *render_driver) {
    if (!SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0")) {
        LOGW("Could not disable minimize on focus loss");
    }
-
-    if (!SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1")) {
-        LOGW("Could not allow joystick background events");
-    }
 }

 static void
@ -180,21 +180,12 @@ event_loop(struct scrcpy *s) {
            case SC_EVENT_RECORDER_ERROR:
                LOGE("Recorder error");
                return SCRCPY_EXIT_FAILURE;
-            case SC_EVENT_AOA_OPEN_ERROR:
-                LOGE("AOA open error");
-                return SCRCPY_EXIT_FAILURE;
            case SC_EVENT_TIME_LIMIT_REACHED:
                LOGI("Time limit reached");
                return SCRCPY_EXIT_SUCCESS;
            case SDL_QUIT:
                LOGD("User requested to quit");
                return SCRCPY_EXIT_SUCCESS;
-            case SC_EVENT_RUN_ON_MAIN_THREAD: {
-                sc_runnable_fn run = event.user.data1;
-                void *userdata = event.user.data2;
-                run(userdata);
-                break;
-            }
            default:
                if (!sc_screen_handle_event(&s->screen, &event)) {
                    return SCRCPY_EXIT_FAILURE;
@ -205,21 +196,6 @@ event_loop(struct scrcpy *s) {
    return SCRCPY_EXIT_FAILURE;
 }

-static void
-terminate_event_loop(void) {
-    sc_reject_new_runnables();
-
-    SDL_Event event;
-    while (SDL_PollEvent(&event)) {
-        if (event.type == SC_EVENT_RUN_ON_MAIN_THREAD) {
-            // Make sure all posted runnables are run, to avoid memory leaks
-            sc_runnable_fn run = event.user.data1;
-            void *userdata = event.user.data2;
-            run(userdata);
-        }
-    }
-}
-
 // Return true on success, false on error
 static bool
 await_for_server(bool *connected) {
@ -254,7 +230,7 @@ sc_recorder_on_ended(struct sc_recorder *recorder, bool success,
    (void) userdata;

    if (!success) {
-        sc_push_event(SC_EVENT_RECORDER_ERROR);
+        PUSH_EVENT(SC_EVENT_RECORDER_ERROR);
    }
 }

@ -268,9 +244,9 @@ sc_video_demuxer_on_ended(struct sc_demuxer *demuxer,
    assert(status != SC_DEMUXER_STATUS_DISABLED);

    if (status == SC_DEMUXER_STATUS_EOS) {
-        sc_push_event(SC_EVENT_DEVICE_DISCONNECTED);
+        PUSH_EVENT(SC_EVENT_DEVICE_DISCONNECTED);
    } else {
-        sc_push_event(SC_EVENT_DEMUXER_ERROR);
+        PUSH_EVENT(SC_EVENT_DEMUXER_ERROR);
    }
 }

@ -284,27 +260,22 @@ sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer,
    // Contrary to the video demuxer, keep mirroring if only the audio fails
    // (unless --require-audio is set).
    if (status == SC_DEMUXER_STATUS_EOS) {
-        sc_push_event(SC_EVENT_DEVICE_DISCONNECTED);
+        PUSH_EVENT(SC_EVENT_DEVICE_DISCONNECTED);
    } else if (status == SC_DEMUXER_STATUS_ERROR
            || (status == SC_DEMUXER_STATUS_DISABLED
                && options->require_audio)) {
-        sc_push_event(SC_EVENT_DEMUXER_ERROR);
+        PUSH_EVENT(SC_EVENT_DEMUXER_ERROR);
    }
 }

 static void
-sc_controller_on_ended(struct sc_controller *controller, bool error,
-                       void *userdata) {
+sc_controller_on_error(struct sc_controller *controller, void *userdata) {
    // Note: this function may be called twice, once from the controller thread
    // and once from the receiver thread
    (void) controller;
    (void) userdata;

-    if (error) {
-        sc_push_event(SC_EVENT_CONTROLLER_ERROR);
-    } else {
-        sc_push_event(SC_EVENT_DEVICE_DISCONNECTED);
-    }
+    PUSH_EVENT(SC_EVENT_CONTROLLER_ERROR);
 }

 static void
@ -312,7 +283,7 @@ sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
    (void) server;
    (void) userdata;

-    sc_push_event(SC_EVENT_SERVER_CONNECTION_FAILED);
+    PUSH_EVENT(SC_EVENT_SERVER_CONNECTION_FAILED);
 }

 static void
@ -320,7 +291,7 @@ sc_server_on_connected(struct sc_server *server, void *userdata) {
    (void) server;
    (void) userdata;

-    sc_push_event(SC_EVENT_SERVER_CONNECTED);
+    PUSH_EVENT(SC_EVENT_SERVER_CONNECTED);
 }

 static void
@ -338,7 +309,7 @@ sc_timeout_on_timeout(struct sc_timeout *timeout, void *userdata) {
    (void) timeout;
    (void) userdata;

-    sc_push_event(SC_EVENT_TIME_LIMIT_REACHED);
+    PUSH_EVENT(SC_EVENT_TIME_LIMIT_REACHED);
 }

 // Generate a scrcpy id to differentiate multiple running scrcpy instances
@ -350,21 +321,6 @@ scrcpy_generate_scid(void) {
    return sc_rand_u32(&rand) & 0x7FFFFFFF;
 }

-static void
-init_sdl_gamepads(void) {
-    // Trigger a SDL_CONTROLLERDEVICEADDED event for all gamepads already
-    // connected
-    int num_joysticks = SDL_NumJoysticks();
-    for (int i = 0; i < num_joysticks; ++i) {
-        if (SDL_IsGameController(i)) {
-            SDL_Event event;
-            event.cdevice.type = SDL_CONTROLLERDEVICEADDED;
-            event.cdevice.which = i;
-            SDL_PushEvent(&event);
-        }
-    }
-}
-
 enum scrcpy_exit_code
 scrcpy(struct scrcpy_options *options) {
    static struct scrcpy scrcpy;
@ -397,7 +353,6 @@ scrcpy(struct scrcpy_options *options) {
    bool aoa_hid_initialized = false;
    bool keyboard_aoa_initialized = false;
    bool mouse_aoa_initialized = false;
-    bool gamepad_aoa_initialized = false;
 #endif
    bool controller_initialized = false;
    bool controller_started = false;
@ -406,6 +361,7 @@ scrcpy(struct scrcpy_options *options) {
    bool timeout_started = false;

    struct sc_acksync *acksync = NULL;
+    struct sc_uhid_devices *uhid_devices = NULL;

    uint32_t scid = scrcpy_generate_scid();

@ -428,16 +384,11 @@ scrcpy(struct scrcpy_options *options) {
        .video_bit_rate = options->video_bit_rate,
        .audio_bit_rate = options->audio_bit_rate,
        .max_fps = options->max_fps,
-        .angle = options->angle,
-        .screen_off_timeout = options->screen_off_timeout,
-        .capture_orientation = options->capture_orientation,
-        .capture_orientation_lock = options->capture_orientation_lock,
+        .lock_video_orientation = options->lock_video_orientation,
        .control = options->control,
        .display_id = options->display_id,
-        .new_display = options->new_display,
        .video = options->video,
        .audio = options->audio,
-        .audio_dup = options->audio_dup,
        .show_touches = options->show_touches,
        .stay_awake = options->stay_awake,
        .video_codec_options = options->video_codec_options,
@ -458,8 +409,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,
    };

@ -518,13 +467,6 @@ scrcpy(struct scrcpy_options *options) {
        }
    }

-    if (options->gamepad_input_mode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
-        if (SDL_Init(SDL_INIT_GAMECONTROLLER)) {
-            LOGE("Could not initialize SDL gamepad: %s", SDL_GetError());
-            goto end;
-        }
-    }
-
    sdl_configure(options->video_playback, options->disable_screensaver);

    // Await for server without blocking Ctrl+C handling
@ -622,11 +564,10 @@ scrcpy(struct scrcpy_options *options) {
    struct sc_controller *controller = NULL;
    struct sc_key_processor *kp = NULL;
    struct sc_mouse_processor *mp = NULL;
-    struct sc_gamepad_processor *gp = NULL;

    if (options->control) {
        static const struct sc_controller_callbacks controller_cbs = {
-            .on_ended = sc_controller_on_ended,
+            .on_error = sc_controller_on_error,
        };

        if (!sc_controller_init(&s->controller, s->server.control_socket,
@ -642,9 +583,7 @@ scrcpy(struct scrcpy_options *options) {
            options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
        bool use_mouse_aoa =
            options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;
-        bool use_gamepad_aoa =
-            options->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_AOA;
-        if (use_keyboard_aoa || use_mouse_aoa || use_gamepad_aoa) {
+        if (use_keyboard_aoa || use_mouse_aoa) {
            bool ok = sc_acksync_init(&s->acksync);
            if (!ok) {
                goto end;
@ -687,15 +626,12 @@ scrcpy(struct scrcpy_options *options) {
                goto end;
            }

-            bool aoa_fail = false;
            if (use_keyboard_aoa) {
                if (sc_keyboard_aoa_init(&s->keyboard_aoa, &s->aoa)) {
                    keyboard_aoa_initialized = true;
                    kp = &s->keyboard_aoa.key_processor;
                } else {
                    LOGE("Could not initialize HID keyboard");
-                    aoa_fail = true;
-                    goto aoa_complete;
                }
            }

@ -705,19 +641,12 @@ scrcpy(struct scrcpy_options *options) {
                    mp = &s->mouse_aoa.mouse_processor;
                } else {
                    LOGE("Could not initialized HID mouse");
-                    aoa_fail = true;
-                    goto aoa_complete;
                }
            }

-            if (use_gamepad_aoa) {
-                sc_gamepad_aoa_init(&s->gamepad_aoa, &s->aoa);
-                gp = &s->gamepad_aoa.gamepad_processor;
-                gamepad_aoa_initialized = true;
-            }
+            bool need_aoa = keyboard_aoa_initialized || mouse_aoa_initialized;

-aoa_complete:
-            if (aoa_fail || !sc_aoa_start(&s->aoa)) {
+            if (!need_aoa || !sc_aoa_start(&s->aoa)) {
                sc_acksync_destroy(&s->acksync);
                sc_usb_disconnect(&s->usb);
                sc_usb_destroy(&s->usb);
@ -734,8 +663,6 @@ aoa_complete:
        assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_AOA);
 #endif

-        struct sc_keyboard_uhid *uhid_keyboard = NULL;
-
        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_SDK) {
            sc_keyboard_sdk_init(&s->keyboard_sdk, &s->controller,
                                 options->key_inject_mode,
@ -743,17 +670,18 @@ aoa_complete:
            kp = &s->keyboard_sdk.key_processor;
        } else if (options->keyboard_input_mode
                == SC_KEYBOARD_INPUT_MODE_UHID) {
-            bool ok = sc_keyboard_uhid_init(&s->keyboard_uhid, &s->controller);
+            sc_uhid_devices_init(&s->uhid_devices);
+            bool ok = sc_keyboard_uhid_init(&s->keyboard_uhid, &s->controller,
+                                            &s->uhid_devices);
            if (!ok) {
                goto end;
            }
+            uhid_devices = &s->uhid_devices;
            kp = &s->keyboard_uhid.key_processor;
-            uhid_keyboard = &s->keyboard_uhid;
        }

        if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK) {
-            sc_mouse_sdk_init(&s->mouse_sdk, &s->controller,
-                              options->mouse_hover);
+            sc_mouse_sdk_init(&s->mouse_sdk, &s->controller);
            mp = &s->mouse_sdk.mouse_processor;
        } else if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_UHID) {
            bool ok = sc_mouse_uhid_init(&s->mouse_uhid, &s->controller);
@ -763,17 +691,6 @@ aoa_complete:
            mp = &s->mouse_uhid.mouse_processor;
        }

-        if (options->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_UHID) {
-            sc_gamepad_uhid_init(&s->gamepad_uhid, &s->controller);
-            gp = &s->gamepad_uhid.gamepad_processor;
-        }
-
-        struct sc_uhid_devices *uhid_devices = NULL;
-        if (uhid_keyboard) {
-            sc_uhid_devices_init(&s->uhid_devices, uhid_keyboard);
-            uhid_devices = &s->uhid_devices;
-        }
-
        sc_controller_configure(&s->controller, acksync, uhid_devices);

        if (!sc_controller_start(&s->controller)) {
@ -795,7 +712,6 @@ aoa_complete:
            .fp = fp,
            .kp = kp,
            .mp = mp,
-            .gp = gp,
            .mouse_bindings = options->mouse_bindings,
            .legacy_paste = options->legacy_paste,
            .clipboard_autosync = options->clipboard_autosync,
@ -813,20 +729,23 @@ aoa_complete:
            .start_fps_counter = options->start_fps_counter,
        };

+        struct sc_frame_source *src;
+        if (options->video_playback) {
+            src = &s->video_decoder.frame_source;
+            if (options->display_buffer) {
+                sc_delay_buffer_init(&s->display_buffer,
+                                     options->display_buffer, true);
+                sc_frame_source_add_sink(src, &s->display_buffer.frame_sink);
+                src = &s->display_buffer.frame_source;
+            }
+        }
+
        if (!sc_screen_init(&s->screen, &screen_params)) {
            goto end;
        }
        screen_initialized = true;

        if (options->video_playback) {
-            struct sc_frame_source *src = &s->video_decoder.frame_source;
-            if (options->video_buffer) {
-                sc_delay_buffer_init(&s->video_buffer,
-                                     options->video_buffer, true);
-                sc_frame_source_add_sink(src, &s->video_buffer.frame_sink);
-                src = &s->video_buffer.frame_source;
-            }
-
            sc_frame_source_add_sink(src, &s->screen.frame_sink);
        }
    }
@ -878,11 +797,11 @@ aoa_complete:
    // everything is set up
    if (options->control && options->turn_screen_off) {
        struct sc_control_msg msg;
-        msg.type = SC_CONTROL_MSG_TYPE_SET_DISPLAY_POWER;
-        msg.set_display_power.on = false;
+        msg.type = SC_CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
+        msg.set_screen_power_mode.mode = SC_SCREEN_POWER_MODE_OFF;

        if (!sc_controller_push_msg(&s->controller, &msg)) {
-            LOGW("Could not request 'set display power'");
+            LOGW("Could not request 'set screen power mode'");
        }
    }

@ -907,32 +826,7 @@ aoa_complete:
        timeout_started = true;
    }

-    if (options->control
-            && options->gamepad_input_mode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
-        init_sdl_gamepads();
-    }
-
-    if (options->control && options->start_app) {
-        assert(controller);
-
-        char *name = strdup(options->start_app);
-        if (!name) {
-            LOG_OOM();
-            goto end;
-        }
-
-        struct sc_control_msg msg;
-        msg.type = SC_CONTROL_MSG_TYPE_START_APP;
-        msg.start_app.name = name;
-
-        if (!sc_controller_push_msg(controller, &msg)) {
-            LOGW("Could not request start app '%s'", name);
-            free(name);
-        }
-    }
-
    ret = event_loop(s);
-    terminate_event_loop();
    LOGD("quit...");

    if (options->video_playback) {
@ -957,9 +851,6 @@ end:
        if (mouse_aoa_initialized) {
            sc_mouse_aoa_destroy(&s->mouse_aoa);
        }
-        if (gamepad_aoa_initialized) {
-            sc_gamepad_aoa_destroy(&s->gamepad_aoa);
-        }
        sc_aoa_stop(&s->aoa);
        sc_usb_stop(&s->usb);
    }
--- a/app/src/screen.c
+++ b/app/src/screen.c
@ -162,6 +162,47 @@ sc_screen_is_relative_mode(struct sc_screen *screen) {
    return screen->im.mp && screen->im.mp->relative_mode;
 }

+static void
+sc_screen_set_mouse_capture(struct sc_screen *screen, bool capture) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(screen->window, &x, &y);
+        SDL_GetWindowSize(screen->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(screen->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) screen;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
+        LOGE("Could not set relative mouse mode to %s: %s",
+             capture ? "true" : "false", SDL_GetError());
+    }
+}
+
+static inline bool
+sc_screen_get_mouse_capture(struct sc_screen *screen) {
+    (void) screen;
+    return SDL_GetRelativeMouseMode();
+}
+
+static inline void
+sc_screen_toggle_mouse_capture(struct sc_screen *screen) {
+    (void) screen;
+    bool new_value = !sc_screen_get_mouse_capture(screen);
+    sc_screen_set_mouse_capture(screen, new_value);
+}
+
 static void
 sc_screen_update_content_rect(struct sc_screen *screen) {
    assert(screen->video);
@ -258,12 +299,6 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink,

    struct sc_screen *screen = DOWNCAST(sink);

-    if (ctx->width <= 0 || ctx->width > 0xFFFF
-            || ctx->height <= 0 || ctx->height > 0xFFFF) {
-        LOGE("Invalid video size: %dx%d", ctx->width, ctx->height);
-        return false;
-    }
-
    assert(ctx->width > 0 && ctx->width <= 0xFFFF);
    assert(ctx->height > 0 && ctx->height <= 0xFFFF);
    // screen->frame_size is never used before the event is pushed, and the
@ -271,9 +306,14 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink,
    screen->frame_size.width = ctx->width;
    screen->frame_size.height = ctx->height;

+    static SDL_Event event = {
+        .type = SC_EVENT_SCREEN_INIT_SIZE,
+    };
+
    // Post the event on the UI thread (the texture must be created from there)
-    bool ok = sc_push_event(SC_EVENT_SCREEN_INIT_SIZE);
-    if (!ok) {
+    int ret = SDL_PushEvent(&event);
+    if (ret < 0) {
+        LOGW("Could not post init size event: %s", SDL_GetError());
        return false;
    }

@ -312,9 +352,14 @@ sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
        // The SC_EVENT_NEW_FRAME triggered for the previous frame will consume
        // this new frame instead
    } else {
+        static SDL_Event new_frame_event = {
+            .type = SC_EVENT_NEW_FRAME,
+        };
+
        // Post the event on the UI thread
-        bool ok = sc_push_event(SC_EVENT_NEW_FRAME);
-        if (!ok) {
+        int ret = SDL_PushEvent(&new_frame_event);
+        if (ret < 0) {
+            LOGW("Could not post new frame event: %s", SDL_GetError());
            return false;
        }
    }
@ -330,6 +375,7 @@ sc_screen_init(struct sc_screen *screen,
    screen->fullscreen = false;
    screen->maximized = false;
    screen->minimized = false;
+    screen->mouse_capture_key_pressed = 0;
    screen->paused = false;
    screen->resume_frame = NULL;
    screen->orientation = SC_ORIENTATION_0;
@ -435,7 +481,6 @@ sc_screen_init(struct sc_screen *screen,
        .screen = screen,
        .kp = params->kp,
        .mp = params->mp,
-        .gp = params->gp,
        .mouse_bindings = params->mouse_bindings,
        .legacy_paste = params->legacy_paste,
        .clipboard_autosync = params->clipboard_autosync,
@ -444,9 +489,6 @@ sc_screen_init(struct sc_screen *screen,

    sc_input_manager_init(&screen->im, &im_params);

-    // Initialize even if not used for simplicity
-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
 #ifdef CONTINUOUS_RESIZING_WORKAROUND
    if (screen->video) {
        SDL_AddEventWatch(event_watcher, screen);
@ -467,7 +509,7 @@ sc_screen_init(struct sc_screen *screen,

    if (!screen->video && sc_screen_is_relative_mode(screen)) {
        // Capture mouse immediately if video mirroring is disabled
-        sc_mouse_capture_set_active(&screen->mc, true);
+        sc_screen_set_mouse_capture(screen, true);
    }

    return true;
@ -499,7 +541,7 @@ sc_screen_show_initial_window(struct sc_screen *screen) {
    SDL_SetWindowPosition(screen->window, x, y);

    if (screen->req.fullscreen) {
-        sc_screen_toggle_fullscreen(screen);
+        sc_screen_switch_fullscreen(screen);
    }

    if (screen->req.start_fps_counter) {
@ -674,7 +716,7 @@ sc_screen_apply_frame(struct sc_screen *screen) {

        if (sc_screen_is_relative_mode(screen)) {
            // Capture mouse on start
-            sc_mouse_capture_set_active(&screen->mc, true);
+            sc_screen_set_mouse_capture(screen, true);
        }
    }

@ -735,7 +777,7 @@ sc_screen_set_paused(struct sc_screen *screen, bool paused) {
 }

 void
-sc_screen_toggle_fullscreen(struct sc_screen *screen) {
+sc_screen_switch_fullscreen(struct sc_screen *screen) {
    assert(screen->video);

    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
@ -798,8 +840,15 @@ sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
                                            content_size.height);
 }

+static inline bool
+sc_screen_is_mouse_capture_key(SDL_Keycode key) {
+    return key == SDLK_LALT || key == SDLK_LGUI || key == SDLK_RGUI;
+}
+
 bool
 sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
+    bool relative_mode = sc_screen_is_relative_mode(screen);
+
    switch (event->type) {
        case SC_EVENT_SCREEN_INIT_SIZE: {
            // The initial size is passed via screen->frame_size
@ -857,15 +906,70 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
                    apply_pending_resize(screen);
                    sc_screen_render(screen, true);
                    break;
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    if (relative_mode) {
+                        sc_screen_set_mouse_capture(screen, false);
+                    }
+                    break;
            }
            return true;
+        case SDL_KEYDOWN:
+            if (relative_mode) {
+                SDL_Keycode key = event->key.keysym.sym;
+                if (sc_screen_is_mouse_capture_key(key)) {
+                    if (!screen->mouse_capture_key_pressed) {
+                        screen->mouse_capture_key_pressed = key;
+                    } else {
+                        // Another mouse capture key has been pressed, cancel
+                        // mouse (un)capture
+                        screen->mouse_capture_key_pressed = 0;
                    }
-
-    if (sc_screen_is_relative_mode(screen)
-            && sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
+                    // Mouse capture keys are never forwarded to the device
                    return true;
                }
+            }
+            break;
+        case SDL_KEYUP:
+            if (relative_mode) {
+                SDL_Keycode key = event->key.keysym.sym;
+                SDL_Keycode cap = screen->mouse_capture_key_pressed;
+                screen->mouse_capture_key_pressed = 0;
+                if (sc_screen_is_mouse_capture_key(key)) {
+                    if (key == cap) {
+                        // A mouse capture key has been pressed then released:
+                        // toggle the capture mouse mode
+                        sc_screen_toggle_mouse_capture(screen);
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return true;
+                }
+            }
+            break;
+        case SDL_MOUSEWHEEL:
+        case SDL_MOUSEMOTION:
+        case SDL_MOUSEBUTTONDOWN:
+            if (relative_mode && !sc_screen_get_mouse_capture(screen)) {
+                // Do not forward to input manager, the mouse will be captured
+                // on SDL_MOUSEBUTTONUP
+                return true;
+            }
+            break;
+        case SDL_FINGERMOTION:
+        case SDL_FINGERDOWN:
+        case SDL_FINGERUP:
+            if (relative_mode) {
+                // Touch events are not compatible with relative mode
+                // (coordinates are not relative)
+                return true;
+            }
+            break;
+        case SDL_MOUSEBUTTONUP:
+            if (relative_mode && !sc_screen_get_mouse_capture(screen)) {
+                sc_screen_set_mouse_capture(screen, true);
+                return true;
+            }
+            break;
+    }

    sc_input_manager_handle_event(&screen->im, event);
    return true;
--- a/app/src/screen.h
+++ b/app/src/screen.h
@ -13,7 +13,6 @@
 #include "fps_counter.h"
 #include "frame_buffer.h"
 #include "input_manager.h"
-#include "mouse_capture.h"
 #include "opengl.h"
 #include "options.h"
 #include "trait/key_processor.h"
@ -31,7 +30,6 @@ struct sc_screen {

    struct sc_display display;
    struct sc_input_manager im;
-    struct sc_mouse_capture mc; // only used in mouse relative mode
    struct sc_frame_buffer fb;
    struct sc_fps_counter fps_counter;

@ -63,6 +61,10 @@ struct sc_screen {
    bool maximized;
    bool minimized;

+    // To enable/disable mouse capture, a mouse capture key (LALT, LGUI or
+    // RGUI) must be pressed. This variable tracks the pressed capture key.
+    SDL_Keycode mouse_capture_key_pressed;
+
    AVFrame *frame;

    bool paused;
@ -76,7 +78,6 @@ struct sc_screen_params {
    struct sc_file_pusher *fp;
    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;
-    struct sc_gamepad_processor *gp;

    struct sc_mouse_bindings mouse_bindings;
    bool legacy_paste;
@ -124,9 +125,9 @@ sc_screen_destroy(struct sc_screen *screen);
 void
 sc_screen_hide_window(struct sc_screen *screen);

-// toggle the fullscreen mode
+// switch the fullscreen mode
 void
-sc_screen_toggle_fullscreen(struct sc_screen *screen);
+sc_screen_switch_fullscreen(struct sc_screen *screen);

 // resize window to optimal size (remove black borders)
 void
--- a/app/src/server.c
+++ b/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");
@ -54,6 +66,56 @@ get_server_path(void) {
    return server_path;
 }

+static void
+sc_server_params_destroy(struct sc_server_params *params) {
+    // The server stores a copy of the params provided by the user
+    free((char *) params->req_serial);
+    free((char *) params->crop);
+    free((char *) params->video_codec_options);
+    free((char *) params->audio_codec_options);
+    free((char *) params->video_encoder);
+    free((char *) params->audio_encoder);
+    free((char *) params->tcpip_dst);
+    free((char *) params->camera_id);
+    free((char *) params->camera_ar);
+}
+
+static bool
+sc_server_params_copy(struct sc_server_params *dst,
+                      const struct sc_server_params *src) {
+    *dst = *src;
+
+    // The params reference user-allocated memory, so we must copy them to
+    // handle them from another thread
+
+#define COPY(FIELD) do { \
+    dst->FIELD = NULL; \
+    if (src->FIELD) { \
+        dst->FIELD = strdup(src->FIELD); \
+        if (!dst->FIELD) { \
+            goto error; \
+        } \
+    } \
+} while(0)
+
+    COPY(req_serial);
+    COPY(crop);
+    COPY(video_codec_options);
+    COPY(audio_codec_options);
+    COPY(video_encoder);
+    COPY(audio_encoder);
+    COPY(tcpip_dst);
+    COPY(camera_id);
+    COPY(camera_ar);
+#undef COPY
+
+    return true;
+
+error:
+    sc_server_params_destroy(dst);
+    return false;
+}
+
 static bool
 push_server(struct sc_intr *intr, const char *serial) {
    char *server_path = get_server_path();
@ -85,7 +147,7 @@ log_level_to_server_string(enum sc_log_level level) {
            return "error";
        default:
            assert(!"unexpected log level");
-            return NULL;
+            return "(unknown)";
    }
 }

@ -121,7 +183,6 @@ sc_server_get_codec_name(enum sc_codec codec) {
        case SC_CODEC_RAW:
            return "raw";
        default:
-            assert(!"unexpected codec");
            return NULL;
    }
 }
@ -136,41 +197,10 @@ sc_server_get_camera_facing_name(enum sc_camera_facing camera_facing) {
        case SC_CAMERA_FACING_EXTERNAL:
            return "external";
        default:
-            assert(!"unexpected camera facing");
            return NULL;
    }
 }

-static const char *
-sc_server_get_audio_source_name(enum sc_audio_source audio_source) {
-    switch (audio_source) {
-        case SC_AUDIO_SOURCE_OUTPUT:
-            return "output";
-        case SC_AUDIO_SOURCE_MIC:
-            return "mic";
-        case SC_AUDIO_SOURCE_PLAYBACK:
-            return "playback";
-        default:
-            assert(!"unexpected audio source");
-            return NULL;
-    }
-}
-
-static bool
-validate_string(const char *s) {
-    // The parameters values are passed as command line arguments to adb, so
-    // they must either be properly escaped, or they must not contain any
-    // special shell characters.
-    // Since they are not properly escaped on Windows anyway (see
-    // sys/win/process.c), just forbid special shell characters.
-    if (strpbrk(s, " ;'\"*$?&`#\\|<>[]{}()!~\r\n")) {
-        LOGE("Invalid server param: [%s]", s);
-        return false;
-    }
-
-    return true;
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
               const struct sc_server_params *params) {
@ -189,31 +219,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="
+    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;
-    } 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;
 #endif
-
    cmd[count++] = "/"; // unused
    cmd[count++] = "com.genymobile.scrcpy.Server";
    cmd[count++] = SCRCPY_VERSION;
@ -226,11 +243,6 @@ execute_server(struct sc_server *server,
        } \
        cmd[count++] = p; \
    } while(0)
-#define VALIDATE_STRING(s) do { \
-        if (!validate_string(s)) { \
-            goto end; \
-        } \
-    } while(0)

    ADD_PARAM("scid=%08x", params->scid);
    ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
@ -259,43 +271,23 @@ execute_server(struct sc_server *server,
        assert(params->video_source == SC_VIDEO_SOURCE_CAMERA);
        ADD_PARAM("video_source=camera");
    }
-    // If audio is enabled, an "auto" audio source must have been resolved
-    assert(params->audio_source != SC_AUDIO_SOURCE_AUTO || !params->audio);
-    if (params->audio_source != SC_AUDIO_SOURCE_OUTPUT && params->audio) {
-        ADD_PARAM("audio_source=%s",
-                  sc_server_get_audio_source_name(params->audio_source));
-    }
-    if (params->audio_dup) {
-        ADD_PARAM("audio_dup=true");
+    if (params->audio_source == SC_AUDIO_SOURCE_MIC) {
+        ADD_PARAM("audio_source=mic");
    }
    if (params->max_size) {
        ADD_PARAM("max_size=%" PRIu16, params->max_size);
    }
    if (params->max_fps) {
-        VALIDATE_STRING(params->max_fps);
-        ADD_PARAM("max_fps=%s", params->max_fps);
-    }
-    if (params->angle) {
-        VALIDATE_STRING(params->angle);
-        ADD_PARAM("angle=%s", params->angle);
-    }
-    if (params->capture_orientation_lock != SC_ORIENTATION_UNLOCKED
-            || params->capture_orientation != SC_ORIENTATION_0) {
-        if (params->capture_orientation_lock == SC_ORIENTATION_LOCKED_INITIAL) {
-            ADD_PARAM("capture_orientation=@");
-        } else {
-            const char *orient =
-                sc_orientation_get_name(params->capture_orientation);
-            bool locked =
-                params->capture_orientation_lock != SC_ORIENTATION_UNLOCKED;
-            ADD_PARAM("capture_orientation=%s%s", locked ? "@" : "", orient);
+        ADD_PARAM("max_fps=%" PRIu16, params->max_fps);
    }
+    if (params->lock_video_orientation != SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
+        ADD_PARAM("lock_video_orientation=%" PRIi8,
+                  params->lock_video_orientation);
    }
    if (server->tunnel.forward) {
        ADD_PARAM("tunnel_forward=true");
    }
    if (params->crop) {
-        VALIDATE_STRING(params->crop);
        ADD_PARAM("crop=%s", params->crop);
    }
    if (!params->control) {
@ -306,11 +298,9 @@ execute_server(struct sc_server *server,
        ADD_PARAM("display_id=%" PRIu32, params->display_id);
    }
    if (params->camera_id) {
-        VALIDATE_STRING(params->camera_id);
        ADD_PARAM("camera_id=%s", params->camera_id);
    }
    if (params->camera_size) {
-        VALIDATE_STRING(params->camera_size);
        ADD_PARAM("camera_size=%s", params->camera_size);
    }
    if (params->camera_facing != SC_CAMERA_FACING_ANY) {
@ -318,7 +308,6 @@ execute_server(struct sc_server *server,
            sc_server_get_camera_facing_name(params->camera_facing));
    }
    if (params->camera_ar) {
-        VALIDATE_STRING(params->camera_ar);
        ADD_PARAM("camera_ar=%s", params->camera_ar);
    }
    if (params->camera_fps) {
@ -333,25 +322,16 @@ execute_server(struct sc_server *server,
    if (params->stay_awake) {
        ADD_PARAM("stay_awake=true");
    }
-    if (params->screen_off_timeout != -1) {
-        assert(params->screen_off_timeout >= 0);
-        uint64_t ms = SC_TICK_TO_MS(params->screen_off_timeout);
-        ADD_PARAM("screen_off_timeout=%" PRIu64, ms);
-    }
    if (params->video_codec_options) {
-        VALIDATE_STRING(params->video_codec_options);
        ADD_PARAM("video_codec_options=%s", params->video_codec_options);
    }
    if (params->audio_codec_options) {
-        VALIDATE_STRING(params->audio_codec_options);
        ADD_PARAM("audio_codec_options=%s", params->audio_codec_options);
    }
    if (params->video_encoder) {
-        VALIDATE_STRING(params->video_encoder);
        ADD_PARAM("video_encoder=%s", params->video_encoder);
    }
    if (params->audio_encoder) {
-        VALIDATE_STRING(params->audio_encoder);
        ADD_PARAM("audio_encoder=%s", params->audio_encoder);
    }
    if (params->power_off_on_close) {
@ -373,16 +353,6 @@ execute_server(struct sc_server *server,
        // By default, power_on is true
        ADD_PARAM("power_on=false");
    }
-    if (params->new_display) {
-        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");
    }
@ -395,23 +365,16 @@ execute_server(struct sc_server *server,
    if (params->list & SC_OPTION_LIST_CAMERA_SIZES) {
        ADD_PARAM("list_camera_sizes=true");
    }
-    if (params->list & SC_OPTION_LIST_APPS) {
-        ADD_PARAM("list_apps=true");
-    }

 #undef ADD_PARAM

    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
@ -484,25 +447,22 @@ connect_to_server(struct sc_server *server, unsigned attempts, sc_tick delay,
 bool
 sc_server_init(struct sc_server *server, const struct sc_server_params *params,
              const struct sc_server_callbacks *cbs, void *cbs_userdata) {
-    // The allocated data in params (const char *) must remain valid until the
-    // end of the program
-    server->params = *params;
-
-    bool ok = sc_adb_init();
+    bool ok = sc_server_params_copy(&server->params, params);
    if (!ok) {
+        LOG_OOM();
        return false;
    }

    ok = sc_mutex_init(&server->mutex);
    if (!ok) {
-        sc_adb_destroy();
+        sc_server_params_destroy(&server->params);
        return false;
    }

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

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

@ -647,14 +607,6 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
        }
    }

-    if (control_socket != SC_SOCKET_NONE) {
-        // Disable Nagle's algorithm for the control socket
-        // (it only impacts the sending side, so it is useless to set it
-        // for the other sockets)
-        bool ok = net_set_tcp_nodelay(control_socket, true);
-        (void) ok; // error already logged
-    }
-
    // we don't need the adb tunnel anymore
    sc_adb_tunnel_close(tunnel, &server->intr, serial,
                        server->device_socket_name);
@ -832,14 +784,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);
-    }

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

@ -855,7 +804,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 +815,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 +840,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 +927,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;
        }
@ -1158,9 +1101,8 @@ sc_server_destroy(struct sc_server *server) {

    free(server->serial);
    free(server->device_socket_name);
+    sc_server_params_destroy(&server->params);
    sc_intr_destroy(&server->intr);
    sc_cond_destroy(&server->cond_stopped);
    sc_mutex_destroy(&server->mutex);
-
-    sc_adb_destroy();
 }
--- a/app/src/server.h
+++ b/app/src/server.h
@ -44,17 +44,12 @@ struct sc_server_params {
    uint16_t max_size;
    uint32_t video_bit_rate;
    uint32_t audio_bit_rate;
-    const char *max_fps; // float to be parsed by the server
-    const char *angle; // float to be parsed by the server
-    sc_tick screen_off_timeout;
-    enum sc_orientation capture_orientation;
-    enum sc_orientation_lock capture_orientation_lock;
+    uint16_t max_fps;
+    int8_t lock_video_orientation;
    bool control;
    uint32_t display_id;
-    const char *new_display;
    bool video;
    bool audio;
-    bool audio_dup;
    bool show_touches;
    bool stay_awake;
    bool force_adb_forward;
@ -69,8 +64,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;
 };

--- a/app/src/shortcut_mod.h
+++ b/app/src/shortcut_mod.h
@ -1,60 +0,0 @@
-#ifndef SC_SHORTCUT_MOD_H
-#define SC_SHORTCUT_MOD_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <SDL2/SDL_keycode.h>
-
-#include "options.h"
-
-#define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)
-
-// input: OR of enum sc_shortcut_mod
-// output: OR of SDL_Keymod
-static inline uint16_t
-sc_shortcut_mods_to_sdl(uint8_t shortcut_mods) {
-    uint16_t sdl_mod = 0;
-    if (shortcut_mods & SC_SHORTCUT_MOD_LCTRL) {
-        sdl_mod |= KMOD_LCTRL;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RCTRL) {
-        sdl_mod |= KMOD_RCTRL;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_LALT) {
-        sdl_mod |= KMOD_LALT;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RALT) {
-        sdl_mod |= KMOD_RALT;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_LSUPER) {
-        sdl_mod |= KMOD_LGUI;
-    }
-    if (shortcut_mods & SC_SHORTCUT_MOD_RSUPER) {
-        sdl_mod |= KMOD_RGUI;
-    }
-    return sdl_mod;
-}
-
-static inline bool
-sc_shortcut_mods_is_shortcut_mod(uint16_t sdl_shortcut_mods, uint16_t sdl_mod) {
-    // sdl_shortcut_mods must be within the mask
-    assert(!(sdl_shortcut_mods & ~SC_SDL_SHORTCUT_MODS_MASK));
-
-    // at least one shortcut mod pressed?
-    return sdl_mod & sdl_shortcut_mods;
-}
-
-static inline bool
-sc_shortcut_mods_is_shortcut_key(uint16_t sdl_shortcut_mods,
-                                 SDL_Keycode keycode) {
-    return (sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
-        || (sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
-        || (sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
-        || (sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
-        || (sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
-        || (sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
-}
-
-#endif
--- a/app/src/sys/unix/file.c
+++ b/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");
+    // 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;
-    }
-    return strdup(path);
 #endif
 }

--- a/app/src/trait/gamepad_processor.h
+++ b/app/src/trait/gamepad_processor.h
@ -1,59 +0,0 @@
-#ifndef SC_GAMEPAD_PROCESSOR_H
-#define SC_GAMEPAD_PROCESSOR_H
-
-#include "common.h"
-
-#include <assert.h>
-#include <stdbool.h>
-
-#include "input_events.h"
-
-/**
- * Gamepad processor trait.
- *
- * Component able to handle gamepads devices and inject buttons and axis events.
- */
-struct sc_gamepad_processor {
-    const struct sc_gamepad_processor_ops *ops;
-};
-
-struct sc_gamepad_processor_ops {
-
-    /**
-     * Process a gamepad device added event
-     *
-     * 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 a gamepad axis event
-     *
-     * This function is mandatory.
-     */
-    void
-    (*process_gamepad_axis)(struct sc_gamepad_processor *gp,
-                            const struct sc_gamepad_axis_event *event);
-
-    /**
-     * Process a gamepad button event
-     *
-     * This function is mandatory.
-     */
-    void
-    (*process_gamepad_button)(struct sc_gamepad_processor *gp,
-                              const struct sc_gamepad_button_event *event);
-};
-
-#endif
--- a/app/src/uhid/gamepad_uhid.c
+++ b/app/src/uhid/gamepad_uhid.c
@ -1,141 +0,0 @@
-#include "gamepad_uhid.h"
-
-#include "hid/hid_gamepad.h"
-#include "input_events.h"
-#include "util/log.h"
-
-/** 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,
-                           const char *name) {
-    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_UHID_INPUT;
-    msg.uhid_input.id = hid_input->hid_id;
-
-    assert(hid_input->size <= SC_HID_MAX_SIZE);
-    memcpy(msg.uhid_input.data, hid_input->data, hid_input->size);
-    msg.uhid_input.size = hid_input->size;
-
-    if (!sc_controller_push_msg(gamepad->controller, &msg)) {
-        LOGE("Could not push UHID_INPUT message (%s)", name);
-    }
-}
-
-static void
-sc_gamepad_uhid_send_open(struct sc_gamepad_uhid *gamepad,
-                          const struct sc_hid_open *hid_open) {
-    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.report_desc = hid_open->report_desc;
-    msg.uhid_create.report_desc_size = hid_open->report_desc_size;
-
-    if (!sc_controller_push_msg(gamepad->controller, &msg)) {
-        LOGE("Could not push UHID_CREATE message (gamepad)");
-    }
-}
-
-static void
-sc_gamepad_uhid_send_close(struct sc_gamepad_uhid *gamepad,
-                           const struct sc_hid_close *hid_close) {
-    struct sc_control_msg msg;
-    msg.type = SC_CONTROL_MSG_TYPE_UHID_DESTROY;
-    msg.uhid_create.id = hid_close->hid_id;
-
-    if (!sc_controller_push_msg(gamepad->controller, &msg)) {
-        LOGE("Could not push UHID_DESTROY message (gamepad)");
-    }
-}
-
-static void
-sc_gamepad_processor_process_gamepad_added(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_device_event *event) {
-    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_open hid_open;
-    if (!sc_hid_gamepad_generate_open(&gamepad->hid, &hid_open,
-                                      event->gamepad_id)) {
-        return;
-    }
-
-    SDL_GameController* game_controller =
-        SDL_GameControllerFromInstanceID(event->gamepad_id);
-    assert(game_controller);
-    const char *name = SDL_GameControllerName(game_controller);
-    LOGI("Gamepad added: [%" PRIu32 "] %s", event->gamepad_id, name);
-
-    sc_gamepad_uhid_send_open(gamepad, &hid_open);
-}
-
-static void
-sc_gamepad_processor_process_gamepad_removed(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_device_event *event) {
-    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_close hid_close;
-    if (!sc_hid_gamepad_generate_close(&gamepad->hid, &hid_close,
-                                       event->gamepad_id)) {
-        return;
-    }
-
-    LOGI("Gamepad removed: [%" PRIu32 "]", event->gamepad_id);
-
-    sc_gamepad_uhid_send_close(gamepad, &hid_close);
-}
-
-static void
-sc_gamepad_processor_process_gamepad_axis(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_axis_event *event) {
-    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_input hid_input;
-    if (!sc_hid_gamepad_generate_input_from_axis(&gamepad->hid, &hid_input,
-                                                 event)) {
-        return;
-    }
-
-    sc_gamepad_uhid_send_input(gamepad, &hid_input, "gamepad axis");
-}
-
-static void
-sc_gamepad_processor_process_gamepad_button(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_button_event *event) {
-    struct sc_gamepad_uhid *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_input hid_input;
-    if (!sc_hid_gamepad_generate_input_from_button(&gamepad->hid, &hid_input,
-                                                   event)) {
-        return;
-    }
-
-    sc_gamepad_uhid_send_input(gamepad, &hid_input, "gamepad button");
-
-}
-
-void
-sc_gamepad_uhid_init(struct sc_gamepad_uhid *gamepad,
-                     struct sc_controller *controller) {
-    sc_hid_gamepad_init(&gamepad->hid);
-
-    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_axis = sc_gamepad_processor_process_gamepad_axis,
-        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
-    };
-
-    gamepad->gamepad_processor.ops = &ops;
-}
--- a/app/src/uhid/gamepad_uhid.h
+++ b/app/src/uhid/gamepad_uhid.h
@ -1,23 +0,0 @@
-#ifndef SC_GAMEPAD_UHID_H
-#define SC_GAMEPAD_UHID_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include "controller.h"
-#include "hid/hid_gamepad.h"
-#include "trait/gamepad_processor.h"
-
-struct sc_gamepad_uhid {
-    struct sc_gamepad_processor gamepad_processor; // gamepad processor trait
-
-    struct sc_hid_gamepad hid;
-    struct sc_controller *controller;
-};
-
-void
-sc_gamepad_uhid_init(struct sc_gamepad_uhid *mouse,
-                     struct sc_controller *controller);
-
-#endif
--- a/app/src/uhid/keyboard_uhid.c
+++ b/app/src/uhid/keyboard_uhid.c
@ -9,19 +9,21 @@
 #define DOWNCAST_RECEIVER(UR) \
    container_of(UR, struct sc_keyboard_uhid, uhid_receiver)

+#define UHID_KEYBOARD_ID 1
+
 static void
 sc_keyboard_uhid_send_input(struct sc_keyboard_uhid *kb,
-                            const struct sc_hid_input *hid_input) {
+                            const struct sc_hid_event *event) {
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_INPUT;
-    msg.uhid_input.id = hid_input->hid_id;
+    msg.uhid_input.id = UHID_KEYBOARD_ID;

-    assert(hid_input->size <= SC_HID_MAX_SIZE);
-    memcpy(msg.uhid_input.data, hid_input->data, hid_input->size);
-    msg.uhid_input.size = hid_input->size;
+    assert(event->size <= SC_HID_MAX_SIZE);
+    memcpy(msg.uhid_input.data, event->data, event->size);
+    msg.uhid_input.size = event->size;

    if (!sc_controller_push_msg(kb->controller, &msg)) {
-        LOGE("Could not push UHID_INPUT message (key)");
+        LOGE("Could not send UHID_INPUT message (key)");
    }
 }

@ -29,22 +31,23 @@ static void
 sc_keyboard_uhid_synchronize_mod(struct sc_keyboard_uhid *kb) {
    SDL_Keymod sdl_mod = SDL_GetModState();
    uint16_t mod = sc_mods_state_from_sdl(sdl_mod) & (SC_MOD_CAPS | SC_MOD_NUM);
-    uint16_t diff = mod ^ kb->device_mod;
+
+    uint16_t device_mod =
+        atomic_load_explicit(&kb->device_mod, memory_order_relaxed);
+    uint16_t diff = mod ^ device_mod;

    if (diff) {
        // Inherently racy (the HID output reports arrive asynchronously in
        // response to key presses), but will re-synchronize on next key press
        // or HID output anyway
-        kb->device_mod = mod;
+        atomic_store_explicit(&kb->device_mod, mod, memory_order_relaxed);

-        struct sc_hid_input hid_input;
-        if (!sc_hid_keyboard_generate_input_from_mods(&hid_input, diff)) {
-            return;
-        }
+        struct sc_hid_event hid_event;
+        sc_hid_keyboard_event_from_mods(&hid_event, diff);

        LOGV("HID keyboard state synchronized");

-        sc_keyboard_uhid_send_input(kb, &hid_input);
+        sc_keyboard_uhid_send_input(kb, &hid_event);
    }
 }

@ -54,8 +57,6 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
                             uint64_t ack_to_wait) {
    (void) ack_to_wait;

-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
-
    if (event->repeat) {
        // In USB HID protocol, key repeat is handled by the host (Android), so
        // just ignore key repeat here.
@ -64,20 +65,22 @@ sc_key_processor_process_key(struct sc_key_processor *kp,

    struct sc_keyboard_uhid *kb = DOWNCAST(kp);

-    struct sc_hid_input hid_input;
+    struct sc_hid_event hid_event;

    // Not all keys are supported, just ignore unsupported keys
-    if (sc_hid_keyboard_generate_input_from_key(&kb->hid, &hid_input, event)) {
+    if (sc_hid_keyboard_event_from_key(&kb->hid, &hid_event, event)) {
        if (event->scancode == SC_SCANCODE_CAPSLOCK) {
-            kb->device_mod ^= SC_MOD_CAPS;
+            atomic_fetch_xor_explicit(&kb->device_mod, SC_MOD_CAPS,
+                                      memory_order_relaxed);
        } else if (event->scancode == SC_SCANCODE_NUMLOCK) {
-            kb->device_mod ^= SC_MOD_NUM;
+            atomic_fetch_xor_explicit(&kb->device_mod, SC_MOD_NUM,
+                                      memory_order_relaxed);
        } else {
            // Synchronize modifiers (only if the scancode itself does not
            // change the modifiers)
            sc_keyboard_uhid_synchronize_mod(kb);
        }
-        sc_keyboard_uhid_send_input(kb, &hid_input);
+        sc_keyboard_uhid_send_input(kb, &hid_event);
    }
 }

@ -95,31 +98,34 @@ sc_keyboard_uhid_to_sc_mod(uint8_t hid_led) {
    return mod;
 }

-void
-sc_keyboard_uhid_process_hid_output(struct sc_keyboard_uhid *kb,
-                                    const uint8_t *data, size_t size) {
-    assert(sc_thread_get_id() == SC_MAIN_THREAD_ID);
+static void
+sc_uhid_receiver_process_output(struct sc_uhid_receiver *receiver,
+                                const uint8_t *data, size_t len) {
+    // Called from the thread receiving device messages

-    assert(size);
+    assert(len);

    // Also check at runtime (do not trust the server)
-    if (!size) {
+    if (!len) {
        LOGE("Unexpected empty HID output message");
        return;
    }

+    struct sc_keyboard_uhid *kb = DOWNCAST_RECEIVER(receiver);
+
    uint8_t hid_led = data[0];
    uint16_t device_mod = sc_keyboard_uhid_to_sc_mod(hid_led);
-    kb->device_mod = device_mod;
+    atomic_store_explicit(&kb->device_mod, device_mod, memory_order_relaxed);
 }

 bool
 sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
-                      struct sc_controller *controller) {
+                      struct sc_controller *controller,
+                      struct sc_uhid_devices *uhid_devices) {
    sc_hid_keyboard_init(&kb->hid);

    kb->controller = controller;
-    kb->device_mod = 0;
+    atomic_init(&kb->device_mod, 0);

    static const struct sc_key_processor_ops ops = {
        .process_key = sc_key_processor_process_key,
@ -134,18 +140,19 @@ sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
    kb->key_processor.hid = true;
    kb->key_processor.ops = &ops;

-    struct sc_hid_open hid_open;
-    sc_hid_keyboard_generate_open(&hid_open);
-    assert(hid_open.hid_id == SC_HID_ID_KEYBOARD);
+    static const struct sc_uhid_receiver_ops uhid_receiver_ops = {
+        .process_output = sc_uhid_receiver_process_output,
+    };
+
+    kb->uhid_receiver.id = UHID_KEYBOARD_ID;
+    kb->uhid_receiver.ops = &uhid_receiver_ops;
+    sc_uhid_devices_add_receiver(uhid_devices, &kb->uhid_receiver);

    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.report_desc = hid_open.report_desc;
-    msg.uhid_create.report_desc_size = hid_open.report_desc_size;
+    msg.uhid_create.id = UHID_KEYBOARD_ID;
+    msg.uhid_create.report_desc = SC_HID_KEYBOARD_REPORT_DESC;
+    msg.uhid_create.report_desc_size = SC_HID_KEYBOARD_REPORT_DESC_LEN;
    if (!sc_controller_push_msg(controller, &msg)) {
        LOGE("Could not send UHID_CREATE message (keyboard)");
        return false;
--- a/app/src/uhid/keyboard_uhid.h
+++ b/app/src/uhid/keyboard_uhid.h
@ -7,22 +7,21 @@

 #include "controller.h"
 #include "hid/hid_keyboard.h"
+#include "uhid/uhid_output.h"
 #include "trait/key_processor.h"

 struct sc_keyboard_uhid {
    struct sc_key_processor key_processor; // key processor trait
+    struct sc_uhid_receiver uhid_receiver;

    struct sc_hid_keyboard hid;
    struct sc_controller *controller;
-    uint16_t device_mod;
+    atomic_uint_least16_t device_mod;
 };

 bool
 sc_keyboard_uhid_init(struct sc_keyboard_uhid *kb,
-                      struct sc_controller *controller);
-
-void
-sc_keyboard_uhid_process_hid_output(struct sc_keyboard_uhid *kb,
-                                    const uint8_t *data, size_t size);
+                      struct sc_controller *controller,
+                      struct sc_uhid_devices *uhid_devices);

 #endif
--- a/app/src/uhid/mouse_uhid.c
+++ b/app/src/uhid/mouse_uhid.c
@ -7,20 +7,21 @@
 /** Downcast mouse processor to mouse_uhid */
 #define DOWNCAST(MP) container_of(MP, struct sc_mouse_uhid, mouse_processor)

+#define UHID_MOUSE_ID 2
+
 static void
 sc_mouse_uhid_send_input(struct sc_mouse_uhid *mouse,
-                         const struct sc_hid_input *hid_input,
-                         const char *name) {
+                         const struct sc_hid_event *event, const char *name) {
    struct sc_control_msg msg;
    msg.type = SC_CONTROL_MSG_TYPE_UHID_INPUT;
-    msg.uhid_input.id = hid_input->hid_id;
+    msg.uhid_input.id = UHID_MOUSE_ID;

-    assert(hid_input->size <= SC_HID_MAX_SIZE);
-    memcpy(msg.uhid_input.data, hid_input->data, hid_input->size);
-    msg.uhid_input.size = hid_input->size;
+    assert(event->size <= SC_HID_MAX_SIZE);
+    memcpy(msg.uhid_input.data, event->data, event->size);
+    msg.uhid_input.size = event->size;

    if (!sc_controller_push_msg(mouse->controller, &msg)) {
-        LOGE("Could not push UHID_INPUT message (%s)", name);
+        LOGE("Could not send UHID_INPUT message (%s)", name);
    }
 }

@ -29,10 +30,10 @@ sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_motion_event *event) {
    struct sc_mouse_uhid *mouse = DOWNCAST(mp);

-    struct sc_hid_input hid_input;
-    sc_hid_mouse_generate_input_from_motion(&hid_input, event);
+    struct sc_hid_event hid_event;
+    sc_hid_mouse_event_from_motion(&hid_event, event);

-    sc_mouse_uhid_send_input(mouse, &hid_input, "mouse motion");
+    sc_mouse_uhid_send_input(mouse, &hid_event, "mouse motion");
 }

 static void
@ -40,10 +41,10 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
                                   const struct sc_mouse_click_event *event) {
    struct sc_mouse_uhid *mouse = DOWNCAST(mp);

-    struct sc_hid_input hid_input;
-    sc_hid_mouse_generate_input_from_click(&hid_input, event);
+    struct sc_hid_event hid_event;
+    sc_hid_mouse_event_from_click(&hid_event, event);

-    sc_mouse_uhid_send_input(mouse, &hid_input, "mouse click");
+    sc_mouse_uhid_send_input(mouse, &hid_event, "mouse click");
 }

 static void
@ -51,10 +52,10 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_scroll_event *event) {
    struct sc_mouse_uhid *mouse = DOWNCAST(mp);

-    struct sc_hid_input hid_input;
-    sc_hid_mouse_generate_input_from_scroll(&hid_input, event);
+    struct sc_hid_event hid_event;
+    sc_hid_mouse_event_from_scroll(&hid_event, event);

-    sc_mouse_uhid_send_input(mouse, &hid_input, "mouse scroll");
+    sc_mouse_uhid_send_input(mouse, &hid_event, "mouse scroll");
 }

 bool
@ -74,20 +75,13 @@ sc_mouse_uhid_init(struct sc_mouse_uhid *mouse,

    mouse->mouse_processor.relative_mode = true;

-    struct sc_hid_open hid_open;
-    sc_hid_mouse_generate_open(&hid_open);
-    assert(hid_open.hid_id == SC_HID_ID_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.report_desc = hid_open.report_desc;
-    msg.uhid_create.report_desc_size = hid_open.report_desc_size;
+    msg.uhid_create.id = UHID_MOUSE_ID;
+    msg.uhid_create.report_desc = SC_HID_MOUSE_REPORT_DESC;
+    msg.uhid_create.report_desc_size = SC_HID_MOUSE_REPORT_DESC_LEN;
    if (!sc_controller_push_msg(controller, &msg)) {
-        LOGE("Could not push UHID_CREATE message (mouse)");
+        LOGE("Could not send UHID_CREATE message (mouse)");
        return false;
    }

--- a/app/src/uhid/uhid_output.c
+++ b/app/src/uhid/uhid_output.c
@ -1,27 +1,25 @@
 #include "uhid_output.h"

 #include <assert.h>
-#include <inttypes.h>
-
-#include "uhid/keyboard_uhid.h"
-#include "util/log.h"

 void
-sc_uhid_devices_init(struct sc_uhid_devices *devices,
-                     struct sc_keyboard_uhid *keyboard) {
-    devices->keyboard = keyboard;
+sc_uhid_devices_init(struct sc_uhid_devices *devices) {
+    devices->count = 0;
 }

 void
-sc_uhid_devices_process_hid_output(struct sc_uhid_devices *devices, uint16_t id,
-                                   const uint8_t *data, size_t size) {
-    if (id == SC_HID_ID_KEYBOARD) {
-        if (devices->keyboard) {
-            sc_keyboard_uhid_process_hid_output(devices->keyboard, data, size);
-        } else {
-            LOGW("Unexpected keyboard HID output without UHID keyboard");
-        }
-    } else {
-        LOGW("HID output ignored for id %" PRIu16, id);
-    }
+sc_uhid_devices_add_receiver(struct sc_uhid_devices *devices,
+                             struct sc_uhid_receiver *receiver) {
+    assert(devices->count < SC_UHID_MAX_RECEIVERS);
+    devices->receivers[devices->count++] = receiver;
+}
+
+struct sc_uhid_receiver *
+sc_uhid_devices_get_receiver(struct sc_uhid_devices *devices, uint16_t id) {
+    for (size_t i = 0; i < devices->count; ++i) {
+        if (devices->receivers[i]->id == id) {
+            return devices->receivers[i];
+        }
+    }
+    return NULL;
 }
--- a/app/src/uhid/uhid_output.h
+++ b/app/src/uhid/uhid_output.h
@ -9,19 +9,37 @@
 /**
 * The communication with UHID devices is bidirectional.
 *
- * This component dispatches HID outputs to the expected processor.
+ * This component manages the registration of receivers to handle UHID output
+ * messages (sent from the device to the computer).
 */

+struct sc_uhid_receiver {
+    uint16_t id;
+
+    const struct sc_uhid_receiver_ops *ops;
+};
+
+struct sc_uhid_receiver_ops {
+    void
+    (*process_output)(struct sc_uhid_receiver *receiver,
+                      const uint8_t *data, size_t len);
+};
+
+#define SC_UHID_MAX_RECEIVERS 1
+
 struct sc_uhid_devices {
-    struct sc_keyboard_uhid *keyboard;
+    struct sc_uhid_receiver *receivers[SC_UHID_MAX_RECEIVERS];
+    unsigned count;
 };

 void
-sc_uhid_devices_init(struct sc_uhid_devices *devices,
-                     struct sc_keyboard_uhid *keyboard);
+sc_uhid_devices_init(struct sc_uhid_devices *devices);

 void
-sc_uhid_devices_process_hid_output(struct sc_uhid_devices *devices, uint16_t id,
-                                   const uint8_t *data, size_t size);
+sc_uhid_devices_add_receiver(struct sc_uhid_devices *devices,
+                             struct sc_uhid_receiver *receiver);
+
+struct sc_uhid_receiver *
+sc_uhid_devices_get_receiver(struct sc_uhid_devices *devices, uint16_t id);

 #endif
--- a/app/src/usb/aoa_hid.c
+++ b/app/src/usb/aoa_hid.c
@ -1,14 +1,11 @@
 #include "util/log.h"

 #include <assert.h>
-#include <inttypes.h>
 #include <stdio.h>

 #include "aoa_hid.h"
-#include "events.h"
 #include "util/log.h"
 #include "util/str.h"
-#include "util/vector.h"

 // See <https://source.android.com/devices/accessories/aoa2#hid-support>.
 #define ACCESSORY_REGISTER_HID 54
@ -18,49 +15,26 @@

 #define DEFAULT_TIMEOUT 1000

-// Drop droppable events above this limit
-#define SC_AOA_EVENT_QUEUE_LIMIT 60
-
-struct sc_vec_hid_ids SC_VECTOR(uint16_t);
+#define SC_AOA_EVENT_QUEUE_MAX 64

 static void
-sc_hid_input_log(const struct sc_hid_input *hid_input) {
-    // HID input: [00] FF FF FF FF...
-    assert(hid_input->size);
-    char *hex = sc_str_to_hex_string(hid_input->data, hid_input->size);
+sc_hid_event_log(uint16_t accessory_id, const struct sc_hid_event *event) {
+    // HID Event: [00] FF FF FF FF...
+    assert(event->size);
+    char *hex = sc_str_to_hex_string(event->data, event->size);
    if (!hex) {
        return;
    }
-    LOGV("HID input: [%" PRIu16 "] %s", hid_input->hid_id, hex);
+    LOGV("HID Event: [%d] %s", accessory_id, hex);
    free(hex);
 }

-static void
-sc_hid_open_log(const struct sc_hid_open *hid_open) {
-    // HID open: [00] FF FF FF FF...
-    assert(hid_open->report_desc_size);
-    char *hex = sc_str_to_hex_string(hid_open->report_desc,
-                                     hid_open->report_desc_size);
-    if (!hex) {
-        return;
-    }
-    LOGV("HID open: [%" PRIu16 "] %s", hid_open->hid_id, hex);
-    free(hex);
-}
-
-static void
-sc_hid_close_log(const struct sc_hid_close *hid_close) {
-    // HID close: [00]
-    LOGV("HID close: [%" PRIu16 "]", hid_close->hid_id);
-}
-
 bool
 sc_aoa_init(struct sc_aoa *aoa, struct sc_usb *usb,
            struct sc_acksync *acksync) {
    sc_vecdeque_init(&aoa->queue);

-    // Add 4 to support 4 non-droppable events without re-allocation
-    if (!sc_vecdeque_reserve(&aoa->queue, SC_AOA_EVENT_QUEUE_LIMIT + 4)) {
+    if (!sc_vecdeque_reserve(&aoa->queue, SC_AOA_EVENT_QUEUE_MAX)) {
        return false;
    }

@ -151,18 +125,38 @@ sc_aoa_set_hid_report_desc(struct sc_aoa *aoa, uint16_t accessory_id,
    return true;
 }

+bool
+sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
+                 const uint8_t *report_desc, uint16_t report_desc_size) {
+    bool ok = sc_aoa_register_hid(aoa, accessory_id, report_desc_size);
+    if (!ok) {
+        return false;
+    }
+
+    ok = sc_aoa_set_hid_report_desc(aoa, accessory_id, report_desc,
+                                    report_desc_size);
+    if (!ok) {
+        if (!sc_aoa_unregister_hid(aoa, accessory_id)) {
+            LOGW("Could not unregister HID");
+        }
+        return false;
+    }
+
+    return true;
+}
+
 static bool
-sc_aoa_send_hid_event(struct sc_aoa *aoa,
-                      const struct sc_hid_input *hid_input) {
+sc_aoa_send_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
+                      const struct sc_hid_event *event) {
    uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
    uint8_t request = ACCESSORY_SEND_HID_EVENT;
    // <https://source.android.com/devices/accessories/aoa2.html#hid-support>
    // value (arg0): accessory assigned ID for the HID device
    // index (arg1): 0 (unused)
-    uint16_t value = hid_input->hid_id;
+    uint16_t value = accessory_id;
    uint16_t index = 0;
-    unsigned char *data = (uint8_t *) hid_input->data; // discard const
-    uint16_t length = hid_input->size;
+    unsigned char *data = (uint8_t *) event->data; // discard const
+    uint16_t length = event->size;
    int result = libusb_control_transfer(aoa->usb->handle, request_type,
                                         request, value, index, data, length,
                                         DEFAULT_TIMEOUT);
@ -175,7 +169,7 @@ sc_aoa_send_hid_event(struct sc_aoa *aoa,
    return true;
 }

-static bool
+bool
 sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id) {
    uint8_t request_type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR;
    uint8_t request = ACCESSORY_UNREGISTER_HID;
@ -198,213 +192,41 @@ sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id) {
    return true;
 }

-static bool
-sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
-                 const uint8_t *report_desc, uint16_t report_desc_size) {
-    bool ok = sc_aoa_register_hid(aoa, accessory_id, report_desc_size);
-    if (!ok) {
-        return false;
-    }
-
-    ok = sc_aoa_set_hid_report_desc(aoa, accessory_id, report_desc,
-                                    report_desc_size);
-    if (!ok) {
-        if (!sc_aoa_unregister_hid(aoa, accessory_id)) {
-            LOGW("Could not unregister HID");
-        }
-        return false;
-    }
-
-    return true;
-}
-
 bool
-sc_aoa_push_input_with_ack_to_wait(struct sc_aoa *aoa,
-                                   const struct sc_hid_input *hid_input,
+sc_aoa_push_hid_event_with_ack_to_wait(struct sc_aoa *aoa,
+                                       uint16_t accessory_id,
+                                       const struct sc_hid_event *event,
                                       uint64_t ack_to_wait) {
    if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
-        sc_hid_input_log(hid_input);
+        sc_hid_event_log(accessory_id, event);
    }

    sc_mutex_lock(&aoa->mutex);
-
-    bool pushed = false;
-
-    size_t size = sc_vecdeque_size(&aoa->queue);
-    if (size < SC_AOA_EVENT_QUEUE_LIMIT) {
+    bool full = sc_vecdeque_is_full(&aoa->queue);
+    if (!full) {
        bool was_empty = sc_vecdeque_is_empty(&aoa->queue);

        struct sc_aoa_event *aoa_event =
            sc_vecdeque_push_hole_noresize(&aoa->queue);
-        aoa_event->type = SC_AOA_EVENT_TYPE_INPUT;
-        aoa_event->input.hid = *hid_input;
-        aoa_event->input.ack_to_wait = ack_to_wait;
-        pushed = true;
+        aoa_event->hid = *event;
+        aoa_event->accessory_id = accessory_id;
+        aoa_event->ack_to_wait = ack_to_wait;

        if (was_empty) {
            sc_cond_signal(&aoa->event_cond);
        }
    }
-    // Otherwise, the event is discarded
+    // Otherwise (if the queue is full), the event is discarded

    sc_mutex_unlock(&aoa->mutex);

-    return pushed;
-}
-
-bool
-sc_aoa_push_open(struct sc_aoa *aoa, const struct sc_hid_open *hid_open,
-                 bool exit_on_open_error) {
-    if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
-        sc_hid_open_log(hid_open);
-    }
-
-    sc_mutex_lock(&aoa->mutex);
-    bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
-
-    // an OPEN event is non-droppable, so push it to the queue even above the
-    // SC_AOA_EVENT_QUEUE_LIMIT
-    struct sc_aoa_event *aoa_event = sc_vecdeque_push_hole(&aoa->queue);
-    if (!aoa_event) {
-        LOG_OOM();
-        sc_mutex_unlock(&aoa->mutex);
-        return false;
-    }
-
-    aoa_event->type = SC_AOA_EVENT_TYPE_OPEN;
-    aoa_event->open.hid = *hid_open;
-    aoa_event->open.exit_on_error = exit_on_open_error;
-
-    if (was_empty) {
-        sc_cond_signal(&aoa->event_cond);
-    }
-
-    sc_mutex_unlock(&aoa->mutex);
-
-    return true;
-}
-
-bool
-sc_aoa_push_close(struct sc_aoa *aoa, const struct sc_hid_close *hid_close) {
-    if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
-        sc_hid_close_log(hid_close);
-    }
-
-    sc_mutex_lock(&aoa->mutex);
-    bool was_empty = sc_vecdeque_is_empty(&aoa->queue);
-
-    // a CLOSE event is non-droppable, so push it to the queue even above the
-    // SC_AOA_EVENT_QUEUE_LIMIT
-    struct sc_aoa_event *aoa_event = sc_vecdeque_push_hole(&aoa->queue);
-    if (!aoa_event) {
-        LOG_OOM();
-        sc_mutex_unlock(&aoa->mutex);
-        return false;
-    }
-
-    aoa_event->type = SC_AOA_EVENT_TYPE_CLOSE;
-    aoa_event->close.hid = *hid_close;
-
-    if (was_empty) {
-        sc_cond_signal(&aoa->event_cond);
-    }
-
-    sc_mutex_unlock(&aoa->mutex);
-
-    return true;
-}
-
-static bool
-sc_aoa_process_event(struct sc_aoa *aoa, struct sc_aoa_event *event,
-                     struct sc_vec_hid_ids *vec_open) {
-    switch (event->type) {
-        case SC_AOA_EVENT_TYPE_INPUT: {
-            uint64_t ack_to_wait = event->input.ack_to_wait;
-            if (ack_to_wait != SC_SEQUENCE_INVALID) {
-                LOGD("Waiting ack from server sequence=%" PRIu64_, ack_to_wait);
-
-                // If some events have ack_to_wait set, then sc_aoa must have
-                // been initialized with a non NULL acksync
-                assert(aoa->acksync);
-
-                // Do not block the loop indefinitely if the ack never comes (it
-                // should never happen)
-                sc_tick deadline = sc_tick_now() + SC_TICK_FROM_MS(500);
-                enum sc_acksync_wait_result result =
-                    sc_acksync_wait(aoa->acksync, ack_to_wait, deadline);
-
-                if (result == SC_ACKSYNC_WAIT_TIMEOUT) {
-                    LOGW("Ack not received after 500ms, discarding HID event");
-                    // continue to process events
-                    return true;
-                } else if (result == SC_ACKSYNC_WAIT_INTR) {
-                    // stopped
-                    return false;
-                }
-            }
-
-            struct sc_hid_input *hid_input = &event->input.hid;
-            bool ok = sc_aoa_send_hid_event(aoa, hid_input);
-            if (!ok) {
-                LOGW("Could not send HID event to USB device: %" PRIu16,
-                     hid_input->hid_id);
-            }
-
-            break;
-        }
-        case SC_AOA_EVENT_TYPE_OPEN: {
-            struct sc_hid_open *hid_open = &event->open.hid;
-            bool ok = sc_aoa_setup_hid(aoa, hid_open->hid_id,
-                                       hid_open->report_desc,
-                                       hid_open->report_desc_size);
-            if (ok) {
-                // The device is now open, add it to the list of devices to
-                // close automatically on exit
-                bool pushed = sc_vector_push(vec_open, hid_open->hid_id);
-                if (!pushed) {
-                    LOG_OOM();
-                    // this is not fatal, the HID device will just not be
-                    // explicitly unregistered
-                }
-            } else {
-                LOGW("Could not open AOA device: %" PRIu16, hid_open->hid_id);
-                if (event->open.exit_on_error) {
-                    // Notify the error to the main thread, which will exit
-                    sc_push_event(SC_EVENT_AOA_OPEN_ERROR);
-                }
-            }
-
-            break;
-        }
-        case SC_AOA_EVENT_TYPE_CLOSE: {
-            struct sc_hid_close *hid_close = &event->close.hid;
-            bool ok = sc_aoa_unregister_hid(aoa, hid_close->hid_id);
-            if (ok) {
-                // The device is not open anymore, remove it from the list of
-                // devices to close automatically on exit
-                ssize_t idx = sc_vector_index_of(vec_open, hid_close->hid_id);
-                if (idx >= 0) {
-                    sc_vector_remove(vec_open, idx);
-                }
-            } else {
-                LOGW("Could not close AOA device: %" PRIu16, hid_close->hid_id);
-            }
-
-            break;
-        }
-    }
-
-    // continue to process events
-    return true;
+    return !full;
 }

 static int
 run_aoa_thread(void *data) {
    struct sc_aoa *aoa = data;

-    // Store the HID ids of opened devices to unregister them all before exiting
-    struct sc_vec_hid_ids vec_open = SC_VECTOR_INITIALIZER;
-
    for (;;) {
        sc_mutex_lock(&aoa->mutex);
        while (!aoa->stopped && sc_vecdeque_is_empty(&aoa->queue)) {
@ -418,26 +240,36 @@ run_aoa_thread(void *data) {

        assert(!sc_vecdeque_is_empty(&aoa->queue));
        struct sc_aoa_event event = sc_vecdeque_pop(&aoa->queue);
+        uint64_t ack_to_wait = event.ack_to_wait;
        sc_mutex_unlock(&aoa->mutex);

-        bool cont = sc_aoa_process_event(aoa, &event, &vec_open);
-        if (!cont) {
+        if (ack_to_wait != SC_SEQUENCE_INVALID) {
+            LOGD("Waiting ack from server sequence=%" PRIu64_, ack_to_wait);
+
+            // If some events have ack_to_wait set, then sc_aoa must have been
+            // initialized with a non NULL acksync
+            assert(aoa->acksync);
+
+            // Do not block the loop indefinitely if the ack never comes (it
+            // should never happen)
+            sc_tick deadline = sc_tick_now() + SC_TICK_FROM_MS(500);
+            enum sc_acksync_wait_result result =
+                sc_acksync_wait(aoa->acksync, ack_to_wait, deadline);
+
+            if (result == SC_ACKSYNC_WAIT_TIMEOUT) {
+                LOGW("Ack not received after 500ms, discarding HID event");
+                continue;
+            } else if (result == SC_ACKSYNC_WAIT_INTR) {
                // stopped
                break;
            }
        }

-    // Explicitly unregister all registered HID ids before exiting
-    for (size_t i = 0; i < vec_open.size; ++i) {
-        uint16_t hid_id = vec_open.data[i];
-        LOGD("Unregistering AOA device %" PRIu16 "...", hid_id);
-        bool ok = sc_aoa_unregister_hid(aoa, hid_id);
+        bool ok = sc_aoa_send_hid_event(aoa, event.accessory_id, &event.hid);
        if (!ok) {
-            LOGW("Could not close AOA device: %" PRIu16, hid_id);
+            LOGW("Could not send HID event to USB device");
        }
    }
-    sc_vector_destroy(&vec_open);
-
    return 0;
 }

--- a/app/src/usb/aoa_hid.h
+++ b/app/src/usb/aoa_hid.h
@ -1,8 +1,6 @@
 #ifndef SC_AOA_HID_H
 #define SC_AOA_HID_H

-#include "common.h"
-
 #include <stdint.h>
 #include <stdbool.h>

@ -15,27 +13,12 @@
 #include "util/tick.h"
 #include "util/vecdeque.h"

-enum sc_aoa_event_type {
-    SC_AOA_EVENT_TYPE_OPEN,
-    SC_AOA_EVENT_TYPE_INPUT,
-    SC_AOA_EVENT_TYPE_CLOSE,
-};
+#define SC_HID_MAX_SIZE 8

 struct sc_aoa_event {
-    enum sc_aoa_event_type type;
-    union {
-        struct {
-            struct sc_hid_open hid;
-            bool exit_on_error;
-        } open;
-        struct {
-            struct sc_hid_close hid;
-        } close;
-        struct {
-            struct sc_hid_input hid;
+    struct sc_hid_event hid;
+    uint16_t accessory_id;
    uint64_t ack_to_wait;
-        } input;
-    };
 };

 struct sc_aoa_event_queue SC_VECDEQUE(struct sc_aoa_event);
@ -66,30 +49,23 @@ sc_aoa_stop(struct sc_aoa *aoa);
 void
 sc_aoa_join(struct sc_aoa *aoa);

-//bool
-//sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
-//              const uint8_t *report_desc, uint16_t report_desc_size);
-//
-//bool
-//sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id);
-
-// report_desc must be a pointer to static memory, accessed at any time from
-// another thread
 bool
-sc_aoa_push_open(struct sc_aoa *aoa, const struct sc_hid_open *hid_open,
-                 bool exit_on_open_error);
+sc_aoa_setup_hid(struct sc_aoa *aoa, uint16_t accessory_id,
+              const uint8_t *report_desc, uint16_t report_desc_size);

 bool
-sc_aoa_push_close(struct sc_aoa *aoa, const struct sc_hid_close *hid_close);
+sc_aoa_unregister_hid(struct sc_aoa *aoa, uint16_t accessory_id);

 bool
-sc_aoa_push_input_with_ack_to_wait(struct sc_aoa *aoa,
-                                   const struct sc_hid_input *hid_input,
+sc_aoa_push_hid_event_with_ack_to_wait(struct sc_aoa *aoa,
+                                       uint16_t accessory_id,
+                                       const struct sc_hid_event *event,
                                       uint64_t ack_to_wait);

 static inline bool
-sc_aoa_push_input(struct sc_aoa *aoa, const struct sc_hid_input *hid_input) {
-    return sc_aoa_push_input_with_ack_to_wait(aoa, hid_input,
+sc_aoa_push_hid_event(struct sc_aoa *aoa, uint16_t accessory_id,
+                      const struct sc_hid_event *event) {
+    return sc_aoa_push_hid_event_with_ack_to_wait(aoa, accessory_id, event,
                                                  SC_SEQUENCE_INVALID);
 }

--- a/app/src/usb/gamepad_aoa.c
+++ b/app/src/usb/gamepad_aoa.c
@ -1,94 +0,0 @@
-#include "gamepad_aoa.h"
-
-#include "input_events.h"
-#include "util/log.h"
-
-/** Downcast gamepad processor to gamepad_aoa */
-#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,
-                                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;
-    }
-
-    // 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)");
-    }
-}
-
-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;
-    }
-
-    if (!sc_aoa_push_close(gamepad->aoa, &hid_close)) {
-        LOGW("Could not push AOA HID close (gamepad)");
-    }
-}
-
-static void
-sc_gamepad_processor_process_gamepad_axis(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_axis_event *event) {
-    struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_input hid_input;
-    if (!sc_hid_gamepad_generate_input_from_axis(&gamepad->hid, &hid_input,
-                                                 event)) {
-        return;
-    }
-
-    if (!sc_aoa_push_input(gamepad->aoa, &hid_input)) {
-        LOGW("Could not push AOA HID input (gamepad axis)");
-    }
-}
-
-static void
-sc_gamepad_processor_process_gamepad_button(struct sc_gamepad_processor *gp,
-                                const struct sc_gamepad_button_event *event) {
-    struct sc_gamepad_aoa *gamepad = DOWNCAST(gp);
-
-    struct sc_hid_input hid_input;
-    if (!sc_hid_gamepad_generate_input_from_button(&gamepad->hid, &hid_input,
-                                                   event)) {
-        return;
-    }
-
-    if (!sc_aoa_push_input(gamepad->aoa, &hid_input)) {
-        LOGW("Could not push AOA HID input (gamepad button)");
-    }
-}
-
-void
-sc_gamepad_aoa_init(struct sc_gamepad_aoa *gamepad, struct sc_aoa *aoa) {
-    gamepad->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_axis = sc_gamepad_processor_process_gamepad_axis,
-        .process_gamepad_button = sc_gamepad_processor_process_gamepad_button,
-    };
-
-    gamepad->gamepad_processor.ops = &ops;
-}
-
-void
-sc_gamepad_aoa_destroy(struct sc_gamepad_aoa *gamepad) {
-    (void) gamepad;
-    // Do nothing, gamepad->aoa will automatically unregister all devices
-}
--- a/app/src/usb/gamepad_aoa.h
+++ b/app/src/usb/gamepad_aoa.h
@ -1,25 +0,0 @@
-#ifndef SC_GAMEPAD_AOA_H
-#define SC_GAMEPAD_AOA_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include "aoa_hid.h"
-#include "hid/hid_gamepad.h"
-#include "trait/gamepad_processor.h"
-
-struct sc_gamepad_aoa {
-    struct sc_gamepad_processor gamepad_processor; // gamepad processor trait
-
-    struct sc_hid_gamepad hid;
-    struct sc_aoa *aoa;
-};
-
-void
-sc_gamepad_aoa_init(struct sc_gamepad_aoa *gamepad, struct sc_aoa *aoa);
-
-void
-sc_gamepad_aoa_destroy(struct sc_gamepad_aoa *gamepad);
-
-#endif
--- a/app/src/usb/keyboard_aoa.c
+++ b/app/src/usb/keyboard_aoa.c
@ -8,16 +8,19 @@
 /** Downcast key processor to keyboard_aoa */
 #define DOWNCAST(KP) container_of(KP, struct sc_keyboard_aoa, key_processor)

+#define HID_KEYBOARD_ACCESSORY_ID 1
+
 static bool
 push_mod_lock_state(struct sc_keyboard_aoa *kb, uint16_t mods_state) {
-    struct sc_hid_input hid_input;
-    if (!sc_hid_keyboard_generate_input_from_mods(&hid_input, mods_state)) {
+    struct sc_hid_event hid_event;
+    if (!sc_hid_keyboard_event_from_mods(&hid_event, mods_state)) {
        // Nothing to do
        return true;
    }

-    if (!sc_aoa_push_input(kb->aoa, &hid_input)) {
-        LOGW("Could not push AOA HID input (mod lock state)");
+    if (!sc_aoa_push_hid_event(kb->aoa, HID_KEYBOARD_ACCESSORY_ID,
+                               &hid_event)) {
+        LOGW("Could not request HID event (mod lock state)");
        return false;
    }

@ -38,10 +41,10 @@ sc_key_processor_process_key(struct sc_key_processor *kp,

    struct sc_keyboard_aoa *kb = DOWNCAST(kp);

-    struct sc_hid_input hid_input;
+    struct sc_hid_event hid_event;

    // Not all keys are supported, just ignore unsupported keys
-    if (sc_hid_keyboard_generate_input_from_key(&kb->hid, &hid_input, event)) {
+    if (sc_hid_keyboard_event_from_key(&kb->hid, &hid_event, event)) {
        if (!kb->mod_lock_synchronized) {
            // Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
            // keyboard state
@ -55,9 +58,11 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
        // synchronization is acknowledged by the server, otherwise it could
        // paste the old clipboard content.

-        if (!sc_aoa_push_input_with_ack_to_wait(kb->aoa, &hid_input,
+        if (!sc_aoa_push_hid_event_with_ack_to_wait(kb->aoa,
+                                                    HID_KEYBOARD_ACCESSORY_ID,
+                                                    &hid_event,
                                                    ack_to_wait)) {
-            LOGW("Could not push AOA HID input (key)");
+            LOGW("Could not request HID event (key)");
        }
    }
 }
@ -66,12 +71,11 @@ bool
 sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa) {
    kb->aoa = aoa;

-    struct sc_hid_open hid_open;
-    sc_hid_keyboard_generate_open(&hid_open);
-
-    bool ok = sc_aoa_push_open(aoa, &hid_open, true);
+    bool ok = sc_aoa_setup_hid(aoa, HID_KEYBOARD_ACCESSORY_ID,
+                               SC_HID_KEYBOARD_REPORT_DESC,
+                               SC_HID_KEYBOARD_REPORT_DESC_LEN);
    if (!ok) {
-        LOGW("Could not push AOA HID open (keyboard)");
+        LOGW("Register HID keyboard failed");
        return false;
    }

@ -98,6 +102,9 @@ sc_keyboard_aoa_init(struct sc_keyboard_aoa *kb, struct sc_aoa *aoa) {

 void
 sc_keyboard_aoa_destroy(struct sc_keyboard_aoa *kb) {
-    (void) kb;
-    // Do nothing, kb->aoa will automatically unregister all devices
+    // Unregister HID keyboard so the soft keyboard shows again on Android
+    bool ok = sc_aoa_unregister_hid(kb->aoa, HID_KEYBOARD_ACCESSORY_ID);
+    if (!ok) {
+        LOGW("Could not unregister HID keyboard");
+    }
 }
--- a/app/src/usb/mouse_aoa.c
+++ b/app/src/usb/mouse_aoa.c
@ -9,16 +9,19 @@
 /** Downcast mouse processor to mouse_aoa */
 #define DOWNCAST(MP) container_of(MP, struct sc_mouse_aoa, mouse_processor)

+#define HID_MOUSE_ACCESSORY_ID 2
+
 static void
 sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_motion_event *event) {
    struct sc_mouse_aoa *mouse = DOWNCAST(mp);

-    struct sc_hid_input hid_input;
-    sc_hid_mouse_generate_input_from_motion(&hid_input, event);
+    struct sc_hid_event hid_event;
+    sc_hid_mouse_event_from_motion(&hid_event, event);

-    if (!sc_aoa_push_input(mouse->aoa, &hid_input)) {
-        LOGW("Could not push AOA HID input (mouse motion)");
+    if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
+                               &hid_event)) {
+        LOGW("Could not request HID event (mouse motion)");
    }
 }

@ -27,11 +30,12 @@ sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
                                   const struct sc_mouse_click_event *event) {
    struct sc_mouse_aoa *mouse = DOWNCAST(mp);

-    struct sc_hid_input hid_input;
-    sc_hid_mouse_generate_input_from_click(&hid_input, event);
+    struct sc_hid_event hid_event;
+    sc_hid_mouse_event_from_click(&hid_event, event);

-    if (!sc_aoa_push_input(mouse->aoa, &hid_input)) {
-        LOGW("Could not push AOA HID input (mouse click)");
+    if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
+                               &hid_event)) {
+        LOGW("Could not request HID event (mouse click)");
    }
 }

@ -40,11 +44,12 @@ sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_scroll_event *event) {
    struct sc_mouse_aoa *mouse = DOWNCAST(mp);

-    struct sc_hid_input hid_input;
-    sc_hid_mouse_generate_input_from_scroll(&hid_input, event);
+    struct sc_hid_event hid_event;
+    sc_hid_mouse_event_from_scroll(&hid_event, event);

-    if (!sc_aoa_push_input(mouse->aoa, &hid_input)) {
-        LOGW("Could not push AOA HID input (mouse scroll)");
+    if (!sc_aoa_push_hid_event(mouse->aoa, HID_MOUSE_ACCESSORY_ID,
+                               &hid_event)) {
+        LOGW("Could not request HID event (mouse scroll)");
    }
 }

@ -52,12 +57,11 @@ bool
 sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa) {
    mouse->aoa = aoa;

-    struct sc_hid_open hid_open;
-    sc_hid_mouse_generate_open(&hid_open);
-
-    bool ok = sc_aoa_push_open(aoa, &hid_open, true);
+    bool ok = sc_aoa_setup_hid(aoa, HID_MOUSE_ACCESSORY_ID,
+                               SC_HID_MOUSE_REPORT_DESC,
+                               SC_HID_MOUSE_REPORT_DESC_LEN);
    if (!ok) {
-        LOGW("Could not push AOA HID open (mouse)");
+        LOGW("Register HID mouse failed");
        return false;
    }

@ -78,6 +82,8 @@ sc_mouse_aoa_init(struct sc_mouse_aoa *mouse, struct sc_aoa *aoa) {

 void
 sc_mouse_aoa_destroy(struct sc_mouse_aoa *mouse) {
-    (void) mouse;
-    // Do nothing, mouse->aoa will automatically unregister all devices
+    bool ok = sc_aoa_unregister_hid(mouse->aoa, HID_MOUSE_ACCESSORY_ID);
+    if (!ok) {
+        LOGW("Could not unregister HID mouse");
+    }
 }
--- a/app/src/usb/scrcpy_otg.c
+++ b/app/src/usb/scrcpy_otg.c
@ -12,7 +12,6 @@ struct scrcpy_otg {
    struct sc_aoa aoa;
    struct sc_keyboard_aoa keyboard;
    struct sc_mouse_aoa mouse;
-    struct sc_gamepad_aoa gamepad;

    struct sc_screen_otg screen_otg;
 };
@ -22,7 +21,12 @@ sc_usb_on_disconnected(struct sc_usb *usb, void *userdata) {
    (void) usb;
    (void) userdata;

-    sc_push_event(SC_EVENT_USB_DEVICE_DISCONNECTED);
+    SDL_Event event;
+    event.type = SC_EVENT_USB_DEVICE_DISCONNECTED;
+    int ret = SDL_PushEvent(&event);
+    if (ret < 0) {
+        LOGE("Could not post USB disconnection event: %s", SDL_GetError());
+    }
 }

 static enum scrcpy_exit_code
@ -33,9 +37,6 @@ event_loop(struct scrcpy_otg *s) {
            case SC_EVENT_USB_DEVICE_DISCONNECTED:
                LOGW("Device disconnected");
                return SCRCPY_EXIT_DISCONNECTED;
-            case SC_EVENT_AOA_OPEN_ERROR:
-                LOGE("AOA open error");
-                return SCRCPY_EXIT_FAILURE;
            case SDL_QUIT:
                LOGD("User requested to quit");
                return SCRCPY_EXIT_SUCCESS;
@ -58,23 +59,12 @@ scrcpy_otg(struct scrcpy_options *options) {
        LOGW("Could not enable linear filtering");
    }

-    if (!SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, "1")) {
-        LOGW("Could not allow joystick background events");
-    }
-
    // Minimal SDL initialization
    if (SDL_Init(SDL_INIT_EVENTS)) {
        LOGE("Could not initialize SDL: %s", SDL_GetError());
        return SCRCPY_EXIT_FAILURE;
    }

-    if (options->gamepad_input_mode != SC_GAMEPAD_INPUT_MODE_DISABLED) {
-        if (SDL_Init(SDL_INIT_GAMECONTROLLER)) {
-            LOGE("Could not initialize SDL controller: %s", SDL_GetError());
-            // Not fatal, keyboard/mouse should still work
-        }
-    }
-
    atexit(SDL_Quit);

    if (!SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1")) {
@ -85,7 +75,6 @@ scrcpy_otg(struct scrcpy_options *options) {

    struct sc_keyboard_aoa *keyboard = NULL;
    struct sc_mouse_aoa *mouse = NULL;
-    struct sc_gamepad_aoa *gamepad = NULL;
    bool usb_device_initialized = false;
    bool usb_connected = false;
    bool aoa_started = false;
@ -95,14 +84,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");
-    }
 #endif

    static const struct sc_usb_callbacks cbs = {
@ -137,15 +121,11 @@ scrcpy_otg(struct scrcpy_options *options) {
        || options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_DISABLED);
    assert(options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA
        || options->mouse_input_mode == SC_MOUSE_INPUT_MODE_DISABLED);
-    assert(options->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_AOA
-        || options->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_DISABLED);

    bool enable_keyboard =
        options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
    bool enable_mouse =
        options->mouse_input_mode == SC_MOUSE_INPUT_MODE_AOA;
-    bool enable_gamepad =
-        options->gamepad_input_mode == SC_GAMEPAD_INPUT_MODE_AOA;

    if (enable_keyboard) {
        ok = sc_keyboard_aoa_init(&s->keyboard, &s->aoa);
@ -163,11 +143,6 @@ scrcpy_otg(struct scrcpy_options *options) {
        mouse = &s->mouse;
    }

-    if (enable_gamepad) {
-        sc_gamepad_aoa_init(&s->gamepad, &s->aoa);
-        gamepad = &s->gamepad;
-    }
-
    ok = sc_aoa_start(&s->aoa);
    if (!ok) {
        goto end;
@ -182,7 +157,6 @@ scrcpy_otg(struct scrcpy_options *options) {
    struct sc_screen_otg_params params = {
        .keyboard = keyboard,
        .mouse = mouse,
-        .gamepad = gamepad,
        .window_title = window_title,
        .always_on_top = options->always_on_top,
        .window_x = options->window_x,
@ -190,7 +164,6 @@ scrcpy_otg(struct scrcpy_options *options) {
        .window_width = options->window_width,
        .window_height = options->window_height,
        .window_borderless = options->window_borderless,
-        .shortcut_mods = options->shortcut_mods,
    };

    ok = sc_screen_otg_init(&s->screen_otg, &params);
@ -217,9 +190,6 @@ end:
    if (keyboard) {
        sc_keyboard_aoa_destroy(&s->keyboard);
    }
-    if (gamepad) {
-        sc_gamepad_aoa_destroy(&s->gamepad);
-    }

    if (aoa_initialized) {
        sc_aoa_join(&s->aoa);
--- a/app/src/usb/screen_otg.c
+++ b/app/src/usb/screen_otg.c
@ -4,6 +4,47 @@
 #include "options.h"
 #include "util/log.h"

+static void
+sc_screen_otg_set_mouse_capture(struct sc_screen_otg *screen, bool capture) {
+#ifdef __APPLE__
+    // Workaround for SDL bug on macOS:
+    // <https://github.com/libsdl-org/SDL/issues/5340>
+    if (capture) {
+        int mouse_x, mouse_y;
+        SDL_GetGlobalMouseState(&mouse_x, &mouse_y);
+
+        int x, y, w, h;
+        SDL_GetWindowPosition(screen->window, &x, &y);
+        SDL_GetWindowSize(screen->window, &w, &h);
+
+        bool outside_window = mouse_x < x || mouse_x >= x + w
+                           || mouse_y < y || mouse_y >= y + h;
+        if (outside_window) {
+            SDL_WarpMouseInWindow(screen->window, w / 2, h / 2);
+        }
+    }
+#else
+    (void) screen;
+#endif
+    if (SDL_SetRelativeMouseMode(capture)) {
+        LOGE("Could not set relative mouse mode to %s: %s",
+             capture ? "true" : "false", SDL_GetError());
+    }
+}
+
+static inline bool
+sc_screen_otg_get_mouse_capture(struct sc_screen_otg *screen) {
+    (void) screen;
+    return SDL_GetRelativeMouseMode();
+}
+
+static inline void
+sc_screen_otg_toggle_mouse_capture(struct sc_screen_otg *screen) {
+    (void) screen;
+    bool new_value = !sc_screen_otg_get_mouse_capture(screen);
+    sc_screen_otg_set_mouse_capture(screen, new_value);
+}
+
 static void
 sc_screen_otg_render(struct sc_screen_otg *screen) {
    SDL_RenderClear(screen->renderer);
@ -18,7 +59,8 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
                   const struct sc_screen_otg_params *params) {
    screen->keyboard = params->keyboard;
    screen->mouse = params->mouse;
-    screen->gamepad = params->gamepad;
+
+    screen->mouse_capture_key_pressed = 0;

    const char *title = params->window_title;
    assert(title);
@ -70,11 +112,9 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
        LOGW("Could not load icon");
    }

-    sc_mouse_capture_init(&screen->mc, screen->window, params->shortcut_mods);
-
    if (screen->mouse) {
        // Capture mouse on start
-        sc_mouse_capture_set_active(&screen->mc, true);
+        sc_screen_otg_set_mouse_capture(screen, true);
    }

    return true;
@ -96,6 +136,11 @@ sc_screen_otg_destroy(struct sc_screen_otg *screen) {
    SDL_DestroyWindow(screen->window);
 }

+static inline bool
+sc_screen_otg_is_mouse_capture_key(SDL_Keycode key) {
+    return key == SDLK_LALT || key == SDLK_LGUI || key == SDLK_RGUI;
+}
+
 static void
 sc_screen_otg_process_key(struct sc_screen_otg *screen,
                             const SDL_KeyboardEvent *event) {
@ -124,7 +169,7 @@ sc_screen_otg_process_mouse_motion(struct sc_screen_otg *screen,
        // .position not used for HID events
        .xrel = event->xrel,
        .yrel = event->yrel,
-        .buttons_state = sc_mouse_buttons_state_from_sdl(event->state),
+        .buttons_state = sc_mouse_buttons_state_from_sdl(event->state, NULL),
    };

    assert(mp->ops->process_mouse_motion);
@ -143,7 +188,8 @@ sc_screen_otg_process_mouse_button(struct sc_screen_otg *screen,
        // .position not used for HID events
        .action = sc_action_from_sdl_mousebutton_type(event->type),
        .button = sc_mouse_button_from_sdl(event->button),
-        .buttons_state = sc_mouse_buttons_state_from_sdl(sdl_buttons_state),
+        .buttons_state =
+            sc_mouse_buttons_state_from_sdl(sdl_buttons_state, NULL),
    };

    assert(mp->ops->process_mouse_click);
@ -162,154 +208,92 @@ sc_screen_otg_process_mouse_wheel(struct sc_screen_otg *screen,
        // .position not used for HID events
        .hscroll = event->x,
        .vscroll = event->y,
-        .buttons_state = sc_mouse_buttons_state_from_sdl(sdl_buttons_state),
+        .buttons_state =
+            sc_mouse_buttons_state_from_sdl(sdl_buttons_state, NULL),
    };

    assert(mp->ops->process_mouse_scroll);
    mp->ops->process_mouse_scroll(mp, &evt);
 }

-static void
-sc_screen_otg_process_gamepad_device(struct sc_screen_otg *screen,
-                                     const SDL_ControllerDeviceEvent *event) {
-    assert(screen->gamepad);
-    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
-
-    if (event->type == SDL_CONTROLLERDEVICEADDED) {
-        SDL_GameController *gc = SDL_GameControllerOpen(event->which);
-        if (!gc) {
-            LOGW("Could not open game controller");
-            return;
-        }
-
-        SDL_Joystick *joystick = SDL_GameControllerGetJoystick(gc);
-        if (!joystick) {
-            LOGW("Could not get controller joystick");
-            SDL_GameControllerClose(gc);
-            return;
-        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = SDL_JoystickInstanceID(joystick),
-        };
-        gp->ops->process_gamepad_added(gp, &evt);
-    } else if (event->type == SDL_CONTROLLERDEVICEREMOVED) {
-        SDL_JoystickID id = event->which;
-
-        SDL_GameController *gc = SDL_GameControllerFromInstanceID(id);
-        if (gc) {
-            SDL_GameControllerClose(gc);
-        } else {
-            LOGW("Unknown gamepad device removed");
-        }
-
-        struct sc_gamepad_device_event evt = {
-            .gamepad_id = id,
-        };
-        gp->ops->process_gamepad_removed(gp, &evt);
-    }
-}
-
-static void
-sc_screen_otg_process_gamepad_axis(struct sc_screen_otg *screen,
-                                   const SDL_ControllerAxisEvent *event) {
-    assert(screen->gamepad);
-    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
-
-    enum sc_gamepad_axis axis = sc_gamepad_axis_from_sdl(event->axis);
-    if (axis == SC_GAMEPAD_AXIS_UNKNOWN) {
-        return;
-    }
-
-    struct sc_gamepad_axis_event evt = {
-        .gamepad_id = event->which,
-        .axis = axis,
-        .value = event->value,
-    };
-    gp->ops->process_gamepad_axis(gp, &evt);
-}
-
-static void
-sc_screen_otg_process_gamepad_button(struct sc_screen_otg *screen,
-                                     const SDL_ControllerButtonEvent *event) {
-    assert(screen->gamepad);
-    struct sc_gamepad_processor *gp = &screen->gamepad->gamepad_processor;
-
-    enum sc_gamepad_button button = sc_gamepad_button_from_sdl(event->button);
-    if (button == SC_GAMEPAD_BUTTON_UNKNOWN) {
-        return;
-    }
-
-    struct sc_gamepad_button_event evt = {
-        .gamepad_id = event->which,
-        .action = sc_action_from_sdl_controllerbutton_type(event->type),
-        .button = button,
-    };
-    gp->ops->process_gamepad_button(gp, &evt);
-}
-
 void
 sc_screen_otg_handle_event(struct sc_screen_otg *screen, SDL_Event *event) {
-    if (sc_mouse_capture_handle_event(&screen->mc, event)) {
-        // The mouse capture handler consumed the event
-        return;
-    }
-
    switch (event->type) {
        case SDL_WINDOWEVENT:
            switch (event->window.event) {
                case SDL_WINDOWEVENT_EXPOSED:
                    sc_screen_otg_render(screen);
                    break;
+                case SDL_WINDOWEVENT_FOCUS_LOST:
+                    if (screen->mouse) {
+                        sc_screen_otg_set_mouse_capture(screen, false);
+                    }
+                    break;
            }
            return;
        case SDL_KEYDOWN:
+            if (screen->mouse) {
+                SDL_Keycode key = event->key.keysym.sym;
+                if (sc_screen_otg_is_mouse_capture_key(key)) {
+                    if (!screen->mouse_capture_key_pressed) {
+                        screen->mouse_capture_key_pressed = key;
+                    } else {
+                        // Another mouse capture key has been pressed, cancel
+                        // mouse (un)capture
+                        screen->mouse_capture_key_pressed = 0;
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return;
+                }
+            }
+
            if (screen->keyboard) {
                sc_screen_otg_process_key(screen, &event->key);
            }
            break;
        case SDL_KEYUP:
+            if (screen->mouse) {
+                SDL_Keycode key = event->key.keysym.sym;
+                SDL_Keycode cap = screen->mouse_capture_key_pressed;
+                screen->mouse_capture_key_pressed = 0;
+                if (sc_screen_otg_is_mouse_capture_key(key)) {
+                    if (key == cap) {
+                        // A mouse capture key has been pressed then released:
+                        // toggle the capture mouse mode
+                        sc_screen_otg_toggle_mouse_capture(screen);
+                    }
+                    // Mouse capture keys are never forwarded to the device
+                    return;
+                }
+            }
+
            if (screen->keyboard) {
                sc_screen_otg_process_key(screen, &event->key);
            }
            break;
        case SDL_MOUSEMOTION:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                sc_screen_otg_process_mouse_motion(screen, &event->motion);
            }
            break;
        case SDL_MOUSEBUTTONDOWN:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                sc_screen_otg_process_mouse_button(screen, &event->button);
            }
            break;
        case SDL_MOUSEBUTTONUP:
            if (screen->mouse) {
+                if (sc_screen_otg_get_mouse_capture(screen)) {
                    sc_screen_otg_process_mouse_button(screen, &event->button);
+                } else {
+                    sc_screen_otg_set_mouse_capture(screen, true);
+                }
            }
            break;
        case SDL_MOUSEWHEEL:
-            if (screen->mouse) {
+            if (screen->mouse && sc_screen_otg_get_mouse_capture(screen)) {
                sc_screen_otg_process_mouse_wheel(screen, &event->wheel);
            }
            break;
-        case SDL_CONTROLLERDEVICEADDED:
-        case SDL_CONTROLLERDEVICEREMOVED:
-            // Handle device added or removed even if paused
-            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_device(screen, &event->cdevice);
-            }
-            break;
-        case SDL_CONTROLLERAXISMOTION:
-            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_axis(screen, &event->caxis);
-            }
-            break;
-        case SDL_CONTROLLERBUTTONDOWN:
-        case SDL_CONTROLLERBUTTONUP:
-            if (screen->gamepad) {
-                sc_screen_otg_process_gamepad_button(screen, &event->cbutton);
-            }
-            break;
    }
 }
--- a/app/src/usb/screen_otg.h
+++ b/app/src/usb/screen_otg.h
@ -8,25 +8,22 @@

 #include "keyboard_aoa.h"
 #include "mouse_aoa.h"
-#include "mouse_capture.h"
-#include "gamepad_aoa.h"

 struct sc_screen_otg {
    struct sc_keyboard_aoa *keyboard;
    struct sc_mouse_aoa *mouse;
-    struct sc_gamepad_aoa *gamepad;

    SDL_Window *window;
    SDL_Renderer *renderer;
    SDL_Texture *texture;

-    struct sc_mouse_capture mc;
+    // See equivalent mechanism in screen.h
+    SDL_Keycode mouse_capture_key_pressed;
 };

 struct sc_screen_otg_params {
    struct sc_keyboard_aoa *keyboard;
    struct sc_mouse_aoa *mouse;
-    struct sc_gamepad_aoa *gamepad;

    const char *window_title;
    bool always_on_top;
@ -35,7 +32,6 @@ struct sc_screen_otg_params {
    uint16_t window_width;
    uint16_t window_height;
    bool window_borderless;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
 };

 bool
--- a/app/src/util/binary.h
+++ b/app/src/util/binary.h
@ -13,12 +13,6 @@ sc_write16be(uint8_t *buf, uint16_t value) {
    buf[1] = value;
 }

-static inline void
-sc_write16le(uint8_t *buf, uint16_t value) {
-    buf[0] = value;
-    buf[1] = value >> 8;
-}
-
 static inline void
 sc_write32be(uint8_t *buf, uint32_t value) {
    buf[0] = value >> 24;
@ -27,26 +21,12 @@ sc_write32be(uint8_t *buf, uint32_t value) {
    buf[3] = value;
 }

-static inline void
-sc_write32le(uint8_t *buf, uint32_t value) {
-    buf[0] = value;
-    buf[1] = value >> 8;
-    buf[2] = value >> 16;
-    buf[3] = value >> 24;
-}
-
 static inline void
 sc_write64be(uint8_t *buf, uint64_t value) {
    sc_write32be(buf, value >> 32);
    sc_write32be(&buf[4], (uint32_t) value);
 }

-static inline void
-sc_write64le(uint8_t *buf, uint64_t value) {
-    sc_write32le(buf, (uint32_t) value);
-    sc_write32le(&buf[4], value >> 32);
-}
-
 static inline uint16_t
 sc_read16be(const uint8_t *buf) {
    return (buf[0] << 8) | buf[1];
--- a/app/src/util/env.c
+++ b/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
-}
--- a/app/src/util/env.h
+++ b/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
--- a/app/src/util/net.c
+++ b/app/src/util/net.c
@ -9,11 +9,12 @@
 #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>
 # include <netinet/in.h>
-# include <netinet/tcp.h>
 # include <arpa/inet.h>
 # include <unistd.h>
 # include <fcntl.h>
@ -21,6 +22,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 +46,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 +71,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 +82,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 +247,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,34 +261,18 @@ 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
 }

-bool
-net_set_tcp_nodelay(sc_socket socket, bool tcp_nodelay) {
-    sc_raw_socket raw_sock = unwrap(socket);
-
-    int value = tcp_nodelay ? 1 : 0;
-    int ret = setsockopt(raw_sock, IPPROTO_TCP, TCP_NODELAY,
-                         (const void *) &value, sizeof(value));
-    if (ret == -1) {
-        net_perror("setsockopt(TCP_NODELAY)");
-        return false;
-    }
-
-    assert(ret == 0);
-    return true;
-}
-
 bool
 net_parse_ipv4(const char *s, uint32_t *ipv4) {
    struct in_addr addr;
--- a/app/src/util/net.h
+++ b/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
@ -82,10 +67,6 @@ net_interrupt(sc_socket socket);
 bool
 net_close(sc_socket socket);

-// Disable Nagle's algorithm (if tcp_nodelay is true)
-bool
-net_set_tcp_nodelay(sc_socket socket, bool tcp_nodelay);
-
 /**
 * Parse `ip` "xxx.xxx.xxx.xxx" to an IPv4 host representation
 */
--- a/app/src/util/str.c
+++ b/app/src/util/str.c
@ -64,26 +64,6 @@ sc_str_quote(const char *src) {
    return quoted;
 }

-char *
-sc_str_concat(const char *start, const char *end) {
-    assert(start);
-    assert(end);
-
-    size_t start_len = strlen(start);
-    size_t end_len = strlen(end);
-
-    char *result = malloc(start_len + end_len + 1);
-    if (!result) {
-        LOG_OOM();
-        return NULL;
-    }
-
-    memcpy(result, start, start_len);
-    memcpy(result + start_len, end, end_len + 1);
-
-    return result;
-}
-
 bool
 sc_str_parse_integer(const char *s, long *out) {
    char *endptr;
--- a/app/src/util/str.h
+++ b/app/src/util/str.h
@ -38,15 +38,6 @@ sc_str_join(char *dst, const char *const tokens[], char sep, size_t n);
 char *
 sc_str_quote(const char *src);

-/**
- * Concat two strings
- *
- * Return a new allocated string, contanining the concatenation of the two
- * input strings.
- */
-char *
-sc_str_concat(const char *start, const char *end);
-
 /**
 * Parse `s` as an integer into `out`
 *
--- a/app/src/util/thread.c
+++ b/app/src/util/thread.c
@ -6,8 +6,6 @@

 #include "log.h"

-sc_thread_id SC_MAIN_THREAD_ID;
-
 bool
 sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
                 void *userdata) {
--- a/app/src/util/thread.h
+++ b/app/src/util/thread.h
@ -39,8 +39,6 @@ typedef struct sc_cond {
    SDL_cond *cond;
 } sc_cond;

-extern sc_thread_id SC_MAIN_THREAD_ID;
-
 bool
 sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
                 void *userdata);
--- a/app/src/util/tick.h
+++ b/app/src/util/tick.h
@ -10,14 +10,14 @@ typedef int64_t sc_tick;
 #define SC_TICK_FREQ 1000000 // microsecond

 // To be adapted if SC_TICK_FREQ changes
-#define SC_TICK_TO_NS(tick) ((sc_tick) (tick) * 1000)
-#define SC_TICK_TO_US(tick) ((sc_tick) tick)
-#define SC_TICK_TO_MS(tick) ((sc_tick) (tick) / 1000)
-#define SC_TICK_TO_SEC(tick) ((sc_tick) (tick) / 1000000)
-#define SC_TICK_FROM_NS(ns) ((sc_tick) (ns) / 1000)
-#define SC_TICK_FROM_US(us) ((sc_tick) us)
-#define SC_TICK_FROM_MS(ms) ((sc_tick) (ms) * 1000)
-#define SC_TICK_FROM_SEC(sec) ((sc_tick) (sec) * 1000000)
+#define SC_TICK_TO_NS(tick) ((tick) * 1000)
+#define SC_TICK_TO_US(tick) (tick)
+#define SC_TICK_TO_MS(tick) ((tick) / 1000)
+#define SC_TICK_TO_SEC(tick) ((tick) / 1000000)
+#define SC_TICK_FROM_NS(ns) ((ns) / 1000)
+#define SC_TICK_FROM_US(us) (us)
+#define SC_TICK_FROM_MS(ms) ((ms) * 1000)
+#define SC_TICK_FROM_SEC(sec) ((sec) * 1000000)

 sc_tick
 sc_tick_now(void);
--- a/app/src/util/timeout.c
+++ b/app/src/util/timeout.c
@ -62,7 +62,6 @@ void
 sc_timeout_stop(struct sc_timeout *timeout) {
    sc_mutex_lock(&timeout->mutex);
    timeout->stopped = true;
-    sc_cond_signal(&timeout->cond);
    sc_mutex_unlock(&timeout->mutex);
 }

--- a/app/src/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@ -240,7 +240,7 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs, const AVCodecContext *ctx) {
    vs->frame = av_frame_alloc();
    if (!vs->frame) {
        LOG_OOM();
-        goto error_avcodec_free_context;
+        goto error_avcodec_close;
    }

    vs->packet = av_packet_alloc();
@ -268,6 +268,8 @@ error_av_packet_free:
    av_packet_free(&vs->packet);
 error_av_frame_free:
    av_frame_free(&vs->frame);
+error_avcodec_close:
+    avcodec_close(vs->encoder_ctx);
 error_avcodec_free_context:
    avcodec_free_context(&vs->encoder_ctx);
 error_avio_close:
@ -295,6 +297,7 @@ sc_v4l2_sink_close(struct sc_v4l2_sink *vs) {

    av_packet_free(&vs->packet);
    av_frame_free(&vs->frame);
+    avcodec_close(vs->encoder_ctx);
    avcodec_free_context(&vs->encoder_ctx);
    avio_close(vs->format_ctx->pb);
    avformat_free_context(vs->format_ctx);
--- a/app/tests/test_binary.c
+++ b/app/tests/test_binary.c
@ -42,44 +42,6 @@ static void test_write64be(void) {
    assert(buf[7] == 0xEF);
 }

-static void test_write16le(void) {
-    uint16_t val = 0xABCD;
-    uint8_t buf[2];
-
-    sc_write16le(buf, val);
-
-    assert(buf[0] == 0xCD);
-    assert(buf[1] == 0xAB);
-}
-
-static void test_write32le(void) {
-    uint32_t val = 0xABCD1234;
-    uint8_t buf[4];
-
-    sc_write32le(buf, val);
-
-    assert(buf[0] == 0x34);
-    assert(buf[1] == 0x12);
-    assert(buf[2] == 0xCD);
-    assert(buf[3] == 0xAB);
-}
-
-static void test_write64le(void) {
-    uint64_t val = 0xABCD1234567890EF;
-    uint8_t buf[8];
-
-    sc_write64le(buf, val);
-
-    assert(buf[0] == 0xEF);
-    assert(buf[1] == 0x90);
-    assert(buf[2] == 0x78);
-    assert(buf[3] == 0x56);
-    assert(buf[4] == 0x34);
-    assert(buf[5] == 0x12);
-    assert(buf[6] == 0xCD);
-    assert(buf[7] == 0xAB);
-}
-
 static void test_read16be(void) {
    uint8_t buf[2] = {0xAB, 0xCD};

@ -146,10 +108,6 @@ int main(int argc, char *argv[]) {
    test_read32be();
    test_read64be();

-    test_write16le();
-    test_write32le();
-    test_write64le();
-
    test_float_to_u16fp();
    test_float_to_i16fp();
    return 0;
--- a/app/tests/test_cli.c
+++ b/app/tests/test_cli.c
@ -51,6 +51,7 @@ static void test_options(void) {
        "--fullscreen",
        "--max-fps", "30",
        "--max-size", "1024",
+        "--lock-video-orientation=2", // optional arguments require '='
        // "--no-control" is not compatible with "--turn-screen-off"
        // "--no-playback" is not compatible with "--fulscreen"
        "--port", "1234:1236",
@ -77,8 +78,9 @@ static void test_options(void) {
    assert(opts->video_bit_rate == 5000000);
    assert(!strcmp(opts->crop, "100:200:300:400"));
    assert(opts->fullscreen);
-    assert(!strcmp(opts->max_fps, "30"));
+    assert(opts->max_fps == 30);
    assert(opts->max_size == 1024);
+    assert(opts->lock_video_orientation == 2);
    assert(opts->port_range.first == 1234);
    assert(opts->port_range.last == 1236);
    assert(!strcmp(opts->push_target, "/sdcard/Movies"));
--- a/Show More
+++ b/Show More