Improve process API

Prefix symbols and constants names and improve documentation.
Factorize common impl of process_execute()
2021-11-11 18:08:47 +01:00 · 2021-11-11 18:08:41 +01:00 · 2021-11-11 18:08:41 +01:00 · 2021-11-11 18:08:35 +01:00 · 2021-11-11 16:27:12 +01:00
101 changed files with 1273 additions and 4192 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -270,10 +270,10 @@ install` must be run as root)._

 #### Option 2: Use prebuilt server

- - [`scrcpy-server-v1.20`][direct-scrcpy-server]  
-   _(SHA-256: b20aee4951f99b060c4a44000ba94de973f9604758ef62beb253b371aad3df34)_
+ - [`scrcpy-server-v1.19`][direct-scrcpy-server]  
+   _(SHA-256: 876f9322182e6aac6a58db1334f4225855ef3a17eaebc80aab6601d9d1ecb867)_

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

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/FAQ.it.md
+++ b/FAQ.it.md
@ -140,24 +140,6 @@ Potresti anche dover configurare il [comportamento di ridimensionamento][scaling
 [scaling behavior]: https://github.com/Genymobile/scrcpy/issues/40#issuecomment-424466723


-### Problema con Wayland
-
-Per impostazione predefinita, SDL utilizza x11 su Linux. Il [video driver] può essere cambiato attraversio la variabile d'ambiente `SDL_VIDEODRIVER`:
-
-[video driver]: https://wiki.libsdl.org/FAQUsingSDL#how_do_i_choose_a_specific_video_driver
-
-```bash
-export SDL_VIDEODRIVER=wayland
-scrcpy
-```
-
-Su alcune distribuzioni (almeno Fedora), il pacchetto `libdecor` deve essere installato manualmente.
-
-Vedi le issues [#2554] e [#2559].
-
-[#2554]: https://github.com/Genymobile/scrcpy/issues/2554
-[#2559]: https://github.com/Genymobile/scrcpy/issues/2559
-

 ### Crash del compositore KWin

--- a/FAQ.md
+++ b/FAQ.md
@ -222,27 +222,6 @@ scrcpy -m 800
 You could also try another [encoder](README.md#encoder).


-If you encounter this exception on Android 12, then just upgrade to scrcpy >=
-1.18 (see [#2129]):
-
-```
-> ERROR: Exception on thread Thread[main,5,main]
-java.lang.AssertionError: java.lang.reflect.InvocationTargetException
-    at com.genymobile.scrcpy.wrappers.SurfaceControl.setDisplaySurface(SurfaceControl.java:75)
-    ...
-Caused by: java.lang.reflect.InvocationTargetException
-    at java.lang.reflect.Method.invoke(Native Method)
-    at com.genymobile.scrcpy.wrappers.SurfaceControl.setDisplaySurface(SurfaceControl.java:73)
-    ... 7 more
-Caused by: java.lang.IllegalArgumentException: displayToken must not be null
-    at android.view.SurfaceControl$Transaction.setDisplaySurface(SurfaceControl.java:3067)
-    at android.view.SurfaceControl.setDisplaySurface(SurfaceControl.java:2147)
-    ... 9 more
-```
-
-[#2129]: https://github.com/Genymobile/scrcpy/issues/2129
-
-
 ## Command line on Windows

 Some Windows users are not familiar with the command line. Here is how to open a
@ -283,6 +262,6 @@ to add some arguments.

 This FAQ is available in other languages:

- - [Italiano (Italiano, `it`) - v1.19](FAQ.it.md)
+ - [Italiano (Italiano, `it`) - v1.17](FAQ.it.md)
 - [한국어 (Korean, `ko`) - v1.11](FAQ.ko.md)
 - [简体中文 (Simplified Chinese, `zh-Hans`) - v1.18](FAQ.zh-Hans.md)
--- a/README.it.md
+++ b/README.it.md
@ -1,6 +1,6 @@
 _Apri il [README](README.md) originale e sempre aggiornato._

-# scrcpy (v1.19)
+# scrcpy (v1.17)

 Questa applicazione fornisce la visualizzazione e il controllo dei dispositivi Android collegati via USB (o [via TCP/IP][article-tcpip]). Non richiede alcun accesso _root_.
 Funziona su _GNU/Linux_, _Windows_ e _macOS_.
@ -205,11 +205,10 @@ Se anche `--max-size` è specificata, il ridimensionamento è applicato dopo il
 Per bloccare l'orientamento della trasmissione:

 ```bash
-scrcpy --lock-video-orientation     # orientamento iniziale (corrente)
-scrcpy --lock-video-orientation=0   # orientamento naturale
-scrcpy --lock-video-orientation=1   # 90° antiorario
-scrcpy --lock-video-orientation=2   # 180°
-scrcpy --lock-video-orientation=3   # 90° orario
+scrcpy --lock-video-orientation 0   # orientamento naturale
+scrcpy --lock-video-orientation 1   # 90° antiorario
+scrcpy --lock-video-orientation 2   # 180°
+scrcpy --lock-video-orientation 3   # 90° orario
 ```

 Questo influisce sull'orientamento della registrazione.
@ -232,9 +231,7 @@ Per elencare i codificatori disponibili puoi immettere un nome di codificatore n
 scrcpy --encoder _
 ```

-### Cattura
-
-#### Registrazione
+### Registrazione

 È possibile registrare lo schermo durante la trasmissione:

@ -256,75 +253,6 @@ I "fotogrammi saltati" sono registrati nonostante non siano mostrati in tempo re
 [packet delay variation]: https://en.wikipedia.org/wiki/Packet_delay_variation


