Log server pushed

Now that "adb push" stdout is disabled, add a log to notify server pushed.
Use inherit flags for adb commands
2021-11-20 00:02:30 +01:00 · 2021-11-20 00:02:30 +01:00 · 2021-11-20 00:02:30 +01:00 · 2021-11-19 22:27:01 +01:00
121 changed files with 1518 additions and 4695 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -15,7 +15,7 @@ First, you need to install the required packages:
 sudo apt install ffmpeg libsdl2-2.0-0 adb wget \
                 gcc git pkg-config meson ninja-build libsdl2-dev \
                 libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev \
-                 libusb-1.0-0 libusb-1.0-0-dev
+                 libusb-1.0-0 libusb-dev
 ```

 Then clone the repo and execute the installation script
@ -94,7 +94,7 @@ sudo apt install ffmpeg libsdl2-2.0-0 adb libusb-1.0-0
 # client build dependencies
 sudo apt install gcc git pkg-config meson ninja-build libsdl2-dev \
                 libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev \
-                 libusb-1.0-0-dev
+                 libusb-dev

 # server build dependencies
 sudo apt install openjdk-11-jdk
@ -270,10 +270,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v1.21`][direct-scrcpy-server]  
-   _(SHA-256: dbcccab523ee26796e55ea33652649e4b7af498edae9aa75e4d4d7869c0ab848)_
+ - [`scrcpy-server-v1.20`][direct-scrcpy-server]  
+   _(SHA-256: b20aee4951f99b060c4a44000ba94de973f9604758ef62beb253b371aad3df34)_

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.21/scrcpy-server-v1.21
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.20/scrcpy-server-v1.20

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/2
+++ b/2
@ -188,7 +188,7 @@
      identification within third-party archives.

   Copyright (C) 2018 Genymobile
-   Copyright (C) 2018-2022 Romain Vimont
+   Copyright (C) 2018-2021 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.id.md
+++ b/README.id.md
@ -672,7 +672,7 @@ Baca [halaman pengembang].
 ## Lisensi

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.it.md
+++ b/README.it.md
@ -790,7 +790,7 @@ Leggi la [pagina per sviluppatori].
 ## Licenza (in inglese)

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.jp.md
+++ b/README.jp.md
@ -776,7 +776,7 @@ _⁴Android 7以上のみ._
 ## ライセンス

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.ko.md
+++ b/README.ko.md
@ -475,7 +475,7 @@ _²화면이 꺼진 상태에서 우클릭 시 다시 켜지며, 그 외의 상
 ## 라이선스

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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
@ -1,11 +1,11 @@
-# scrcpy (v1.21)
+# scrcpy (v1.20)

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

 [Read in another language](#translations)

 This application provides display and control of Android devices connected via
-USB (or [over TCP/IP](#tcpip-wireless)). It does not require any _root_ access.
+USB (or [over TCP/IP](#wireless)). It does not require any _root_ access.
 It works on _GNU/Linux_, _Windows_ and _macOS_.

 ![screenshot](assets/screenshot-debian-600.jpg)
@ -31,8 +31,6 @@ Its features include:
 - device screen [as a webcam (V4L2)](#v4l2loopback) (Linux-only)
 - [physical keyboard simulation (HID)](#physical-keyboard-simulation-hid)
   (Linux-only)
- - [physical mouse simulation (HID)](#physical-mouse-simulation-hid)
-   (Linux-only)
 - and more…

 ## Requirements
@ -67,7 +65,7 @@ Build from sources: [BUILD] ([simplified process][BUILD_simple])

 ### Linux

-On Debian and Ubuntu:
+On Debian (_testing_ and _sid_ for now) and Ubuntu (20.04):

 ```
 apt install scrcpy
@ -103,10 +101,10 @@ process][BUILD_simple]).
 For Windows, for simplicity, a prebuilt archive with all the dependencies
 (including `adb`) is available:

- - [`scrcpy-win64-v1.21.zip`][direct-win64]  
-   _(SHA-256: fdab0c1421353b592a9bbcebd6e252675eadccca65cca8105686feaa9c1ded53)_
+ - [`scrcpy-win64-v1.20.zip`][direct-win64]  
+   _(SHA-256: 548532b616288bcaeceff6881ad5e6f0928e5ae2b48c380385f03627401cfdba)_

-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.21/scrcpy-win64-v1.21.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.20/scrcpy-win64-v1.20.zip

 It is also available in [Chocolatey]:

@ -358,39 +356,10 @@ scrcpy --v4l2-buffer=500    # add 500 ms buffering for v4l2 sink

 ### Connection

-#### TCP/IP (wireless)
+#### Wireless

 _Scrcpy_ uses `adb` to communicate with the device, and `adb` can [connect] to a
-device over TCP/IP. The device must be connected on the same network as the
-computer.
-
-##### Automatic
-
-An option `--tcpip` allows to configure the connection automatically. There are
-two variants.
-
-If the device (accessible at 192.168.1.1 in this example) already listens on a
-port (typically 5555) for incoming adb connections, then run:
-
-```bash
-scrcpy --tcpip=192.168.1.1       # default port is 5555
-scrcpy --tcpip=192.168.1.1:5555
-```
-
-If adb TCP/IP mode is disabled on the device (or if you don't know the IP
-address), connect the device over USB, then run:
-
-```bash
-scrcpy --tcpip    # without arguments
-```
-
-It will automatically find the device IP address, enable TCP/IP mode, then
-connect to the device before starting.
-
-##### Manual
-
-Alternatively, it is possible to enable the TCP/IP connection manually using
-`adb`:
+device over TCP/IP:

 1. Connect the device to the same Wi-Fi as your computer.
 2. Get your device IP address, in Settings → About phone → Status, or by
@ -443,47 +412,12 @@ autoadb scrcpy -s '{}'

 [AutoAdb]: https://github.com/rom1v/autoadb

-#### Tunnels
+#### SSH tunnel

 To connect to a remote device, it is possible to connect a local `adb` client to
 a remote `adb` server (provided they use the same version of the _adb_
 protocol).

-##### Remote ADB server
-
-To connect to a remote ADB server, make the server listen on all interfaces:
-
-```bash
-adb kill-server
-adb -a nodaemon server start
-# keep this open
-```
-
-**Warning: all communications between clients and ADB server are unencrypted.**
-
-Suppose that this server is accessible at 192.168.1.2. Then, from another
-terminal, run scrcpy:
-
-```bash
-export ADB_SERVER_SOCKET=tcp:192.168.1.2:5037
-scrcpy --tunnel-host=192.168.1.2
-```
-
-By default, scrcpy uses the local port used for `adb forward` tunnel
-establishment (typically `27183`, see `--port`). It is also possible to force a
-different tunnel port (it may be useful in more complex situations, when more
-redirections are involved):
-
-```
-scrcpy --tunnel-port=1234
-```
-
-
-##### SSH tunnel
-
-To communicate with a remote ADB server securely, it is preferable to use a SSH
-tunnel.
-
 First, make sure the ADB server is running on the remote computer:

 ```bash
@ -761,9 +695,6 @@ of <kbd>Ctrl</kbd>+<kbd>v</kbd> and <kbd>MOD</kbd>+<kbd>v</kbd> so that they
 also inject the computer clipboard text as a sequence of key events (the same
 way as <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>).

-To disable automatic clipboard synchronization, use
-`--no-clipboard-autosync`.
-
 #### Pinch-to-zoom

 To simulate "pinch-to-zoom": <kbd>Ctrl</kbd>+_click-and-move_.
@ -806,46 +737,8 @@ of the host key mapping. Therefore, if your keyboard layout does not match, it
 must be configured on the Android device, in Settings → System → Languages and
 input → [Physical keyboard].

-This settings page can be started directly:
-
-```bash
-adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS
-```
-
-However, the option is only available when the HID keyboard is enabled (or when
-a physical keyboard is connected).
-
 [Physical keyboard]: https://github.com/Genymobile/scrcpy/pull/2632#issuecomment-923756915

-#### Physical mouse simulation (HID)
-
-Similarly to the physical keyboard simulation, it is possible to simulate a
-physical mouse. Likewise, it only works if the device is connected by USB, and
-is currently only supported on Linux.
-
-By default, scrcpy uses Android mouse events injection, using absolute
-coordinates. By simulating a physical mouse, a mouse pointer appears on the
-Android device, and relative mouse motion, clicks and scrolls are injected.
-
-To enable this mode:
-
-```bash
-scrcpy --hid-mouse
-scrcpy -M  # short version
-```
-
-You could also add `--forward-all-clicks` to [forward all mouse
-buttons][forward_all_clicks].
-
-[forward_all_clicks]: #right-click-and-middle-click
-
-When this mode is enabled, the computer mouse is "captured" (the mouse pointer
-disappears from the computer and appears on the Android device instead).
-
-Special capture keys, either <kbd>Alt</kbd> or <kbd>Super</kbd>, toggle
-(disable or enable) the mouse capture. Use one of them to give the control of
-the mouse back to the computer.
-

 #### Text injection preference

@ -865,13 +758,7 @@ scrcpy --prefer-text

 (but this will break keyboard behavior in games)

-On the contrary, you could force to always inject raw key events:
-
-```bash
-scrcpy --raw-key-events
-```
-
-These options have no effect on HID keyboard (all key events are sent as
+This option has no effect on HID keyboard (all key events are sent as
 scancodes in this mode).

 [textevents]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-text-input
@ -1048,7 +935,7 @@ Read the [developers page].
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@ -1080,7 +967,7 @@ This README is available in other languages:
 - [한국어 (Korean, `ko`) - v1.11](README.ko.md)
 - [Português Brasileiro (Brazilian Portuguese, `pt-BR`) - v1.19](README.pt-br.md)
 - [Español (Spanish, `sp`) - v1.17](README.sp.md)
- [简体中文 (Simplified Chinese, `zh-Hans`) - v1.20](README.zh-Hans.md)
+- [简体中文 (Simplified Chinese, `zh-Hans`) - v1.17](README.zh-Hans.md)
 - [繁體中文 (Traditional Chinese, `zh-Hant`) - v1.15](README.zh-Hant.md)
 - [Turkish (Turkish, `tr`) - v1.18](README.tr.md)

--- a/README.pt-br.md
+++ b/README.pt-br.md
@ -857,7 +857,7 @@ Leia a [página dos desenvolvedores][developers page].
 ## Licença

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.sp.md
+++ b/README.sp.md
@ -720,7 +720,7 @@ Lea la [hoja de desarrolladores (en inglés)](DEVELOP.md).
 ## Licencia

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.tr.md
+++ b/README.tr.md
@ -801,7 +801,7 @@ Bakınız [FAQ](FAQ.md).
 ## Lisans

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.zh-Hans.md
+++ b/README.zh-Hans.md
@ -2,41 +2,27 @@ _Only the original [README](README.md) is guaranteed to be up-to-date._

 只有原版的[README](README.md)会保持最新。

-Current version is based on [65b023a]
+本文根据[ed130e05]进行翻译。

-本文根据[65b023a]进行翻译。
+[ed130e05]: https://github.com/Genymobile/scrcpy/blob/ed130e05d55615d6014d93f15cfcb92ad62b01d8/README.md

-[65b023a]: https://github.com/Genymobile/scrcpy/blob/65b023ac6d586593193fd5290f65e25603b68e02/README.md
-
-# scrcpy (v1.20)
-
-<img src="data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
+# scrcpy (v1.17)

 本应用程序可以显示并控制通过 USB (或 [TCP/IP][article-tcpip]) 连接的安卓设备，且不需要任何 _root_ 权限。本程序支持 _GNU/Linux_, _Windows_ 和 _macOS_。

 ![screenshot](assets/screenshot-debian-600.jpg)

-本应用专注于：
+它专注于：

- - **轻量**： 原生，仅显示设备屏幕
- - **性能**： 30~120fps，取决于设备
- - **质量**： 分辨率可达 1920×1080 或更高
- - **低延迟**： [35~70ms][lowlatency]
- - **快速启动**： 最快 1 秒内即可显示第一帧
- - **无侵入性**： 不会在设备上遗留任何程序
- - **用户利益**： 无需帐号，无广告，无需联网
- - **自由**： 自由和开源软件
+ - **轻量** (原生，仅显示设备屏幕)
+ - **性能** (30~60fps)
+ - **质量** (分辨率可达 1920×1080 或更高)
+ - **低延迟** ([35~70ms][lowlatency])
+ - **快速启动** (最快 1 秒内即可显示第一帧)
+ - **无侵入性** (不会在设备上遗留任何程序)

 [lowlatency]: https://github.com/Genymobile/scrcpy/pull/646

-功能：
- - [屏幕录制](#屏幕录制)
- - 镜像时[关闭设备屏幕](#关闭设备屏幕)
- - 双向[复制粘贴](#复制粘贴)
- - [可配置显示质量](#采集设置)
- - 以设备屏幕[作为摄像头(V4L2)](#v4l2loopback) (仅限 Linux)
- - [模拟物理键盘 (HID)](#物理键盘模拟-hid) (仅限 Linux)
- - 更多 ……

 ## 系统要求

@ -55,17 +41,6 @@ Current version is based on [65b023a]

 <a href="https://repology.org/project/scrcpy/versions"><img src="https://repology.org/badge/vertical-allrepos/scrcpy.svg" alt="Packaging status" align="right"></a>

-### 概要
-
- - Linux: `apt install scrcpy`
- - Windows: [下载][direct-win64]
- - macOS: `brew install scrcpy`
-
-从源代码编译: [构建][BUILD] ([简化过程][BUILD_simple])
-
-[BUILD]: BUILD.md
-[BUILD_simple]: BUILD.md#simple
-
 ### Linux

 在 Debian (目前仅支持 _testing_ 和 _sid_ 分支) 和Ubuntu (20.04) 上：
@ -95,12 +70,13 @@ apt install scrcpy
 [Ebuild]: https://wiki.gentoo.org/wiki/Ebuild
 [ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy

-您也可以[自行构建][BUILD] ([简化过程][BUILD_simple])。
+您也可以[自行构建][BUILD] (不必担心，这并不困难)。
+


 ### Windows

-在 Windows 上，为简便起见，我们提供包含了所有依赖 (包括 `adb`) 的预编译包。
+在 Windows 上，简便起见，我们提供包含了所有依赖 (包括 `adb`) 的预编译包。

 - [README](README.md#windows)

@ -138,17 +114,13 @@ brew install scrcpy
 你还需要在 `PATH` 内有 `adb`。如果还没有：

 ```bash
-brew install android-platform-tools
+# Homebrew >= 2.6.0
+brew install --cask android-platform-tools
+
+# Homebrew < 2.6.0
+brew cask install android-platform-tools
 ```

-或者通过 [MacPorts]，该方法同时设置好 adb：
-
-```bash
-sudo port install scrcpy
-```
-
-[MacPorts]: https://www.macports.org/
-
 您也可以[自行构建][BUILD]。


@ -168,7 +140,7 @@ scrcpy --help

 ## 功能介绍

-### 采集设置
+### 捕获设置

 #### 降低分辨率

@ -186,7 +158,7 @@ scrcpy -m 1024  # 简写

 #### 修改码率

-默认码率是 8 Mbps。改变视频码率 (例如改为 2 Mbps)：
+默认码率是 8Mbps。要改变视频的码率 (例如改为 2Mbps)：

 ```bash
 scrcpy --bit-rate 2M
@ -195,7 +167,7 @@ scrcpy -b 2M  # 简写

 #### 限制帧率

-要限制采集的帧率：
+要限制捕获的帧率：

 ```bash
 scrcpy --max-fps 15
@ -222,11 +194,10 @@ scrcpy --crop 1224:1440:0:0   # 以 (0,0) 为原点的 1224x1440 像素
 要锁定镜像画面的方向：

 ```bash
-scrcpy --lock-video-orientation     # 初始（目前）方向
-scrcpy --lock-video-orientation=0   # 自然方向
-scrcpy --lock-video-orientation=1   # 逆时针旋转 90°
-scrcpy --lock-video-orientation=2   # 180°
-scrcpy --lock-video-orientation=3   # 顺时针旋转 90°
+scrcpy --lock-video-orientation 0   # 自然方向
+scrcpy --lock-video-orientation 1   # 逆时针旋转 90°
+scrcpy --lock-video-orientation 2   # 180°
+scrcpy --lock-video-orientation 3   # 顺时针旋转 90°
 ```

 只影响录制的方向。
@ -248,9 +219,7 @@ scrcpy --encoder OMX.qcom.video.encoder.avc
 scrcpy --encoder _
 ```

-### 采集
-
-#### 屏幕录制
+### 屏幕录制

 可以在镜像的同时录制视频：

@ -272,75 +241,6 @@ scrcpy -Nr file.mkv
 [packet delay variation]: https://en.wikipedia.org/wiki/Packet_delay_variation


-#### v4l2loopback
-
-在 Linux 上，可以将视频流发送至 v4l2 回环 (loopback) 设备，因此可以使用任何 v4l2 工具像摄像头一样打开安卓设备。
-
-需安装 `v4l2loopback` 模块：
-
-```bash
-sudo apt install v4l2loopback-dkms
-```
-
-创建一个 v4l2 设备：
-
-```bash
-sudo modprobe v4l2loopback
-```
-
-这样会在 `/dev/videoN` 创建一个新的视频设备，其中 `N` 是整数。 ([更多选项](https://github.com/umlaeute/v4l2loopback#options) 可以用来创建多个设备或者特定 ID 的设备)。
-
-列出已启用的设备：
-
-```bash
-# 需要 v4l-utils 包
-v4l2-ctl --list-devices
-
-# 简单但或许足够
-ls /dev/video*
-```
-
-使用一个 v4l2 漏开启 scrcpy：
-
-```bash
-scrcpy --v4l2-sink=/dev/videoN
-scrcpy --v4l2-sink=/dev/videoN --no-display  # 禁用窗口镜像
-scrcpy --v4l2-sink=/dev/videoN -N            # 简写
-```
-
-(将 `N` 替换为设备 ID，使用 `ls /dev/video*` 命令查看)
-
-启用之后，可以使用 v4l2 工具打开视频流：
-
-```bash
-ffplay -i /dev/videoN
-vlc v4l2:///dev/videoN   # VLC 可能存在一些缓冲延迟
-```
-
-例如，可以在 [OBS] 中采集视频。
-
-[OBS]: https://obsproject.com/
-
-
-#### 缓冲
-
-可以加入缓冲，会增加延迟，但可以减少抖动 (见 [#2464])。
-
-[#2464]: https://github.com/Genymobile/scrcpy/issues/2464
-
-对于显示缓冲：
-
-```bash
-scrcpy --display-buffer=50  # 为显示增加 50 毫秒的缓冲
-```
-
-对于 V4L2 漏:
-
-```bash
-scrcpy --v4l2-buffer=500    # 为 v4l2 漏增加 500 毫秒的缓冲
-```
-
-
 ### 连接

 #### 无线
@ -349,17 +249,16 @@ _Scrcpy_ 使用 `adb` 与设备通信，并且 `adb` 支持通过 TCP/IP [连接

 1. 将设备和电脑连接至同一 Wi-Fi。
 2. 打开 设置 → 关于手机 → 状态信息，获取设备的 IP 地址，也可以执行以下的命令：
-
    ```bash
    adb shell ip route | awk '{print $9}'
    ```

-3. 启用设备的网络 adb 功能： `adb tcpip 5555`。
+3. 启用设备的网络 adb 功能 `adb tcpip 5555`。
 4. 断开设备的 USB 连接。
-5. 连接到您的设备：`adb connect DEVICE_IP:5555` _(将 `DEVICE_IP` 替换为设备 IP)_。
+5. 连接到您的设备：`adb connect DEVICE_IP:5555` _(将 `DEVICE_IP` 替换为设备 IP)_.
 6. 正常运行 `scrcpy`。

-可能降低码率和分辨率会更好一些：
+可能需要降低码率和分辨率：

 ```bash
 scrcpy --bit-rate 2M --max-size 800
@ -428,7 +327,7 @@ scrcpy --force-adb-forward
 ```


-类似地，对于无线连接，可能需要降低画面质量：
+类似无线网络连接，可能需要降低画面质量：

 ```
 scrcpy -b2M -m800 --max-fps 15
@ -454,7 +353,7 @@ scrcpy --window-x 100 --window-y 100 --window-width 800 --window-height 600

 #### 无边框

-禁用窗口边框：
+关闭边框：

 ```bash
 scrcpy --window-borderless
@ -470,7 +369,7 @@ scrcpy --always-on-top

 #### 全屏

-您可以通过如下命令直接全屏启动 scrcpy：
+您可以通过如下命令直接全屏启动scrcpy：

 ```bash
 scrcpy --fullscreen
@ -495,7 +394,7 @@ scrcpy --rotation 1

 也可以使用 <kbd>MOD</kbd>+<kbd>←</kbd> _(左箭头)_ 和 <kbd>MOD</kbd>+<kbd>→</kbd> _(右箭头)_ 随时更改。

-需要注意的是， _scrcpy_ 中有三类旋转方向：
+需要注意的是， _scrcpy_ 有三个不同的方向：
 - <kbd>MOD</kbd>+<kbd>r</kbd> 请求设备在竖屏和横屏之间切换 (如果前台应用程序不支持请求的朝向，可能会拒绝该请求)。
 - [`--lock-video-orientation`](#锁定屏幕方向) 改变镜像的朝向 (设备传输到电脑的画面的朝向)。这会影响录制。
 - `--rotation` (或 <kbd>MOD</kbd>+<kbd>←</kbd>/<kbd>MOD</kbd>+<kbd>→</kbd>) 只旋转窗口的内容。这只影响显示，不影响录制。
@ -505,7 +404,7 @@ scrcpy --rotation 1

 #### 只读

-禁用电脑对设备的控制 (任何可与设备交互的方式：如键盘输入、鼠标事件和文件拖放)：
+禁用电脑对设备的控制 (如键盘输入、鼠标事件和文件拖放)：

 ```bash
 scrcpy --no-control
@ -531,14 +430,14 @@ adb shell dumpsys display   # 在输出中搜索 “mDisplayId=”

 #### 保持常亮

-阻止设备在连接时一段时间后休眠：
+阻止设备在连接时休眠：

 ```bash
 scrcpy --stay-awake
 scrcpy -w
 ```

-scrcpy 关闭时会恢复设备原来的设置。
+程序关闭时会恢复设备原来的设置。


 #### 关闭设备屏幕
@ -552,7 +451,7 @@ scrcpy -S

 或者在任何时候按 <kbd>MOD</kbd>+<kbd>o</kbd>。

-要重新打开屏幕，按下 <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>。
+要重新打开屏幕，按下 <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>.

 在Android上，`电源` 按钮始终能把屏幕打开。为了方便，对于在 _scrcpy_ 中发出的 `电源` 事件 (通过鼠标右键或 <kbd>MOD</kbd>+<kbd>p</kbd>)，会 (尽最大的努力) 在短暂的延迟后将屏幕关闭。设备上的 `电源` 按钮仍然能打开设备屏幕。

@ -563,17 +462,20 @@ scrcpy --turn-screen-off --stay-awake
 scrcpy -Sw
 ```

-#### 退出时息屏

-scrcpy 退出时关闭设备屏幕：
+#### 渲染过期帧
+
+默认状态下，为了降低延迟， _scrcpy_ 永远渲染解码成功的最近一帧，并跳过前面任意帧。
+
+强制渲染所有帧 (可能导致延迟变高)：

 ```bash
-scrcpy --power-off-on-close
+scrcpy --render-expired-frames
 ```

 #### 显示触摸

-在演示时，可能会需要显示 (在物理设备上的) 物理触摸点。
+在演示时，可能会需要显示物理触摸点 (在物理设备上的触摸点)。

 Android 在 _开发者选项_ 中提供了这项功能。

@ -636,32 +538,10 @@ scrcpy --disable-screensaver

 更准确的说，在按住鼠标左键时按住 <kbd>Ctrl</kbd>。直到松开鼠标左键，所有鼠标移动将以屏幕中心为原点，缩放或旋转内容 (如果应用支持)。

-实际上，_scrcpy_ 会在关于屏幕中心对称的位置上用“虚拟手指”发出触摸事件。
+实际上，_scrcpy_ 会在以屏幕中心对称的位置上生成由“虚拟手指”发出的额外触摸事件。

-#### 物理键盘模拟 (HID)

-默认情况下，scrcpy 使用安卓按键或文本注入，这在任何情况都可以使用，但仅限于ASCII字符。
-
-在 Linux 上，scrcpy 可以模拟为 Android 上的物理 USB 键盘，以提供更好地输入体验 (使用 [USB HID over AOAv2][hid-aoav2])：禁用虚拟键盘，并适用于任何字符和输入法。
-
-[hid-aoav2]: https://source.android.com/devices/accessories/aoa2#hid-support
-
-不过，这种方法仅支持 USB 连接以及 Linux平台。
-
-启用 HID 模式：
-
-```bash
-scrcpy --hid-keyboard
-scrcpy -K  # 简写
-```
-
-如果失败了 (如设备未通过 USB 连接)，则自动回退至默认模式 (终端中会输出日志)。这即允许通过 USB 和 TCP/IP 连接时使用相同的命令行参数。
-
-在这种模式下，原始按键事件 (扫描码) 被发送给设备，而与宿主机按键映射无关。因此，若键盘布局不匹配，需要在 Android 设备上进行配置，具体为 设置 → 系统 → 语言和输入法 → [实体键盘]。
-
-[Physical keyboard]: https://github.com/Genymobile/scrcpy/pull/2632#issuecomment-923756915
-
-#### 文本注入偏好
+#### 文字注入偏好

 打字的时候，系统会产生两种[事件][textevents]：
 - _按键事件_ ，代表一个按键被按下或松开。
@ -677,15 +557,13 @@ scrcpy --prefer-text

 (这会导致键盘在游戏中工作不正常)

-该选项不影响 HID 键盘 (该模式下，所有按键都发送为扫描码)。
-
 [textevents]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-text-input
 [prefertext]: https://github.com/Genymobile/scrcpy/issues/650#issuecomment-512945343


 #### 按键重复

-默认状态下，按住一个按键不放会生成多个重复按键事件。在某些游戏中这通常没有实际用途，且可能会导致性能问题。
+默认状态下，按住一个按键不放会生成多个重复按键事件。在某些游戏中这可能会导致性能问题。

 避免转发重复按键事件：

@ -693,11 +571,10 @@ scrcpy --prefer-text
 scrcpy --no-key-repeat
 ```

-该选项不影响 HID 键盘 (该模式下，按键重复由 Android 直接管理)。

 #### 右键和中键

-默认状态下，右键会触发返回键 (或电源键开启)，中键会触发 HOME 键。要禁用这些快捷键并把所有点击转发到设备：
+默认状态下，右键会触发返回键 (或电源键)，中键会触发 HOME 键。要禁用这些快捷键并把所有点击转发到设备：

 ```bash
 scrcpy --forward-all-clicks
@ -710,27 +587,27 @@ scrcpy --forward-all-clicks

 将 APK 文件 (文件名以 `.apk` 结尾) 拖放到 _scrcpy_ 窗口来安装。

-不会有视觉反馈，终端会输出一条日志。
+该操作在屏幕上不会出现任何变化，而会在控制台输出一条日志。


 #### 将文件推送至设备

-要推送文件到设备的 `/sdcard/Download/`，将 (非 APK) 文件拖放至 _scrcpy_ 窗口。
+要推送文件到设备的 `/sdcard/`，将 (非 APK) 文件拖放至 _scrcpy_ 窗口。

-不会有视觉反馈，终端会输出一条日志。
+该操作没有可见的响应，只会在控制台输出日志。

 在启动时可以修改目标目录：

 ```bash
-scrcpy --push-target=/sdcard/Movies/
+scrcpy --push-target /sdcard/foo/bar/
 ```


 ### 音频转发

-_Scrcpy_ 不支持音频。请使用 [sndcpy]。
+_Scrcpy_ 不支持音频。请使用 [sndcpy].

-另见 [issue #14]。
+另外请阅读 [issue #14]。

 [sndcpy]: https://github.com/rom1v/sndcpy
 [issue #14]: https://github.com/Genymobile/scrcpy/issues/14
@ -755,46 +632,36 @@ _<kbd>[Super]</kbd> 键通常是指 <kbd>Windows</kbd> 或 <kbd>Cmd</kbd> 键。

 [Super]: https://en.wikipedia.org/wiki/Super_key_(keyboard_button)

- | 操作                              | 快捷键
- | --------------------------------- | :-------------------------------------------
- | 全屏                              | <kbd>MOD</kbd>+<kbd>f</kbd>
- | 向左旋转屏幕                      | <kbd>MOD</kbd>+<kbd>←</kbd> _(左箭头)_
- | 向右旋转屏幕                      | <kbd>MOD</kbd>+<kbd>→</kbd> _(右箭头)_
- | 将窗口大小重置为1:1 (匹配像素)    | <kbd>MOD</kbd>+<kbd>g</kbd>
- | 将窗口大小重置为消除黑边          | <kbd>MOD</kbd>+<kbd>w</kbd> \| _双击左键¹_
- | 点按 `主屏幕`                     | <kbd>MOD</kbd>+<kbd>h</kbd> \| _中键_
- | 点按 `返回`                       | <kbd>MOD</kbd>+<kbd>b</kbd> \| _右键²_
- | 点按 `切换应用`                   | <kbd>MOD</kbd>+<kbd>s</kbd> \| _第4键³_
- | 点按 `菜单` (解锁屏幕)            | <kbd>MOD</kbd>+<kbd>m</kbd>
- | 点按 `音量+`                      | <kbd>MOD</kbd>+<kbd>↑</kbd> _(上箭头)_
- | 点按 `音量-`                      | <kbd>MOD</kbd>+<kbd>↓</kbd> _(下箭头)_
- | 点按 `电源`                       | <kbd>MOD</kbd>+<kbd>p</kbd>
- | 打开屏幕                          | _鼠标右键²_
- | 关闭设备屏幕 (但继续在电脑上显示) | <kbd>MOD</kbd>+<kbd>o</kbd>
- | 打开设备屏幕                      | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>
- | 旋转设备屏幕                      | <kbd>MOD</kbd>+<kbd>r</kbd>
- | 展开通知面板                      | <kbd>MOD</kbd>+<kbd>n</kbd> \| _第5键³_
- | 展开设置面板                      | <kbd>MOD</kbd>+<kbd>n</kbd>+<kbd>n</kbd> \| _双击第5键³_
- | 收起通知面板                      | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
- | 复制到剪贴板⁴                     | <kbd>MOD</kbd>+<kbd>c</kbd>
- | 剪切到剪贴板⁴                     | <kbd>MOD</kbd>+<kbd>x</kbd>
- | 同步剪贴板并粘贴⁴                 | <kbd>MOD</kbd>+<kbd>v</kbd>
- | 注入电脑剪贴板文本                | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
- | 打开/关闭FPS显示 (至标准输出)     | <kbd>MOD</kbd>+<kbd>i</kbd>
- | 捏拉缩放                          | <kbd>Ctrl</kbd>+_按住并移动鼠标_
- | 拖放 APK 文件                     | 从电脑安装 APK 文件
- | 拖放非 APK 文件                   | [将文件推送至设备](#push-file-to-device)
+ | 操作                              | 快捷键                                       |
+ | --------------------------------- | :------------------------------------------- |
+ | 全屏                              | <kbd>MOD</kbd>+<kbd>f</kbd>                  |
+ | 向左旋转屏幕                      | <kbd>MOD</kbd>+<kbd>←</kbd> _(左箭头)_       |
+ | 向右旋转屏幕                      | <kbd>MOD</kbd>+<kbd>→</kbd> _(右箭头)_       |
+ | 将窗口大小重置为1:1 (匹配像素)    | <kbd>MOD</kbd>+<kbd>g</kbd>                  |
+ | 将窗口大小重置为消除黑边          | <kbd>MOD</kbd>+<kbd>w</kbd> \| _双击¹_       |
+ | 点按 `主屏幕`                     | <kbd>MOD</kbd>+<kbd>h</kbd> \| _鼠标中键_    |
+ | 点按 `返回`                       | <kbd>MOD</kbd>+<kbd>b</kbd> \| _鼠标右键²_   |
+ | 点按 `切换应用`                   | <kbd>MOD</kbd>+<kbd>s</kbd>                  |
+ | 点按 `菜单` (解锁屏幕)            | <kbd>MOD</kbd>+<kbd>m</kbd>                  |
+ | 点按 `音量+`                      | <kbd>MOD</kbd>+<kbd>↑</kbd> _(上箭头)_       |
+ | 点按 `音量-`                      | <kbd>MOD</kbd>+<kbd>↓</kbd> _(下箭头)_       |
+ | 点按 `电源`                       | <kbd>MOD</kbd>+<kbd>p</kbd>                  |
+ | 打开屏幕                          | _鼠标右键²_                                  |
+ | 关闭设备屏幕 (但继续在电脑上显示) | <kbd>MOD</kbd>+<kbd>o</kbd>                  |
+ | 打开设备屏幕                      | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd> |
+ | 旋转设备屏幕                      | <kbd>MOD</kbd>+<kbd>r</kbd>                  |
+ | 展开通知面板                      | <kbd>MOD</kbd>+<kbd>n</kbd>                  |
+ | 收起通知面板                      | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd> |
+ | 复制到剪贴板³                     | <kbd>MOD</kbd>+<kbd>c</kbd>                  |
+ | 剪切到剪贴板³                     | <kbd>MOD</kbd>+<kbd>x</kbd>                  |
+ | 同步剪贴板并粘贴³                 | <kbd>MOD</kbd>+<kbd>v</kbd>                  |
+ | 注入电脑剪贴板文本                | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd> |
+ | 打开/关闭FPS显示 (在 stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>                  |
+ | 捏拉缩放                          | <kbd>Ctrl</kbd>+_按住并移动鼠标_             |

-_¹双击黑边可以去除黑边。_  
-_²点击鼠标右键将在屏幕熄灭时点亮屏幕，其余情况则视为按下返回键 。_  
-_³鼠标的第4键和第5键。_  
-_⁴需要安卓版本 Android >= 7。_
-
-有重复按键的快捷键通过松开再按下一个按键来进行，如“展开设置面板”：
-
- 1. 按下 <kbd>MOD</kbd> 不放。
- 2. 双击 <kbd>n</kbd>。
- 3. 松开 <kbd>MOD</kbd>。
+_¹双击黑边可以去除黑边_
+_²点击鼠标右键将在屏幕熄灭时点亮屏幕，其余情况则视为按下返回键 。_
+_³需要安卓版本 Android >= 7。_

 所有的 <kbd>Ctrl</kbd>+_按键_ 的快捷键都会被转发到设备，所以会由当前应用程序进行处理。

@ -803,20 +670,18 @@ _⁴需要安卓版本 Android >= 7。_

 要使用指定的 _adb_ 二进制文件，可以设置环境变量 `ADB`：

-```bash
-ADB=/path/to/adb scrcpy
-```
+    ADB=/path/to/adb scrcpy

 要覆盖 `scrcpy-server` 的路径，可以设置 `SCRCPY_SERVER_PATH`。

-要覆盖图标，可以设置其路径至 `SCRCPY_ICON_PATH`。
+[useful]: https://github.com/Genymobile/scrcpy/issues/278#issuecomment-429330345


 ## 为什么叫 _scrcpy_ ？

 一个同事让我找出一个和 [gnirehtet] 一样难以发音的名字。

-[`strcpy`] 复制一个 **str**ing （字符串）； `scrcpy` 复制一个 **scr**een （屏幕）。
+[`strcpy`] 复制一个 **str**ing； `scrcpy` 复制一个 **scr**een。

 [gnirehtet]: https://github.com/Genymobile/gnirehtet
 [`strcpy`]: http://man7.org/linux/man-pages/man3/strcpy.3.html
@ -824,12 +689,14 @@ ADB=/path/to/adb scrcpy

 ## 如何构建？

-请查看 [BUILD]。
+请查看[BUILD]。
+
+[BUILD]: BUILD.md


 ## 常见问题

-请查看 [FAQ](FAQ.md)。
+请查看[FAQ](FAQ.md)。


 ## 开发者
@ -842,7 +709,7 @@ ADB=/path/to/adb scrcpy
 ## 许可协议

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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.zh-Hant.md
+++ b/README.zh-Hant.md
@ -679,7 +679,7 @@ _³只支援 Android 7+。_
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2022 Romain Vimont
+    Copyright (C) 2018-2021 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/meson.build
+++ b/app/meson.build
@ -1,7 +1,6 @@
 src = [
    'src/main.c',
    'src/adb.c',
-    'src/adb_parser.c',
    'src/adb_tunnel.c',
    'src/cli.c',
    'src/clock.c',
@ -26,9 +25,7 @@ src = [
    'src/server.c',
    'src/stream.c',
    'src/video_buffer.c',
-    'src/util/acksync.c',
    'src/util/file.c',
-    'src/util/intmap.c',
    'src/util/intr.c',
    'src/util/log.c',
    'src/util/net.c',
@ -42,29 +39,16 @@ src = [
    'src/util/tick.c',
 ]

-conf = configuration_data()
-
-conf.set('_POSIX_C_SOURCE', '200809L')
-conf.set('_XOPEN_SOURCE', '700')
-conf.set('_GNU_SOURCE', true)
-
 if host_machine.system() == 'windows'
-    windows = import('windows')
    src += [
        'src/sys/win/file.c',
        'src/sys/win/process.c',
-        windows.compile_resources('scrcpy-windows.rc'),
    ]
-    conf.set('_WIN32_WINNT', '0x0600')
-    conf.set('WINVER', '0x0600')
 else
    src += [
        'src/sys/unix/file.c',
        'src/sys/unix/process.c',
    ]
-    if host_machine.system() == 'darwin'
-        conf.set('_DARWIN_C_SOURCE', true)
-    endif
 endif

 v4l2_support = host_machine.system() == 'linux'
@ -77,22 +61,23 @@ if aoa_hid_support
    src += [
        'src/aoa_hid.c',
        'src/hid_keyboard.c',
-        'src/hid_mouse.c',
    ]
 endif

+check_functions = [
+    'strdup'
+]
+
 cc = meson.get_compiler('c')

-crossbuild_windows = meson.is_cross_build() and host_machine.system() == 'windows'
-
-if not crossbuild_windows
+if not get_option('crossbuild_windows')

    # native build
    dependencies = [
-        dependency('libavformat', version: '>= 57.33'),
-        dependency('libavcodec', version: '>= 57.37'),
+        dependency('libavformat'),
+        dependency('libavcodec'),
        dependency('libavutil'),
-        dependency('sdl2', version: '>= 2.0.5'),
+        dependency('sdl2'),
    ]

    if v4l2_support
@ -143,11 +128,7 @@ if host_machine.system() == 'windows'
    dependencies += cc.find_library('ws2_32')
 endif

-check_functions = [
-    'strdup',
-    'asprintf',
-    'vasprintf',
-]
+conf = configuration_data()

 foreach f : check_functions
  if cc.has_function(f)
@ -156,9 +137,6 @@ foreach f : check_functions
  endif
 endforeach

-conf.set('HAVE_SOCK_CLOEXEC', host_machine.system() != 'windows' and
-                              cc.has_header_symbol('sys/socket.h', 'SOCK_CLOEXEC'))
-
 # the version, updated on release
 conf.set_quoted('SCRCPY_VERSION', meson.project_version())

@ -211,14 +189,8 @@ install_data('../data/icon.png',
 # do not build tests in release (assertions would not be executed at all)
 if get_option('buildtype') == 'debug'
    tests = [
-        ['test_adb_parser', [
-            'tests/test_adb_parser.c',
-            'src/adb_parser.c',
-            'src/util/str.c',
-            'src/util/strbuf.c',
-        ]],
        ['test_buffer_util', [
-            'tests/test_buffer_util.c',
+            'tests/test_buffer_util.c'
        ]],
        ['test_cbuf', [
            'tests/test_cbuf.c',
@ -227,7 +199,6 @@ if get_option('buildtype') == 'debug'
            'tests/test_cli.c',
            'src/cli.c',
            'src/options.c',
-            'src/util/net.c',
            'src/util/str.c',
            'src/util/strbuf.c',
            'src/util/term.c',
--- a/app/scrcpy-windows.manifest
+++ b/app/scrcpy-windows.manifest
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-  <asmv3:application>
-    <asmv3:windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-</assembly>
--- a/app/scrcpy-windows.rc
+++ b/app/scrcpy-windows.rc
@ -1,23 +0,0 @@
-#include <winuser.h>
-
-0 ICON "../data/icon.ico"
-1 RT_MANIFEST "scrcpy-windows.manifest"
-2 VERSIONINFO
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    BEGIN
-      VALUE "FileDescription", "Display and control your Android device"
-      VALUE "InternalName", "scrcpy"
-      VALUE "LegalCopyright", "Romain Vimont, Genymobile"
-      VALUE "OriginalFilename", "scrcpy.exe"
-      VALUE "ProductName", "scrcpy"
-      VALUE "ProductVersion", "1.21"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1252
-  END
-END
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@ -90,14 +90,6 @@ This provides a better experience for IME users, and allows to generate non-ASCI

 It may only work over USB, and is currently only supported on Linux.

-The keyboard layout must be configured (once and for all) on the device, via Settings -> System -> Languages and input -> Physical keyboard. This settings page can be started directly:
-
-    adb shell am start -a android.settings.HARD_KEYBOARD_SETTINGS
-
-However, the option is only available when the HID keyboard is enabled (or a physical keyboard is connected).
-
-Also see \fB\-\-hid\-mouse\fR.
-
 .TP
 .B \-\-legacy\-paste
 Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+Shift+v).
@ -122,24 +114,6 @@ Limit both the width and height of the video to \fIvalue\fR. The other dimension

 Default is 0 (unlimited).

-.TP
-.B \-M, \-\-hid\-mouse
-Simulate a physical mouse by using HID over AOAv2.
-
-In this mode, the computer mouse is captured to control the device directly (relative mouse mode).
-
-LAlt, LSuper or RSuper toggle the capture mode, to give control of the mouse back to the computer.
-
-It may only work over USB, and is currently only supported on Linux.
-
-Also see \fB\-\-hid\-keyboard\fR.
-
-.TP
-.B \-\-no\-clipboard\-autosync
-By default, scrcpy automatically synchronizes the computer clipboard to the device clipboard before injecting Ctrl+v, and the device clipboard to the computer clipboard whenever it changes.
-
-This option disables this automatic synchronization.
-
 .TP
 .B \-n, \-\-no\-control
 Disable device control (mirror the device in read\-only).
@ -179,10 +153,6 @@ Set the target directory for pushing files to the device by drag & drop. It is p

 Default is "/sdcard/Download/".

-.TP
-.B \-\-raw\-key\-events
-Inject key events for all input keys, and ignore text events.
-
 .TP
 .BI "\-r, \-\-record " file
 Record screen to
@ -223,14 +193,6 @@ For example, to use either LCtrl+LAlt or LSuper for scrcpy shortcuts, pass "lctr

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

-.TP
-.BI "\-\-tcpip[=ip[:port]]
-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 of the current device (typically connected over USB), enables TCP/IP mode, then connects to this address before starting.
-
 .TP
 .B \-S, \-\-turn\-screen\-off
 Turn the device screen off immediately.
@ -241,18 +203,6 @@ Enable "show touches" on start, restore the initial value on exit.

 It only shows physical touches (not clicks from scrcpy).

-.TP
-.BI "\-\-tunnel\-host " ip
-Set the IP address of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.
-
-Default is localhost.
-
-.TP
-.BI "\-\-tunnel\-port " port
-Set the TCP port of the adb tunnel to reach the scrcpy server. This option automatically enables --force-adb-forward.
-
-Default is 0 (not forced): the local port used for establishing the tunnel will be used.
-
 .TP
 .BI "\-\-v4l2-sink " /dev/videoN
 Output to v4l2loopback device.
@ -427,15 +377,11 @@ Push file to device (see \fB\-\-push\-target\fR)

 .TP
 .B ADB
-Path to adb.
-
-.TP
-.B SCRCPY_ICON_PATH
-Path to the program icon.
+Specify the path to adb.

 .TP
 .B SCRCPY_SERVER_PATH
-Path to the server binary.
+Specify the path to server binary.


 .SH AUTHORS
@ -460,7 +406,7 @@ Copyright \(co 2018 Genymobile
 Genymobile
 .UE

-Copyright \(co 2018\-2022
+Copyright \(co 2018\-2020
 .MT rom@rom1v.com
 Romain Vimont
 .ME
--- a/app/src/adb.c
+++ b/app/src/adb.c
@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <string.h>

-#include "adb_parser.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/process_intr.h"
@ -87,8 +86,7 @@ show_adb_err_msg(enum sc_process_result err, const char *const argv[]) {
 #define MAX_COMMAND_STRING_LEN 1024
    char *buf = malloc(MAX_COMMAND_STRING_LEN);
    if (!buf) {
-        LOG_OOM();
-        LOGE("Failed to execute");
+        LOGE("Failed to execute (could not allocate error message)");
        return;
    }

@ -112,61 +110,18 @@ show_adb_err_msg(enum sc_process_result err, const char *const argv[]) {
    free(buf);
 }

-static bool
-process_check_success_internal(sc_pid pid, const char *name, bool close,
-                               unsigned flags) {
-    bool log_errors = !(flags & SC_ADB_NO_LOGERR);
+static sc_pid
+adb_execute_p(const char *serial, const char *const adb_cmd[],
+              size_t len, unsigned inherit, sc_pipe *pout) {
+    int i;
+    sc_pid pid;

-    if (pid == SC_PROCESS_NONE) {
-        if (log_errors) {
-            LOGE("Could not execute \"%s\"", name);
-        }
-        return false;
-    }
-    sc_exit_code exit_code = sc_process_wait(pid, close);
-    if (exit_code) {
-        if (log_errors) {
-            if (exit_code != SC_EXIT_CODE_NONE) {
-                LOGE("\"%s\" returned with value %" SC_PRIexitcode, name,
-                     exit_code);
-            } else {
-                LOGE("\"%s\" exited unexpectedly", name);
-            }
-        }
-        return false;
-    }
-    return true;
-}
-
-static bool
-process_check_success_intr(struct sc_intr *intr, sc_pid pid, const char *name,
-                           unsigned flags) {
-    if (!sc_intr_set_process(intr, pid)) {
-        // Already interrupted
-        return false;
-    }
-
-    // Always pass close=false, interrupting would be racy otherwise
-    bool ret = process_check_success_internal(pid, name, false, flags);
-
-    sc_intr_set_process(intr, SC_PROCESS_NONE);
-
-    // Close separately
-    sc_process_close(pid);
-
-    return ret;
-}
-
-static const char **
-adb_create_argv(const char *serial, const char *const adb_cmd[], size_t len) {
    const char **argv = malloc((len + 4) * sizeof(*argv));
    if (!argv) {
-        LOG_OOM();
-        return NULL;
+        return SC_PROCESS_NONE;
    }

    argv[0] = get_adb_command();
-    int i;
    if (serial) {
        argv[1] = "-s";
        argv[2] = serial;
@ -177,31 +132,9 @@ adb_create_argv(const char *serial, const char *const adb_cmd[], size_t len) {

    memcpy(&argv[i], adb_cmd, len * sizeof(const char *));
    argv[len + i] = NULL;
-    return argv;
-}
-
-static sc_pid
-adb_execute_p(const char *serial, const char *const adb_cmd[], size_t len,
-              unsigned flags, sc_pipe *pout) {
-    const char **argv = adb_create_argv(serial, adb_cmd, len);
-    if (!argv) {
-        return SC_PROCESS_NONE;
-    }
-
-    unsigned process_flags = 0;
-    if (flags & SC_ADB_NO_STDOUT) {
-        process_flags |= SC_PROCESS_NO_STDOUT;
-    }
-    if (flags & SC_ADB_NO_STDERR) {
-        process_flags |= SC_PROCESS_NO_STDERR;
-    }
-
-    sc_pid pid;
    enum sc_process_result r =
-        sc_process_execute_p(argv, &pid, process_flags, NULL, pout, NULL);
+        sc_process_execute_p(argv, &pid, inherit, NULL, pout, NULL);
    if (r != SC_PROCESS_SUCCESS) {
-        // If the execution itself failed (not the command exit code), log the
-        // error in all cases
        show_adb_err_msg(r, argv);
        pid = SC_PROCESS_NONE;
    }
@ -212,62 +145,53 @@ adb_execute_p(const char *serial, const char *const adb_cmd[], size_t len,

 sc_pid
 adb_execute(const char *serial, const char *const adb_cmd[], size_t len,
-            unsigned flags) {
-    return adb_execute_p(serial, adb_cmd, len, flags, NULL);
+            unsigned inherit) {
+    return adb_execute_p(serial, adb_cmd, len, inherit, NULL);
 }

-bool
-adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
-            const char *device_socket_name, unsigned flags) {
+static sc_pid
+adb_exec_forward(const char *serial, uint16_t local_port,
+                 const char *device_socket_name, unsigned inherit) {
    char local[4 + 5 + 1]; // tcp:PORT
    char remote[108 + 14 + 1]; // localabstract:NAME
    sprintf(local, "tcp:%" PRIu16, local_port);
    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
    const char *const adb_cmd[] = {"forward", local, remote};
-
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
-    return process_check_success_intr(intr, pid, "adb forward", flags);
+    return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), inherit);
 }

-bool
-adb_forward_remove(struct sc_intr *intr, const char *serial,
-                   uint16_t local_port, unsigned flags) {
+static sc_pid
+adb_exec_forward_remove(const char *serial, uint16_t local_port,
+                        unsigned inherit) {
    char local[4 + 5 + 1]; // tcp:PORT
    sprintf(local, "tcp:%" PRIu16, local_port);
    const char *const adb_cmd[] = {"forward", "--remove", local};
-
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
-    return process_check_success_intr(intr, pid, "adb forward --remove", flags);
+    return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), inherit);
 }

-bool
-adb_reverse(struct sc_intr *intr, const char *serial,
-            const char *device_socket_name, uint16_t local_port,
-            unsigned flags) {
+static sc_pid
+adb_exec_reverse(const char *serial, const char *device_socket_name,
+                 uint16_t local_port, unsigned inherit) {
    char local[4 + 5 + 1]; // tcp:PORT
    char remote[108 + 14 + 1]; // localabstract:NAME
    sprintf(local, "tcp:%" PRIu16, local_port);
    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
    const char *const adb_cmd[] = {"reverse", remote, local};
-
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
-    return process_check_success_intr(intr, pid, "adb reverse", flags);
+    return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), inherit);
 }

-bool
-adb_reverse_remove(struct sc_intr *intr, const char *serial,
-                   const char *device_socket_name, unsigned flags) {
+static sc_pid
+adb_exec_reverse_remove(const char *serial, const char *device_socket_name,
+                        unsigned inherit) {
    char remote[108 + 14 + 1]; // localabstract:NAME
    snprintf(remote, sizeof(remote), "localabstract:%s", device_socket_name);
    const char *const adb_cmd[] = {"reverse", "--remove", remote};
-
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
-    return process_check_success_intr(intr, pid, "adb reverse --remove", flags);
+    return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), inherit);
 }

-bool
-adb_push(struct sc_intr *intr, const char *serial, const char *local,
-         const char *remote, unsigned flags) {
+static sc_pid
+adb_exec_push(const char *serial, const char *local, const char *remote,
+              unsigned inherit) {
 #ifdef __WINDOWS__
    // Windows will parse the string, so the paths must be quoted
    // (see sys/win/command.c)
@ -283,19 +207,18 @@ adb_push(struct sc_intr *intr, const char *serial, const char *local,
 #endif

    const char *const adb_cmd[] = {"push", local, remote};
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
+    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), inherit);

 #ifdef __WINDOWS__
    free((void *) remote);
    free((void *) local);
 #endif

-    return process_check_success_intr(intr, pid, "adb push", flags);
+    return pid;
 }

-bool
-adb_install(struct sc_intr *intr, const char *serial, const char *local,
-            unsigned flags) {
+static sc_pid
+adb_exec_install(const char *serial, const char *local, unsigned inherit) {
 #ifdef __WINDOWS__
    // Windows will parse the string, so the local name must be quoted
    // (see sys/win/command.c)
@ -306,110 +229,72 @@ adb_install(struct sc_intr *intr, const char *serial, const char *local,
 #endif

    const char *const adb_cmd[] = {"install", "-r", local};
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
+    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), inherit);

 #ifdef __WINDOWS__
    free((void *) local);
 #endif

-    return process_check_success_intr(intr, pid, "adb install", flags);
+    return pid;
 }

-bool
-adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
-          unsigned flags) {
-    char port_string[5 + 1];
-    sprintf(port_string, "%" PRIu16, port);
-    const char *const adb_cmd[] = {"tcpip", port_string};
-
-    sc_pid pid = adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags);
-    return process_check_success_intr(intr, pid, "adb tcpip", flags);
-}
-
-bool
-adb_connect(struct sc_intr *intr, const char *ip_port, unsigned flags) {
-    const char *const adb_cmd[] = {"connect", ip_port};
-
-    sc_pipe pout;
-    sc_pid pid = adb_execute_p(NULL, adb_cmd, ARRAY_LEN(adb_cmd), flags, &pout);
-    if (pid == SC_PROCESS_NONE) {
-        LOGE("Could not execute \"adb connect\"");
-        return false;
-    }
-
-    // "adb connect" always returns successfully (with exit code 0), even in
-    // case of failure. As a workaround, check if its output starts with
-    // "connected".
-    char buf[128];
-    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf));
-    sc_pipe_close(pout);
-
-    bool ok = process_check_success_intr(intr, pid, "adb connect", flags);
-    if (!ok) {
-        return false;
-    }
-
-    if (r == -1) {
-        return false;
-    }
-
-    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.
-        sc_str_truncate(buf, r, "\r\n");
-        fprintf(stderr, "%s\n", buf);
-    }
-    return ok;
-}
-
-bool
-adb_disconnect(struct sc_intr *intr, const char *ip_port, unsigned flags) {
-    const char *const adb_cmd[] = {"disconnect", ip_port};
-    size_t len = ip_port ? ARRAY_LEN(adb_cmd)
-                         : ARRAY_LEN(adb_cmd) - 1;
-
-    sc_pid pid = adb_execute(NULL, adb_cmd, len, flags);
-    return process_check_success_intr(intr, pid, "adb disconnect", flags);
-}
-
-char *
-adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
-            unsigned flags) {
-    const char *const adb_cmd[] = {"shell", "getprop", prop};
-
-    sc_pipe pout;
-    sc_pid pid =
-        adb_execute_p(serial, adb_cmd, ARRAY_LEN(adb_cmd), flags, &pout);
-    if (pid == SC_PROCESS_NONE) {
-        LOGE("Could not execute \"adb getprop\"");
-        return NULL;
-    }
-
-    char buf[128];
-    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf));
-    sc_pipe_close(pout);
-
-    bool ok = process_check_success_intr(intr, pid, "adb getprop", flags);
-    if (!ok) {
-        return NULL;
-    }
-
-    if (r == -1) {
-        return NULL;
-    }
-
-    sc_str_truncate(buf, r, " \r\n");
-
-    return strdup(buf);
-}
-
-char *
-adb_get_serialno(struct sc_intr *intr, unsigned flags) {
+static sc_pid
+adb_exec_get_serialno(unsigned inherit, sc_pipe *pout) {
    const char *const adb_cmd[] = {"get-serialno"};
+    return adb_execute_p(NULL, adb_cmd, ARRAY_LEN(adb_cmd), inherit, pout);
+}

+bool
+adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
+            const char *device_socket_name, unsigned inherit) {
+    sc_pid pid =
+        adb_exec_forward(serial, local_port, device_socket_name, inherit);
+    return sc_process_check_success_intr(intr, pid, "adb forward", true);
+}
+
+bool
+adb_forward_remove(struct sc_intr *intr, const char *serial,
+                   uint16_t local_port, unsigned inherit) {
+    sc_pid pid = adb_exec_forward_remove(serial, local_port, inherit);
+    return sc_process_check_success_intr(intr, pid, "adb forward --remove",
+                                         true);
+}
+
+bool
+adb_reverse(struct sc_intr *intr, const char *serial,
+            const char *device_socket_name, uint16_t local_port,
+            unsigned inherit) {
+    sc_pid pid =
+        adb_exec_reverse(serial, device_socket_name, local_port, inherit);
+    return sc_process_check_success_intr(intr, pid, "adb reverse", true);
+}
+
+bool
+adb_reverse_remove(struct sc_intr *intr, const char *serial,
+                   const char *device_socket_name, unsigned inherit) {
+    sc_pid pid = adb_exec_reverse_remove(serial, device_socket_name, inherit);
+    return sc_process_check_success_intr(intr, pid, "adb reverse --remove",
+                                         true);
+}
+
+bool
+adb_push(struct sc_intr *intr, const char *serial, const char *local,
+         const char *remote, unsigned inherit) {
+    sc_pid pid = adb_exec_push(serial, local, remote, inherit);
+    return sc_process_check_success_intr(intr, pid, "adb push", true);
+}
+
+bool
+adb_install(struct sc_intr *intr, const char *serial, const char *local,
+            unsigned inherit) {
+    sc_pid pid = adb_exec_install(serial, local, inherit);
+    return sc_process_check_success_intr(intr, pid, "adb install", true);
+}
+
+char *
+adb_get_serialno(struct sc_intr *intr, unsigned inherit) {
    sc_pipe pout;
-    sc_pid pid = adb_execute_p(NULL, adb_cmd, ARRAY_LEN(adb_cmd), flags, &pout);
+    sc_pid pid = adb_exec_get_serialno(inherit, &pout);
    if (pid == SC_PROCESS_NONE) {
        LOGE("Could not execute \"adb get-serialno\"");
        return NULL;
@ -419,53 +304,13 @@ adb_get_serialno(struct sc_intr *intr, unsigned flags) {
    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf));
    sc_pipe_close(pout);

-    bool ok = process_check_success_intr(intr, pid, "adb get-serialno", flags);
+    bool ok =
+        sc_process_check_success_intr(intr, pid, "adb get-serialno", true);
    if (!ok) {
        return NULL;
    }

-    if (r == -1) {
-        return false;
-    }
-
    sc_str_truncate(buf, r, " \r\n");

    return strdup(buf);
 }
-
-char *
-adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {
-    const char *const cmd[] = {"shell", "ip", "route"};
-
-    sc_pipe pout;
-    sc_pid pid = adb_execute_p(serial, cmd, ARRAY_LEN(cmd), flags, &pout);
-    if (pid == SC_PROCESS_NONE) {
-        LOGD("Could not execute \"ip route\"");
-        return NULL;
-    }
-
-    // "adb shell ip route" output should contain only a few lines
-    char buf[1024];
-    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf));
-    sc_pipe_close(pout);
-
-    bool ok = process_check_success_intr(intr, pid, "ip route", flags);
-    if (!ok) {
-        return NULL;
-    }
-
-    if (r == -1) {
-        return false;
-    }
-
-    assert((size_t) r <= sizeof(buf));
-    if (r == sizeof(buf) && buf[sizeof(buf) - 1] != '\0')  {
-        // The implementation assumes that the output of "ip route" fits in the
-        // buffer in a single pass
-        LOGW("Result of \"ip route\" does not fit in 1Kb. "
-             "Please report an issue.\n");
-        return NULL;
-    }
-
-    return sc_adb_parse_device_ip_from_output(buf, r);
-}
--- a/app/src/adb.h
+++ b/app/src/adb.h
@ -8,71 +8,34 @@

 #include "util/intr.h"

-#define SC_ADB_NO_STDOUT (1 << 0)
-#define SC_ADB_NO_STDERR (1 << 1)
-#define SC_ADB_NO_LOGERR (1 << 2)
-
-#define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)
-
 sc_pid
 adb_execute(const char *serial, const char *const adb_cmd[], size_t len,
-            unsigned flags);
+            unsigned inherit);

 bool
 adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
-            const char *device_socket_name, unsigned flags);
+            const char *device_socket_name, unsigned inherit);

 bool
 adb_forward_remove(struct sc_intr *intr, const char *serial,
-                   uint16_t local_port, unsigned flags);
+                   uint16_t local_port, unsigned inherit);

 bool
 adb_reverse(struct sc_intr *intr, const char *serial,
            const char *device_socket_name, uint16_t local_port,
-            unsigned flags);
+            unsigned inherit);

 bool
 adb_reverse_remove(struct sc_intr *intr, const char *serial,
-                   const char *device_socket_name, unsigned flags);
+                   const char *device_socket_name, unsigned inherit);

 bool
 adb_push(struct sc_intr *intr, const char *serial, const char *local,
-         const char *remote, unsigned flags);
+         const char *remote, unsigned inherit);

 bool
 adb_install(struct sc_intr *intr, const char *serial, const char *local,
-            unsigned flags);
-
-/**
- * Execute `adb tcpip <port>`
- */
-bool
-adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
-          unsigned flags);
-
-/**
- * Execute `adb connect <ip_port>`
- *
- * `ip_port` may not be NULL.
- */
-bool
-adb_connect(struct sc_intr *intr, const char *ip_port, unsigned flags);
-
-/**
- * Execute `adb disconnect [<ip_port>]`
- *
- * If `ip_port` is NULL, execute `adb disconnect`.
- * Otherwise, execute `adb disconnect <ip_port>`.
- */
-bool
-adb_disconnect(struct sc_intr *intr, const char *ip_port, unsigned flags);
-
-/**
- * Execute `adb getprop <prop>`
- */
-char *
-adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
-            unsigned flags);
+            unsigned inherit);

 /**
 * Execute `adb get-serialno`
@ -80,15 +43,6 @@ adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
 * Return the result, to be freed by the caller, or NULL on error.
 */
 char *
-adb_get_serialno(struct sc_intr *intr, unsigned flags);
-
-/**
- * Attempt to retrieve the device IP
- *
- * Return the IP as a string of the form "xxx.xxx.xxx.xxx", to be freed by the
- * caller, or NULL on error.
- */
-char *
-adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags);
+adb_get_serialno(struct sc_intr *intr, unsigned inherit);

 #endif
--- a/app/src/adb_parser.c
+++ b/app/src/adb_parser.c
@ -1,65 +0,0 @@
-#include "adb_parser.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "util/log.h"
-#include "util/str.h"
-
-static char *
-sc_adb_parse_device_ip_from_line(char *line, size_t len) {
-    // One line from "ip route" looks lile:
-    // "192.168.1.0/24 dev wlan0  proto kernel  scope link  src 192.168.1.x"
-
-    // Get the location of the device name (index of "wlan0" in the example)
-    ssize_t idx_dev_name = sc_str_index_of_column(line, 2, " ");
-    if (idx_dev_name == -1) {
-        return NULL;
-    }
-
-    // Get the location of the ip address (column 8, but column 6 if we start
-    // from column 2). Must be computed before truncating individual columns.
-    ssize_t idx_ip = sc_str_index_of_column(&line[idx_dev_name], 6, " ");
-    if (idx_ip == -1) {
-        return NULL;
-    }
-    // idx_ip is searched from &line[idx_dev_name]
-    idx_ip += idx_dev_name;
-
-    char *dev_name = &line[idx_dev_name];
-    sc_str_truncate(dev_name, len - idx_dev_name + 1, " \t");
-
-    char *ip = &line[idx_ip];
-    sc_str_truncate(ip, len - idx_ip + 1, " \t");
-
-    // Only consider lines where the device name starts with "wlan"
-    if (strncmp(dev_name, "wlan", sizeof("wlan") - 1)) {
-        LOGD("Device ip lookup: ignoring %s (%s)", ip, dev_name);
-        return NULL;
-    }
-
-    return strdup(ip);
-}
-
-char *
-sc_adb_parse_device_ip_from_output(char *buf, size_t buf_len) {
-    size_t idx_line = 0;
-    while (idx_line < buf_len && buf[idx_line] != '\0') {
-        char *line = &buf[idx_line];
-        size_t len = sc_str_truncate(line, buf_len - idx_line, "\n");
-
-        // The same, but without any trailing '\r'
-        size_t line_len = sc_str_remove_trailing_cr(line, len);
-
-        char *ip = sc_adb_parse_device_ip_from_line(line, line_len);
-        if (ip) {
-            // Found
-            return ip;
-        }
-
-        // The next line starts after the '\n' (replaced by `\0`)
-        idx_line += len + 1;
-    }
-
-    return NULL;
-}
--- a/app/src/adb_parser.h
+++ b/app/src/adb_parser.h
@ -1,14 +0,0 @@
-#ifndef SC_ADB_PARSER_H
-#define SC_ADB_PARSER_H
-
-#include "common.h"
-
-#include "stddef.h"
-
-/**
- * Parse the ip from the output of `adb shell ip route`
- */
-char *
-sc_adb_parse_device_ip_from_output(char *buf, size_t buf_len);
-
-#endif
--- a/app/src/adb_tunnel.c
+++ b/app/src/adb_tunnel.c
@ -20,8 +20,7 @@ enable_tunnel_reverse_any_port(struct sc_adb_tunnel *tunnel,
                               struct sc_port_range port_range) {
    uint16_t port = port_range.first;
    for (;;) {
-        if (!adb_reverse(intr, serial, SC_SOCKET_NAME, port,
-                         SC_ADB_NO_STDOUT)) {
+        if (!adb_reverse(intr, serial, SC_SOCKET_NAME, port, SC_STDERR)) {
            // the command itself failed, it will fail on any port
            return false;
        }
@ -52,8 +51,7 @@ enable_tunnel_reverse_any_port(struct sc_adb_tunnel *tunnel,
        }

        // failure, disable tunnel and try another port
-        if (!adb_reverse_remove(intr, serial, SC_SOCKET_NAME,
-                                SC_ADB_NO_STDOUT)) {
+        if (!adb_reverse_remove(intr, serial, SC_SOCKET_NAME, SC_STDERR)) {
            LOGW("Could not remove reverse tunnel on port %" PRIu16, port);
        }

@ -83,7 +81,7 @@ enable_tunnel_forward_any_port(struct sc_adb_tunnel *tunnel,

    uint16_t port = port_range.first;
    for (;;) {
-        if (adb_forward(intr, serial, port, SC_SOCKET_NAME, SC_ADB_NO_STDOUT)) {
+        if (adb_forward(intr, serial, port, SC_SOCKET_NAME, SC_STDERR)) {
            // success
            tunnel->local_port = port;
            tunnel->enabled = true;
@ -148,11 +146,9 @@ sc_adb_tunnel_close(struct sc_adb_tunnel *tunnel, struct sc_intr *intr,

    bool ret;
    if (tunnel->forward) {
-        ret = adb_forward_remove(intr, serial, tunnel->local_port,
-                                 SC_ADB_NO_STDOUT);
+        ret = adb_forward_remove(intr, serial, tunnel->local_port, SC_STDERR);
    } else {
-        ret = adb_reverse_remove(intr, serial, SC_SOCKET_NAME,
-                                 SC_ADB_NO_STDOUT);
+        ret = adb_reverse_remove(intr, serial, SC_SOCKET_NAME, SC_STDERR);

        assert(tunnel->server_socket != SC_SOCKET_NONE);
        if (!net_close(tunnel->server_socket)) {
--- a/app/src/aoa_hid.c
+++ b/app/src/aoa_hid.c
@ -4,7 +4,6 @@
 #include <stdio.h>

 #include "aoa_hid.h"
-#include "util/log.h"

 // See <https://source.android.com/devices/accessories/aoa2#hid-support>.
 #define ACCESSORY_REGISTER_HID 54
@ -21,7 +20,6 @@ sc_hid_event_log(const struct sc_hid_event *event) {
    unsigned buffer_size = event->size * 3 + 1;
    char *buffer = malloc(buffer_size);
    if (!buffer) {
-        LOG_OOM();
        return;
    }
    for (unsigned i = 0; i < event->size; ++i) {
@ -37,7 +35,7 @@ sc_hid_event_init(struct sc_hid_event *hid_event, uint16_t accessory_id,
    hid_event->accessory_id = accessory_id;
    hid_event->buffer = buffer;
    hid_event->size = buffer_size;
-    hid_event->ack_to_wait = SC_SEQUENCE_INVALID;
+    hid_event->delay = 0;
 }

 void
@ -120,10 +118,7 @@ sc_aoa_open_usb_handle(libusb_device *device, libusb_device_handle **handle) {
 }

 bool
-sc_aoa_init(struct sc_aoa *aoa, const char *serial,
-            struct sc_acksync *acksync) {
-    assert(acksync);
-
+sc_aoa_init(struct sc_aoa *aoa, const char *serial) {
    cbuf_init(&aoa->queue);

    if (!sc_mutex_init(&aoa->mutex)) {
@ -160,7 +155,6 @@ sc_aoa_init(struct sc_aoa *aoa, const char *serial,
    }

    aoa->stopped = false;
-    aoa->acksync = acksync;

    return true;
 }
@ -338,28 +332,23 @@ run_aoa_thread(void *data) {
        assert(non_empty);
        (void) non_empty;

-        uint64_t ack_to_wait = event.ack_to_wait;
-        sc_mutex_unlock(&aoa->mutex);
-
-        if (ack_to_wait != SC_SEQUENCE_INVALID) {
-            LOGD("Waiting ack from server sequence=%" PRIu64_, ack_to_wait);
-            // 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");
-                sc_hid_event_destroy(&event);
-                continue;
-            } else if (result == SC_ACKSYNC_WAIT_INTR) {
-                // stopped
-                sc_hid_event_destroy(&event);
+        assert(event.delay >= 0);
+        if (event.delay) {
+            // Wait during the specified delay before injecting the HID event
+            sc_tick deadline = sc_tick_now() + event.delay;
+            bool timed_out = false;
+            while (!aoa->stopped && !timed_out) {
+                timed_out = !sc_cond_timedwait(&aoa->event_cond, &aoa->mutex,
+                                               deadline);
+            }
+            if (aoa->stopped) {
+                sc_mutex_unlock(&aoa->mutex);
                break;
            }
        }

+        sc_mutex_unlock(&aoa->mutex);
+
        bool ok = sc_aoa_send_hid_event(aoa, &event);
        sc_hid_event_destroy(&event);
        if (!ok) {
@ -373,7 +362,7 @@ bool
 sc_aoa_start(struct sc_aoa *aoa) {
    LOGD("Starting AOA thread");

-    bool ok = sc_thread_create(&aoa->thread, run_aoa_thread, "scrcpy-aoa", aoa);
+    bool ok = sc_thread_create(&aoa->thread, run_aoa_thread, "aoa_thread", aoa);
    if (!ok) {
        LOGC("Could not start AOA thread");
        return false;
@ -388,8 +377,6 @@ sc_aoa_stop(struct sc_aoa *aoa) {
    aoa->stopped = true;
    sc_cond_signal(&aoa->event_cond);
    sc_mutex_unlock(&aoa->mutex);
-
-    sc_acksync_interrupt(aoa->acksync);
 }

 void
--- a/app/src/aoa_hid.h
+++ b/app/src/aoa_hid.h
@ -6,7 +6,6 @@

 #include <libusb-1.0/libusb.h>

-#include "util/acksync.h"
 #include "util/cbuf.h"
 #include "util/thread.h"
 #include "util/tick.h"
@ -15,7 +14,7 @@ struct sc_hid_event {
    uint16_t accessory_id;
    unsigned char *buffer;
    uint16_t size;
-    uint64_t ack_to_wait;
+    sc_tick delay;
 };

 // Takes ownership of buffer
@ -37,12 +36,10 @@ struct sc_aoa {
    sc_cond event_cond;
    bool stopped;
    struct sc_hid_event_queue queue;
-
-    struct sc_acksync *acksync;
 };

 bool
-sc_aoa_init(struct sc_aoa *aoa, const char *serial, struct sc_acksync *acksync);
+sc_aoa_init(struct sc_aoa *aoa, const char *serial);

 void
 sc_aoa_destroy(struct sc_aoa *aoa);
--- a/app/src/cli.c
+++ b/app/src/cli.c
@ -9,7 +9,6 @@

 #include "options.h"
 #include "util/log.h"
-#include "util/net.h"
 #include "util/str.h"
 #include "util/strbuf.h"
 #include "util/term.h"
@ -47,11 +46,6 @@
 #define OPT_V4L2_SINK              1027
 #define OPT_DISPLAY_BUFFER         1028
 #define OPT_V4L2_BUFFER            1029
-#define OPT_TUNNEL_HOST            1030
-#define OPT_TUNNEL_PORT            1031
-#define OPT_NO_CLIPBOARD_AUTOSYNC  1032
-#define OPT_TCPIP                  1033
-#define OPT_RAW_KEY_EVENTS         1034

 struct sc_option {
    char shortopt;
@ -71,11 +65,6 @@ struct sc_shortcut {
    const char *text;
 };

-struct sc_envvar {
-    const char *name;
-    const char *text;
-};
-
 struct sc_getopt_adapter {
    char *optstring;
    struct option *longopts;
@ -171,15 +160,7 @@ static const struct sc_option options[] = {
                "generate non-ASCII characters, contrary to the default "
                "injection method.\n"
                "It may only work over USB, and is currently only supported "
-                "on Linux.\n"
-                "The keyboard layout must be configured (once and for all) on "
-                "the device, via Settings -> System -> Languages and input -> "
-                "Physical keyboard. This settings page can be started "
-                "directly: `adb shell am start -a "
-                "android.settings.HARD_KEYBOARD_SETTINGS`.\n"
-                "However, the option is only available when the HID keyboard "
-                "is enabled (or a physical keyboard is connected).\n"
-                "Also see --hid-mouse.",
+                "on Linux.",
    },
    {
        .shortopt = 'h',
@ -215,18 +196,6 @@ static const struct sc_option options[] = {
        .text = "Limit the frame rate of screen capture (officially supported "
                "since Android 10, but may work on earlier versions).",
    },
-    {
-        .shortopt = 'M',
-        .longopt = "hid-mouse",
-        .text = "Simulate a physical mouse by using HID over AOAv2.\n"
-                "In this mode, the computer mouse is captured to control the "
-                "device directly (relative mouse mode).\n"
-                "LAlt, LSuper or RSuper toggle the capture mode, to give "
-                "control of the mouse back to the computer.\n"
-                "It may only work over USB, and is currently only supported "
-                "on Linux.\n"
-                "Also see --hid-keyboard.",
-    },
    {
        .shortopt = 'm',
        .longopt = "max-size",
@ -236,15 +205,6 @@ static const struct sc_option options[] = {
                "is preserved.\n"
                "Default is 0 (unlimited).",
    },
-    {
-        .longopt_id = OPT_NO_CLIPBOARD_AUTOSYNC,
-        .longopt = "no-clipboard-autosync",
-        .text = "By default, scrcpy automatically synchronizes the computer "
-                "clipboard to the device clipboard before injecting Ctrl+v, "
-                "and the device clipboard to the computer clipboard whenever "
-                "it changes.\n"
-                "This option disables this automatic synchronization."
-    },
    {
        .shortopt = 'n',
        .longopt = "no-control",
@ -253,8 +213,11 @@ static const struct sc_option options[] = {
    {
        .shortopt = 'N',
        .longopt = "no-display",
-        .text = "Do not display device (only when screen recording or V4L2 "
-                "sink is enabled).",
+        .text = "Do not display device (only when screen recording "
+#ifdef HAVE_V4L2
+                "or V4L2 sink "
+#endif
+                "is enabled).",
    },
    {
        .longopt_id = OPT_NO_KEY_REPEAT,
@ -298,11 +261,6 @@ static const struct sc_option options[] = {
                "drag & drop. It is passed as is to \"adb push\".\n"
                "Default is \"/sdcard/Download/\".",
    },
-    {
-        .longopt_id = OPT_RAW_KEY_EVENTS,
-        .longopt = "raw-key-events",
-        .text = "Inject key events for all input keys, and ignore text events."
-    },
    {
        .shortopt = 'r',
        .longopt = "record",
@ -372,33 +330,14 @@ static const struct sc_option options[] = {
                "on exit.\n"
                "It only shows physical touches (not clicks from scrcpy).",
    },
-    {
-        .longopt_id = OPT_TUNNEL_HOST,
-        .longopt = "tunnel-host",
-        .argdesc = "ip",
-        .text = "Set the IP address of the adb tunnel to reach the scrcpy "
-                "server. This option automatically enables "
-                "--force-adb-forward.\n"
-                "Default is localhost.",
-    },
-    {
-        .longopt_id = OPT_TUNNEL_PORT,
-        .longopt = "tunnel-port",
-        .argdesc = "port",
-        .text = "Set the TCP port of the adb tunnel to reach the scrcpy "
-                "server. This option automatically enables "
-                "--force-adb-forward.\n"
-                "Default is 0 (not forced): the local port used for "
-                "establishing the tunnel will be used.",
-    },
+#ifdef HAVE_V4L2
    {
        .longopt_id = OPT_V4L2_SINK,
        .longopt = "v4l2-sink",
        .argdesc = "/dev/videoN",
        .text = "Output to v4l2loopback device.\n"
                "It requires to lock the video orientation (see "
-                "--lock-video-orientation).\n"
-                "This feature is only available on Linux.",
+                "--lock-video-orientation).",
    },
    {
        .longopt_id = OPT_V4L2_BUFFER,
@ -408,9 +347,9 @@ static const struct sc_option options[] = {
                "frames. This increases latency to compensate for jitter.\n"
                "This option is similar to --display-buffer, but specific to "
                "V4L2 sink.\n"
-                "Default is 0 (no buffering).\n"
-                "This option is only available on Linux.",
+                "Default is 0 (no buffering).",
    },
+#endif
    {
        .shortopt = 'V',
        .longopt = "verbosity",
@ -433,20 +372,6 @@ static const struct sc_option options[] = {
        .text = "Keep the device on while scrcpy is running, when the device "
                "is plugged in.",
    },
-    {
-        .longopt_id = OPT_TCPIP,
-        .longopt = "tcpip",
-        .argdesc = "ip[:port]",
-        .optional_arg = true,
-        .text = "Configure and reconnect the device over TCP/IP.\n"
-                "If a destination address is provided, then scrcpy connects to "
-                "this address before starting. The device must listen on the "
-                "given TCP port (default is 5555).\n"
-                "If no destination address is provided, then scrcpy attempts "
-                "to find the IP address of the current device (typically "
-                "connected over USB), enables TCP/IP mode, then connects to "
-                "this address before starting.",
-    },
    {
        .longopt_id = OPT_WINDOW_BORDERLESS,
        .longopt = "window-borderless",
@ -600,21 +525,6 @@ static const struct sc_shortcut shortcuts[] = {
    },
 };

-static const struct sc_envvar envvars[] = {
-    {
-        .name = "ADB",
-        .text = "Path to adb executable",
-    },
-    {
-        .name = "SCRCPY_ICON_PATH",
-        .text = "Path to the program icon",
-    },
-    {
-        .name = "SCRCPY_SERVER_PATH",
-        .text = "Path to the server binary",
-    }
-};
-
 static char *
 sc_getopt_adapter_create_optstring(void) {
    struct sc_strbuf buf;
@ -653,7 +563,6 @@ sc_getopt_adapter_create_longopts(void) {
    struct option *longopts =
        malloc((ARRAY_LEN(options) + 1) * sizeof(*longopts));
    if (!longopts) {
-        LOG_OOM();
        return NULL;
    }

@ -708,7 +617,7 @@ sc_getopt_adapter_init(struct sc_getopt_adapter *adapter) {
    }

    return true;
-}
+};

 static void
 sc_getopt_adapter_destroy(struct sc_getopt_adapter *adapter) {
@ -806,7 +715,7 @@ print_shortcuts_intro(unsigned cols) {
        return;
    }

-    printf("\n%s\n", intro);
+    printf("%s\n", intro);
    free(intro);
 }

@ -834,23 +743,6 @@ print_shortcut(const struct sc_shortcut *shortcut, unsigned cols) {
    free(text);
 }

-static void
-print_envvar(const struct sc_envvar *envvar, unsigned cols) {
-    assert(cols > 8); // sc_str_wrap_lines() requires indent < columns
-    assert(envvar->name);
-    assert(envvar->text);
-
-    printf("\n    %s\n", envvar->name);
-    char *text = sc_str_wrap_lines(envvar->text, cols, 8);
-    if (!text) {
-        printf("<ERROR>\n");
-        return;
-    }
-
-    printf("%s\n", text);
-    free(text);
-}
-
 void
 scrcpy_print_usage(const char *arg0) {
 #define SC_TERM_COLS_DEFAULT 80
@ -878,17 +770,11 @@ scrcpy_print_usage(const char *arg0) {
    }

    // Print shortcuts section
-    printf("\nShortcuts:\n");
+    printf("\nShortcuts:\n\n");
    print_shortcuts_intro(cols);
    for (size_t i = 0; i < ARRAY_LEN(shortcuts); ++i) {
        print_shortcut(&shortcuts[i], cols);
    }
-
-    // Print environment variables section
-    printf("\nEnvironment variables:\n");
-    for (size_t i = 0; i < ARRAY_LEN(envvars); ++i) {
-        print_envvar(&envvars[i], cols);
-    }
 }

 static bool
@ -1131,7 +1017,7 @@ parse_log_level(const char *s, enum sc_log_level *log_level) {
 }

 // item is a list of mod keys separated by '+' (e.g. "lctrl+lalt")
-// returns a bitwise-or of SC_SHORTCUT_MOD_* constants (or 0 on error)
+// returns a bitwise-or of SC_MOD_* constants (or 0 on error)
 static unsigned
 parse_shortcut_mods_item(const char *item, size_t len) {
    unsigned mod = 0;
@ -1149,17 +1035,17 @@ parse_shortcut_mods_item(const char *item, size_t len) {
    ((sizeof(literal)-1 == len) && !memcmp(literal, s, len))

        if (STREQ("lctrl", item, key_len)) {
-            mod |= SC_SHORTCUT_MOD_LCTRL;
+            mod |= SC_MOD_LCTRL;
        } else if (STREQ("rctrl", item, key_len)) {
-            mod |= SC_SHORTCUT_MOD_RCTRL;
+            mod |= SC_MOD_RCTRL;
        } else if (STREQ("lalt", item, key_len)) {
-            mod |= SC_SHORTCUT_MOD_LALT;
+            mod |= SC_MOD_LALT;
        } else if (STREQ("ralt", item, key_len)) {
-            mod |= SC_SHORTCUT_MOD_RALT;
+            mod |= SC_MOD_RALT;
        } else if (STREQ("lsuper", item, key_len)) {
-            mod |= SC_SHORTCUT_MOD_LSUPER;
+            mod |= SC_MOD_LSUPER;
        } else if (STREQ("rsuper", item, key_len)) {
-            mod |= SC_SHORTCUT_MOD_RSUPER;
+            mod |= SC_MOD_RSUPER;
        } else {
            LOGE("Unknown modifier key: %.*s "
                 "(must be one of: lctrl, rctrl, lalt, ralt, lsuper, rsuper)",
@ -1241,21 +1127,6 @@ parse_record_format(const char *optarg, enum sc_record_format *format) {
    return false;
 }

-static bool
-parse_ip(const char *optarg, uint32_t *ipv4) {
-    return net_parse_ipv4(optarg, ipv4);
-}
-
-static bool
-parse_port(const char *optarg, uint16_t *port) {
-    long value;
-    if (!parse_integer_arg(optarg, &value, false, 0, 0xFFFF, "port")) {
-        return false;
-    }
-    *port = (uint16_t) value;
-    return true;
-}
-
 static enum sc_record_format
 guess_record_format(const char *filename) {
    size_t len = strlen(filename);
@ -1310,13 +1181,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                args->help = true;
                break;
            case 'K':
-#ifdef HAVE_AOA_HID
                opts->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_HID;
-#else
-                LOGE("HID over AOA (-K/--hid-keyboard) is not supported on "
-                     "this platform. It is only available on Linux.");
-                return false;
-#endif
                break;
            case OPT_MAX_FPS:
                if (!parse_max_fps(optarg, &opts->max_fps)) {
@ -1328,31 +1193,12 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case 'M':
-#ifdef HAVE_AOA_HID
-                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_HID;
-#else
-                LOGE("HID over AOA (-M/--hid-mouse) is not supported on this"
-                     "platform. It is only available on Linux.");
-                return false;
-#endif
-                break;
            case OPT_LOCK_VIDEO_ORIENTATION:
                if (!parse_lock_video_orientation(optarg,
                        &opts->lock_video_orientation)) {
                    return false;
                }
                break;
-            case OPT_TUNNEL_HOST:
-                if (!parse_ip(optarg, &opts->tunnel_host)) {
-                    return false;
-                }
-                break;
-            case OPT_TUNNEL_PORT:
-                if (!parse_port(optarg, &opts->tunnel_port)) {
-                    return false;
-                }
-                break;
            case 'n':
                opts->control = false;
                break;
@ -1424,18 +1270,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                opts->push_target = optarg;
                break;
            case OPT_PREFER_TEXT:
-                if (opts->key_inject_mode != SC_KEY_INJECT_MODE_MIXED) {
-                    LOGE("--prefer-text is incompatible with --raw-key-events");
-                    return false;
-                }
-                opts->key_inject_mode = SC_KEY_INJECT_MODE_TEXT;
-                break;
-            case OPT_RAW_KEY_EVENTS:
-                if (opts->key_inject_mode != SC_KEY_INJECT_MODE_MIXED) {
-                    LOGE("--prefer-text is incompatible with --raw-key-events");
-                    return false;
-                }
-                opts->key_inject_mode = SC_KEY_INJECT_MODE_RAW;
+                opts->prefer_text = true;
                break;
            case OPT_ROTATION:
                if (!parse_rotation(optarg, &opts->rotation)) {
@ -1482,51 +1317,22 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case OPT_NO_CLIPBOARD_AUTOSYNC:
-                opts->clipboard_autosync = false;
-                break;
-            case OPT_TCPIP:
-                opts->tcpip = true;
-                opts->tcpip_dst = optarg;
-                break;
-            case OPT_V4L2_SINK:
 #ifdef HAVE_V4L2
+            case OPT_V4L2_SINK:
                opts->v4l2_device = optarg;
-#else
-                LOGE("V4L2 (--v4l2-sink) is only available on Linux.");
-                return false;
-#endif
                break;
            case OPT_V4L2_BUFFER:
-#ifdef HAVE_V4L2
                if (!parse_buffering_time(optarg, &opts->v4l2_buffer)) {
                    return false;
                }
-#else
-                LOGE("V4L2 (--v4l2-buffer) is only available on Linux.");
-                return false;
-#endif
                break;
+#endif
            default:
                // getopt prints the error message on stderr
                return false;
        }
    }

-    int index = optind;
-    if (index < argc) {
-        LOGE("Unexpected additional argument: %s", argv[index]);
-        return false;
-    }
-
-    // If a TCP/IP address is provided, then tcpip must be enabled
-    assert(opts->tcpip || !opts->tcpip_dst);
-
-    if (opts->serial && opts->tcpip_dst) {
-        LOGE("Incompatible options: -s/--serial and --tcpip with an argument");
-        return false;
-    }
-
 #ifdef HAVE_V4L2
    if (!opts->display && !opts->record_filename && !opts->v4l2_device) {
        LOGE("-N/--no-display requires either screen recording (-r/--record)"
@ -1552,10 +1358,10 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }
 #endif

-    if ((opts->tunnel_host || opts->tunnel_port) && !opts->force_adb_forward) {
-        LOGI("Tunnel host/port is set, "
-             "--force-adb-forward automatically enabled.");
-        opts->force_adb_forward = true;
+    int index = optind;
+    if (index < argc) {
+        LOGE("Unexpected additional argument: %s", argv[index]);
+        return false;
    }

    if (opts->record_format && !opts->record_filename) {
--- a/app/src/common.h
+++ b/app/src/common.h
@ -7,7 +7,6 @@
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 #define MIN(X,Y) (X) < (Y) ? (X) : (Y)
 #define MAX(X,Y) (X) > (Y) ? (X) : (Y)
-#define CLAMP(V,X,Y) MIN( MAX((V),(X)), (Y) )

 #define container_of(ptr, type, member) \
    ((type *) (((char *) (ptr)) - offsetof(type, member)))
--- a/app/src/compat.c
+++ b/app/src/compat.c
@ -2,12 +2,6 @@

 #include "config.h"

-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-
 #ifndef HAVE_STRDUP
 char *strdup(const char *s) {
    size_t size = strlen(s) + 1;
@ -18,36 +12,3 @@ char *strdup(const char *s) {
    return dup;
 }
 #endif
-
-#ifndef HAVE_ASPRINTF
-int asprintf(char **strp, const char *fmt, ...) {
-    va_list va;
-    va_start(va, fmt);
-    int ret = vasprintf(strp, fmt, va);
-    va_end(va);
-    return ret;
-}
-#endif
-
-#ifndef HAVE_VASPRINTF
-int vasprintf(char **strp, const char *fmt, va_list ap) {
-    va_list va;
-    va_copy(va, ap);
-    int len = vsnprintf(NULL, 0, fmt, va);
-    va_end(va);
-
-    char *str = malloc(len + 1);
-    if (!str) {
-        return -1;
-    }
-
-    va_copy(va, ap);
-    int len2 = vsnprintf(str, len + 1, fmt, va);
-    (void) len2;
-    assert(len == len2);
-    va_end(va);
-
-    *strp = str;
-    return len;
-}
-#endif
--- a/app/src/compat.h
+++ b/app/src/compat.h
@ -1,17 +1,16 @@
 #ifndef COMPAT_H
 #define COMPAT_H

-#include "config.h"
+#define _POSIX_C_SOURCE 200809L
+#define _XOPEN_SOURCE 700
+#define _GNU_SOURCE
+#ifdef __APPLE__
+# define _DARWIN_C_SOURCE
+#endif

 #include <libavformat/version.h>
 #include <SDL2/SDL_version.h>

-#ifndef __WIN32
-# define PRIu64_ PRIu64
-#else
-# define PRIu64_ "I64u"  // Windows...
-#endif
-
 // In ffmpeg/doc/APIchanges:
 // 2018-02-06 - 0694d87024 - lavf 58.9.100 - avformat.h
 //   Deprecate use of av_register_input_format(), av_register_output_format(),
@ -35,6 +34,15 @@
 # define SCRCPY_LAVF_HAS_AVFORMATCONTEXT_URL
 #endif

+#if SDL_VERSION_ATLEAST(2, 0, 5)
+// <https://wiki.libsdl.org/SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH>
+# define SCRCPY_SDL_HAS_HINT_MOUSE_FOCUS_CLICKTHROUGH
+// <https://wiki.libsdl.org/SDL_GetDisplayUsableBounds>
+# define SCRCPY_SDL_HAS_GET_DISPLAY_USABLE_BOUNDS
+// <https://wiki.libsdl.org/SDL_WindowFlags>
+# define SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP
+#endif
+
 #if SDL_VERSION_ATLEAST(2, 0, 6)
 // <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
 # define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
@ -49,12 +57,4 @@
 char *strdup(const char *s);
 #endif

-#ifndef HAVE_ASPRINTF
-int asprintf(char **strp, const char *fmt, ...);
-#endif
-
-#ifndef HAVE_VASPRINTF
-int vasprintf(char **strp, const char *fmt, va_list ap);
-#endif
-
 #endif
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@ -41,7 +41,7 @@ static const char *const android_motionevent_action_labels[] = {
    "pointer-up",
    "hover-move",
    "scroll",
-    "hover-enter",
+    "hover-enter"
    "hover-exit",
    "btn-press",
    "btn-release",
@ -55,12 +55,6 @@ static const char *const screen_power_mode_labels[] = {
    "suspend",
 };

-static const char *const copy_key_labels[] = {
-    "none",
-    "copy",
-    "cut",
-};
-
 static void
 write_position(uint8_t *buf, const struct sc_position *position) {
    buffer_write32be(&buf[0], position->point.x);
@ -69,7 +63,7 @@ write_position(uint8_t *buf, const struct sc_position *position) {
    buffer_write16be(&buf[10], position->screen_size.height);
 }

-// write length (4 bytes) + string (non null-terminated)
+// write length (2 bytes) + string (non nul-terminated)
 static size_t
 write_string(const char *utf8, size_t max_len, unsigned char *buf) {
    size_t len = sc_str_utf8_truncation_index(utf8, max_len);
@ -89,7 +83,7 @@ to_fixed_point_16(float f) {
 }

 size_t
-sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
+control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
    buf[0] = msg->type;
    switch (msg->type) {
        case CONTROL_MSG_TYPE_INJECT_KEYCODE:
@ -119,21 +113,16 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
                             (uint32_t) msg->inject_scroll_event.hscroll);
            buffer_write32be(&buf[17],
                             (uint32_t) msg->inject_scroll_event.vscroll);
-            buffer_write32be(&buf[21], msg->inject_scroll_event.buttons);
-            return 25;
+            return 21;
        case CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
            buf[1] = msg->inject_keycode.action;
            return 2;
-        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
-            buf[1] = msg->get_clipboard.copy_key;
-            return 2;
        case CONTROL_MSG_TYPE_SET_CLIPBOARD: {
-            buffer_write64be(&buf[1], msg->set_clipboard.sequence);
-            buf[9] = !!msg->set_clipboard.paste;
+            buf[1] = !!msg->set_clipboard.paste;
            size_t len = write_string(msg->set_clipboard.text,
                                      CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH,
-                                      &buf[10]);
-            return 10 + len;
+                                      &buf[2]);
+            return 2 + len;
        }
        case CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
            buf[1] = msg->set_screen_power_mode.mode;
@ -141,6 +130,7 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
        case CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
        case CONTROL_MSG_TYPE_COLLAPSE_PANELS:
+        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
        case CONTROL_MSG_TYPE_ROTATE_DEVICE:
            // no additional data
            return 1;
@ -151,7 +141,7 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
 }

 void
-sc_control_msg_log(const struct sc_control_msg *msg) {
+control_msg_log(const struct control_msg *msg) {
 #define LOG_CMSG(fmt, ...) LOGV("input: " fmt, ## __VA_ARGS__)
    switch (msg->type) {
        case CONTROL_MSG_TYPE_INJECT_KEYCODE:
@ -180,6 +170,11 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
                         (long) msg->inject_touch_event.buttons);
            } else {
                // numeric pointer id
+#ifndef __WIN32
+# define PRIu64_ PRIu64
+#else
+# define PRIu64_ "I64u"  // Windows...
+#endif
                LOG_CMSG("touch [id=%" PRIu64_ "] %-4s position=%" PRIi32 ",%"
                             PRIi32 " pressure=%g buttons=%06lx",
                         id,
@ -193,25 +188,19 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
        }
        case CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:
            LOG_CMSG("scroll position=%" PRIi32 ",%" PRIi32 " hscroll=%" PRIi32
-                         " vscroll=%" PRIi32 " buttons=%06lx",
+                         " vscroll=%" PRIi32,
                     msg->inject_scroll_event.position.point.x,
                     msg->inject_scroll_event.position.point.y,
                     msg->inject_scroll_event.hscroll,
-                     msg->inject_scroll_event.vscroll,
-                     (long) msg->inject_scroll_event.buttons);
+                     msg->inject_scroll_event.vscroll);
            break;
        case CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
            LOG_CMSG("back-or-screen-on %s",
                     KEYEVENT_ACTION_LABEL(msg->inject_keycode.action));
            break;
-        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
-            LOG_CMSG("get clipboard copy_key=%s",
-                     copy_key_labels[msg->get_clipboard.copy_key]);
-            break;
        case CONTROL_MSG_TYPE_SET_CLIPBOARD:
-            LOG_CMSG("clipboard %" PRIu64_ " %s \"%s\"",
-                     msg->set_clipboard.sequence,
-                     msg->set_clipboard.paste ? "paste" : "nopaste",
+            LOG_CMSG("clipboard %s \"%s\"",
+                     msg->set_clipboard.paste ? "paste" : "copy",
                     msg->set_clipboard.text);
            break;
        case CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE:
@ -227,6 +216,9 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
        case CONTROL_MSG_TYPE_COLLAPSE_PANELS:
            LOG_CMSG("collapse panels");
            break;
+        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
+            LOG_CMSG("get clipboard");
+            break;
        case CONTROL_MSG_TYPE_ROTATE_DEVICE:
            LOG_CMSG("rotate device");
            break;
@ -237,7 +229,7 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
 }

 void
-sc_control_msg_destroy(struct sc_control_msg *msg) {
+control_msg_destroy(struct control_msg *msg) {
    switch (msg->type) {
        case CONTROL_MSG_TYPE_INJECT_TEXT:
            free(msg->inject_text.text);
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@ -14,13 +14,13 @@
 #define CONTROL_MSG_MAX_SIZE (1 << 18) // 256k

 #define CONTROL_MSG_INJECT_TEXT_MAX_LENGTH 300
-// type: 1 byte; sequence: 8 bytes; paste flag: 1 byte; length: 4 bytes
-#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 14)
+// type: 1 byte; paste flag: 1 byte; length: 4 bytes
+#define CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH (CONTROL_MSG_MAX_SIZE - 6)

 #define POINTER_ID_MOUSE UINT64_C(-1)
 #define POINTER_ID_VIRTUAL_FINGER UINT64_C(-2)

-enum sc_control_msg_type {
+enum control_msg_type {
    CONTROL_MSG_TYPE_INJECT_KEYCODE,
    CONTROL_MSG_TYPE_INJECT_TEXT,
    CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
@ -41,14 +41,8 @@ enum screen_power_mode {
    SCREEN_POWER_MODE_NORMAL = 2,
 };

-enum get_clipboard_copy_key {
-    GET_CLIPBOARD_COPY_KEY_NONE,
-    GET_CLIPBOARD_COPY_KEY_COPY,
-    GET_CLIPBOARD_COPY_KEY_CUT,
-};
-
-struct sc_control_msg {
-    enum sc_control_msg_type type;
+struct control_msg {
+    enum control_msg_type type;
    union {
        struct {
            enum android_keyevent_action action;
@ -70,17 +64,12 @@ struct sc_control_msg {
            struct sc_position position;
            int32_t hscroll;
            int32_t vscroll;
-            enum android_motionevent_buttons buttons;
        } inject_scroll_event;
        struct {
            enum android_keyevent_action action; // action for the BACK key
            // screen may only be turned on on ACTION_DOWN
        } back_or_screen_on;
        struct {
-            enum get_clipboard_copy_key copy_key;
-        } get_clipboard;
-        struct {
-            uint64_t sequence;
            char *text; // owned, to be freed by free()
            bool paste;
        } set_clipboard;
@ -93,12 +82,12 @@ struct sc_control_msg {
 // buf size must be at least CONTROL_MSG_MAX_SIZE
 // return the number of bytes written
 size_t
-sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf);
+control_msg_serialize(const struct control_msg *msg, unsigned char *buf);

 void
-sc_control_msg_log(const struct sc_control_msg *msg);
+control_msg_log(const struct control_msg *msg);

 void
-sc_control_msg_destroy(struct sc_control_msg *msg);
+control_msg_destroy(struct control_msg *msg);

 #endif
--- a/app/src/controller.c
+++ b/app/src/controller.c
@ -5,11 +5,10 @@
 #include "util/log.h"

 bool
-sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
-                   struct sc_acksync *acksync) {
+controller_init(struct controller *controller, sc_socket control_socket) {
    cbuf_init(&controller->queue);

-    bool ok = receiver_init(&controller->receiver, control_socket, acksync);
+    bool ok = receiver_init(&controller->receiver, control_socket);
    if (!ok) {
        return false;
    }
@ -34,23 +33,23 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
 }

 void
-sc_controller_destroy(struct sc_controller *controller) {
+controller_destroy(struct controller *controller) {
    sc_cond_destroy(&controller->msg_cond);
    sc_mutex_destroy(&controller->mutex);

-    struct sc_control_msg msg;
+    struct control_msg msg;
    while (cbuf_take(&controller->queue, &msg)) {
-        sc_control_msg_destroy(&msg);
+        control_msg_destroy(&msg);
    }

    receiver_destroy(&controller->receiver);
 }

 bool
-sc_controller_push_msg(struct sc_controller *controller,
-                       const struct sc_control_msg *msg) {
+controller_push_msg(struct controller *controller,
+                    const struct control_msg *msg) {
    if (sc_get_log_level() <= SC_LOG_LEVEL_VERBOSE) {
-        sc_control_msg_log(msg);
+        control_msg_log(msg);
    }

    sc_mutex_lock(&controller->mutex);
@ -64,10 +63,9 @@ sc_controller_push_msg(struct sc_controller *controller,
 }

 static bool
-process_msg(struct sc_controller *controller,
-            const struct sc_control_msg *msg) {
+process_msg(struct controller *controller, const struct control_msg *msg) {
    static unsigned char serialized_msg[CONTROL_MSG_MAX_SIZE];
-    size_t length = sc_control_msg_serialize(msg, serialized_msg);
+    size_t length = control_msg_serialize(msg, serialized_msg);
    if (!length) {
        return false;
    }
@ -78,7 +76,7 @@ process_msg(struct sc_controller *controller,

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

    for (;;) {
        sc_mutex_lock(&controller->mutex);
@ -90,14 +88,14 @@ run_controller(void *data) {
            sc_mutex_unlock(&controller->mutex);
            break;
        }
-        struct sc_control_msg msg;
+        struct control_msg msg;
        bool non_empty = cbuf_take(&controller->queue, &msg);
        assert(non_empty);
        (void) non_empty;
        sc_mutex_unlock(&controller->mutex);

        bool ok = process_msg(controller, &msg);
-        sc_control_msg_destroy(&msg);
+        control_msg_destroy(&msg);
        if (!ok) {
            LOGD("Could not write msg to socket");
            break;
@ -107,18 +105,18 @@ run_controller(void *data) {
 }

 bool
-sc_controller_start(struct sc_controller *controller) {
+controller_start(struct controller *controller) {
    LOGD("Starting controller thread");

    bool ok = sc_thread_create(&controller->thread, run_controller,
-                               "scrcpy-ctl", controller);
+                               "controller", controller);
    if (!ok) {
        LOGC("Could not start controller thread");
        return false;
    }

    if (!receiver_start(&controller->receiver)) {
-        sc_controller_stop(controller);
+        controller_stop(controller);
        sc_thread_join(&controller->thread, NULL);
        return false;
    }
@ -127,7 +125,7 @@ sc_controller_start(struct sc_controller *controller) {
 }

 void
-sc_controller_stop(struct sc_controller *controller) {
+controller_stop(struct controller *controller) {
    sc_mutex_lock(&controller->mutex);
    controller->stopped = true;
    sc_cond_signal(&controller->msg_cond);
@ -135,7 +133,7 @@ sc_controller_stop(struct sc_controller *controller) {
 }

 void
-sc_controller_join(struct sc_controller *controller) {
+controller_join(struct controller *controller) {
    sc_thread_join(&controller->thread, NULL);
    receiver_join(&controller->receiver);
 }
--- a/app/src/controller.h
+++ b/app/src/controller.h
@ -7,41 +7,39 @@

 #include "control_msg.h"
 #include "receiver.h"
-#include "util/acksync.h"
 #include "util/cbuf.h"
 #include "util/net.h"
 #include "util/thread.h"

-struct sc_control_msg_queue CBUF(struct sc_control_msg, 64);
+struct control_msg_queue CBUF(struct control_msg, 64);

-struct sc_controller {
+struct controller {
    sc_socket control_socket;
    sc_thread thread;
    sc_mutex mutex;
    sc_cond msg_cond;
    bool stopped;
-    struct sc_control_msg_queue queue;
+    struct control_msg_queue queue;
    struct receiver receiver;
 };

 bool
-sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
-                   struct sc_acksync *acksync);
+controller_init(struct controller *controller, sc_socket control_socket);

 void
-sc_controller_destroy(struct sc_controller *controller);
+controller_destroy(struct controller *controller);

 bool
-sc_controller_start(struct sc_controller *controller);
+controller_start(struct controller *controller);

 void
-sc_controller_stop(struct sc_controller *controller);
+controller_stop(struct controller *controller);

 void
-sc_controller_join(struct sc_controller *controller);
+controller_join(struct controller *controller);

 bool
-sc_controller_push_msg(struct sc_controller *controller,
-                       const struct sc_control_msg *msg);
+controller_push_msg(struct controller *controller,
+                    const struct control_msg *msg);

 #endif
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@ -42,12 +42,10 @@ static bool
 decoder_open(struct decoder *decoder, const AVCodec *codec) {
    decoder->codec_ctx = avcodec_alloc_context3(codec);
    if (!decoder->codec_ctx) {
-        LOG_OOM();
+        LOGC("Could not allocate decoder context");
        return false;
    }

-    decoder->codec_ctx->flags |= AV_CODEC_FLAG_LOW_DELAY;
-
    if (avcodec_open2(decoder->codec_ctx, codec, NULL) < 0) {
        LOGE("Could not open codec");
        avcodec_free_context(&decoder->codec_ctx);
@ -56,7 +54,7 @@ decoder_open(struct decoder *decoder, const AVCodec *codec) {

    decoder->frame = av_frame_alloc();
    if (!decoder->frame) {
-        LOG_OOM();
+        LOGE("Could not create decoder frame");
        avcodec_close(decoder->codec_ctx);
        avcodec_free_context(&decoder->codec_ctx);
        return false;
--- a/app/src/decoder.h
+++ b/app/src/decoder.h
@ -6,7 +6,6 @@
 #include "trait/packet_sink.h"

 #include <stdbool.h>
-#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>

 #define DECODER_MAX_SINKS 2
--- a/app/src/device_msg.c
+++ b/app/src/device_msg.c
@ -1,6 +1,5 @@
 #include "device_msg.h"

-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

@ -24,7 +23,7 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
            }
            char *text = malloc(clipboard_len + 1);
            if (!text) {
-                LOG_OOM();
+                LOGW("Could not allocate text for clipboard");
                return -1;
            }
            if (clipboard_len) {
@ -35,11 +34,6 @@ device_msg_deserialize(const unsigned char *buf, size_t len,
            msg->clipboard.text = text;
            return 5 + clipboard_len;
        }
-        case DEVICE_MSG_TYPE_ACK_CLIPBOARD: {
-            uint64_t sequence = buffer_read64be(&buf[1]);
-            msg->ack_clipboard.sequence = sequence;
-            return 9;
-        }
        default:
            LOGW("Unknown device message type: %d", (int) msg->type);
            return -1; // error, we cannot recover
--- a/app/src/device_msg.h
+++ b/app/src/device_msg.h
@ -13,7 +13,6 @@

 enum device_msg_type {
    DEVICE_MSG_TYPE_CLIPBOARD,
-    DEVICE_MSG_TYPE_ACK_CLIPBOARD,
 };

 struct device_msg {
@ -22,9 +21,6 @@ struct device_msg {
        struct {
            char *text; // owned, to be freed by free()
        } clipboard;
-        struct {
-            uint64_t sequence;
-        } ack_clipboard;
    };
 };

--- a/app/src/file_handler.c
+++ b/app/src/file_handler.c
@ -34,14 +34,14 @@ file_handler_init(struct file_handler *file_handler, const char *serial,

    ok = sc_intr_init(&file_handler->intr);
    if (!ok) {
+        LOGE("Could not create intr");
        sc_cond_destroy(&file_handler->event_cond);
        sc_mutex_destroy(&file_handler->mutex);
-        return false;
    }

    file_handler->serial = strdup(serial);
    if (!file_handler->serial) {
-        LOG_OOM();
+        LOGE("Could not strdup serial");
        sc_intr_destroy(&file_handler->intr);
        sc_cond_destroy(&file_handler->event_cond);
        sc_mutex_destroy(&file_handler->mutex);
@ -128,7 +128,8 @@ run_file_handler(void *data) {

        if (req.action == ACTION_INSTALL_APK) {
            LOGI("Installing %s...", req.file);
-            bool ok = adb_install(intr, serial, req.file, 0);
+            bool ok =
+                adb_install(intr, serial, req.file, SC_STDOUT | SC_STDERR);
            if (ok) {
                LOGI("%s successfully installed", req.file);
            } else {
@ -136,7 +137,8 @@ run_file_handler(void *data) {
            }
        } else {
            LOGI("Pushing %s...", req.file);
-            bool ok = adb_push(intr, serial, req.file, push_target, 0);
+            bool ok = adb_push(intr, serial, req.file, push_target,
+                               SC_STDOUT | SC_STDERR);
            if (ok) {
                LOGI("%s successfully pushed to %s", req.file, push_target);
            } else {
@ -154,7 +156,7 @@ file_handler_start(struct file_handler *file_handler) {
    LOGD("Starting file_handler thread");

    bool ok = sc_thread_create(&file_handler->thread, run_file_handler,
-                               "scrcpy-file", file_handler);
+                               "file_handler", file_handler);
    if (!ok) {
        LOGC("Could not start file_handler thread");
        return false;
--- a/app/src/fps_counter.c
+++ b/app/src/fps_counter.c
@ -108,7 +108,7 @@ fps_counter_start(struct fps_counter *counter) {
    // same thread, no need to lock
    if (!counter->thread_started) {
        bool ok = sc_thread_create(&counter->thread, run_fps_counter,
-                                   "scrcpy-fps", counter);
+                                   "fps counter", counter);
        if (!ok) {
            LOGE("Could not start FPS counter thread");
            return false;
--- a/app/src/frame_buffer.c
+++ b/app/src/frame_buffer.c
@ -10,13 +10,11 @@ bool
 sc_frame_buffer_init(struct sc_frame_buffer *fb) {
    fb->pending_frame = av_frame_alloc();
    if (!fb->pending_frame) {
-        LOG_OOM();
        return false;
    }

    fb->tmp_frame = av_frame_alloc();
    if (!fb->tmp_frame) {
-        LOG_OOM();
        av_frame_free(&fb->pending_frame);
        return false;
    }
--- a/app/src/hid_keyboard.c
+++ b/app/src/hid_keyboard.c
@ -1,8 +1,8 @@
 #include "hid_keyboard.h"

 #include <assert.h>
+#include <SDL2/SDL_events.h>

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

 /** Downcast key processor to hid_keyboard */
@ -126,105 +126,31 @@ static const unsigned char keyboard_report_desc[]  = {
    0xC0
 };

-/**
- * 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)
- *  - bytes 2 to 7: pressed keys (6 at most)
- *
- *                   7 6 5 4 3 2 1 0
- *                  +---------------+
- *         byte 0:  |. . . . . . . .| modifiers
- *                  +---------------+
- *                   ^ ^ ^ ^ ^ ^ ^ ^
- *                   | | | | | | | `- left Ctrl
- *                   | | | | | | `--- left Shift
- *                   | | | | | `----- left Alt
- *                   | | | | `------- left Gui
- *                   | | | `--------- right Ctrl
- *                   | | `----------- right Shift
- *                   | `------------- right Alt
- *                   `--------------- right Gui
- *
- *                  +---------------+
- *         byte 1:  |0 0 0 0 0 0 0 0| reserved
- *                  +---------------+
- *
- *                  +---------------+
- *   bytes 2 to 7:  |. . . . . . . .| scancode of 1st key pressed
- *                  +---------------+
- *                  |. . . . . . . .| scancode of 2nd key pressed
- *                  +---------------+
- *                  |. . . . . . . .| scancode of 3rd key pressed
- *                  +---------------+
- *                  |. . . . . . . .| scancode of 4th key pressed
- *                  +---------------+
- *                  |. . . . . . . .| scancode of 5th key pressed
- *                  +---------------+
- *                  |. . . . . . . .| scancode of 6th key pressed
- *                  +---------------+
- *
- * If there are less than 6 keys pressed, the last items are set to 0.
- * For example, if A and W are pressed:
- *
- *                  +---------------+
- *   bytes 2 to 7:  |0 0 0 0 0 1 0 0| A is pressed (scancode = 4)
- *                  +---------------+
- *                  |0 0 0 1 1 0 1 0| W is pressed (scancode = 26)
- *                  +---------------+
- *                  |0 0 0 0 0 0 0 0| ^
- *                  +---------------+ |  only 2 keys are pressed, the
- *                  |0 0 0 0 0 0 0 0| |  remaining items are set to 0
- *                  +---------------+ |
- *                  |0 0 0 0 0 0 0 0| |
- *                  +---------------+ |
- *                  |0 0 0 0 0 0 0 0| v
- *                  +---------------+
- *
- * Pressing more than 6 keys is not supported. If this happens (typically,
- * never in practice), report a "phantom state":
- *
- *                  +---------------+
- *   bytes 2 to 7:  |0 0 0 0 0 0 0 1| ^
- *                  +---------------+ |
- *                  |0 0 0 0 0 0 0 1| |  more than 6 keys pressed:
- *                  +---------------+ |  the list is filled with a special
- *                  |0 0 0 0 0 0 0 1| |  rollover error code (0x01)
- *                  +---------------+ |
- *                  |0 0 0 0 0 0 0 1| |
- *                  +---------------+ |
- *                  |0 0 0 0 0 0 0 1| |
- *                  +---------------+ |
- *                  |0 0 0 0 0 0 0 1| v
- *                  +---------------+
- */
-
 static unsigned char
-sdl_keymod_to_hid_modifiers(uint16_t mod) {
+sdl_keymod_to_hid_modifiers(SDL_Keymod mod) {
    unsigned char modifiers = HID_MODIFIER_NONE;
-    if (mod & SC_MOD_LCTRL) {
+    if (mod & KMOD_LCTRL) {
        modifiers |= HID_MODIFIER_LEFT_CONTROL;
    }
-    if (mod & SC_MOD_LSHIFT) {
+    if (mod & KMOD_LSHIFT) {
        modifiers |= HID_MODIFIER_LEFT_SHIFT;
    }
-    if (mod & SC_MOD_LALT) {
+    if (mod & KMOD_LALT) {
        modifiers |= HID_MODIFIER_LEFT_ALT;
    }
-    if (mod & SC_MOD_LGUI) {
+    if (mod & KMOD_LGUI) {
        modifiers |= HID_MODIFIER_LEFT_GUI;
    }
-    if (mod & SC_MOD_RCTRL) {
+    if (mod & KMOD_RCTRL) {
        modifiers |= HID_MODIFIER_RIGHT_CONTROL;
    }
-    if (mod & SC_MOD_RSHIFT) {
+    if (mod & KMOD_RSHIFT) {
        modifiers |= HID_MODIFIER_RIGHT_SHIFT;
    }
-    if (mod & SC_MOD_RALT) {
+    if (mod & KMOD_RALT) {
        modifiers |= HID_MODIFIER_RIGHT_ALT;
    }
-    if (mod & SC_MOD_RGUI) {
+    if (mod & KMOD_RGUI) {
        modifiers |= HID_MODIFIER_RIGHT_GUI;
    }
    return modifiers;
@ -234,7 +160,6 @@ static bool
 sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
    unsigned char *buffer = malloc(HID_KEYBOARD_EVENT_SIZE);
    if (!buffer) {
-        LOG_OOM();
        return false;
    }

@ -248,15 +173,15 @@ sc_hid_keyboard_event_init(struct sc_hid_event *hid_event) {
 }

 static inline bool
-scancode_is_modifier(enum sc_scancode scancode) {
-    return scancode >= SC_SCANCODE_LCTRL && scancode <= SC_SCANCODE_RGUI;
+scancode_is_modifier(SDL_Scancode scancode) {
+    return scancode >= SDL_SCANCODE_LCTRL && scancode <= SDL_SCANCODE_RGUI;
 }

 static bool
 convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
                           struct sc_hid_event *hid_event,
-                           const struct sc_key_event *event) {
-    enum sc_scancode scancode = event->scancode;
+                           const SDL_KeyboardEvent *event) {
+    SDL_Scancode scancode = event->keysym.scancode;
    assert(scancode >= 0);

    // SDL also generates events when only modifiers are pressed, we cannot
@ -272,11 +197,11 @@ convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
        return false;
    }

-    unsigned char modifiers = sdl_keymod_to_hid_modifiers(event->mods_state);
+    unsigned char modifiers = sdl_keymod_to_hid_modifiers(event->keysym.mod);

    if (scancode < SC_HID_KEYBOARD_KEYS) {
        // Pressed is true and released is false
-        kb->keys[scancode] = (event->action == SC_ACTION_DOWN);
+        kb->keys[scancode] = (event->type == SDL_KEYDOWN);
        LOGV("keys[%02x] = %s", scancode,
             kb->keys[scancode] ? "true" : "false");
    }
@ -291,7 +216,7 @@ convert_hid_keyboard_event(struct sc_hid_keyboard *kb,
            // USB HID protocol says that if keys exceeds report count, a
            // phantom state should be reported
            if (keys_pressed_count >= HID_KEYBOARD_MAX_KEYS) {
-                // Phantom state:
+                // Pantom state:
                //  - Modifiers
                //  - Reserved
                //  - ErrorRollOver * HID_MAX_KEYS
@ -306,17 +231,17 @@ convert_hid_keyboard_event(struct sc_hid_keyboard *kb,

 end:
    LOGV("hid keyboard: key %-4s scancode=%02x (%u) mod=%02x",
-         event->action == SC_ACTION_DOWN ? "down" : "up", event->scancode,
-         event->scancode, modifiers);
+         event->type == SDL_KEYDOWN ? "down" : "up", event->keysym.scancode,
+         event->keysym.scancode, modifiers);

    return true;
 }


 static bool
-push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t mods_state) {
-    bool capslock = mods_state & SC_MOD_CAPS;
-    bool numlock = mods_state & SC_MOD_NUM;
+push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t sdl_mod) {
+    bool capslock = sdl_mod & KMOD_CAPS;
+    bool numlock = sdl_mod & KMOD_NUM;
    if (!capslock && !numlock) {
        // Nothing to do
        return true;
@ -328,6 +253,8 @@ push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t mods_state) {
        return false;
    }

+#define SC_SCANCODE_CAPSLOCK SDL_SCANCODE_CAPSLOCK
+#define SC_SCANCODE_NUMLOCK SDL_SCANCODE_NUMLOCKCLEAR
    unsigned i = 0;
    if (capslock) {
        hid_event.buffer[HID_KEYBOARD_INDEX_KEYS + i] = SC_SCANCODE_CAPSLOCK;
@ -351,8 +278,7 @@ push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t mods_state) {

 static void
 sc_key_processor_process_key(struct sc_key_processor *kp,
-                             const struct sc_key_event *event,
-                             uint64_t ack_to_wait) {
+                             const SDL_KeyboardEvent *event) {
    if (event->repeat) {
        // In USB HID protocol, key repeat is handled by the host (Android), so
        // just ignore key repeat here.
@ -367,17 +293,21 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
        if (!kb->mod_lock_synchronized) {
            // Inject CAPSLOCK and/or NUMLOCK if necessary to synchronize
            // keyboard state
-            if (push_mod_lock_state(kb, event->mods_state)) {
+            if (push_mod_lock_state(kb, event->keysym.mod)) {
                kb->mod_lock_synchronized = true;
            }
        }

-        if (ack_to_wait) {
+        SDL_Keycode keycode = event->keysym.sym;
+        bool down = event->type == SDL_KEYDOWN;
+        bool ctrl = event->keysym.mod & KMOD_CTRL;
+        bool shift = event->keysym.mod & KMOD_SHIFT;
+        if (ctrl && !shift && keycode == SDLK_v && down) {
            // Ctrl+v is pressed, so clipboard synchronization has been
-            // requested. Wait until clipboard synchronization is acknowledged
-            // by the server, otherwise it could paste the old clipboard
-            // content.
-            hid_event.ack_to_wait = ack_to_wait;
+            // requested. Wait a bit so that the clipboard is set before
+            // injecting Ctrl+v via HID, otherwise it would paste the old
+            // clipboard content.
+            hid_event.delay = SC_TICK_FROM_MS(5);
        }

        if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
@ -387,6 +317,15 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
    }
 }

+static void
+sc_key_processor_process_text(struct sc_key_processor *kp,
+                              const SDL_TextInputEvent *event) {
+    (void) kp;
+    (void) event;
+
+    // Never forward text input via HID (all the keys are injected separately)
+}
+
 bool
 sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa) {
    kb->aoa = aoa;
@ -406,15 +345,9 @@ sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa) {

    static const struct sc_key_processor_ops ops = {
        .process_key = sc_key_processor_process_key,
-        // Never forward text input via HID (all the keys are injected
-        // separately)
-        .process_text = NULL,
+        .process_text = sc_key_processor_process_text,
    };

-    // Clipboard synchronization is requested over the control socket, while HID
-    // events are sent over AOA, so it must wait for clipboard synchronization
-    // to be acknowledged by the device before injecting Ctrl+v.
-    kb->key_processor.async_paste = true;
    kb->key_processor.ops = &ops;

    return true;
--- a/app/src/hid_mouse.c
+++ b/app/src/hid_mouse.c
@ -1,267 +0,0 @@
-#include "hid_mouse.h"
-
-#include <assert.h>
-
-#include "input_events.h"
-#include "util/log.h"
-
-/** Downcast mouse processor to hid_mouse */
-#define DOWNCAST(MP) container_of(MP, struct sc_hid_mouse, mouse_processor)
-
-#define HID_MOUSE_ACCESSORY_ID 2
-
-// 1 byte for buttons + padding, 1 byte for X position, 1 byte for Y position
-#define HID_MOUSE_EVENT_SIZE 4
-
-/**
- * Mouse descriptor from the specification:
- * <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/sites/default/files/documents/hut1_12v2.pdf>
- * §4 Generic Desktop Page (0x01) (p26)
- */
-static const unsigned char mouse_report_desc[]  = {
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (Mouse)
-    0x09, 0x02,
-
-    // Collection (Application)
-    0xA1, 0x01,
-
-    // Usage (Pointer)
-    0x09, 0x01,
-
-    // Collection (Physical)
-    0xA1, 0x00,
-
-    // Usage Page (Buttons)
-    0x05, 0x09,
-
-    // Usage Minimum (1)
-    0x19, 0x01,
-     // Usage Maximum (5)
-    0x29, 0x05,
-    // Logical Minimum (0)
-    0x15, 0x00,
-    // Logical Maximum (1)
-    0x25, 0x01,
-    // Report Count (5)
-    0x95, 0x05,
-    // Report Size (1)
-    0x75, 0x01,
-    // Input (Data, Variable, Absolute): 5 buttons bits
-    0x81, 0x02,
-
-    // Report Count (1)
-    0x95, 0x01,
-    // Report Size (3)
-    0x75, 0x03,
-    // Input (Constant): 3 bits padding
-    0x81, 0x01,
-
-    // Usage Page (Generic Desktop)
-    0x05, 0x01,
-    // Usage (X)
-    0x09, 0x30,
-    // Usage (Y)
-    0x09, 0x31,
-    // Usage (Wheel)
-    0x09, 0x38,
-    // Local Minimum (-127)
-    0x15, 0x81,
-    // Local Maximum (127)
-    0x25, 0x7F,
-    // Report Size (8)
-    0x75, 0x08,
-    // Report Count (3)
-    0x95, 0x03,
-    // Input (Data, Variable, Relative): 3 position bytes (X, Y, Wheel)
-    0x81, 0x06,
-
-    // End Collection
-    0xC0,
-
-    // End Collection
-    0xC0,
-};
-
-/**
- * A mouse HID event is 3 bytes long:
- *
- *  - byte 0: buttons state
- *  - byte 1: relative x motion (signed byte from -127 to 127)
- *  - byte 2: relative y motion (signed byte from -127 to 127)
- *
- *                   7 6 5 4 3 2 1 0
- *                  +---------------+
- *         byte 0:  |0 0 0 . . . . .| buttons state
- *                  +---------------+
- *                         ^ ^ ^ ^ ^
- *                         | | | | `- left button
- *                         | | | `--- right button
- *                         | | `----- middle button
- *                         | `------- button 4
- *                         `--------- button 5
- *
- *                  +---------------+
- *         byte 1:  |. . . . . . . .| relative x motion
- *                  +---------------+
- *         byte 2:  |. . . . . . . .| relative y motion
- *                  +---------------+
- *         byte 3:  |. . . . . . . .| wheel motion (-1, 0 or 1)
- *                  +---------------+
- *
- * As an example, here is the report for a motion of (x=5, y=-4) with left
- * button pressed:
- *
- *                  +---------------+
- *                  |0 0 0 0 0 0 0 1| left button pressed
- *                  +---------------+
- *                  |0 0 0 0 0 1 0 1| horizontal motion (x = 5)
- *                  +---------------+
- *                  |1 1 1 1 1 1 0 0| relative y motion (y = -4)
- *                  +---------------+
- *                  |0 0 0 0 0 0 0 0| wheel motion
- *                  +---------------+
- */
-
-static bool
-sc_hid_mouse_event_init(struct sc_hid_event *hid_event) {
-    unsigned char *buffer = calloc(1, HID_MOUSE_EVENT_SIZE);
-    if (!buffer) {
-        LOG_OOM();
-        return false;
-    }
-
-    sc_hid_event_init(hid_event, HID_MOUSE_ACCESSORY_ID, buffer,
-                      HID_MOUSE_EVENT_SIZE);
-    return true;
-}
-
-static unsigned char
-buttons_state_to_hid_buttons(uint8_t buttons_state) {
-    unsigned char c = 0;
-    if (buttons_state & SC_MOUSE_BUTTON_LEFT) {
-        c |= 1 << 0;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_RIGHT) {
-        c |= 1 << 1;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_MIDDLE) {
-        c |= 1 << 2;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_X1) {
-        c |= 1 << 3;
-    }
-    if (buttons_state & SC_MOUSE_BUTTON_X2) {
-        c |= 1 << 4;
-    }
-    return c;
-}
-
-static void
-sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
-                                    const struct sc_mouse_motion_event *event) {
-    struct sc_hid_mouse *mouse = DOWNCAST(mp);
-
-    struct sc_hid_event hid_event;
-    if (!sc_hid_mouse_event_init(&hid_event)) {
-        return;
-    }
-
-    unsigned char *buffer = hid_event.buffer;
-    buffer[0] = buttons_state_to_hid_buttons(event->buttons_state);
-    buffer[1] = CLAMP(event->xrel, -127, 127);
-    buffer[2] = CLAMP(event->yrel, -127, 127);
-    buffer[3] = 0; // wheel coordinates only used for scrolling
-
-    if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
-        sc_hid_event_destroy(&hid_event);
-        LOGW("Could request HID event");
-    }
-}
-
-static void
-sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
-                                   const struct sc_mouse_click_event *event) {
-    struct sc_hid_mouse *mouse = DOWNCAST(mp);
-
-    struct sc_hid_event hid_event;
-    if (!sc_hid_mouse_event_init(&hid_event)) {
-        return;
-    }
-
-    unsigned char *buffer = hid_event.buffer;
-    buffer[0] = buttons_state_to_hid_buttons(event->buttons_state);
-    buffer[1] = 0; // no x motion
-    buffer[2] = 0; // no y motion
-    buffer[3] = 0; // wheel coordinates only used for scrolling
-
-    if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
-        sc_hid_event_destroy(&hid_event);
-        LOGW("Could request HID event");
-    }
-}
-
-static void
-sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
-                                    const struct sc_mouse_scroll_event *event) {
-    struct sc_hid_mouse *mouse = DOWNCAST(mp);
-
-    struct sc_hid_event hid_event;
-    if (!sc_hid_mouse_event_init(&hid_event)) {
-        return;
-    }
-
-    unsigned char *buffer = hid_event.buffer;
-    buffer[0] = 0; // buttons state irrelevant (and unknown)
-    buffer[1] = 0; // no x motion
-    buffer[2] = 0; // no y motion
-    // In practice, vscroll is always -1, 0 or 1, but in theory other values
-    // are possible
-    buffer[3] = CLAMP(event->vscroll, -127, 127);
-    // Horizontal scrolling ignored
-
-    if (!sc_aoa_push_hid_event(mouse->aoa, &hid_event)) {
-        sc_hid_event_destroy(&hid_event);
-        LOGW("Could request HID event");
-    }
-}
-
-bool
-sc_hid_mouse_init(struct sc_hid_mouse *mouse, struct sc_aoa *aoa) {
-    mouse->aoa = aoa;
-
-    bool ok = sc_aoa_setup_hid(aoa, HID_MOUSE_ACCESSORY_ID, mouse_report_desc,
-                               ARRAY_LEN(mouse_report_desc));
-    if (!ok) {
-        LOGW("Register HID mouse failed");
-        return false;
-    }
-
-    static const struct sc_mouse_processor_ops ops = {
-        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
-        .process_mouse_click = sc_mouse_processor_process_mouse_click,
-        .process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
-        // Touch events not supported (coordinates are not relative)
-        .process_touch = NULL,
-    };
-
-    mouse->mouse_processor.ops = &ops;
-
-    mouse->mouse_processor.relative_mode = true;
-
-    return true;
-}
-
-void
-sc_hid_mouse_destroy(struct sc_hid_mouse *mouse) {
-    bool ok = sc_aoa_unregister_hid(mouse->aoa, HID_MOUSE_ACCESSORY_ID);
-    if (!ok) {
-        LOGW("Could not unregister HID");
-    }
-}
--- a/app/src/hid_mouse.h
+++ b/app/src/hid_mouse.h
@ -1,23 +0,0 @@
-#ifndef HID_MOUSE_H
-#define HID_MOUSE_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-#include "aoa_hid.h"
-#include "trait/mouse_processor.h"
-
-struct sc_hid_mouse {
-    struct sc_mouse_processor mouse_processor; // mouse processor trait
-
-    struct sc_aoa *aoa;
-};
-
-bool
-sc_hid_mouse_init(struct sc_hid_mouse *mouse, struct sc_aoa *aoa);
-
-void
-sc_hid_mouse_destroy(struct sc_hid_mouse *mouse);
-
-#endif
--- a/app/src/icon.c
+++ b/app/src/icon.c
@ -2,7 +2,6 @@

 #include <assert.h>
 #include <stdbool.h>
-#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/pixfmt.h>
@ -32,7 +31,7 @@ get_icon_path(void) {
        char *icon_path = strdup(icon_path_env);
 #endif
        if (!icon_path) {
-            LOG_OOM();
+            LOGE("Could not allocate memory");
            return NULL;
        }
        LOGD("Using SCRCPY_ICON_PATH: %s", icon_path);
@ -43,7 +42,7 @@ get_icon_path(void) {
    LOGD("Using icon: " SCRCPY_DEFAULT_ICON_PATH);
    char *icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
    if (!icon_path) {
-        LOG_OOM();
+        LOGE("Could not allocate memory");
        return NULL;
    }
 #else
@ -64,7 +63,7 @@ decode_image(const char *path) {

    AVFormatContext *ctx = avformat_alloc_context();
    if (!ctx) {
-        LOG_OOM();
+        LOGE("Could not allocate image decoder context");
        return NULL;
    }

@ -86,7 +85,7 @@ decode_image(const char *path) {

    AVCodecParameters *params = ctx->streams[stream]->codecpar;

-    const AVCodec *codec = avcodec_find_decoder(params->codec_id);
+    AVCodec *codec = avcodec_find_decoder(params->codec_id);
    if (!codec) {
        LOGE("Could not find image decoder");
        goto close_input;
@ -94,7 +93,7 @@ decode_image(const char *path) {

    AVCodecContext *codec_ctx = avcodec_alloc_context3(codec);
    if (!codec_ctx) {
-        LOG_OOM();
+        LOGE("Could not allocate codec context");
        goto close_input;
    }

@ -110,13 +109,13 @@ decode_image(const char *path) {

    AVFrame *frame = av_frame_alloc();
    if (!frame) {
-        LOG_OOM();
+        LOGE("Could not allocate frame");
        goto close_codec;
    }

    AVPacket *packet = av_packet_alloc();
    if (!packet) {
-        LOG_OOM();
+        LOGE("Could not allocate packet");
        av_frame_free(&frame);
        goto close_codec;
    }
--- a/app/src/input_events.h
+++ b/app/src/input_events.h
@ -1,380 +0,0 @@
-#ifndef SC_INPUT_EVENTS_H
-#define SC_INPUT_EVENTS_H
-
-#include "common.h"
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <SDL2/SDL_events.h>
-
-#include "coords.h"
-
-/* The representation of input events in scrcpy is very close to the SDL API,
- * for simplicity.
- *
- * This scrcpy input events API is designed to be consumed by input event
- * processors (sc_key_processor and sc_mouse_processor, see app/src/trait/).
- *
- * One major semantic difference between SDL input events and scrcpy input
- * events is their frame of reference (for mouse and touch events): SDL events
- * coordinates are expressed in SDL window coordinates (the visible UI), while
- * scrcpy events are expressed in device frame coordinates.
- *
- * In particular, the window may be visually scaled or rotated (with --rotation
- * or MOD+Left/Right), but this does not impact scrcpy input events (contrary
- * to SDL input events). This allows to abstract these display details from the
- * input event processors (and to make them independent from the "screen").
- *
- * For many enums below, the values are purposely the same as the SDL
- * constants (though not all SDL values are represented), so that the
- * implementation to convert from the SDL version to the scrcpy version is
- * straightforward.
- *
- * In practice, there are 3 levels of input events:
- *  1. SDL input events (as received from SDL)
- *  2. scrcpy input events (this API)
- *  3. the key/mouse processors input events (Android API or HID events)
- *
- * An input event is first received (1), then (if accepted) converted to an
- * scrcpy input event (2), then submitted to the relevant key/mouse processor,
- * which (if accepted) is converted to an Android event (to be sent to the
- * server) or to an HID event (to be sent over USB/AOA directly).
- */
-
-enum sc_mod {
-    SC_MOD_LSHIFT = KMOD_LSHIFT,
-    SC_MOD_RSHIFT = KMOD_RSHIFT,
-    SC_MOD_LCTRL = KMOD_LCTRL,
-    SC_MOD_RCTRL = KMOD_RCTRL,
-    SC_MOD_LALT = KMOD_LALT,
-    SC_MOD_RALT = KMOD_RALT,
-    SC_MOD_LGUI = KMOD_LGUI,
-    SC_MOD_RGUI = KMOD_RGUI,
-
-    SC_MOD_NUM = KMOD_NUM,
-    SC_MOD_CAPS = KMOD_CAPS,
-};
-
-enum sc_action {
-    SC_ACTION_DOWN, // key or button pressed
-    SC_ACTION_UP, // key or button released
-};
-
-enum sc_keycode {
-    SC_KEYCODE_UNKNOWN = SDLK_UNKNOWN,
-
-    SC_KEYCODE_RETURN = SDLK_RETURN,
-    SC_KEYCODE_ESCAPE = SDLK_ESCAPE,
-    SC_KEYCODE_BACKSPACE = SDLK_BACKSPACE,
-    SC_KEYCODE_TAB = SDLK_TAB,
-    SC_KEYCODE_SPACE = SDLK_SPACE,
-    SC_KEYCODE_EXCLAIM = SDLK_EXCLAIM,
-    SC_KEYCODE_QUOTEDBL = SDLK_QUOTEDBL,
-    SC_KEYCODE_HASH = SDLK_HASH,
-    SC_KEYCODE_PERCENT = SDLK_PERCENT,
-    SC_KEYCODE_DOLLAR = SDLK_DOLLAR,
-    SC_KEYCODE_AMPERSAND = SDLK_AMPERSAND,
-    SC_KEYCODE_QUOTE = SDLK_QUOTE,
-    SC_KEYCODE_LEFTPAREN = SDLK_LEFTPAREN,
-    SC_KEYCODE_RIGHTPAREN = SDLK_RIGHTPAREN,
-    SC_KEYCODE_ASTERISK = SDLK_ASTERISK,
-    SC_KEYCODE_PLUS = SDLK_PLUS,
-    SC_KEYCODE_COMMA = SDLK_COMMA,
-    SC_KEYCODE_MINUS = SDLK_MINUS,
-    SC_KEYCODE_PERIOD = SDLK_PERIOD,
-    SC_KEYCODE_SLASH = SDLK_SLASH,
-    SC_KEYCODE_0 = SDLK_0,
-    SC_KEYCODE_1 = SDLK_1,
-    SC_KEYCODE_2 = SDLK_2,
-    SC_KEYCODE_3 = SDLK_3,
-    SC_KEYCODE_4 = SDLK_4,
-    SC_KEYCODE_5 = SDLK_5,
-    SC_KEYCODE_6 = SDLK_6,
-    SC_KEYCODE_7 = SDLK_7,
-    SC_KEYCODE_8 = SDLK_8,
-    SC_KEYCODE_9 = SDLK_9,
-    SC_KEYCODE_COLON = SDLK_COLON,
-    SC_KEYCODE_SEMICOLON = SDLK_SEMICOLON,
-    SC_KEYCODE_LESS = SDLK_LESS,
-    SC_KEYCODE_EQUALS = SDLK_EQUALS,
-    SC_KEYCODE_GREATER = SDLK_GREATER,
-    SC_KEYCODE_QUESTION = SDLK_QUESTION,
-    SC_KEYCODE_AT = SDLK_AT,
-
-    SC_KEYCODE_LEFTBRACKET = SDLK_LEFTBRACKET,
-    SC_KEYCODE_BACKSLASH = SDLK_BACKSLASH,
-    SC_KEYCODE_RIGHTBRACKET = SDLK_RIGHTBRACKET,
-    SC_KEYCODE_CARET = SDLK_CARET,
-    SC_KEYCODE_UNDERSCORE = SDLK_UNDERSCORE,
-    SC_KEYCODE_BACKQUOTE = SDLK_BACKQUOTE,
-    SC_KEYCODE_a = SDLK_a,
-    SC_KEYCODE_b = SDLK_b,
-    SC_KEYCODE_c = SDLK_c,
-    SC_KEYCODE_d = SDLK_d,
-    SC_KEYCODE_e = SDLK_e,
-    SC_KEYCODE_f = SDLK_f,
-    SC_KEYCODE_g = SDLK_g,
-    SC_KEYCODE_h = SDLK_h,
-    SC_KEYCODE_i = SDLK_i,
-    SC_KEYCODE_j = SDLK_j,
-    SC_KEYCODE_k = SDLK_k,
-    SC_KEYCODE_l = SDLK_l,
-    SC_KEYCODE_m = SDLK_m,
-    SC_KEYCODE_n = SDLK_n,
-    SC_KEYCODE_o = SDLK_o,
-    SC_KEYCODE_p = SDLK_p,
-    SC_KEYCODE_q = SDLK_q,
-    SC_KEYCODE_r = SDLK_r,
-    SC_KEYCODE_s = SDLK_s,
-    SC_KEYCODE_t = SDLK_t,
-    SC_KEYCODE_u = SDLK_u,
-    SC_KEYCODE_v = SDLK_v,
-    SC_KEYCODE_w = SDLK_w,
-    SC_KEYCODE_x = SDLK_x,
-    SC_KEYCODE_y = SDLK_y,
-    SC_KEYCODE_z = SDLK_z,
-
-    SC_KEYCODE_CAPSLOCK = SDLK_CAPSLOCK,
-
-    SC_KEYCODE_F1 = SDLK_F1,
-    SC_KEYCODE_F2 = SDLK_F2,
-    SC_KEYCODE_F3 = SDLK_F3,
-    SC_KEYCODE_F4 = SDLK_F4,
-    SC_KEYCODE_F5 = SDLK_F5,
-    SC_KEYCODE_F6 = SDLK_F6,
-    SC_KEYCODE_F7 = SDLK_F7,
-    SC_KEYCODE_F8 = SDLK_F8,
-    SC_KEYCODE_F9 = SDLK_F9,
-    SC_KEYCODE_F10 = SDLK_F10,
-    SC_KEYCODE_F11 = SDLK_F11,
-    SC_KEYCODE_F12 = SDLK_F12,
-
-    SC_KEYCODE_PRINTSCREEN = SDLK_PRINTSCREEN,
-    SC_KEYCODE_SCROLLLOCK = SDLK_SCROLLLOCK,
-    SC_KEYCODE_PAUSE = SDLK_PAUSE,
-    SC_KEYCODE_INSERT = SDLK_INSERT,
-    SC_KEYCODE_HOME = SDLK_HOME,
-    SC_KEYCODE_PAGEUP = SDLK_PAGEUP,
-    SC_KEYCODE_DELETE = SDLK_DELETE,
-    SC_KEYCODE_END = SDLK_END,
-    SC_KEYCODE_PAGEDOWN = SDLK_PAGEDOWN,
-    SC_KEYCODE_RIGHT = SDLK_RIGHT,
-    SC_KEYCODE_LEFT = SDLK_LEFT,
-    SC_KEYCODE_DOWN = SDLK_DOWN,
-    SC_KEYCODE_UP = SDLK_UP,
-
-    SC_KEYCODE_KP_DIVIDE = SDLK_KP_DIVIDE,
-    SC_KEYCODE_KP_MULTIPLY = SDLK_KP_MULTIPLY,
-    SC_KEYCODE_KP_MINUS = SDLK_KP_MINUS,
-    SC_KEYCODE_KP_PLUS = SDLK_KP_PLUS,
-    SC_KEYCODE_KP_ENTER = SDLK_KP_ENTER,
-    SC_KEYCODE_KP_1 = SDLK_KP_1,
-    SC_KEYCODE_KP_2 = SDLK_KP_2,
-    SC_KEYCODE_KP_3 = SDLK_KP_3,
-    SC_KEYCODE_KP_4 = SDLK_KP_4,
-    SC_KEYCODE_KP_5 = SDLK_KP_5,
-    SC_KEYCODE_KP_6 = SDLK_KP_6,
-    SC_KEYCODE_KP_7 = SDLK_KP_7,
-    SC_KEYCODE_KP_8 = SDLK_KP_8,
-    SC_KEYCODE_KP_9 = SDLK_KP_9,
-    SC_KEYCODE_KP_0 = SDLK_KP_0,
-    SC_KEYCODE_KP_PERIOD = SDLK_KP_PERIOD,
-    SC_KEYCODE_KP_EQUALS = SDLK_KP_EQUALS,
-    SC_KEYCODE_KP_LEFTPAREN = SDLK_KP_LEFTPAREN,
-    SC_KEYCODE_KP_RIGHTPAREN = SDLK_KP_RIGHTPAREN,
-
-    SC_KEYCODE_LCTRL = SDLK_LCTRL,
-    SC_KEYCODE_LSHIFT = SDLK_LSHIFT,
-    SC_KEYCODE_LALT = SDLK_LALT,
-    SC_KEYCODE_LGUI = SDLK_LGUI,
-    SC_KEYCODE_RCTRL = SDLK_RCTRL,
-    SC_KEYCODE_RSHIFT = SDLK_RSHIFT,
-    SC_KEYCODE_RALT = SDLK_RALT,
-    SC_KEYCODE_RGUI = SDLK_RGUI,
-};
-
-enum sc_scancode {
-    SC_SCANCODE_UNKNOWN = SDL_SCANCODE_UNKNOWN,
-
-    SC_SCANCODE_A = SDL_SCANCODE_A,
-    SC_SCANCODE_B = SDL_SCANCODE_B,
-    SC_SCANCODE_C = SDL_SCANCODE_C,
-    SC_SCANCODE_D = SDL_SCANCODE_D,
-    SC_SCANCODE_E = SDL_SCANCODE_E,
-    SC_SCANCODE_F = SDL_SCANCODE_F,
-    SC_SCANCODE_G = SDL_SCANCODE_G,
-    SC_SCANCODE_H = SDL_SCANCODE_H,
-    SC_SCANCODE_I = SDL_SCANCODE_I,
-    SC_SCANCODE_J = SDL_SCANCODE_J,
-    SC_SCANCODE_K = SDL_SCANCODE_K,
-    SC_SCANCODE_L = SDL_SCANCODE_L,
-    SC_SCANCODE_M = SDL_SCANCODE_M,
-    SC_SCANCODE_N = SDL_SCANCODE_N,
-    SC_SCANCODE_O = SDL_SCANCODE_O,
-    SC_SCANCODE_P = SDL_SCANCODE_P,
-    SC_SCANCODE_Q = SDL_SCANCODE_Q,
-    SC_SCANCODE_R = SDL_SCANCODE_R,
-    SC_SCANCODE_S = SDL_SCANCODE_S,
-    SC_SCANCODE_T = SDL_SCANCODE_T,
-    SC_SCANCODE_U = SDL_SCANCODE_U,
-    SC_SCANCODE_V = SDL_SCANCODE_V,
-    SC_SCANCODE_W = SDL_SCANCODE_W,
-    SC_SCANCODE_X = SDL_SCANCODE_X,
-    SC_SCANCODE_Y = SDL_SCANCODE_Y,
-    SC_SCANCODE_Z = SDL_SCANCODE_Z,
-
-    SC_SCANCODE_1 = SDL_SCANCODE_1,
-    SC_SCANCODE_2 = SDL_SCANCODE_2,
-    SC_SCANCODE_3 = SDL_SCANCODE_3,
-    SC_SCANCODE_4 = SDL_SCANCODE_4,
-    SC_SCANCODE_5 = SDL_SCANCODE_5,
-    SC_SCANCODE_6 = SDL_SCANCODE_6,
-    SC_SCANCODE_7 = SDL_SCANCODE_7,
-    SC_SCANCODE_8 = SDL_SCANCODE_8,
-    SC_SCANCODE_9 = SDL_SCANCODE_9,
-    SC_SCANCODE_0 = SDL_SCANCODE_0,
-
-    SC_SCANCODE_RETURN = SDL_SCANCODE_RETURN,
-    SC_SCANCODE_ESCAPE = SDL_SCANCODE_ESCAPE,
-    SC_SCANCODE_BACKSPACE = SDL_SCANCODE_BACKSPACE,
-    SC_SCANCODE_TAB = SDL_SCANCODE_TAB,
-    SC_SCANCODE_SPACE = SDL_SCANCODE_SPACE,
-
-    SC_SCANCODE_MINUS = SDL_SCANCODE_MINUS,
-    SC_SCANCODE_EQUALS = SDL_SCANCODE_EQUALS,
-    SC_SCANCODE_LEFTBRACKET = SDL_SCANCODE_LEFTBRACKET,
-    SC_SCANCODE_RIGHTBRACKET = SDL_SCANCODE_RIGHTBRACKET,
-    SC_SCANCODE_BACKSLASH = SDL_SCANCODE_BACKSLASH,
-    SC_SCANCODE_NONUSHASH = SDL_SCANCODE_NONUSHASH,
-    SC_SCANCODE_SEMICOLON = SDL_SCANCODE_SEMICOLON,
-    SC_SCANCODE_APOSTROPHE = SDL_SCANCODE_APOSTROPHE,
-    SC_SCANCODE_GRAVE = SDL_SCANCODE_GRAVE,
-    SC_SCANCODE_COMMA = SDL_SCANCODE_COMMA,
-    SC_SCANCODE_PERIOD = SDL_SCANCODE_PERIOD,
-    SC_SCANCODE_SLASH = SDL_SCANCODE_SLASH,
-
-    SC_SCANCODE_CAPSLOCK = SDL_SCANCODE_CAPSLOCK,
-
-    SC_SCANCODE_F1 = SDL_SCANCODE_F1,
-    SC_SCANCODE_F2 = SDL_SCANCODE_F2,
-    SC_SCANCODE_F3 = SDL_SCANCODE_F3,
-    SC_SCANCODE_F4 = SDL_SCANCODE_F4,
-    SC_SCANCODE_F5 = SDL_SCANCODE_F5,
-    SC_SCANCODE_F6 = SDL_SCANCODE_F6,
-    SC_SCANCODE_F7 = SDL_SCANCODE_F7,
-    SC_SCANCODE_F8 = SDL_SCANCODE_F8,
-    SC_SCANCODE_F9 = SDL_SCANCODE_F9,
-    SC_SCANCODE_F10 = SDL_SCANCODE_F10,
-    SC_SCANCODE_F11 = SDL_SCANCODE_F11,
-    SC_SCANCODE_F12 = SDL_SCANCODE_F12,
-
-    SC_SCANCODE_PRINTSCREEN = SDL_SCANCODE_PRINTSCREEN,
-    SC_SCANCODE_SCROLLLOCK = SDL_SCANCODE_SCROLLLOCK,
-    SC_SCANCODE_PAUSE = SDL_SCANCODE_PAUSE,
-    SC_SCANCODE_INSERT = SDL_SCANCODE_INSERT,
-    SC_SCANCODE_HOME = SDL_SCANCODE_HOME,
-    SC_SCANCODE_PAGEUP = SDL_SCANCODE_PAGEUP,
-    SC_SCANCODE_DELETE = SDL_SCANCODE_DELETE,
-    SC_SCANCODE_END = SDL_SCANCODE_END,
-    SC_SCANCODE_PAGEDOWN = SDL_SCANCODE_PAGEDOWN,
-    SC_SCANCODE_RIGHT = SDL_SCANCODE_RIGHT,
-    SC_SCANCODE_LEFT = SDL_SCANCODE_LEFT,
-    SC_SCANCODE_DOWN = SDL_SCANCODE_DOWN,
-    SC_SCANCODE_UP = SDL_SCANCODE_UP,
-
-    SC_SCANCODE_NUMLOCK = SDL_SCANCODE_NUMLOCKCLEAR,
-    SC_SCANCODE_KP_DIVIDE = SDL_SCANCODE_KP_DIVIDE,
-    SC_SCANCODE_KP_MULTIPLY = SDL_SCANCODE_KP_MULTIPLY,
-    SC_SCANCODE_KP_MINUS = SDL_SCANCODE_KP_MINUS,
-    SC_SCANCODE_KP_PLUS = SDL_SCANCODE_KP_PLUS,
-    SC_SCANCODE_KP_ENTER = SDL_SCANCODE_KP_ENTER,
-    SC_SCANCODE_KP_1 = SDL_SCANCODE_KP_1,
-    SC_SCANCODE_KP_2 = SDL_SCANCODE_KP_2,
-    SC_SCANCODE_KP_3 = SDL_SCANCODE_KP_3,
-    SC_SCANCODE_KP_4 = SDL_SCANCODE_KP_4,
-    SC_SCANCODE_KP_5 = SDL_SCANCODE_KP_5,
-    SC_SCANCODE_KP_6 = SDL_SCANCODE_KP_6,
-    SC_SCANCODE_KP_7 = SDL_SCANCODE_KP_7,
-    SC_SCANCODE_KP_8 = SDL_SCANCODE_KP_8,
-    SC_SCANCODE_KP_9 = SDL_SCANCODE_KP_9,
-    SC_SCANCODE_KP_0 = SDL_SCANCODE_KP_0,
-    SC_SCANCODE_KP_PERIOD = SDL_SCANCODE_KP_PERIOD,
-
-    SC_SCANCODE_LCTRL = SDL_SCANCODE_LCTRL,
-    SC_SCANCODE_LSHIFT = SDL_SCANCODE_LSHIFT,
-    SC_SCANCODE_LALT = SDL_SCANCODE_LALT,
-    SC_SCANCODE_LGUI = SDL_SCANCODE_LGUI,
-    SC_SCANCODE_RCTRL = SDL_SCANCODE_RCTRL,
-    SC_SCANCODE_RSHIFT = SDL_SCANCODE_RSHIFT,
-    SC_SCANCODE_RALT = SDL_SCANCODE_RALT,
-    SC_SCANCODE_RGUI = SDL_SCANCODE_RGUI,
-};
-
-// On purpose, only use the "mask" values (1, 2, 4, 8, 16) for a single button,
-// to avoid unnecessary conversions (and confusion).
-enum sc_mouse_button {
-    SC_MOUSE_BUTTON_UNKNOWN = 0,
-    SC_MOUSE_BUTTON_LEFT = SDL_BUTTON(SDL_BUTTON_LEFT),
-    SC_MOUSE_BUTTON_RIGHT = SDL_BUTTON(SDL_BUTTON_RIGHT),
-    SC_MOUSE_BUTTON_MIDDLE = SDL_BUTTON(SDL_BUTTON_MIDDLE),
-    SC_MOUSE_BUTTON_X1 = SDL_BUTTON(SDL_BUTTON_X1),
-    SC_MOUSE_BUTTON_X2 = SDL_BUTTON(SDL_BUTTON_X2),
-};
-
-static_assert(sizeof(enum sc_mod) >= sizeof(SDL_Keymod),
-              "SDL_Keymod must be convertible to sc_mod");
-
-static_assert(sizeof(enum sc_keycode) >= sizeof(SDL_Keycode),
-              "SDL_Keycode must be convertible to sc_keycode");
-
-static_assert(sizeof(enum sc_scancode) >= sizeof(SDL_Scancode),
-              "SDL_Scancode must be convertible to sc_scancode");
-
-enum sc_touch_action {
-    SC_TOUCH_ACTION_MOVE,
-    SC_TOUCH_ACTION_DOWN,
-    SC_TOUCH_ACTION_UP,
-};
-
-struct sc_key_event {
-    enum sc_action action;
-    enum sc_keycode keycode;
-    enum sc_scancode scancode;
-    uint16_t mods_state; // bitwise-OR of sc_mod values
-    bool repeat;
-};
-
-struct sc_text_event {
-    const char *text; // not owned
-};
-
-struct sc_mouse_click_event {
-    struct sc_position position;
-    enum sc_action action;
-    enum sc_mouse_button button;
-    uint8_t buttons_state; // bitwise-OR of sc_mouse_button values
-};
-
-struct sc_mouse_scroll_event {
-    struct sc_position position;
-    int32_t hscroll;
-    int32_t vscroll;
-    uint8_t buttons_state; // bitwise-OR of sc_mouse_button values
-};
-
-struct sc_mouse_motion_event {
-    struct sc_position position;
-    int32_t xrel;
-    int32_t yrel;
-    uint8_t buttons_state; // bitwise-OR of sc_mouse_button values
-};
-
-struct sc_touch_event {
-    struct sc_position position;
-    enum sc_touch_action action;
-    uint64_t pointer_id;
-    float pressure;
-};
-
-#endif
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@ -3,110 +3,39 @@
 #include <assert.h>
 #include <SDL2/SDL_keycode.h>

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

-static inline uint16_t
-sc_mods_state_from_sdl(uint16_t mods_state) {
-    return mods_state;
-}
-
-static inline enum sc_keycode
-sc_keycode_from_sdl(SDL_Keycode keycode) {
-    return (enum sc_keycode) keycode;
-}
-
-static inline enum sc_scancode
-sc_scancode_from_sdl(SDL_Scancode scancode) {
-    return (enum sc_scancode) scancode;
-}
-
-static inline enum sc_action
-sc_action_from_sdl_keyboard_type(uint32_t type) {
-    assert(type == SDL_KEYDOWN || type == SDL_KEYUP);
-    if (type == SDL_KEYDOWN) {
-        return SC_ACTION_DOWN;
-    }
-    return SC_ACTION_UP;
-}
-
-static inline enum sc_action
-sc_action_from_sdl_mousebutton_type(uint32_t type) {
-    assert(type == SDL_MOUSEBUTTONDOWN || type == SDL_MOUSEBUTTONUP);
-    if (type == SDL_MOUSEBUTTONDOWN) {
-        return SC_ACTION_DOWN;
-    }
-    return SC_ACTION_UP;
-}
-
-static inline enum sc_touch_action
-sc_touch_action_from_sdl(uint32_t type) {
-    assert(type == SDL_FINGERMOTION || type == SDL_FINGERDOWN ||
-           type == SDL_FINGERUP);
-    if (type == SDL_FINGERMOTION) {
-        return SC_TOUCH_ACTION_MOVE;
-    }
-    if (type == SDL_FINGERDOWN) {
-        return SC_TOUCH_ACTION_DOWN;
-    }
-    return SC_TOUCH_ACTION_UP;
-}
-
-static inline enum sc_mouse_button
-sc_mouse_button_from_sdl(uint8_t button) {
-    if (button >= SDL_BUTTON_LEFT && button <= SDL_BUTTON_X2) {
-        // SC_MOUSE_BUTTON_* constants are initialized from SDL_BUTTON(index)
-        return SDL_BUTTON(button);
-    }
-
-    return SC_MOUSE_BUTTON_UNKNOWN;
-}
-
-static inline uint8_t
-sc_mouse_buttons_state_from_sdl(uint32_t buttons_state,
-                                bool forward_all_clicks) {
-    assert(buttons_state < 0x100); // fits in uint8_t
-
-    uint8_t mask = SC_MOUSE_BUTTON_LEFT;
-    if (forward_all_clicks) {
-        mask |= SC_MOUSE_BUTTON_RIGHT
-              | SC_MOUSE_BUTTON_MIDDLE
-              | SC_MOUSE_BUTTON_X1
-              | SC_MOUSE_BUTTON_X2;
-    }
-
-    return buttons_state & mask;
-}
+static const int ACTION_DOWN = 1;
+static const int ACTION_UP = 1 << 1;

 #define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)

 static inline uint16_t
-to_sdl_mod(unsigned shortcut_mod) {
+to_sdl_mod(unsigned mod) {
    uint16_t sdl_mod = 0;
-    if (shortcut_mod & SC_SHORTCUT_MOD_LCTRL) {
+    if (mod & SC_MOD_LCTRL) {
        sdl_mod |= KMOD_LCTRL;
    }
-    if (shortcut_mod & SC_SHORTCUT_MOD_RCTRL) {
+    if (mod & SC_MOD_RCTRL) {
        sdl_mod |= KMOD_RCTRL;
    }
-    if (shortcut_mod & SC_SHORTCUT_MOD_LALT) {
+    if (mod & SC_MOD_LALT) {
        sdl_mod |= KMOD_LALT;
    }
-    if (shortcut_mod & SC_SHORTCUT_MOD_RALT) {
+    if (mod & SC_MOD_RALT) {
        sdl_mod |= KMOD_RALT;
    }
-    if (shortcut_mod & SC_SHORTCUT_MOD_LSUPER) {
+    if (mod & SC_MOD_LSUPER) {
        sdl_mod |= KMOD_LGUI;
    }
-    if (shortcut_mod & SC_SHORTCUT_MOD_RSUPER) {
+    if (mod & SC_MOD_RSUPER) {
        sdl_mod |= KMOD_RGUI;
    }
    return sdl_mod;
 }

 static bool
-is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
+is_shortcut_mod(struct input_manager *im, uint16_t sdl_mod) {
    // keep only the relevant modifier keys
    sdl_mod &= SC_SDL_SHORTCUT_MODS_MASK;

@ -122,22 +51,23 @@ is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
 }

 void
-sc_input_manager_init(struct sc_input_manager *im,
-                      const struct sc_input_manager_params *params) {
-    assert(!params->control || (params->kp && params->kp->ops));
-    assert(!params->control || (params->mp && params->mp->ops));
+input_manager_init(struct input_manager *im, struct controller *controller,
+                   struct screen *screen, struct sc_key_processor *kp,
+                   struct sc_mouse_processor *mp,
+                   const struct scrcpy_options *options) {
+    assert(!options->control || (kp && kp->ops));
+    assert(!options->control || (mp && mp->ops));

-    im->controller = params->controller;
-    im->screen = params->screen;
-    im->kp = params->kp;
-    im->mp = params->mp;
+    im->controller = controller;
+    im->screen = screen;
+    im->kp = kp;
+    im->mp = mp;

-    im->control = params->control;
-    im->forward_all_clicks = params->forward_all_clicks;
-    im->legacy_paste = params->legacy_paste;
-    im->clipboard_autosync = params->clipboard_autosync;
+    im->control = options->control;
+    im->forward_all_clicks = options->forward_all_clicks;
+    im->legacy_paste = options->legacy_paste;

-    const struct sc_shortcut_mods *shortcut_mods = params->shortcut_mods;
+    const struct sc_shortcut_mods *shortcut_mods = &options->shortcut_mods;
    assert(shortcut_mods->count);
    assert(shortcut_mods->count < SC_MAX_SHORTCUT_MODS);
    for (unsigned i = 0; i < shortcut_mods->count; ++i) {
@ -152,163 +82,171 @@ sc_input_manager_init(struct sc_input_manager *im,
    im->last_keycode = SDLK_UNKNOWN;
    im->last_mod = 0;
    im->key_repeat = 0;
-
-    im->next_sequence = 1; // 0 is reserved for SC_SEQUENCE_INVALID
 }

 static void
-send_keycode(struct sc_controller *controller, enum android_keycode keycode,
-             enum sc_action action, const char *name) {
+send_keycode(struct controller *controller, enum android_keycode keycode,
+             int actions, const char *name) {
    // send DOWN event
-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
-    msg.inject_keycode.action = action == SC_ACTION_DOWN
-                              ? AKEY_EVENT_ACTION_DOWN
-                              : AKEY_EVENT_ACTION_UP;
    msg.inject_keycode.keycode = keycode;
    msg.inject_keycode.metastate = 0;
    msg.inject_keycode.repeat = 0;

-    if (!sc_controller_push_msg(controller, &msg)) {
-        LOGW("Could not request 'inject %s'", name);
+    if (actions & ACTION_DOWN) {
+        msg.inject_keycode.action = AKEY_EVENT_ACTION_DOWN;
+        if (!controller_push_msg(controller, &msg)) {
+            LOGW("Could not request 'inject %s (DOWN)'", name);
+            return;
+        }
+    }
+
+    if (actions & ACTION_UP) {
+        msg.inject_keycode.action = AKEY_EVENT_ACTION_UP;
+        if (!controller_push_msg(controller, &msg)) {
+            LOGW("Could not request 'inject %s (UP)'", name);
+        }
    }
 }

 static inline void
-action_home(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_HOME, action, "HOME");
+action_home(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_HOME, actions, "HOME");
 }

 static inline void
-action_back(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_BACK, action, "BACK");
+action_back(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_BACK, actions, "BACK");
 }

 static inline void
-action_app_switch(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_APP_SWITCH, action, "APP_SWITCH");
+action_app_switch(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_APP_SWITCH, actions, "APP_SWITCH");
 }

 static inline void
-action_power(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_POWER, action, "POWER");
+action_power(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_POWER, actions, "POWER");
 }

 static inline void
-action_volume_up(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_VOLUME_UP, action, "VOLUME_UP");
+action_volume_up(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_VOLUME_UP, actions, "VOLUME_UP");
 }

 static inline void
-action_volume_down(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_VOLUME_DOWN, action, "VOLUME_DOWN");
+action_volume_down(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_VOLUME_DOWN, actions, "VOLUME_DOWN");
 }

 static inline void
-action_menu(struct sc_controller *controller, enum sc_action action) {
-    send_keycode(controller, AKEYCODE_MENU, action, "MENU");
+action_menu(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_MENU, actions, "MENU");
+}
+
+static inline void
+action_copy(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_COPY, actions, "COPY");
+}
+
+static inline void
+action_cut(struct controller *controller, int actions) {
+    send_keycode(controller, AKEYCODE_CUT, actions, "CUT");
 }

 // turn the screen on if it was off, press BACK otherwise
 // If the screen is off, it is turned on only on ACTION_DOWN
 static void
-press_back_or_turn_screen_on(struct sc_controller *controller,
-                             enum sc_action action) {
-    struct sc_control_msg msg;
+press_back_or_turn_screen_on(struct controller *controller, int actions) {
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
-    msg.back_or_screen_on.action = action == SC_ACTION_DOWN
-                                 ? AKEY_EVENT_ACTION_DOWN
-                                 : AKEY_EVENT_ACTION_UP;

-    if (!sc_controller_push_msg(controller, &msg)) {
-        LOGW("Could not request 'press back or turn screen on'");
+    if (actions & ACTION_DOWN) {
+        msg.back_or_screen_on.action = AKEY_EVENT_ACTION_DOWN;
+        if (!controller_push_msg(controller, &msg)) {
+            LOGW("Could not request 'press back or turn screen on'");
+            return;
+        }
+    }
+
+    if (actions & ACTION_UP) {
+        msg.back_or_screen_on.action = AKEY_EVENT_ACTION_UP;
+        if (!controller_push_msg(controller, &msg)) {
+            LOGW("Could not request 'press back or turn screen on'");
+        }
    }
 }

 static void
-expand_notification_panel(struct sc_controller *controller) {
-    struct sc_control_msg msg;
+expand_notification_panel(struct controller *controller) {
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL;

-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request 'expand notification panel'");
    }
 }

 static void
-expand_settings_panel(struct sc_controller *controller) {
-    struct sc_control_msg msg;
+expand_settings_panel(struct controller *controller) {
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL;

-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request 'expand settings panel'");
    }
 }

 static void
-collapse_panels(struct sc_controller *controller) {
-    struct sc_control_msg msg;
+collapse_panels(struct controller *controller) {
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_COLLAPSE_PANELS;

-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request 'collapse notification panel'");
    }
 }

-static bool
-get_device_clipboard(struct sc_controller *controller,
-                     enum get_clipboard_copy_key copy_key) {
-    struct sc_control_msg msg;
-    msg.type = CONTROL_MSG_TYPE_GET_CLIPBOARD;
-    msg.get_clipboard.copy_key = copy_key;
-
-    if (!sc_controller_push_msg(controller, &msg)) {
-        LOGW("Could not request 'get device clipboard'");
-        return false;
-    }
-
-    return true;
-}
-
-static bool
-set_device_clipboard(struct sc_controller *controller, bool paste,
-                     uint64_t sequence) {
+static void
+set_device_clipboard(struct controller *controller, bool paste) {
    char *text = SDL_GetClipboardText();
    if (!text) {
        LOGW("Could not get clipboard text: %s", SDL_GetError());
-        return false;
+        return;
+    }
+    if (!*text) {
+        // empty text
+        SDL_free(text);
+        return;
    }

    char *text_dup = strdup(text);
    SDL_free(text);
    if (!text_dup) {
        LOGW("Could not strdup input text");
-        return false;
+        return;
    }

-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_SET_CLIPBOARD;
-    msg.set_clipboard.sequence = sequence;
    msg.set_clipboard.text = text_dup;
    msg.set_clipboard.paste = paste;

-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        free(text_dup);
        LOGW("Could not request 'set device clipboard'");
-        return false;
    }
-
-    return true;
 }

 static void
-set_screen_power_mode(struct sc_controller *controller,
+set_screen_power_mode(struct controller *controller,
                      enum screen_power_mode mode) {
-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
    msg.set_screen_power_mode.mode = mode;

-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request 'set screen power mode'");
    }
 }
@ -330,7 +268,7 @@ switch_fps_counter_state(struct fps_counter *fps_counter) {
 }

 static void
-clipboard_paste(struct sc_controller *controller) {
+clipboard_paste(struct controller *controller) {
    char *text = SDL_GetClipboardText();
    if (!text) {
        LOGW("Could not get clipboard text: %s", SDL_GetError());
@ -349,64 +287,55 @@ clipboard_paste(struct sc_controller *controller) {
        return;
    }

-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
    msg.inject_text.text = text_dup;
-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        free(text_dup);
        LOGW("Could not request 'paste clipboard'");
    }
 }

 static void
-rotate_device(struct sc_controller *controller) {
-    struct sc_control_msg msg;
+rotate_device(struct controller *controller) {
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_ROTATE_DEVICE;

-    if (!sc_controller_push_msg(controller, &msg)) {
+    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request device rotation");
    }
 }

 static void
-rotate_client_left(struct sc_screen *screen) {
+rotate_client_left(struct screen *screen) {
    unsigned new_rotation = (screen->rotation + 1) % 4;
-    sc_screen_set_rotation(screen, new_rotation);
+    screen_set_rotation(screen, new_rotation);
 }

 static void
-rotate_client_right(struct sc_screen *screen) {
+rotate_client_right(struct screen *screen) {
    unsigned new_rotation = (screen->rotation + 3) % 4;
-    sc_screen_set_rotation(screen, new_rotation);
+    screen_set_rotation(screen, new_rotation);
 }

 static void
-sc_input_manager_process_text_input(struct sc_input_manager *im,
-                                    const SDL_TextInputEvent *event) {
-    if (!im->kp->ops->process_text) {
-        // The key processor does not support text input
-        return;
-    }
-
+input_manager_process_text_input(struct input_manager *im,
+                                 const SDL_TextInputEvent *event) {
    if (is_shortcut_mod(im, SDL_GetModState())) {
        // A shortcut must never generate text events
        return;
    }

-    struct sc_text_event evt = {
-        .text = event->text,
-    };
-
-    im->kp->ops->process_text(im->kp, &evt);
+    im->kp->ops->process_text(im->kp, event);
 }

 static bool
-simulate_virtual_finger(struct sc_input_manager *im,
+simulate_virtual_finger(struct input_manager *im,
                        enum android_motionevent_action action,
                        struct sc_point point) {
    bool up = action == AMOTION_EVENT_ACTION_UP;

-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
    msg.inject_touch_event.action = action;
    msg.inject_touch_event.position.screen_size = im->screen->frame_size;
@ -415,7 +344,7 @@ simulate_virtual_finger(struct sc_input_manager *im,
    msg.inject_touch_event.pressure = up ? 0.0f : 1.0f;
    msg.inject_touch_event.buttons = 0;

-    if (!sc_controller_push_msg(im->controller, &msg)) {
+    if (!controller_push_msg(im->controller, &msg)) {
        LOGW("Could not request 'inject virtual finger event'");
        return false;
    }
@ -431,12 +360,12 @@ inverse_point(struct sc_point point, struct sc_size size) {
 }

 static void
-sc_input_manager_process_key(struct sc_input_manager *im,
-                             const SDL_KeyboardEvent *event) {
+input_manager_process_key(struct input_manager *im,
+                          const SDL_KeyboardEvent *event) {
    // control: indicates the state of the command-line option --no-control
    bool control = im->control;

-    struct sc_controller *controller = im->controller;
+    struct controller *controller = im->controller;

    SDL_Keycode keycode = event->keysym.sym;
    uint16_t mod = event->keysym.mod;
@ -459,7 +388,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,

    // The shortcut modifier is pressed
    if (smod) {
-        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
+        int action = down ? ACTION_DOWN : ACTION_UP;
        switch (keycode) {
            case SDLK_h:
                if (control && !shift && !repeat) {
@ -518,15 +447,13 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_c:
-                if (control && !shift && !repeat && down) {
-                    get_device_clipboard(controller,
-                                         GET_CLIPBOARD_COPY_KEY_COPY);
+                if (control && !shift && !repeat) {
+                    action_copy(controller, action);
                }
                return;
            case SDLK_x:
-                if (control && !shift && !repeat && down) {
-                    get_device_clipboard(controller,
-                                         GET_CLIPBOARD_COPY_KEY_CUT);
+                if (control && !shift && !repeat) {
+                    action_cut(controller, action);
                }
                return;
            case SDLK_v:
@ -535,26 +462,24 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                        // inject the text as input events
                        clipboard_paste(controller);
                    } else {
-                        // store the text in the device clipboard and paste,
-                        // without requesting an acknowledgment
-                        set_device_clipboard(controller, true,
-                                             SC_SEQUENCE_INVALID);
+                        // store the text in the device clipboard and paste
+                        set_device_clipboard(controller, true);
                    }
                }
                return;
            case SDLK_f:
                if (!shift && !repeat && down) {
-                    sc_screen_switch_fullscreen(im->screen);
+                    screen_switch_fullscreen(im->screen);
                }
                return;
            case SDLK_w:
                if (!shift && !repeat && down) {
-                    sc_screen_resize_to_fit(im->screen);
+                    screen_resize_to_fit(im->screen);
                }
                return;
            case SDLK_g:
                if (!shift && !repeat && down) {
-                    sc_screen_resize_to_pixel_perfect(im->screen);
+                    screen_resize_to_pixel_perfect(im->screen);
                }
                return;
            case SDLK_i:
@ -587,119 +512,56 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        return;
    }

-    uint64_t ack_to_wait = SC_SEQUENCE_INVALID;
-    bool is_ctrl_v = ctrl && !shift && keycode == SDLK_v && down && !repeat;
-    if (im->clipboard_autosync && is_ctrl_v) {
+    if (ctrl && !shift && keycode == SDLK_v && down && !repeat) {
        if (im->legacy_paste) {
            // inject the text as input events
            clipboard_paste(controller);
            return;
        }
-
-        // Request an acknowledgement only if necessary
-        uint64_t sequence = im->kp->async_paste ? im->next_sequence
-                                                : SC_SEQUENCE_INVALID;
-
        // Synchronize the computer clipboard to the device clipboard before
        // sending Ctrl+v, to allow seamless copy-paste.
-        bool ok = set_device_clipboard(controller, false, sequence);
-        if (!ok) {
-            LOGW("Clipboard could not be synchronized, Ctrl+v not injected");
-            return;
-        }
-
-        if (im->kp->async_paste) {
-            // The key processor must wait for this ack before injecting Ctrl+v
-            ack_to_wait = sequence;
-            // Increment only when the request succeeded
-            ++im->next_sequence;
-        }
+        set_device_clipboard(controller, false);
    }

-    struct sc_key_event evt = {
-        .action = sc_action_from_sdl_keyboard_type(event->type),
-        .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),
-    };
-
-    assert(im->kp->ops->process_key);
-    im->kp->ops->process_key(im->kp, &evt, ack_to_wait);
+    im->kp->ops->process_key(im->kp, event);
 }

 static void
-sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
-                                      const SDL_MouseMotionEvent *event) {
-
+input_manager_process_mouse_motion(struct input_manager *im,
+                                   const SDL_MouseMotionEvent *event) {
+    uint32_t mask = SDL_BUTTON_LMASK;
+    if (im->forward_all_clicks) {
+        mask |= SDL_BUTTON_MMASK | SDL_BUTTON_RMASK;
+    }
+    if (!(event->state & mask)) {
+        // do not send motion events when no click is pressed
+        return;
+    }
    if (event->which == SDL_TOUCH_MOUSEID) {
        // simulated from touch events, so it's a duplicate
        return;
    }

-    struct sc_mouse_motion_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point = sc_screen_convert_window_to_frame_coords(im->screen,
-                                                              event->x,
-                                                              event->y),
-        },
-        .xrel = event->xrel,
-        .yrel = event->yrel,
-        .buttons_state =
-            sc_mouse_buttons_state_from_sdl(event->state,
-                                            im->forward_all_clicks),
-    };
-
-    assert(im->mp->ops->process_mouse_motion);
-    im->mp->ops->process_mouse_motion(im->mp, &evt);
-
-    // vfinger must never be used in relative mode
-    assert(!im->mp->relative_mode || !im->vfinger_down);
+    im->mp->ops->process_mouse_motion(im->mp, event);

    if (im->vfinger_down) {
-        assert(!im->mp->relative_mode); // assert one more time
        struct sc_point mouse =
-           sc_screen_convert_window_to_frame_coords(im->screen, event->x,
-                                                    event->y);
+            screen_convert_window_to_frame_coords(im->screen, event->x,
+                                                  event->y);
        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
        simulate_virtual_finger(im, AMOTION_EVENT_ACTION_MOVE, vfinger);
    }
 }

 static void
-sc_input_manager_process_touch(struct sc_input_manager *im,
-                               const SDL_TouchFingerEvent *event) {
-    if (!im->mp->ops->process_touch) {
-        // The mouse processor does not support touch events
-        return;
-    }
-
-    int dw;
-    int dh;
-    SDL_GL_GetDrawableSize(im->screen->window, &dw, &dh);
-
-    // SDL touch event coordinates are normalized in the range [0; 1]
-    int32_t x = event->x * dw;
-    int32_t y = event->y * dh;
-
-    struct sc_touch_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point =
-                sc_screen_convert_drawable_to_frame_coords(im->screen, x, y),
-        },
-        .action = sc_touch_action_from_sdl(event->type),
-        .pointer_id = event->fingerId,
-        .pressure = event->pressure,
-    };
-
-    im->mp->ops->process_touch(im->mp, &evt);
+input_manager_process_touch(struct input_manager *im,
+                            const SDL_TouchFingerEvent *event) {
+    im->mp->ops->process_touch(im->mp, event);
 }

 static void
-sc_input_manager_process_mouse_button(struct sc_input_manager *im,
-                                      const SDL_MouseButtonEvent *event) {
+input_manager_process_mouse_button(struct input_manager *im,
+                                   const SDL_MouseButtonEvent *event) {
    bool control = im->control;

    if (event->which == SDL_TOUCH_MOUSEID) {
@ -709,7 +571,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,

    bool down = event->type == SDL_MOUSEBUTTONDOWN;
    if (!im->forward_all_clicks) {
-        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
+        int action = down ? ACTION_DOWN : ACTION_UP;

        if (control && event->button == SDL_BUTTON_X1) {
            action_app_switch(im->controller, action);
@ -736,13 +598,13 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
        if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
            int32_t x = event->x;
            int32_t y = event->y;
-            sc_screen_hidpi_scale_coords(im->screen, &x, &y);
+            screen_hidpi_scale_coords(im->screen, &x, &y);
            SDL_Rect *r = &im->screen->rect;
            bool outside = x < r->x || x >= r->x + r->w
                        || y < r->y || y >= r->y + r->h;
            if (outside) {
                if (down) {
-                    sc_screen_resize_to_fit(im->screen);
+                    screen_resize_to_fit(im->screen);
                }
                return;
            }
@ -754,30 +616,7 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
        return;
    }

-    uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);
-
-    struct sc_mouse_click_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point = sc_screen_convert_window_to_frame_coords(im->screen,
-                                                              event->x,
-                                                              event->y),
-        },
-        .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,
-                                            im->forward_all_clicks),
-    };
-
-    assert(im->mp->ops->process_mouse_click);
-    im->mp->ops->process_mouse_click(im->mp, &evt);
-
-    if (im->mp->relative_mode) {
-        assert(!im->vfinger_down); // vfinger must not be used in relative mode
-        // No pinch-to-zoom simulation
-        return;
-    }
+    im->mp->ops->process_mouse_button(im->mp, event);

    // Pinch-to-zoom simulation.
    //
@ -789,12 +628,11 @@ 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.
 #define CTRL_PRESSED (SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL))
-    if (event->button == SDL_BUTTON_LEFT &&
-            ((down && !im->vfinger_down && CTRL_PRESSED) ||
-             (!down && im->vfinger_down))) {
+    if ((down && !im->vfinger_down && CTRL_PRESSED)
+            || (!down && im->vfinger_down)) {
        struct sc_point mouse =
-            sc_screen_convert_window_to_frame_coords(im->screen, event->x,
-                                                                 event->y);
+            screen_convert_window_to_frame_coords(im->screen, event->x,
+                                                              event->y);
        struct sc_point vfinger = inverse_point(mouse, im->screen->frame_size);
        enum android_motionevent_action action = down
                                               ? AMOTION_EVENT_ACTION_DOWN
@ -807,70 +645,48 @@ sc_input_manager_process_mouse_button(struct sc_input_manager *im,
 }

 static void
-sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
-                                     const SDL_MouseWheelEvent *event) {
-    if (!im->mp->ops->process_mouse_scroll) {
-        // The mouse processor does not support scroll events
-        return;
-    }
-
-    // mouse_x and mouse_y are expressed in pixels relative to the window
-    int mouse_x;
-    int mouse_y;
-    uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);
-
-    struct sc_mouse_scroll_event evt = {
-        .position = {
-            .screen_size = im->screen->frame_size,
-            .point = sc_screen_convert_window_to_frame_coords(im->screen,
-                                                              mouse_x, mouse_y),
-        },
-        .hscroll = event->x,
-        .vscroll = event->y,
-        .buttons_state =
-            sc_mouse_buttons_state_from_sdl(buttons, im->forward_all_clicks),
-    };
-
-    im->mp->ops->process_mouse_scroll(im->mp, &evt);
+input_manager_process_mouse_wheel(struct input_manager *im,
+                                  const SDL_MouseWheelEvent *event) {
+    im->mp->ops->process_mouse_wheel(im->mp, event);
 }

 bool
-sc_input_manager_handle_event(struct sc_input_manager *im, SDL_Event *event) {
+input_manager_handle_event(struct input_manager *im, SDL_Event *event) {
    switch (event->type) {
        case SDL_TEXTINPUT:
            if (!im->control) {
                return true;
            }
-            sc_input_manager_process_text_input(im, &event->text);
+            input_manager_process_text_input(im, &event->text);
            return true;
        case SDL_KEYDOWN:
        case SDL_KEYUP:
            // some key events do not interact with the device, so process the
            // event even if control is disabled
-            sc_input_manager_process_key(im, &event->key);
+            input_manager_process_key(im, &event->key);
            return true;
        case SDL_MOUSEMOTION:
            if (!im->control) {
                break;
            }
-            sc_input_manager_process_mouse_motion(im, &event->motion);
+            input_manager_process_mouse_motion(im, &event->motion);
            return true;
        case SDL_MOUSEWHEEL:
            if (!im->control) {
                break;
            }
-            sc_input_manager_process_mouse_wheel(im, &event->wheel);
+            input_manager_process_mouse_wheel(im, &event->wheel);
            return true;
        case SDL_MOUSEBUTTONDOWN:
        case SDL_MOUSEBUTTONUP:
            // some mouse events do not interact with the device, so process
            // the event even if control is disabled
-            sc_input_manager_process_mouse_button(im, &event->button);
+            input_manager_process_mouse_button(im, &event->button);
            return true;
        case SDL_FINGERMOTION:
        case SDL_FINGERDOWN:
        case SDL_FINGERUP:
-            sc_input_manager_process_touch(im, &event->tfinger);
+            input_manager_process_touch(im, &event->tfinger);
            return true;
    }

--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@ -10,12 +10,13 @@
 #include "controller.h"
 #include "fps_counter.h"
 #include "options.h"
+#include "screen.h"
 #include "trait/key_processor.h"
 #include "trait/mouse_processor.h"

-struct sc_input_manager {
-    struct sc_controller *controller;
-    struct sc_screen *screen;
+struct input_manager {
+    struct controller *controller;
+    struct screen *screen;

    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;
@ -23,7 +24,6 @@ struct sc_input_manager {
    bool control;
    bool forward_all_clicks;
    bool legacy_paste;
-    bool clipboard_autosync;

    struct {
        unsigned data[SC_MAX_SHORTCUT_MODS];
@ -38,28 +38,15 @@ struct sc_input_manager {
    unsigned key_repeat;
    SDL_Keycode last_keycode;
    uint16_t last_mod;
-
-    uint64_t next_sequence; // used for request acknowledgements
-};
-
-struct sc_input_manager_params {
-    struct sc_controller *controller;
-    struct sc_screen *screen;
-    struct sc_key_processor *kp;
-    struct sc_mouse_processor *mp;
-
-    bool control;
-    bool forward_all_clicks;
-    bool legacy_paste;
-    bool clipboard_autosync;
-    const struct sc_shortcut_mods *shortcut_mods;
 };

 void
-sc_input_manager_init(struct sc_input_manager *im,
-                      const struct sc_input_manager_params *params);
+input_manager_init(struct input_manager *im, struct controller *controller,
+                   struct screen *screen, struct sc_key_processor *kp,
+                   struct sc_mouse_processor *mp,
+                   const struct scrcpy_options *options);

 bool
-sc_input_manager_handle_event(struct sc_input_manager *im, SDL_Event *event);
+input_manager_handle_event(struct input_manager *im, SDL_Event *event);

 #endif
--- a/app/src/keyboard_inject.c
+++ b/app/src/keyboard_inject.c
@ -1,191 +1,108 @@
 #include "keyboard_inject.h"

 #include <assert.h>
+#include <SDL2/SDL_events.h>

 #include "android/input.h"
 #include "control_msg.h"
 #include "controller.h"
-#include "input_events.h"
-#include "util/intmap.h"
 #include "util/log.h"

 /** Downcast key processor to sc_keyboard_inject */
-#define DOWNCAST(KP) container_of(KP, struct sc_keyboard_inject, key_processor)
+#define DOWNCAST(KP) \
+    container_of(KP, struct sc_keyboard_inject, key_processor)

-static enum android_keyevent_action
-convert_keycode_action(enum sc_action action) {
-    if (action == SC_ACTION_DOWN) {
-        return AKEY_EVENT_ACTION_DOWN;
+#define MAP(FROM, TO) case FROM: *to = TO; return true
+#define FAIL default: return false
+static bool
+convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to) {
+    switch (from) {
+        MAP(SDL_KEYDOWN, AKEY_EVENT_ACTION_DOWN);
+        MAP(SDL_KEYUP,   AKEY_EVENT_ACTION_UP);
+        FAIL;
    }
-    assert(action == SC_ACTION_UP);
-    return AKEY_EVENT_ACTION_UP;
 }

 static bool
-convert_keycode(enum sc_keycode from, enum android_keycode *to, uint16_t mod,
-                enum sc_key_inject_mode key_inject_mode) {
-    // Navigation keys and ENTER.
-    // Used in all modes.
-    static const struct sc_intmap_entry special_keys[] = {
-        {SC_KEYCODE_RETURN,    AKEYCODE_ENTER},
-        {SC_KEYCODE_KP_ENTER,  AKEYCODE_NUMPAD_ENTER},
-        {SC_KEYCODE_ESCAPE,    AKEYCODE_ESCAPE},
-        {SC_KEYCODE_BACKSPACE, AKEYCODE_DEL},
-        {SC_KEYCODE_TAB,       AKEYCODE_TAB},
-        {SC_KEYCODE_PAGEUP,    AKEYCODE_PAGE_UP},
-        {SC_KEYCODE_DELETE,    AKEYCODE_FORWARD_DEL},
-        {SC_KEYCODE_HOME,      AKEYCODE_MOVE_HOME},
-        {SC_KEYCODE_END,       AKEYCODE_MOVE_END},
-        {SC_KEYCODE_PAGEDOWN,  AKEYCODE_PAGE_DOWN},
-        {SC_KEYCODE_RIGHT,     AKEYCODE_DPAD_RIGHT},
-        {SC_KEYCODE_LEFT,      AKEYCODE_DPAD_LEFT},
-        {SC_KEYCODE_DOWN,      AKEYCODE_DPAD_DOWN},
-        {SC_KEYCODE_UP,        AKEYCODE_DPAD_UP},
-        {SC_KEYCODE_LCTRL,     AKEYCODE_CTRL_LEFT},
-        {SC_KEYCODE_RCTRL,     AKEYCODE_CTRL_RIGHT},
-        {SC_KEYCODE_LSHIFT,    AKEYCODE_SHIFT_LEFT},
-        {SC_KEYCODE_RSHIFT,    AKEYCODE_SHIFT_RIGHT},
-    };
-
-    // Numpad navigation keys.
-    // Used in all modes, when NumLock and Shift are disabled.
-    static const struct sc_intmap_entry kp_nav_keys[] = {
-        {SC_KEYCODE_KP_0,      AKEYCODE_INSERT},
-        {SC_KEYCODE_KP_1,      AKEYCODE_MOVE_END},
-        {SC_KEYCODE_KP_2,      AKEYCODE_DPAD_DOWN},
-        {SC_KEYCODE_KP_3,      AKEYCODE_PAGE_DOWN},
-        {SC_KEYCODE_KP_4,      AKEYCODE_DPAD_LEFT},
-        {SC_KEYCODE_KP_6,      AKEYCODE_DPAD_RIGHT},
-        {SC_KEYCODE_KP_7,      AKEYCODE_MOVE_HOME},
-        {SC_KEYCODE_KP_8,      AKEYCODE_DPAD_UP},
-        {SC_KEYCODE_KP_9,      AKEYCODE_PAGE_UP},
-        {SC_KEYCODE_KP_PERIOD, AKEYCODE_FORWARD_DEL},
-    };
-
-    // Letters and space.
-    // Used in non-text mode.
-    static const struct sc_intmap_entry alphaspace_keys[] = {
-        {SC_KEYCODE_a,         AKEYCODE_A},
-        {SC_KEYCODE_b,         AKEYCODE_B},
-        {SC_KEYCODE_c,         AKEYCODE_C},
-        {SC_KEYCODE_d,         AKEYCODE_D},
-        {SC_KEYCODE_e,         AKEYCODE_E},
-        {SC_KEYCODE_f,         AKEYCODE_F},
-        {SC_KEYCODE_g,         AKEYCODE_G},
-        {SC_KEYCODE_h,         AKEYCODE_H},
-        {SC_KEYCODE_i,         AKEYCODE_I},
-        {SC_KEYCODE_j,         AKEYCODE_J},
-        {SC_KEYCODE_k,         AKEYCODE_K},
-        {SC_KEYCODE_l,         AKEYCODE_L},
-        {SC_KEYCODE_m,         AKEYCODE_M},
-        {SC_KEYCODE_n,         AKEYCODE_N},
-        {SC_KEYCODE_o,         AKEYCODE_O},
-        {SC_KEYCODE_p,         AKEYCODE_P},
-        {SC_KEYCODE_q,         AKEYCODE_Q},
-        {SC_KEYCODE_r,         AKEYCODE_R},
-        {SC_KEYCODE_s,         AKEYCODE_S},
-        {SC_KEYCODE_t,         AKEYCODE_T},
-        {SC_KEYCODE_u,         AKEYCODE_U},
-        {SC_KEYCODE_v,         AKEYCODE_V},
-        {SC_KEYCODE_w,         AKEYCODE_W},
-        {SC_KEYCODE_x,         AKEYCODE_X},
-        {SC_KEYCODE_y,         AKEYCODE_Y},
-        {SC_KEYCODE_z,         AKEYCODE_Z},
-        {SC_KEYCODE_SPACE,     AKEYCODE_SPACE},
-    };
-
-    // Numbers and punctuation keys.
-    // Used in raw mode only.
-    static const struct sc_intmap_entry numbers_punct_keys[] = {
-        {SC_KEYCODE_HASH,          AKEYCODE_POUND},
-        {SC_KEYCODE_PERCENT,       AKEYCODE_PERIOD},
-        {SC_KEYCODE_QUOTE,         AKEYCODE_APOSTROPHE},
-        {SC_KEYCODE_ASTERISK,      AKEYCODE_STAR},
-        {SC_KEYCODE_PLUS,          AKEYCODE_PLUS},
-        {SC_KEYCODE_COMMA,         AKEYCODE_COMMA},
-        {SC_KEYCODE_MINUS,         AKEYCODE_MINUS},
-        {SC_KEYCODE_PERIOD,        AKEYCODE_PERIOD},
-        {SC_KEYCODE_SLASH,         AKEYCODE_SLASH},
-        {SC_KEYCODE_0,             AKEYCODE_0},
-        {SC_KEYCODE_1,             AKEYCODE_1},
-        {SC_KEYCODE_2,             AKEYCODE_2},
-        {SC_KEYCODE_3,             AKEYCODE_3},
-        {SC_KEYCODE_4,             AKEYCODE_4},
-        {SC_KEYCODE_5,             AKEYCODE_5},
-        {SC_KEYCODE_6,             AKEYCODE_6},
-        {SC_KEYCODE_7,             AKEYCODE_7},
-        {SC_KEYCODE_8,             AKEYCODE_8},
-        {SC_KEYCODE_9,             AKEYCODE_9},
-        {SC_KEYCODE_SEMICOLON,     AKEYCODE_SEMICOLON},
-        {SC_KEYCODE_EQUALS,        AKEYCODE_EQUALS},
-        {SC_KEYCODE_AT,            AKEYCODE_AT},
-        {SC_KEYCODE_LEFTBRACKET,   AKEYCODE_LEFT_BRACKET},
-        {SC_KEYCODE_BACKSLASH,     AKEYCODE_BACKSLASH},
-        {SC_KEYCODE_RIGHTBRACKET,  AKEYCODE_RIGHT_BRACKET},
-        {SC_KEYCODE_BACKQUOTE,     AKEYCODE_GRAVE},
-        {SC_KEYCODE_KP_1,          AKEYCODE_NUMPAD_1},
-        {SC_KEYCODE_KP_2,          AKEYCODE_NUMPAD_2},
-        {SC_KEYCODE_KP_3,          AKEYCODE_NUMPAD_3},
-        {SC_KEYCODE_KP_4,          AKEYCODE_NUMPAD_4},
-        {SC_KEYCODE_KP_5,          AKEYCODE_NUMPAD_5},
-        {SC_KEYCODE_KP_6,          AKEYCODE_NUMPAD_6},
-        {SC_KEYCODE_KP_7,          AKEYCODE_NUMPAD_7},
-        {SC_KEYCODE_KP_8,          AKEYCODE_NUMPAD_8},
-        {SC_KEYCODE_KP_9,          AKEYCODE_NUMPAD_9},
-        {SC_KEYCODE_KP_0,          AKEYCODE_NUMPAD_0},
-        {SC_KEYCODE_KP_DIVIDE,     AKEYCODE_NUMPAD_DIVIDE},
-        {SC_KEYCODE_KP_MULTIPLY,   AKEYCODE_NUMPAD_MULTIPLY},
-        {SC_KEYCODE_KP_MINUS,      AKEYCODE_NUMPAD_SUBTRACT},
-        {SC_KEYCODE_KP_PLUS,       AKEYCODE_NUMPAD_ADD},
-        {SC_KEYCODE_KP_PERIOD,     AKEYCODE_NUMPAD_DOT},
-        {SC_KEYCODE_KP_EQUALS,     AKEYCODE_NUMPAD_EQUALS},
-        {SC_KEYCODE_KP_LEFTPAREN,  AKEYCODE_NUMPAD_LEFT_PAREN},
-        {SC_KEYCODE_KP_RIGHTPAREN, AKEYCODE_NUMPAD_RIGHT_PAREN},
-    };
-
-    const struct sc_intmap_entry *entry =
-        SC_INTMAP_FIND_ENTRY(special_keys, from);
-    if (entry) {
-        *to = entry->value;
-        return true;
+convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
+                bool prefer_text) {
+    switch (from) {
+        MAP(SDLK_RETURN,       AKEYCODE_ENTER);
+        MAP(SDLK_KP_ENTER,     AKEYCODE_NUMPAD_ENTER);
+        MAP(SDLK_ESCAPE,       AKEYCODE_ESCAPE);
+        MAP(SDLK_BACKSPACE,    AKEYCODE_DEL);
+        MAP(SDLK_TAB,          AKEYCODE_TAB);
+        MAP(SDLK_PAGEUP,       AKEYCODE_PAGE_UP);
+        MAP(SDLK_DELETE,       AKEYCODE_FORWARD_DEL);
+        MAP(SDLK_HOME,         AKEYCODE_MOVE_HOME);
+        MAP(SDLK_END,          AKEYCODE_MOVE_END);
+        MAP(SDLK_PAGEDOWN,     AKEYCODE_PAGE_DOWN);
+        MAP(SDLK_RIGHT,        AKEYCODE_DPAD_RIGHT);
+        MAP(SDLK_LEFT,         AKEYCODE_DPAD_LEFT);
+        MAP(SDLK_DOWN,         AKEYCODE_DPAD_DOWN);
+        MAP(SDLK_UP,           AKEYCODE_DPAD_UP);
+        MAP(SDLK_LCTRL,        AKEYCODE_CTRL_LEFT);
+        MAP(SDLK_RCTRL,        AKEYCODE_CTRL_RIGHT);
+        MAP(SDLK_LSHIFT,       AKEYCODE_SHIFT_LEFT);
+        MAP(SDLK_RSHIFT,       AKEYCODE_SHIFT_RIGHT);
    }

-    if (!(mod & (SC_MOD_NUM | SC_MOD_LSHIFT | SC_MOD_RSHIFT))) {
+    if (!(mod & (KMOD_NUM | KMOD_SHIFT))) {
        // Handle Numpad events when Num Lock is disabled
        // If SHIFT is pressed, a text event will be sent instead
-        entry = SC_INTMAP_FIND_ENTRY(kp_nav_keys, from);
-        if (entry) {
-            *to = entry->value;
-            return true;
+        switch(from) {
+            MAP(SDLK_KP_0,            AKEYCODE_INSERT);
+            MAP(SDLK_KP_1,            AKEYCODE_MOVE_END);
+            MAP(SDLK_KP_2,            AKEYCODE_DPAD_DOWN);
+            MAP(SDLK_KP_3,            AKEYCODE_PAGE_DOWN);
+            MAP(SDLK_KP_4,            AKEYCODE_DPAD_LEFT);
+            MAP(SDLK_KP_6,            AKEYCODE_DPAD_RIGHT);
+            MAP(SDLK_KP_7,            AKEYCODE_MOVE_HOME);
+            MAP(SDLK_KP_8,            AKEYCODE_DPAD_UP);
+            MAP(SDLK_KP_9,            AKEYCODE_PAGE_UP);
+            MAP(SDLK_KP_PERIOD,       AKEYCODE_FORWARD_DEL);
        }
    }

-    if (key_inject_mode == SC_KEY_INJECT_MODE_TEXT &&
-            !(mod & (SC_MOD_LCTRL | SC_MOD_RCTRL))) {
+    if (prefer_text && !(mod & KMOD_CTRL)) {
        // do not forward alpha and space key events (unless Ctrl is pressed)
        return false;
    }

-    if (mod & (SC_MOD_LALT | SC_MOD_RALT | SC_MOD_LGUI | SC_MOD_RGUI)) {
+    if (mod & (KMOD_LALT | KMOD_RALT | KMOD_LGUI | KMOD_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;
-        return true;
+    switch (from) {
+        MAP(SDLK_a,            AKEYCODE_A);
+        MAP(SDLK_b,            AKEYCODE_B);
+        MAP(SDLK_c,            AKEYCODE_C);
+        MAP(SDLK_d,            AKEYCODE_D);
+        MAP(SDLK_e,            AKEYCODE_E);
+        MAP(SDLK_f,            AKEYCODE_F);
+        MAP(SDLK_g,            AKEYCODE_G);
+        MAP(SDLK_h,            AKEYCODE_H);
+        MAP(SDLK_i,            AKEYCODE_I);
+        MAP(SDLK_j,            AKEYCODE_J);
+        MAP(SDLK_k,            AKEYCODE_K);
+        MAP(SDLK_l,            AKEYCODE_L);
+        MAP(SDLK_m,            AKEYCODE_M);
+        MAP(SDLK_n,            AKEYCODE_N);
+        MAP(SDLK_o,            AKEYCODE_O);
+        MAP(SDLK_p,            AKEYCODE_P);
+        MAP(SDLK_q,            AKEYCODE_Q);
+        MAP(SDLK_r,            AKEYCODE_R);
+        MAP(SDLK_s,            AKEYCODE_S);
+        MAP(SDLK_t,            AKEYCODE_T);
+        MAP(SDLK_u,            AKEYCODE_U);
+        MAP(SDLK_v,            AKEYCODE_V);
+        MAP(SDLK_w,            AKEYCODE_W);
+        MAP(SDLK_x,            AKEYCODE_X);
+        MAP(SDLK_y,            AKEYCODE_Y);
+        MAP(SDLK_z,            AKEYCODE_Z);
+        MAP(SDLK_SPACE,        AKEYCODE_SPACE);
+        FAIL;
    }
-
-    if (key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
-        entry = SC_INTMAP_FIND_ENTRY(numbers_punct_keys, from);
-        if (entry) {
-            *to = entry->value;
-            return true;
-        }
-    }
-
-    return false;
 }

 static enum android_metastate
@ -208,69 +125,70 @@ autocomplete_metastate(enum android_metastate metastate) {
 }

 static enum android_metastate
-convert_meta_state(uint16_t mod) {
+convert_meta_state(SDL_Keymod mod) {
    enum android_metastate metastate = 0;
-    if (mod & SC_MOD_LSHIFT) {
+    if (mod & KMOD_LSHIFT) {
        metastate |= AMETA_SHIFT_LEFT_ON;
    }
-    if (mod & SC_MOD_RSHIFT) {
+    if (mod & KMOD_RSHIFT) {
        metastate |= AMETA_SHIFT_RIGHT_ON;
    }
-    if (mod & SC_MOD_LCTRL) {
+    if (mod & KMOD_LCTRL) {
        metastate |= AMETA_CTRL_LEFT_ON;
    }
-    if (mod & SC_MOD_RCTRL) {
+    if (mod & KMOD_RCTRL) {
        metastate |= AMETA_CTRL_RIGHT_ON;
    }
-    if (mod & SC_MOD_LALT) {
+    if (mod & KMOD_LALT) {
        metastate |= AMETA_ALT_LEFT_ON;
    }
-    if (mod & SC_MOD_RALT) {
+    if (mod & KMOD_RALT) {
        metastate |= AMETA_ALT_RIGHT_ON;
    }
-    if (mod & SC_MOD_LGUI) { // Windows key
+    if (mod & KMOD_LGUI) { // Windows key
        metastate |= AMETA_META_LEFT_ON;
    }
-    if (mod & SC_MOD_RGUI) { // Windows key
+    if (mod & KMOD_RGUI) { // Windows key
        metastate |= AMETA_META_RIGHT_ON;
    }
-    if (mod & SC_MOD_NUM) {
+    if (mod & KMOD_NUM) {
        metastate |= AMETA_NUM_LOCK_ON;
    }
-    if (mod & SC_MOD_CAPS) {
+    if (mod & KMOD_CAPS) {
        metastate |= AMETA_CAPS_LOCK_ON;
    }
+    if (mod & KMOD_MODE) { // Alt Gr
+        // no mapping?
+    }

    // fill the dependent fields
    return autocomplete_metastate(metastate);
 }

 static bool
-convert_input_key(const struct sc_key_event *event, struct sc_control_msg *msg,
-                  enum sc_key_inject_mode key_inject_mode, uint32_t repeat) {
-    msg->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
+                  bool prefer_text, uint32_t repeat) {
+    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;

-    if (!convert_keycode(event->keycode, &msg->inject_keycode.keycode,
-                         event->mods_state, key_inject_mode)) {
+    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
        return false;
    }

-    msg->inject_keycode.action = convert_keycode_action(event->action);
-    msg->inject_keycode.repeat = repeat;
-    msg->inject_keycode.metastate = convert_meta_state(event->mods_state);
+    uint16_t mod = from->keysym.mod;
+    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod,
+                         prefer_text)) {
+        return false;
+    }
+
+    to->inject_keycode.repeat = repeat;
+    to->inject_keycode.metastate = convert_meta_state(mod);

    return true;
 }

 static void
 sc_key_processor_process_key(struct sc_key_processor *kp,
-                             const struct sc_key_event *event,
-                             uint64_t ack_to_wait) {
-    // The device clipboard synchronization and the key event messages are
-    // serialized, there is nothing special to do to ensure that the clipboard
-    // is set before injecting Ctrl+v.
-    (void) ack_to_wait;
-
+                             const SDL_KeyboardEvent *event) {
    struct sc_keyboard_inject *ki = DOWNCAST(kp);

    if (event->repeat) {
@ -282,9 +200,9 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
        ki->repeat = 0;
    }

-    struct sc_control_msg msg;
-    if (convert_input_key(event, &msg, ki->key_inject_mode, ki->repeat)) {
-        if (!sc_controller_push_msg(ki->controller, &msg)) {
+    struct control_msg msg;
+    if (convert_input_key(event, &msg, ki->prefer_text, ki->repeat)) {
+        if (!controller_push_msg(ki->controller, &msg)) {
            LOGW("Could not request 'inject keycode'");
        }
    }
@ -292,31 +210,26 @@ sc_key_processor_process_key(struct sc_key_processor *kp,

 static void
 sc_key_processor_process_text(struct sc_key_processor *kp,
-                              const struct sc_text_event *event) {
+                              const SDL_TextInputEvent *event) {
    struct sc_keyboard_inject *ki = DOWNCAST(kp);

-    if (ki->key_inject_mode == SC_KEY_INJECT_MODE_RAW) {
-        // Never inject text events
-        return;
-    }
-
-    if (ki->key_inject_mode == SC_KEY_INJECT_MODE_MIXED) {
+    if (!ki->prefer_text) {
        char c = event->text[0];
        if (isalpha(c) || c == ' ') {
            assert(event->text[1] == '\0');
-            // Letters and space are handled as raw key events
+            // letters and space are handled as raw key event
            return;
        }
    }

-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
    msg.inject_text.text = strdup(event->text);
    if (!msg.inject_text.text) {
        LOGW("Could not strdup input text");
        return;
    }
-    if (!sc_controller_push_msg(ki->controller, &msg)) {
+    if (!controller_push_msg(ki->controller, &msg)) {
        free(msg.inject_text.text);
        LOGW("Could not request 'inject text'");
    }
@ -324,12 +237,11 @@ sc_key_processor_process_text(struct sc_key_processor *kp,

 void
 sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
-                        struct sc_controller *controller,
-                        enum sc_key_inject_mode key_inject_mode,
-                        bool forward_key_repeat) {
+                        struct controller *controller,
+                        const struct scrcpy_options *options) {
    ki->controller = controller;
-    ki->key_inject_mode = key_inject_mode;
-    ki->forward_key_repeat = forward_key_repeat;
+    ki->prefer_text = options->prefer_text;
+    ki->forward_key_repeat = options->forward_key_repeat;

    ki->repeat = 0;

@ -338,7 +250,5 @@ sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
        .process_text = sc_key_processor_process_text,
    };

-    // Key injection and clipboard synchronization are serialized
-    ki->key_processor.async_paste = false;
    ki->key_processor.ops = &ops;
 }
--- a/app/src/keyboard_inject.h
+++ b/app/src/keyboard_inject.h
@ -12,20 +12,19 @@
 struct sc_keyboard_inject {
    struct sc_key_processor key_processor; // key processor trait

-    struct sc_controller *controller;
+    struct controller *controller;

    // SDL reports repeated events as a boolean, but Android expects the actual
    // number of repetitions. This variable keeps track of the count.
    unsigned repeat;

-    enum sc_key_inject_mode key_inject_mode;
+    bool prefer_text;
    bool forward_key_repeat;
 };

 void
 sc_keyboard_inject_init(struct sc_keyboard_inject *ki,
-                        struct sc_controller *controller,
-                        enum sc_key_inject_mode key_inject_mode,
-                        bool forward_key_repeat);
+                        struct controller *controller,
+                        const struct scrcpy_options *options);

 #endif
--- a/app/src/mouse_inject.c
+++ b/app/src/mouse_inject.c
@ -1,12 +1,11 @@
 #include "mouse_inject.h"

 #include <assert.h>
+#include <SDL2/SDL_events.h>

 #include "android/input.h"
 #include "control_msg.h"
 #include "controller.h"
-#include "input_events.h"
-#include "util/intmap.h"
 #include "util/log.h"

 /** Downcast mouse processor to sc_mouse_inject */
@ -15,147 +14,198 @@
 static enum android_motionevent_buttons
 convert_mouse_buttons(uint32_t state) {
    enum android_motionevent_buttons buttons = 0;
-    if (state & SC_MOUSE_BUTTON_LEFT) {
+    if (state & SDL_BUTTON_LMASK) {
        buttons |= AMOTION_EVENT_BUTTON_PRIMARY;
    }
-    if (state & SC_MOUSE_BUTTON_RIGHT) {
+    if (state & SDL_BUTTON_RMASK) {
        buttons |= AMOTION_EVENT_BUTTON_SECONDARY;
    }
-    if (state & SC_MOUSE_BUTTON_MIDDLE) {
+    if (state & SDL_BUTTON_MMASK) {
        buttons |= AMOTION_EVENT_BUTTON_TERTIARY;
    }
-    if (state & SC_MOUSE_BUTTON_X1) {
+    if (state & SDL_BUTTON_X1MASK) {
        buttons |= AMOTION_EVENT_BUTTON_BACK;
    }
-    if (state & SC_MOUSE_BUTTON_X2) {
+    if (state & SDL_BUTTON_X2MASK) {
        buttons |= AMOTION_EVENT_BUTTON_FORWARD;
    }
    return buttons;
 }

-static enum android_motionevent_action
-convert_mouse_action(enum sc_action action) {
-    if (action == SC_ACTION_DOWN) {
-        return AMOTION_EVENT_ACTION_DOWN;
+#define MAP(FROM, TO) case FROM: *to = TO; return true
+#define FAIL default: return false
+static bool
+convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
+    switch (from) {
+        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
+        MAP(SDL_MOUSEBUTTONUP,   AMOTION_EVENT_ACTION_UP);
+        FAIL;
    }
-    assert(action == SC_ACTION_UP);
-    return AMOTION_EVENT_ACTION_UP;
 }

-static enum android_motionevent_action
-convert_touch_action(enum sc_touch_action action) {
-    switch (action) {
-        case SC_TOUCH_ACTION_MOVE:
-            return AMOTION_EVENT_ACTION_MOVE;
-        case SC_TOUCH_ACTION_DOWN:
-            return AMOTION_EVENT_ACTION_DOWN;
-        default:
-            assert(action == SC_TOUCH_ACTION_UP);
-            return AMOTION_EVENT_ACTION_UP;
+static bool
+convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
+    switch (from) {
+        MAP(SDL_FINGERMOTION, AMOTION_EVENT_ACTION_MOVE);
+        MAP(SDL_FINGERDOWN,   AMOTION_EVENT_ACTION_DOWN);
+        MAP(SDL_FINGERUP,     AMOTION_EVENT_ACTION_UP);
+        FAIL;
    }
 }

+static bool
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen->frame_size;
+    to->inject_touch_event.position.point =
+        screen_convert_window_to_frame_coords(screen, from->x, from->y);
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
+
+    return true;
+}
+
+static bool
+convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
+              struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = from->fingerId;
+    to->inject_touch_event.position.screen_size = screen->frame_size;
+
+    int dw;
+    int dh;
+    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
+
+    // SDL touch event coordinates are normalized in the range [0; 1]
+    int32_t x = from->x * dw;
+    int32_t y = from->y * dh;
+    to->inject_touch_event.position.point =
+        screen_convert_drawable_to_frame_coords(screen, x, y);
+
+    to->inject_touch_event.pressure = from->pressure;
+    to->inject_touch_event.buttons = 0;
+    return true;
+}
+
+static bool
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen->frame_size;
+    to->inject_touch_event.position.point =
+        screen_convert_window_to_frame_coords(screen, from->x, from->y);
+    to->inject_touch_event.pressure =
+        from->type == SDL_MOUSEBUTTONDOWN ? 1.f : 0.f;
+    to->inject_touch_event.buttons =
+        convert_mouse_buttons(SDL_BUTTON(from->button));
+
+    return true;
+}
+
+static bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
+                    struct control_msg *to) {
+
+    // mouse_x and mouse_y are expressed in pixels relative to the window
+    int mouse_x;
+    int mouse_y;
+    SDL_GetMouseState(&mouse_x, &mouse_y);
+
+    struct sc_position position = {
+        .screen_size = screen->frame_size,
+        .point = screen_convert_window_to_frame_coords(screen,
+                                                       mouse_x, mouse_y),
+    };
+
+    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
+
+    to->inject_scroll_event.position = position;
+    to->inject_scroll_event.hscroll = from->x;
+    to->inject_scroll_event.vscroll = from->y;
+
+    return true;
+}
+
 static void
 sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
-                                    const struct sc_mouse_motion_event *event) {
-    if (!event->buttons_state) {
-        // Do not send motion events when no click is pressed
+                                        const SDL_MouseMotionEvent *event) {
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
+
+    struct control_msg msg;
+    if (!convert_mouse_motion(event, mi->screen, &msg)) {
        return;
    }

-    struct sc_mouse_inject *mi = DOWNCAST(mp);
-
-    struct sc_control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
-        .inject_touch_event = {
-            .action = AMOTION_EVENT_ACTION_MOVE,
-            .pointer_id = POINTER_ID_MOUSE,
-            .position = event->position,
-            .pressure = 1.f,
-            .buttons = convert_mouse_buttons(event->buttons_state),
-        },
-    };
-
-    if (!sc_controller_push_msg(mi->controller, &msg)) {
+    if (!controller_push_msg(mi->controller, &msg)) {
        LOGW("Could not request 'inject mouse motion event'");
    }
 }

-static void
-sc_mouse_processor_process_mouse_click(struct sc_mouse_processor *mp,
-                                    const struct sc_mouse_click_event *event) {
-    struct sc_mouse_inject *mi = DOWNCAST(mp);
-
-    struct sc_control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
-        .inject_touch_event = {
-            .action = convert_mouse_action(event->action),
-            .pointer_id = POINTER_ID_MOUSE,
-            .position = event->position,
-            .pressure = event->action == SC_ACTION_DOWN ? 1.f : 0.f,
-            .buttons = convert_mouse_buttons(event->buttons_state),
-        },
-    };
-
-    if (!sc_controller_push_msg(mi->controller, &msg)) {
-        LOGW("Could not request 'inject mouse click event'");
-    }
-}
-
-static void
-sc_mouse_processor_process_mouse_scroll(struct sc_mouse_processor *mp,
-                                   const struct sc_mouse_scroll_event *event) {
-    struct sc_mouse_inject *mi = DOWNCAST(mp);
-
-    struct sc_control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
-        .inject_scroll_event = {
-            .position = event->position,
-            .hscroll = event->hscroll,
-            .vscroll = event->vscroll,
-            .buttons = convert_mouse_buttons(event->buttons_state),
-        },
-    };
-
-    if (!sc_controller_push_msg(mi->controller, &msg)) {
-        LOGW("Could not request 'inject mouse scroll event'");
-    }
-}
-
 static void
 sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
-                                 const struct sc_touch_event *event) {
+                                 const SDL_TouchFingerEvent *event) {
    struct sc_mouse_inject *mi = DOWNCAST(mp);

-    struct sc_control_msg msg = {
-        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
-        .inject_touch_event = {
-            .action = convert_touch_action(event->action),
-            .pointer_id = event->pointer_id,
-            .position = event->position,
-            .pressure = event->pressure,
-            .buttons = 0,
-        },
-    };
+    struct control_msg msg;
+    if (convert_touch(event, mi->screen, &msg)) {
+        if (!controller_push_msg(mi->controller, &msg)) {
+            LOGW("Could not request 'inject touch event'");
+        }
+    }
+}

-    if (!sc_controller_push_msg(mi->controller, &msg)) {
-        LOGW("Could not request 'inject touch event'");
+static void
+sc_mouse_processor_process_mouse_button(struct sc_mouse_processor *mp,
+                                        const SDL_MouseButtonEvent *event) {
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
+
+    struct control_msg msg;
+    if (convert_mouse_button(event, mi->screen, &msg)) {
+        if (!controller_push_msg(mi->controller, &msg)) {
+            LOGW("Could not request 'inject mouse button event'");
+        }
+    }
+}
+
+static void
+sc_mouse_processor_process_mouse_wheel(struct sc_mouse_processor *mp,
+                                       const SDL_MouseWheelEvent *event) {
+    struct sc_mouse_inject *mi = DOWNCAST(mp);
+
+    struct control_msg msg;
+    if (convert_mouse_wheel(event, mi->screen, &msg)) {
+        if (!controller_push_msg(mi->controller, &msg)) {
+            LOGW("Could not request 'inject mouse wheel event'");
+        }
    }
 }

 void
-sc_mouse_inject_init(struct sc_mouse_inject *mi,
-                     struct sc_controller *controller) {
+sc_mouse_inject_init(struct sc_mouse_inject *mi, struct controller *controller,
+                     struct screen *screen) {
    mi->controller = controller;
+    mi->screen = screen;

    static const struct sc_mouse_processor_ops ops = {
        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
-        .process_mouse_click = sc_mouse_processor_process_mouse_click,
-        .process_mouse_scroll = sc_mouse_processor_process_mouse_scroll,
        .process_touch = sc_mouse_processor_process_touch,
+        .process_mouse_button = sc_mouse_processor_process_mouse_button,
+        .process_mouse_wheel = sc_mouse_processor_process_mouse_wheel,
    };

    mi->mouse_processor.ops = &ops;
-
-    mi->mouse_processor.relative_mode = false;
 }
--- a/app/src/mouse_inject.h
+++ b/app/src/mouse_inject.h
@ -12,11 +12,12 @@
 struct sc_mouse_inject {
    struct sc_mouse_processor mouse_processor; // mouse processor trait

-    struct sc_controller *controller;
+    struct controller *controller;
+    struct screen *screen;
 };

 void
-sc_mouse_inject_init(struct sc_mouse_inject *mi,
-                     struct sc_controller *controller);
+sc_mouse_inject_init(struct sc_mouse_inject *mi, struct controller *controller,
+                     struct screen *screen);

 #endif
--- a/app/src/options.c
+++ b/app/src/options.c
@ -19,10 +19,8 @@ const struct scrcpy_options scrcpy_options_default = {
        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
        .last = DEFAULT_LOCAL_PORT_RANGE_LAST,
    },
-    .tunnel_host = 0,
-    .tunnel_port = 0,
    .shortcut_mods = {
-        .data = {SC_SHORTCUT_MOD_LALT, SC_SHORTCUT_MOD_LSUPER},
+        .data = {SC_MOD_LALT, SC_MOD_LSUPER},
        .count = 2,
    },
    .max_size = 0,
@ -43,7 +41,7 @@ const struct scrcpy_options scrcpy_options_default = {
    .control = true,
    .display = true,
    .turn_screen_off = false,
-    .key_inject_mode = SC_KEY_INJECT_MODE_MIXED,
+    .prefer_text = false,
    .window_borderless = false,
    .mipmaps = true,
    .stay_awake = false,
@ -53,7 +51,4 @@ const struct scrcpy_options scrcpy_options_default = {
    .forward_all_clicks = false,
    .legacy_paste = false,
    .power_off_on_close = false,
-    .clipboard_autosync = true,
-    .tcpip = false,
-    .tcpip_dst = NULL,
 };
--- a/app/src/options.h
+++ b/app/src/options.h
@ -38,34 +38,15 @@ enum sc_keyboard_input_mode {
    SC_KEYBOARD_INPUT_MODE_HID,
 };

-enum sc_mouse_input_mode {
-    SC_MOUSE_INPUT_MODE_INJECT,
-    SC_MOUSE_INPUT_MODE_HID,
-};
-
-enum sc_key_inject_mode {
-    // Inject special keys, letters and space as key events.
-    // Inject numbers and punctuation as text events.
-    // This is the default mode.
-    SC_KEY_INJECT_MODE_MIXED,
-
-    // Inject special keys as key events.
-    // Inject letters and space, numbers and punctuation as text events.
-    SC_KEY_INJECT_MODE_TEXT,
-
-    // Inject everything as key events.
-    SC_KEY_INJECT_MODE_RAW,
-};
-
 #define SC_MAX_SHORTCUT_MODS 8

 enum sc_shortcut_mod {
-    SC_SHORTCUT_MOD_LCTRL = 1 << 0,
-    SC_SHORTCUT_MOD_RCTRL = 1 << 1,
-    SC_SHORTCUT_MOD_LALT = 1 << 2,
-    SC_SHORTCUT_MOD_RALT = 1 << 3,
-    SC_SHORTCUT_MOD_LSUPER = 1 << 4,
-    SC_SHORTCUT_MOD_RSUPER = 1 << 5,
+    SC_MOD_LCTRL = 1 << 0,
+    SC_MOD_RCTRL = 1 << 1,
+    SC_MOD_LALT = 1 << 2,
+    SC_MOD_RALT = 1 << 3,
+    SC_MOD_LSUPER = 1 << 4,
+    SC_MOD_RSUPER = 1 << 5,
 };

 struct sc_shortcut_mods {
@ -95,10 +76,7 @@ struct scrcpy_options {
    enum sc_log_level log_level;
    enum sc_record_format record_format;
    enum sc_keyboard_input_mode keyboard_input_mode;
-    enum sc_mouse_input_mode mouse_input_mode;
    struct sc_port_range port_range;
-    uint32_t tunnel_host;
-    uint16_t tunnel_port;
    struct sc_shortcut_mods shortcut_mods;
    uint16_t max_size;
    uint32_t bit_rate;
@ -118,7 +96,7 @@ struct scrcpy_options {
    bool control;
    bool display;
    bool turn_screen_off;
-    enum sc_key_inject_mode key_inject_mode;
+    bool prefer_text;
    bool window_borderless;
    bool mipmaps;
    bool stay_awake;
@ -128,9 +106,6 @@ struct scrcpy_options {
    bool forward_all_clicks;
    bool legacy_paste;
    bool power_off_on_close;
-    bool clipboard_autosync;
-    bool tcpip;
-    const char *tcpip_dst;
 };

 extern const struct scrcpy_options scrcpy_options_default;
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@ -7,16 +7,12 @@
 #include "util/log.h"

 bool
-receiver_init(struct receiver *receiver, sc_socket control_socket,
-              struct sc_acksync *acksync) {
+receiver_init(struct receiver *receiver, sc_socket control_socket) {
    bool ok = sc_mutex_init(&receiver->mutex);
    if (!ok) {
        return false;
    }
-
    receiver->control_socket = control_socket;
-    receiver->acksync = acksync;
-
    return true;
 }

@ -26,7 +22,7 @@ receiver_destroy(struct receiver *receiver) {
 }

 static void
-process_msg(struct receiver *receiver, struct device_msg *msg) {
+process_msg(struct device_msg *msg) {
    switch (msg->type) {
        case DEVICE_MSG_TYPE_CLIPBOARD: {
            char *current = SDL_GetClipboardText();
@ -41,17 +37,11 @@ process_msg(struct receiver *receiver, struct device_msg *msg) {
            SDL_SetClipboardText(msg->clipboard.text);
            break;
        }
-        case DEVICE_MSG_TYPE_ACK_CLIPBOARD:
-            assert(receiver->acksync);
-            LOGD("Ack device clipboard sequence=%" PRIu64_,
-                 msg->ack_clipboard.sequence);
-            sc_acksync_ack(receiver->acksync, msg->ack_clipboard.sequence);
-            break;
    }
 }

 static ssize_t
-process_msgs(struct receiver *receiver, const unsigned char *buf, size_t len) {
+process_msgs(const unsigned char *buf, size_t len) {
    size_t head = 0;
    for (;;) {
        struct device_msg msg;
@ -63,7 +53,7 @@ process_msgs(struct receiver *receiver, const unsigned char *buf, size_t len) {
            return head;
        }

-        process_msg(receiver, &msg);
+        process_msg(&msg);
        device_msg_destroy(&msg);

        head += r;
@ -91,7 +81,7 @@ run_receiver(void *data) {
        }

        head += r;
-        ssize_t consumed = process_msgs(receiver, buf, head);
+        ssize_t consumed = process_msgs(buf, head);
        if (consumed == -1) {
            // an error occurred
            break;
@ -111,8 +101,8 @@ bool
 receiver_start(struct receiver *receiver) {
    LOGD("Starting receiver thread");

-    bool ok = sc_thread_create(&receiver->thread, run_receiver,
-                               "scrcpy-receiver", receiver);
+    bool ok = sc_thread_create(&receiver->thread, run_receiver, "receiver",
+                               receiver);
    if (!ok) {
        LOGC("Could not start receiver thread");
        return false;
--- a/app/src/receiver.h
+++ b/app/src/receiver.h
@ -5,7 +5,6 @@

 #include <stdbool.h>

-#include "util/acksync.h"
 #include "util/net.h"
 #include "util/thread.h"

@ -15,13 +14,10 @@ struct receiver {
    sc_socket control_socket;
    sc_thread thread;
    sc_mutex mutex;
-
-    struct sc_acksync *acksync;
 };

 bool
-receiver_init(struct receiver *receiver, sc_socket control_socket,
-              struct sc_acksync *acksync);
+receiver_init(struct receiver *receiver, sc_socket control_socket);

 void
 receiver_destroy(struct receiver *receiver);
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@ -34,13 +34,11 @@ static struct record_packet *
 record_packet_new(const AVPacket *packet) {
    struct record_packet *rec = malloc(sizeof(*rec));
    if (!rec) {
-        LOG_OOM();
        return NULL;
    }

    rec->packet = av_packet_alloc();
    if (!rec->packet) {
-        LOG_OOM();
        free(rec);
        return NULL;
    }
@ -83,7 +81,7 @@ recorder_write_header(struct recorder *recorder, const AVPacket *packet) {

    uint8_t *extradata = av_malloc(packet->size * sizeof(uint8_t));
    if (!extradata) {
-        LOG_OOM();
+        LOGC("Could not allocate extradata");
        return false;
    }

@ -230,11 +228,13 @@ static bool
 recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
    bool ok = sc_mutex_init(&recorder->mutex);
    if (!ok) {
+        LOGC("Could not create mutex");
        return false;
    }

    ok = sc_cond_init(&recorder->queue_cond);
    if (!ok) {
+        LOGC("Could not create cond");
        goto error_mutex_destroy;
    }

@ -254,7 +254,7 @@ recorder_open(struct recorder *recorder, const AVCodec *input_codec) {

    recorder->ctx = avformat_alloc_context();
    if (!recorder->ctx) {
-        LOG_OOM();
+        LOGE("Could not allocate output context");
        goto error_cond_destroy;
    }

@ -287,8 +287,8 @@ recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
    }

    LOGD("Starting recorder thread");
-    ok = sc_thread_create(&recorder->thread, run_recorder, "scrcpy-recorder",
-                          recorder);
+    ok = sc_thread_create(&recorder->thread, run_recorder, "recorder",
+                               recorder);
    if (!ok) {
        LOGC("Could not start recorder thread");
        goto error_avio_close;
@ -338,7 +338,7 @@ recorder_push(struct recorder *recorder, const AVPacket *packet) {

    struct record_packet *rec = record_packet_new(packet);
    if (!rec) {
-        LOG_OOM();
+        LOGC("Could not allocate record packet");
        sc_mutex_unlock(&recorder->mutex);
        return false;
    }
@ -375,7 +375,7 @@ recorder_init(struct recorder *recorder,
              struct sc_size declared_frame_size) {
    recorder->filename = strdup(filename);
    if (!recorder->filename) {
-        LOG_OOM();
+        LOGE("Could not strdup filename");
        return false;
    }

--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@ -17,9 +17,9 @@
 #include "decoder.h"
 #include "events.h"
 #include "file_handler.h"
+#include "input_manager.h"
 #ifdef HAVE_AOA_HID
 # include "hid_keyboard.h"
-# include "hid_mouse.h"
 #endif
 #include "keyboard_inject.h"
 #include "mouse_inject.h"
@ -27,7 +27,6 @@
 #include "screen.h"
 #include "server.h"
 #include "stream.h"
-#include "util/acksync.h"
 #include "util/log.h"
 #include "util/net.h"
 #ifdef HAVE_V4L2
@ -36,19 +35,17 @@

 struct scrcpy {
    struct sc_server server;
-    struct sc_screen screen;
+    struct screen screen;
    struct stream stream;
    struct decoder decoder;
    struct recorder recorder;
 #ifdef HAVE_V4L2
    struct sc_v4l2_sink v4l2_sink;
 #endif
-    struct sc_controller controller;
+    struct controller controller;
    struct file_handler file_handler;
 #ifdef HAVE_AOA_HID
    struct sc_aoa aoa;
-    // sequence/ack helper to synchronize clipboard and Ctrl+v via HID
-    struct sc_acksync acksync;
 #endif
    union {
        struct sc_keyboard_inject keyboard_inject;
@ -56,12 +53,8 @@ struct scrcpy {
        struct sc_hid_keyboard keyboard_hid;
 #endif
    };
-    union {
-        struct sc_mouse_inject mouse_inject;
-#ifdef HAVE_AOA_HID
-        struct sc_hid_mouse mouse_hid;
-#endif
-    };
+    struct sc_mouse_inject mouse_inject;
+    struct input_manager input_manager;
 };

 static inline void
@ -98,10 +91,12 @@ sdl_set_hints(const char *render_driver) {
        LOGW("Could not enable linear filtering");
    }

+#ifdef SCRCPY_SDL_HAS_HINT_MOUSE_FOCUS_CLICKTHROUGH
    // Handle a click to gain focus as any other click
    if (!SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1")) {
        LOGW("Could not enable mouse focus clickthrough");
    }
+#endif

 #ifdef SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
    // Disable synthetic mouse events from touch events
@ -192,7 +187,12 @@ handle_event(struct scrcpy *s, const struct scrcpy_options *options,
        }
    }

-    bool consumed = sc_screen_handle_event(&s->screen, event);
+    bool consumed = screen_handle_event(&s->screen, event);
+    if (consumed) {
+        goto end;
+    }
+
+    consumed = input_manager_handle_event(&s->input_manager, event);
    (void) consumed;

 end:
@ -268,7 +268,7 @@ av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
    size_t fmt_len = strlen(fmt);
    char *local_fmt = malloc(fmt_len + 10);
    if (!local_fmt) {
-        LOG_OOM();
+        LOGC("Could not allocate string");
        return;
    }
    memcpy(local_fmt, "[FFmpeg] ", 9); // do not write the final '\0'
@ -335,22 +335,16 @@ scrcpy(struct scrcpy_options *options) {
    bool stream_started = false;
 #ifdef HAVE_AOA_HID
    bool aoa_hid_initialized = false;
-    bool hid_keyboard_initialized = false;
-    bool hid_mouse_initialized = false;
 #endif
    bool controller_initialized = false;
    bool controller_started = false;
    bool screen_initialized = false;

-    struct sc_acksync *acksync = NULL;
-
    struct sc_server_params params = {
        .serial = options->serial,
        .log_level = options->log_level,
        .crop = options->crop,
        .port_range = options->port_range,
-        .tunnel_host = options->tunnel_host,
-        .tunnel_port = options->tunnel_port,
        .max_size = options->max_size,
        .bit_rate = options->bit_rate,
        .max_fps = options->max_fps,
@ -363,9 +357,6 @@ scrcpy(struct scrcpy_options *options) {
        .encoder_name = options->encoder_name,
        .force_adb_forward = options->force_adb_forward,
        .power_off_on_close = options->power_off_on_close,
-        .clipboard_autosync = options->clipboard_autosync,
-        .tcpip = options->tcpip,
-        .tcpip_dst = options->tcpip_dst,
    };

    static const struct sc_server_callbacks cbs = {
@ -451,137 +442,33 @@ scrcpy(struct scrcpy_options *options) {
        stream_add_sink(&s->stream, &rec->packet_sink);
    }

-    struct sc_key_processor *kp = NULL;
-    struct sc_mouse_processor *mp = NULL;
-
    if (options->control) {
-#ifdef HAVE_AOA_HID
-        bool use_hid_keyboard =
-            options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID;
-        bool use_hid_mouse =
-            options->mouse_input_mode == SC_MOUSE_INPUT_MODE_HID;
-        if (use_hid_keyboard || use_hid_mouse) {
-            bool ok = sc_acksync_init(&s->acksync);
-            if (!ok) {
-                goto end;
-            }
-
-            ok = sc_aoa_init(&s->aoa, serial, &s->acksync);
-            if (!ok) {
-                LOGE("Failed to enable HID over AOA");
-                sc_acksync_destroy(&s->acksync);
-                goto aoa_hid_end;
-            }
-
-            if (use_hid_keyboard) {
-                if (sc_hid_keyboard_init(&s->keyboard_hid, &s->aoa)) {
-                    hid_keyboard_initialized = true;
-                    kp = &s->keyboard_hid.key_processor;
-                } else {
-                    LOGE("Could not initialize HID keyboard");
-                }
-            }
-
-            if (use_hid_mouse) {
-                if (sc_hid_mouse_init(&s->mouse_hid, &s->aoa)) {
-                    hid_mouse_initialized = true;
-                    mp = &s->mouse_hid.mouse_processor;
-                } else {
-                    LOGE("Could not initialized HID mouse");
-                }
-            }
-
-            bool need_aoa = hid_keyboard_initialized || hid_mouse_initialized;
-
-            if (!need_aoa || !sc_aoa_start(&s->aoa)) {
-                sc_acksync_destroy(&s->acksync);
-                sc_aoa_destroy(&s->aoa);
-                goto aoa_hid_end;
-            }
-
-            acksync = &s->acksync;
-
-            aoa_hid_initialized = true;
-
-aoa_hid_end:
-            if (!aoa_hid_initialized) {
-                if (hid_keyboard_initialized) {
-                    sc_hid_keyboard_destroy(&s->keyboard_hid);
-                    hid_keyboard_initialized = false;
-                }
-                if (hid_mouse_initialized) {
-                    sc_hid_mouse_destroy(&s->mouse_hid);
-                    hid_mouse_initialized = false;
-                }
-            }
-
-            if (use_hid_keyboard && !hid_keyboard_initialized) {
-                LOGE("Fallback to default keyboard injection method "
-                     "(-K/--hid-keyboard ignored)");
-                options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT;
-            }
-
-            if (use_hid_mouse && !hid_mouse_initialized) {
-                LOGE("Fallback to default mouse injection method "
-                     "(-M/--hid-mouse ignored)");
-                options->mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT;
-            }
-        }
-#else
-        assert(options->keyboard_input_mode != SC_KEYBOARD_INPUT_MODE_HID);
-        assert(options->mouse_input_mode != SC_MOUSE_INPUT_MODE_HID);
-#endif
-
-        // keyboard_input_mode may have been reset if HID mode failed
-        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_INJECT) {
-            sc_keyboard_inject_init(&s->keyboard_inject, &s->controller,
-                                    options->key_inject_mode,
-                                    options->forward_key_repeat);
-            kp = &s->keyboard_inject.key_processor;
-        }
-
-        // mouse_input_mode may have been reset if HID mode failed
-        if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_INJECT) {
-            sc_mouse_inject_init(&s->mouse_inject, &s->controller);
-            mp = &s->mouse_inject.mouse_processor;
-        }
-
-        if (!sc_controller_init(&s->controller, s->server.control_socket,
-                                acksync)) {
+        if (!controller_init(&s->controller, s->server.control_socket)) {
            goto end;
        }
        controller_initialized = true;

-        if (!sc_controller_start(&s->controller)) {
+        if (!controller_start(&s->controller)) {
            goto end;
        }
        controller_started = true;

        if (options->turn_screen_off) {
-            struct sc_control_msg msg;
+            struct control_msg msg;
            msg.type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE;
            msg.set_screen_power_mode.mode = SCREEN_POWER_MODE_OFF;

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

    if (options->display) {
        const char *window_title =
            options->window_title ? options->window_title : info->device_name;

-        struct sc_screen_params screen_params = {
-            .controller = &s->controller,
-            .kp = kp,
-            .mp = mp,
-            .control = options->control,
-            .forward_all_clicks = options->forward_all_clicks,
-            .legacy_paste = options->legacy_paste,
-            .clipboard_autosync = options->clipboard_autosync,
-            .shortcut_mods = &options->shortcut_mods,
+        struct screen_params screen_params = {
            .window_title = window_title,
            .frame_size = info->frame_size,
            .always_on_top = options->always_on_top,
@ -596,7 +483,7 @@ aoa_hid_end:
            .buffering_time = options->display_buffer,
        };

-        if (!sc_screen_init(&s->screen, &screen_params)) {
+        if (!screen_init(&s->screen, &screen_params)) {
            goto end;
        }
        screen_initialized = true;
@ -624,35 +511,88 @@ aoa_hid_end:
    }
    stream_started = true;

+    struct sc_key_processor *kp = NULL;
+    struct sc_mouse_processor *mp = NULL;
+
+    if (options->control) {
+        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID) {
+#ifdef HAVE_AOA_HID
+            bool aoa_hid_ok = false;
+
+            bool ok = sc_aoa_init(&s->aoa, serial);
+            if (!ok) {
+                goto aoa_hid_end;
+            }
+
+            if (!sc_hid_keyboard_init(&s->keyboard_hid, &s->aoa)) {
+                sc_aoa_destroy(&s->aoa);
+                goto aoa_hid_end;
+            }
+
+            if (!sc_aoa_start(&s->aoa)) {
+                sc_hid_keyboard_destroy(&s->keyboard_hid);
+                sc_aoa_destroy(&s->aoa);
+                goto aoa_hid_end;
+            }
+
+            aoa_hid_ok = true;
+            kp = &s->keyboard_hid.key_processor;
+
+            aoa_hid_initialized = true;
+
+aoa_hid_end:
+            if (!aoa_hid_ok) {
+                LOGE("Failed to enable HID over AOA, "
+                     "fallback to default keyboard injection method "
+                     "(-K/--hid-keyboard ignored)");
+                options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT;
+            }
+#else
+            LOGE("HID over AOA is not supported on this platform, "
+                 "fallback to default keyboard injection method "
+                 "(-K/--hid-keyboard ignored)");
+            options->keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT;
+#endif
+        }
+
+        // keyboard_input_mode may have been reset if HID mode failed
+        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_INJECT) {
+            sc_keyboard_inject_init(&s->keyboard_inject, &s->controller,
+                                    options);
+            kp = &s->keyboard_inject.key_processor;
+        }
+
+        sc_mouse_inject_init(&s->mouse_inject, &s->controller, &s->screen);
+        mp = &s->mouse_inject.mouse_processor;
+    }
+
+    input_manager_init(&s->input_manager, &s->controller, &s->screen, kp, mp,
+                       options);
+
    ret = event_loop(s, options);
    LOGD("quit...");

    // Close the window immediately on closing, because screen_destroy() may
    // only be called once the stream thread is joined (it may take time)
-    sc_screen_hide_window(&s->screen);
+    screen_hide_window(&s->screen);

 end:
    // The stream is not stopped explicitly, because it will stop by itself on
    // end-of-stream
 #ifdef HAVE_AOA_HID
    if (aoa_hid_initialized) {
-        if (hid_keyboard_initialized) {
-            sc_hid_keyboard_destroy(&s->keyboard_hid);
-        }
+        sc_hid_keyboard_destroy(&s->keyboard_hid);
        sc_aoa_stop(&s->aoa);
    }
-    if (acksync) {
-        sc_acksync_destroy(acksync);
-    }
 #endif
    if (controller_started) {
-        sc_controller_stop(&s->controller);
+        controller_stop(&s->controller);
    }
    if (file_handler_initialized) {
        file_handler_stop(&s->file_handler);
    }
    if (screen_initialized) {
-        sc_screen_interrupt(&s->screen);
+        screen_interrupt(&s->screen);
    }

    if (server_started) {
@ -682,15 +622,15 @@ end:
    // Destroy the screen only after the stream is guaranteed to be finished,
    // because otherwise the screen could receive new frames after destruction
    if (screen_initialized) {
-        sc_screen_join(&s->screen);
-        sc_screen_destroy(&s->screen);
+        screen_join(&s->screen);
+        screen_destroy(&s->screen);
    }

    if (controller_started) {
-        sc_controller_join(&s->controller);
+        controller_join(&s->controller);
    }
    if (controller_initialized) {
-        sc_controller_destroy(&s->controller);
+        controller_destroy(&s->controller);
    }

    if (recorder_initialized) {
--- a/app/src/screen.c
+++ b/app/src/screen.c
@ -12,7 +12,7 @@

 #define DISPLAY_MARGINS 96

-#define DOWNCAST(SINK) container_of(SINK, struct sc_screen, frame_sink)
+#define DOWNCAST(SINK) container_of(SINK, struct screen, frame_sink)

 static inline struct sc_size
 get_rotated_size(struct sc_size size, int rotation) {
@ -29,7 +29,7 @@ get_rotated_size(struct sc_size size, int rotation) {

 // get the window size in a struct sc_size
 static struct sc_size
-get_window_size(const struct sc_screen *screen) {
+get_window_size(const struct screen *screen) {
    int width;
    int height;
    SDL_GetWindowSize(screen->window, &width, &height);
@ -41,7 +41,7 @@ get_window_size(const struct sc_screen *screen) {
 }

 static struct sc_point
-get_window_position(const struct sc_screen *screen) {
+get_window_position(const struct screen *screen) {
    int x;
    int y;
    SDL_GetWindowPosition(screen->window, &x, &y);
@ -54,7 +54,7 @@ get_window_position(const struct sc_screen *screen) {

 // set the window size to be applied when fullscreen is disabled
 static void
-set_window_size(struct sc_screen *screen, struct sc_size new_size) {
+set_window_size(struct screen *screen, struct sc_size new_size) {
    assert(!screen->fullscreen);
    assert(!screen->maximized);
    SDL_SetWindowSize(screen->window, new_size.width, new_size.height);
@ -64,7 +64,12 @@ set_window_size(struct sc_screen *screen, struct sc_size new_size) {
 static bool
 get_preferred_display_bounds(struct sc_size *bounds) {
    SDL_Rect rect;
-    if (SDL_GetDisplayUsableBounds(0, &rect)) {
+#ifdef SCRCPY_SDL_HAS_GET_DISPLAY_USABLE_BOUNDS
+# define GET_DISPLAY_BOUNDS(i, r) SDL_GetDisplayUsableBounds((i), (r))
+#else
+# define GET_DISPLAY_BOUNDS(i, r) SDL_GetDisplayBounds((i), (r))
+#endif
+    if (GET_DISPLAY_BOUNDS(0, &rect)) {
        LOGW("Could not get display usable bounds: %s", SDL_GetError());
        return false;
    }
@ -90,8 +95,7 @@ is_optimal_size(struct sc_size current_size, struct sc_size content_size) {
 //  - it keeps the aspect ratio
 //  - it scales down to make it fit in the display_size
 static struct sc_size
-get_optimal_size(struct sc_size current_size, struct sc_size content_size,
-                 bool within_display_bounds) {
+get_optimal_size(struct sc_size current_size, struct sc_size content_size) {
    if (content_size.width == 0 || content_size.height == 0) {
        // avoid division by 0
        return current_size;
@ -100,10 +104,10 @@ get_optimal_size(struct sc_size current_size, struct sc_size content_size,
    struct sc_size window_size;

    struct sc_size display_size;
-    if (!within_display_bounds ||
-            !get_preferred_display_bounds(&display_size)) {
-        // do not constraint the size
-        window_size = current_size;
+    if (!get_preferred_display_bounds(&display_size)) {
+        // could not get display bounds, do not constraint the size
+        window_size.width = current_size.width;
+        window_size.height = current_size.height;
    } else {
        window_size.width = MIN(current_size.width, display_size.width);
        window_size.height = MIN(current_size.height, display_size.height);
@ -136,7 +140,7 @@ get_initial_optimal_size(struct sc_size content_size, uint16_t req_width,
                         uint16_t req_height) {
    struct sc_size window_size;
    if (!req_width && !req_height) {
-        window_size = get_optimal_size(content_size, content_size, true);
+        window_size = get_optimal_size(content_size, content_size);
    } else {
        if (req_width) {
            window_size.width = req_width;
@ -156,19 +160,8 @@ get_initial_optimal_size(struct sc_size content_size, uint16_t req_width,
    return window_size;
 }

-static inline void
-sc_screen_capture_mouse(struct sc_screen *screen, bool capture) {
-    if (SDL_SetRelativeMouseMode(capture)) {
-        LOGE("Could not set relative mouse mode to %s: %s",
-             capture ? "true" : "false", SDL_GetError());
-        return;
-    }
-
-    screen->mouse_captured = capture;
-}
-
 static void
-sc_screen_update_content_rect(struct sc_screen *screen) {
+screen_update_content_rect(struct screen *screen) {
    int dw;
    int dh;
    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
@ -205,7 +198,7 @@ sc_screen_update_content_rect(struct sc_screen *screen) {
 }

 static inline SDL_Texture *
-create_texture(struct sc_screen *screen) {
+create_texture(struct screen *screen) {
    SDL_Renderer *renderer = screen->renderer;
    struct sc_size size = screen->frame_size;
    SDL_Texture *texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12,
@ -236,9 +229,9 @@ create_texture(struct sc_screen *screen) {
 // Set the update_content_rect flag if the window or content size may have
 // changed, so that the content rectangle is recomputed
 static void
-sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
+screen_render(struct screen *screen, bool update_content_rect) {
    if (update_content_rect) {
-        sc_screen_update_content_rect(screen);
+        screen_update_content_rect(screen);
    }

    SDL_RenderClear(screen->renderer);
@ -282,20 +275,20 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
 // <https://stackoverflow.com/a/40693139/1987178>
 static int
 event_watcher(void *data, SDL_Event *event) {
-    struct sc_screen *screen = data;
+    struct screen *screen = data;
    if (event->type == SDL_WINDOWEVENT
            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
        // In practice, it seems to always be called from the same thread in
        // that specific case. Anyway, it's just a workaround.
-        sc_screen_render(screen, true);
+        screen_render(screen, true);
    }
    return 0;
 }
 #endif

 static bool
-sc_screen_frame_sink_open(struct sc_frame_sink *sink) {
-    struct sc_screen *screen = DOWNCAST(sink);
+screen_frame_sink_open(struct sc_frame_sink *sink) {
+    struct screen *screen = DOWNCAST(sink);
    (void) screen;
 #ifndef NDEBUG
    screen->open = true;
@ -306,8 +299,8 @@ sc_screen_frame_sink_open(struct sc_frame_sink *sink) {
 }

 static void
-sc_screen_frame_sink_close(struct sc_frame_sink *sink) {
-    struct sc_screen *screen = DOWNCAST(sink);
+screen_frame_sink_close(struct sc_frame_sink *sink) {
+    struct screen *screen = DOWNCAST(sink);
    (void) screen;
 #ifndef NDEBUG
    screen->open = false;
@ -317,8 +310,8 @@ sc_screen_frame_sink_close(struct sc_frame_sink *sink) {
 }

 static bool
-sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
-    struct sc_screen *screen = DOWNCAST(sink);
+screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
+    struct screen *screen = DOWNCAST(sink);
    return sc_video_buffer_push(&screen->vb, frame);
 }

@ -326,7 +319,7 @@ static void
 sc_video_buffer_on_new_frame(struct sc_video_buffer *vb, bool previous_skipped,
                             void *userdata) {
    (void) vb;
-    struct sc_screen *screen = userdata;
+    struct screen *screen = userdata;

    // event_failed implies previous_skipped (the previous frame may not have
    // been consumed if the event was not sent)
@ -359,15 +352,12 @@ sc_video_buffer_on_new_frame(struct sc_video_buffer *vb, bool previous_skipped,
 }

 bool
-sc_screen_init(struct sc_screen *screen,
-               const struct sc_screen_params *params) {
+screen_init(struct screen *screen, const struct screen_params *params) {
    screen->resize_pending = false;
    screen->has_frame = false;
    screen->fullscreen = false;
    screen->maximized = false;
    screen->event_failed = false;
-    screen->mouse_captured = false;
-    screen->mouse_capture_key_pressed = 0;

    static const struct sc_video_buffer_callbacks cbs = {
        .on_new_frame = sc_video_buffer_on_new_frame,
@ -376,15 +366,18 @@ sc_screen_init(struct sc_screen *screen,
    bool ok = sc_video_buffer_init(&screen->vb, params->buffering_time, &cbs,
                                   screen);
    if (!ok) {
+        LOGE("Could not initialize video buffer");
        return false;
    }

    ok = sc_video_buffer_start(&screen->vb);
    if (!ok) {
+        LOGE("Could not start video_buffer");
        goto error_destroy_video_buffer;
    }

    if (!fps_counter_init(&screen->fps_counter)) {
+        LOGE("Could not initialize FPS counter");
        goto error_stop_and_join_video_buffer;
    }

@ -404,7 +397,12 @@ sc_screen_init(struct sc_screen *screen,
                          | SDL_WINDOW_RESIZABLE
                          | SDL_WINDOW_ALLOW_HIGHDPI;
    if (params->always_on_top) {
+#ifdef SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP
        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
+#else
+        LOGW("The 'always on top' flag is not available "
+             "(compile with SDL >= 2.0.5 to enable it)");
+#endif
    }
    if (params->window_borderless) {
        window_flags |= SDL_WINDOW_BORDERLESS;
@ -480,33 +478,19 @@ sc_screen_init(struct sc_screen *screen,

    screen->frame = av_frame_alloc();
    if (!screen->frame) {
-        LOG_OOM();
+        LOGC("Could not create screen frame");
        goto error_destroy_texture;
    }

-    struct sc_input_manager_params im_params = {
-        .controller = params->controller,
-        .screen = screen,
-        .kp = params->kp,
-        .mp = params->mp,
-        .control = params->control,
-        .forward_all_clicks = params->forward_all_clicks,
-        .legacy_paste = params->legacy_paste,
-        .clipboard_autosync = params->clipboard_autosync,
-        .shortcut_mods = params->shortcut_mods,
-    };
-
-    sc_input_manager_init(&screen->im, &im_params);
-
    // Reset the window size to trigger a SIZE_CHANGED event, to workaround
    // HiDPI issues with some SDL renderers when several displays having
    // different HiDPI scaling are connected
    SDL_SetWindowSize(screen->window, window_size.width, window_size.height);

-    sc_screen_update_content_rect(screen);
+    screen_update_content_rect(screen);

    if (params->fullscreen) {
-        sc_screen_switch_fullscreen(screen);
+        screen_switch_fullscreen(screen);
    }

 #ifdef CONTINUOUS_RESIZING_WORKAROUND
@ -514,9 +498,9 @@ sc_screen_init(struct sc_screen *screen,
 #endif

    static const struct sc_frame_sink_ops ops = {
-        .open = sc_screen_frame_sink_open,
-        .close = sc_screen_frame_sink_close,
-        .push = sc_screen_frame_sink_push,
+        .open = screen_frame_sink_open,
+        .close = screen_frame_sink_close,
+        .push = screen_frame_sink_push,
    };

    screen->frame_sink.ops = &ops;
@ -545,29 +529,29 @@ error_destroy_video_buffer:
 }

 static void
-sc_screen_show_window(struct sc_screen *screen) {
+screen_show_window(struct screen *screen) {
    SDL_ShowWindow(screen->window);
 }

 void
-sc_screen_hide_window(struct sc_screen *screen) {
+screen_hide_window(struct screen *screen) {
    SDL_HideWindow(screen->window);
 }

 void
-sc_screen_interrupt(struct sc_screen *screen) {
+screen_interrupt(struct screen *screen) {
    sc_video_buffer_stop(&screen->vb);
    fps_counter_interrupt(&screen->fps_counter);
 }

 void
-sc_screen_join(struct sc_screen *screen) {
+screen_join(struct screen *screen) {
    sc_video_buffer_join(&screen->vb);
    fps_counter_join(&screen->fps_counter);
 }

 void
-sc_screen_destroy(struct sc_screen *screen) {
+screen_destroy(struct screen *screen) {
 #ifndef NDEBUG
    assert(!screen->open);
 #endif
@ -580,7 +564,7 @@ sc_screen_destroy(struct sc_screen *screen) {
 }

 static void
-resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
+resize_for_content(struct screen *screen, struct sc_size old_content_size,
                   struct sc_size new_content_size) {
    struct sc_size window_size = get_window_size(screen);
    struct sc_size target_size = {
@ -589,12 +573,12 @@ resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
        .height = (uint32_t) window_size.height * new_content_size.height
                / old_content_size.height,
    };
-    target_size = get_optimal_size(target_size, new_content_size, true);
+    target_size = get_optimal_size(target_size, new_content_size);
    set_window_size(screen, target_size);
 }

 static void
-set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
+set_content_size(struct screen *screen, struct sc_size new_content_size) {
    if (!screen->fullscreen && !screen->maximized) {
        resize_for_content(screen, screen->content_size, new_content_size);
    } else if (!screen->resize_pending) {
@ -608,7 +592,7 @@ set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
 }

 static void
-apply_pending_resize(struct sc_screen *screen) {
+apply_pending_resize(struct screen *screen) {
    assert(!screen->fullscreen);
    assert(!screen->maximized);
    if (screen->resize_pending) {
@ -619,7 +603,7 @@ apply_pending_resize(struct sc_screen *screen) {
 }

 void
-sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation) {
+screen_set_rotation(struct screen *screen, unsigned rotation) {
    assert(rotation < 4);
    if (rotation == screen->rotation) {
        return;
@ -633,12 +617,12 @@ sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation) {
    screen->rotation = rotation;
    LOGI("Display rotation set to %u", rotation);

-    sc_screen_render(screen, true);
+    screen_render(screen, true);
 }

 // recreate the texture and resize the window if the frame size has changed
 static bool
-prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
+prepare_for_frame(struct screen *screen, struct sc_size new_frame_size) {
    if (screen->frame_size.width != new_frame_size.width
            || screen->frame_size.height != new_frame_size.height) {
        // frame dimension changed, destroy texture
@ -650,7 +634,7 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
            get_rotated_size(new_frame_size, screen->rotation);
        set_content_size(screen, new_content_size);

-        sc_screen_update_content_rect(screen);
+        screen_update_content_rect(screen);

        LOGI("New texture: %" PRIu16 "x%" PRIu16,
                     screen->frame_size.width, screen->frame_size.height);
@ -666,7 +650,7 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {

 // write the frame into the texture
 static void
-update_texture(struct sc_screen *screen, const AVFrame *frame) {
+update_texture(struct screen *screen, const AVFrame *frame) {
    SDL_UpdateYUVTexture(screen->texture, NULL,
            frame->data[0], frame->linesize[0],
            frame->data[1], frame->linesize[1],
@ -680,7 +664,7 @@ update_texture(struct sc_screen *screen, const AVFrame *frame) {
 }

 static bool
-sc_screen_update_frame(struct sc_screen *screen) {
+screen_update_frame(struct screen *screen) {
    av_frame_unref(screen->frame);
    sc_video_buffer_consume(&screen->vb, screen->frame);
    AVFrame *frame = screen->frame;
@ -693,12 +677,12 @@ sc_screen_update_frame(struct sc_screen *screen) {
    }
    update_texture(screen, frame);

-    sc_screen_render(screen, false);
+    screen_render(screen, false);
    return true;
 }

 void
-sc_screen_switch_fullscreen(struct sc_screen *screen) {
+screen_switch_fullscreen(struct screen *screen) {
    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
    if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
        LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
@ -711,11 +695,11 @@ sc_screen_switch_fullscreen(struct sc_screen *screen) {
    }

    LOGD("Switched to %s mode", screen->fullscreen ? "fullscreen" : "windowed");
-    sc_screen_render(screen, true);
+    screen_render(screen, true);
 }

 void
-sc_screen_resize_to_fit(struct sc_screen *screen) {
+screen_resize_to_fit(struct screen *screen) {
    if (screen->fullscreen || screen->maximized) {
        return;
    }
@ -724,7 +708,7 @@ sc_screen_resize_to_fit(struct sc_screen *screen) {
    struct sc_size window_size = get_window_size(screen);

    struct sc_size optimal_size =
-        get_optimal_size(window_size, screen->content_size, false);
+        get_optimal_size(window_size, screen->content_size);

    // Center the window related to the device screen
    assert(optimal_size.width <= window_size.width);
@ -739,7 +723,7 @@ sc_screen_resize_to_fit(struct sc_screen *screen) {
 }

 void
-sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
+screen_resize_to_pixel_perfect(struct screen *screen) {
    if (screen->fullscreen) {
        return;
    }
@ -755,21 +739,16 @@ 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, SDL_Event *event) {
+screen_handle_event(struct screen *screen, SDL_Event *event) {
    switch (event->type) {
        case EVENT_NEW_FRAME:
            if (!screen->has_frame) {
                screen->has_frame = true;
                // this is the very first frame, show the window
-                sc_screen_show_window(screen);
+                screen_show_window(screen);
            }
-            bool ok = sc_screen_update_frame(screen);
+            bool ok = screen_update_frame(screen);
            if (!ok) {
                LOGW("Frame update failed\n");
            }
@ -781,10 +760,10 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
            }
            switch (event->window.event) {
                case SDL_WINDOWEVENT_EXPOSED:
-                    sc_screen_render(screen, true);
+                    screen_render(screen, true);
                    break;
                case SDL_WINDOWEVENT_SIZE_CHANGED:
-                    sc_screen_render(screen, true);
+                    screen_render(screen, true);
                    break;
                case SDL_WINDOWEVENT_MAXIMIZED:
                    screen->maximized = true;
@ -800,78 +779,18 @@ sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event) {
                    }
                    screen->maximized = false;
                    apply_pending_resize(screen);
-                    sc_screen_render(screen, true);
-                    break;
-                case SDL_WINDOWEVENT_FOCUS_LOST:
-                    if (screen->im.mp->relative_mode) {
-                        sc_screen_capture_mouse(screen, false);
-                    }
+                    screen_render(screen, true);
                    break;
            }
            return true;
-        case SDL_KEYDOWN:
-            if (screen->im.mp->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;
-                        return true;
-                    } else {
-                        // Another mouse capture key has been pressed, cancel
-                        // mouse (un)capture
-                        screen->mouse_capture_key_pressed = 0;
-                        // Do not return, the event must be forwarded to the
-                        // input manager
-                    }
-                }
-            }
-            break;
-        case SDL_KEYUP:
-            if (screen->im.mp->relative_mode) {
-                SDL_Keycode key = event->key.keysym.sym;
-                SDL_Keycode cap = screen->mouse_capture_key_pressed;
-                screen->mouse_capture_key_pressed = 0;
-                if (key == cap) {
-                    // A mouse capture key has been pressed then released:
-                    // toggle the capture mouse mode
-                    sc_screen_capture_mouse(screen, !screen->mouse_captured);
-                    return true;
-                }
-                // Do not return, the event must be forwarded to the input
-                // manager
-            }
-            break;
-        case SDL_MOUSEWHEEL:
-        case SDL_MOUSEMOTION:
-        case SDL_MOUSEBUTTONDOWN:
-            if (screen->im.mp->relative_mode && !screen->mouse_captured) {
-                // 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 (screen->im.mp->relative_mode) {
-                // Touch events are not compatible with relative mode
-                // (coordinates are not relative)
-                return true;
-            }
-            break;
-        case SDL_MOUSEBUTTONUP:
-            if (screen->im.mp->relative_mode && !screen->mouse_captured) {
-                sc_screen_capture_mouse(screen, true);
-                return true;
-            }
    }

-    return sc_input_manager_handle_event(&screen->im, event);
+    return false;
 }

 struct sc_point
-sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
-                                           int32_t x, int32_t y) {
+screen_convert_drawable_to_frame_coords(struct screen *screen,
+                                        int32_t x, int32_t y) {
    unsigned rotation = screen->rotation;
    assert(rotation < 4);

@ -907,14 +826,14 @@ sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
 }

 struct sc_point
-sc_screen_convert_window_to_frame_coords(struct sc_screen *screen,
-                                         int32_t x, int32_t y) {
-    sc_screen_hidpi_scale_coords(screen, &x, &y);
-    return sc_screen_convert_drawable_to_frame_coords(screen, x, y);
+screen_convert_window_to_frame_coords(struct screen *screen,
+                                      int32_t x, int32_t y) {
+    screen_hidpi_scale_coords(screen, &x, &y);
+    return screen_convert_drawable_to_frame_coords(screen, x, y);
 }

 void
-sc_screen_hidpi_scale_coords(struct sc_screen *screen, int32_t *x, int32_t *y) {
+screen_hidpi_scale_coords(struct screen *screen, int32_t *x, int32_t *y) {
    // take the HiDPI scaling (dw/ww and dh/wh) into account
    int ww, wh, dw, dh;
    SDL_GetWindowSize(screen->window, &ww, &wh);
--- a/app/src/screen.h
+++ b/app/src/screen.h
@ -7,24 +7,19 @@
 #include <SDL2/SDL.h>
 #include <libavformat/avformat.h>

-#include "controller.h"
 #include "coords.h"
 #include "fps_counter.h"
-#include "input_manager.h"
 #include "opengl.h"
-#include "trait/key_processor.h"
 #include "trait/frame_sink.h"
-#include "trait/mouse_processor.h"
 #include "video_buffer.h"

-struct sc_screen {
+struct screen {
    struct sc_frame_sink frame_sink; // frame sink trait

 #ifndef NDEBUG
    bool open; // track the open/close state to assert correct behavior
 #endif

-    struct sc_input_manager im;
    struct sc_video_buffer vb;
    struct fps_counter fps_counter;

@ -51,25 +46,10 @@ struct sc_screen {

    bool event_failed; // in case SDL_PushEvent() returned an error

-    bool mouse_captured; // only relevant in relative mouse mode
-    // 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;
 };

-struct sc_screen_params {
-    struct sc_controller *controller;
-    struct sc_key_processor *kp;
-    struct sc_mouse_processor *mp;
-
-    bool control;
-    bool forward_all_clicks;
-    bool legacy_paste;
-    bool clipboard_autosync;
-    const struct sc_shortcut_mods *shortcut_mods;
-
+struct screen_params {
    const char *window_title;
    struct sc_size frame_size;
    bool always_on_top;
@ -91,65 +71,65 @@ struct sc_screen_params {

 // initialize screen, create window, renderer and texture (window is hidden)
 bool
-sc_screen_init(struct sc_screen *screen, const struct sc_screen_params *params);
+screen_init(struct screen *screen, const struct screen_params *params);

 // request to interrupt any inner thread
 // must be called before screen_join()
 void
-sc_screen_interrupt(struct sc_screen *screen);
+screen_interrupt(struct screen *screen);

 // join any inner thread
 void
-sc_screen_join(struct sc_screen *screen);
+screen_join(struct screen *screen);

 // destroy window, renderer and texture (if any)
 void
-sc_screen_destroy(struct sc_screen *screen);
+screen_destroy(struct screen *screen);

 // hide the window
 //
 // It is used to hide the window immediately on closing without waiting for
 // screen_destroy()
 void
-sc_screen_hide_window(struct sc_screen *screen);
+screen_hide_window(struct screen *screen);

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

 // resize window to optimal size (remove black borders)
 void
-sc_screen_resize_to_fit(struct sc_screen *screen);
+screen_resize_to_fit(struct screen *screen);

 // resize window to 1:1 (pixel-perfect)
 void
-sc_screen_resize_to_pixel_perfect(struct sc_screen *screen);
+screen_resize_to_pixel_perfect(struct screen *screen);

 // set the display rotation (0, 1, 2 or 3, x90 degrees counterclockwise)
 void
-sc_screen_set_rotation(struct sc_screen *screen, unsigned rotation);
+screen_set_rotation(struct screen *screen, unsigned rotation);

 // react to SDL events
 bool
-sc_screen_handle_event(struct sc_screen *screen, SDL_Event *event);
+screen_handle_event(struct screen *screen, SDL_Event *event);

 // convert point from window coordinates to frame coordinates
 // x and y are expressed in pixels
 struct sc_point
-sc_screen_convert_window_to_frame_coords(struct sc_screen *screen,
-                                        int32_t x, int32_t y);
+screen_convert_window_to_frame_coords(struct screen *screen,
+                                      int32_t x, int32_t y);

 // convert point from drawable coordinates to frame coordinates
 // x and y are expressed in pixels
 struct sc_point
-sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
-                                          int32_t x, int32_t y);
+screen_convert_drawable_to_frame_coords(struct screen *screen,
+                                        int32_t x, int32_t y);

 // Convert coordinates from window to drawable.
 // Events are expressed in window coordinates, but content is expressed in
 // drawable coordinates. They are the same if HiDPI scaling is 1, but differ
 // otherwise.
 void
-sc_screen_hidpi_scale_coords(struct sc_screen *screen, int32_t *x, int32_t *y);
+screen_hidpi_scale_coords(struct screen *screen, int32_t *x, int32_t *y);

 #endif
--- a/app/src/server.c
+++ b/app/src/server.c
@ -34,7 +34,7 @@ get_server_path(void) {
        char *server_path = strdup(server_path_env);
 #endif
        if (!server_path) {
-            LOG_OOM();
+            LOGE("Could not allocate memory");
            return NULL;
        }
        LOGD("Using SCRCPY_SERVER_PATH: %s", server_path);
@ -45,7 +45,7 @@ get_server_path(void) {
    LOGD("Using server: " SC_SERVER_PATH_DEFAULT);
    char *server_path = strdup(SC_SERVER_PATH_DEFAULT);
    if (!server_path) {
-        LOG_OOM();
+        LOGE("Could not allocate memory");
        return NULL;
    }
 #else
@ -69,7 +69,6 @@ sc_server_params_destroy(struct sc_server_params *params) {
    free((char *) params->crop);
    free((char *) params->codec_options);
    free((char *) params->encoder_name);
-    free((char *) params->tcpip_dst);
 }

 static bool
@ -93,7 +92,6 @@ sc_server_params_copy(struct sc_server_params *dst,
    COPY(crop);
    COPY(codec_options);
    COPY(encoder_name);
-    COPY(tcpip_dst);
 #undef COPY

    return true;
@ -114,7 +112,8 @@ push_server(struct sc_intr *intr, const char *serial) {
        free(server_path);
        return false;
    }
-    bool ok = adb_push(intr, serial, server_path, SC_DEVICE_SERVER_PATH, 0);
+    bool ok = adb_push(intr, serial, server_path, SC_DEVICE_SERVER_PATH,
+                       SC_STDERR);
    free(server_path);
    return ok;
 }
@ -138,34 +137,28 @@ log_level_to_server_string(enum sc_log_level level) {
    }
 }

-static bool
-sc_server_sleep(struct sc_server *server, sc_tick deadline) {
-    sc_mutex_lock(&server->mutex);
-    bool timed_out = false;
-    while (!server->stopped && !timed_out) {
-        timed_out = !sc_cond_timedwait(&server->cond_stopped,
-                                       &server->mutex, deadline);
-    }
-    bool stopped = server->stopped;
-    sc_mutex_unlock(&server->mutex);
-
-    return !stopped;
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
               const struct sc_server_params *params) {
-    sc_pid pid = SC_PROCESS_NONE;
-
-    const char *cmd[128];
-    unsigned count = 0;
-    cmd[count++] = "shell";
-    cmd[count++] = "CLASSPATH=" SC_DEVICE_SERVER_PATH;
-    cmd[count++] = "app_process";
+    const char *serial = server->params.serial;

+    char max_size_string[6];
+    char bit_rate_string[11];
+    char max_fps_string[6];
+    char lock_video_orientation_string[5];
+    char display_id_string[11];
+    sprintf(max_size_string, "%"PRIu16, params->max_size);
+    sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
+    sprintf(max_fps_string, "%"PRIu16, params->max_fps);
+    sprintf(lock_video_orientation_string, "%"PRIi8,
+            params->lock_video_orientation);
+    sprintf(display_id_string, "%"PRIu32, params->display_id);
+    const char *const cmd[] = {
+        "shell",
+        "CLASSPATH=" SC_DEVICE_SERVER_PATH,
+        "app_process",
 #ifdef SERVER_DEBUGGER
 # define SERVER_DEBUGGER_PORT "5005"
-    cmd[count++] =
 # ifdef SERVER_DEBUGGER_METHOD_NEW
        /* Android 9 and above */
        "-XjdwpProvider:internal -XjdwpOptions:transport=dt_socket,suspend=y,"
@ -174,70 +167,27 @@ execute_server(struct sc_server *server,
        /* Android 8 and below */
        "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
 # endif
-            SERVER_DEBUGGER_PORT;
+            SERVER_DEBUGGER_PORT,
 #endif
-    cmd[count++] = "/"; // unused
-    cmd[count++] = "com.genymobile.scrcpy.Server";
-    cmd[count++] = SCRCPY_VERSION;
-
-    unsigned dyn_idx = count; // from there, the strings are allocated
-#define ADD_PARAM(fmt, ...) { \
-        char *p = (char *) &cmd[count]; \
-        if (asprintf(&p, fmt, ## __VA_ARGS__) == -1) { \
-            goto end; \
-        } \
-        cmd[count++] = p; \
-    }
-
-    ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
-    ADD_PARAM("bit_rate=%" PRIu32, params->bit_rate);
-
-    if (params->max_size) {
-        ADD_PARAM("max_size=%" PRIu16, params->max_size);
-    }
-    if (params->max_fps) {
-        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) {
-        ADD_PARAM("crop=%s", params->crop);
-    }
-    if (!params->control) {
-        // By default, control is true
-        ADD_PARAM("control=false");
-    }
-    if (params->display_id) {
-        ADD_PARAM("display_id=%" PRIu32, params->display_id);
-    }
-    if (params->show_touches) {
-        ADD_PARAM("show_touches=true");
-    }
-    if (params->stay_awake) {
-        ADD_PARAM("stay_awake=true");
-    }
-    if (params->codec_options) {
-        ADD_PARAM("codec_options=%s", params->codec_options);
-    }
-    if (params->encoder_name) {
-        ADD_PARAM("encoder_name=%s", params->encoder_name);
-    }
-    if (params->power_off_on_close) {
-        ADD_PARAM("power_off_on_close=true");
-    }
-    if (!params->clipboard_autosync) {
-        // By default, clipboard_autosync is true
-        ADD_PARAM("clipboard_autosync=false");
-    }
-
-#undef ADD_PARAM
-#undef STRBOOL
-
+        "/", // unused
+        "com.genymobile.scrcpy.Server",
+        SCRCPY_VERSION,
+        log_level_to_server_string(params->log_level),
+        max_size_string,
+        bit_rate_string,
+        max_fps_string,
+        lock_video_orientation_string,
+        server->tunnel.forward ? "true" : "false",
+        params->crop ? params->crop : "-",
+        "true", // always send frame meta (packet boundaries + timestamp)
+        params->control ? "true" : "false",
+        display_id_string,
+        params->show_touches ? "true" : "false",
+        params->stay_awake ? "true" : "false",
+        params->codec_options ? params->codec_options : "-",
+        params->encoder_name ? params->encoder_name : "-",
+        params->power_off_on_close ? "true" : "false",
+    };
 #ifdef SERVER_DEBUGGER
    LOGI("Server debugger waiting for a client on device port "
         SERVER_DEBUGGER_PORT "...");
@ -250,20 +200,12 @@ execute_server(struct sc_server *server,
    // Then click on "Debug"
 #endif
    // Inherit both stdout and stderr (all server logs are printed to stdout)
-    pid = adb_execute(params->serial, cmd, count, 0);
-
-end:
-    for (unsigned i = dyn_idx; i < count; ++i) {
-        free((char *) cmd[i]);
-    }
-
-    return pid;
+    return adb_execute(serial, cmd, ARRAY_LEN(cmd), SC_STDOUT | SC_STDERR);
 }

 static bool
-connect_and_read_byte(struct sc_intr *intr, sc_socket socket,
-                      uint32_t tunnel_host, uint16_t tunnel_port) {
-    bool ok = net_connect_intr(intr, socket, tunnel_host, tunnel_port);
+connect_and_read_byte(struct sc_intr *intr, sc_socket socket, uint16_t port) {
+    bool ok = net_connect_intr(intr, socket, IPV4_LOCALHOST, port);
    if (!ok) {
        return false;
    }
@ -280,13 +222,13 @@ connect_and_read_byte(struct sc_intr *intr, sc_socket socket,
 }

 static sc_socket
-connect_to_server(struct sc_server *server, unsigned attempts, sc_tick delay,
-                  uint32_t host, uint16_t port) {
+connect_to_server(struct sc_server *server, uint32_t attempts, sc_tick delay) {
+    uint16_t port = server->tunnel.local_port;
    do {
-        LOGD("Remaining connection attempts: %u", attempts);
+        LOGD("Remaining connection attempts: %d", (int) attempts);
        sc_socket socket = net_socket();
        if (socket != SC_SOCKET_NONE) {
-            bool ok = connect_and_read_byte(&server->intr, socket, host, port);
+            bool ok = connect_and_read_byte(&server->intr, socket, port);
            if (ok) {
                // it worked!
                return socket;
@ -301,14 +243,22 @@ connect_to_server(struct sc_server *server, unsigned attempts, sc_tick delay,
        }

        if (attempts) {
+            sc_mutex_lock(&server->mutex);
            sc_tick deadline = sc_tick_now() + delay;
-            bool ok = sc_server_sleep(server, deadline);
-            if (!ok) {
+            bool timed_out = false;
+            while (!server->stopped && !timed_out) {
+                timed_out = !sc_cond_timedwait(&server->cond_stopped,
+                                               &server->mutex, deadline);
+            }
+            bool stopped = server->stopped;
+            sc_mutex_unlock(&server->mutex);
+
+            if (stopped) {
                LOGI("Connection attempt stopped");
                break;
            }
        }
-    } while (--attempts);
+    } while (--attempts > 0);
    return SC_SOCKET_NONE;
 }

@ -317,18 +267,20 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
              const struct sc_server_callbacks *cbs, void *cbs_userdata) {
    bool ok = sc_server_params_copy(&server->params, params);
    if (!ok) {
-        LOG_OOM();
+        LOGE("Could not copy server params");
        return false;
    }

    ok = sc_mutex_init(&server->mutex);
    if (!ok) {
+        LOGE("Could not create server mutex");
        sc_server_params_destroy(&server->params);
        return false;
    }

    ok = sc_cond_init(&server->cond_stopped);
    if (!ok) {
+        LOGE("Could not create server cond_stopped");
        sc_mutex_destroy(&server->mutex);
        sc_server_params_destroy(&server->params);
        return false;
@ -336,6 +288,7 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,

    ok = sc_intr_init(&server->intr);
    if (!ok) {
+        LOGE("Could not create intr");
        sc_cond_destroy(&server->cond_stopped);
        sc_mutex_destroy(&server->mutex);
        sc_server_params_destroy(&server->params);
@ -387,7 +340,6 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
    assert(tunnel->enabled);

    const char *serial = server->params.serial;
-    bool control = server->params.control;

    sc_socket video_socket = SC_SOCKET_NONE;
    sc_socket control_socket = SC_SOCKET_NONE;
@ -397,44 +349,27 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
            goto fail;
        }

-        if (control) {
-            control_socket =
-                net_accept_intr(&server->intr, tunnel->server_socket);
-            if (control_socket == SC_SOCKET_NONE) {
-                goto fail;
-            }
+        control_socket = net_accept_intr(&server->intr, tunnel->server_socket);
+        if (control_socket == SC_SOCKET_NONE) {
+            goto fail;
        }
    } else {
-        uint32_t tunnel_host = server->params.tunnel_host;
-        if (!tunnel_host) {
-            tunnel_host = IPV4_LOCALHOST;
-        }
-
-        uint16_t tunnel_port = server->params.tunnel_port;
-        if (!tunnel_port) {
-            tunnel_port = tunnel->local_port;
-        }
-
-        unsigned attempts = 100;
+        uint32_t attempts = 100;
        sc_tick delay = SC_TICK_FROM_MS(100);
-        video_socket = connect_to_server(server, attempts, delay, tunnel_host,
-                                         tunnel_port);
+        video_socket = connect_to_server(server, attempts, delay);
        if (video_socket == SC_SOCKET_NONE) {
            goto fail;
        }

-        if (control) {
-            // we know that the device is listening, we don't need several
-            // attempts
-            control_socket = net_socket();
-            if (control_socket == SC_SOCKET_NONE) {
-                goto fail;
-            }
-            bool ok = net_connect_intr(&server->intr, control_socket,
-                                       tunnel_host, tunnel_port);
-            if (!ok) {
-                goto fail;
-            }
+        // we know that the device is listening, we don't need several attempts
+        control_socket = net_socket();
+        if (control_socket == SC_SOCKET_NONE) {
+            goto fail;
+        }
+        bool ok = net_connect_intr(&server->intr, control_socket,
+                                   IPV4_LOCALHOST, tunnel->local_port);
+        if (!ok) {
+            goto fail;
        }
    }

@ -448,7 +383,7 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
    }

    assert(video_socket != SC_SOCKET_NONE);
-    assert(!control || control_socket != SC_SOCKET_NONE);
+    assert(control_socket != SC_SOCKET_NONE);

    server->video_socket = video_socket;
    server->control_socket = control_socket;
@ -497,226 +432,35 @@ sc_server_fill_serial(struct sc_server *server) {
    // device/emulator" error)
    if (!server->params.serial) {
        // The serial is owned by sc_server_params, and will be freed on destroy
-        server->params.serial = adb_get_serialno(&server->intr, 0);
+        server->params.serial = adb_get_serialno(&server->intr, SC_STDERR);
        if (!server->params.serial) {
            LOGE("Could not get device serial");
            return false;
        }
-
-        LOGD("Device serial: %s", server->params.serial);
    }

    return true;
 }

-static bool
-is_tcpip_mode_enabled(struct sc_server *server) {
-    struct sc_intr *intr = &server->intr;
-    const char *serial = server->params.serial;
-
-    char *current_port =
-        adb_getprop(intr, serial, "service.adb.tcp.port", SC_ADB_SILENT);
-    if (!current_port) {
-        return false;
-    }
-
-    // Is the device is listening on TCP on port 5555?
-    bool enabled = !strcmp("5555", current_port);
-    free(current_port);
-    return enabled;
-}
-
-static bool
-wait_tcpip_mode_enabled(struct sc_server *server, unsigned attempts,
-                        sc_tick delay) {
-    if (is_tcpip_mode_enabled(server)) {
-        LOGI("TCP/IP mode enabled");
-        return true;
-    }
-
-    // Only print this log if TCP/IP is not enabled
-    LOGI("Waiting for TCP/IP mode enabled...");
-
-    do {
-        sc_tick deadline = sc_tick_now() + delay;
-        if (!sc_server_sleep(server, deadline)) {
-            LOGI("TCP/IP mode waiting interrupted");
-            return false;
-        }
-
-        if (is_tcpip_mode_enabled(server)) {
-            LOGI("TCP/IP mode enabled");
-            return true;
-        }
-    } while (--attempts);
-    return false;
-}
-
-char *
-append_port_5555(const char *ip) {
-    size_t len = strlen(ip);
-
-    // sizeof counts the final '\0'
-    char *ip_port = malloc(len + sizeof(":5555"));
-    if (!ip_port) {
-        LOG_OOM();
-        return NULL;
-    }
-
-    memcpy(ip_port, ip, len);
-    memcpy(ip_port + len, ":5555", sizeof(":5555"));
-
-    return ip_port;
-}
-
-static bool
-sc_server_switch_to_tcpip(struct sc_server *server, char **out_ip_port) {
-    const char *serial = server->params.serial;
-    assert(serial);
-
-    struct sc_intr *intr = &server->intr;
-
-    char *ip = adb_get_device_ip(intr, serial, 0);
-    if (!ip) {
-        LOGE("Device IP not found");
-        return false;
-    }
-
-    char *ip_port = append_port_5555(ip);
-    free(ip);
-    if (!ip_port) {
-        return false;
-    }
-
-    bool tcp_mode = is_tcpip_mode_enabled(server);
-
-    if (!tcp_mode) {
-        bool ok = adb_tcpip(intr, serial, 5555, SC_ADB_NO_STDOUT);
-        if (!ok) {
-            LOGE("Could not restart adbd in TCP/IP mode");
-            goto error;
-        }
-
-        unsigned attempts = 40;
-        sc_tick delay = SC_TICK_FROM_MS(250);
-        ok = wait_tcpip_mode_enabled(server, attempts, delay);
-        if (!ok) {
-            goto error;
-        }
-    }
-
-    *out_ip_port = ip_port;
-
-    return true;
-
-error:
-    free(ip_port);
-    return false;
-}
-
-static bool
-sc_server_connect_to_tcpip(struct sc_server *server, const char *ip_port) {
-    struct sc_intr *intr = &server->intr;
-
-    // Error expected if not connected, do not report any error
-    adb_disconnect(intr, ip_port, SC_ADB_SILENT);
-
-    bool ok = adb_connect(intr, ip_port, 0);
-    if (!ok) {
-        LOGE("Could not connect to %s", ip_port);
-        return false;
-    }
-
-    // Override the serial, owned by the sc_server_params
-    free((void *) server->params.serial);
-    server->params.serial = strdup(ip_port);
-    if (!server->params.serial) {
-        LOG_OOM();
-        return false;
-    }
-
-    LOGI("Connected to %s", ip_port);
-    return true;
-}
-
-
-static bool
-sc_server_configure_tcpip(struct sc_server *server) {
-    char *ip_port;
-
-    const struct sc_server_params *params = &server->params;
-
-    // If tcpip parameter is given, then it must connect to this address.
-    // Therefore, the device is unknown, so serial is meaningless at this point.
-    assert(!params->serial || !params->tcpip_dst);
-
-    if (params->tcpip_dst) {
-        // Append ":5555" if no port is present
-        bool contains_port = strchr(params->tcpip_dst, ':');
-        ip_port = contains_port ? strdup(params->tcpip_dst)
-                                : append_port_5555(params->tcpip_dst);
-        if (!ip_port) {
-            LOG_OOM();
-            return false;
-        }
-    } else {
-        // The device IP address must be retrieved from the current
-        // connected device
-        if (!sc_server_fill_serial(server)) {
-            return false;
-        }
-
-        // The serial is either the real serial when connected via USB, or
-        // the IP:PORT when connected over TCP/IP. Only the latter contains
-        // a colon.
-        bool is_already_tcpip = strchr(params->serial, ':');
-        if (is_already_tcpip) {
-            // Nothing to do
-            LOGI("Device already connected via TCP/IP: %s", params->serial);
-            return true;
-        }
-
-        bool ok = sc_server_switch_to_tcpip(server, &ip_port);
-        if (!ok) {
-            return false;
-        }
-    }
-
-    // On success, this call changes params->serial
-    bool ok = sc_server_connect_to_tcpip(server, ip_port);
-    free(ip_port);
-    return ok;
-}
-
 static int
 run_server(void *data) {
    struct sc_server *server = data;

-    const struct sc_server_params *params = &server->params;
-
-    if (params->serial) {
-        LOGD("Device serial: %s", params->serial);
-    }
-
-    if (params->tcpip) {
-        // params->serial may be changed after this call
-        bool ok = sc_server_configure_tcpip(server);
-        if (!ok) {
-            goto error_connection_failed;
-        }
-    }
-
-    // It is ok to call this function even if the device serial has been
-    // changed by switching over TCP/IP
    if (!sc_server_fill_serial(server)) {
        goto error_connection_failed;
    }

+    const struct sc_server_params *params = &server->params;
+
+    LOGD("Device serial: %s", params->serial);
+
    bool ok = push_server(&server->intr, params->serial);
    if (!ok) {
        goto error_connection_failed;
    }

+    LOGI("Server pushed");
+
    ok = sc_adb_tunnel_open(&server->tunnel, &server->intr, params->serial,
                            params->port_range, params->force_adb_forward);
    if (!ok) {
@ -762,17 +506,6 @@ run_server(void *data) {
    }
    sc_mutex_unlock(&server->mutex);

-    // Interrupt sockets to wake up socket blocking calls on the server
-    assert(server->video_socket != SC_SOCKET_NONE);
-    net_interrupt(server->video_socket);
-    net_close(server->video_socket);
-
-    if (server->control_socket != SC_SOCKET_NONE) {
-        // There is no control_socket if --no-control is set
-        net_interrupt(server->control_socket);
-        net_close(server->control_socket);
-    }
-
    // Give some delay for the server to terminate properly
 #define WATCHDOG_DELAY SC_TICK_FROM_SEC(1)
    sc_tick deadline = sc_tick_now() + WATCHDOG_DELAY;
@ -803,8 +536,7 @@ error_connection_failed:

 bool
 sc_server_start(struct sc_server *server) {
-    bool ok =
-        sc_thread_create(&server->thread, run_server, "scrcpy-server", server);
+    bool ok = sc_thread_create(&server->thread, run_server, "server", server);
    if (!ok) {
        LOGE("Could not create server thread");
        return false;
--- a/app/src/server.h
+++ b/app/src/server.h
@ -29,8 +29,6 @@ struct sc_server_params {
    const char *codec_options;
    const char *encoder_name;
    struct sc_port_range port_range;
-    uint32_t tunnel_host;
-    uint16_t tunnel_port;
    uint16_t max_size;
    uint32_t bit_rate;
    uint16_t max_fps;
@ -41,9 +39,6 @@ struct sc_server_params {
    bool stay_awake;
    bool force_adb_forward;
    bool power_off_on_close;
-    bool clipboard_autosync;
-    bool tcpip;
-    const char *tcpip_dst;
 };

 struct sc_server {
--- a/app/src/stream.c
+++ b/app/src/stream.c
@ -1,6 +1,7 @@
 #include "stream.h"

 #include <assert.h>
+#include <libavformat/avformat.h>
 #include <libavutil/time.h>
 #include <unistd.h>

@ -41,7 +42,7 @@ stream_recv_packet(struct stream *stream, AVPacket *packet) {
    assert(len);

    if (av_new_packet(packet, len)) {
-        LOG_OOM();
+        LOGE("Could not allocate packet");
        return false;
    }

@ -110,18 +111,18 @@ stream_push_packet(struct stream *stream, AVPacket *packet) {
        if (stream->pending) {
            offset = stream->pending->size;
            if (av_grow_packet(stream->pending, packet->size)) {
-                LOG_OOM();
+                LOGE("Could not grow packet");
                return false;
            }
        } else {
            offset = 0;
            stream->pending = av_packet_alloc();
            if (!stream->pending) {
-                LOG_OOM();
+                LOGE("Could not allocate packet");
                return false;
            }
            if (av_new_packet(stream->pending, packet->size)) {
-                LOG_OOM();
+                LOGE("Could not create packet");
                av_packet_free(&stream->pending);
                return false;
            }
@ -191,7 +192,7 @@ static int
 run_stream(void *data) {
    struct stream *stream = data;

-    const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_H264);
+    AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_H264);
    if (!codec) {
        LOGE("H.264 decoder not found");
        goto end;
@ -199,7 +200,7 @@ run_stream(void *data) {

    stream->codec_ctx = avcodec_alloc_context3(codec);
    if (!stream->codec_ctx) {
-        LOG_OOM();
+        LOGC("Could not allocate codec context");
        goto end;
    }

@ -220,7 +221,7 @@ run_stream(void *data) {

    AVPacket *packet = av_packet_alloc();
    if (!packet) {
-        LOG_OOM();
+        LOGE("Could not allocate packet");
        goto finally_close_parser;
    }

@ -283,8 +284,7 @@ bool
 stream_start(struct stream *stream) {
    LOGD("Starting stream thread");

-    bool ok =
-        sc_thread_create(&stream->thread, run_stream, "scrcpy-stream", stream);
+    bool ok = sc_thread_create(&stream->thread, run_stream, "stream", stream);
    if (!ok) {
        LOGC("Could not start stream thread");
        return false;
--- a/app/src/stream.h
+++ b/app/src/stream.h
@ -5,7 +5,6 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>

 #include "trait/packet_sink.h"
--- a/app/src/sys/unix/file.c
+++ b/app/src/sys/unix/file.c
@ -2,13 +2,10 @@

 #include <limits.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>

-#include "util/log.h"
-
 bool
 sc_file_executable_exists(const char *file) {
    char *path = getenv("PATH");
@ -26,10 +23,7 @@ sc_file_executable_exists(const char *file) {
        size_t dir_len = strlen(dir);
        char *fullpath = malloc(dir_len + file_len + 2);
        if (!fullpath)
-        {
-            LOG_OOM();
            continue;
-        }
        memcpy(fullpath, dir, dir_len);
        fullpath[dir_len] = '/';
        memcpy(fullpath + dir_len + 1, file, file_len + 1);
--- a/app/src/sys/unix/process.c
+++ b/app/src/sys/unix/process.c
@ -11,10 +11,15 @@
 #include "util/log.h"

 enum sc_process_result
-sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
+sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned inherit,
                     int *pin, int *pout, int *perr) {
-    bool inherit_stdout = !pout && !(flags & SC_PROCESS_NO_STDOUT);
-    bool inherit_stderr = !perr && !(flags & SC_PROCESS_NO_STDERR);
+    bool inherit_stdout = inherit & SC_STDOUT;
+    bool inherit_stderr = inherit & SC_STDERR;
+
+    // If pout is defined, then inherit MUST NOT contain SC_STDOUT.
+    assert(!pout || !inherit_stdout);
+    // If perr is defined, then inherit MUST NOT contain SC_STDERR.
+    assert(!perr || !inherit_stderr);

    int in[2];
    int out[2];
@ -93,7 +98,8 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
            }
            close(in[1]);
        }
-        // Do not close stdin in the child process, this makes adb fail on Linux
+        // Do not close stdin in the child process, this makes adb fail on
+        // Linux

        if (pout) {
            if (out[1] != STDOUT_FILENO) {
@ -119,13 +125,6 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,

        close(internal[0]);
        enum sc_process_result err;
-
-        // Somehow SDL masks many signals - undo them for other processes
-        // https://github.com/libsdl-org/SDL/blob/release-2.0.18/src/thread/pthread/SDL_systhread.c#L167
-        sigset_t mask;
-        sigemptyset(&mask);
-        sigprocmask(SIG_SETMASK, &mask, NULL);
-
        if (fcntl(internal[1], F_SETFD, FD_CLOEXEC) == 0) {
            execvp(argv[0], (char *const *) argv);
            perror("exec");
--- a/app/src/sys/win/file.c
+++ b/app/src/sys/win/file.c
@ -26,7 +26,7 @@ bool
 sc_file_is_regular(const char *path) {
    wchar_t *wide_path = sc_str_to_wchars(path);
    if (!wide_path) {
-        LOG_OOM();
+        LOGC("Could not allocate wide char string");
        return false;
    }

--- a/app/src/sys/win/process.c
+++ b/app/src/sys/win/process.c
@ -1,3 +1,6 @@
+// <https://devblogs.microsoft.com/oldnewthing/20111216-00/?p=8873>
+#define _WIN32_WINNT 0x0600 // For extended process API
+
 #include "util/process.h"

 #include <processthreadsapi.h>
@ -24,13 +27,20 @@ build_cmd(char *cmd, size_t len, const char *const argv[]) {
 }

 enum sc_process_result
-sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,
+sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned inherit,
                     HANDLE *pin, HANDLE *pout, HANDLE *perr) {
-    bool inherit_stdout = !pout && !(flags & SC_PROCESS_NO_STDOUT);
-    bool inherit_stderr = !perr && !(flags & SC_PROCESS_NO_STDERR);
+    bool inherit_stdout = inherit & SC_STDOUT;
+    bool inherit_stderr = inherit & SC_STDERR;
+
+    // If pout is defined, then inherit MUST NOT contain SC_STDOUT.
+    assert(!pout || !inherit_stdout);
+    // If perr is defined, then inherit MUST NOT contain SC_STDERR.
+    assert(!perr || !inherit_stderr);

    // Add 1 per non-NULL pointer
-    unsigned handle_count = !!pin || !!pout || !!perr;
+    unsigned handle_count = !!pin
+                          + (pout || inherit_stdout)
+                          + (perr || inherit_stderr);

    enum sc_process_result ret = SC_PROCESS_ERROR_GENERIC;

@ -79,29 +89,25 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,
    si.StartupInfo.cb = sizeof(si);
    HANDLE handles[3];

-    si.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
-    if (inherit_stdout) {
-        si.StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    }
-    if (inherit_stderr) {
-        si.StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-    }
-
    LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
+    // Must be set even if handle_count == 0, so that stdin, stdout and stderr
+    // are NOT inherited in that case
+    si.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
+
    if (handle_count) {
        unsigned i = 0;
        if (pin) {
            si.StartupInfo.hStdInput = stdin_read_handle;
            handles[i++] = si.StartupInfo.hStdInput;
        }
-        if (pout) {
-            assert(!inherit_stdout);
-            si.StartupInfo.hStdOutput = stdout_write_handle;
+        if (pout || inherit_stdout) {
+            si.StartupInfo.hStdOutput = pout ? stdout_write_handle
+                                             : GetStdHandle(STD_OUTPUT_HANDLE);
            handles[i++] = si.StartupInfo.hStdOutput;
        }
-        if (perr) {
-            assert(!inherit_stderr);
-            si.StartupInfo.hStdError = stderr_write_handle;
+        if (perr || inherit_stderr) {
+            si.StartupInfo.hStdError = perr ? stderr_write_handle
+                                            : GetStdHandle(STD_ERROR_HANDLE);
            handles[i++] = si.StartupInfo.hStdError;
        }

@ -116,7 +122,6 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,

        lpAttributeList = malloc(size);
        if (!lpAttributeList) {
-            LOG_OOM();
            goto error_close_stderr;
        }

@ -139,33 +144,23 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,

    char *cmd = malloc(CMD_MAX_LEN);
    if (!cmd || !build_cmd(cmd, CMD_MAX_LEN, argv)) {
-        LOG_OOM();
        goto error_free_attribute_list;
    }

    wchar_t *wide = sc_str_to_wchars(cmd);
    free(cmd);
    if (!wide) {
-        LOG_OOM();
+        LOGC("Could not allocate wide char string");
        goto error_free_attribute_list;
    }

-    BOOL bInheritHandles = handle_count > 0 || inherit_stdout || inherit_stderr;
-    DWORD dwCreationFlags = 0;
-    if (handle_count > 0) {
-        dwCreationFlags |= EXTENDED_STARTUPINFO_PRESENT;
-    }
-    if (!inherit_stdout && !inherit_stderr) {
-        // DETACHED_PROCESS to disable stdin, stdout and stderr
-        dwCreationFlags |= DETACHED_PROCESS;
-    }
+    BOOL bInheritHandles = handle_count > 0;
+    DWORD dwCreationFlags = handle_count > 0 ? EXTENDED_STARTUPINFO_PRESENT : 0;
    BOOL ok = CreateProcessW(NULL, wide, NULL, NULL, bInheritHandles,
                             dwCreationFlags, NULL, NULL, &si.StartupInfo, &pi);
    free(wide);
    if (!ok) {
-        int err = GetLastError();
-        LOGE("CreateProcessW() error %d", err);
-        if (err == ERROR_FILE_NOT_FOUND) {
+        if (GetLastError() == ERROR_FILE_NOT_FOUND) {
            ret = SC_PROCESS_ERROR_MISSING_BINARY;
        }
        goto error_free_attribute_list;
--- a/app/src/trait/key_processor.h
+++ b/app/src/trait/key_processor.h
@ -6,7 +6,7 @@
 #include <assert.h>
 #include <stdbool.h>

-#include "input_events.h"
+#include <SDL2/SDL_events.h>

 /**
 * Key processor trait.
@ -14,42 +14,16 @@
 * Component able to process and inject keys should implement this trait.
 */
 struct sc_key_processor {
-    /**
-     * Set by the implementation to indicate that it must explicitly wait for
-     * the clipboard to be set on the device before injecting Ctrl+v to avoid
-     * race conditions. If it is set, the input_manager will pass a valid
-     * ack_to_wait to process_key() in case of clipboard synchronization
-     * resulting of the key event.
-     */
-    bool async_paste;
-
    const struct sc_key_processor_ops *ops;
 };

 struct sc_key_processor_ops {
-
-    /**
-     * Process a keyboard event
-     *
-     * The `sequence` number (if different from `SC_SEQUENCE_INVALID`) indicates
-     * the acknowledgement number to wait for before injecting this event.
-     * This allows to ensure that the device clipboard is set before injecting
-     * Ctrl+v on the device.
-     *
-     * This function is mandatory.
-     */
    void
-    (*process_key)(struct sc_key_processor *kp,
-                   const struct sc_key_event *event, uint64_t ack_to_wait);
+    (*process_key)(struct sc_key_processor *kp, const SDL_KeyboardEvent *event);

-    /**
-     * Process an input text
-     *
-     * This function is optional.
-     */
    void
    (*process_text)(struct sc_key_processor *kp,
-                    const struct sc_text_event *event);
+                    const SDL_TextInputEvent *event);
 };

 #endif
--- a/app/src/trait/mouse_processor.h
+++ b/app/src/trait/mouse_processor.h
@ -6,7 +6,7 @@
 #include <assert.h>
 #include <stdbool.h>

-#include "input_events.h"
+#include <SDL2/SDL_events.h>

 /**
 * Mouse processor trait.
@ -16,51 +16,24 @@
 */
 struct sc_mouse_processor {
    const struct sc_mouse_processor_ops *ops;
-
-    /**
-     * If set, the mouse processor works in relative mode (the absolute
-     * position is irrelevant). In particular, it indicates that the mouse
-     * pointer must be "captured" by the UI.
-     */
-    bool relative_mode;
 };

 struct sc_mouse_processor_ops {
-    /**
-     * Process a mouse motion event
-     *
-     * This function is mandatory.
-     */
    void
    (*process_mouse_motion)(struct sc_mouse_processor *mp,
-                            const struct sc_mouse_motion_event *event);
+                            const SDL_MouseMotionEvent *event);

-    /**
-     * Process a mouse click event
-     *
-     * This function is mandatory.
-     */
-    void
-    (*process_mouse_click)(struct sc_mouse_processor *mp,
-                           const struct sc_mouse_click_event *event);
-
-    /**
-     * Process a mouse scroll event
-     *
-     * This function is optional.
-     */
-    void
-    (*process_mouse_scroll)(struct sc_mouse_processor *mp,
-                            const struct sc_mouse_scroll_event *event);
-
-    /**
-     * Process a touch event
-     *
-     * This function is optional.
-     */
    void
    (*process_touch)(struct sc_mouse_processor *mp,
-                     const struct sc_touch_event *event);
+                     const SDL_TouchFingerEvent *event);
+
+    void
+    (*process_mouse_button)(struct sc_mouse_processor *mp,
+                            const SDL_MouseButtonEvent *event);
+
+    void
+    (*process_mouse_wheel)(struct sc_mouse_processor *mp,
+                           const SDL_MouseWheelEvent *event);
 };

 #endif
--- a/app/src/util/acksync.c
+++ b/app/src/util/acksync.c
@ -1,76 +0,0 @@
-#include "acksync.h"
-
-#include <assert.h>
-#include "util/log.h"
-
-bool
-sc_acksync_init(struct sc_acksync *as) {
-    bool ok = sc_mutex_init(&as->mutex);
-    if (!ok) {
-        return false;
-    }
-
-    ok = sc_cond_init(&as->cond);
-    if (!ok) {
-        sc_mutex_destroy(&as->mutex);
-        return false;
-    }
-
-    as->stopped = false;
-    as->ack = SC_SEQUENCE_INVALID;
-
-    return true;
-}
-
-void
-sc_acksync_destroy(struct sc_acksync *as) {
-    sc_cond_destroy(&as->cond);
-    sc_mutex_destroy(&as->mutex);
-}
-
-void
-sc_acksync_ack(struct sc_acksync *as, uint64_t sequence) {
-    sc_mutex_lock(&as->mutex);
-
-    // Acknowledgements must be monotonic
-    assert(sequence >= as->ack);
-
-    as->ack = sequence;
-    sc_cond_signal(&as->cond);
-
-    sc_mutex_unlock(&as->mutex);
-}
-
-enum sc_acksync_wait_result
-sc_acksync_wait(struct sc_acksync *as, uint64_t ack, sc_tick deadline) {
-    sc_mutex_lock(&as->mutex);
-
-    bool timed_out = false;
-    while (!as->stopped && as->ack < ack && !timed_out) {
-        timed_out = !sc_cond_timedwait(&as->cond, &as->mutex, deadline);
-    }
-
-    enum sc_acksync_wait_result ret;
-    if (as->stopped) {
-        ret = SC_ACKSYNC_WAIT_INTR;
-    } else if (as->ack >= ack) {
-        ret = SC_ACKSYNC_WAIT_OK;
-    } else {
-        assert(timed_out);
-        ret = SC_ACKSYNC_WAIT_TIMEOUT;
-    }
-    sc_mutex_unlock(&as->mutex);
-
-    return ret;
-}
-
-/**
- * Interrupt any `sc_acksync_wait()`
- */
-void
-sc_acksync_interrupt(struct sc_acksync *as) {
-    sc_mutex_lock(&as->mutex);
-    as->stopped = true;
-    sc_cond_signal(&as->cond);
-    sc_mutex_unlock(&as->mutex);
-}
--- a/app/src/util/acksync.h
+++ b/app/src/util/acksync.h
@ -1,66 +0,0 @@
-#ifndef SC_ACK_SYNC_H
-#define SC_ACK_SYNC_H
-
-#include "common.h"
-
-#include "thread.h"
-
-#define SC_SEQUENCE_INVALID 0
-
-/**
- * Helper to wait for acknowledgments
- *
- * In practice, it is used to wait for device clipboard acknowledgement from the
- * server before injecting Ctrl+v via AOA HID, in order to avoid pasting the
- * content of the old device clipboard (if Ctrl+v was injected before the
- * clipboard content was actually set).
- */
-struct sc_acksync {
-    sc_mutex mutex;
-    sc_cond cond;
-
-    bool stopped;
-
-    // Last acked value, initially SC_SEQUENCE_INVALID
-    uint64_t ack;
-};
-
-enum sc_acksync_wait_result {
-    // Acknowledgment received
-    SC_ACKSYNC_WAIT_OK,
-
-    // Timeout expired
-    SC_ACKSYNC_WAIT_TIMEOUT,
-
-    // Interrupted from another thread by sc_acksync_interrupt()
-    SC_ACKSYNC_WAIT_INTR,
-};
-
-bool
-sc_acksync_init(struct sc_acksync *as);
-
-void
-sc_acksync_destroy(struct sc_acksync *as);
-
-/**
- * Acknowledge `sequence`
- *
- * The `sequence` must be greater than (or equal to) any previous acknowledged
- * sequence.
- */
-void
-sc_acksync_ack(struct sc_acksync *as, uint64_t sequence);
-
-/**
- * Wait for acknowledgment of sequence `ack` (or higher)
- */
-enum sc_acksync_wait_result
-sc_acksync_wait(struct sc_acksync *as, uint64_t ack, sc_tick deadline);
-
-/**
- * Interrupt any `sc_acksync_wait()`
- */
-void
-sc_acksync_interrupt(struct sc_acksync *as);
-
-#endif
--- a/app/src/util/file.c
+++ b/app/src/util/file.c
@ -31,7 +31,7 @@ sc_file_get_local_path(const char *name) {
    size_t len = dirlen + namelen + 2; // +2: '/' and '\0'
    char *file_path = malloc(len);
    if (!file_path) {
-        LOG_OOM();
+        LOGE("Could not alloc path");
        free(executable_path);
        return NULL;
    }
--- a/app/src/util/intmap.c
+++ b/app/src/util/intmap.c
@ -1,13 +0,0 @@
-#include "intmap.h"
-
-const struct sc_intmap_entry *
-sc_intmap_find_entry(const struct sc_intmap_entry entries[], size_t len,
-                     int32_t key) {
-    for (size_t i = 0; i < len; ++i) {
-        const struct sc_intmap_entry *entry = &entries[i];
-        if (entry->key == key) {
-            return entry;
-        }
-    }
-    return NULL;
-}
--- a/app/src/util/intmap.h
+++ b/app/src/util/intmap.h
@ -1,24 +0,0 @@
-#ifndef SC_ARRAYMAP_H
-#define SC_ARRAYMAP_H
-
-#include "common.h"
-
-#include <stdint.h>
-
-struct sc_intmap_entry {
-    int32_t key;
-    int32_t value;
-};
-
-const struct sc_intmap_entry *
-sc_intmap_find_entry(const struct sc_intmap_entry entries[], size_t len,
-                     int32_t key);
-
-/**
- * MAP is expected to be a static array of sc_intmap_entry, so that
- * ARRAY_LEN(MAP) can be computed statically.
- */
-#define SC_INTMAP_FIND_ENTRY(MAP, KEY) \
-    sc_intmap_find_entry(MAP, ARRAY_LEN(MAP), KEY)
-
-#endif
--- a/app/src/util/intr.c
+++ b/app/src/util/intr.c
@ -8,7 +8,7 @@ bool
 sc_intr_init(struct sc_intr *intr) {
    bool ok = sc_mutex_init(&intr->mutex);
    if (!ok) {
-        LOG_OOM();
+        LOGE("Could not init intr mutex");
        return false;
    }

--- a/app/src/util/log.h
+++ b/app/src/util/log.h
@ -7,9 +7,6 @@

 #include "options.h"

-#define LOG_STR_IMPL_(x) # x
-#define LOG_STR(x) LOG_STR_IMPL_(x)
-
 #define LOGV(...) SDL_LogVerbose(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)
 #define LOGD(...) SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)
 #define LOGI(...) SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)
@ -17,9 +14,6 @@
 #define LOGE(...) SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)
 #define LOGC(...) SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION, __VA_ARGS__)

-#define LOG_OOM() \
-    LOGC("OOM: %s:%d %s()", __FILE__, __LINE__, __func__)
-
 void
 sc_set_log_level(enum sc_log_level level);

--- a/app/src/util/net.c
+++ b/app/src/util/net.c
@ -1,30 +1,25 @@
 #include "net.h"

 #include <assert.h>
-#include <errno.h>
 #include <stdio.h>
 #include <SDL2/SDL_platform.h>

 #include "log.h"

 #ifdef __WINDOWS__
-# 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 <arpa/inet.h>
 # include <unistd.h>
-# include <fcntl.h>
 # define SOCKET_ERROR -1
  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
@ -56,7 +51,6 @@ wrap(sc_raw_socket sock) {

    struct sc_socket_windows *socket = malloc(sizeof(*socket));
    if (!socket) {
-        LOG_OOM();
        closesocket(sock);
        return SC_SOCKET_NONE;
    }
@ -83,37 +77,6 @@ unwrap(sc_socket socket) {
 #endif
 }

-#ifndef HAVE_SOCK_CLOEXEC // avoid unused-function warning
-static inline bool
-sc_raw_socket_close(sc_raw_socket raw_sock) {
-#ifndef _WIN32
-    return !close(raw_sock);
-#else
-    return !closesocket(raw_sock);
-#endif
-}
-#endif
-
-#ifndef HAVE_SOCK_CLOEXEC
-// If SOCK_CLOEXEC does not exist, the flag must be set manually once the
-// socket is created
-static bool
-set_cloexec_flag(sc_raw_socket raw_sock) {
-#ifndef _WIN32
-    if (fcntl(raw_sock, F_SETFD, FD_CLOEXEC) == -1) {
-        perror("fcntl F_SETFD");
-        return false;
-    }
-#else
-    if (!SetHandleInformation((HANDLE) raw_sock, HANDLE_FLAG_INHERIT, 0)) {
-        LOGE("SetHandleInformation socket failed");
-        return false;
-    }
-#endif
-    return true;
-}
-#endif
-
 static void
 net_perror(const char *s) {
 #ifdef _WIN32
@ -132,16 +95,7 @@ net_perror(const char *s) {

 sc_socket
 net_socket(void) {
-#ifdef HAVE_SOCK_CLOEXEC
-    sc_raw_socket raw_sock = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-#else
    sc_raw_socket raw_sock = socket(AF_INET, SOCK_STREAM, 0);
-    if (raw_sock != SC_RAW_SOCKET_NONE && !set_cloexec_flag(raw_sock)) {
-        sc_raw_socket_close(raw_sock);
-        return SC_SOCKET_NONE;
-    }
-#endif
-
    sc_socket sock = wrap(raw_sock);
    if (sock == SC_SOCKET_NONE) {
        net_perror("socket");
@ -200,18 +154,8 @@ net_accept(sc_socket server_socket) {

    SOCKADDR_IN csin;
    socklen_t sinsize = sizeof(csin);
-
-#ifdef HAVE_SOCK_CLOEXEC
-    sc_raw_socket raw_sock =
-        accept4(raw_server_socket, (SOCKADDR *) &csin, &sinsize, SOCK_CLOEXEC);
-#else
    sc_raw_socket raw_sock =
        accept(raw_server_socket, (SOCKADDR *) &csin, &sinsize);
-    if (raw_sock != SC_RAW_SOCKET_NONE && !set_cloexec_flag(raw_sock)) {
-        sc_raw_socket_close(raw_sock);
-        return SC_SOCKET_NONE;
-    }
-#endif

    return wrap(raw_sock);
 }
@ -265,6 +209,7 @@ net_interrupt(sc_socket socket) {
 #endif
 }

+#include <errno.h>
 bool
 net_close(sc_socket socket) {
    sc_raw_socket raw_sock = unwrap(socket);
@ -280,15 +225,3 @@ net_close(sc_socket socket) {
    return !close(raw_sock);
 #endif
 }
-
-bool
-net_parse_ipv4(const char *s, uint32_t *ipv4) {
-    struct in_addr addr;
-    if (!inet_pton(AF_INET, s, &addr)) {
-        LOGE("Invalid IPv4 address: %s", s);
-        return false;
-    }
-
-    *ipv4 = ntohl(addr.s_addr);
-    return true;
-}
--- a/app/src/util/net.h
+++ b/app/src/util/net.h
@ -68,10 +68,4 @@ net_interrupt(sc_socket socket);
 bool
 net_close(sc_socket socket);

-/**
- * Parse `ip` "xxx.xxx.xxx.xxx" to an IPv4 host representation
- */
-bool
-net_parse_ipv4(const char *ip, uint32_t *ipv4);
-
 #endif
--- a/app/src/util/process.c
+++ b/app/src/util/process.c
@ -5,8 +5,27 @@
 #include "log.h"

 enum sc_process_result
-sc_process_execute(const char *const argv[], sc_pid *pid, unsigned flags) {
-    return sc_process_execute_p(argv, pid, flags, NULL, NULL, NULL);
+sc_process_execute(const char *const argv[], sc_pid *pid, unsigned inherit) {
+    return sc_process_execute_p(argv, pid, inherit, NULL, NULL, NULL);
+}
+
+bool
+sc_process_check_success(sc_pid pid, const char *name, bool close) {
+    if (pid == SC_PROCESS_NONE) {
+        LOGE("Could not execute \"%s\"", name);
+        return false;
+    }
+    sc_exit_code exit_code = sc_process_wait(pid, close);
+    if (exit_code) {
+        if (exit_code != SC_EXIT_CODE_NONE) {
+            LOGE("\"%s\" returned with value %" SC_PRIexitcode, name,
+                 exit_code);
+        } else {
+            LOGE("\"%s\" exited unexpectedly", name);
+        }
+        return false;
+    }
+    return true;
 }

 ssize_t
@ -64,7 +83,7 @@ sc_process_observer_init(struct sc_process_observer *observer, sc_pid pid,
    observer->listener_userdata = listener_userdata;
    observer->terminated = false;

-    ok = sc_thread_create(&observer->thread, run_observer, "scrcpy-proc",
+    ok = sc_thread_create(&observer->thread, run_observer, "process_observer",
                          observer);
    if (!ok) {
        sc_cond_destroy(&observer->cond_terminated);
--- a/app/src/util/process.h
+++ b/app/src/util/process.h
@ -67,21 +67,18 @@ enum sc_process_result {
    SC_PROCESS_ERROR_MISSING_BINARY,
 };

-#define SC_PROCESS_NO_STDOUT (1 << 0)
-#define SC_PROCESS_NO_STDERR (1 << 1)
+#define SC_STDOUT (1 << 0)
+#define SC_STDERR (1 << 1)

 /**
 * Execute the command and write the process id to `pid`
 *
- * The `flags` argument is a bitwise OR of the following values:
- *  - SC_PROCESS_NO_STDOUT
- *  - SC_PROCESS_NO_STDERR
- *
- * It indicates if stdout and stderr must be inherited from the scrcpy process
- * (i.e. if the process must output to the scrcpy console).
+ * The parameter `inherit` is a OR of any of SC_STDOUT and SC_STDERR. It
+ * indicates if stdout and stderr must be inherited from the scrcpy process (in
+ * other words, if the process must output to the scrcpy console).
 */
 enum sc_process_result
-sc_process_execute(const char *const argv[], sc_pid *pid, unsigned flags);
+sc_process_execute(const char *const argv[], sc_pid *pid, unsigned inherit);

 /**
 * Execute the command and write the process id to `pid`
@ -89,10 +86,12 @@ sc_process_execute(const char *const argv[], sc_pid *pid, unsigned flags);
 * If not NULL, provide a pipe for stdin (`pin`), stdout (`pout`) and stderr
 * (`perr`).
 *
- * The `flags` argument has the same semantics as in `sc_process_execute()`.
+ * The parameter `inherit` has the same semantics as in `sc_process_execute()`.
+ * If `pout` is not NULL, then `inherit` MUST NOT contain SC_STDOUT.
+ * If `perr` is not NULL, then `inherit` MUST NOT contain SC_STDERR.
 */
 enum sc_process_result
-sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
+sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned inherit,
                     sc_pipe *pin, sc_pipe *pout, sc_pipe *perr);

 /**
@ -119,6 +118,14 @@ sc_process_wait(sc_pid pid, bool close);
 void
 sc_process_close(sc_pid pid);

+/**
+ * Convenience function to wait for a successful process execution
+ *
+ * Automatically log process errors with the provided process name.
+ */
+bool
+sc_process_check_success(sc_pid pid, const char *name, bool close);
+
 /**
 * Read from the pipe
 *
--- a/app/src/util/process_intr.c
+++ b/app/src/util/process_intr.c
@ -1,5 +1,26 @@
 #include "process_intr.h"

+bool
+sc_process_check_success_intr(struct sc_intr *intr, sc_pid pid,
+                              const char *name, bool close) {
+    if (!sc_intr_set_process(intr, pid)) {
+        // Already interrupted
+        return false;
+    }
+
+    // Always pass close=false, interrupting would be racy otherwise
+    bool ret = sc_process_check_success(pid, name, false);
+
+    sc_intr_set_process(intr, SC_PROCESS_NONE);
+
+    if (close) {
+        // Close separately
+        sc_process_close(pid);
+    }
+
+    return ret;
+}
+
 ssize_t
 sc_pipe_read_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe, char *data,
                  size_t len) {
--- a/app/src/util/process_intr.h
+++ b/app/src/util/process_intr.h
@ -6,6 +6,10 @@
 #include "intr.h"
 #include "process.h"

+bool
+sc_process_check_success_intr(struct sc_intr *intr, sc_pid pid,
+                              const char *name, bool close);
+
 ssize_t
 sc_pipe_read_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe, char *data,
                  size_t len);
--- a/app/src/util/str.c
+++ b/app/src/util/str.c
@ -5,15 +5,13 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include "util/strbuf.h"

 #ifdef _WIN32
 # include <windows.h>
 # include <tchar.h>
 #endif

-#include "log.h"
-#include "strbuf.h"
-
 size_t
 sc_strncpy(char *dest, const char *src, size_t n) {
    size_t i;
@ -53,7 +51,6 @@ sc_str_quote(const char *src) {
    size_t len = strlen(src);
    char *quoted = malloc(len + 3);
    if (!quoted) {
-        LOG_OOM();
        return NULL;
    }
    memcpy(&quoted[1], src, len);
@ -191,7 +188,6 @@ sc_str_to_wchars(const char *utf8) {

    wchar_t *wide = malloc(len * sizeof(wchar_t));
    if (!wide) {
-        LOG_OOM();
        return NULL;
    }

@ -208,7 +204,6 @@ sc_str_from_wchars(const wchar_t *ws) {

    char *utf8 = malloc(len);
    if (!utf8) {
-        LOG_OOM();
        return NULL;
    }

@ -240,7 +235,7 @@ sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent) {

    APPEND_INDENT();

-    // The last separator encountered, it must be inserted only conditionally,
+    // The last separator encountered, it must be inserted only conditionnaly,
    // depending on the next token
    char pending = 0;

@ -304,40 +299,3 @@ sc_str_truncate(char *data, size_t len, const char *endchars) {
    data[idx] = '\0';
    return idx;
 }
-
-ssize_t
-sc_str_index_of_column(const char *s, unsigned col, const char *seps) {
-    size_t colidx = 0;
-
-    size_t idx = 0;
-    while (s[idx] != '\0' && colidx != col) {
-        size_t r = strcspn(&s[idx], seps);
-        idx += r;
-
-        if (s[idx] == '\0') {
-            // Not found
-            return -1;
-        }
-
-        size_t consecutive_seps = strspn(&s[idx], seps);
-        assert(consecutive_seps); // At least one
-        idx += consecutive_seps;
-
-        if (s[idx] != '\0') {
-            ++colidx;
-        }
-    }
-
-    return col == colidx ? (ssize_t) idx : -1;
-}
-
-size_t
-sc_str_remove_trailing_cr(char *s, size_t len) {
-    while (len) {
-        if (s[len - 1] != '\r') {
-            break;
-        }
-        s[--len] = '\0';
-    }
-    return len;
-}
--- a/app/src/util/str.h
+++ b/app/src/util/str.h
@ -114,35 +114,4 @@ sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent);
 size_t
 sc_str_truncate(char *data, size_t len, const char *endchars);

-/**
- * Find the start of a column in a string
- *
- * A string may represent several columns, separated by some "spaces"
- * (separators). This function aims to find the start of the column number
- * `col`.
- *
- * For example, to find the 4th column (column number 3):
- *
- *     //                               here
- *     //                               v
- *     const char *s = "abc def    ghi  jk";
- *     ssize_t index = sc_str_index_of_column(s, 3, " ");
- *     assert(index == 16); // points to "jk"
- *
- * Return -1 if no such column exists.
- */
-ssize_t
-sc_str_index_of_column(const char *s, unsigned col, const char *seps);
-
-/**
- * Remove all `\r` at the end of the line
- *
- * The line length is provided by `len` (this avoids a call to `strlen()` when
- * the caller already knows the length).
- *
- * Return the new length.
- */
-size_t
-sc_str_remove_trailing_cr(char *s, size_t len);
-
 #endif
--- a/app/src/util/strbuf.c
+++ b/app/src/util/strbuf.c
@ -1,17 +1,15 @@
 #include "strbuf.h"

 #include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include "log.h"
+#include <stdio.h>

 bool
 sc_strbuf_init(struct sc_strbuf *buf, size_t init_cap) {
    buf->s = malloc(init_cap + 1); // +1 for '\0'
    if (!buf->s) {
-        LOG_OOM();
        return false;
    }

@ -27,7 +25,6 @@ sc_strbuf_reserve(struct sc_strbuf *buf, size_t len) {
        char *s = realloc(buf->s, new_cap + 1); // +1 for '\0'
        if (!s) {
            // Leave the old buf->s
-            LOG_OOM();
            return false;
        }
        buf->s = s;
--- a/app/src/util/thread.c
+++ b/app/src/util/thread.c
@ -8,13 +8,8 @@
 bool
 sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
                 void *userdata) {
-    // The thread name length is limited on some systems. Never use a name
-    // longer than 16 bytes (including the final '\0')
-    assert(strlen(name) <= 15);
-
    SDL_Thread *sdl_thread = SDL_CreateThread(fn, name, userdata);
    if (!sdl_thread) {
-        LOG_OOM();
        return false;
    }

@ -31,7 +26,6 @@ bool
 sc_mutex_init(sc_mutex *mutex) {
    SDL_mutex *sdl_mutex = SDL_CreateMutex();
    if (!sdl_mutex) {
-        LOG_OOM();
        return false;
    }

@ -100,7 +94,6 @@ bool
 sc_cond_init(sc_cond *cond) {
    SDL_cond *sdl_cond = SDL_CreateCond();
    if (!sdl_cond) {
-        LOG_OOM();
        return false;
    }

--- a/app/src/util/tick.c
+++ b/app/src/util/tick.c
@ -1,55 +1,16 @@
 #include "tick.h"

-#include <assert.h>
-#include <time.h>
-#ifdef _WIN32
-# include <windows.h>
-#endif
+#include <SDL2/SDL_timer.h>

 sc_tick
 sc_tick_now(void) {
-#ifndef _WIN32
-    // Maximum sc_tick precision (microsecond)
-    struct timespec ts;
-    int ret = clock_gettime(CLOCK_MONOTONIC, &ts);
-    if (ret) {
-        abort();
-    }
-
-    return SC_TICK_FROM_SEC(ts.tv_sec) + SC_TICK_FROM_NS(ts.tv_nsec);
-#else
-    LARGE_INTEGER c;
-
-    // On systems that run Windows XP or later, the function will always
-    // succeed and will thus never return zero.
-    // <https://docs.microsoft.com/en-us/windows/win32/api/profileapi/nf-profileapi-queryperformancecounter>
-    // <https://docs.microsoft.com/en-us/windows/win32/api/profileapi/nf-profileapi-queryperformancefrequency>
-
-    BOOL ok = QueryPerformanceCounter(&c);
-    assert(ok);
-    (void) ok;
-
-    LONGLONG counter = c.QuadPart;
-
-    static LONGLONG frequency;
-    if (!frequency) {
-        // Initialize on first call
-        LARGE_INTEGER f;
-        ok = QueryPerformanceFrequency(&f);
-        assert(ok);
-        frequency = f.QuadPart;
-        assert(frequency);
-    }
-
-    if (frequency % SC_TICK_FREQ == 0) {
-        // Expected case (typically frequency = 10000000, i.e. 100ns precision)
-        sc_tick div = frequency / SC_TICK_FREQ;
-        return SC_TICK_FROM_US(counter / div);
-    }
-
-    // Split the division to avoid overflow
-    sc_tick secs = SC_TICK_FROM_SEC(counter / frequency);
-    sc_tick subsec = SC_TICK_FREQ * (counter % frequency) / frequency;
-    return secs + subsec;
-#endif
+    // SDL_GetTicks() resolution is in milliseconds, but sc_tick are expressed
+    // in microseconds to store PTS without precision loss.
+    //
+    // As an alternative, SDL_GetPerformanceCounter() and
+    // SDL_GetPerformanceFrequency() could be used, but:
+    //  - the conversions (avoiding overflow) are expansive, since the
+    //    frequency is not known at compile time;
+    //  - in practice, we don't need more precision for now.
+    return (sc_tick) SDL_GetTicks() * 1000;
 }
--- a/app/src/util/tick.h
+++ b/app/src/util/tick.h
@ -10,11 +10,9 @@ 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) ((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)
--- a/app/src/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@ -1,7 +1,5 @@
 #include "v4l2_sink.h"

-#include <string.h>
-
 #include "util/log.h"
 #include "util/str.h"

@ -33,7 +31,7 @@ write_header(struct sc_v4l2_sink *vs, const AVPacket *packet) {

    uint8_t *extradata = av_malloc(packet->size * sizeof(uint8_t));
    if (!extradata) {
-        LOG_OOM();
+        LOGC("Could not allocate extradata");
        return false;
    }

@ -163,21 +161,25 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {

    bool ok = sc_video_buffer_init(&vs->vb, vs->buffering_time, &cbs, vs);
    if (!ok) {
+        LOGE("Could not initialize video buffer");
        return false;
    }

    ok = sc_video_buffer_start(&vs->vb);
    if (!ok) {
+        LOGE("Could not start video buffer");
        goto error_video_buffer_destroy;
    }

    ok = sc_mutex_init(&vs->mutex);
    if (!ok) {
+        LOGC("Could not create mutex");
        goto error_video_buffer_stop_and_join;
    }

    ok = sc_cond_init(&vs->cond);
    if (!ok) {
+        LOGC("Could not create cond");
        goto error_mutex_destroy;
    }

@ -199,7 +201,7 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {

    vs->format_ctx = avformat_alloc_context();
    if (!vs->format_ctx) {
-        LOG_OOM();
+        LOGE("Could not allocate v4l2 output context");
        return false;
    }

@ -211,8 +213,9 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {
 #ifdef SCRCPY_LAVF_HAS_AVFORMATCONTEXT_URL
    vs->format_ctx->url = strdup(vs->device_name);
    if (!vs->format_ctx->url) {
-        LOG_OOM();
+        LOGE("Could not strdup v4l2 device name");
        goto error_avformat_free_context;
+        return false;
    }
 #else
    strncpy(vs->format_ctx->filename, vs->device_name,
@ -221,8 +224,9 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {

    AVStream *ostream = avformat_new_stream(vs->format_ctx, encoder);
    if (!ostream) {
-        LOG_OOM();
+        LOGE("Could not allocate new v4l2 stream");
        goto error_avformat_free_context;
+        return false;
    }

    ostream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
@ -240,7 +244,7 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {

    vs->encoder_ctx = avcodec_alloc_context3(encoder);
    if (!vs->encoder_ctx) {
-        LOG_OOM();
+        LOGC("Could not allocate codec context for v4l2");
        goto error_avio_close;
    }

@ -257,13 +261,13 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {

    vs->frame = av_frame_alloc();
    if (!vs->frame) {
-        LOG_OOM();
+        LOGE("Could not create v4l2 frame");
        goto error_avcodec_close;
    }

    vs->packet = av_packet_alloc();
    if (!vs->packet) {
-        LOG_OOM();
+        LOGE("Could not allocate packet");
        goto error_av_frame_free;
    }

@ -272,7 +276,7 @@ sc_v4l2_sink_open(struct sc_v4l2_sink *vs) {
    vs->stopped = false;

    LOGD("Starting v4l2 thread");
-    ok = sc_thread_create(&vs->thread, run_v4l2_sink, "scrcpy-v4l2", vs);
+    ok = sc_thread_create(&vs->thread, run_v4l2_sink, "v4l2", vs);
    if (!ok) {
        LOGC("Could not start v4l2 thread");
        goto error_av_packet_free;
--- a/app/src/v4l2_sink.h
+++ b/app/src/v4l2_sink.h
@ -3,14 +3,13 @@

 #include "common.h"

-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-
 #include "coords.h"
 #include "trait/frame_sink.h"
 #include "video_buffer.h"
 #include "util/tick.h"

+#include <libavformat/avformat.h>
+
 struct sc_v4l2_sink {
    struct sc_frame_sink frame_sink; // frame sink trait

--- a/app/src/video_buffer.c
+++ b/app/src/video_buffer.c
@ -14,13 +14,11 @@ static struct sc_video_buffer_frame *
 sc_video_buffer_frame_new(const AVFrame *frame) {
    struct sc_video_buffer_frame *vb_frame = malloc(sizeof(*vb_frame));
    if (!vb_frame) {
-        LOG_OOM();
        return NULL;
    }

    vb_frame->frame = av_frame_alloc();
    if (!vb_frame->frame) {
-        LOG_OOM();
        free(vb_frame);
        return NULL;
    }
@ -134,12 +132,14 @@ sc_video_buffer_init(struct sc_video_buffer *vb, sc_tick buffering_time,
    if (buffering_time) {
        ok = sc_mutex_init(&vb->b.mutex);
        if (!ok) {
+            LOGC("Could not create mutex");
            sc_frame_buffer_destroy(&vb->fb);
            return false;
        }

        ok = sc_cond_init(&vb->b.queue_cond);
        if (!ok) {
+            LOGC("Could not create cond");
            sc_mutex_destroy(&vb->b.mutex);
            sc_frame_buffer_destroy(&vb->fb);
            return false;
@ -147,6 +147,7 @@ sc_video_buffer_init(struct sc_video_buffer *vb, sc_tick buffering_time,

        ok = sc_cond_init(&vb->b.wait_cond);
        if (!ok) {
+            LOGC("Could not create wait cond");
            sc_cond_destroy(&vb->b.queue_cond);
            sc_mutex_destroy(&vb->b.mutex);
            sc_frame_buffer_destroy(&vb->fb);
@ -170,7 +171,7 @@ bool
 sc_video_buffer_start(struct sc_video_buffer *vb) {
    if (vb->buffering_time) {
        bool ok =
-            sc_thread_create(&vb->b.thread, run_buffering, "scrcpy-vbuf", vb);
+            sc_thread_create(&vb->b.thread, run_buffering, "buffering", vb);
        if (!ok) {
            LOGE("Could not start buffering thread");
            return false;
@ -233,7 +234,7 @@ sc_video_buffer_push(struct sc_video_buffer *vb, const AVFrame *frame) {
    struct sc_video_buffer_frame *vb_frame = sc_video_buffer_frame_new(frame);
    if (!vb_frame) {
        sc_mutex_unlock(&vb->b.mutex);
-        LOG_OOM();
+        LOGE("Could not allocate frame");
        return false;
    }

--- a/app/tests/test_adb_parser.c
+++ b/app/tests/test_adb_parser.c
@ -1,88 +0,0 @@
-#include "common.h"
-
-#include <assert.h>
-
-#include "adb_parser.h"
-
-static void test_get_ip_single_line() {
-    char ip_route[] = "192.168.1.0/24 dev wlan0  proto kernel  scope link  src "
-                      "192.168.12.34\r\r\n";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(ip);
-    assert(!strcmp(ip, "192.168.12.34"));
-    free(ip);
-}
-
-static void test_get_ip_single_line_without_eol() {
-    char ip_route[] = "192.168.1.0/24 dev wlan0  proto kernel  scope link  src "
-                      "192.168.12.34";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(ip);
-    assert(!strcmp(ip, "192.168.12.34"));
-    free(ip);
-}
-
-static void test_get_ip_single_line_with_trailing_space() {
-    char ip_route[] = "192.168.1.0/24 dev wlan0  proto kernel  scope link  src "
-                      "192.168.12.34 \n";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(ip);
-    assert(!strcmp(ip, "192.168.12.34"));
-    free(ip);
-}
-
-static void test_get_ip_multiline_first_ok() {
-    char ip_route[] = "192.168.1.0/24 dev wlan0  proto kernel  scope link  src "
-                      "192.168.1.2\r\n"
-                      "10.0.0.0/24 dev rmnet  proto kernel  scope link  src "
-                      "10.0.0.2\r\n";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(ip);
-    assert(!strcmp(ip, "192.168.1.2"));
-    free(ip);
-}
-
-static void test_get_ip_multiline_second_ok() {
-    char ip_route[] = "10.0.0.0/24 dev rmnet  proto kernel  scope link  src "
-                      "10.0.0.3\r\n"
-                      "192.168.1.0/24 dev wlan0  proto kernel  scope link  src "
-                      "192.168.1.3\r\n";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(ip);
-    assert(!strcmp(ip, "192.168.1.3"));
-    free(ip);
-}
-
-static void test_get_ip_no_wlan() {
-    char ip_route[] = "192.168.1.0/24 dev rmnet  proto kernel  scope link  src "
-                      "192.168.12.34\r\r\n";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(!ip);
-}
-
-static void test_get_ip_truncated() {
-    char ip_route[] = "192.168.1.0/24 dev rmnet  proto kernel  scope link  src "
-                      "\n";
-
-    char *ip = sc_adb_parse_device_ip_from_output(ip_route, sizeof(ip_route));
-    assert(!ip);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
-    test_get_ip_single_line();
-    test_get_ip_single_line_without_eol();
-    test_get_ip_single_line_with_trailing_space();
-    test_get_ip_multiline_first_ok();
-    test_get_ip_multiline_second_ok();
-    test_get_ip_no_wlan();
-    test_get_ip_truncated();
-}
--- a/app/tests/test_cli.c
+++ b/app/tests/test_cli.c
@ -89,7 +89,7 @@ static void test_options(void) {
    assert(!strcmp(opts->serial, "0123456789abcdef"));
    assert(opts->show_touches);
    assert(opts->turn_screen_off);
-    assert(opts->key_inject_mode == SC_KEY_INJECT_MODE_TEXT);
+    assert(opts->prefer_text);
    assert(!strcmp(opts->window_title, "my device"));
    assert(opts->window_x == 100);
    assert(opts->window_y == -1);
@ -129,26 +129,25 @@ static void test_parse_shortcut_mods(void) {
    ok = sc_parse_shortcut_mods("lctrl", &mods);
    assert(ok);
    assert(mods.count == 1);
-    assert(mods.data[0] == SC_SHORTCUT_MOD_LCTRL);
+    assert(mods.data[0] == SC_MOD_LCTRL);

    ok = sc_parse_shortcut_mods("lctrl+lalt", &mods);
    assert(ok);
    assert(mods.count == 1);
-    assert(mods.data[0] == (SC_SHORTCUT_MOD_LCTRL | SC_SHORTCUT_MOD_LALT));
+    assert(mods.data[0] == (SC_MOD_LCTRL | SC_MOD_LALT));

    ok = sc_parse_shortcut_mods("rctrl,lalt", &mods);
    assert(ok);
    assert(mods.count == 2);
-    assert(mods.data[0] == SC_SHORTCUT_MOD_RCTRL);
-    assert(mods.data[1] == SC_SHORTCUT_MOD_LALT);
+    assert(mods.data[0] == SC_MOD_RCTRL);
+    assert(mods.data[1] == SC_MOD_LALT);

    ok = sc_parse_shortcut_mods("lsuper,rsuper+lalt,lctrl+rctrl+ralt", &mods);
    assert(ok);
    assert(mods.count == 3);
-    assert(mods.data[0] == SC_SHORTCUT_MOD_LSUPER);
-    assert(mods.data[1] == (SC_SHORTCUT_MOD_RSUPER | SC_SHORTCUT_MOD_LALT));
-    assert(mods.data[2] == (SC_SHORTCUT_MOD_LCTRL | SC_SHORTCUT_MOD_RCTRL |
-                            SC_SHORTCUT_MOD_RALT));
+    assert(mods.data[0] == SC_MOD_LSUPER);
+    assert(mods.data[1] == (SC_MOD_RSUPER | SC_MOD_LALT));
+    assert(mods.data[2] == (SC_MOD_LCTRL | SC_MOD_RCTRL | SC_MOD_RALT));

    ok = sc_parse_shortcut_mods("", &mods);
    assert(!ok);
@ -170,4 +169,4 @@ int main(int argc, char *argv[]) {
    test_options2();
    test_parse_shortcut_mods();
    return 0;
-}
+};
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@ -6,7 +6,7 @@
 #include "control_msg.h"

 static void test_serialize_inject_keycode(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_INJECT_KEYCODE,
        .inject_keycode = {
            .action = AKEY_EVENT_ACTION_UP,
@ -17,7 +17,7 @@ static void test_serialize_inject_keycode(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 14);

    const unsigned char expected[] = {
@ -31,7 +31,7 @@ static void test_serialize_inject_keycode(void) {
 }

 static void test_serialize_inject_text(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_INJECT_TEXT,
        .inject_text = {
            .text = "hello, world!",
@ -39,7 +39,7 @@ static void test_serialize_inject_text(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 18);

    const unsigned char expected[] = {
@ -51,15 +51,15 @@ static void test_serialize_inject_text(void) {
 }

 static void test_serialize_inject_text_long(void) {
-    struct sc_control_msg msg;
+    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
    char text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH + 1];
-    memset(text, 'a', CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);
+    memset(text, 'a', sizeof(text));
    text[CONTROL_MSG_INJECT_TEXT_MAX_LENGTH] = '\0';
    msg.inject_text.text = text;

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH);

    unsigned char expected[5 + CONTROL_MSG_INJECT_TEXT_MAX_LENGTH];
@ -74,11 +74,11 @@ static void test_serialize_inject_text_long(void) {
 }

 static void test_serialize_inject_touch_event(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
        .inject_touch_event = {
            .action = AMOTION_EVENT_ACTION_DOWN,
-            .pointer_id = UINT64_C(0x1234567887654321),
+            .pointer_id = 0x1234567887654321L,
            .position = {
                .point = {
                    .x = 100,
@ -95,7 +95,7 @@ static void test_serialize_inject_touch_event(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 28);

    const unsigned char expected[] = {
@ -111,7 +111,7 @@ static void test_serialize_inject_touch_event(void) {
 }

 static void test_serialize_inject_scroll_event(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
        .inject_scroll_event = {
            .position = {
@ -126,13 +126,12 @@ static void test_serialize_inject_scroll_event(void) {
            },
            .hscroll = 1,
            .vscroll = -1,
-            .buttons = 1,
        },
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 25);
+    size_t size = control_msg_serialize(&msg, buf);
+    assert(size == 21);

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
@ -140,13 +139,12 @@ static void test_serialize_inject_scroll_event(void) {
        0x04, 0x38, 0x07, 0x80, // 1080 1920
        0x00, 0x00, 0x00, 0x01, // 1
        0xFF, 0xFF, 0xFF, 0xFF, // -1
-        0x00, 0x00, 0x00, 0x01, // 1
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

 static void test_serialize_back_or_screen_on(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
        .back_or_screen_on = {
            .action = AKEY_EVENT_ACTION_UP,
@ -154,7 +152,7 @@ static void test_serialize_back_or_screen_on(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 2);

    const unsigned char expected[] = {
@ -165,12 +163,12 @@ static void test_serialize_back_or_screen_on(void) {
 }

 static void test_serialize_expand_notification_panel(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL,
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@ -180,12 +178,12 @@ static void test_serialize_expand_notification_panel(void) {
 }

 static void test_serialize_expand_settings_panel(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL,
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@ -195,12 +193,12 @@ static void test_serialize_expand_settings_panel(void) {
 }

 static void test_serialize_collapse_panels(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_COLLAPSE_PANELS,
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@ -210,41 +208,35 @@ static void test_serialize_collapse_panels(void) {
 }

 static void test_serialize_get_clipboard(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_GET_CLIPBOARD,
-        .get_clipboard = {
-            .copy_key = GET_CLIPBOARD_COPY_KEY_COPY,
-        },
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 2);
+    size_t size = control_msg_serialize(&msg, buf);
+    assert(size == 1);

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_GET_CLIPBOARD,
-        GET_CLIPBOARD_COPY_KEY_COPY,
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

 static void test_serialize_set_clipboard(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_SET_CLIPBOARD,
        .set_clipboard = {
-            .sequence = UINT64_C(0x0102030405060708),
            .paste = true,
            .text = "hello, world!",
        },
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 27);
+    size_t size = control_msg_serialize(&msg, buf);
+    assert(size == 19);

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_SET_CLIPBOARD,
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
        1, // paste
        0x00, 0x00, 0x00, 0x0d, // text length
        'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // text
@ -252,42 +244,8 @@ static void test_serialize_set_clipboard(void) {
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

-static void test_serialize_set_clipboard_long(void) {
-    struct sc_control_msg msg = {
-        .type = CONTROL_MSG_TYPE_SET_CLIPBOARD,
-        .set_clipboard = {
-            .sequence = UINT64_C(0x0102030405060708),
-            .paste = true,
-            .text = NULL,
-        },
-    };
-
-    char text[CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH + 1];
-    memset(text, 'a', CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH);
-    text[CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH] = '\0';
-    msg.set_clipboard.text = text;
-
-    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == CONTROL_MSG_MAX_SIZE);
-
-    unsigned char expected[CONTROL_MSG_MAX_SIZE] = {
-        CONTROL_MSG_TYPE_SET_CLIPBOARD,
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
-        1, // paste
-        // text length
-        CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH >> 24,
-        (CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH >> 16) & 0xff,
-        (CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH >> 8) & 0xff,
-        CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH & 0xff,
-    };
-    memset(expected + 14, 'a', CONTROL_MSG_CLIPBOARD_TEXT_MAX_LENGTH);
-
-    assert(!memcmp(buf, expected, sizeof(expected)));
-}
-
 static void test_serialize_set_screen_power_mode(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
        .set_screen_power_mode = {
            .mode = SCREEN_POWER_MODE_NORMAL,
@ -295,7 +253,7 @@ static void test_serialize_set_screen_power_mode(void) {
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 2);

    const unsigned char expected[] = {
@ -306,12 +264,12 @@ static void test_serialize_set_screen_power_mode(void) {
 }

 static void test_serialize_rotate_device(void) {
-    struct sc_control_msg msg = {
+    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_ROTATE_DEVICE,
    };

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
-    size_t size = sc_control_msg_serialize(&msg, buf);
+    size_t size = control_msg_serialize(&msg, buf);
    assert(size == 1);

    const unsigned char expected[] = {
@ -335,7 +293,6 @@ int main(int argc, char *argv[]) {
    test_serialize_collapse_panels();
    test_serialize_get_clipboard();
    test_serialize_set_clipboard();
-    test_serialize_set_clipboard_long();
    test_serialize_set_screen_power_mode();
    test_serialize_rotate_device();
    return 0;
--- a/app/tests/test_device_msg_deserialize.c
+++ b/app/tests/test_device_msg_deserialize.c
@ -47,26 +47,11 @@ static void test_deserialize_clipboard_big(void) {
    device_msg_destroy(&msg);
 }

-static void test_deserialize_ack_set_clipboard(void) {
-    const unsigned char input[] = {
-        DEVICE_MSG_TYPE_ACK_CLIPBOARD,
-        0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // sequence
-    };
-
-    struct device_msg msg;
-    ssize_t r = device_msg_deserialize(input, sizeof(input), &msg);
-    assert(r == 9);
-
-    assert(msg.type == DEVICE_MSG_TYPE_ACK_CLIPBOARD);
-    assert(msg.ack_clipboard.sequence == UINT64_C(0x0102030405060708));
-}
-
 int main(int argc, char *argv[]) {
    (void) argc;
    (void) argv;

    test_deserialize_clipboard();
    test_deserialize_clipboard_big();
-    test_deserialize_ack_set_clipboard();
    return 0;
 }
--- a/app/tests/test_str.c
+++ b/app/tests/test_str.c
@ -3,7 +3,6 @@
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>

 #include "util/str.h"
@ -364,40 +363,6 @@ static void test_truncate(void) {
    assert(!strcmp("hello", s4));
 }

-static void test_index_of_column(void) {
-    assert(sc_str_index_of_column("a bc  d", 0, " ") == 0);
-    assert(sc_str_index_of_column("a bc  d", 1, " ") == 2);
-    assert(sc_str_index_of_column("a bc  d", 2, " ") == 6);
-    assert(sc_str_index_of_column("a bc  d", 3, " ") == -1);
-
-    assert(sc_str_index_of_column("a  ", 0, " ") == 0);
-    assert(sc_str_index_of_column("a  ", 1, " ") == -1);
-
-    assert(sc_str_index_of_column("", 0, " ") == 0);
-    assert(sc_str_index_of_column("", 1, " ") == -1);
-
-    assert(sc_str_index_of_column("a \t   \t bc  \t  d\t", 0, " \t") == 0);
-    assert(sc_str_index_of_column("a \t   \t bc  \t  d\t", 1, " \t") == 8);
-    assert(sc_str_index_of_column("a \t   \t bc  \t  d\t", 2, " \t") == 15);
-    assert(sc_str_index_of_column("a \t   \t bc  \t  d\t", 3, " \t") == -1);
-
-    assert(sc_str_index_of_column("  a bc  d", 1, " ") == 2);
-}
-
-static void test_remove_trailing_cr() {
-    char s[] = "abc\r";
-    sc_str_remove_trailing_cr(s, sizeof(s) - 1);
-    assert(!strcmp(s, "abc"));
-
-    char s2[] = "def\r\r\r\r";
-    sc_str_remove_trailing_cr(s2, sizeof(s2) - 1);
-    assert(!strcmp(s2, "def"));
-
-    char s3[] = "adb\rdef\r";
-    sc_str_remove_trailing_cr(s3, sizeof(s3) - 1);
-    assert(!strcmp(s3, "adb\rdef"));
-}
-
 int main(int argc, char *argv[]) {
    (void) argc;
    (void) argv;
@ -418,7 +383,5 @@ int main(int argc, char *argv[]) {
    test_strlist_contains();
    test_wrap_lines();
    test_truncate();
-    test_index_of_column();
-    test_remove_trailing_cr();
    return 0;
 }
--- a/app/tests/test_strbuf.c
+++ b/app/tests/test_strbuf.c
@ -2,7 +2,6 @@

 #include <assert.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>

 #include "util/strbuf.h"
--- a/build.gradle
+++ b/build.gradle
@ -7,7 +7,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.2'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/34
+++ b/34
@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script bump scrcpy version by editing all the necessary files.
-#
-# Usage:
-#
-#     ./bump_version 1.23.4
-#
-# Then check the diff manually to confirm that everything is ok.
-
-set -e
-
-if [[ $# != 1 ]]
-then
-    echo "Syntax: $0 <version>" >&2
-    exit 1
-fi
-
-VERSION="$1"
-
-a=( ${VERSION//./ } )
-MAJOR="${a[0]:-0}"
-MINOR="${a[1]:-0}"
-PATCH="${a[2]:-0}"
-
-# If VERSION is 1.23.4, then VERSION_CODE is 12304
-VERSION_CODE="$(( $MAJOR * 10000 + $MINOR * 100 + "$PATCH" ))"
-
-echo "$VERSION: major=$MAJOR minor=$MINOR patch=$PATCH [versionCode=$VERSION_CODE]"
-sed -i "s/^\(\s*version: \)'[^']*'/\1'$VERSION'/" meson.build
-sed -i "s/^\(\s*versionCode \).*/\1$VERSION_CODE/;s/^\(\s*versionName \).*/\1\"$VERSION\"/" server/build.gradle
-sed -i "s/^\(SCRCPY_VERSION_NAME=\).*/\1$VERSION/" server/build_without_gradle.sh
-sed -i "s/^\(\s*VALUE \"ProductVersion\", \)\"[^\"]*\"/\1\"$VERSION\"/" app/scrcpy-windows.rc
-echo done
--- a/cross_win32.txt
+++ b/cross_win32.txt
@ -7,7 +7,6 @@ cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
 pkgconfig = 'i686-w64-mingw32-pkg-config'
-windres = 'i686-w64-mingw32-windres'

 [host_machine]
 system = 'windows'
@ -18,4 +17,4 @@ endian = 'little'
 [properties]
 prebuilt_ffmpeg_shared = 'ffmpeg-4.3.1-win32-shared'
 prebuilt_ffmpeg_dev = 'ffmpeg-4.3.1-win32-dev'
-prebuilt_sdl2 = 'SDL2-2.0.18/i686-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.0.16/i686-w64-mingw32'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@ -7,7 +7,6 @@ cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
 pkgconfig = 'x86_64-w64-mingw32-pkg-config'
-windres = 'x86_64-w64-mingw32-windres'

 [host_machine]
 system = 'windows'
@ -18,4 +17,4 @@ endian = 'little'
 [properties]
 prebuilt_ffmpeg_shared = 'ffmpeg-4.3.1-win64-shared'
 prebuilt_ffmpeg_dev = 'ffmpeg-4.3.1-win64-dev'
-prebuilt_sdl2 = 'SDL2-2.0.18/x86_64-w64-mingw32'
+prebuilt_sdl2 = 'SDL2-2.0.16/x86_64-w64-mingw32'
--- a/data/icon.ico
+++ b/data/icon.ico
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Romain Vimont	d5d1b59b68	Log server pushed Now that "adb push" stdout is disabled, add a log to notify server pushed.	2021-11-20 00:02:30 +01:00
Romain Vimont	d921e2d7a3	Use inherit flags for adb commands Explicitly indicate, for each call, if stdout and stderr must be inherited.	2021-11-20 00:02:30 +01:00
Romain Vimont	4156771077	Expose inherit flag for process execution Let the caller decide if stdout and stderr must be inherited on process creation, i.e. if stdout and stderr of the child process should be printed in the scrcpy console. This allows to get output and errors for specific adb commands depending on the context.	2021-11-20 00:02:30 +01:00
Romain Vimont	c96dc6d2c4	Simplify Windows process inheritance configuration Merge if-blocks together.	2021-11-19 22:27:01 +01:00