-#### v4l2loopback
-
-Su Linux è possibile inviare il flusso video ad un dispositivo v4l2 loopback, cosicchè un dispositivo Android possa essere aperto come una webcam da qualsiasi strumento compatibile con v4l2.
-
-Il modulo `v4l2loopback` deve essere installato:
-
-```bash
-sudo apt install v4l2loopback-dkms
-```
-
-Per creare un dispositvo v4l2:
-
-```bash
-sudo modprobe v4l2loopback
-```
-
-Questo creerà un nuovo dispositivo video in `/dev/videoN` dove `N` è un intero (più [opzioni](https://github.com/umlaeute/v4l2loopback#options) sono disponibili per crere più dispositivi o dispositivi con ID specifici).
-
-Per elencare i dispositvi attivati:
-
-```bash
-# necessita del pacchetto v4l-utils
-v4l2-ctl --list-devices
-
-# semplice ma potrebbe essere sufficiente
-ls /dev/video*
-```
-
-Per avviare scrcpy utilizzando un v4l2 sink:
-
-```bash
-scrcpy --v4l2-sink=/dev/videoN
-scrcpy --v4l2-sink=/dev/videoN --no-display  # disabilita la finestra di trasmissione
-scrcpy --v4l2-sink=/dev/videoN -N            # versione corta
-```
-
-(sostituisci `N` con l'ID del dispositivo, controlla con `ls /dev/video*`)
-
-Una volta abilitato, puoi aprire il tuo flusso video con uno strumento compatibile con v4l2:
-
-```bash
-ffplay -i /dev/videoN
-vlc v4l2:///dev/videoN   # VLC potrebbe aggiungere del ritardo per il buffer
-```
-
-Per esempio potresti catturare il video in [OBS].
-
-[OBS]: https://obsproject.com/
-
-
-#### Buffering
-
-È possibile aggiungere del buffer. Questo aumenta la latenza ma riduce il jitter (vedi [#2464]).
-
-[#2464]: https://github.com/Genymobile/scrcpy/issues/2464
-
-L'opzione è disponibile per il buffer della visualizzazione:
-
-```bash
-scrcpy --display-buffer=50  # aggiungi 50 ms di buffer per la visualizzazione
-```
-
-e per il V4L2 sink:
-
-```bash
-scrcpy --v4l2-buffer=500    #  aggiungi 50 ms di buffer per il v4l2 sink
-```
-
-
 ### Connessione

 #### Wireless
@ -551,6 +479,15 @@ scrcpy --turn-screen-off --stay-awake
 scrcpy -Sw
 ```

+#### Renderizzare i fotogrammi scaduti
+
+Per minimizzare la latenza _scrcpy_ renderizza sempre l'ultimo fotogramma decodificato disponibile in maniera predefinita e tralascia quelli precedenti.
+
+Per forzare la renderizzazione di tutti i fotogrammi (a costo di una possibile latenza superiore), utilizzare:
+
+```bash
+scrcpy --render-expired-frames
+```

 #### Mostrare i tocchi

@ -670,14 +607,14 @@ Non c'è alcuna risposta visiva, un log è stampato nella console.

 #### Trasferimento di file verso il dispositivo

-Per trasferire un file in `/sdcard/Download` del dispositivo trascina e rilascia un file (non APK) nella finestra di _scrcpy_.
+Per trasferire un file in `/sdcard/` del dispositivo trascina e rilascia un file (non APK) nella finestra di _scrcpy_.

 Non c'è alcuna risposta visiva, un log è stampato nella console.

 La cartella di destinazione può essere cambiata all'avvio:

 ```bash
-scrcpy --push-target=/sdcard/Movies/
+scrcpy --push-target=/sdcard/Download/
 ```


@ -716,10 +653,10 @@ _<kbd>[Super]</kbd> è il pulsante <kbd>Windows</kbd> o <kbd>Cmd</kbd>._
 | Rotazione schermo a sinistra                         | <kbd>MOD</kbd>+<kbd>←</kbd> _(sinistra)_
 | Rotazione schermo a destra                        | <kbd>MOD</kbd>+<kbd>→</kbd> _(destra)_
 | Ridimensiona finestra a 1:1 (pixel-perfect)        | <kbd>MOD</kbd>+<kbd>g</kbd>
- | Ridimensiona la finestra per rimuovere i bordi neri       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Doppio click sinistro¹_
+ | Ridimensiona la finestra per rimuovere i bordi neri       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Doppio click¹_
 | Premi il tasto `HOME`                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Click centrale_
 | Premi il tasto `BACK`                             | <kbd>MOD</kbd>+<kbd>b</kbd> \| _Click destro²_
- | Premi il tasto `APP_SWITCH`                       | <kbd>MOD</kbd>+<kbd>s</kbd> \| _4° click³_
+ | Premi il tasto `APP_SWITCH`                       | <kbd>MOD</kbd>+<kbd>s</kbd>
 | Premi il tasto `MENU` (sblocca lo schermo)             | <kbd>MOD</kbd>+<kbd>m</kbd>
 | Premi il tasto `VOLUME_UP`                        | <kbd>MOD</kbd>+<kbd>↑</kbd> _(su)_
 | Premi il tasto `VOLUME_DOWN`                      | <kbd>MOD</kbd>+<kbd>↓</kbd> _(giù)_
@ -728,26 +665,18 @@ _<kbd>[Super]</kbd> è il pulsante <kbd>Windows</kbd> o <kbd>Cmd</kbd>._
 | Spegni lo schermo del dispositivo (continua a trasmettere)     | <kbd>MOD</kbd>+<kbd>o</kbd>
 | Accendi lo schermo del dispositivo                       | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>
 | Ruota lo schermo del dispositivo                        | <kbd>MOD</kbd>+<kbd>r</kbd>
- | Espandi il pannello delle notifiche                   | <kbd>MOD</kbd>+<kbd>n</kbd> \| _5° click³_
- | Espandi il pannello delle impostazioni                   | <kbd>MOD</kbd>+<kbd>n</kbd>+<kbd>n</kbd> \| _Doppio 5° click³_
- | Chiudi pannelli                 | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
- | Copia negli appunti⁴                          | <kbd>MOD</kbd>+<kbd>c</kbd>
- | Taglia negli appunti⁴                           | <kbd>MOD</kbd>+<kbd>x</kbd>
- | Sincronizza gli appunti e incolla⁴           | <kbd>MOD</kbd>+<kbd>v</kbd>
+ | Espandi il pannello delle notifiche                   | <kbd>MOD</kbd>+<kbd>n</kbd>
+ | Chiudi il pannello delle notifiche                 | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
+ | Copia negli appunti³                          | <kbd>MOD</kbd>+<kbd>c</kbd>
+ | Taglia negli appunti³                           | <kbd>MOD</kbd>+<kbd>x</kbd>
+ | Sincronizza gli appunti e incolla³           | <kbd>MOD</kbd>+<kbd>v</kbd>
 | Inietta il testo degli appunti del computer              | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
 | Abilita/Disabilita il contatore FPS (su stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
 | Pizzica per zoomare                               | <kbd>Ctrl</kbd>+_click e trascina_

 _¹Doppio click sui bordi neri per rimuoverli._  
 _²Il tasto destro accende lo schermo se era spento, preme BACK in caso contrario._  
-_³4° e 5° pulsante del mouse, se il tuo mouse ne dispone._  
-_⁴Solo in Android >= 7._
-
-Le scorciatoie con pulsanti ripetuti sono eseguite rilasciando e premendo il pulsante una seconda volta. Per esempio, per eseguire "Espandi il pannello delle impostazioni":
-
-1. Premi e tieni premuto <kbd>MOD</kbd>.
-2. Poi premi due volte <kbd>n</kbd>.
-3. Infine rilascia <kbd>MOD</kbd>.
+_³Solo in Android >= 7._

 Tutte le scorciatoie <kbd>Ctrl</kbd>+_tasto_ sono inoltrate al dispositivo, così sono gestite dall'applicazione attiva.

--- a/README.jp.md
+++ b/README.jp.md
@ -1,6 +1,6 @@
 _Only the original [README](README.md) is guaranteed to be up-to-date._

-# scrcpy (v1.19)
+# scrcpy (v1.17)

 このアプリケーションはUSB(もしくは[TCP/IP経由][article-tcpip])で接続されたAndroidデバイスの表示と制御を提供します。このアプリケーションは _root_ でのアクセスを必要としません。このアプリケーションは _GNU/Linux_ 、 _Windows_ そして _macOS_ 上で動作します。

@ -103,22 +103,19 @@ scoop install adb    # まだ入手していない場合
 brew install scrcpy
 ```

-`PATH`からアクセス可能な`adb`が必要です。もし持っていない場合はインストールしてください。
+`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
 ```

-`adb`は[MacPorts]からでもインストールできます。
-
-```bash
-sudo port install scrcpy
-```
-
-[MacPorts]: https://www.macports.org/
-
 また、[アプリケーションをビルド][BUILD]することも可能です。

+
 ## 実行

 Androidデバイスを接続し、実行:
@ -187,11 +184,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°時計回り
 ```

 この設定は録画の向きに影響します。
@ -214,9 +210,7 @@ scrcpy --encoder OMX.qcom.video.encoder.avc
 scrcpy --encoder _
 ```

-### キャプチャ
-
-#### 録画
+### 録画

 ミラーリング中に画面の録画をすることが可能です:

@ -239,77 +233,6 @@ scrcpy -Nr file.mkv

 [パケット遅延のバリエーション]: https://en.wikipedia.org/wiki/Packet_delay_variation

-#### v4l2loopback
-
-Linuxでは、ビデオストリームをv4l2ループバックデバイスに送信することができます。
-v4l2loopbackのデバイスにビデオストリームを送信することで、Androidデバイスをウェブカメラのようにv4l2対応ツールで開くこともできます。
-
-`v4l2loopback` モジュールのインストールが必要です。
-
-```bash
-sudo apt install v4l2loopback-dkms
-```
-
-v4l2デバイスを作成する。
-
-```bash
-sudo modprobe v4l2loopback
-```
-
-これにより、新しいビデオデバイスが `/dev/videoN` に作成されます。（`N` は整数）
-(複数のデバイスや特定のIDのデバイスを作成するために、より多くの[オプション](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/
-
-
-#### Buffering
-
-バッファリングを追加することも可能です。これによりレイテンシーは増加しますが、ジッターは減少します。（参照
-[#2464])
-
-[#2464]: https://github.com/Genymobile/scrcpy/issues/2464
-
-このオプションでディスプレイバッファリングを設定できます。
-
-```bash
-scrcpy --display-buffer=50  # ディスプレイに50msのバッファリングを追加する
-```
-
-V4L2の場合はこちらのオプションで設定できます。
-
-```bash
-scrcpy --v4l2-buffer=500    # add 500 ms buffering for v4l2 sink
-```

 ### 接続

@ -534,6 +457,16 @@ scrcpy -Sw
 ```


+#### 期限切れフレームをレンダリングする
+
+初期状態では、待ち時間を最小限にするために、_scrcpy_ は最後にデコードされたフレームをレンダリングし、前のフレームを削除します。
+
+全フレームのレンダリングを強制するには(待ち時間が長くなる可能性があります):
+
+```bash
+scrcpy --render-expired-frames
+```
+
 #### タッチを表示

 プレゼンテーションの場合(物理デバイス上で)物理的なタッチを表示すると便利な場合があります。
@ -653,14 +586,14 @@ APKをインストールするには、(`.apk`で終わる)APKファイルを _s

 #### デバイスにファイルを送る

-デバイスの`/sdcard/Download`ディレクトリにファイルを送るには、(APKではない)ファイルを _scrcpy_ の画面にドラッグ&ドロップします。
+デバイスの`/sdcard/`ディレクトリにファイルを送るには、(APKではない)ファイルを _scrcpy_ の画面にドラッグ&ドロップします。

 見た目のフィードバックはありません。コンソールにログが出力されます。

 転送先ディレクトリを起動時に変更することができます:

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


@ -701,7 +634,7 @@ _<kbd>[Super]</kbd>は通常<kbd>Windows</kbd>もしくは<kbd>Cmd</kbd>キー
 | ウィンドウサイズを変更して黒い境界線を削除      | <kbd>MOD</kbd>+<kbd>w</kbd> \| _ダブルクリック¹_
 | `HOME`をクリック                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _真ん中クリック_
 | `BACK`をクリック                             | <kbd>MOD</kbd>+<kbd>b</kbd> \| _右クリック²_
- | `APP_SWITCH`をクリック                       | <kbd>MOD</kbd>+<kbd>s</kbd> \| _4クリック³_
+ | `APP_SWITCH`をクリック                       | <kbd>MOD</kbd>+<kbd>s</kbd>
 | `MENU` (画面のアンロック)をクリック            | <kbd>MOD</kbd>+<kbd>m</kbd>
 | `VOLUME_UP`をクリック                        | <kbd>MOD</kbd>+<kbd>↑</kbd> _(上)_
 | `VOLUME_DOWN`をクリック                      | <kbd>MOD</kbd>+<kbd>↓</kbd> _(下)_
@ -710,8 +643,7 @@ _<kbd>[Super]</kbd>は通常<kbd>Windows</kbd>もしくは<kbd>Cmd</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>n</kbd>
 | 通知パネルを折りたたむ                        | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
 | クリップボードへのコピー³                     | <kbd>MOD</kbd>+<kbd>c</kbd>
 | クリップボードへのカット³                     | <kbd>MOD</kbd>+<kbd>x</kbd>
@ -722,17 +654,11 @@ _<kbd>[Super]</kbd>は通常<kbd>Windows</kbd>もしくは<kbd>Cmd</kbd>キー

 _¹黒い境界線を削除するため、境界線上でダブルクリック_  
 _²もしスクリーンがオフの場合、右クリックでスクリーンをオンする。それ以外の場合はBackを押します._  
-_³4と5はマウスのボタンです、もしあなたのマウスにボタンがあれば使えます._  
-_⁴Android 7以上のみ._
-
-キーを繰り返すショートカットはキーを離して2回目を押したら実行されます。例えば「設定パネルを展開する」を実行する場合は以下のように操作する。
-
- 1. <kbd>MOD</kbd> キーを押し、押したままにする.
- 2. その後に <kbd>n</kbd>キーを2回押す.
- 3. 最後に <kbd>MOD</kbd>キーを離す.
+_³Android 7以上のみ._

 全ての<kbd>Ctrl</kbd>+_キー_ ショートカットはデバイスに転送されます、そのためアクティブなアプリケーションによって処理されます。

+
 ## カスタムパス

 特定の _adb_ バイナリを使用する場合、そのパスを環境変数`ADB`で構成します:
--- a/README.md
+++ b/README.md
@ -1,37 +1,26 @@
-# scrcpy (v1.20)
+# scrcpy (v1.19)

-<img src="data/icon.svg" width="128" height="128" alt="scrcpy" align="right" />
+![icon](data/icon.png)

 [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.
+This application provides display and control of Android devices connected on
+USB (or [over TCP/IP][article-tcpip]). It does not require any _root_ access.
 It works on _GNU/Linux_, _Windows_ and _macOS_.

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

 It focuses on:

- - **lightness**: native, displays only the device screen
- - **performance**: 30~120fps, depending on the device
- - **quality**: 1920×1080 or above
- - **low latency**: [35~70ms][lowlatency]
- - **low startup time**: ~1 second to display the first image
- - **non-intrusiveness**: nothing is left installed on the device
- - **user benefits**: no account, no ads, no internet required
- - **freedom**: free and open source software
+ - **lightness** (native, displays only the device screen)
+ - **performance** (30~60fps)
+ - **quality** (1920×1080 or above)
+ - **low latency** ([35~70ms][lowlatency])
+ - **low startup time** (~1 second to display the first image)
+ - **non-intrusiveness** (nothing is left installed on the device)

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

-Its features include:
- - [recording](#recording)
- - mirroring with [device screen off](#turn-screen-off)
- - [copy-paste](#copy-paste) in both directions
- - [configurable quality](#capture-configuration)
- - device screen [as a webcam (V4L2)](#v4l2loopback) (Linux-only)
- - [physical keyboard simulation (HID)](#physical-keyboard-simulation-hid)
-   (Linux-only)
- - and more…

 ## Requirements

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

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

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

 It is also available in [Chocolatey]:

@ -337,9 +326,7 @@ For example, you could capture the video within [OBS].
 #### Buffering

 It is possible to add buffering. This increases latency but reduces jitter (see
-[#2464]).
-
-[#2464]: https://github.com/Genymobile/scrcpy/issues/2464
+#2464).

 The option is available for display buffering:

@ -356,38 +343,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.
-
-##### 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 the device TCP/IP mode is disabled (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
@ -440,66 +399,21 @@ 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:
+protocol):

 ```bash
-adb kill-server
-adb -a nodaemon server start
+adb kill-server    # kill the local adb server on 5037
+ssh -CN -L5037:localhost:5037 -R27183:localhost:27183 your_remote_computer
 # 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:
+From another terminal:

 ```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
-adb start-server
-```
-
-Then, establish a SSH tunnel:
-
-```bash
-# local  5038 --> remote  5037
-# local 27183 <-- remote 27183
-ssh -CN -L5038:localhost:5037 -R27183:localhost:27183 your_remote_computer
-# keep this open
-```
-
-From another terminal, run scrcpy:
-
-```bash
-export ADB_SERVER_SOCKET=tcp:localhost:5038
 scrcpy
 ```

@ -507,16 +421,14 @@ To avoid enabling remote port forwarding, you could force a forward connection
 instead (notice the `-L` instead of `-R`):

 ```bash
-# local  5038 --> remote  5037
-# local 27183 --> remote 27183
-ssh -CN -L5038:localhost:5037 -L27183:localhost:27183 your_remote_computer
+adb kill-server    # kill the local adb server on 5037
+ssh -CN -L5037:localhost:5037 -L27183:localhost:27183 your_remote_computer
 # keep this open
 ```

-From another terminal, run scrcpy:
+From another terminal:

 ```bash
-export ADB_SERVER_SOCKET=tcp:localhost:5038
 scrcpy --force-adb-forward
 ```

@ -758,9 +670,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_.
@ -777,7 +686,7 @@ a location inverted through the center of the screen.
 By default, scrcpy uses Android key or text injection: it works everywhere, but
 is limited to ASCII.

-On Linux, scrcpy can simulate a physical USB keyboard on Android to provide a
+On Linux, scrcpy can simulate a USB physical keyboard on Android to provide a
 better input experience (using [USB HID over AOAv2][hid-aoav2]): the virtual
 keyboard is disabled and it works for all characters and IME.

@ -1028,10 +937,10 @@ Read the [developers page].
 This README is available in other languages:

 - [Indonesian (Indonesia, `id`) - v1.16](README.id.md)
- [Italiano (Italiano, `it`) - v1.19](README.it.md)
- [日本語 (Japanese, `jp`) - v1.19](README.jp.md)
+- [Italiano (Italiano, `it`) - v1.17](README.it.md)
+- [日本語 (Japanese, `jp`) - v1.17](README.jp.md)
 - [한국어 (Korean, `ko`) - v1.11](README.ko.md)
- [Português Brasileiro (Brazilian Portuguese, `pt-BR`) - v1.19](README.pt-br.md)
+- [português brasileiro (Brazilian Portuguese, `pt-BR`) - v1.17](README.pt-br.md)
 - [Español (Spanish, `sp`) - v1.17](README.sp.md)
 - [简体中文 (Simplified Chinese, `zh-Hans`) - v1.17](README.zh-Hans.md)
 - [繁體中文 (Traditional Chinese, `zh-Hant`) - v1.15](README.zh-Hant.md)
--- a/README.pt-br.md
+++ b/README.pt-br.md
@ -1,6 +1,6 @@
 _Apenas o [README](README.md) original é garantido estar atualizado._

-# scrcpy (v1.19)
+# scrcpy (v1.17)

 Esta aplicação fornece exibição e controle de dispositivos Android conectados via
 USB (ou [via TCP/IP][article-tcpip]). Não requer nenhum acesso _root_.
@ -38,18 +38,6 @@ controlá-lo usando teclado e mouse.

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

-### Sumário
-
- - Linux: `apt install scrcpy`
- - Windows: [baixar][direct-win64]
- - macOS: `brew install scrcpy`
-
-  Compilar pelos arquivos fontes: [BUILD] ([processo simplificado][BUILD_simple])
-
-[BUILD]: BUILD.md
-[BUILD_simple]: BUILD.md#simple
-
-
 ### Linux

 No Debian (_testing_ e _sid_ por enquanto) e Ubuntu (20.04):
@ -79,7 +67,9 @@ Para Gentoo, uma [Ebuild] está disponível: [`scrcpy/`][ebuild-link].
 [Ebuild]: https://wiki.gentoo.org/wiki/Ebuild
 [ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy

-Você também pode [compilar o app manualmente][BUILD] ([processo simplificado][BUILD_simple]).
+Você também pode [compilar o app manualmente][BUILD] (não se preocupe, não é tão
+difícil).
+


 ### Windows
@ -123,18 +113,13 @@ brew install scrcpy
 Você precisa do `adb`, acessível pelo seu `PATH`. Se você ainda não o tem:

 ```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
 ```

-Está também disponivel em [MacPorts], que prepara o adb para você:
-
-```bash
-sudo port install scrcpy
-```
-
-[MacPorts]: https://www.macports.org/
-
-
 Você também pode [compilar o app manualmente][BUILD].


@ -210,11 +195,10 @@ Se `--max-size` também for especificado, o redimensionamento é aplicado após
 Para travar a orientação do espelhamento:

 ```bash
-scrcpy --lock-video-orientation     # orientação inicial (Atual)
-scrcpy --lock-video-orientation=0   # orientação natural
-scrcpy --lock-video-orientation=1   # 90° sentido anti-horário
-scrcpy --lock-video-orientation=2   # 180°
-scrcpy --lock-video-orientation=3   # 90° sentido horário
+scrcpy --lock-video-orientation 0   # orientação natural
+scrcpy --lock-video-orientation 1   # 90° sentido anti-horário
+scrcpy --lock-video-orientation 2   # 180°
+scrcpy --lock-video-orientation 3   # 90° sentido horário
 ```

 Isso afeta a orientação de gravação.
@ -238,9 +222,7 @@ erro dará os encoders disponíveis:
 scrcpy --encoder _
 ```

-### Captura
-
-#### Gravando
+### Gravando

 É possível gravar a tela enquanto ocorre o espelhamento:

@ -264,79 +246,6 @@ pacotes][packet delay variation] não impacta o arquivo gravado.
 [packet delay variation]: https://en.wikipedia.org/wiki/Packet_delay_variation


-#### v4l2loopback
-
-Em Linux, é possível enviar a transmissão do video para um disposiivo v4l2 loopback, assim
-o dispositivo Android pode ser aberto como uma webcam por qualquer ferramneta capaz de v4l2
-
-The module `v4l2loopback` must be installed:
-
-```bash
-sudo apt install v4l2loopback-dkms
-```
-
-Para criar um dispositivo v4l2:
-
-```bash
-sudo modprobe v4l2loopback
-```
-
-Isso criara um novo dispositivo de vídeo em `/dev/videoN`, onde `N` é uma integer
-(mais [opções](https://github.com/umlaeute/v4l2loopback#options) estão disponiveis
-para criar varios dispositivos ou dispositivos com IDs específicas).
-
-Para listar os dispositivos disponíveis:
-
-```bash
-# requer o pacote v4l-utils
-v4l2-ctl --list-devices
-
-# simples, mas pode ser suficiente
-ls /dev/video*
-```
-
-Para iniciar o scrcpy usando o coletor v4l2 (sink):
-
-```bash
-scrcpy --v4l2-sink=/dev/videoN
-scrcpy --v4l2-sink=/dev/videoN --no-display  # desativa a janela espelhada
-scrcpy --v4l2-sink=/dev/videoN -N            # versão curta
-```
-
-(troque `N` pelo ID do dipositivo, verifique com `ls /dev/video*`)
-
-Uma vez ativado, você pode abrir suas trasmissões de videos com uma ferramenta capaz de v4l2:
-
-```bash
-ffplay -i /dev/videoN
-vlc v4l2:///dev/videoN   # VLC pode adicionar um pouco de atraso de buffering
-```
-
-Por exemplo, você pode capturar o video dentro do [OBS].
-
-[OBS]: https://obsproject.com/
-
-
-#### Buffering
-
-É possivel adicionar buffering. Isso aumenta a latência, mas reduz a tenção (jitter) (veja
-[#2464]).
-
-[#2464]: https://github.com/Genymobile/scrcpy/issues/2464
-
-A opção éta disponivel para buffering de exibição:
-
-```bash
-scrcpy --display-buffer=50  # adiciona 50 ms de buffering para a exibição
-```
-
-e coletor V4L2:
-
-```bash
-scrcpy --v4l2-buffer=500    # adiciona 500 ms de buffering para coletor V4L2
-```
-
-,
 ### Conexão

 #### Sem fio
@ -579,6 +488,18 @@ scrcpy -Sw
 ```


+#### Renderizar frames expirados
+
+Por padrão, para minimizar a latência, _scrcpy_ sempre renderiza o último frame decodificado
+disponível, e descarta o anterior.
+
+Para forçar a renderização de todos os frames (com o custo de um possível aumento de
+latência), use:
+
+```bash
+scrcpy --render-expired-frames
+```
+
 #### Mostrar toques

 Para apresentações, pode ser útil mostrar toques físicos (no dispositivo
@ -726,7 +647,7 @@ Não existe feedback visual, um log é imprimido no console.

 #### Enviar arquivo para dispositivo

-Para enviar um arquivo para `/sdcard/Download/` no dispositivo, arraste e solte um arquivo (não-APK) para a
+Para enviar um arquivo para `/sdcard/` no dispositivo, arraste e solte um arquivo (não-APK) para a
 janela do _scrcpy_.

 Não existe feedback visual, um log é imprimido no console.
@ -773,12 +694,12 @@ _<kbd>[Super]</kbd> é tipicamente a tecla <kbd>Windows</kbd> ou <kbd>Cmd</kbd>.
 | Mudar modo de tela cheia                    | <kbd>MOD</kbd>+<kbd>f</kbd>
 | Rotacionar display para esquerda            | <kbd>MOD</kbd>+<kbd>←</kbd> _(esquerda)_
 | Rotacionar display para direita             | <kbd>MOD</kbd>+<kbd>→</kbd> _(direita)_
- | Redimensionar janela para 1:1 (pixel-perfeito) | <kbd>MOD</kbd>+<kbd>g</kbd>
- | Redimensionar janela para remover bordas pretas | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Clique-duplo-esquerdo¹_
+ | Redimensionar janela para 1:1 (pixel-perfect) | <kbd>MOD</kbd>+<kbd>g</kbd>
+ | Redimensionar janela para remover bordas pretas | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Clique-duplo¹_
 | Clicar em `HOME`                            | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Clique-do-meio_
 | Clicar em `BACK`                            | <kbd>MOD</kbd>+<kbd>b</kbd> \| _Clique-direito²_
- | Clicar em `APP_SWITCH`                      | <kbd>MOD</kbd>+<kbd>s</kbd> \| _Clique-do-4.°³_
- | Clicar em `MENU` (desbloquear tela)         | <kbd>MOD</kbd>+<kbd>m</kbd>
+ | Clicar em `APP_SWITCH`                      | <kbd>MOD</kbd>+<kbd>s</kbd>
+ | Clicar em `MENU` (desbloquear tela          | <kbd>MOD</kbd>+<kbd>m</kbd>
 | Clicar em `VOLUME_UP`                       | <kbd>MOD</kbd>+<kbd>↑</kbd> _(cima)_
 | Clicar em `VOLUME_DOWN`                     | <kbd>MOD</kbd>+<kbd>↓</kbd> _(baixo)_
 | Clicar em `POWER`                           | <kbd>MOD</kbd>+<kbd>p</kbd>
@ -786,27 +707,18 @@ _<kbd>[Super]</kbd> é tipicamente a tecla <kbd>Windows</kbd> ou <kbd>Cmd</kbd>.
 | Desligar tela do dispositivo (continuar espelhando) | <kbd>MOD</kbd>+<kbd>o</kbd>
 | Ligar tela do dispositivo                   | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>
 | Rotacionar tela do dispositivo              | <kbd>MOD</kbd>+<kbd>r</kbd>
- | Expandir painel de notificação              | <kbd>MOD</kbd>+<kbd>n</kbd> \| _Clique-do-5.°³_
- | Expandir painel de configurção              | <kbd>MOD</kbd>+<kbd>n</kbd>+<kbd>n</kbd> \| _Clique-duplo-do-5.°³_
- | Colapsar paineis                            | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
- | Copiar para área de transferência⁴          | <kbd>MOD</kbd>+<kbd>c</kbd>
- | Recortar para área de transferência⁴        | <kbd>MOD</kbd>+<kbd>x</kbd>
- | Sincronizar áreas de transferência e colar⁴ | <kbd>MOD</kbd>+<kbd>v</kbd>
+ | Expandir painel de notificação              | <kbd>MOD</kbd>+<kbd>n</kbd>
+ | Colapsar painel de notificação              | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
+ | Copiar para área de transferência³          | <kbd>MOD</kbd>+<kbd>c</kbd>
+ | Recortar para área de transferência³        | <kbd>MOD</kbd>+<kbd>x</kbd>
+ | Sincronizar áreas de transferência e colar³ | <kbd>MOD</kbd>+<kbd>v</kbd>
 | Injetar texto da área de transferência do computador | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
 | Ativar/desativar contador de FPS (em stdout) | <kbd>MOD</kbd>+<kbd>i</kbd>
- | Pinçar para dar zoom                        | <kbd>Ctrl</kbd>+_Clicar-e-mover_
+ | Pinçar para dar zoom                        | <kbd>Ctrl</kbd>+_clicar-e-mover_

-_¹Clique-duplo-esquerdo na borda preta para remove-la._  
-_²Clique-direito liga a tela caso esteja desligada, pressione BACK caso contrário._  
-_³4.° and 5.° botões do mouse, caso o mouse possua._  
-_⁴Apenas em Android >= 7._
-
-Atalhos com teclas reptidas são executados soltando e precionando a tecla
-uma segunda vez. Por exemplo, para executar "Expandir painel de Configurção":
-
- 1. Mantenha pressionado <kbd>MOD</kbd>.
- 2. Depois click duas vezes <kbd>n</kbd>.
- 3. Finalmente, solte <kbd>MOD</kbd>.
+_¹Clique-duplo em bordas pretas para removê-las._  
+_²Clique-direito liga a tela se ela estiver desligada, pressiona BACK caso contrário._
+_³Apenas em Android >= 7._

 Todos os atalhos <kbd>Ctrl</kbd>+_tecla_ são encaminhados para o dispositivo, para que eles sejam
 tratados pela aplicação ativa.
@ -817,9 +729,7 @@ tratados pela aplicação ativa.
 Para usar um binário _adb_ específico, configure seu caminho na variável de ambiente
 `ADB`:

-```bash
-ADB=/caminho/para/adb scrcpy
-```
+    ADB=/caminho/para/adb scrcpy

 Para sobrepor o caminho do arquivo `scrcpy-server`, configure seu caminho em
 `SCRCPY_SERVER_PATH`.
@ -841,6 +751,8 @@ Um colega me desafiou a encontrar um nome tão impronunciável quanto [gnirehtet

 Veja [BUILD].

+[BUILD]: BUILD.md
+

 ## Problemas comuns

--- a/app/meson.build
+++ b/app/meson.build
@ -1,8 +1,6 @@
 src = [
    'src/main.c',
    'src/adb.c',
-    'src/adb_parser.c',
-    'src/adb_tunnel.c',
    'src/cli.c',
    'src/clock.c',
    'src/compat.c',
@ -26,42 +24,27 @@ src = [
    'src/server.c',
    'src/stream.c',
    'src/video_buffer.c',
-    'src/util/acksync.c',
    'src/util/file.c',
-    'src/util/intr.c',
    'src/util/log.c',
    'src/util/net.c',
-    'src/util/net_intr.c',
    'src/util/process.c',
-    'src/util/process_intr.c',
    'src/util/strbuf.c',
-    'src/util/str.c',
+    'src/util/str_util.c',
    'src/util/term.c',
    'src/util/thread.c',
    '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'
    src += [
        'src/sys/win/file.c',
        'src/sys/win/process.c',
    ]
-    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,6 +60,10 @@ if aoa_hid_support
    ]
 endif

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

 if not get_option('crossbuild_windows')
@ -137,11 +124,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)
@ -150,9 +133,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())

@ -205,14 +185,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',
@ -221,9 +195,8 @@ 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/str_util.c',
            'src/util/term.c',
        ]],
        ['test_clock', [
@ -233,8 +206,8 @@ if get_option('buildtype') == 'debug'
        ['test_control_msg_serialize', [
            'tests/test_control_msg_serialize.c',
            'src/control_msg.c',
-            'src/util/str.c',
            'src/util/strbuf.c',
+            'src/util/str_util.c',
        ]],
        ['test_device_msg_deserialize', [
            'tests/test_device_msg_deserialize.c',
@ -247,10 +220,10 @@ if get_option('buildtype') == 'debug'
            'tests/test_strbuf.c',
            'src/util/strbuf.c',
        ]],
-        ['test_str', [
-            'tests/test_str.c',
-            'src/util/str.c',
+        ['test_strutil', [
+            'tests/test_strutil.c',
            'src/util/strbuf.c',
+            'src/util/str_util.c',
        ]],
    ]

--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@ -114,12 +114,6 @@ Limit both the width and height of the video to \fIvalue\fR. The other dimension

 Default is 0 (unlimited).

-.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).
@ -199,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.
@ -217,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.
--- a/app/src/adb.c
+++ b/app/src/adb.c
@ -5,11 +5,9 @@
 #include <stdlib.h>
 #include <string.h>

-#include "adb_parser.h"
 #include "util/file.h"
 #include "util/log.h"
-#include "util/process_intr.h"
-#include "util/str.h"
+#include "util/str_util.h"

 static const char *adb_command;

@ -87,8 +85,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 +109,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);
+sc_pid
+adb_execute_p(const char *serial, const char *const adb_cmd[],
+              size_t len, sc_pipe *pin, sc_pipe *pout, sc_pipe *perr) {
+    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 +131,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, pin, pout, perr);
    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;
    }
@ -211,71 +143,58 @@ 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);
+adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {
+    return adb_execute_p(serial, adb_cmd, len, NULL, NULL, NULL);
 }

-bool
-adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
-            const char *device_socket_name, unsigned flags) {
+sc_pid
+adb_forward(const char *serial, uint16_t local_port,
+            const char *device_socket_name) {
    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));
 }

-bool
-adb_forward_remove(struct sc_intr *intr, const char *serial,
-                   uint16_t local_port, unsigned flags) {
+sc_pid
+adb_forward_remove(const char *serial, uint16_t local_port) {
    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));
 }

-bool
-adb_reverse(struct sc_intr *intr, const char *serial,
-            const char *device_socket_name, uint16_t local_port,
-            unsigned flags) {
+sc_pid
+adb_reverse(const char *serial, const char *device_socket_name,
+            uint16_t local_port) {
    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));
 }

-bool
-adb_reverse_remove(struct sc_intr *intr, const char *serial,
-                   const char *device_socket_name, unsigned flags) {
+sc_pid
+adb_reverse_remove(const char *serial, const char *device_socket_name) {
    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));
 }

-bool
-adb_push(struct sc_intr *intr, const char *serial, const char *local,
-         const char *remote, unsigned flags) {
+sc_pid
+adb_push(const char *serial, const char *local, const char *remote) {
 #ifdef __WINDOWS__
    // Windows will parse the string, so the paths must be quoted
    // (see sys/win/command.c)
-    local = sc_str_quote(local);
+    local = strquote(local);
    if (!local) {
        return SC_PROCESS_NONE;
    }
-    remote = sc_str_quote(remote);
+    remote = strquote(remote);
    if (!remote) {
        free((void *) local);
        return SC_PROCESS_NONE;
@ -283,189 +202,76 @@ 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));

 #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) {
+sc_pid
+adb_install(const char *serial, const char *local) {
 #ifdef __WINDOWS__
    // Windows will parse the string, so the local name must be quoted
    // (see sys/win/command.c)
-    local = sc_str_quote(local);
+    local = strquote(local);
    if (!local) {
        return SC_PROCESS_NONE;
    }
 #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));

 #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};
-
+static ssize_t
+adb_execute_for_output(const char *serial, const char *const adb_cmd[],
+                       size_t adb_cmd_len, char *buf, size_t buf_len,
+                       const char *name) {
    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;
-    }
+    sc_pid pid = adb_execute_p(serial, adb_cmd, adb_cmd_len, NULL, &pout, NULL);

-    // "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));
+    ssize_t r = sc_pipe_read_all(pout, buf, buf_len);
    sc_pipe_close(pout);

-    bool ok = process_check_success_intr(intr, pid, "adb connect", flags);
-    if (!ok) {
-        return false;
+    if (!sc_process_check_success(pid, name, true)) {
+        return -1;
    }

-    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;
+    return r;
 }

-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);
+static size_t
+truncate_first_line(char *data, size_t len) {
+    data[len - 1] = '\0';
+    char *eol = strpbrk(data, "\r\n");
+    if (eol) {
+        *eol = '\0';
+        len = eol - data;
+    }
+    return len;
 }

 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;
-    }
-
+adb_get_serialno(void) {
    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) {
    const char *const adb_cmd[] = {"get-serialno"};
-
-    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 get-serialno\"");
+    ssize_t r = adb_execute_for_output(NULL, adb_cmd, ARRAY_LEN(adb_cmd),
+                                       buf, sizeof(buf), "get-serialno");
+    if (r <= 0) {
        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 get-serialno", flags);
-    if (!ok) {
-        return NULL;
-    }
-
-    if (r == -1) {
-        return false;
-    }
-
-    sc_str_truncate(buf, r, " \r\n");
-
+    truncate_first_line(buf, r);
    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
@ -6,89 +6,37 @@
 #include <stdbool.h>
 #include <inttypes.h>

-#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)
+#include "util/process.h"

 sc_pid
-adb_execute(const char *serial, const char *const adb_cmd[], size_t len,
-            unsigned flags);
+adb_execute(const char *serial, const char *const adb_cmd[], size_t len);

-bool
-adb_forward(struct sc_intr *intr, const char *serial, uint16_t local_port,
-            const char *device_socket_name, unsigned flags);
+sc_pid
+adb_execute_p(const char *serial, const char *const adb_cmd[],
+              size_t len, sc_pipe *pin, sc_pipe *pout, sc_pipe *perr);

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

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

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

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

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

-/**
- * Execute `adb tcpip <port>`
- */
-bool
-adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
-          unsigned flags);
+sc_pid
+adb_install(const char *serial, const char *local);

-/**
- * 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>`
- */
+// Return the result of "adb get-serialno".
 char *
-adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
-            unsigned flags);
-
-/**
- * Execute `adb get-serialno`
- *
- * 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(void);

 #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
@ -1,169 +0,0 @@
-#include "adb_tunnel.h"
-
-#include <assert.h>
-
-#include "adb.h"
-#include "util/log.h"
-#include "util/net_intr.h"
-#include "util/process_intr.h"
-
-#define SC_SOCKET_NAME "scrcpy"
-
-static bool
-listen_on_port(struct sc_intr *intr, sc_socket socket, uint16_t port) {
-    return net_listen_intr(intr, socket, IPV4_LOCALHOST, port, 1);
-}
-
-static bool
-enable_tunnel_reverse_any_port(struct sc_adb_tunnel *tunnel,
-                               struct sc_intr *intr, const char *serial,
-                               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)) {
-            // the command itself failed, it will fail on any port
-            return false;
-        }
-
-        // At the application level, the device part is "the server" because it
-        // serves video stream and control. However, at the network level, the
-        // client listens and the server connects to the client. That way, the
-        // client can listen before starting the server app, so there is no
-        // need to try to connect until the server socket is listening on the
-        // device.
-        sc_socket server_socket = net_socket();
-        if (server_socket != SC_SOCKET_NONE) {
-            bool ok = listen_on_port(intr, server_socket, port);
-            if (ok) {
-                // success
-                tunnel->server_socket = server_socket;
-                tunnel->local_port = port;
-                tunnel->enabled = true;
-                return true;
-            }
-
-            net_close(server_socket);
-        }
-
-        if (sc_intr_is_interrupted(intr)) {
-            // Stop immediately
-            return false;
-        }
-
-        // failure, disable tunnel and try another port
-        if (!adb_reverse_remove(intr, serial, SC_SOCKET_NAME,
-                                SC_ADB_NO_STDOUT)) {
-            LOGW("Could not remove reverse tunnel on port %" PRIu16, port);
-        }
-
-        // check before incrementing to avoid overflow on port 65535
-        if (port < port_range.last) {
-            LOGW("Could not listen on port %" PRIu16", retrying on %" PRIu16,
-                 port, (uint16_t) (port + 1));
-            port++;
-            continue;
-        }
-
-        if (port_range.first == port_range.last) {
-            LOGE("Could not listen on port %" PRIu16, port_range.first);
-        } else {
-            LOGE("Could not listen on any port in range %" PRIu16 ":%" PRIu16,
-                 port_range.first, port_range.last);
-        }
-        return false;
-    }
-}
-
-static bool
-enable_tunnel_forward_any_port(struct sc_adb_tunnel *tunnel,
-                               struct sc_intr *intr, const char *serial,
-                               struct sc_port_range port_range) {
-    tunnel->forward = true;
-
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (adb_forward(intr, serial, port, SC_SOCKET_NAME, SC_ADB_NO_STDOUT)) {
-            // success
-            tunnel->local_port = port;
-            tunnel->enabled = true;
-            return true;
-        }
-
-        if (sc_intr_is_interrupted(intr)) {
-            // Stop immediately
-            return false;
-        }
-
-        if (port < port_range.last) {
-            LOGW("Could not forward port %" PRIu16", retrying on %" PRIu16,
-                 port, (uint16_t) (port + 1));
-            port++;
-            continue;
-        }
-
-        if (port_range.first == port_range.last) {
-            LOGE("Could not forward port %" PRIu16, port_range.first);
-        } else {
-            LOGE("Could not forward any port in range %" PRIu16 ":%" PRIu16,
-                 port_range.first, port_range.last);
-        }
-        return false;
-    }
-}
-
-void
-sc_adb_tunnel_init(struct sc_adb_tunnel *tunnel) {
-    tunnel->enabled = false;
-    tunnel->forward = false;
-    tunnel->server_socket = SC_SOCKET_NONE;
-    tunnel->local_port = 0;
-}
-
-bool
-sc_adb_tunnel_open(struct sc_adb_tunnel *tunnel, struct sc_intr *intr,
-                   const char *serial, struct sc_port_range port_range,
-                   bool force_adb_forward) {
-    assert(!tunnel->enabled);
-
-    if (!force_adb_forward) {
-        // Attempt to use "adb reverse"
-        if (enable_tunnel_reverse_any_port(tunnel, intr, serial, port_range)) {
-            return true;
-        }
-
-        // if "adb reverse" does not work (e.g. over "adb connect"), it
-        // fallbacks to "adb forward", so the app socket is the client
-
-        LOGW("'adb reverse' failed, fallback to 'adb forward'");
-    }
-
-    return enable_tunnel_forward_any_port(tunnel, intr, serial, port_range);
-}
-
-bool
-sc_adb_tunnel_close(struct sc_adb_tunnel *tunnel, struct sc_intr *intr,
-                    const char *serial) {
-    assert(tunnel->enabled);
-
-    bool ret;
-    if (tunnel->forward) {
-        ret = adb_forward_remove(intr, serial, tunnel->local_port,
-                                 SC_ADB_NO_STDOUT);
-    } else {
-        ret = adb_reverse_remove(intr, serial, SC_SOCKET_NAME,
-                                 SC_ADB_NO_STDOUT);
-
-        assert(tunnel->server_socket != SC_SOCKET_NONE);
-        if (!net_close(tunnel->server_socket)) {
-            LOGW("Could not close server socket");
-        }
-
-        // server_socket is never used anymore
-    }
-
-    // Consider tunnel disabled even if the command failed
-    tunnel->enabled = false;
-
-    return ret;
-}
--- a/app/src/adb_tunnel.h
+++ b/app/src/adb_tunnel.h
@ -1,47 +0,0 @@
-#ifndef SC_ADB_TUNNEL_H
-#define SC_ADB_TUNNEL_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#include "options.h"
-#include "util/intr.h"
-#include "util/net.h"
-
-struct sc_adb_tunnel {
-    bool enabled;
-    bool forward; // use "adb forward" instead of "adb reverse"
-    sc_socket server_socket; // only used if !forward
-    uint16_t local_port;
-};
-
-/**
- * Initialize the adb tunnel struct to default values
- */
-void
-sc_adb_tunnel_init(struct sc_adb_tunnel *tunnel);
-
-/**
- * Open a tunnel
- *
- * Blocking calls may be interrupted asynchronously via `intr`.
- *
- * If `force_adb_forward` is not set, then attempts to set up an "adb reverse"
- * tunnel first. Only if it fails (typical on old Android version connected via
- * TCP/IP), use "adb forward".
- */
-bool
-sc_adb_tunnel_open(struct sc_adb_tunnel *tunnel, struct sc_intr *intr,
-                   const char *serial, struct sc_port_range port_range,
-                   bool force_adb_forward);
-
-/**
- * Close the tunnel
- */
-bool
-sc_adb_tunnel_close(struct sc_adb_tunnel *tunnel, struct sc_intr *intr,
-                    const char *serial);
-
-#endif
--- 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) {
@ -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,9 +9,8 @@

 #include "options.h"
 #include "util/log.h"
-#include "util/net.h"
-#include "util/str.h"
 #include "util/strbuf.h"
+#include "util/str_util.h"
 #include "util/term.h"

 #define STR_IMPL_(x) #x
@ -47,10 +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

 struct sc_option {
    char shortopt;
@ -210,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",
@ -344,25 +330,6 @@ 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,
@ -405,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",
@ -610,17 +563,12 @@ sc_getopt_adapter_create_longopts(void) {
    struct option *longopts =
        malloc((ARRAY_LEN(options) + 1) * sizeof(*longopts));
    if (!longopts) {
-        LOG_OOM();
        return NULL;
    }

    size_t out_idx = 0;
    for (size_t i = 0; i < ARRAY_LEN(options); ++i) {
        const struct sc_option *in = &options[i];
-
-        // If longopt_id is set, then longopt must be set
-        assert(!in->longopt_id || in->longopt);
-
        if (!in->longopt) {
            // The longopts array must only contain long options
            continue;
@ -723,12 +671,12 @@ print_option_usage_header(const struct sc_option *opt) {
        }
    }

-    printf("\n    %s\n", buf.s);
+    fprintf(stderr, "\n    %s\n", buf.s);
    free(buf.s);
    return;

 error:
-    printf("<ERROR>\n");
+    fprintf(stderr, "<ERROR>\n");
 }

 static void
@ -744,11 +692,11 @@ print_option_usage(const struct sc_option *opt, unsigned cols) {

    char *text = sc_str_wrap_lines(opt->text, cols, 8);
    if (!text) {
-        printf("<ERROR>\n");
+        fprintf(stderr, "<ERROR>\n");
        return;
    }

-    printf("%s\n", text);
+    fprintf(stderr, "%s\n", text);
    free(text);
 }

@ -759,11 +707,11 @@ print_shortcuts_intro(unsigned cols) {
        "(left) Alt or (left) Super, but it can be configured by "
        "--shortcut-mod (see above).", cols, 4);
    if (!intro) {
-        printf("<ERROR>\n");
+        fprintf(stderr, "<ERROR>\n");
        return;
    }

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

@ -773,21 +721,21 @@ print_shortcut(const struct sc_shortcut *shortcut, unsigned cols) {
    assert(shortcut->shortcuts[0]); // At least one shortcut
    assert(shortcut->text);

-    printf("\n");
+    fprintf(stderr, "\n");

    unsigned i = 0;
    while (shortcut->shortcuts[i]) {
-        printf("    %s\n", shortcut->shortcuts[i]);
+        fprintf(stderr, "    %s\n", shortcut->shortcuts[i]);
        ++i;
    };

    char *text = sc_str_wrap_lines(shortcut->text, cols, 8);
    if (!text) {
-        printf("<ERROR>\n");
+        fprintf(stderr, "<ERROR>\n");
        return;
    }

-    printf("%s\n", text);
+    fprintf(stderr, "%s\n", text);
    free(text);
 }

@ -811,14 +759,14 @@ scrcpy_print_usage(const char *arg0) {
        }
    }

-    printf("Usage: %s [options]\n\n"
-            "Options:\n", arg0);
+    fprintf(stderr, "Usage: %s [options]\n\n"
+                    "Options:\n", arg0);
    for (size_t i = 0; i < ARRAY_LEN(options); ++i) {
        print_option_usage(&options[i], cols);
    }

    // Print shortcuts section
-    printf("\nShortcuts:\n\n");
+    fprintf(stderr, "\nShortcuts:\n\n");
    print_shortcuts_intro(cols);
    for (size_t i = 0; i < ARRAY_LEN(shortcuts); ++i) {
        print_shortcut(&shortcuts[i], cols);
@ -831,9 +779,9 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
    long value;
    bool ok;
    if (accept_suffix) {
-        ok = sc_str_parse_integer_with_suffix(s, &value);
+        ok = parse_integer_with_suffix(s, &value);
    } else {
-        ok = sc_str_parse_integer(s, &value);
+        ok = parse_integer(s, &value);
    }
    if (!ok) {
        LOGE("Could not parse %s: %s", name, s);
@ -853,7 +801,7 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
 static size_t
 parse_integers_arg(const char *s, size_t max_items, long *out, long min,
                   long max, const char *name) {
-    size_t count = sc_str_parse_integers(s, ':', max_items, out);
+    size_t count = parse_integers(s, ':', max_items, out);
    if (!count) {
        LOGE("Could not parse %s: %s", name, s);
        return 0;
@ -1175,21 +1123,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);
@ -1262,16 +1195,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    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;
@ -1390,13 +1313,6 @@ 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;
 #ifdef HAVE_V4L2
            case OPT_V4L2_SINK:
                opts->v4l2_device = optarg;
@ -1413,20 +1329,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        }
    }

-    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)"
@ -1452,10 +1354,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/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(),
@ -58,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
@ -7,7 +7,7 @@

 #include "util/buffer_util.h"
 #include "util/log.h"
-#include "util/str.h"
+#include "util/str_util.h"

 /**
 * Map an enum value to a string based on an array, without crashing on an
@ -66,7 +66,7 @@ write_position(uint8_t *buf, const struct sc_position *position) {
 // 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);
+    size_t len = utf8_truncation_index(utf8, max_len);
    buffer_write32be(buf, len);
    memcpy(&buf[4], utf8, len);
    return 4 + len;
@ -118,12 +118,11 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
            buf[1] = msg->inject_keycode.action;
            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;
@ -171,6 +170,11 @@ control_msg_log(const struct 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,
@ -195,8 +199,7 @@ control_msg_log(const struct control_msg *msg) {
                     KEYEVENT_ACTION_LABEL(msg->inject_keycode.action));
            break;
        case CONTROL_MSG_TYPE_SET_CLIPBOARD:
-            LOG_CMSG("clipboard %" PRIu64_ " %s \"%s\"",
-                     msg->set_clipboard.sequence,
+            LOG_CMSG("clipboard %s \"%s\"",
                     msg->set_clipboard.paste ? "paste" : "copy",
                     msg->set_clipboard.text);
            break;
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@ -70,7 +70,6 @@ struct control_msg {
            // screen may only be turned on on ACTION_DOWN
        } back_or_screen_on;
        struct {
-            uint64_t sequence;
            char *text; // owned, to be freed by free()
            bool paste;
        } set_clipboard;
--- a/app/src/controller.c
+++ b/app/src/controller.c
@ -5,11 +5,10 @@
 #include "util/log.h"

 bool
-controller_init(struct 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;
    }
--- a/app/src/controller.h
+++ b/app/src/controller.h
@ -7,7 +7,6 @@

 #include "control_msg.h"
 #include "receiver.h"
-#include "util/acksync.h"
 #include "util/cbuf.h"
 #include "util/net.h"
 #include "util/thread.h"
@ -25,8 +24,7 @@ struct controller {
 };

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

 void
 controller_destroy(struct controller *controller);
--- a/app/src/decoder.c
+++ b/app/src/decoder.c
@ -42,7 +42,7 @@ 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;
    }

@ -54,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/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/events.h
+++ b/app/src/events.h
@ -1,4 +1,2 @@
-#define EVENT_NEW_FRAME                 SDL_USEREVENT
-#define EVENT_STREAM_STOPPED           (SDL_USEREVENT + 1)
-#define EVENT_SERVER_CONNECTION_FAILED (SDL_USEREVENT + 2)
-#define EVENT_SERVER_CONNECTED         (SDL_USEREVENT + 3)
+#define EVENT_NEW_FRAME       SDL_USEREVENT
+#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 1)
--- a/app/src/file_handler.c
+++ b/app/src/file_handler.c
@ -5,7 +5,6 @@

 #include "adb.h"
 #include "util/log.h"
-#include "util/process_intr.h"

 #define DEFAULT_PUSH_TARGET "/sdcard/Download/"

@ -17,7 +16,6 @@ file_handler_request_destroy(struct file_handler_request *req) {
 bool
 file_handler_init(struct file_handler *file_handler, const char *serial,
                  const char *push_target) {
-    assert(serial);

    cbuf_init(&file_handler->queue);

@ -32,26 +30,23 @@ file_handler_init(struct file_handler *file_handler, const char *serial,
        return false;
    }

-    ok = sc_intr_init(&file_handler->intr);
-    if (!ok) {
-        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();
-        sc_intr_destroy(&file_handler->intr);
-        sc_cond_destroy(&file_handler->event_cond);
-        sc_mutex_destroy(&file_handler->mutex);
-        return false;
+    if (serial) {
+        file_handler->serial = strdup(serial);
+        if (!file_handler->serial) {
+            LOGW("Could not strdup serial");
+            sc_cond_destroy(&file_handler->event_cond);
+            sc_mutex_destroy(&file_handler->mutex);
+            return false;
+        }
+    } else {
+        file_handler->serial = NULL;
    }

    // lazy initialization
    file_handler->initialized = false;

    file_handler->stopped = false;
+    file_handler->current_process = SC_PROCESS_NONE;

    file_handler->push_target = push_target ? push_target : DEFAULT_PUSH_TARGET;

@ -62,7 +57,6 @@ void
 file_handler_destroy(struct file_handler *file_handler) {
    sc_cond_destroy(&file_handler->event_cond);
    sc_mutex_destroy(&file_handler->mutex);
-    sc_intr_destroy(&file_handler->intr);
    free(file_handler->serial);

    struct file_handler_request req;
@ -71,6 +65,16 @@ file_handler_destroy(struct file_handler *file_handler) {
    }
 }

+static sc_pid
+install_apk(const char *serial, const char *file) {
+    return adb_install(serial, file);
+}
+
+static sc_pid
+push_file(const char *serial, const char *file, const char *push_target) {
+    return adb_push(serial, file, push_target);
+}
+
 bool
 file_handler_request(struct file_handler *file_handler,
                     file_handler_action_t action, char *file) {
@ -102,16 +106,10 @@ file_handler_request(struct file_handler *file_handler,
 static int
 run_file_handler(void *data) {
    struct file_handler *file_handler = data;
-    struct sc_intr *intr = &file_handler->intr;
-
-    const char *serial = file_handler->serial;
-    assert(serial);
-
-    const char *push_target = file_handler->push_target;
-    assert(push_target);

    for (;;) {
        sc_mutex_lock(&file_handler->mutex);
+        file_handler->current_process = SC_PROCESS_NONE;
        while (!file_handler->stopped && cbuf_is_empty(&file_handler->queue)) {
            sc_cond_wait(&file_handler->event_cond, &file_handler->mutex);
        }
@ -124,26 +122,43 @@ run_file_handler(void *data) {
        bool non_empty = cbuf_take(&file_handler->queue, &req);
        assert(non_empty);
        (void) non_empty;
+
+        sc_pid pid;
+        if (req.action == ACTION_INSTALL_APK) {
+            LOGI("Installing %s...", req.file);
+            pid = install_apk(file_handler->serial, req.file);
+        } else {
+            LOGI("Pushing %s...", req.file);
+            pid = push_file(file_handler->serial, req.file,
+                            file_handler->push_target);
+        }
+        file_handler->current_process = pid;
        sc_mutex_unlock(&file_handler->mutex);

        if (req.action == ACTION_INSTALL_APK) {
-            LOGI("Installing %s...", req.file);
-            bool ok = adb_install(intr, serial, req.file, 0);
-            if (ok) {
+            if (sc_process_check_success(pid, "adb install", false)) {
                LOGI("%s successfully installed", req.file);
            } else {
                LOGE("Failed to install %s", req.file);
            }
        } else {
-            LOGI("Pushing %s...", req.file);
-            bool ok = adb_push(intr, serial, req.file, push_target, 0);
-            if (ok) {
-                LOGI("%s successfully pushed to %s", req.file, push_target);
+            if (sc_process_check_success(pid, "adb push", false)) {
+                LOGI("%s successfully pushed to %s", req.file,
+                                                     file_handler->push_target);
            } else {
-                LOGE("Failed to push %s to %s", req.file, push_target);
+                LOGE("Failed to push %s to %s", req.file,
+                                                file_handler->push_target);
            }
        }

+        sc_mutex_lock(&file_handler->mutex);
+        // Close the process (it is necessarily already terminated)
+        // Execute this call with mutex locked to avoid race conditions with
+        // file_handler_stop()
+        sc_process_close(file_handler->current_process);
+        file_handler->current_process = SC_PROCESS_NONE;
+        sc_mutex_unlock(&file_handler->mutex);
+
        file_handler_request_destroy(&req);
    }
    return 0;
@ -168,7 +183,11 @@ file_handler_stop(struct file_handler *file_handler) {
    sc_mutex_lock(&file_handler->mutex);
    file_handler->stopped = true;
    sc_cond_signal(&file_handler->event_cond);
-    sc_intr_interrupt(&file_handler->intr);
+    if (file_handler->current_process != SC_PROCESS_NONE) {
+        if (!sc_process_terminate(file_handler->current_process)) {
+            LOGW("Could not terminate push/install process");
+        }
+    }
    sc_mutex_unlock(&file_handler->mutex);
 }

--- a/app/src/file_handler.h
+++ b/app/src/file_handler.h
@ -8,7 +8,6 @@
 #include "adb.h"
 #include "util/cbuf.h"
 #include "util/thread.h"
-#include "util/intr.h"

 typedef enum {
    ACTION_INSTALL_APK,
@ -30,9 +29,8 @@ struct file_handler {
    sc_cond event_cond;
    bool stopped;
    bool initialized;
+    sc_pid current_process;
    struct file_handler_request_queue queue;
-
-    struct sc_intr intr;
 };

 bool
--- 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
@ -160,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;
    }

@ -279,8 +278,7 @@ push_mod_lock_state(struct sc_hid_keyboard *kb, uint16_t sdl_mod) {

 static void
 sc_key_processor_process_key(struct sc_key_processor *kp,
-                             const SDL_KeyboardEvent *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.
@ -300,12 +298,16 @@ sc_key_processor_process_key(struct sc_key_processor *kp,
            }
        }

-        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(2);
        }

        if (!sc_aoa_push_hid_event(kb->aoa, &hid_event)) {
@ -346,10 +348,6 @@ sc_hid_keyboard_init(struct sc_hid_keyboard *kb, struct sc_aoa *aoa) {
        .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/icon.c
+++ b/app/src/icon.c
@ -10,7 +10,7 @@
 #include "compat.h"
 #include "util/file.h"
 #include "util/log.h"
-#include "util/str.h"
+#include "util/str_util.h"

 #define SCRCPY_PORTABLE_ICON_FILENAME "icon.png"
 #define SCRCPY_DEFAULT_ICON_PATH \
@ -26,12 +26,12 @@ get_icon_path(void) {
    if (icon_path_env) {
        // if the envvar is set, use it
 #ifdef __WINDOWS__
-        char *icon_path = sc_str_from_wchars(icon_path_env);
+        char *icon_path = utf8_from_wide_char(icon_path_env);
 #else
        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);
@ -42,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
@ -63,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;
    }

@ -93,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;
    }

@ -109,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;
    }
@ -158,12 +158,6 @@ free_ctx:
    return result;
 }

-#if !SDL_VERSION_ATLEAST(2, 0, 10)
-// SDL_PixelFormatEnum has been introduced in SDL 2.0.10. Use int for older SDL
-// versions.
-typedef int SDL_PixelFormatEnum;
-#endif
-
 static SDL_PixelFormatEnum
 to_sdl_pixel_format(enum AVPixelFormat fmt) {
    switch (fmt) {
@ -178,9 +172,7 @@ to_sdl_pixel_format(enum AVPixelFormat fmt) {
        case AV_PIX_FMT_BGR565BE: return SDL_PIXELFORMAT_BGR565;
        case AV_PIX_FMT_BGR555BE: return SDL_PIXELFORMAT_BGR555;
        case AV_PIX_FMT_RGB444BE: return SDL_PIXELFORMAT_RGB444;
-#if SDL_VERSION_ATLEAST(2, 0, 12)
        case AV_PIX_FMT_BGR444BE: return SDL_PIXELFORMAT_BGR444;
-#endif
        case AV_PIX_FMT_PAL8: return SDL_PIXELFORMAT_INDEX8;
        default: return SDL_PIXELFORMAT_UNKNOWN;
    }
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@ -66,7 +66,6 @@ input_manager_init(struct input_manager *im, struct controller *controller,
    im->control = options->control;
    im->forward_all_clicks = options->forward_all_clicks;
    im->legacy_paste = options->legacy_paste;
-    im->clipboard_autosync = options->clipboard_autosync;

    const struct sc_shortcut_mods *shortcut_mods = &options->shortcut_mods;
    assert(shortcut_mods->count);
@ -83,8 +82,6 @@ input_manager_init(struct input_manager *im, struct controller *controller,
    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
@ -211,35 +208,35 @@ collapse_panels(struct controller *controller) {
    }
 }

-static bool
-set_device_clipboard(struct 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 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 (!controller_push_msg(controller, &msg)) {
        free(text_dup);
        LOGW("Could not request 'set device clipboard'");
-        return false;
    }
-
-    return true;
 }

 static void
@ -465,10 +462,8 @@ input_manager_process_key(struct 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;
@ -517,36 +512,18 @@ input_manager_process_key(struct 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);
    }

-    im->kp->ops->process_key(im->kp, event, ack_to_wait);
+    im->kp->ops->process_key(im->kp, event);
 }

 static void
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@ -24,7 +24,6 @@ struct input_manager {
    bool control;
    bool forward_all_clicks;
    bool legacy_paste;
-    bool clipboard_autosync;

    struct {
        unsigned data[SC_MAX_SHORTCUT_MODS];
@ -39,8 +38,6 @@ struct input_manager {
    unsigned key_repeat;
    SDL_Keycode last_keycode;
    uint16_t last_mod;
-
-    uint64_t next_sequence; // used for request acknowledgements
 };

 void
--- a/app/src/keyboard_inject.c
+++ b/app/src/keyboard_inject.c
@ -188,13 +188,7 @@ convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,

 static void
 sc_key_processor_process_key(struct sc_key_processor *kp,
-                             const SDL_KeyboardEvent *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) {
@ -256,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/main.c
+++ b/app/src/main.c
@ -47,9 +47,6 @@ main(int argc, char *argv[]) {
    setbuf(stderr, NULL);
 #endif

-    printf("scrcpy " SCRCPY_VERSION
-           " <https://github.com/Genymobile/scrcpy>\n");
-
    struct scrcpy_cli_args args = {
        .opts = scrcpy_options_default,
        .help = false,
@ -76,6 +73,8 @@ main(int argc, char *argv[]) {
        return 0;
    }

+    LOGI("scrcpy " SCRCPY_VERSION " <https://github.com/Genymobile/scrcpy>");
+
 #ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
    av_register_all();
 #endif
--- a/app/src/options.c
+++ b/app/src/options.c
@ -19,8 +19,6 @@ 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_MOD_LALT, SC_MOD_LSUPER},
        .count = 2,
@ -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
@ -77,8 +77,6 @@ struct scrcpy_options {
    enum sc_record_format record_format;
    enum sc_keyboard_input_mode keyboard_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;
@ -108,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;
--- 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
@ -6,7 +6,7 @@
 #include <libavutil/time.h>

 #include "util/log.h"
-#include "util/str.h"
+#include "util/str_util.h"

 /** Downcast packet_sink to recorder */
 #define DOWNCAST(SINK) container_of(SINK, struct recorder, packet_sink)
@ -26,7 +26,7 @@ find_muxer(const char *name) {
        oformat = av_oformat_next(oformat);
 #endif
        // until null or containing the requested name
-    } while (oformat && !sc_str_list_contains(oformat->name, ',', name));
+    } while (oformat && !strlist_contains(oformat->name, ',', name));
    return oformat;
 }

@ -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;
    }

@ -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
@ -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
@ -35,7 +34,7 @@
 #endif

 struct scrcpy {
-    struct sc_server server;
+    struct server server;
    struct screen screen;
    struct stream stream;
    struct decoder decoder;
@ -47,8 +46,6 @@ struct scrcpy {
    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;
@ -220,29 +217,6 @@ event_loop(struct scrcpy *s, const struct scrcpy_options *options) {
    return false;
 }

-static bool
-await_for_server(void) {
-    SDL_Event event;
-    while (SDL_WaitEvent(&event)) {
-        switch (event.type) {
-            case SDL_QUIT:
-                LOGD("User requested to quit");
-                return false;
-            case EVENT_SERVER_CONNECTION_FAILED:
-                LOGE("Server connection failed");
-                return false;
-            case EVENT_SERVER_CONNECTED:
-                LOGD("Server connected");
-                return true;
-            default:
-                break;
-        }
-    }
-
-    LOGE("SDL_WaitEvent() error: %s", SDL_GetError());
-    return false;
-}
-
 static SDL_LogPriority
 sdl_priority_from_av_level(int level) {
    switch (level) {
@ -271,7 +245,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'
@ -288,32 +262,6 @@ stream_on_eos(struct stream *stream, void *userdata) {
    PUSH_EVENT(EVENT_STREAM_STOPPED);
 }

-static void
-sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
-    (void) server;
-    (void) userdata;
-
-    PUSH_EVENT(EVENT_SERVER_CONNECTION_FAILED);
-}
-
-static void
-sc_server_on_connected(struct sc_server *server, void *userdata) {
-    (void) server;
-    (void) userdata;
-
-    PUSH_EVENT(EVENT_SERVER_CONNECTED);
-}
-
-static void
-sc_server_on_disconnected(struct sc_server *server, void *userdata) {
-    (void) server;
-    (void) userdata;
-
-    LOGD("Server disconnected");
-    // Do nothing, the disconnection will be handled by the "stream stopped"
-    // event
-}
-
 bool
 scrcpy(struct scrcpy_options *options) {
    static struct scrcpy scrcpy;
@ -327,6 +275,10 @@ scrcpy(struct scrcpy_options *options) {

    atexit(SDL_Quit);

+    if (!server_init(&s->server)) {
+        return false;
+    }
+
    bool ret = false;

    bool server_started = false;
@ -343,15 +295,11 @@ scrcpy(struct scrcpy_options *options) {
    bool controller_started = false;
    bool screen_initialized = false;

-    struct sc_acksync *acksync = NULL;
-
-    struct sc_server_params params = {
+    struct 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,
@ -364,21 +312,8 @@ 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 = {
-        .on_connection_failed = sc_server_on_connection_failed,
-        .on_connected = sc_server_on_connected,
-        .on_disconnected = sc_server_on_disconnected,
-    };
-    if (!sc_server_init(&s->server, &params, &cbs, NULL)) {
-        return false;
-    }
-
-    if (!sc_server_start(&s->server)) {
+    if (!server_start(&s->server, &params)) {
        goto end;
    }

@ -396,19 +331,14 @@ scrcpy(struct scrcpy_options *options) {

    sdl_configure(options->display, options->disable_screensaver);

-    // Await for server without blocking Ctrl+C handling
-    if (!await_for_server()) {
+    struct server_info info;
+
+    if (!server_connect_to(&s->server, &info)) {
        goto end;
    }

-    // It is necessarily initialized here, since the device is connected
-    struct sc_server_info *info = &s->server.info;
-
-    const char *serial = s->server.params.serial;
-    assert(serial);
-
    if (options->display && options->control) {
-        if (!file_handler_init(&s->file_handler, serial,
+        if (!file_handler_init(&s->file_handler, s->server.serial,
                               options->push_target)) {
            goto end;
        }
@ -430,7 +360,7 @@ scrcpy(struct scrcpy_options *options) {
        if (!recorder_init(&s->recorder,
                           options->record_filename,
                           options->record_format,
-                           info->frame_size)) {
+                           info.frame_size)) {
            goto end;
        }
        rec = &s->recorder;
@ -453,18 +383,7 @@ scrcpy(struct scrcpy_options *options) {
    }

    if (options->control) {
-#ifdef HAVE_AOA_HID
-        if (options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_HID) {
-            bool ok = sc_acksync_init(&s->acksync);
-            if (!ok) {
-                goto end;
-            }
-
-            acksync = &s->acksync;
-        }
-#endif
-        if (!controller_init(&s->controller, s->server.control_socket,
-                             acksync)) {
+        if (!controller_init(&s->controller, s->server.control_socket)) {
            goto end;
        }
        controller_initialized = true;
@ -487,11 +406,11 @@ scrcpy(struct scrcpy_options *options) {

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

        struct screen_params screen_params = {
            .window_title = window_title,
-            .frame_size = info->frame_size,
+            .frame_size = info.frame_size,
            .always_on_top = options->always_on_top,
            .window_x = options->window_x,
            .window_y = options->window_y,
@ -515,7 +434,7 @@ scrcpy(struct scrcpy_options *options) {
 #ifdef HAVE_V4L2
    if (options->v4l2_device) {
        if (!sc_v4l2_sink_init(&s->v4l2_sink, options->v4l2_device,
-                               info->frame_size, options->v4l2_buffer)) {
+                               info.frame_size, options->v4l2_buffer)) {
            goto end;
        }

@ -540,7 +459,21 @@ scrcpy(struct scrcpy_options *options) {
 #ifdef HAVE_AOA_HID
            bool aoa_hid_ok = false;

-            bool ok = sc_aoa_init(&s->aoa, serial, acksync);
+            char *serialno = NULL;
+
+            const char *serial = options->serial;
+            if (!serial) {
+                serialno = adb_get_serialno();
+                if (!serialno) {
+                    LOGE("Could not get device serial");
+                    goto aoa_hid_end;
+                }
+                serial = serialno;
+                LOGI("Device serial: %s", serial);
+            }
+
+            bool ok = sc_aoa_init(&s->aoa, serial);
+            free(serialno);
            if (!ok) {
                goto aoa_hid_end;
            }
@ -605,9 +538,6 @@ end:
        sc_hid_keyboard_destroy(&s->keyboard_hid);
        sc_aoa_stop(&s->aoa);
    }
-    if (acksync) {
-        sc_acksync_destroy(acksync);
-    }
 #endif
    if (controller_started) {
        controller_stop(&s->controller);
@ -621,7 +551,7 @@ end:

    if (server_started) {
        // shutdown the sockets and kill the server
-        sc_server_stop(&s->server);
+        server_stop(&s->server);
    }

    // now that the sockets are shutdown, the stream and controller are
@ -666,7 +596,7 @@ end:
        file_handler_destroy(&s->file_handler);
    }

-    sc_server_destroy(&s->server);
+    server_destroy(&s->server);

    return ret;
 }
--- a/app/src/screen.c
+++ b/app/src/screen.c
@ -224,45 +224,6 @@ create_texture(struct screen *screen) {
    return texture;
 }

-// render the texture to the renderer
-//
-// Set the update_content_rect flag if the window or content size may have
-// changed, so that the content rectangle is recomputed
-static void
-screen_render(struct screen *screen, bool update_content_rect) {
-    if (update_content_rect) {
-        screen_update_content_rect(screen);
-    }
-
-    SDL_RenderClear(screen->renderer);
-    if (screen->rotation == 0) {
-        SDL_RenderCopy(screen->renderer, screen->texture, NULL, &screen->rect);
-    } else {
-        // rotation in RenderCopyEx() is clockwise, while screen->rotation is
-        // counterclockwise (to be consistent with --lock-video-orientation)
-        int cw_rotation = (4 - screen->rotation) % 4;
-        double angle = 90 * cw_rotation;
-
-        SDL_Rect *dstrect = NULL;
-        SDL_Rect rect;
-        if (screen->rotation & 1) {
-            rect.x = screen->rect.x + (screen->rect.w - screen->rect.h) / 2;
-            rect.y = screen->rect.y + (screen->rect.h - screen->rect.w) / 2;
-            rect.w = screen->rect.h;
-            rect.h = screen->rect.w;
-            dstrect = &rect;
-        } else {
-            assert(screen->rotation == 2);
-            dstrect = &screen->rect;
-        }
-
-        SDL_RenderCopyEx(screen->renderer, screen->texture, NULL, dstrect,
-                         angle, NULL, 0);
-    }
-    SDL_RenderPresent(screen->renderer);
-}
-
-
 #if defined(__APPLE__) || defined(__WINDOWS__)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif
@ -366,15 +327,18 @@ screen_init(struct screen *screen, const struct screen_params *params) {
    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;
    }

@ -475,7 +439,7 @@ screen_init(struct screen *screen, const struct screen_params *params) {

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

@ -678,6 +642,40 @@ screen_update_frame(struct screen *screen) {
    return true;
 }

+void
+screen_render(struct screen *screen, bool update_content_rect) {
+    if (update_content_rect) {
+        screen_update_content_rect(screen);
+    }
+
+    SDL_RenderClear(screen->renderer);
+    if (screen->rotation == 0) {
+        SDL_RenderCopy(screen->renderer, screen->texture, NULL, &screen->rect);
+    } else {
+        // rotation in RenderCopyEx() is clockwise, while screen->rotation is
+        // counterclockwise (to be consistent with --lock-video-orientation)
+        int cw_rotation = (4 - screen->rotation) % 4;
+        double angle = 90 * cw_rotation;
+
+        SDL_Rect *dstrect = NULL;
+        SDL_Rect rect;
+        if (screen->rotation & 1) {
+            rect.x = screen->rect.x + (screen->rect.w - screen->rect.h) / 2;
+            rect.y = screen->rect.y + (screen->rect.h - screen->rect.w) / 2;
+            rect.w = screen->rect.h;
+            rect.h = screen->rect.w;
+            dstrect = &rect;
+        } else {
+            assert(screen->rotation == 2);
+            dstrect = &screen->rect;
+        }
+
+        SDL_RenderCopyEx(screen->renderer, screen->texture, NULL, dstrect,
+                         angle, NULL, 0);
+    }
+    SDL_RenderPresent(screen->renderer);
+}
+
 void
 screen_switch_fullscreen(struct screen *screen) {
    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
--- a/app/src/screen.h
+++ b/app/src/screen.h
@ -93,6 +93,13 @@ screen_destroy(struct screen *screen);
 void
 screen_hide_window(struct screen *screen);

+// render the texture to the renderer
+//
+// Set the update_content_rect flag if the window or content size may have
+// changed, so that the content rectangle is recomputed
+void
+screen_render(struct screen *screen, bool update_content_rect);
+
 // switch the fullscreen mode
 void
 screen_switch_fullscreen(struct screen *screen);
--- a/app/src/server.c
+++ b/app/src/server.c
--- a/app/src/server.h
+++ b/app/src/server.h
@ -8,29 +8,42 @@
 #include <stdint.h>

 #include "adb.h"
-#include "adb_tunnel.h"
 #include "coords.h"
 #include "options.h"
-#include "util/intr.h"
 #include "util/log.h"
 #include "util/net.h"
 #include "util/thread.h"

-#define SC_DEVICE_NAME_FIELD_LENGTH 64
-struct sc_server_info {
-    char device_name[SC_DEVICE_NAME_FIELD_LENGTH];
+#define DEVICE_NAME_FIELD_LENGTH 64
+struct server_info {
+    char device_name[DEVICE_NAME_FIELD_LENGTH];
    struct sc_size frame_size;
 };

-struct sc_server_params {
+struct server {
+    char *serial;
+    sc_pid process;
+    sc_thread wait_server_thread;
+
+    sc_mutex mutex;
+    sc_cond process_terminated_cond;
+    bool process_terminated;
+
+    sc_socket server_socket; // only used if !tunnel_forward
+    sc_socket video_socket;
+    sc_socket control_socket;
+    uint16_t local_port; // selected from port_range
+    bool tunnel_enabled;
+    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
+};
+
+struct server_params {
    const char *serial;
    enum sc_log_level log_level;
    const char *crop;
    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,67 +54,26 @@ 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 {
-    // The internal allocated strings are copies owned by the server
-    struct sc_server_params params;
-
-    sc_thread thread;
-    struct sc_server_info info; // initialized once connected
-
-    sc_mutex mutex;
-    sc_cond cond_stopped;
-    bool stopped;
-
-    struct sc_intr intr;
-    struct sc_adb_tunnel tunnel;
-
-    sc_socket video_socket;
-    sc_socket control_socket;
-
-    const struct sc_server_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct sc_server_callbacks {
-    /**
-     * Called when the server failed to connect
-     *
-     * If it is called, then on_connected() and on_disconnected() will never be
-     * called.
-     */
-    void (*on_connection_failed)(struct sc_server *server, void *userdata);
-
-    /**
-     * Called on server connection
-     */
-    void (*on_connected)(struct sc_server *server, void *userdata);
-
-    /**
-     * Called on server disconnection (after it has been connected)
-     */
-    void (*on_disconnected)(struct sc_server *server, void *userdata);
-};
-
-// init the server with the given params
+// init default values
 bool
-sc_server_init(struct sc_server *server, const struct sc_server_params *params,
-               const struct sc_server_callbacks *cbs, void *cbs_userdata);
+server_init(struct server *server);

-// start the server asynchronously
+// push, enable tunnel et start the server
 bool
-sc_server_start(struct sc_server *server);
+server_start(struct server *server, const struct server_params *params);
+
+// block until the communication with the server is established
+bool
+server_connect_to(struct server *server, struct server_info *info);

 // disconnect and kill the server process
 void
-sc_server_stop(struct sc_server *server);
+server_stop(struct server *server);

 // close and release sockets
 void
-sc_server_destroy(struct sc_server *server);
+server_destroy(struct server *server);

 #endif
--- a/app/src/stream.c
+++ b/app/src/stream.c
@ -42,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;
    }

@ -111,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;
            }
@ -200,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;
    }

@ -221,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;
    }

--- 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,11 +11,8 @@
 #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,
                     int *pin, int *pout, int *perr) {
-    bool inherit_stdout = !pout && !(flags & SC_PROCESS_NO_STDOUT);
-    bool inherit_stderr = !perr && !(flags & SC_PROCESS_NO_STDERR);
-
    int in[2];
    int out[2];
    int err[2];
@ -93,30 +90,20 @@ 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
-
        if (pout) {
            if (out[1] != STDOUT_FILENO) {
                dup2(out[1], STDOUT_FILENO);
                close(out[1]);
            }
            close(out[0]);
-        } else if (!inherit_stdout) {
-            // Close stdout in the child process
-            close(STDOUT_FILENO);
        }
-
        if (perr) {
            if (err[1] != STDERR_FILENO) {
                dup2(err[1], STDERR_FILENO);
                close(err[1]);
            }
            close(err[0]);
-        } else if (!inherit_stderr) {
-            // Close stderr in the child process
-            close(STDERR_FILENO);
        }
-
        close(internal[0]);
        enum sc_process_result err;
        if (fcntl(internal[1], F_SETFD, FD_CLOEXEC) == 0) {
--- a/app/src/sys/win/file.c
+++ b/app/src/sys/win/file.c
@ -5,7 +5,7 @@
 #include <sys/stat.h>

 #include "util/log.h"
-#include "util/str.h"
+#include "util/str_util.h"

 char *
 sc_file_get_executable_path(void) {
@ -19,14 +19,14 @@ sc_file_get_executable_path(void) {
        return NULL;
    }
    buf[len] = '\0';
-    return sc_str_from_wchars(buf);
+    return utf8_from_wide_char(buf);
 }

 bool
 sc_file_is_regular(const char *path) {
-    wchar_t *wide_path = sc_str_to_wchars(path);
+    wchar_t *wide_path = utf8_to_wide_char(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,11 +1,9 @@
 #include "util/process.h"

-#include <processthreadsapi.h>
-
 #include <assert.h>

 #include "util/log.h"
-#include "util/str.h"
+#include "util/str_util.h"

 #define CMD_MAX_LEN 8192

@ -15,7 +13,7 @@ build_cmd(char *cmd, size_t len, const char *const argv[]) {
    // <http://daviddeley.com/autohotkey/parameters/parameters.htm#WINPASS>
    // only make it work for this very specific program
    // (don't handle escaping nor quotes)
-    size_t ret = sc_str_join(cmd, argv, ' ', len);
+    size_t ret = xstrjoin(cmd, argv, ' ', len);
    if (ret >= len) {
        LOGE("Command too long (%" SC_PRIsizet " chars)", len - 1);
        return false;
@ -24,16 +22,8 @@ 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,
                     HANDLE *pin, HANDLE *pout, HANDLE *perr) {
-    bool inherit_stdout = !pout && !(flags & SC_PROCESS_NO_STDOUT);
-    bool inherit_stderr = !perr && !(flags & SC_PROCESS_NO_STDERR);
-
-    // Add 1 per non-NULL pointer
-    unsigned handle_count = !!pin
-                          + (pout || inherit_stdout)
-                          + (perr || inherit_stderr);
-
    enum sc_process_result ret = SC_PROCESS_ERROR_GENERIC;

    SECURITY_ATTRIBUTES sa;
@ -75,94 +65,45 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,
        }
    }

-    STARTUPINFOEXW si;
+    STARTUPINFOW si;
    PROCESS_INFORMATION pi;
    memset(&si, 0, sizeof(si));
-    si.StartupInfo.cb = sizeof(si);
-    HANDLE handles[3];
-
-    LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList = NULL;
-    if (handle_count) {
-        si.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
-
-        unsigned i = 0;
+    si.cb = sizeof(si);
+    if (pin || pout || perr) {
+        si.dwFlags = STARTF_USESTDHANDLES;
        if (pin) {
-            si.StartupInfo.hStdInput = stdin_read_handle;
-            handles[i++] = si.StartupInfo.hStdInput;
+            si.hStdInput = stdin_read_handle;
        }
-        if (pout || inherit_stdout) {
-            si.StartupInfo.hStdOutput = pout ? stdout_write_handle
-                                             : GetStdHandle(STD_OUTPUT_HANDLE);
-            handles[i++] = si.StartupInfo.hStdOutput;
+        if (pout) {
+            si.hStdOutput = stdout_write_handle;
        }
-        if (perr || inherit_stderr) {
-            si.StartupInfo.hStdError = perr ? stderr_write_handle
-                                            : GetStdHandle(STD_ERROR_HANDLE);
-            handles[i++] = si.StartupInfo.hStdError;
+        if (perr) {
+            si.hStdError = stderr_write_handle;
        }
-
-        SIZE_T size;
-        // Call it once to know the required buffer size
-        BOOL ok =
-            InitializeProcThreadAttributeList(NULL, 1, 0, &size)
-                || GetLastError() == ERROR_INSUFFICIENT_BUFFER;
-        if (!ok) {
-            goto error_close_stderr;
-        }
-
-        lpAttributeList = malloc(size);
-        if (!lpAttributeList) {
-            LOG_OOM();
-            goto error_close_stderr;
-        }
-
-        ok = InitializeProcThreadAttributeList(lpAttributeList, 1, 0, &size);
-        if (!ok) {
-            free(lpAttributeList);
-            goto error_close_stderr;
-        }
-
-        ok = UpdateProcThreadAttribute(lpAttributeList, 0,
-                                       PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
-                                       handles, handle_count * sizeof(HANDLE),
-                                       NULL, NULL);
-        if (!ok) {
-            goto error_free_attribute_list;
-        }
-
-        si.lpAttributeList = lpAttributeList;
    }

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

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

-    BOOL bInheritHandles = handle_count > 0;
-    // DETACHED_PROCESS to disable stdin, stdout and stderr
-    DWORD dwCreationFlags = handle_count > 0 ? EXTENDED_STARTUPINFO_PRESENT
-                                             : DETACHED_PROCESS;
-    BOOL ok = CreateProcessW(NULL, wide, NULL, NULL, bInheritHandles,
-                             dwCreationFlags, NULL, NULL, &si.StartupInfo, &pi);
-    free(wide);
-    if (!ok) {
+    if (!CreateProcessW(NULL, wide, NULL, NULL, TRUE, 0, NULL, NULL, &si,
+                        &pi)) {
+        free(wide);
+        *handle = NULL;
+
        if (GetLastError() == ERROR_FILE_NOT_FOUND) {
            ret = SC_PROCESS_ERROR_MISSING_BINARY;
        }
-        goto error_free_attribute_list;
-    }
-
-    if (lpAttributeList) {
-        DeleteProcThreadAttributeList(lpAttributeList);
-        free(lpAttributeList);
+        goto error_close_stderr;
    }

    // These handles are used by the child process, close them for this process
@ -176,15 +117,11 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,
        CloseHandle(stderr_write_handle);
    }

+    free(wide);
    *handle = pi.hProcess;

    return SC_PROCESS_SUCCESS;

-error_free_attribute_list:
-    if (lpAttributeList) {
-        DeleteProcThreadAttributeList(lpAttributeList);
-        free(lpAttributeList);
-    }
 error_close_stderr:
    if (perr) {
        CloseHandle(*perr);
@ -231,7 +168,7 @@ sc_process_close(HANDLE handle) {
 }

 ssize_t
-sc_pipe_read(HANDLE pipe, char *data, size_t len) {
+sc_read_pipe(HANDLE pipe, char *data, size_t len) {
    DWORD r;
    if (!ReadFile(pipe, data, len, &r, NULL)) {
        return -1;
@ -240,7 +177,7 @@ sc_pipe_read(HANDLE pipe, char *data, size_t len) {
 }

 void
-sc_pipe_close(HANDLE pipe) {
+sc_close_pipe(HANDLE pipe) {
    if (!CloseHandle(pipe)) {
        LOGW("Cannot close pipe");
    }
--- a/app/src/trait/key_processor.h
+++ b/app/src/trait/key_processor.h
@ -14,31 +14,12 @@
 * 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 the 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.
-     */
    void
-    (*process_key)(struct sc_key_processor *kp, const SDL_KeyboardEvent *event,
-                   uint64_t ack_to_wait);
+    (*process_key)(struct sc_key_processor *kp, const SDL_KeyboardEvent *event);

    void
    (*process_text)(struct sc_key_processor *kp,
--- 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/intr.c
+++ b/app/src/util/intr.c
@ -1,83 +0,0 @@
-#include "intr.h"
-
-#include "util/log.h"
-
-#include <assert.h>
-
-bool
-sc_intr_init(struct sc_intr *intr) {
-    bool ok = sc_mutex_init(&intr->mutex);
-    if (!ok) {
-        LOG_OOM();
-        return false;
-    }
-
-    intr->socket = SC_SOCKET_NONE;
-    intr->process = SC_PROCESS_NONE;
-
-    atomic_store_explicit(&intr->interrupted, false, memory_order_relaxed);
-
-    return true;
-}
-
-bool
-sc_intr_set_socket(struct sc_intr *intr, sc_socket socket) {
-    assert(intr->process == SC_PROCESS_NONE);
-
-    sc_mutex_lock(&intr->mutex);
-    bool interrupted =
-        atomic_load_explicit(&intr->interrupted, memory_order_relaxed);
-    if (!interrupted) {
-        intr->socket = socket;
-    }
-    sc_mutex_unlock(&intr->mutex);
-
-    return !interrupted;
-}
-
-bool
-sc_intr_set_process(struct sc_intr *intr, sc_pid pid) {
-    assert(intr->socket == SC_SOCKET_NONE);
-
-    sc_mutex_lock(&intr->mutex);
-    bool interrupted =
-        atomic_load_explicit(&intr->interrupted, memory_order_relaxed);
-    if (!interrupted) {
-        intr->process = pid;
-    }
-    sc_mutex_unlock(&intr->mutex);
-
-    return !interrupted;
-}
-
-void
-sc_intr_interrupt(struct sc_intr *intr) {
-    sc_mutex_lock(&intr->mutex);
-
-    atomic_store_explicit(&intr->interrupted, true, memory_order_relaxed);
-
-    // No more than one component to interrupt
-    assert(intr->socket == SC_SOCKET_NONE ||
-           intr->process == SC_PROCESS_NONE);
-
-    if (intr->socket != SC_SOCKET_NONE) {
-        LOGD("Interrupting socket");
-        net_interrupt(intr->socket);
-        intr->socket = SC_SOCKET_NONE;
-    }
-    if (intr->process != SC_PROCESS_NONE) {
-        LOGD("Interrupting process");
-        sc_process_terminate(intr->process);
-        intr->process = SC_PROCESS_NONE;
-    }
-
-    sc_mutex_unlock(&intr->mutex);
-}
-
-void
-sc_intr_destroy(struct sc_intr *intr) {
-    assert(intr->socket == SC_SOCKET_NONE);
-    assert(intr->process == SC_PROCESS_NONE);
-
-    sc_mutex_destroy(&intr->mutex);
-}
--- a/app/src/util/intr.h
+++ b/app/src/util/intr.h
@ -1,78 +0,0 @@
-#ifndef SC_INTR_H
-#define SC_INTR_H
-
-#include "common.h"
-
-#include <stdatomic.h>
-#include <stdbool.h>
-
-#include "net.h"
-#include "process.h"
-#include "thread.h"
-
-/**
- * Interruptor to wake up a blocking call from another thread
- *
- * It allows to register a socket or a process before a blocking call, and
- * interrupt/close from another thread to wake up the blocking call.
- */
-struct sc_intr {
-    sc_mutex mutex;
-
-    sc_socket socket;
-    sc_pid process;
-
-    // Written protected by the mutex to avoid race conditions against
-    // sc_intr_set_socket() and sc_intr_set_process(), but can be read
-    // (atomically) without mutex
-    atomic_bool interrupted;
-};
-
-/**
- * Initialize an interruptor
- */
-bool
-sc_intr_init(struct sc_intr *intr);
-
-/**
- * Set a socket as the interruptible component
- *
- * Call with SC_SOCKET_NONE to unset.
- */
-bool
-sc_intr_set_socket(struct sc_intr *intr, sc_socket socket);
-
-/**
- * Set a process as the interruptible component
- *
- * Call with SC_PROCESS_NONE to unset.
- */
-bool
-sc_intr_set_process(struct sc_intr *intr, sc_pid socket);
-
-/**
- * Interrupt the current interruptible component
- *
- * Must be called from a different thread.
- */
-void
-sc_intr_interrupt(struct sc_intr *intr);
-
-/**
- * Read the interrupted state
- *
- * It is exposed as a static inline function because it just loads from an
- * atomic.
- */
-static inline bool
-sc_intr_is_interrupted(struct sc_intr *intr) {
-    return atomic_load_explicit(&intr->interrupted, memory_order_relaxed);
-}
-
-/**
- * Destroy the interruptor
- */
-void
-sc_intr_destroy(struct sc_intr *intr);
-
-#endif
--- 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
@ -51,14 +46,13 @@ static inline sc_socket
 wrap(sc_raw_socket sock) {
 #ifdef __WINDOWS__
    if (sock == INVALID_SOCKET) {
-        return SC_SOCKET_NONE;
+        return SC_INVALID_SOCKET;
    }

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

    socket->socket = sock;
@ -73,7 +67,7 @@ wrap(sc_raw_socket sock) {
 static inline sc_raw_socket
 unwrap(sc_socket socket) {
 #ifdef __WINDOWS__
-    if (socket == SC_SOCKET_NONE) {
+    if (socket == SC_INVALID_SOCKET) {
        return INVALID_SOCKET;
    }

@ -83,35 +77,6 @@ unwrap(sc_socket socket) {
 #endif
 }

-static inline bool
-sc_raw_socket_close(sc_raw_socket raw_sock) {
-#ifndef _WIN32
-    return !close(raw_sock);
-#else
-    return !closesocket(raw_sock);
-#endif
-}
-
-#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
@ -129,27 +94,13 @@ 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
+net_connect(uint32_t addr, uint16_t port) {
    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) {
+    if (sock == SC_INVALID_SOCKET) {
        net_perror("socket");
+        return SC_INVALID_SOCKET;
    }
-    return sock;
-}
-
-bool
-net_connect(sc_socket socket, uint32_t addr, uint16_t port) {
-    sc_raw_socket raw_sock = unwrap(socket);

    SOCKADDR_IN sin;
    sin.sin_family = AF_INET;
@ -158,15 +109,21 @@ net_connect(sc_socket socket, uint32_t addr, uint16_t port) {

    if (connect(raw_sock, (SOCKADDR *) &sin, sizeof(sin)) == SOCKET_ERROR) {
        net_perror("connect");
-        return false;
+        net_close(sock);
+        return SC_INVALID_SOCKET;
    }

-    return true;
+    return sock;
 }

-bool
-net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog) {
-    sc_raw_socket raw_sock = unwrap(socket);
+sc_socket
+net_listen(uint32_t addr, uint16_t port, int backlog) {
+    sc_raw_socket raw_sock = socket(AF_INET, SOCK_STREAM, 0);
+    sc_socket sock = wrap(raw_sock);
+    if (sock == SC_INVALID_SOCKET) {
+        net_perror("socket");
+        return SC_INVALID_SOCKET;
+    }

    int reuse = 1;
    if (setsockopt(raw_sock, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse,
@ -181,15 +138,17 @@ net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog) {

    if (bind(raw_sock, (SOCKADDR *) &sin, sizeof(sin)) == SOCKET_ERROR) {
        net_perror("bind");
-        return false;
+        net_close(sock);
+        return SC_INVALID_SOCKET;
    }

    if (listen(raw_sock, backlog) == SOCKET_ERROR) {
        net_perror("listen");
-        return false;
+        net_close(sock);
+        return SC_INVALID_SOCKET;
    }

-    return true;
+    return sock;
 }

 sc_socket
@ -198,18 +157,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);
 }
@ -249,7 +198,7 @@ net_send_all(sc_socket socket, const void *buf, size_t len) {

 bool
 net_interrupt(sc_socket socket) {
-    assert(socket != SC_SOCKET_NONE);
+    assert(socket != SC_INVALID_SOCKET);

    sc_raw_socket raw_sock = unwrap(socket);

@ -263,6 +212,7 @@ net_interrupt(sc_socket socket) {
 #endif
 }

+#include <errno.h>
 bool
 net_close(sc_socket socket) {
    sc_raw_socket raw_sock = unwrap(socket);
@ -278,15 +228,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
@ -11,7 +11,7 @@

 # include <winsock2.h>
 # include <stdatomic.h>
-# define SC_SOCKET_NONE NULL
+# define SC_INVALID_SOCKET NULL
  typedef struct sc_socket_windows {
      SOCKET socket;
      atomic_flag closed;
@ -20,13 +20,10 @@
 #else // not __WINDOWS__

 # include <sys/socket.h>
-# define SC_SOCKET_NONE -1
+# define SC_INVALID_SOCKET -1
  typedef int sc_socket;
-
 #endif

-#define IPV4_LOCALHOST 0x7F000001
-
 bool
 net_init(void);

@ -34,13 +31,10 @@ void
 net_cleanup(void);

 sc_socket
-net_socket(void);
+net_connect(uint32_t addr, uint16_t port);

-bool
-net_connect(sc_socket socket, uint32_t addr, uint16_t port);
-
-bool
-net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog);
+sc_socket
+net_listen(uint32_t addr, uint16_t port, int backlog);

 sc_socket
 net_accept(sc_socket server_socket);
@ -68,10 +62,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/net_intr.c
+++ b/app/src/util/net_intr.c
@ -1,97 +0,0 @@
-#include "net_intr.h"
-
-bool
-net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
-                 uint16_t port) {
-    if (!sc_intr_set_socket(intr, socket)) {
-        // Already interrupted
-        return false;
-    }
-
-    bool ret = net_connect(socket, addr, port);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return ret;
-}
-
-bool
-net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
-                uint16_t port, int backlog) {
-    if (!sc_intr_set_socket(intr, socket)) {
-        // Already interrupted
-        return false;
-    }
-
-    bool ret = net_listen(socket, addr, port, backlog);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return ret;
-}
-
-sc_socket
-net_accept_intr(struct sc_intr *intr, sc_socket server_socket) {
-    if (!sc_intr_set_socket(intr, server_socket)) {
-        // Already interrupted
-        return SC_SOCKET_NONE;
-    }
-
-    sc_socket socket = net_accept(server_socket);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return socket;
-}
-
-ssize_t
-net_recv_intr(struct sc_intr *intr, sc_socket socket, void *buf, size_t len) {
-    if (!sc_intr_set_socket(intr, socket)) {
-        // Already interrupted
-        return -1;
-    }
-
-    ssize_t r = net_recv(socket, buf, len);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return r;
-}
-
-ssize_t
-net_recv_all_intr(struct sc_intr *intr, sc_socket socket, void *buf,
-                  size_t len) {
-    if (!sc_intr_set_socket(intr, socket)) {
-        // Already interrupted
-        return -1;
-    }
-
-    ssize_t r = net_recv_all(socket, buf, len);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return r;
-}
-
-ssize_t
-net_send_intr(struct sc_intr *intr, sc_socket socket, const void *buf,
-              size_t len) {
-    if (!sc_intr_set_socket(intr, socket)) {
-        // Already interrupted
-        return -1;
-    }
-
-    ssize_t w = net_send(socket, buf, len);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return w;
-}
-
-ssize_t
-net_send_all_intr(struct sc_intr *intr, sc_socket socket, const void *buf,
-                  size_t len) {
-    if (!sc_intr_set_socket(intr, socket)) {
-        // Already interrupted
-        return -1;
-    }
-
-    ssize_t w = net_send_all(socket, buf, len);
-
-    sc_intr_set_socket(intr, SC_SOCKET_NONE);
-    return w;
-}
--- a/app/src/util/net_intr.h
+++ b/app/src/util/net_intr.h
@ -1,35 +0,0 @@
-#ifndef SC_NET_INTR_H
-#define SC_NET_INTR_H
-
-#include "common.h"
-
-#include "intr.h"
-#include "net.h"
-
-bool
-net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
-                 uint16_t port);
-
-bool
-net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
-                uint16_t port, int backlog);
-
-sc_socket
-net_accept_intr(struct sc_intr *intr, sc_socket server_socket);
-
-ssize_t
-net_recv_intr(struct sc_intr *intr, sc_socket socket, void *buf, size_t len);
-
-ssize_t
-net_recv_all_intr(struct sc_intr *intr, sc_socket socket, void *buf,
-                  size_t len);
-
-ssize_t
-net_send_intr(struct sc_intr *intr, sc_socket socket, const void *buf,
-              size_t len);
-
-ssize_t
-net_send_all_intr(struct sc_intr *intr, sc_socket socket, const void *buf,
-                  size_t len);
-
-#endif
--- a/app/src/util/process.c
+++ b/app/src/util/process.c
@ -1,12 +1,30 @@
 #include "process.h"

-#include <assert.h>
 #include <libgen.h>
 #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) {
+    return sc_process_execute_p(argv, pid, 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
@ -23,80 +41,3 @@ sc_pipe_read_all(sc_pipe pipe, char *data, size_t len) {
    }
    return copied;
 }
-
-static int
-run_observer(void *data) {
-    struct sc_process_observer *observer = data;
-    sc_process_wait(observer->pid, false); // ignore exit code
-
-    sc_mutex_lock(&observer->mutex);
-    observer->terminated = true;
-    sc_cond_signal(&observer->cond_terminated);
-    sc_mutex_unlock(&observer->mutex);
-
-    if (observer->listener) {
-        observer->listener->on_terminated(observer->listener_userdata);
-    }
-
-    return 0;
-}
-
-bool
-sc_process_observer_init(struct sc_process_observer *observer, sc_pid pid,
-                         const struct sc_process_listener *listener,
-                         void *listener_userdata) {
-    // Either no listener, or on_terminated() is defined
-    assert(!listener || listener->on_terminated);
-
-    bool ok = sc_mutex_init(&observer->mutex);
-    if (!ok) {
-        return false;
-    }
-
-    ok = sc_cond_init(&observer->cond_terminated);
-    if (!ok) {
-        sc_mutex_destroy(&observer->mutex);
-        return false;
-    }
-
-    observer->pid = pid;
-    observer->listener = listener;
-    observer->listener_userdata = listener_userdata;
-    observer->terminated = false;
-
-    ok = sc_thread_create(&observer->thread, run_observer, "process_observer",
-                          observer);
-    if (!ok) {
-        sc_cond_destroy(&observer->cond_terminated);
-        sc_mutex_destroy(&observer->mutex);
-        return false;
-    }
-
-    return true;
-}
-
-bool
-sc_process_observer_timedwait(struct sc_process_observer *observer,
-                              sc_tick deadline) {
-    sc_mutex_lock(&observer->mutex);
-    bool timed_out = false;
-    while (!observer->terminated && !timed_out) {
-        timed_out = !sc_cond_timedwait(&observer->cond_terminated,
-                                       &observer->mutex, deadline);
-    }
-    bool terminated = observer->terminated;
-    sc_mutex_unlock(&observer->mutex);
-
-    return terminated;
-}
-
-void
-sc_process_observer_join(struct sc_process_observer *observer) {
-    sc_thread_join(&observer->thread, NULL);
-}
-
-void
-sc_process_observer_destroy(struct sc_process_observer *observer) {
-    sc_cond_destroy(&observer->cond_terminated);
-    sc_mutex_destroy(&observer->mutex);
-}
--- a/app/src/util/process.h
+++ b/app/src/util/process.h
@ -4,7 +4,6 @@
 #include "common.h"

 #include <stdbool.h>
-#include "util/thread.h"

 #ifdef _WIN32

@ -33,66 +32,26 @@

 #endif

-struct sc_process_listener {
-    void (*on_terminated)(void *userdata);
-};
-
-/**
- * Tool to observe process termination
- *
- * To keep things simple and multiplatform, it runs a separate thread to wait
- * for process termination (without closing the process to avoid race
- * conditions).
- *
- * It allows a caller to block until the process is terminated (with a
- * timeout), and to be notified asynchronously from the observer thread.
- *
- * The process is not owned by the observer (the observer will never close it).
- */
-struct sc_process_observer {
-    sc_pid pid;
-
-    sc_mutex mutex;
-    sc_cond cond_terminated;
-    bool terminated;
-
-    sc_thread thread;
-    const struct sc_process_listener *listener;
-    void *listener_userdata;
-};
-
 enum sc_process_result {
    SC_PROCESS_SUCCESS,
    SC_PROCESS_ERROR_GENERIC,
    SC_PROCESS_ERROR_MISSING_BINARY,
 };

-#define SC_PROCESS_NO_STDOUT (1 << 0)
-#define SC_PROCESS_NO_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).
 */
 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);

 /**
 * Execute the command and write the process id to `pid`
 *
 * 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()`.
 */
 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,
                     sc_pipe *pin, sc_pipe *pout, sc_pipe *perr);

 /**
@ -119,6 +78,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
 *
@ -139,42 +106,4 @@ sc_pipe_read_all(sc_pipe pipe, char *data, size_t len);
 void
 sc_pipe_close(sc_pipe pipe);

-/**
- * Start observing process
- *
- * The listener is optional. If set, its callback will be called from the
- * observer thread once the process is terminated.
- */
-bool
-sc_process_observer_init(struct sc_process_observer *observer, sc_pid pid,
-                         const struct sc_process_listener *listener,
-                         void *listener_userdata);
-
-/**
- * Wait for process termination until a deadline
- *
- * Return true if the process is already terminated. Return false if the
- * process terminatation has not been detected yet (however, it may have
- * terminated in the meantime).
- *
- * To wait without timeout/deadline, just use sc_process_wait() instead.
- */
-bool
-sc_process_observer_timedwait(struct sc_process_observer *observer,
-                              sc_tick deadline);
-
-/**
- * Join the observer thread
- */
-void
-sc_process_observer_join(struct sc_process_observer *observer);
-
-/**
- * Destroy the observer
- *
- * This does not close the associated process.
- */
-void
-sc_process_observer_destroy(struct sc_process_observer *observer);
-
 #endif
--- a/app/src/util/process_intr.c
+++ b/app/src/util/process_intr.c
@ -1,29 +0,0 @@
-#include "process_intr.h"
-
-ssize_t
-sc_pipe_read_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe, char *data,
-                  size_t len) {
-    if (!sc_intr_set_process(intr, pid)) {
-        // Already interrupted
-        return false;
-    }
-
-    ssize_t ret = sc_pipe_read(pipe, data, len);
-
-    sc_intr_set_process(intr, SC_PROCESS_NONE);
-    return ret;
-}
-
-ssize_t
-sc_pipe_read_all_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe,
-                      char *data, size_t len) {
-    if (!sc_intr_set_process(intr, pid)) {
-        // Already interrupted
-        return false;
-    }
-
-    ssize_t ret = sc_pipe_read_all(pipe, data, len);
-
-    sc_intr_set_process(intr, SC_PROCESS_NONE);
-    return ret;
-}
--- a/app/src/util/process_intr.h
+++ b/app/src/util/process_intr.h
@ -1,17 +0,0 @@
-#ifndef SC_PROCESS_INTR_H
-#define SC_PROCESS_INTR_H
-
-#include "common.h"
-
-#include "intr.h"
-#include "process.h"
-
-ssize_t
-sc_pipe_read_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe, char *data,
-                  size_t len);
-
-ssize_t
-sc_pipe_read_all_intr(struct sc_intr *intr, sc_pid pid, sc_pipe pipe,
-                      char *data, size_t len);
-
-#endif
--- a/app/src/util/str.h
+++ b/app/src/util/str.h
@ -1,148 +0,0 @@
-#ifndef SC_STR_H
-#define SC_STR_H
-
-#include "common.h"
-
-#include <stdbool.h>
-#include <stddef.h>
-
-/**
- * Like strncpy(), except:
- *  - it copies at most n-1 chars
- *  - the dest string is nul-terminated
- *  - it does not write useless bytes if strlen(src) < n
- *  - it returns the number of chars actually written (max n-1) if src has
- *    been copied completely, or n if src has been truncated
- */
-size_t
-sc_strncpy(char *dest, const char *src, size_t n);
-
-/**
- * Join tokens by separator `sep` into `dst`
- *
- * Return the number of chars actually written (max n-1) if no truncation
- * occurred, or n if truncated.
- */
-size_t
-sc_str_join(char *dst, const char *const tokens[], char sep, size_t n);
-
-/**
- * Quote a string
- *
- * Return a new allocated string, surrounded with quotes (`"`).
- */
-char *
-sc_str_quote(const char *src);
-
-/**
- * Parse `s` as an integer into `out`
- *
- * Return true if the conversion succeeded, false otherwise.
- */
-bool
-sc_str_parse_integer(const char *s, long *out);
-
-/**
- * Parse `s` as integers separated by `sep` (for example `1234:2000`) into `out`
- *
- * Returns the number of integers on success, 0 on failure.
- */
-size_t
-sc_str_parse_integers(const char *s, const char sep, size_t max_items,
-                      long *out);
-
-/**
- * Parse `s` as an integer into `out`
- *
- * Like `sc_str_parse_integer()`, but accept 'k'/'K' (x1000) and 'm'/'M'
- * (x1000000) as suffixes.
- *
- * Return true if the conversion succeeded, false otherwise.
- */
-bool
-sc_str_parse_integer_with_suffix(const char *s, long *out);
-
-/**
- * Search `s` in the list separated by `sep`
- *
- * For example, sc_str_list_contains("a,bc,def", ',', "bc") returns true.
- */
-bool
-sc_str_list_contains(const char *list, char sep, const char *s);
-
-/**
- * Return the index to truncate a UTF-8 string at a valid position
- */
-size_t
-sc_str_utf8_truncation_index(const char *utf8, size_t max_len);
-
-#ifdef _WIN32
-/**
- * Convert a UTF-8 string to a wchar_t string
- *
- * Return the new allocated string, to be freed by the caller.
- */
-wchar_t *
-sc_str_to_wchars(const char *utf8);
-
-/**
- * Convert a wchar_t string to a UTF-8 string
- *
- * Return the new allocated string, to be freed by the caller.
- */
-char *
-sc_str_from_wchars(const wchar_t *s);
-#endif
-
-/**
- * Wrap input lines to fit in `columns` columns
- *
- * Break input lines at word boundaries (spaces) so that they fit in `columns`
- * columns, left-indented by `indent` spaces.
- */
-char *
-sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent);
-
-/**
- * Truncate the data after any of the characters from `endchars`
- *
- * An '\0' is always written at the end of the data, even if no newline
- * character is encountered.
- *
- * Return the size of the resulting line.
- */
-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/str_util.c
+++ b/app/src/util/str_util.c
@ -1,21 +1,19 @@
-#include "str.h"
+#include "str_util.h"

 #include <assert.h>
 #include <errno.h>
 #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) {
+xstrncpy(char *dest, const char *src, size_t n) {
    size_t i;
    for (i = 0; i < n - 1 && src[i] != '\0'; ++i)
        dest[i] = src[i];
@ -25,7 +23,7 @@ sc_strncpy(char *dest, const char *src, size_t n) {
 }

 size_t
-sc_str_join(char *dst, const char *const tokens[], char sep, size_t n) {
+xstrjoin(char *dst, const char *const tokens[], char sep, size_t n) {
    const char *const *remaining = tokens;
    const char *token = *remaining++;
    size_t i = 0;
@ -35,7 +33,7 @@ sc_str_join(char *dst, const char *const tokens[], char sep, size_t n) {
            if (i == n)
                goto truncated;
        }
-        size_t w = sc_strncpy(dst + i, token, n - i);
+        size_t w = xstrncpy(dst + i, token, n - i);
        if (w >= n - i)
            goto truncated;
        i += w;
@ -49,11 +47,10 @@ truncated:
 }

 char *
-sc_str_quote(const char *src) {
+strquote(const char *src) {
    size_t len = strlen(src);
    char *quoted = malloc(len + 3);
    if (!quoted) {
-        LOG_OOM();
        return NULL;
    }
    memcpy(&quoted[1], src, len);
@ -64,7 +61,7 @@ sc_str_quote(const char *src) {
 }

 bool
-sc_str_parse_integer(const char *s, long *out) {
+parse_integer(const char *s, long *out) {
    char *endptr;
    if (*s == '\0') {
        return false;
@ -83,8 +80,7 @@ sc_str_parse_integer(const char *s, long *out) {
 }

 size_t
-sc_str_parse_integers(const char *s, const char sep, size_t max_items,
-                      long *out) {
+parse_integers(const char *s, const char sep, size_t max_items, long *out) {
    size_t count = 0;
    char *endptr;
    do {
@ -113,7 +109,7 @@ sc_str_parse_integers(const char *s, const char sep, size_t max_items,
 }

 bool
-sc_str_parse_integer_with_suffix(const char *s, long *out) {
+parse_integer_with_suffix(const char *s, long *out) {
    char *endptr;
    if (*s == '\0') {
        return false;
@ -147,7 +143,7 @@ sc_str_parse_integer_with_suffix(const char *s, long *out) {
 }

 bool
-sc_str_list_contains(const char *list, char sep, const char *s) {
+strlist_contains(const char *list, char sep, const char *s) {
    char *p;
    do {
        p = strchr(list, sep);
@ -165,7 +161,7 @@ sc_str_list_contains(const char *list, char sep, const char *s) {
 }

 size_t
-sc_str_utf8_truncation_index(const char *utf8, size_t max_len) {
+utf8_truncation_index(const char *utf8, size_t max_len) {
    size_t len = strlen(utf8);
    if (len <= max_len) {
        return len;
@ -183,7 +179,7 @@ sc_str_utf8_truncation_index(const char *utf8, size_t max_len) {
 #ifdef _WIN32

 wchar_t *
-sc_str_to_wchars(const char *utf8) {
+utf8_to_wide_char(const char *utf8) {
    int len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0);
    if (!len) {
        return NULL;
@ -191,7 +187,6 @@ sc_str_to_wchars(const char *utf8) {

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

@ -200,7 +195,7 @@ sc_str_to_wchars(const char *utf8) {
 }

 char *
-sc_str_from_wchars(const wchar_t *ws) {
+utf8_from_wide_char(const wchar_t *ws) {
    int len = WideCharToMultiByte(CP_UTF8, 0, ws, -1, NULL, 0, NULL, NULL);
    if (!len) {
        return NULL;
@ -208,7 +203,6 @@ sc_str_from_wchars(const wchar_t *ws) {

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

@ -218,8 +212,7 @@ sc_str_from_wchars(const wchar_t *ws) {

 #endif

-char *
-sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent) {
+char *sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent) {
    assert(indent < columns);

    struct sc_strbuf buf;
@ -296,48 +289,3 @@ error:
    free(buf.s);
    return NULL;
 }
-
-size_t
-sc_str_truncate(char *data, size_t len, const char *endchars) {
-    data[len - 1] = '\0';
-    size_t idx = strcspn(data, 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_util.h
+++ b/app/src/util/str_util.h
@ -0,0 +1,73 @@
+#ifndef STRUTIL_H
+#define STRUTIL_H
+
+#include "common.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+
+// like strncpy, except:
+//  - it copies at most n-1 chars
+//  - the dest string is nul-terminated
+//  - it does not write useless bytes if strlen(src) < n
+//  - it returns the number of chars actually written (max n-1) if src has
+//    been copied completely, or n if src has been truncated
+size_t
+xstrncpy(char *dest, const char *src, size_t n);
+
+// join tokens by sep into dst
+// returns the number of chars actually written (max n-1) if no truncation
+// occurred, or n if truncated
+size_t
+xstrjoin(char *dst, const char *const tokens[], char sep, size_t n);
+
+// quote a string
+// returns the new allocated string, to be freed by the caller
+char *
+strquote(const char *src);
+
+// parse s as an integer into value
+// returns true if the conversion succeeded, false otherwise
+bool
+parse_integer(const char *s, long *out);
+
+// parse s as integers separated by sep (for example '1234:2000')
+// returns the number of integers on success, 0 on failure
+size_t
+parse_integers(const char *s, const char sep, size_t max_items, long *out);
+
+// parse s as an integer into value
+// like parse_integer(), but accept 'k'/'K' (x1000) and 'm'/'M' (x1000000) as
+// suffix
+// returns true if the conversion succeeded, false otherwise
+bool
+parse_integer_with_suffix(const char *s, long *out);
+
+// search s in the list separated by sep
+// for example, strlist_contains("a,bc,def", ',', "bc") returns true
+bool
+strlist_contains(const char *list, char sep, const char *s);
+
+// return the index to truncate a UTF-8 string at a valid position
+size_t
+utf8_truncation_index(const char *utf8, size_t max_len);
+
+#ifdef _WIN32
+// convert a UTF-8 string to a wchar_t string
+// returns the new allocated string, to be freed by the caller
+wchar_t *
+utf8_to_wide_char(const char *utf8);
+
+char *
+utf8_from_wide_char(const wchar_t *s);
+#endif
+
+/**
+ * Wrap input lines to fit in `columns` columns
+ *
+ * Break input lines at word boundaries (spaces) so that they fit in `columns`
+ * columns, left-indented by `indent` spaces.
+ */
+char *sc_str_wrap_lines(const char *input, unsigned columns, unsigned indent);
+
+#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
@ -10,7 +10,6 @@ sc_thread_create(sc_thread *thread, sc_thread_fn fn, const char *name,
                 void *userdata) {
    SDL_Thread *sdl_thread = SDL_CreateThread(fn, name, userdata);
    if (!sdl_thread) {
-        LOG_OOM();
        return false;
    }

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

@ -96,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/v4l2_sink.c
+++ b/app/src/v4l2_sink.c
@ -1,9 +1,7 @@
 #include "v4l2_sink.h"

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

 /** Downcast frame_sink to sc_v4l2_sink */
 #define DOWNCAST(SINK) container_of(SINK, struct sc_v4l2_sink, frame_sink)
@ -23,7 +21,7 @@ find_muxer(const char *name) {
        oformat = av_oformat_next(oformat);
 #endif
        // until null or containing the requested name
-    } while (oformat && !sc_str_list_contains(oformat->name, ',', name));
+    } while (oformat && !strlist_contains(oformat->name, ',', name));
    return oformat;
 }

@ -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;
    }

--- 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);
@ -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,83 +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"));
-}
-
-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"));
-}
-
-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"));
-}
-
-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"));
-}
-
-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"));
-}
-
-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_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@ -78,7 +78,7 @@ static void test_serialize_inject_touch_event(void) {
        .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,
@ -226,7 +226,6 @@ static void test_serialize_set_clipboard(void) {
    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_SET_CLIPBOARD,
        .set_clipboard = {
-            .sequence = UINT64_C(0x0102030405060708),
            .paste = true,
            .text = "hello, world!",
        },
@ -234,11 +233,10 @@ static void test_serialize_set_clipboard(void) {

    unsigned char buf[CONTROL_MSG_MAX_SIZE];
    size_t size = control_msg_serialize(&msg, buf);
-    assert(size == 27);
+    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
--- 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_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/app/tests/test_strutil.c
+++ b/app/tests/test_strutil.c
@ -3,14 +3,13 @@
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>

-#include "util/str.h"
+#include "util/str_util.h"

-static void test_strncpy_simple(void) {
+static void test_xstrncpy_simple(void) {
    char s[] = "xxxxxxxxxx";
-    size_t w = sc_strncpy(s, "abcdef", sizeof(s));
+    size_t w = xstrncpy(s, "abcdef", sizeof(s));

    // returns strlen of copied string
    assert(w == 6);
@ -25,9 +24,9 @@ static void test_strncpy_simple(void) {
    assert(!strcmp("abcdef", s));
 }

-static void test_strncpy_just_fit(void) {
+static void test_xstrncpy_just_fit(void) {
    char s[] = "xxxxxx";
-    size_t w = sc_strncpy(s, "abcdef", sizeof(s));
+    size_t w = xstrncpy(s, "abcdef", sizeof(s));

    // returns strlen of copied string
    assert(w == 6);
@ -39,9 +38,9 @@ static void test_strncpy_just_fit(void) {
    assert(!strcmp("abcdef", s));
 }

-static void test_strncpy_truncated(void) {
+static void test_xstrncpy_truncated(void) {
    char s[] = "xxx";
-    size_t w = sc_strncpy(s, "abcdef", sizeof(s));
+    size_t w = xstrncpy(s, "abcdef", sizeof(s));

    // returns 'n' (sizeof(s))
    assert(w == 4);
@ -53,10 +52,10 @@ static void test_strncpy_truncated(void) {
    assert(!strncmp("abcdef", s, 3));
 }

-static void test_join_simple(void) {
+static void test_xstrjoin_simple(void) {
    const char *const tokens[] = { "abc", "de", "fghi", NULL };
    char s[] = "xxxxxxxxxxxxxx";
-    size_t w = sc_str_join(s, tokens, ' ', sizeof(s));
+    size_t w = xstrjoin(s, tokens, ' ', sizeof(s));

    // returns strlen of concatenation
    assert(w == 11);
@ -71,10 +70,10 @@ static void test_join_simple(void) {
    assert(!strcmp("abc de fghi", s));
 }

-static void test_join_just_fit(void) {
+static void test_xstrjoin_just_fit(void) {
    const char *const tokens[] = { "abc", "de", "fghi", NULL };
    char s[] = "xxxxxxxxxxx";
-    size_t w = sc_str_join(s, tokens, ' ', sizeof(s));
+    size_t w = xstrjoin(s, tokens, ' ', sizeof(s));

    // returns strlen of concatenation
    assert(w == 11);
@ -86,10 +85,10 @@ static void test_join_just_fit(void) {
    assert(!strcmp("abc de fghi", s));
 }

-static void test_join_truncated_in_token(void) {
+static void test_xstrjoin_truncated_in_token(void) {
    const char *const tokens[] = { "abc", "de", "fghi", NULL };
    char s[] = "xxxxx";
-    size_t w = sc_str_join(s, tokens, ' ', sizeof(s));
+    size_t w = xstrjoin(s, tokens, ' ', sizeof(s));

    // returns 'n' (sizeof(s))
    assert(w == 6);
@ -101,10 +100,10 @@ static void test_join_truncated_in_token(void) {
    assert(!strcmp("abc d", s));
 }

-static void test_join_truncated_before_sep(void) {
+static void test_xstrjoin_truncated_before_sep(void) {
    const char *const tokens[] = { "abc", "de", "fghi", NULL };
    char s[] = "xxxxxx";
-    size_t w = sc_str_join(s, tokens, ' ', sizeof(s));
+    size_t w = xstrjoin(s, tokens, ' ', sizeof(s));

    // returns 'n' (sizeof(s))
    assert(w == 7);
@ -116,10 +115,10 @@ static void test_join_truncated_before_sep(void) {
    assert(!strcmp("abc de", s));
 }

-static void test_join_truncated_after_sep(void) {
+static void test_xstrjoin_truncated_after_sep(void) {
    const char *const tokens[] = { "abc", "de", "fghi", NULL };
    char s[] = "xxxxxxx";
-    size_t w = sc_str_join(s, tokens, ' ', sizeof(s));
+    size_t w = xstrjoin(s, tokens, ' ', sizeof(s));

    // returns 'n' (sizeof(s))
    assert(w == 8);
@ -131,9 +130,9 @@ static void test_join_truncated_after_sep(void) {
    assert(!strcmp("abc de ", s));
 }

-static void test_quote(void) {
+static void test_strquote(void) {
    const char *s = "abcde";
-    char *out = sc_str_quote(s);
+    char *out = strquote(s);

    // add '"' at the beginning and the end
    assert(!strcmp("\"abcde\"", out));
@ -147,71 +146,71 @@ static void test_utf8_truncate(void) {

    size_t count;

-    count = sc_str_utf8_truncation_index(s, 1);
+    count = utf8_truncation_index(s, 1);
    assert(count == 1);

-    count = sc_str_utf8_truncation_index(s, 2);
+    count = utf8_truncation_index(s, 2);
    assert(count == 1); // É is 2 bytes-wide

-    count = sc_str_utf8_truncation_index(s, 3);
+    count = utf8_truncation_index(s, 3);
    assert(count == 3);

-    count = sc_str_utf8_truncation_index(s, 4);
+    count = utf8_truncation_index(s, 4);
    assert(count == 4);

-    count = sc_str_utf8_truncation_index(s, 5);
+    count = utf8_truncation_index(s, 5);
    assert(count == 4); // Ô is 2 bytes-wide

-    count = sc_str_utf8_truncation_index(s, 6);
+    count = utf8_truncation_index(s, 6);
    assert(count == 6);

-    count = sc_str_utf8_truncation_index(s, 7);
+    count = utf8_truncation_index(s, 7);
    assert(count == 7);

-    count = sc_str_utf8_truncation_index(s, 8);
+    count = utf8_truncation_index(s, 8);
    assert(count == 7); // no more chars
 }

 static void test_parse_integer(void) {
    long value;
-    bool ok = sc_str_parse_integer("1234", &value);
+    bool ok = parse_integer("1234", &value);
    assert(ok);
    assert(value == 1234);

-    ok = sc_str_parse_integer("-1234", &value);
+    ok = parse_integer("-1234", &value);
    assert(ok);
    assert(value == -1234);

-    ok = sc_str_parse_integer("1234k", &value);
+    ok = parse_integer("1234k", &value);
    assert(!ok);

-    ok = sc_str_parse_integer("123456789876543212345678987654321", &value);
+    ok = parse_integer("123456789876543212345678987654321", &value);
    assert(!ok); // out-of-range
 }

 static void test_parse_integers(void) {
    long values[5];

-    size_t count = sc_str_parse_integers("1234", ':', 5, values);
+    size_t count = parse_integers("1234", ':', 5, values);
    assert(count == 1);
    assert(values[0] == 1234);

-    count = sc_str_parse_integers("1234:5678", ':', 5, values);
+    count = parse_integers("1234:5678", ':', 5, values);
    assert(count == 2);
    assert(values[0] == 1234);
    assert(values[1] == 5678);

-    count = sc_str_parse_integers("1234:5678", ':', 2, values);
+    count = parse_integers("1234:5678", ':', 2, values);
    assert(count == 2);
    assert(values[0] == 1234);
    assert(values[1] == 5678);

-    count = sc_str_parse_integers("1234:-5678", ':', 2, values);
+    count = parse_integers("1234:-5678", ':', 2, values);
    assert(count == 2);
    assert(values[0] == 1234);
    assert(values[1] == -5678);

-    count = sc_str_parse_integers("1:2:3:4:5", ':', 5, values);
+    count = parse_integers("1:2:3:4:5", ':', 5, values);
    assert(count == 5);
    assert(values[0] == 1);
    assert(values[1] == 2);
@ -219,85 +218,85 @@ static void test_parse_integers(void) {
    assert(values[3] == 4);
    assert(values[4] == 5);

-    count = sc_str_parse_integers("1234:5678", ':', 1, values);
+    count = parse_integers("1234:5678", ':', 1, values);
    assert(count == 0); // max_items == 1

-    count = sc_str_parse_integers("1:2:3:4:5", ':', 3, values);
+    count = parse_integers("1:2:3:4:5", ':', 3, values);
    assert(count == 0); // max_items == 3

-    count = sc_str_parse_integers(":1234", ':', 5, values);
+    count = parse_integers(":1234", ':', 5, values);
    assert(count == 0); // invalid

-    count = sc_str_parse_integers("1234:", ':', 5, values);
+    count = parse_integers("1234:", ':', 5, values);
    assert(count == 0); // invalid

-    count = sc_str_parse_integers("1234:", ':', 1, values);
+    count = parse_integers("1234:", ':', 1, values);
    assert(count == 0); // invalid, even when max_items == 1

-    count = sc_str_parse_integers("1234::5678", ':', 5, values);
+    count = parse_integers("1234::5678", ':', 5, values);
    assert(count == 0); // invalid
 }

 static void test_parse_integer_with_suffix(void) {
    long value;
-    bool ok = sc_str_parse_integer_with_suffix("1234", &value);
+    bool ok = parse_integer_with_suffix("1234", &value);
    assert(ok);
    assert(value == 1234);

-    ok = sc_str_parse_integer_with_suffix("-1234", &value);
+    ok = parse_integer_with_suffix("-1234", &value);
    assert(ok);
    assert(value == -1234);

-    ok = sc_str_parse_integer_with_suffix("1234k", &value);
+    ok = parse_integer_with_suffix("1234k", &value);
    assert(ok);
    assert(value == 1234000);

-    ok = sc_str_parse_integer_with_suffix("1234m", &value);
+    ok = parse_integer_with_suffix("1234m", &value);
    assert(ok);
    assert(value == 1234000000);

-    ok = sc_str_parse_integer_with_suffix("-1234k", &value);
+    ok = parse_integer_with_suffix("-1234k", &value);
    assert(ok);
    assert(value == -1234000);

-    ok = sc_str_parse_integer_with_suffix("-1234m", &value);
+    ok = parse_integer_with_suffix("-1234m", &value);
    assert(ok);
    assert(value == -1234000000);

-    ok = sc_str_parse_integer_with_suffix("123456789876543212345678987654321", &value);
+    ok = parse_integer_with_suffix("123456789876543212345678987654321", &value);
    assert(!ok); // out-of-range

    char buf[32];

    sprintf(buf, "%ldk", LONG_MAX / 2000);
-    ok = sc_str_parse_integer_with_suffix(buf, &value);
+    ok = parse_integer_with_suffix(buf, &value);
    assert(ok);
    assert(value == LONG_MAX / 2000 * 1000);

    sprintf(buf, "%ldm", LONG_MAX / 2000);
-    ok = sc_str_parse_integer_with_suffix(buf, &value);
+    ok = parse_integer_with_suffix(buf, &value);
    assert(!ok);

    sprintf(buf, "%ldk", LONG_MIN / 2000);
-    ok = sc_str_parse_integer_with_suffix(buf, &value);
+    ok = parse_integer_with_suffix(buf, &value);
    assert(ok);
    assert(value == LONG_MIN / 2000 * 1000);

    sprintf(buf, "%ldm", LONG_MIN / 2000);
-    ok = sc_str_parse_integer_with_suffix(buf, &value);
+    ok = parse_integer_with_suffix(buf, &value);
    assert(!ok);
 }

 static void test_strlist_contains(void) {
-    assert(sc_str_list_contains("a,bc,def", ',', "bc"));
-    assert(!sc_str_list_contains("a,bc,def", ',', "b"));
-    assert(sc_str_list_contains("", ',', ""));
-    assert(sc_str_list_contains("abc,", ',', ""));
-    assert(sc_str_list_contains(",abc", ',', ""));
-    assert(sc_str_list_contains("abc,,def", ',', ""));
-    assert(!sc_str_list_contains("abc", ',', ""));
-    assert(sc_str_list_contains(",,|x", '|', ",,"));
-    assert(sc_str_list_contains("xyz", '\0', "xyz"));
+    assert(strlist_contains("a,bc,def", ',', "bc"));
+    assert(!strlist_contains("a,bc,def", ',', "b"));
+    assert(strlist_contains("", ',', ""));
+    assert(strlist_contains("abc,", ',', ""));
+    assert(strlist_contains(",abc", ',', ""));
+    assert(strlist_contains("abc,,def", ',', ""));
+    assert(!strlist_contains("abc", ',', ""));
+    assert(strlist_contains(",,|x", '|', ",,"));
+    assert(strlist_contains("xyz", '\0', "xyz"));
 }

 static void test_wrap_lines(void) {
@ -338,87 +337,24 @@ static void test_wrap_lines(void) {
    free(formatted);
 }

-static void test_truncate(void) {
-    char s[] = "hello\nworld\n!";
-    size_t len = sc_str_truncate(s, sizeof(s), "\n");
-
-    assert(len == 5);
-    assert(!strcmp("hello", s));
-
-    char s2[] = "hello\r\nworkd\r\n!";
-    len = sc_str_truncate(s2, sizeof(s2), "\n\r");
-
-    assert(len == 5);
-    assert(!strcmp("hello", s));
-
-    char s3[] = "hello world\n!";
-    len = sc_str_truncate(s3, sizeof(s3), " \n\r");
-
-    assert(len == 5);
-    assert(!strcmp("hello", s3));
-
-    char s4[] = "hello ";
-    len = sc_str_truncate(s4, sizeof(s4), " \n\r");
-
-    assert(len == 5);
-    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;

-    test_strncpy_simple();
-    test_strncpy_just_fit();
-    test_strncpy_truncated();
-    test_join_simple();
-    test_join_just_fit();
-    test_join_truncated_in_token();
-    test_join_truncated_before_sep();
-    test_join_truncated_after_sep();
-    test_quote();
+    test_xstrncpy_simple();
+    test_xstrncpy_just_fit();
+    test_xstrncpy_truncated();
+    test_xstrjoin_simple();
+    test_xstrjoin_just_fit();
+    test_xstrjoin_truncated_in_token();
+    test_xstrjoin_truncated_before_sep();
+    test_xstrjoin_truncated_after_sep();
+    test_strquote();
    test_utf8_truncate();
    test_parse_integer();
    test_parse_integers();
    test_parse_integer_with_suffix();
    test_strlist_contains();
    test_wrap_lines();
-    test_truncate();
-    test_index_of_column();
-    test_remove_trailing_cr();
    return 0;
 }
--- a/install_release.sh
+++ b/install_release.sh
@ -2,8 +2,8 @@
 set -e

 BUILDDIR=build-auto
-PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v1.20/scrcpy-server-v1.20
-PREBUILT_SERVER_SHA256=b20aee4951f99b060c4a44000ba94de973f9604758ef62beb253b371aad3df34
+PREBUILT_SERVER_URL=https://github.com/Genymobile/scrcpy/releases/download/v1.19/scrcpy-server-v1.19
+PREBUILT_SERVER_SHA256=876f9322182e6aac6a58db1334f4225855ef3a17eaebc80aab6601d9d1ecb867

 echo "[scrcpy] Downloading prebuilt server..."
 wget "$PREBUILT_SERVER_URL" -O scrcpy-server
--- a/meson.build
+++ b/meson.build
@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '1.20',
+        version: '1.19',
        meson_version: '>= 0.48',
        default_options: [
            'c_std=c11',
--- a/server/build.gradle
+++ b/server/build.gradle
@ -6,8 +6,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 12000
-        versionName "1.20"
+        versionCode 11900
+        versionName "1.19"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
@ -20,7 +20,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13'
 }

 apply from: "$project.rootDir/config/android-checkstyle.gradle"
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@ -12,17 +12,15 @@
 set -e

 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=1.20
+SCRCPY_VERSION_NAME=1.19

-PLATFORM_VERSION=31
-PLATFORM=${ANDROID_PLATFORM:-$PLATFORM_VERSION}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-31.0.0}
+PLATFORM=${ANDROID_PLATFORM:-30}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-30.0.0}

 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
 CLASSES_DIR="$BUILD_DIR/classes"
 SERVER_DIR=$(dirname "$0")
 SERVER_BINARY=scrcpy-server
-ANDROID_JAR="$ANDROID_HOME/platforms/android-$PLATFORM/android.jar"

 echo "Platform: android-$PLATFORM"
 echo "Build-tools: $BUILD_TOOLS"
@ -49,40 +47,23 @@ cd "$SERVER_DIR/src/main/aidl"

 echo "Compiling java sources..."
 cd ../java
-javac -bootclasspath "$ANDROID_JAR" -cp "$CLASSES_DIR" -d "$CLASSES_DIR" \
-    -source 1.8 -target 1.8 \
+javac -bootclasspath "$ANDROID_HOME/platforms/android-$PLATFORM/android.jar" \
+    -cp "$CLASSES_DIR" -d "$CLASSES_DIR" -source 1.8 -target 1.8 \
    com/genymobile/scrcpy/*.java \
    com/genymobile/scrcpy/wrappers/*.java

 echo "Dexing..."
 cd "$CLASSES_DIR"
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
+    --output "$BUILD_DIR/classes.dex" \
+    android/view/*.class \
+    android/content/*.class \
+    com/genymobile/scrcpy/*.class \
+    com/genymobile/scrcpy/wrappers/*.class

-if [[ $PLATFORM_VERSION -lt 31 ]]
-then
-    # use dx
-    "$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
-        --output "$BUILD_DIR/classes.dex" \
-        android/view/*.class \
-        android/content/*.class \
-        com/genymobile/scrcpy/*.class \
-        com/genymobile/scrcpy/wrappers/*.class
-
-    echo "Archiving..."
-    cd "$BUILD_DIR"
-    jar cvf "$SERVER_BINARY" classes.dex
-    rm -rf classes.dex classes
-else
-    # use d8
-    "$ANDROID_HOME/build-tools/$BUILD_TOOLS/d8" --classpath "$ANDROID_JAR" \
-        --output "$BUILD_DIR/classes.zip" \
-        android/view/*.class \
-        android/content/*.class \
-        com/genymobile/scrcpy/*.class \
-        com/genymobile/scrcpy/wrappers/*.class
-
-    cd "$BUILD_DIR"
-    mv classes.zip "$SERVER_BINARY"
-    rm -rf classes
-fi
+echo "Archiving..."
+cd "$BUILD_DIR"
+jar cvf "$SERVER_BINARY" classes.dex
+rm -rf classes.dex classes

 echo "Server generated in $BUILD_DIR/$SERVER_BINARY"
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@ -1,5 +1,6 @@
 package com.genymobile.scrcpy;

+import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

 import android.os.Parcel;
@ -165,21 +166,14 @@ public final class CleanUp {

        if (config.disableShowTouches || config.restoreStayOn != -1) {
            ServiceManager serviceManager = new ServiceManager();
-            Settings settings = new Settings(serviceManager);
-            if (config.disableShowTouches) {
-                Ln.i("Disabling \"show touches\"");
-                try {
-                    settings.putValue(Settings.TABLE_SYSTEM, "show_touches", "0");
-                } catch (SettingsException e) {
-                    Ln.e("Could not restore \"show_touches\"", e);
+            try (ContentProvider settings = serviceManager.getActivityManager().createSettingsProvider()) {
+                if (config.disableShowTouches) {
+                    Ln.i("Disabling \"show touches\"");
+                    settings.putValue(ContentProvider.TABLE_SYSTEM, "show_touches", "0");
                }
-            }
-            if (config.restoreStayOn != -1) {
-                Ln.i("Restoring \"stay awake\"");
-                try {
-                    settings.putValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
-                } catch (SettingsException e) {
-                    Ln.e("Could not restore \"stay_on_while_plugged_in\"", e);
+                if (config.restoreStayOn != -1) {
+                    Ln.i("Restoring \"stay awake\"");
+                    settings.putValue(ContentProvider.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(config.restoreStayOn));
                }
            }
        }
--- a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CodecOption.java
@ -21,7 +21,7 @@ public class CodecOption {
    }

    public static List<CodecOption> parse(String codecOptions) {
-        if (codecOptions.isEmpty()) {
+        if ("-".equals(codecOptions)) {
            return null;
        }

--- a/server/src/main/java/com/genymobile/scrcpy/Command.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Command.java
@ -1,33 +0,0 @@
-package com.genymobile.scrcpy;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Scanner;
-
-public final class Command {
-    private Command() {
-        // not instantiable
-    }
-
-    public static void exec(String... cmd) throws IOException, InterruptedException {
-        Process process = Runtime.getRuntime().exec(cmd);
-        int exitCode = process.waitFor();
-        if (exitCode != 0) {
-            throw new IOException("Command " + Arrays.toString(cmd) + " returned with value " + exitCode);
-        }
-    }
-
-    public static String execReadLine(String... cmd) throws IOException, InterruptedException {
-        String result = null;
-        Process process = Runtime.getRuntime().exec(cmd);
-        Scanner scanner = new Scanner(process.getInputStream());
-        if (scanner.hasNextLine()) {
-            result = scanner.nextLine();
-        }
-        int exitCode = process.waitFor();
-        if (exitCode != 0) {
-            throw new IOException("Command " + Arrays.toString(cmd) + " returned with value " + exitCode);
-        }
-        return result;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@ -18,8 +18,6 @@ public final class ControlMessage {
    public static final int TYPE_SET_SCREEN_POWER_MODE = 10;
    public static final int TYPE_ROTATE_DEVICE = 11;

-    public static final long SEQUENCE_INVALID = 0;
-
    private int type;
    private String text;
    private int metaState; // KeyEvent.META_*
@ -33,7 +31,6 @@ public final class ControlMessage {
    private int vScroll;
    private boolean paste;
    private int repeat;
-    private long sequence;

    private ControlMessage() {
    }
@ -82,10 +79,9 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createSetClipboard(long sequence, String text, boolean paste) {
+    public static ControlMessage createSetClipboard(String text, boolean paste) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_SET_CLIPBOARD;
-        msg.sequence = sequence;
        msg.text = text;
        msg.paste = paste;
        return msg;
@ -158,8 +154,4 @@ public final class ControlMessage {
    public int getRepeat() {
        return repeat;
    }
-
-    public long getSequence() {
-        return sequence;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@ -13,11 +13,11 @@ public class ControlMessageReader {
    static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
    static final int BACK_OR_SCREEN_ON_LENGTH = 1;
    static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
-    static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 9;
+    static final int SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH = 1;

    private static final int MESSAGE_MAX_SIZE = 1 << 18; // 256k

-    public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 14; // type: 1 byte; sequence: 8 bytes; paste flag: 1 byte; length: 4 bytes
+    public static final int CLIPBOARD_TEXT_MAX_LENGTH = MESSAGE_MAX_SIZE - 6; // type: 1 byte; paste flag: 1 byte; length: 4 bytes
    public static final int INJECT_TEXT_MAX_LENGTH = 300;

    private final byte[] rawBuffer = new byte[MESSAGE_MAX_SIZE];
@ -166,13 +166,12 @@ public class ControlMessageReader {
        if (buffer.remaining() < SET_CLIPBOARD_FIXED_PAYLOAD_LENGTH) {
            return null;
        }
-        long sequence = buffer.getLong();
        boolean paste = buffer.get() != 0;
        String text = parseString();
        if (text == null) {
            return null;
        }
-        return ControlMessage.createSetClipboard(sequence, text, paste);
+        return ControlMessage.createSetClipboard(text, paste);
    }

    private ControlMessage parseSetScreenPowerMode() {
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@ -120,12 +120,7 @@ public class Controller {
                }
                break;
            case ControlMessage.TYPE_SET_CLIPBOARD:
-                long sequence = msg.getSequence();
                setClipboard(msg.getText(), msg.getPaste());
-                if (sequence != ControlMessage.SEQUENCE_INVALID) {
-                    // Acknowledgement requested
-                    sender.pushAckClipboard(sequence);
-                }
                break;
            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                if (device.supportsInputEvents()) {
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@ -1,6 +1,7 @@
 package com.genymobile.scrcpy;

 import com.genymobile.scrcpy.wrappers.ClipboardManager;
+import com.genymobile.scrcpy.wrappers.ContentProvider;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
@ -28,7 +29,6 @@ public final class Device {
    public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;

    private static final ServiceManager SERVICE_MANAGER = new ServiceManager();
-    private static final Settings SETTINGS = new Settings(SERVICE_MANAGER);

    public interface RotationListener {
        void onRotationChanged(int rotation);
@ -65,7 +65,7 @@ public final class Device {

        int displayInfoFlags = displayInfo.getFlags();

-        screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockVideoOrientation());
+        screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
        layerStack = displayInfo.getLayerStack();

        SERVICE_MANAGER.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
@ -82,8 +82,8 @@ public final class Device {
            }
        }, displayId);

-        if (options.getControl() && options.getClipboardAutosync()) {
-            // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
+        if (options.getControl()) {
+            // If control is enabled, synchronize Android clipboard to the computer automatically
            ClipboardManager clipboardManager = SERVICE_MANAGER.getClipboardManager();
            if (clipboardManager != null) {
                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
@ -296,7 +296,7 @@ public final class Device {
        }
    }

-    public static Settings getSettings() {
-        return SETTINGS;
+    public static ContentProvider createSettingsProvider() {
+        return SERVICE_MANAGER.getActivityManager().createSettingsProvider();
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java
@ -3,13 +3,9 @@ package com.genymobile.scrcpy;
 public final class DeviceMessage {

    public static final int TYPE_CLIPBOARD = 0;
-    public static final int TYPE_ACK_CLIPBOARD = 1;
-
-    public static final long SEQUENCE_INVALID = ControlMessage.SEQUENCE_INVALID;

    private int type;
    private String text;
-    private long sequence;

    private DeviceMessage() {
    }
@ -21,13 +17,6 @@ public final class DeviceMessage {
        return event;
    }

-    public static DeviceMessage createAckClipboard(long sequence) {
-        DeviceMessage event = new DeviceMessage();
-        event.type = TYPE_ACK_CLIPBOARD;
-        event.sequence = sequence;
-        return event;
-    }
-
    public int getType() {
        return type;
    }
@ -35,8 +24,4 @@ public final class DeviceMessage {
    public String getText() {
        return text;
    }
-
-    public long getSequence() {
-        return sequence;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java
@ -8,8 +8,6 @@ public final class DeviceMessageSender {

    private String clipboardText;

-    private long ack;
-
    public DeviceMessageSender(DesktopConnection connection) {
        this.connection = connection;
    }
@ -19,34 +17,18 @@ public final class DeviceMessageSender {
        notify();
    }

-    public synchronized void pushAckClipboard(long sequence) {
-        ack = sequence;
-        notify();
-    }
-
    public void loop() throws IOException, InterruptedException {
        while (true) {
            String text;
-            long sequence;
            synchronized (this) {
-                while (ack == DeviceMessage.SEQUENCE_INVALID && clipboardText == null) {
+                while (clipboardText == null) {
                    wait();
                }
                text = clipboardText;
                clipboardText = null;
-
-                sequence = ack;
-                ack = DeviceMessage.SEQUENCE_INVALID;
-            }
-
-            if (sequence != DeviceMessage.SEQUENCE_INVALID) {
-                DeviceMessage event = DeviceMessage.createAckClipboard(sequence);
-                connection.sendDeviceMessage(event);
-            }
-            if (text != null) {
-                DeviceMessage event = DeviceMessage.createClipboard(text);
-                connection.sendDeviceMessage(event);
            }
+            DeviceMessage event = DeviceMessage.createClipboard(text);
+            connection.sendDeviceMessage(event);
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java
@ -15,7 +15,7 @@ public class DeviceMessageWriter {

    public void writeTo(DeviceMessage msg, OutputStream output) throws IOException {
        buffer.clear();
-        buffer.put((byte) msg.getType());
+        buffer.put((byte) DeviceMessage.TYPE_CLIPBOARD);
        switch (msg.getType()) {
            case DeviceMessage.TYPE_CLIPBOARD:
                String text = msg.getText();
@ -25,10 +25,6 @@ public class DeviceMessageWriter {
                buffer.put(raw, 0, len);
                output.write(rawBuffer, 0, buffer.position());
                break;
-            case DeviceMessage.TYPE_ACK_CLIPBOARD:
-                buffer.putLong(msg.getSequence());
-                output.write(rawBuffer, 0, buffer.position());
-                break;
            default:
                Ln.w("Unknown device message: " + msg.getType());
                break;
--- a/server/src/main/java/com/genymobile/scrcpy/Ln.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Ln.java
@ -57,18 +57,11 @@ public final class Ln {
        }
    }

-    public static void w(String message, Throwable throwable) {
-        if (isEnabled(Level.WARN)) {
-            Log.w(TAG, message, throwable);
-            System.out.println(PREFIX + "WARN: " + message);
-            if (throwable != null) {
-                throwable.printStackTrace();
-            }
-        }
-    }
-
    public static void w(String message) {
-        w(message, null);
+        if (isEnabled(Level.WARN)) {
+            Log.w(TAG, message);
+            System.out.println(PREFIX + "WARN: " + message);
+        }
    }

    public static void e(String message, Throwable throwable) {
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@ -2,25 +2,22 @@ package com.genymobile.scrcpy;

 import android.graphics.Rect;

-import java.util.List;
-
 public class Options {
-    private Ln.Level logLevel = Ln.Level.DEBUG;
+    private Ln.Level logLevel;
    private int maxSize;
-    private int bitRate = 8000000;
+    private int bitRate;
    private int maxFps;
-    private int lockVideoOrientation = -1;
+    private int lockedVideoOrientation;
    private boolean tunnelForward;
    private Rect crop;
-    private boolean sendFrameMeta = true; // send PTS so that the client may record properly
-    private boolean control = true;
+    private boolean sendFrameMeta; // send PTS so that the client may record properly
+    private boolean control;
    private int displayId;
    private boolean showTouches;
    private boolean stayAwake;
-    private List<CodecOption> codecOptions;
+    private String codecOptions;
    private String encoderName;
    private boolean powerOffScreenOnClose;
-    private boolean clipboardAutosync = true;

    public Ln.Level getLogLevel() {
        return logLevel;
@ -54,12 +51,12 @@ public class Options {
        this.maxFps = maxFps;
    }

-    public int getLockVideoOrientation() {
-        return lockVideoOrientation;
+    public int getLockedVideoOrientation() {
+        return lockedVideoOrientation;
    }

-    public void setLockVideoOrientation(int lockVideoOrientation) {
-        this.lockVideoOrientation = lockVideoOrientation;
+    public void setLockedVideoOrientation(int lockedVideoOrientation) {
+        this.lockedVideoOrientation = lockedVideoOrientation;
    }

    public boolean isTunnelForward() {
@ -118,11 +115,11 @@ public class Options {
        this.stayAwake = stayAwake;
    }

-    public List<CodecOption> getCodecOptions() {
+    public String getCodecOptions() {
        return codecOptions;
    }

-    public void setCodecOptions(List<CodecOption> codecOptions) {
+    public void setCodecOptions(String codecOptions) {
        this.codecOptions = codecOptions;
    }

@ -141,12 +138,4 @@ public class Options {
    public boolean getPowerOffScreenOnClose() {
        return this.powerOffScreenOnClose;
    }
-
-    public boolean getClipboardAutosync() {
-        return clipboardAutosync;
-    }
-
-    public void setClipboardAutosync(boolean clipboardAutosync) {
-        this.clipboardAutosync = clipboardAutosync;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@ -1,5 +1,7 @@
 package com.genymobile.scrcpy;

+import com.genymobile.scrcpy.wrappers.ContentProvider;
+
 import android.graphics.Rect;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
@ -17,25 +19,24 @@ public final class Server {
        // not instantiable
    }

-    private static void initAndCleanUp(Options options) {
+    private static void scrcpy(Options options) throws IOException {
+        Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
+        final Device device = new Device(options);
+        List<CodecOption> codecOptions = CodecOption.parse(options.getCodecOptions());
+
        boolean mustDisableShowTouchesOnCleanUp = false;
        int restoreStayOn = -1;
        if (options.getShowTouches() || options.getStayAwake()) {
-            Settings settings = Device.getSettings();
-            if (options.getShowTouches()) {
-                try {
-                    String oldValue = settings.getAndPutValue(Settings.TABLE_SYSTEM, "show_touches", "1");
+            try (ContentProvider settings = Device.createSettingsProvider()) {
+                if (options.getShowTouches()) {
+                    String oldValue = settings.getAndPutValue(ContentProvider.TABLE_SYSTEM, "show_touches", "1");
                    // If "show touches" was disabled, it must be disabled back on clean up
                    mustDisableShowTouchesOnCleanUp = !"1".equals(oldValue);
-                } catch (SettingsException e) {
-                    Ln.e("Could not change \"show_touches\"", e);
                }
-            }

-            if (options.getStayAwake()) {
-                int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
-                try {
-                    String oldValue = settings.getAndPutValue(Settings.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
+                if (options.getStayAwake()) {
+                    int stayOn = BatteryManager.BATTERY_PLUGGED_AC | BatteryManager.BATTERY_PLUGGED_USB | BatteryManager.BATTERY_PLUGGED_WIRELESS;
+                    String oldValue = settings.getAndPutValue(ContentProvider.TABLE_GLOBAL, "stay_on_while_plugged_in", String.valueOf(stayOn));
                    try {
                        restoreStayOn = Integer.parseInt(oldValue);
                        if (restoreStayOn == stayOn) {
@ -45,25 +46,11 @@ public final class Server {
                    } catch (NumberFormatException e) {
                        restoreStayOn = 0;
                    }
-                } catch (SettingsException e) {
-                    Ln.e("Could not change \"stay_on_while_plugged_in\"", e);
                }
            }
        }

-        try {
-            CleanUp.configure(options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp, true, options.getPowerOffScreenOnClose());
-        } catch (IOException e) {
-            Ln.e("Could not configure cleanup", e);
-        }
-    }
-
-    private static void scrcpy(Options options) throws IOException {
-        Ln.i("Device: " + Build.MANUFACTURER + " " + Build.MODEL + " (Android " + Build.VERSION.RELEASE + ")");
-        final Device device = new Device(options);
-        List<CodecOption> codecOptions = options.getCodecOptions();
-
-        Thread initThread = startInitThread(options);
+        CleanUp.configure(options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp, true, options.getPowerOffScreenOnClose());

        boolean tunnelForward = options.isTunnelForward();

@ -95,7 +82,6 @@ public final class Server {
                // this is expected on close
                Ln.d("Screen streaming stopped");
            } finally {
-                initThread.interrupt();
                if (controllerThread != null) {
                    controllerThread.interrupt();
                }
@ -106,17 +92,6 @@ public final class Server {
        }
    }

-    private static Thread startInitThread(final Options options) {
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                initAndCleanUp(options);
-            }
-        });
-        thread.start();
-        return thread;
-    }
-
    private static Thread startController(final Controller controller) {
        Thread thread = new Thread(new Runnable() {
            @Override
@ -160,93 +135,64 @@ public final class Server {
                    "The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
        }

+        final int expectedParameters = 16;
+        if (args.length != expectedParameters) {
+            throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");
+        }
+
        Options options = new Options();

-        for (int i = 1; i < args.length; ++i) {
-            String arg = args[i];
-            int equalIndex = arg.indexOf('=');
-            if (equalIndex == -1) {
-                throw new IllegalArgumentException("Invalid key=value pair: \"" + arg + "\"");
-            }
-            String key = arg.substring(0, equalIndex);
-            String value = arg.substring(equalIndex + 1);
-            switch (key) {
-                case "log_level":
-                    Ln.Level level = Ln.Level.valueOf(value.toUpperCase(Locale.ENGLISH));
-                    options.setLogLevel(level);
-                    break;
-                case "max_size":
-                    int maxSize = Integer.parseInt(value) & ~7; // multiple of 8
-                    options.setMaxSize(maxSize);
-                    break;
-                case "bit_rate":
-                    int bitRate = Integer.parseInt(value);
-                    options.setBitRate(bitRate);
-                    break;
-                case "max_fps":
-                    int maxFps = Integer.parseInt(value);
-                    options.setMaxFps(maxFps);
-                    break;
-                case "lock_video_orientation":
-                    int lockVideoOrientation = Integer.parseInt(value);
-                    options.setLockVideoOrientation(lockVideoOrientation);
-                    break;
-                case "tunnel_forward":
-                    boolean tunnelForward = Boolean.parseBoolean(value);
-                    options.setTunnelForward(tunnelForward);
-                    break;
-                case "crop":
-                    Rect crop = parseCrop(value);
-                    options.setCrop(crop);
-                    break;
-                case "send_frame_meta":
-                    boolean sendFrameMeta = Boolean.parseBoolean(value);
-                    options.setSendFrameMeta(sendFrameMeta);
-                    break;
-                case "control":
-                    boolean control = Boolean.parseBoolean(value);
-                    options.setControl(control);
-                    break;
-                case "display_id":
-                    int displayId = Integer.parseInt(value);
-                    options.setDisplayId(displayId);
-                    break;
-                case "show_touches":
-                    boolean showTouches = Boolean.parseBoolean(value);
-                    options.setShowTouches(showTouches);
-                    break;
-                case "stay_awake":
-                    boolean stayAwake = Boolean.parseBoolean(value);
-                    options.setStayAwake(stayAwake);
-                    break;
-                case "codec_options":
-                    List<CodecOption> codecOptions = CodecOption.parse(value);
-                    options.setCodecOptions(codecOptions);
-                    break;
-                case "encoder_name":
-                    if (!value.isEmpty()) {
-                        options.setEncoderName(value);
-                    }
-                    break;
-                case "power_off_on_close":
-                    boolean powerOffScreenOnClose = Boolean.parseBoolean(value);
-                    options.setPowerOffScreenOnClose(powerOffScreenOnClose);
-                    break;
-                case "clipboard_autosync":
-                    boolean clipboardAutosync = Boolean.parseBoolean(value);
-                    options.setClipboardAutosync(clipboardAutosync);
-                    break;
-                default:
-                    Ln.w("Unknown server option: " + key);
-                    break;
-            }
-        }
+        Ln.Level level = Ln.Level.valueOf(args[1].toUpperCase(Locale.ENGLISH));
+        options.setLogLevel(level);
+
+        int maxSize = Integer.parseInt(args[2]) & ~7; // multiple of 8
+        options.setMaxSize(maxSize);
+
+        int bitRate = Integer.parseInt(args[3]);
+        options.setBitRate(bitRate);
+
+        int maxFps = Integer.parseInt(args[4]);
+        options.setMaxFps(maxFps);
+
+        int lockedVideoOrientation = Integer.parseInt(args[5]);
+        options.setLockedVideoOrientation(lockedVideoOrientation);
+
+        // use "adb forward" instead of "adb tunnel"? (so the server must listen)
+        boolean tunnelForward = Boolean.parseBoolean(args[6]);
+        options.setTunnelForward(tunnelForward);
+
+        Rect crop = parseCrop(args[7]);
+        options.setCrop(crop);
+
+        boolean sendFrameMeta = Boolean.parseBoolean(args[8]);
+        options.setSendFrameMeta(sendFrameMeta);
+
+        boolean control = Boolean.parseBoolean(args[9]);
+        options.setControl(control);
+
+        int displayId = Integer.parseInt(args[10]);
+        options.setDisplayId(displayId);
+
+        boolean showTouches = Boolean.parseBoolean(args[11]);
+        options.setShowTouches(showTouches);
+
+        boolean stayAwake = Boolean.parseBoolean(args[12]);
+        options.setStayAwake(stayAwake);
+
+        String codecOptions = args[13];
+        options.setCodecOptions(codecOptions);
+
+        String encoderName = "-".equals(args[14]) ? null : args[14];
+        options.setEncoderName(encoderName);
+
+        boolean powerOffScreenOnClose = Boolean.parseBoolean(args[15]);
+        options.setPowerOffScreenOnClose(powerOffScreenOnClose);

        return options;
    }

    private static Rect parseCrop(String crop) {
-        if (crop.isEmpty()) {
+        if ("-".equals(crop)) {
            return null;
        }
        // input format: "width:height:x:y"
--- a/server/src/main/java/com/genymobile/scrcpy/Settings.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Settings.java
@ -1,84 +0,0 @@
-package com.genymobile.scrcpy;
-
-import com.genymobile.scrcpy.wrappers.ContentProvider;
-import com.genymobile.scrcpy.wrappers.ServiceManager;
-
-import android.os.Build;
-
-import java.io.IOException;
-
-public class Settings {
-
-    public static final String TABLE_SYSTEM = ContentProvider.TABLE_SYSTEM;
-    public static final String TABLE_SECURE = ContentProvider.TABLE_SECURE;
-    public static final String TABLE_GLOBAL = ContentProvider.TABLE_GLOBAL;
-
-    private final ServiceManager serviceManager;
-
-    public Settings(ServiceManager serviceManager) {
-        this.serviceManager = serviceManager;
-    }
-
-    private static void execSettingsPut(String table, String key, String value) throws SettingsException {
-        try {
-            Command.exec("settings", "put", table, key, value);
-        } catch (IOException | InterruptedException e) {
-            throw new SettingsException("put", table, key, value, e);
-        }
-    }
-
-    private static String execSettingsGet(String table, String key) throws SettingsException {
-        try {
-            return Command.execReadLine("settings", "get", table, key);
-        } catch (IOException | InterruptedException e) {
-            throw new SettingsException("get", table, key, null, e);
-        }
-    }
-
-    public String getValue(String table, String key) throws SettingsException {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-            // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
-                return provider.getValue(table, key);
-            } catch (SettingsException e) {
-                Ln.w("Could not get settings value via ContentProvider, fallback to settings process", e);
-            }
-        }
-
-        return execSettingsGet(table, key);
-    }
-
-    public void putValue(String table, String key, String value) throws SettingsException {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-            // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
-                provider.putValue(table, key, value);
-            } catch (SettingsException e) {
-                Ln.w("Could not put settings value via ContentProvider, fallback to settings process", e);
-            }
-        }
-
-        execSettingsPut(table, key, value);
-    }
-
-    public String getAndPutValue(String table, String key, String value) throws SettingsException {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-            // on Android >= 12, it always fails: <https://github.com/Genymobile/scrcpy/issues/2788>
-            try (ContentProvider provider = serviceManager.getActivityManager().createSettingsProvider()) {
-                String oldValue = provider.getValue(table, key);
-                if (!value.equals(oldValue)) {
-                    provider.putValue(table, key, value);
-                }
-                return oldValue;
-            } catch (SettingsException e) {
-                Ln.w("Could not get and put settings value via ContentProvider, fallback to settings process", e);
-            }
-        }
-
-        String oldValue = getValue(table, key);
-        if (!value.equals(oldValue)) {
-             putValue(table, key, value);
-        }
-        return oldValue;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/SettingsException.java
+++ b/server/src/main/java/com/genymobile/scrcpy/SettingsException.java
@ -1,11 +0,0 @@
-package com.genymobile.scrcpy;
-
-public class SettingsException extends Exception {
-    private static String createMessage(String method, String table, String key, String value) {
-        return "Could not access settings: " + method + " " + table + " " + key + (value != null ? " " + value : "");
-    }
-
-    public SettingsException(String method, String table, String key, String value, Throwable cause) {
-        super(createMessage(method, table, key, value), cause);
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java
@ -1,7 +1,6 @@
 package com.genymobile.scrcpy.wrappers;

 import com.genymobile.scrcpy.Ln;
-import com.genymobile.scrcpy.SettingsException;

 import android.annotation.SuppressLint;
 import android.os.Bundle;
@ -88,8 +87,7 @@ public class ContentProvider implements Closeable {
        return attributionSource;
    }

-    private Bundle call(String callMethod, String arg, Bundle extras)
-            throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    private Bundle call(String callMethod, String arg, Bundle extras) {
        try {
            Method method = getCallMethod();
            Object[] args;
@ -110,7 +108,7 @@ public class ContentProvider implements Closeable {
            return (Bundle) method.invoke(provider, args);
        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException | ClassNotFoundException | InstantiationException e) {
            Ln.e("Could not invoke method", e);
-            throw e;
+            return null;
        }
    }

@ -144,31 +142,30 @@ public class ContentProvider implements Closeable {
        }
    }

-    public String getValue(String table, String key) throws SettingsException {
+    public String getValue(String table, String key) {
        String method = getGetMethod(table);
        Bundle arg = new Bundle();
        arg.putInt(CALL_METHOD_USER_KEY, ServiceManager.USER_ID);
-        try {
-            Bundle bundle = call(method, key, arg);
-            if (bundle == null) {
-                return null;
-            }
-            return bundle.getString("value");
-        } catch (Exception e) {
-            throw new SettingsException(table, "get", key, null, e);
+        Bundle bundle = call(method, key, arg);
+        if (bundle == null) {
+            return null;
        }
-
+        return bundle.getString("value");
    }

-    public void putValue(String table, String key, String value) throws SettingsException {
+    public void putValue(String table, String key, String value) {
        String method = getPutMethod(table);
        Bundle arg = new Bundle();
        arg.putInt(CALL_METHOD_USER_KEY, ServiceManager.USER_ID);
        arg.putString(NAME_VALUE_TABLE_VALUE, value);
-        try {
-            call(method, key, arg);
-        } catch (Exception e) {
-            throw new SettingsException(table, "put", key, value, e);
+        call(method, key, arg);
+    }
+
+    public String getAndPutValue(String table, String key, String value) {
+        String oldValue = getValue(table, key);
+        if (!value.equals(oldValue)) {
+            putValue(table, key, value);
        }
+        return oldValue;
    }
 }
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@ -235,7 +235,6 @@ public class ControlMessageReaderTest {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);
-        dos.writeLong(0x0102030405060708L); // sequence
        dos.writeByte(1); // paste
        byte[] text = "testé".getBytes(StandardCharsets.UTF_8);
        dos.writeInt(text.length);
@ -247,7 +246,6 @@ public class ControlMessageReaderTest {
        ControlMessage event = reader.next();

        Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
-        Assert.assertEquals(0x0102030405060708L, event.getSequence());
        Assert.assertEquals("testé", event.getText());
        Assert.assertTrue(event.getPaste());
    }
@ -261,7 +259,6 @@ public class ControlMessageReaderTest {
        dos.writeByte(ControlMessage.TYPE_SET_CLIPBOARD);

        byte[] rawText = new byte[ControlMessageReader.CLIPBOARD_TEXT_MAX_LENGTH];
-        dos.writeLong(0x0807060504030201L); // sequence
        dos.writeByte(1); // paste
        Arrays.fill(rawText, (byte) 'a');
        String text = new String(rawText, 0, rawText.length);
@ -275,7 +272,6 @@ public class ControlMessageReaderTest {
        ControlMessage event = reader.next();

        Assert.assertEquals(ControlMessage.TYPE_SET_CLIPBOARD, event.getType());
-        Assert.assertEquals(0x0807060504030201L, event.getSequence());
        Assert.assertEquals(text, event.getText());
        Assert.assertTrue(event.getPaste());
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Romain Vimont	c7e46583b8	Improve process API Prefix symbols and constants names and improve documentation.	2021-11-11 18:08:47 +01:00
Romain Vimont	848db078a5	Factorize common impl of process_execute() Both implementations are the same. Move them to the common process.c.	2021-11-11 18:08:41 +01:00
Romain Vimont	b197372dd3	Remove duplicate function declaration The function process_terminate() was declared twice.	2021-11-11 18:08:41 +01:00
Romain Vimont	66f21cf680	Improve file API Prefix symbols and constants names and improve documentation.	2021-11-11 18:08:35 +01:00
Romain Vimont	f197c1181e	Move functions from process to file Move filesystem-related functions from process.[ch] to file.[ch].	2021-11-11 16:27:12 +01:00