Add option to disable window decoration

Add --window-borderless parameter. Signed-off-by: Romain Vimont <rom@rom1v.com>
Add option to specify the initial window size
2019-11-03 18:18:41 +01:00 · 2019-11-03 18:18:41 +01:00 · 2019-11-03 18:18:41 +01:00 · 2019-11-03 18:18:39 +01:00
90 changed files with 1423 additions and 3189 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -40,7 +40,7 @@ Install the required packages from your package manager.

 ```bash
 # runtime dependencies
-sudo apt install ffmpeg libsdl2-2.0-0 adb
+sudo apt install ffmpeg libsdl2-2.0-0

 # client build dependencies
 sudo apt install gcc git pkg-config meson ninja-build \
@ -233,10 +233,10 @@ You can then [run](README.md#run) _scrcpy_.

 ## Prebuilt server

- - [`scrcpy-server-v1.12.1`][direct-scrcpy-server]  
-   _(SHA-256: 63e569c8a1d0c1df31d48c4214871c479a601782945fed50c1e61167d78266ea)_
+ - [`scrcpy-server-v1.10.jar`][direct-scrcpy-server]  
+   _(SHA-256: cbeb1a4e046f1392c1dc73c3ccffd7f86dec4636b505556ea20929687a119390)_

-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-server-v1.12.1
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.10/scrcpy-server-v1.10.jar

 Download the prebuilt server somewhere, and specify its path during the Meson
 configuration:
--- a/DEVELOP.md
+++ b/DEVELOP.md
@ -268,33 +268,3 @@ For more details, go read the code!

 If you find a bug, or have an awesome idea to implement, please discuss and
 contribute ;-)
-
-
-### Debug the server
-
-The server is pushed to the device by the client on startup.
-
-To debug it, enable the server debugger during configuration:
-
-```bash
-meson x -Dserver_debugger=true
-# or, if x is already configured
-meson configure x -Dserver_debugger=true
-```
-
-Then recompile.
-
-When you start scrcpy, it will start a debugger on port 5005 on the device.
-Redirect that port to the computer:
-
-```bash
-adb forward tcp:5005 tcp:5005
-```
-
-In Android Studio, _Run_ > _Debug_ > _Edit configurations..._ On the left, click on
-`+`, _Remote_, and fill the form:
-
- - Host: `localhost`
- - Port: `5005`
-
-Then click on _Debug_.
--- a/FAQ.ko.md
+++ b/FAQ.ko.md
@ -1,84 +0,0 @@
-# 자주하는 질문 (FAQ)
-
-다음은 자주 제보되는 문제들과 그들의 현황입니다.
-
-
-### Window 운영체제에서, 디바이스가 발견되지 않습니다.
-
-가장 흔한 제보는 `adb`에 발견되지 않는 디바이스 혹은 권한 관련 문제입니다.
-다음 명령어를 호출하여 모든 것들에 이상이 없는지 확인하세요:
-
-    adb devices
-
-Window는 당신의 디바이스를 감지하기 위해 [drivers]가 필요할 수도 있습니다.
-
-[drivers]: https://developer.android.com/studio/run/oem-usb.html
-
-
-### 내 디바이스의 미러링만 가능하고, 디바이스와 상호작용을 할 수 없습니다.
-
-일부 디바이스에서는, [simulating input]을 허용하기 위해서 한가지 옵션을 활성화해야 할 수도 있습니다.
-개발자 옵션에서 (developer options) 다음을 활성화 하세요:
-
-> **USB debugging (Security settings)**
-> _권한 부여와 USB 디버깅을 통한 simulating input을 허용한다_
-
-[simulating input]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
-
-
-### 마우스 클릭이 다른 곳에 적용됩니다.
-
-Mac 운영체제에서, HiDPI support 와 여러 스크린 창이 있는 경우, 입력 위치가 잘못 파악될 수 있습니다.
-[issue 15]를 참고하세요.
-
-[issue 15]: https://github.com/Genymobile/scrcpy/issues/15
-
-차선책은 HiDPI support을 비활성화 하고 build하는 방법입니다:
-
-```bash
-meson x --buildtype release -Dhidpi_support=false
-```
-
-하지만, 동영상은 낮은 해상도로 재생될 것 입니다.
-
-
-### HiDPI display의 화질이 낮습니다.
-
-Windows에서는, [scaling behavior] 환경을 설정해야 할 수도 있습니다.
-
-> `scrcpy.exe` > Properties > Compatibility > Change high DPI settings >
-> Override high DPI scaling behavior > Scaling performed by: _Application_.
-
-[scaling behavior]: https://github.com/Genymobile/scrcpy/issues/40#issuecomment-424466723
-
-
-### KWin compositor가 실행되지 않습니다
-
-Plasma Desktop에서는,_scrcpy_ 가 실행중에는 compositor가 비활성화 됩니다.
-
-차석책으로는, ["Block compositing"를 비활성화하세요][kwin].
-
-[kwin]: https://github.com/Genymobile/scrcpy/issues/114#issuecomment-378778613
-
-
-###비디오 스트림을 열 수 없는 에러가 발생합니다.(Could not open video stream).
-
-여러가지 원인이 있을 수 있습니다. 가장 흔한 원인은 디바이스의 하드웨어 인코더(hardware encoder)가
-주어진 해상도를 인코딩할 수 없는 경우입니다.
-
-```
-ERROR: Exception on thread Thread[main,5,main]
-android.media.MediaCodec$CodecException: Error 0xfffffc0e
-...
-Exit due to uncaughtException in main thread:
-ERROR: Could not open video stream
-INFO: Initial texture: 1080x2336
-```
-
-더 낮은 해상도로 시도 해보세요:
-
-```
-scrcpy -m 1920
-scrcpy -m 1024
-scrcpy -m 800
-```
--- a/Makefile.CrossWindows
+++ b/Makefile.CrossWindows
@ -100,11 +100,11 @@ dist-win32: build-server build-win32 build-win32-noconsole
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp "$(WIN32_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/scrcpy-noconsole.exe"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win32-shared/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win32-shared/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
@ -115,11 +115,11 @@ dist-win64: build-server build-win64 build-win64-noconsole
 	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp "$(WIN64_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/scrcpy-noconsole.exe"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/swresample-3.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/swscale-5.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win64-shared/bin/swresample-3.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
+	cp prebuilt-deps/ffmpeg-4.1.4-win64-shared/bin/swscale-5.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
 	cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
--- a/README.ko.md
+++ b/README.ko.md
@ -1,498 +0,0 @@
-# scrcpy (v1.11)
-
-This document will be updated frequently along with the original Readme file
-이 문서는 원어 리드미 파일의 업데이트에 따라 종종 업데이트 될 것입니다
-
- 이 어플리케이션은 UBS ( 혹은 [TCP/IP][article-tcpip] ) 로 연결된 Android 디바이스를 화면에 보여주고 관리하는 것을 제공합니다.
- _GNU/Linux_, _Windows_ 와 _macOS_ 상에서 작동합니다.
- (아래 설명에서 디바이스는 안드로이드 핸드폰을 의미합니다.)
-
-[article-tcpip]:https://www.genymotion.com/blog/open-source-project-scrcpy-now-works-wirelessly/
-
-![screenshot](https://github.com/Genymobile/scrcpy/blob/master/assets/screenshot-debian-600.jpg?raw=true)
-
-주요 기능은 다음과 같습니다.
-
- - **가벼움** (기본적이며 디바이스의 화면만을 보여줌)
- - **뛰어난 성능** (30~60fps)
- - **높은 품질** (1920×1080 이상의 해상도)
- - **빠른 반응 속도** ([35~70ms][lowlatency])
- - **짧은 부팅 시간** (첫 사진을 보여주는데 최대 1초 소요됨)
- - **장치 설치와는 무관함** (디바이스에 설치하지 않아도 됨)
-
-[lowlatency]: https://github.com/Genymobile/scrcpy/pull/646
-
-
-## 요구사항
-
-안드로이드 장치는 최소 API 21 (Android 5.0) 을 필요로 합니다.
-
-디바이스에 [adb debugging][enable-adb]이 가능한지 확인하십시오.
-
-[enable-adb]: https://developer.android.com/studio/command-line/adb.html#Enabling
-
-어떤 디바이스에서는, 키보드와 마우스를 사용하기 위해서 [추가 옵션][control] 이 필요하기도 합니다.
-
-[control]: https://github.com/Genymobile/scrcpy/issues/70#issuecomment-373286323
-
-
-## 앱 설치하기
-
-
-### Linux (리눅스)
-
-리눅스 상에서는 보통 [어플을 직접 설치][BUILD] 해야합니다. 어렵지 않으므로 걱정하지 않아도 됩니다.
-
-[BUILD]:https://github.com/Genymobile/scrcpy/blob/master/BUILD.md
-
-[Snap] 패키지가 가능합니다 : [`scrcpy`][snap-link].
-
-[snap-link]: https://snapstats.org/snaps/scrcpy
-
-[snap]: https://en.wikipedia.org/wiki/Snappy_(package_manager)
-
-Arch Linux에서, [AUR] 패키지가 가능합니다 : [`scrcpy`][aur-link].
-
-[AUR]: https://wiki.archlinux.org/index.php/Arch_User_Repository
-[aur-link]: https://aur.archlinux.org/packages/scrcpy/
-
-Gentoo에서 ,[Ebuild] 가 가능합니다 : [`scrcpy/`][ebuild-link].
-
-[Ebuild]: https://wiki.gentoo.org/wiki/Ebuild
-[ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy
-
-
-### Windows (윈도우)
-
-윈도우 상에서, 간단하게 설치하기 위해 종속성이 있는 사전 구축된 아카이브가 제공됩니다 (`adb` 포함) :
-해당 파일은 Readme원본 링크를 통해서 다운로드가 가능합니다.
- - [`scrcpy-win`][direct-win]
-
-[direct-win]: https://github.com/Genymobile/scrcpy/blob/master/README.md#windows
-
-
-[어플을 직접 설치][BUILD] 할 수도 있습니다.
-
-
-### macOS (맥 OS)
-
-이 어플리케이션은 아래 사항을 따라 설치한다면 [Homebrew] 에서도 사용 가능합니다 :
-
-[Homebrew]: https://brew.sh/
-
-```bash
-brew install scrcpy
-```
-
-`PATH` 로부터 접근 가능한 `adb` 가 필요합니다. 아직 설치하지 않았다면 다음을 따라 설치해야 합니다 :
-
-```bash
-brew cask install android-platform-tools
-```
-
-[어플을 직접 설치][BUILD] 할 수도 있습니다.
-
-
-## 실행
-
-안드로이드 디바이스를 연결하고 실행하십시오:
-
-```bash
-scrcpy
-```
-
-다음과 같이 명령창 옵션 기능도 제공합니다.
-
-```bash
-scrcpy --help
-```
-
-## 기능
-
-### 캡쳐 환경 설정
-
-
-###사이즈 재정의
-
-가끔씩 성능을 향상시키기위해 안드로이드 디바이스를 낮은 해상도에서 미러링하는 것이 유용할 때도 있습니다.
-
-너비와 높이를 제한하기 위해 특정 값으로 지정할 수 있습니다 (e.g. 1024) :
-
-```bash
-scrcpy --max-size 1024
-scrcpy -m 1024  # 축약 버전
-```
-
-이 외의 크기도 디바이스의 가로 세로 비율이 유지된 상태에서 계산됩니다.
-이러한 방식으로 디바이스 상에서 1920×1080 는 모니터 상에서1024×576로 미러링될 것 입니다.
-
-
-### bit-rate 변경
-
-기본 bit-rate 는 8 Mbps입니다. 비디오 bit-rate 를 변경하기 위해선 다음과 같이 입력하십시오 (e.g. 2 Mbps로 변경):
-
-```bash
-scrcpy --bit-rate 2M
-scrcpy -b 2M  # 축약 버전
-```
-
-###프레임 비율 제한
-
-안드로이드 버전 10이상의 디바이스에서는, 다음의 명령어로 캡쳐 화면의 프레임 비율을 제한할 수 있습니다:
-
-```bash
-scrcpy --max-fps 15
-```
-
-
-### Crop (잘라내기)
-
-디바이스 화면은 화면의 일부만 미러링하기 위해 잘라질 것입니다.
-
-예를 들어, *Oculus Go* 의 한 쪽 눈만 미러링할 때 유용합니다 :
-
-```bash
-scrcpy --crop 1224:1440:0:0   # 1224x1440 at offset (0,0)
-scrcpy -c 1224:1440:0:0       # 축약 버전
-```
-
-만약 `--max-size` 도 지정하는 경우, 잘라낸 다음에 재정의된 크기가 적용될 것입니다.
-
-
-### 화면 녹화
-
-미러링하는 동안 화면 녹화를 할 수 있습니다 :
-
-```bash
-scrcpy --record file.mp4
-scrcpy -r file.mkv
-```
-
-녹화하는 동안 미러링을 멈출 수 있습니다 :
-
-```bash
-scrcpy --no-display --record file.mp4
-scrcpy -Nr file.mkv
-# Ctrl+C 로 녹화를 중단할 수 있습니다.
-# 윈도우 상에서 Ctrl+C 는 정상정으로 종료되지 않을 수 있으므로, 디바이스 연결을 해제하십시오.
-```
-
-"skipped frames" 은 모니터 화면에 보여지지 않았지만 녹화되었습니다 ( 성능 문제로 인해 ). 프레임은 디바이스 상에서 _타임 스탬프 ( 어느 시점에 데이터가 존재했다는 사실을 증명하기 위해 특정 위치에 시각을 표시 )_ 되었으므로, [packet delay
-variation] 은 녹화된 파일에 영향을 끼치지 않습니다.
-
-[packet delay variation]: https://en.wikipedia.org/wiki/Packet_delay_variation
-
-## 연결
-
-### 무선연결
-
-_Scrcpy_ 장치와 정보를 주고받기 위해 `adb` 를 사용합니다.  `adb` 는 TCIP/IP 를 통해 디바이스와 [연결][connect] 할 수 있습니다 :
-
-1. 컴퓨터와 디바이스를 동일한 Wi-Fi 에 연결합니다.
-2. 디바이스의 IP address 를 확인합니다 (설정 → 내 기기 → 상태 / 혹은 인터넷에 '내 IP'검색 시 확인 가능합니다. ).
-3. TCP/IP 를 통해 디바이스에서 adb 를 사용할 수 있게 합니다: `adb tcpip 5555`.
-4. 디바이스 연결을 해제합니다.
-5. adb 를 통해 디바이스에 연결을 합니다\: `adb connect DEVICE_IP:5555` _(`DEVICE_IP` 대신)_.
-6. `scrcpy` 실행합니다.
-
-다음은 bit-rate 와 해상도를 줄이는데 유용합니다 :
-
-```bash
-scrcpy --bit-rate 2M --max-size 800
-scrcpy -b2M -m800  # 축약 버전
-```
-
-[connect]: https://developer.android.com/studio/command-line/adb.html#wireless
-
-
-
-### 여러 디바이스 사용 가능
-
-만약에 여러 디바이스들이 `adb devices` 목록에 표시되었다면, _serial_ 을 명시해야합니다:
-
-```bash
-scrcpy --serial 0123456789abcdef
-scrcpy -s 0123456789abcdef  # 축약 버전
-```
-
-_scrcpy_ 로 여러 디바이스를 연결해 사용할 수 있습니다.
-
-
-#### SSH tunnel
-
-떨어져 있는 디바이스와 연결하기 위해서는, 로컬 `adb` client와 떨어져 있는 `adb` 서버를 연결해야 합니다.  (디바이스와 클라이언트가 동일한 버전의 _adb_ protocol을 사용할 경우에 제공됩니다.):
-
-```bash
-adb kill-server    # 5037의 로컬 local adb server를 중단
-ssh -CN -L5037:localhost:5037 -R27183:localhost:27183 your_remote_computer
-# 실행 유지
-```
-
-다른 터미널에서는 :
-
-```bash
-scrcpy
-```
-
-무선 연결과 동일하게, 화질을 줄이는 것이 나을 수 있습니다:
-
-```
-scrcpy -b2M -m800 --max-fps 15
-```
-
-## Window에서의 배치
-
-### 맞춤형 window 제목
-
-기본적으로, window의 이름은 디바이스의 모델명 입니다.
-다음의 명령어를 통해 변경하세요.
-
-```bash
-scrcpy --window-title 'My device'
-```
-
-
-### 배치와 크기
-
-초기 window창의 배치와 크기는 다음과 같이 설정할 수 있습니다:
-
-```bash
-scrcpy --window-x 100 --window-y 100 --window-width 800 --window-height 600
-```
-
-
-### 경계 없애기
-
-윈도우 장식(경계선 등)을 다음과 같이 제거할 수 있습니다:
-
-```bash
-scrcpy --window-borderless
-```
-
-### 항상 모든 윈도우 위에 실행창 고정
-
-이 어플리케이션의 윈도우 창은 다음의 명령어로 다른 window 위에 디스플레이 할 수 있습니다:
-
-```bash
-scrcpy --always-on-top
-scrcpy -T  # 축약 버전
-```
-
-### 전체 화면
-
-이 어플리케이션은 전체화면으로 바로 시작할 수 있습니다.
-
-```bash
-scrcpy --fullscreen
-scrcpy -f  # short version
-```
-
-전체 화면은  `Ctrl`+`f`키로 끄거나 켤 수 있습니다.
-
-
-## 다른 미러링 옵션
-
-### 읽기 전용(Read-only)
-
-권한을 제한하기 위해서는 (디바이스와 관련된 모든 것: 입력 키, 마우스 이벤트 , 파일의 드래그 앤 드랍(drag&drop)):
-
-```bash
-scrcpy --no-control
-scrcpy -n
-```
-
-### 화면 끄기
-
-미러링을 실행하는 와중에 디바이스의 화면을 끌 수 있게 하기 위해서는
-다음의 커맨드 라인 옵션을(command line option) 입력하세요:
-
-```bash
-scrcpy --turn-screen-off
-scrcpy -S
-```
-
-혹은 `Ctrl`+`o`을 눌러 언제든지 디바이스의 화면을 끌 수 있습니다.
-
-다시 화면을 켜기 위해서는`POWER` (혹은 `Ctrl`+`p`)를 누르세요.
-
-
-### 유효기간이 지난 프레임 제공 (Render expired frames)
-
-디폴트로, 대기시간을 최소화하기 위해 _scrcpy_ 는 항상 마지막으로 디코딩된 프레임을 제공합니다
-과거의 프레임은 하나씩 삭제합니다.
-
-모든 프레임을 강제로 렌더링하기 위해서는 (대기 시간이 증가될 수 있습니다)
-다음의 명령어를 사용하세요:
-
-```bash
-scrcpy --render-expired-frames
-```
-
-
-### 화면에 터치 나타내기
-
-발표를 할 때, 물리적인 기기에 한 물리적 터치를 나타내는 것이 유용할 수 있습니다.
-
-안드로이드 운영체제는 이런 기능을 _Developers options_에서 제공합니다.
-
-_Scrcpy_ 는 이런 기능을 시작할 때와 종료할 때 옵션으로 제공합니다.
-
-```bash
-scrcpy --show-touches
-scrcpy -t
-```
-
-화면에 _물리적인 터치만_ 나타나는 것에 유의하세요 (손가락을 디바이스에 대는 행위).
-
-
-### 입력 제어
-
-#### 복사-붙여넣기
-
-컴퓨터와 디바이스 양방향으로 클립보드를 복사하는 것이 가능합니다:
-
- - `Ctrl`+`c` 디바이스의 클립보드를 컴퓨터로 복사합니다;
- - `Ctrl`+`Shift`+`v` 컴퓨터의 클립보드를 디바이스로 복사합니다;
- - `Ctrl`+`v` 컴퓨터의 클립보드를 text event 로써 _붙여넣습니다_  ( 그러나, ASCII 코드가 아닌 경우 실행되지 않습니다 )
-
-#### 텍스트 삽입 우선 순위
-
-텍스트를 입력할 때 생성되는 두 가지의 [events][textevents] 가 있습니다:
- - _key events_, 키가 눌려있는 지에 대한 신호;
- - _text events_, 텍스트가 입력되었는지에 대한 신호.
-
-기본적으로, 글자들은 key event 를 이용해 입력되기 때문에, 키보드는 게임에서처럼 처리합니다 ( 보통 WASD 키에 대해서 ).
-
-그러나 이는 [issues 를 발생][prefertext]시킵니다. 이와 관련된 문제를 접할 경우, 아래와 같이 피할 수 있습니다:
-
-```bash
-scrcpy --prefer-text
-```
-
-( 그러나 이는 게임에서의 처리를 중단할 수 있습니다 )
-
-[textevents]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-text-input
-[prefertext]: https://github.com/Genymobile/scrcpy/issues/650#issuecomment-512945343
-
-
-### 파일 드랍
-
-### APK 실행하기
-
-APK를 실행하기 위해서는, APK file(파일명이`.apk`로 끝나는 파일)을  드래그하고 _scrcpy_ window에 드랍하세요 (drag and drop)
-
-시각적인 피드백은 없고,log 하나가 콘솔에 출력될 것입니다.
-
-### 디바이스에 파일 push하기
-
-디바이스의`/sdcard/`에 파일을 push하기 위해서는,
-APK파일이 아닌 파일을_scrcpy_ window에 드래그하고 드랍하세요.(drag and drop).
-
-시각적인 피드백은 없고,log 하나가 콘솔에 출력될 것입니다.
-
-해당 디렉토리는 시작할 때 변경이 가능합니다:
-
-```bash
-scrcpy --push-target /sdcard/foo/bar/
-```
-
-### 오디오의 전달
-
-_scrcpy_는 오디오를 직접 전달해주지 않습니다. [USBaudio] (Linux-only)를 사용하세요.
-
-추가적으로 [issue #14]를 참고하세요.
-
-[USBaudio]: https://github.com/rom1v/usbaudio
-[issue #14]: https://github.com/Genymobile/scrcpy/issues/14
-
-## 단축키
-
- | 실행내용                                |   단축키                       |   단축키 (macOS)
- | -------------------------------------- |:----------------------------- |:-----------------------------
- | 전체화면 모드로 전환                      | `Ctrl`+`f`                    | `Cmd`+`f`
- | window를 1:1비율로 전환하기(픽셀 맞춤)   | `Ctrl`+`g`                    | `Cmd`+`g`
- | 검은 공백 제거 위한 window 크기 조정  | `Ctrl`+`x` \| _Double-click¹_ | `Cmd`+`x`  \| _Double-click¹_
- |`HOME` 클릭                        | `Ctrl`+`h` \| _Middle-click_  | `Ctrl`+`h` \| _Middle-click_
- | `BACK` 클릭                      | `Ctrl`+`b` \| _Right-click²_  | `Cmd`+`b`  \| _Right-click²_
- | `APP_SWITCH` 클릭                 | `Ctrl`+`s`                    | `Cmd`+`s`
- | `MENU` 클릭                       | `Ctrl`+`m`                    | `Ctrl`+`m`
- | `VOLUME_UP` 클릭                   | `Ctrl`+`↑` _(up)_             | `Cmd`+`↑` _(up)_
- | `VOLUME_DOWN` 클릭                | `Ctrl`+`↓` _(down)_           | `Cmd`+`↓` _(down)_
- | `POWER` 클릭                      | `Ctrl`+`p`                    | `Cmd`+`p`
- | 전원 켜기                               | _Right-click²_                | _Right-click²_
- | 미러링 중 디바이스 화면 끄기    | `Ctrl`+`o`                    | `Cmd`+`o`
- | 알림 패널 늘리기               | `Ctrl`+`n`                    | `Cmd`+`n`
- | 알림 패널 닫기            | `Ctrl`+`Shift`+`n`            | `Cmd`+`Shift`+`n`
- | 디바이스의 clipboard 컴퓨터로 복사하기      | `Ctrl`+`c`                    | `Cmd`+`c`
- | 컴퓨터의 clipboard 디바이스에 붙여넣기     | `Ctrl`+`v`                    | `Cmd`+`v`
- | Copy computer clipboard to device      | `Ctrl`+`Shift`+`v`            | `Cmd`+`Shift`+`v`
- | Enable/disable FPS counter (on stdout) | `Ctrl`+`i`                    | `Cmd`+`i`
-
-_¹검은 공백을 제거하기 위해서는 그 부분을 더블 클릭하세요_
-_²화면이 꺼진 상태에서 우클릭 시 다시 켜지며, 그 외의 상태에서는 뒤로 돌아갑니다.
-
-## 맞춤 경로 (custom path)
-
-특정한 _adb_ binary를 사용하기 위해서는, 그것의 경로를 환경변수로 설정하세요.
-`ADB`:
-
-    ADB=/path/to/adb scrcpy
-
-`scrcpy-server.jar`파일의 경로에 오버라이드 하기 위해서는, 그것의 경로를 `SCRCPY_SERVER_PATH`에 저장하세요.
-
-[useful]: https://github.com/Genymobile/scrcpy/issues/278#issuecomment-429330345
-
-
-## _scrcpy_ 인 이유?
-
-한 동료가 [gnirehtet]와 같이 발음하기 어려운 이름을 찾을 수 있는지 도발했습니다.
-
-[`strcpy`] 는 **str**ing을 copy하고; `scrcpy`는 **scr**een을 copy합니다.
-
-[gnirehtet]: https://github.com/Genymobile/gnirehtet
-[`strcpy`]: http://man7.org/linux/man-pages/man3/strcpy.3.html
-
-
-
-## 빌드하는 방법?
-
-[BUILD]을 참고하세요.
-
-[BUILD]: BUILD.md
-
-## 흔한 issue
-
-[FAQ](FAQ.md)을 참고하세요.
-
-
-## 개발자들
-
-[developers page]를 참고하세요.
-
-[developers page]: DEVELOP.md
-
-
-## 라이선스
-
-    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2019 Romain Vimont
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-## 관련 글 (articles)
-
- [scrcpy 소개][article-intro]
- [무선으로 연결하는 Scrcpy][article-tcpip]
-
-[article-intro]: https://blog.rom1v.com/2018/03/introducing-scrcpy/
-[article-tcpip]: https://www.genymotion.com/blog/open-source-project-scrcpy-now-works-wirelessly/
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# scrcpy (v1.12.1)
+# scrcpy (v1.10)

 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.
@ -62,13 +62,13 @@ For Gentoo, an [Ebuild] is available: [`scrcpy/`][ebuild-link].
 For Windows, for simplicity, prebuilt archives with all the dependencies
 (including `adb`) are available:

- - [`scrcpy-win32-v1.12.1.zip`][direct-win32]  
-   _(SHA-256: 0f4b3b063536b50a2df05dc42c760f9cc0093a9a26dbdf02d8232c74dab43480)_
- - [`scrcpy-win64-v1.12.1.zip`][direct-win64]  
-   _(SHA-256: 57d34b6d16cfd9fe169bc37c4df58ebd256d05c1ea3febc63d9cb0a027ab47c9)_
+ - [`scrcpy-win32-v1.10.zip`][direct-win32]  
+   _(SHA-256: f98b400b3764404b33b212e9762dd6f1593ddb766c1480fc2609c94768e4a8e1)_
+ - [`scrcpy-win64-v1.10.zip`][direct-win64]  
+   _(SHA-256: 95de34575d873c7e95dfcfb5e74d0f6af4f70b2a5bc6fde0f48d1a05480e3a44)_

-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win32-v1.12.1.zip
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win64-v1.12.1.zip
+[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v1.10/scrcpy-win32-v1.10.zip
+[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.10/scrcpy-win64-v1.10.zip

 You can also [build the app manually][BUILD].

@ -108,9 +108,8 @@ scrcpy --help

 ## Features

-### Capture configuration

-#### Reduce size
+### Reduce size

 Sometimes, it is useful to mirror an Android device at a lower definition to
 increase performance.
@ -126,7 +125,7 @@ The other dimension is computed to that the device aspect ratio is preserved.
 That way, a device in 1920×1080 will be mirrored at 1024×576.


-#### Change bit-rate
+### Change bit-rate

 The default bit-rate is 8 Mbps. To change the video bitrate (e.g. to 2 Mbps):

@ -135,17 +134,8 @@ scrcpy --bit-rate 2M
 scrcpy -b 2M  # short version
 ```

-#### Limit frame rate

-The capture frame rate can be limited:
-
-```bash
-scrcpy --max-fps 15
-```
-
-This is officially supported since Android 10, but may work on earlier versions.
-
-#### Crop
+### Crop

 The device screen may be cropped to mirror only part of the screen.

@ -153,12 +143,35 @@ This is useful for example to mirror only one eye of the Oculus Go:

 ```bash
 scrcpy --crop 1224:1440:0:0   # 1224x1440 at offset (0,0)
+scrcpy -c 1224:1440:0:0       # short version
 ```

 If `--max-size` is also specified, resizing is applied after cropping.


-### Recording
+### Wireless
+
+_Scrcpy_ uses `adb` to communicate with the device, and `adb` can [connect] to a
+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).
+3. Enable adb over TCP/IP on your device: `adb tcpip 5555`.
+4. Unplug your device.
+5. Connect to your device: `adb connect DEVICE_IP:5555` _(replace `DEVICE_IP`)_.
+6. Run `scrcpy` as usual.
+
+It may be useful to decrease the bit-rate and the definition:
+
+```bash
+scrcpy --bit-rate 2M --max-size 800
+scrcpy -b2M -m800  # short version
+```
+
+[connect]: https://developer.android.com/studio/command-line/adb.html#wireless
+
+
+### Record screen

 It is possible to record the screen while mirroring:

@ -183,31 +196,7 @@ variation] does not impact the recorded file.
 [packet delay variation]: https://en.wikipedia.org/wiki/Packet_delay_variation


-### Connection
-
-#### Wireless
-
-_Scrcpy_ uses `adb` to communicate with the device, and `adb` can [connect] to a
-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).
-3. Enable adb over TCP/IP on your device: `adb tcpip 5555`.
-4. Unplug your device.
-5. Connect to your device: `adb connect DEVICE_IP:5555` _(replace `DEVICE_IP`)_.
-6. Run `scrcpy` as usual.
-
-It may be useful to decrease the bit-rate and the definition:
-
-```bash
-scrcpy --bit-rate 2M --max-size 800
-scrcpy -b2M -m800  # short version
-```
-
-[connect]: https://developer.android.com/studio/command-line/adb.html#wireless
-
-
-#### Multi-devices
+### Multi-devices

 If several devices are listed in `adb devices`, you must specify the _serial_:

@ -218,65 +207,8 @@ scrcpy -s 0123456789abcdef  # short version

 You can start several instances of _scrcpy_ for several devices.

-#### 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):
-
-```bash
-adb kill-server    # kill the local adb server on 5037
-ssh -CN -L5037:localhost:5037 -R27183:localhost:27183 your_remote_computer
-# keep this open
-```
-
-From another terminal:
-
-```bash
-scrcpy
-```
-
-Like for wireless connections, it may be useful to reduce quality:
-
-```
-scrcpy -b2M -m800 --max-fps 15
-```
-
-### Window configuration
-
-#### Title
-
-By default, the window title is the device model. It can be changed:
-
-```bash
-scrcpy --window-title 'My device'
-```
-
-#### Position and size
-
-The initial window position and size may be specified:
-
-```bash
-scrcpy --window-x 100 --window-y 100 --window-width 800 --window-height 600
-```
-
-#### Borderless
-
-To disable window decorations:
-
-```bash
-scrcpy --window-borderless
-```
-
-#### Always on top
-
-To keep the scrcpy window always on top:
-
-```bash
-scrcpy --always-on-top
-```
-
-#### Fullscreen
+### Fullscreen

 The app may be started directly in fullscreen:

@ -288,45 +220,17 @@ scrcpy -f  # short version
 Fullscreen can then be toggled dynamically with `Ctrl`+`f`.


-### Other mirroring options
+### Always on top

-#### Read-only
-
-To disable controls (everything which can interact with the device: input keys,
-mouse events, drag&drop files):
+The window of app can always be above others by:

 ```bash
-scrcpy --no-control
-scrcpy -n
+scrcpy --always-on-top
+scrcpy -T  # short version
 ```

-#### Turn screen off

-It is possible to turn the device screen off while mirroring on start with a
-command-line option:
-
-```bash
-scrcpy --turn-screen-off
-scrcpy -S
-```
-
-Or by pressing `Ctrl`+`o` at any time.
-
-To turn it back on, press `POWER` (or `Ctrl`+`p`).
-
-#### Render expired frames
-
-By default, to minimize latency, _scrcpy_ always renders the last decoded frame
-available, and drops any previous one.
-
-To force the rendering of all frames (at a cost of a possible increased
-latency), use:
-
-```bash
-scrcpy --render-expired-frames
-```
-
-#### Show touches
+### Show touches

 For presentations, it may be useful to show physical touches (on the physical
 device).
@ -343,50 +247,7 @@ scrcpy -t
 Note that it only shows _physical_ touches (with the finger on the device).


-### Input control
-
-#### Rotate device screen
-
-Press `Ctrl`+`r` to switch between portrait and landscape modes.
-
-Note that it rotates only if the application in foreground supports the
-requested orientation.
-
-#### Copy-paste
-
-It is possible to synchronize clipboards between the computer and the device, in
-both directions:
-
- - `Ctrl`+`c` copies the device clipboard to the computer clipboard;
- - `Ctrl`+`Shift`+`v` copies the computer clipboard to the device clipboard;
- - `Ctrl`+`v` _pastes_ the computer clipboard as a sequence of text events (but
-   breaks non-ASCII characters).
-
-#### Text injection preference
-
-There are two kinds of [events][textevents] generated when typing text:
- - _key events_, signaling that a key is pressed or released;
- - _text events_, signaling that a text has been entered.
-
-By default, letters are injected using key events, so that the keyboard behaves
-as expected in games (typically for WASD keys).
-
-But this may [cause issues][prefertext]. If you encounter such a problem, you
-can avoid it by:
-
-```bash
-scrcpy --prefer-text
-```
-
-(but this will break keyboard behavior in games)
-
-[textevents]: https://blog.rom1v.com/2018/03/introducing-scrcpy/#handle-text-input
-[prefertext]: https://github.com/Genymobile/scrcpy/issues/650#issuecomment-512945343
-
-
-### File drop
-
-#### Install APK
+### Install APK

 To install an APK, drag & drop an APK file (ending with `.apk`) to the _scrcpy_
 window.
@ -394,7 +255,7 @@ window.
 There is no visual feedback, a log is printed to the console.


-#### Push file to device
+### Push file to device

 To push a file to `/sdcard/` on the device, drag & drop a (non-APK) file to the
 _scrcpy_ window.
@ -407,8 +268,53 @@ The target directory can be changed on start:
 scrcpy --push-target /sdcard/foo/bar/
 ```

+### Read-only

-### Audio forwarding
+To disable controls (everything which can interact with the device: input keys,
+mouse events, drag&drop files):
+
+```bash
+scrcpy --no-control
+scrcpy -n
+```
+
+### Turn screen off
+
+It is possible to turn the device screen off while mirroring on start with a
+command-line option:
+
+```bash
+scrcpy --turn-screen-off
+scrcpy -S
+```
+
+Or by pressing `Ctrl`+`o` at any time.
+
+To turn it back on, press `POWER` (or `Ctrl`+`p`).
+
+
+### Render expired frames
+
+By default, to minimize latency, _scrcpy_ always renders the last decoded frame
+available, and drops any previous one.
+
+To force the rendering of all frames (at a cost of a possible increased
+latency), use:
+
+```bash
+scrcpy --render-expired-frames
+```
+
+### Custom window title
+
+By default, the window title is the device model. It can be changed:
+
+```bash
+scrcpy --window-title 'My device'
+```
+
+
+### Forward audio

 Audio is not forwarded by _scrcpy_. Use [USBaudio] (Linux-only).

@ -434,7 +340,6 @@ Also see [issue #14].
 | Click on `POWER`                       | `Ctrl`+`p`                    | `Cmd`+`p`
 | Power on                               | _Right-click²_                | _Right-click²_
 | Turn device screen off (keep mirroring)| `Ctrl`+`o`                    | `Cmd`+`o`
- | Rotate device screen                   | `Ctrl`+`r`                    | `Cmd`+`r`
 | Expand notification panel              | `Ctrl`+`n`                    | `Cmd`+`n`
 | Collapse notification panel            | `Ctrl`+`Shift`+`n`            | `Cmd`+`Shift`+`n`
 | Copy device clipboard to computer      | `Ctrl`+`c`                    | `Cmd`+`c`
--- a/app/meson.build
+++ b/app/meson.build
@ -1,6 +1,5 @@
 src = [
    'src/main.c',
-    'src/cli.c',
    'src/command.c',
    'src/control_msg.c',
    'src/controller.c',
@ -11,16 +10,16 @@ src = [
    'src/file_handler.c',
    'src/fps_counter.c',
    'src/input_manager.c',
+    'src/net.c',
    'src/receiver.c',
    'src/recorder.c',
    'src/scrcpy.c',
    'src/screen.c',
    'src/server.c',
-    'src/stream.c',
+    'src/str_util.c',
    'src/tiny_xpm.c',
+    'src/stream.c',
    'src/video_buffer.c',
-    'src/util/net.c',
-    'src/util/str_util.c'
 ]

 if not get_option('crossbuild_windows')
@ -76,15 +75,17 @@ cc = meson.get_compiler('c')

 if host_machine.system() == 'windows'
    src += [ 'src/sys/win/command.c' ]
+    src += [ 'src/sys/win/net.c' ]
    dependencies += cc.find_library('ws2_32')
 else
    src += [ 'src/sys/unix/command.c' ]
+    src += [ 'src/sys/unix/net.c' ]
 endif

 conf = configuration_data()

 # expose the build type
-conf.set('NDEBUG', get_option('buildtype') != 'debug')
+conf.set('BUILD_DEBUG', get_option('buildtype') == 'debug')

 # the version, updated on release
 conf.set_quoted('SCRCPY_VERSION', meson.project_version())
@ -96,10 +97,9 @@ conf.set_quoted('PREFIX', get_option('prefix'))
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))

-# the default client TCP port range for the "adb reverse" tunnel
+# the default client TCP port for the "adb reverse" tunnel
 # overridden by option --port
-conf.set('DEFAULT_LOCAL_PORT_RANGE_FIRST', '27183')
-conf.set('DEFAULT_LOCAL_PORT_RANGE_LAST', '27199')
+conf.set('DEFAULT_LOCAL_PORT', '27183')

 # the default max video size for both dimensions, in pixels
 # overridden by option --max-size
@ -115,16 +115,15 @@ conf.set('HIDPI_SUPPORT', get_option('hidpi_support'))
 # disable console on Windows
 conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole'))

-# run a server debugger and wait for a client to be attached
-conf.set('SERVER_DEBUGGER', get_option('server_debugger'))
-
 configure_file(configuration: conf, output: 'config.h')

 src_dir = include_directories('src')

 if get_option('windows_noconsole')
-    link_args = [ '-Wl,--subsystem,windows' ]
+    c_args = [ '-mwindows' ]
+    link_args = [ '-mwindows' ]
 else
+    c_args = []
    link_args = []
 endif

@ -132,7 +131,7 @@ executable('scrcpy', src,
           dependencies: dependencies,
           include_directories: src_dir,
           install: true,
-           c_args: [],
+           c_args: c_args,
           link_args: link_args)

 install_man('scrcpy.1')
@ -140,43 +139,31 @@ install_man('scrcpy.1')

 ### TESTS

-# do not build tests in release (assertions would not be executed at all)
-if get_option('buildtype') == 'debug'
-    tests = [
-        ['test_buffer_util', [
-            'tests/test_buffer_util.c'
-        ]],
-        ['test_cbuf', [
-            'tests/test_cbuf.c',
-        ]],
-        ['test_cli', [
-            'tests/test_cli.c',
-            'src/cli.c',
-            'src/util/str_util.c',
-        ]],
-        ['test_control_event_serialize', [
-            'tests/test_control_msg_serialize.c',
-            'src/control_msg.c',
-            'src/util/str_util.c',
-        ]],
-        ['test_device_event_deserialize', [
-            'tests/test_device_msg_deserialize.c',
-            'src/device_msg.c',
-        ]],
-        ['test_queue', [
-            'tests/test_queue.c',
-        ]],
-        ['test_strutil', [
-            'tests/test_strutil.c',
-            'src/util/str_util.c',
-        ]],
-    ]
+tests = [
+    ['test_cbuf', [
+        'tests/test_cbuf.c',
+    ]],
+    ['test_control_event_serialize', [
+        'tests/test_control_msg_serialize.c',
+        'src/control_msg.c',
+        'src/str_util.c'
+    ]],
+    ['test_device_event_deserialize', [
+        'tests/test_device_msg_deserialize.c',
+        'src/device_msg.c'
+    ]],
+    ['test_queue', [
+        'tests/test_queue.c',
+    ]],
+    ['test_strutil', [
+        'tests/test_strutil.c',
+        'src/str_util.c'
+    ]],
+]

-    foreach t : tests
-        exe = executable(t[0], t[1],
-                         include_directories: src_dir,
-                         dependencies: dependencies,
-                         c_args: ['-DSDL_MAIN_HANDLED'])
-        test(t[0], exe)
-    endforeach
-endif
+foreach t : tests
+    exe = executable(t[0], t[1],
+                     include_directories: src_dir,
+                     dependencies: dependencies)
+    test(t[0], exe)
+endforeach
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@ -15,10 +15,6 @@ provides display and control of Android devices connected on USB (or over TCP/IP

 .SH OPTIONS

-.TP
-.B \-\-always\-on\-top
-Make scrcpy window always on top (above other windows).
-
 .TP
 .BI "\-b, \-\-bit\-rate " value
 Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are supported: '\fBK\fR' (x1000) and '\fBM\fR' (x1000000).
@ -26,7 +22,7 @@ Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are
 Default is 8000000.

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

 The values are expressed in the device natural orientation (typically, portrait for a phone, landscape for a tablet). Any
@ -38,12 +34,12 @@ value is computed on the cropped size.
 Start in fullscreen.

 .TP
-.B \-h, \-\-help
-Print this help.
+.BI "\-F, \-\-record\-format " format
+Force recording format (either mp4 or mkv).

 .TP
-.BI "\-\-max\-fps " value
-Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
+.B \-h, \-\-help
+Print this help.

 .TP
 .BI "\-m, \-\-max\-size " value
@ -60,17 +56,10 @@ Disable device control (mirror the device in read\-only).
 Do not display device (only when screen recording is enabled).

 .TP
-.BI "\-p, \-\-port " port[:port]
-Set the TCP port (range) used by the client to listen.
+.BI "\-p, \-\-port " port
+Set the TCP port the client listens on.

-Default is 27183:27199.
-
-.TP
-.B \-\-prefer\-text
-Inject alpha characters and space as text events instead of key events.
-
-This avoids issues when combining multiple keys to enter special characters,
-but breaks the expected behavior of alpha keys in games (typically WASD).
+Default is 27183.

 .TP
 .BI "\-\-push\-target " path
@ -84,13 +73,9 @@ Record screen to
 .IR file .

 The format is determined by the
-.B \-\-record\-format
+.B \-F/\-\-record\-format
 option if set, or by the file extension (.mp4 or .mkv).

-.TP
-.BI "\-\-record\-format " format
-Force recording format (either mp4 or mkv).
-
 .TP
 .B \-\-render\-expired\-frames
 By default, to minimize latency, scrcpy always renders the last available decoded frame, and drops any previous ones. This flag forces to render all frames, at a cost of a possible increased latency.
@ -109,38 +94,38 @@ Enable "show touches" on start, disable on quit.

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

+.TP
+.B \-T, \-\-always\-on\-top
+Make scrcpy window always on top (above other windows).
+
 .TP
 .B \-v, \-\-version
 Print the version of scrcpy.

 .TP
-.B \-\-window\-borderless
-Disable window decorations (display borderless window).
-
-.TP
-.BI "\-\-window\-title " text
+.BI \-\-window\-title " text
 Set a custom window title.

 .TP
-.BI "\-\-window\-x " value
+.BI \-\-window\-x " value
 Set the initial window horizontal position.

 Default is -1 (automatic).\n

 .TP
-.BI "\-\-window\-y " value
+.BI \-\-window\-y " value
 Set the initial window vertical position.

 Default is -1 (automatic).\n

 .TP
-.BI "\-\-window\-width " value
+.BI \-\-window\-width " value
 Set the initial window width.

 Default is 0 (automatic).\n

 .TP
-.BI "\-\-window\-height " value
+.BI \-\-window\-height " value
 Set the initial window height.

 Default is 0 (automatic).\n
@ -195,10 +180,6 @@ turn screen on
 .B Ctrl+o
 turn device screen off (keep mirroring)

-.TP
-.B Ctrl+r
-rotate device screen
-
 .TP
 .B Ctrl+n
 expand notification panel
--- a/app/src/util/buffer_util.h
+++ b/app/src/util/buffer_util.h
@ -36,8 +36,8 @@ buffer_read32be(const uint8_t *buf) {
    return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
 }

-static inline uint64_t
-buffer_read64be(const uint8_t *buf) {
+static inline
+uint64_t buffer_read64be(const uint8_t *buf) {
    uint32_t msb = buffer_read32be(buf);
    uint32_t lsb = buffer_read32be(&buf[4]);
    return ((uint64_t) msb << 32) | lsb;
--- a/app/src/util/cbuf.h
+++ b/app/src/util/cbuf.h
--- a/app/src/cli.c
+++ b/app/src/cli.c
@ -1,566 +0,0 @@
-#include "cli.h"
-
-#include <getopt.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "recorder.h"
-#include "util/log.h"
-#include "util/str_util.h"
-
-void
-scrcpy_print_usage(const char *arg0) {
-#ifdef __APPLE__
-# define CTRL_OR_CMD "Cmd"
-#else
-# define CTRL_OR_CMD "Ctrl"
-#endif
-    fprintf(stderr,
-        "Usage: %s [options]\n"
-        "\n"
-        "Options:\n"
-        "\n"
-        "    --always-on-top\n"
-        "        Make scrcpy window always on top (above other windows).\n"
-        "\n"
-        "    -b, --bit-rate value\n"
-        "        Encode the video at the given bit-rate, expressed in bits/s.\n"
-        "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
-        "        Default is %d.\n"
-        "\n"
-        "    --crop width:height:x:y\n"
-        "        Crop the device screen on the server.\n"
-        "        The values are expressed in the device natural orientation\n"
-        "        (typically, portrait for a phone, landscape for a tablet).\n"
-        "        Any --max-size value is computed on the cropped size.\n"
-        "\n"
-        "    -f, --fullscreen\n"
-        "        Start in fullscreen.\n"
-        "\n"
-        "    -h, --help\n"
-        "        Print this help.\n"
-        "\n"
-        "    --max-fps value\n"
-        "        Limit the frame rate of screen capture (officially supported\n"
-        "        since Android 10, but may work on earlier versions).\n"
-        "\n"
-        "    -m, --max-size value\n"
-        "        Limit both the width and height of the video to value. The\n"
-        "        other dimension is computed so that the device aspect-ratio\n"
-        "        is preserved.\n"
-        "        Default is %d%s.\n"
-        "\n"
-        "    -n, --no-control\n"
-        "        Disable device control (mirror the device in read-only).\n"
-        "\n"
-        "    -N, --no-display\n"
-        "        Do not display device (only when screen recording is\n"
-        "        enabled).\n"
-        "\n"
-        "    -p, --port port[:port]\n"
-        "        Set the TCP port (range) used by the client to listen.\n"
-        "        Default is %d:%d.\n"
-        "\n"
-        "    --prefer-text\n"
-        "        Inject alpha characters and space as text events instead of\n"
-        "        key events.\n"
-        "        This avoids issues when combining multiple keys to enter a\n"
-        "        special character, but breaks the expected behavior of alpha\n"
-        "        keys in games (typically WASD).\n"
-        "\n"
-        "    --push-target path\n"
-        "        Set the target directory for pushing files to the device by\n"
-        "        drag & drop. It is passed as-is to \"adb push\".\n"
-        "        Default is \"/sdcard/\".\n"
-        "\n"
-        "    -r, --record file.mp4\n"
-        "        Record screen to file.\n"
-        "        The format is determined by the --record-format option if\n"
-        "        set, or by the file extension (.mp4 or .mkv).\n"
-        "\n"
-        "    --record-format format\n"
-        "        Force recording format (either mp4 or mkv).\n"
-        "\n"
-        "    --render-expired-frames\n"
-        "        By default, to minimize latency, scrcpy always renders the\n"
-        "        last available decoded frame, and drops any previous ones.\n"
-        "        This flag forces to render all frames, at a cost of a\n"
-        "        possible increased latency.\n"
-        "\n"
-        "    -s, --serial serial\n"
-        "        The device serial number. Mandatory only if several devices\n"
-        "        are connected to adb.\n"
-        "\n"
-        "    -S, --turn-screen-off\n"
-        "        Turn the device screen off immediately.\n"
-        "\n"
-        "    -t, --show-touches\n"
-        "        Enable \"show touches\" on start, disable on quit.\n"
-        "        It only shows physical touches (not clicks from scrcpy).\n"
-        "\n"
-        "    -v, --version\n"
-        "        Print the version of scrcpy.\n"
-        "\n"
-        "    --window-borderless\n"
-        "        Disable window decorations (display borderless window).\n"
-        "\n"
-        "    --window-title text\n"
-        "        Set a custom window title.\n"
-        "\n"
-        "    --window-x value\n"
-        "        Set the initial window horizontal position.\n"
-        "        Default is -1 (automatic).\n"
-        "\n"
-        "    --window-y value\n"
-        "        Set the initial window vertical position.\n"
-        "        Default is -1 (automatic).\n"
-        "\n"
-        "    --window-width value\n"
-        "        Set the initial window width.\n"
-        "        Default is 0 (automatic).\n"
-        "\n"
-        "    --window-height value\n"
-        "        Set the initial window width.\n"
-        "        Default is 0 (automatic).\n"
-        "\n"
-        "Shortcuts:\n"
-        "\n"
-        "    " CTRL_OR_CMD "+f\n"
-        "        switch fullscreen mode\n"
-        "\n"
-        "    " CTRL_OR_CMD "+g\n"
-        "        resize window to 1:1 (pixel-perfect)\n"
-        "\n"
-        "    " CTRL_OR_CMD "+x\n"
-        "    Double-click on black borders\n"
-        "        resize window to remove black borders\n"
-        "\n"
-        "    Ctrl+h\n"
-        "    Middle-click\n"
-        "        click on HOME\n"
-        "\n"
-        "    " CTRL_OR_CMD "+b\n"
-        "    " CTRL_OR_CMD "+Backspace\n"
-        "    Right-click (when screen is on)\n"
-        "        click on BACK\n"
-        "\n"
-        "    " CTRL_OR_CMD "+s\n"
-        "        click on APP_SWITCH\n"
-        "\n"
-        "    Ctrl+m\n"
-        "        click on MENU\n"
-        "\n"
-        "    " CTRL_OR_CMD "+Up\n"
-        "        click on VOLUME_UP\n"
-        "\n"
-        "    " CTRL_OR_CMD "+Down\n"
-        "        click on VOLUME_DOWN\n"
-        "\n"
-        "    " CTRL_OR_CMD "+p\n"
-        "        click on POWER (turn screen on/off)\n"
-        "\n"
-        "    Right-click (when screen is off)\n"
-        "        power on\n"
-        "\n"
-        "    " CTRL_OR_CMD "+o\n"
-        "        turn device screen off (keep mirroring)\n"
-        "\n"
-        "    " CTRL_OR_CMD "+r\n"
-        "        rotate device screen\n"
-        "\n"
-        "    " CTRL_OR_CMD "+n\n"
-        "       expand notification panel\n"
-        "\n"
-        "    " CTRL_OR_CMD "+Shift+n\n"
-        "       collapse notification panel\n"
-        "\n"
-        "    " CTRL_OR_CMD "+c\n"
-        "        copy device clipboard to computer\n"
-        "\n"
-        "    " CTRL_OR_CMD "+v\n"
-        "        paste computer clipboard to device\n"
-        "\n"
-        "    " CTRL_OR_CMD "+Shift+v\n"
-        "        copy computer clipboard to device\n"
-        "\n"
-        "    " CTRL_OR_CMD "+i\n"
-        "        enable/disable FPS counter (print frames/second in logs)\n"
-        "\n"
-        "    Drag & drop APK file\n"
-        "        install APK from computer\n"
-        "\n",
-        arg0,
-        DEFAULT_BIT_RATE,
-        DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
-        DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
-}
-
-static bool
-parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
-                  long max, const char *name) {
-    long value;
-    bool ok;
-    if (accept_suffix) {
-        ok = parse_integer_with_suffix(s, &value);
-    } else {
-        ok = parse_integer(s, &value);
-    }
-    if (!ok) {
-        LOGE("Could not parse %s: %s", name, s);
-        return false;
-    }
-
-    if (value < min || value > max) {
-        LOGE("Could not parse %s: value (%ld) out-of-range (%ld; %ld)",
-             name, value, min, max);
-        return false;
-    }
-
-    *out = value;
-    return true;
-}
-
-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 = parse_integers(s, ':', max_items, out);
-    if (!count) {
-        LOGE("Could not parse %s: %s", name, s);
-        return 0;
-    }
-
-    for (size_t i = 0; i < count; ++i) {
-        long value = out[i];
-        if (value < min || value > max) {
-            LOGE("Could not parse %s: value (%ld) out-of-range (%ld; %ld)",
-                 name, value, min, max);
-            return 0;
-        }
-    }
-
-    return count;
-}
-
-static bool
-parse_bit_rate(const char *s, uint32_t *bit_rate) {
-    long value;
-    // long may be 32 bits (it is the case on mingw), so do not use more than
-    // 31 bits (long is signed)
-    bool ok = parse_integer_arg(s, &value, true, 0, 0x7FFFFFFF, "bit-rate");
-    if (!ok) {
-        return false;
-    }
-
-    *bit_rate = (uint32_t) value;
-    return true;
-}
-
-static bool
-parse_max_size(const char *s, uint16_t *max_size) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "max size");
-    if (!ok) {
-        return false;
-    }
-
-    *max_size = (uint16_t) value;
-    return true;
-}
-
-static bool
-parse_max_fps(const char *s, uint16_t *max_fps) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 1000, "max fps");
-    if (!ok) {
-        return false;
-    }
-
-    *max_fps = (uint16_t) value;
-    return true;
-}
-
-static bool
-parse_window_position(const char *s, int16_t *position) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, -1, 0x7FFF,
-                                "window position");
-    if (!ok) {
-        return false;
-    }
-
-    *position = (int16_t) value;
-    return true;
-}
-
-static bool
-parse_window_dimension(const char *s, uint16_t *dimension) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF,
-                                "window dimension");
-    if (!ok) {
-        return false;
-    }
-
-    *dimension = (uint16_t) value;
-    return true;
-}
-
-static bool
-parse_port_range(const char *s, struct port_range *port_range) {
-    long values[2];
-    size_t count = parse_integers_arg(s, 2, values, 0, 0xFFFF, "port");
-    if (!count) {
-        return false;
-    }
-
-    uint16_t v0 = (uint16_t) values[0];
-    if (count == 1) {
-        port_range->first = v0;
-        port_range->last = v0;
-        return true;
-    }
-
-    assert(count == 2);
-    uint16_t v1 = (uint16_t) values[1];
-    if (v0 < v1) {
-        port_range->first = v0;
-        port_range->last = v1;
-    } else {
-        port_range->first = v1;
-        port_range->last = v0;
-    }
-
-    return true;
-}
-
-static bool
-parse_record_format(const char *optarg, enum recorder_format *format) {
-    if (!strcmp(optarg, "mp4")) {
-        *format = RECORDER_FORMAT_MP4;
-        return true;
-    }
-    if (!strcmp(optarg, "mkv")) {
-        *format = RECORDER_FORMAT_MKV;
-        return true;
-    }
-    LOGE("Unsupported format: %s (expected mp4 or mkv)", optarg);
-    return false;
-}
-
-static enum recorder_format
-guess_record_format(const char *filename) {
-    size_t len = strlen(filename);
-    if (len < 4) {
-        return 0;
-    }
-    const char *ext = &filename[len - 4];
-    if (!strcmp(ext, ".mp4")) {
-        return RECORDER_FORMAT_MP4;
-    }
-    if (!strcmp(ext, ".mkv")) {
-        return RECORDER_FORMAT_MKV;
-    }
-    return 0;
-}
-
-#define OPT_RENDER_EXPIRED_FRAMES 1000
-#define OPT_WINDOW_TITLE          1001
-#define OPT_PUSH_TARGET           1002
-#define OPT_ALWAYS_ON_TOP         1003
-#define OPT_CROP                  1004
-#define OPT_RECORD_FORMAT         1005
-#define OPT_PREFER_TEXT           1006
-#define OPT_WINDOW_X              1007
-#define OPT_WINDOW_Y              1008
-#define OPT_WINDOW_WIDTH          1009
-#define OPT_WINDOW_HEIGHT         1010
-#define OPT_WINDOW_BORDERLESS     1011
-#define OPT_MAX_FPS               1012
-
-bool
-scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
-    static const struct option long_options[] = {
-        {"always-on-top",         no_argument,       NULL, OPT_ALWAYS_ON_TOP},
-        {"bit-rate",              required_argument, NULL, 'b'},
-        {"crop",                  required_argument, NULL, OPT_CROP},
-        {"fullscreen",            no_argument,       NULL, 'f'},
-        {"help",                  no_argument,       NULL, 'h'},
-        {"max-fps",               required_argument, NULL, OPT_MAX_FPS},
-        {"max-size",              required_argument, NULL, 'm'},
-        {"no-control",            no_argument,       NULL, 'n'},
-        {"no-display",            no_argument,       NULL, 'N'},
-        {"port",                  required_argument, NULL, 'p'},
-        {"push-target",           required_argument, NULL, OPT_PUSH_TARGET},
-        {"record",                required_argument, NULL, 'r'},
-        {"record-format",         required_argument, NULL, OPT_RECORD_FORMAT},
-        {"render-expired-frames", no_argument,       NULL,
-                                                     OPT_RENDER_EXPIRED_FRAMES},
-        {"serial",                required_argument, NULL, 's'},
-        {"show-touches",          no_argument,       NULL, 't'},
-        {"turn-screen-off",       no_argument,       NULL, 'S'},
-        {"prefer-text",           no_argument,       NULL, OPT_PREFER_TEXT},
-        {"version",               no_argument,       NULL, 'v'},
-        {"window-title",          required_argument, NULL, OPT_WINDOW_TITLE},
-        {"window-x",              required_argument, NULL, OPT_WINDOW_X},
-        {"window-y",              required_argument, NULL, OPT_WINDOW_Y},
-        {"window-width",          required_argument, NULL, OPT_WINDOW_WIDTH},
-        {"window-height",         required_argument, NULL, OPT_WINDOW_HEIGHT},
-        {"window-borderless",     no_argument,       NULL,
-                                                     OPT_WINDOW_BORDERLESS},
-        {NULL,                    0,                 NULL, 0  },
-    };
-
-    struct scrcpy_options *opts = &args->opts;
-
-    optind = 0; // reset to start from the first argument in tests
-
-    int c;
-    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv", long_options,
-                            NULL)) != -1) {
-        switch (c) {
-            case 'b':
-                if (!parse_bit_rate(optarg, &opts->bit_rate)) {
-                    return false;
-                }
-                break;
-            case 'c':
-                LOGW("Deprecated option -c. Use --crop instead.");
-                // fall through
-            case OPT_CROP:
-                opts->crop = optarg;
-                break;
-            case 'f':
-                opts->fullscreen = true;
-                break;
-            case 'F':
-                LOGW("Deprecated option -F. Use --record-format instead.");
-                // fall through
-            case OPT_RECORD_FORMAT:
-                if (!parse_record_format(optarg, &opts->record_format)) {
-                    return false;
-                }
-                break;
-            case 'h':
-                args->help = true;
-                break;
-            case OPT_MAX_FPS:
-                if (!parse_max_fps(optarg, &opts->max_fps)) {
-                    return false;
-                }
-                break;
-            case 'm':
-                if (!parse_max_size(optarg, &opts->max_size)) {
-                    return false;
-                }
-                break;
-            case 'n':
-                opts->control = false;
-                break;
-            case 'N':
-                opts->display = false;
-                break;
-            case 'p':
-                if (!parse_port_range(optarg, &opts->port_range)) {
-                    return false;
-                }
-                break;
-            case 'r':
-                opts->record_filename = optarg;
-                break;
-            case 's':
-                opts->serial = optarg;
-                break;
-            case 'S':
-                opts->turn_screen_off = true;
-                break;
-            case 't':
-                opts->show_touches = true;
-                break;
-            case 'T':
-                LOGW("Deprecated option -T. Use --always-on-top instead.");
-                // fall through
-            case OPT_ALWAYS_ON_TOP:
-                opts->always_on_top = true;
-                break;
-            case 'v':
-                args->version = true;
-                break;
-            case OPT_RENDER_EXPIRED_FRAMES:
-                opts->render_expired_frames = true;
-                break;
-            case OPT_WINDOW_TITLE:
-                opts->window_title = optarg;
-                break;
-            case OPT_WINDOW_X:
-                if (!parse_window_position(optarg, &opts->window_x)) {
-                    return false;
-                }
-                break;
-            case OPT_WINDOW_Y:
-                if (!parse_window_position(optarg, &opts->window_y)) {
-                    return false;
-                }
-                break;
-            case OPT_WINDOW_WIDTH:
-                if (!parse_window_dimension(optarg, &opts->window_width)) {
-                    return false;
-                }
-                break;
-            case OPT_WINDOW_HEIGHT:
-                if (!parse_window_dimension(optarg, &opts->window_height)) {
-                    return false;
-                }
-                break;
-            case OPT_WINDOW_BORDERLESS:
-                opts->window_borderless = true;
-                break;
-            case OPT_PUSH_TARGET:
-                opts->push_target = optarg;
-                break;
-            case OPT_PREFER_TEXT:
-                opts->prefer_text = true;
-                break;
-            default:
-                // getopt prints the error message on stderr
-                return false;
-        }
-    }
-
-    if (!opts->display && !opts->record_filename) {
-        LOGE("-N/--no-display requires screen recording (-r/--record)");
-        return false;
-    }
-
-    if (!opts->display && opts->fullscreen) {
-        LOGE("-f/--fullscreen-window is incompatible with -N/--no-display");
-        return false;
-    }
-
-    int index = optind;
-    if (index < argc) {
-        LOGE("Unexpected additional argument: %s", argv[index]);
-        return false;
-    }
-
-    if (opts->record_format && !opts->record_filename) {
-        LOGE("Record format specified without recording");
-        return false;
-    }
-
-    if (opts->record_filename && !opts->record_format) {
-        opts->record_format = guess_record_format(opts->record_filename);
-        if (!opts->record_format) {
-            LOGE("No format specified for \"%s\" (try with -F mkv)",
-                 opts->record_filename);
-            return false;
-        }
-    }
-
-    if (!opts->control && opts->turn_screen_off) {
-        LOGE("Could not request to turn screen off if control is disabled");
-        return false;
-    }
-
-    return true;
-}
--- a/app/src/cli.h
+++ b/app/src/cli.h
@ -1,21 +0,0 @@
-#ifndef SCRCPY_CLI_H
-#define SCRCPY_CLI_H
-
-#include <stdbool.h>
-
-#include "config.h"
-#include "scrcpy.h"
-
-struct scrcpy_cli_args {
-    struct scrcpy_options opts;
-    bool help;
-    bool version;
-};
-
-void
-scrcpy_print_usage(const char *arg0);
-
-bool
-scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]);
-
-#endif
--- a/app/src/command.c
+++ b/app/src/command.c
@ -7,8 +7,8 @@

 #include "config.h"
 #include "common.h"
-#include "util/log.h"
-#include "util/str_util.h"
+#include "log.h"
+#include "str_util.h"

 static const char *adb_command;

@ -55,32 +55,6 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
    return idx;
 }

-static void
-show_adb_installation_msg() {
-#ifndef __WINDOWS__
-    static const struct {
-        const char *binary;
-        const char *command;
-    } pkg_managers[] = {
-        {"apt", "apt install adb"},
-        {"apt-get", "apt-get install adb"},
-        {"brew", "brew cask install android-platform-tools"},
-        {"dnf", "dnf install android-tools"},
-        {"emerge", "emerge dev-util/android-tools"},
-        {"pacman", "pacman -S android-tools"},
-    };
-    for (size_t i = 0; i < ARRAY_LEN(pkg_managers); ++i) {
-        if (cmd_search(pkg_managers[i].binary)) {
-            LOGI("You may install 'adb' by \"%s\"", pkg_managers[i].command);
-            return;
-        }
-    }
-#endif
-
-    LOGI("You may download and install 'adb' from "
-         "https://developer.android.com/studio/releases/platform-tools");
-}
-
 static void
 show_adb_err_msg(enum process_result err, const char *const argv[]) {
    char buf[512];
@ -94,7 +68,6 @@ show_adb_err_msg(enum process_result err, const char *const argv[]) {
            LOGE("Command not found: %s", buf);
            LOGE("(make 'adb' accessible from your PATH or define its full"
                 "path in the ADB environment variable)");
-            show_adb_installation_msg();
            break;
        case PROCESS_SUCCESS:
            // do nothing
@ -118,7 +91,7 @@ adb_execute(const char *serial, const char *const adb_cmd[], size_t len) {

    memcpy(&cmd[i], adb_cmd, len * sizeof(const char *));
    cmd[len + i] = NULL;
-    enum process_result r = cmd_execute(cmd, &process);
+    enum process_result r = cmd_execute(cmd[0], cmd, &process);
    if (r != PROCESS_SUCCESS) {
        show_adb_err_msg(r, cmd);
        return PROCESS_NONE;
--- a/app/src/command.h
+++ b/app/src/command.h
@ -18,7 +18,6 @@
 #   define PRIsizet PRIu32
 # endif
 # define PROCESS_NONE NULL
-# define NO_EXIT_CODE -1u // max value as unsigned
  typedef HANDLE process_t;
  typedef DWORD exit_code_t;

@ -29,7 +28,6 @@
 # define PRIsizet "zu"
 # define PRIexitcode "d"
 # define PROCESS_NONE -1
-# define NO_EXIT_CODE -1
  typedef pid_t process_t;
  typedef int exit_code_t;

@ -37,19 +35,16 @@

 #include "config.h"

+# define NO_EXIT_CODE -1
+
 enum process_result {
    PROCESS_SUCCESS,
    PROCESS_ERROR_GENERIC,
    PROCESS_ERROR_MISSING_BINARY,
 };

-#ifndef __WINDOWS__
-bool
-cmd_search(const char *file);
-#endif
-
 enum process_result
-cmd_execute(const char *const argv[], process_t *process);
+cmd_execute(const char *path, const char *const argv[], process_t *process);

 bool
 cmd_terminate(process_t pid);
@ -90,8 +85,4 @@ process_check_success(process_t proc, const char *name);
 char *
 get_executable_path(void);

-// returns true if the file exists and is not a directory
-bool
-is_regular_file(const char *path);
-
 #endif
--- a/app/src/common.h
+++ b/app/src/common.h
@ -27,9 +27,4 @@ struct position {
    struct point point;
 };

-struct port_range {
-    uint16_t first;
-    uint16_t last;
-};
-
 #endif
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@ -1,12 +1,12 @@
 #include "control_msg.h"

-#include <assert.h>
 #include <string.h>
+#include <SDL2/SDL_assert.h>

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

 static void
 write_position(uint8_t *buf, const struct position *position) {
@ -27,7 +27,7 @@ write_string(const char *utf8, size_t max_len, unsigned char *buf) {

 static uint16_t
 to_fixed_point_16(float f) {
-    assert(f >= 0.0f && f <= 1.0f);
+    SDL_assert(f >= 0.0f && f <= 1.0f);
    uint32_t u = f * 0x1p16f; // 2^16
    if (u >= 0xffff) {
        u = 0xffff;
@ -78,7 +78,6 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
        case CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
-        case CONTROL_MSG_TYPE_ROTATE_DEVICE:
            // no additional data
            return 1;
        default:
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@ -28,7 +28,6 @@ enum control_msg_type {
    CONTROL_MSG_TYPE_GET_CLIPBOARD,
    CONTROL_MSG_TYPE_SET_CLIPBOARD,
    CONTROL_MSG_TYPE_SET_SCREEN_POWER_MODE,
-    CONTROL_MSG_TYPE_ROTATE_DEVICE,
 };

 enum screen_power_mode {
--- a/app/src/controller.c
+++ b/app/src/controller.c
@ -1,10 +1,10 @@
 #include "controller.h"

-#include <assert.h>
+#include <SDL2/SDL_assert.h>

 #include "config.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 bool
 controller_init(struct controller *controller, socket_t control_socket) {
@ -85,8 +85,7 @@ run_controller(void *data) {
        }
        struct control_msg msg;
        bool non_empty = cbuf_take(&controller->queue, &msg);
-        assert(non_empty);
-        (void) non_empty;
+        SDL_assert(non_empty);
        mutex_unlock(controller->mutex);

        bool ok = process_msg(controller, &msg);
--- a/app/src/controller.h
+++ b/app/src/controller.h
@ -6,10 +6,10 @@
 #include <SDL2/SDL_thread.h>

 #include "config.h"
+#include "cbuf.h"
 #include "control_msg.h"
+#include "net.h"
 #include "receiver.h"
-#include "util/cbuf.h"
-#include "util/net.h"

 struct control_msg_queue CBUF(struct control_msg, 64);

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

 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
+#include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_events.h>
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
@ -9,11 +10,12 @@

 #include "config.h"
 #include "compat.h"
+#include "buffer_util.h"
 #include "events.h"
+#include "lock_util.h"
+#include "log.h"
 #include "recorder.h"
 #include "video_buffer.h"
-#include "util/buffer_util.h"
-#include "util/log.h"

 // set the decoded frame as ready for rendering, and notify
 static void
--- a/app/src/device.c
+++ b/app/src/device.c
@ -1,7 +1,7 @@
 #include "device.h"

 #include "config.h"
-#include "util/log.h"
+#include "log.h"

 bool
 device_read_info(socket_t device_socket, char *device_name, struct size *size) {
--- a/app/src/device.h
+++ b/app/src/device.h
@ -5,7 +5,7 @@

 #include "config.h"
 #include "common.h"
-#include "util/net.h"
+#include "net.h"

 #define DEVICE_NAME_FIELD_LENGTH 64

--- a/app/src/device_msg.c
+++ b/app/src/device_msg.c
@ -1,10 +1,11 @@
 #include "device_msg.h"

 #include <string.h>
+#include <SDL2/SDL_assert.h>

 #include "config.h"
-#include "util/buffer_util.h"
-#include "util/log.h"
+#include "buffer_util.h"
+#include "log.h"

 ssize_t
 device_msg_deserialize(const unsigned char *buf, size_t len,
--- a/app/src/event_converter.c
+++ b/app/src/event_converter.c
@ -5,7 +5,7 @@
 #define MAP(FROM, TO) case FROM: *to = TO; return true
 #define FAIL default: return false

-bool
+static bool
 convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to) {
    switch (from) {
        MAP(SDL_KEYDOWN, AKEY_EVENT_ACTION_DOWN);
@ -33,7 +33,7 @@ autocomplete_metastate(enum android_metastate metastate) {
    return metastate;
 }

-enum android_metastate
+static enum android_metastate
 convert_meta_state(SDL_Keymod mod) {
    enum android_metastate metastate = 0;
    if (mod & KMOD_LSHIFT) {
@ -74,9 +74,8 @@ convert_meta_state(SDL_Keymod mod) {
    return autocomplete_metastate(metastate);
 }

-bool
-convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
-                bool prefer_text) {
+static bool
+convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod) {
    switch (from) {
        MAP(SDLK_RETURN,       AKEYCODE_ENTER);
        MAP(SDLK_KP_ENTER,     AKEYCODE_NUMPAD_ENTER);
@ -93,12 +92,6 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
        MAP(SDLK_DOWN,         AKEYCODE_DPAD_DOWN);
        MAP(SDLK_UP,           AKEYCODE_DPAD_UP);
    }
-
-    if (prefer_text) {
-        // do not forward alpha and space key events
-        return false;
-    }
-
    if (mod & (KMOD_LALT | KMOD_RALT | KMOD_LGUI | KMOD_RGUI)) {
        return false;
    }
@ -135,7 +128,7 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
    }
 }

-enum android_motionevent_buttons
+static enum android_motionevent_buttons
 convert_mouse_buttons(uint32_t state) {
    enum android_motionevent_buttons buttons = 0;
    if (state & SDL_BUTTON_LMASK) {
@ -157,6 +150,24 @@ convert_mouse_buttons(uint32_t state) {
 }

 bool
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
+
+    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
+        return false;
+    }
+
+    uint16_t mod = from->keysym.mod;
+    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod)) {
+        return false;
+    }
+
+    to->inject_keycode.metastate = convert_meta_state(mod);
+
+    return true;
+}
+
+static bool
 convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
    switch (from) {
        MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
@ -166,6 +177,41 @@ convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
 }

 bool
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons =
+        convert_mouse_buttons(SDL_BUTTON(from->button));
+
+    return true;
+}
+
+bool
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
+
+    return true;
+}
+
+static bool
 convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
    switch (from) {
        MAP(SDL_FINGERMOTION, AMOTION_EVENT_ACTION_MOVE);
@ -174,3 +220,39 @@ convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
        FAIL;
    }
 }
+
+bool
+convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
+              struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = from->fingerId;
+    to->inject_touch_event.position.screen_size = screen_size;
+    // SDL touch event coordinates are normalized in the range [0; 1]
+    to->inject_touch_event.position.point.x = from->x * screen_size.width;
+    to->inject_touch_event.position.point.y = from->y * screen_size.height;
+    to->inject_touch_event.pressure = from->pressure;
+    to->inject_touch_event.buttons = 0;
+    return true;
+}
+
+bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
+                    struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
+
+    to->inject_scroll_event.position = position;
+
+    int mul = from->direction == SDL_MOUSEWHEEL_NORMAL ? 1 : -1;
+    // SDL behavior seems inconsistent between horizontal and vertical scrolling
+    // so reverse the horizontal
+    // <https://wiki.libsdl.org/SDL_MouseWheelEvent#Remarks>
+    to->inject_scroll_event.hscroll = -mul * from->x;
+    to->inject_scroll_event.vscroll = mul * from->y;
+
+    return true;
+}
--- a/app/src/event_converter.h
+++ b/app/src/event_converter.h
@ -7,23 +7,36 @@
 #include "config.h"
 #include "control_msg.h"

-bool
-convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to);
+struct complete_mouse_motion_event {
+    SDL_MouseMotionEvent *mouse_motion_event;
+    struct size screen_size;
+};

-enum android_metastate
-convert_meta_state(SDL_Keymod mod);
+struct complete_mouse_wheel_event {
+    SDL_MouseWheelEvent *mouse_wheel_event;
+    struct point position;
+};

 bool
-convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
-                bool prefer_text);
-
-enum android_motionevent_buttons
-convert_mouse_buttons(uint32_t state);
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to);

 bool
-convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to);
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
+                     struct control_msg *to);
+
+// the video size may be different from the real device size, so we need the
+// size to which the absolute position apply, to scale it accordingly
+bool
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
+                     struct control_msg *to);

 bool
-convert_touch_action(SDL_EventType from, enum android_motionevent_action *to);
+convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
+              struct control_msg *to);
+
+// on Android, a scroll event requires the current mouse position
+bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
+                    struct control_msg *to);

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

-#include <assert.h>
 #include <string.h>
+#include <SDL2/SDL_assert.h>

 #include "config.h"
 #include "command.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 #define DEFAULT_PUSH_TARGET "/sdcard/"

@ -120,8 +120,7 @@ run_file_handler(void *data) {
        }
        struct file_handler_request req;
        bool non_empty = cbuf_take(&file_handler->queue, &req);
-        assert(non_empty);
-        (void) non_empty;
+        SDL_assert(non_empty);

        process_t process;
        if (req.action == ACTION_INSTALL_APK) {
--- a/app/src/file_handler.h
+++ b/app/src/file_handler.h
@ -6,8 +6,8 @@
 #include <SDL2/SDL_thread.h>

 #include "config.h"
+#include "cbuf.h"
 #include "command.h"
-#include "util/cbuf.h"

 typedef enum {
    ACTION_INSTALL_APK,
--- a/app/src/fps_counter.c
+++ b/app/src/fps_counter.c
@ -1,11 +1,11 @@
 #include "fps_counter.h"

-#include <assert.h>
+#include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_timer.h>

 #include "config.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 #define FPS_COUNTER_INTERVAL_MS 1000

@ -77,7 +77,7 @@ run_fps_counter(void *data) {
            uint32_t now = SDL_GetTicks();
            check_interval_expired(counter, now);

-            assert(counter->next_timestamp > now);
+            SDL_assert(counter->next_timestamp > now);
            uint32_t remaining = counter->next_timestamp - now;

            // ignore the reason (timeout or signaled), we just loop anyway
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@ -1,11 +1,11 @@
 #include "input_manager.h"

-#include <assert.h>
+#include <SDL2/SDL_assert.h>

 #include "config.h"
 #include "event_converter.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 // Convert window coordinates (as provided by SDL_GetMouseState() to renderer
 // coordinates (as provided in SDL mouse events)
@ -211,28 +211,15 @@ clipboard_paste(struct controller *controller) {
    }
 }

-static void
-rotate_device(struct controller *controller) {
-    struct control_msg msg;
-    msg.type = CONTROL_MSG_TYPE_ROTATE_DEVICE;
-
-    if (!controller_push_msg(controller, &msg)) {
-        LOGW("Could not request device rotation");
-    }
-}
-
 void
-input_manager_process_text_input(struct input_manager *im,
+input_manager_process_text_input(struct input_manager *input_manager,
                                 const SDL_TextInputEvent *event) {
-    if (!im->prefer_text) {
-        char c = event->text[0];
-        if (isalpha(c) || c == ' ') {
-            assert(event->text[1] == '\0');
-            // letters and space are handled as raw key event
-            return;
-        }
+    char c = event->text[0];
+    if (isalpha(c) || c == ' ') {
+        SDL_assert(event->text[1] == '\0');
+        // letters and space are handled as raw key event
+        return;
    }
-
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
    msg.inject_text.text = SDL_strdup(event->text);
@ -240,34 +227,14 @@ input_manager_process_text_input(struct input_manager *im,
        LOGW("Could not strdup input text");
        return;
    }
-    if (!controller_push_msg(im->controller, &msg)) {
+    if (!controller_push_msg(input_manager->controller, &msg)) {
        SDL_free(msg.inject_text.text);
        LOGW("Could not request 'inject text'");
    }
 }

-static bool
-convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
-                  bool prefer_text) {
-    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
-
-    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
-        return false;
-    }
-
-    uint16_t mod = from->keysym.mod;
-    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod,
-                         prefer_text)) {
-        return false;
-    }
-
-    to->inject_keycode.metastate = convert_meta_state(mod);
-
-    return true;
-}
-
 void
-input_manager_process_key(struct input_manager *im,
+input_manager_process_key(struct input_manager *input_manager,
                          const SDL_KeyboardEvent *event,
                          bool control) {
    // control: indicates the state of the command-line option --no-control
@ -294,7 +261,7 @@ input_manager_process_key(struct input_manager *im,
        return;
    }

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

    // capture all Ctrl events
    if (ctrl || cmd) {
@ -369,23 +336,23 @@ input_manager_process_key(struct input_manager *im,
                return;
            case SDLK_f:
                if (!shift && cmd && !repeat && down) {
-                    screen_switch_fullscreen(im->screen);
+                    screen_switch_fullscreen(input_manager->screen);
                }
                return;
            case SDLK_x:
                if (!shift && cmd && !repeat && down) {
-                    screen_resize_to_fit(im->screen);
+                    screen_resize_to_fit(input_manager->screen);
                }
                return;
            case SDLK_g:
                if (!shift && cmd && !repeat && down) {
-                    screen_resize_to_pixel_perfect(im->screen);
+                    screen_resize_to_pixel_perfect(input_manager->screen);
                }
                return;
            case SDLK_i:
                if (!shift && cmd && !repeat && down) {
                    struct fps_counter *fps_counter =
-                        im->video_buffer->fps_counter;
+                        input_manager->video_buffer->fps_counter;
                    switch_fps_counter_state(fps_counter);
                }
                return;
@ -398,11 +365,6 @@ input_manager_process_key(struct input_manager *im,
                    }
                }
                return;
-            case SDLK_r:
-                if (control && cmd && !shift && !repeat && down) {
-                    rotate_device(controller);
-                }
-                return;
        }

        return;
@ -413,30 +375,15 @@ input_manager_process_key(struct input_manager *im,
    }

    struct control_msg msg;
-    if (convert_input_key(event, &msg, im->prefer_text)) {
+    if (convert_input_key(event, &msg)) {
        if (!controller_push_msg(controller, &msg)) {
            LOGW("Could not request 'inject keycode'");
        }
    }
 }

-static bool
-convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
-                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
-    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
-    to->inject_touch_event.position.screen_size = screen->frame_size;
-    to->inject_touch_event.position.point.x = from->x;
-    to->inject_touch_event.position.point.y = from->y;
-    to->inject_touch_event.pressure = 1.f;
-    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
-
-    return true;
-}
-
 void
-input_manager_process_mouse_motion(struct input_manager *im,
+input_manager_process_mouse_motion(struct input_manager *input_manager,
                                   const SDL_MouseMotionEvent *event) {
    if (!event->state) {
        // do not send motion events when no button is pressed
@ -447,74 +394,33 @@ input_manager_process_mouse_motion(struct input_manager *im,
        return;
    }
    struct control_msg msg;
-    if (convert_mouse_motion(event, im->screen, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+    if (convert_mouse_motion(event, input_manager->screen->frame_size, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
            LOGW("Could not request 'inject mouse motion event'");
        }
    }
 }

-static bool
-convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
-              struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-
-    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
-        return false;
-    }
-
-    struct size frame_size = screen->frame_size;
-
-    to->inject_touch_event.pointer_id = from->fingerId;
-    to->inject_touch_event.position.screen_size = frame_size;
-    // SDL touch event coordinates are normalized in the range [0; 1]
-    to->inject_touch_event.position.point.x = from->x * frame_size.width;
-    to->inject_touch_event.position.point.y = from->y * frame_size.height;
-    to->inject_touch_event.pressure = from->pressure;
-    to->inject_touch_event.buttons = 0;
-    return true;
-}
-
 void
-input_manager_process_touch(struct input_manager *im,
+input_manager_process_touch(struct input_manager *input_manager,
                            const SDL_TouchFingerEvent *event) {
    struct control_msg msg;
-    if (convert_touch(event, im->screen, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+    if (convert_touch(event, input_manager->screen->frame_size, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
            LOGW("Could not request 'inject touch event'");
        }
    }
 }

 static bool
-is_outside_device_screen(struct input_manager *im, int x, int y)
+is_outside_device_screen(struct input_manager *input_manager, int x, int y)
 {
-    return x < 0 || x >= im->screen->frame_size.width ||
-           y < 0 || y >= im->screen->frame_size.height;
-}
-
-static bool
-convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
-                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-
-    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
-        return false;
-    }
-
-    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
-    to->inject_touch_event.position.screen_size = screen->frame_size;
-    to->inject_touch_event.position.point.x = from->x;
-    to->inject_touch_event.position.point.y = from->y;
-    to->inject_touch_event.pressure = 1.f;
-    to->inject_touch_event.buttons =
-        convert_mouse_buttons(SDL_BUTTON(from->button));
-
-    return true;
+    return x < 0 || x >= input_manager->screen->frame_size.width ||
+           y < 0 || y >= input_manager->screen->frame_size.height;
 }

 void
-input_manager_process_mouse_button(struct input_manager *im,
+input_manager_process_mouse_button(struct input_manager *input_manager,
                                   const SDL_MouseButtonEvent *event,
                                   bool control) {
    if (event->which == SDL_TOUCH_MOUSEID) {
@ -523,19 +429,19 @@ input_manager_process_mouse_button(struct input_manager *im,
    }
    if (event->type == SDL_MOUSEBUTTONDOWN) {
        if (control && event->button == SDL_BUTTON_RIGHT) {
-            press_back_or_turn_screen_on(im->controller);
+            press_back_or_turn_screen_on(input_manager->controller);
            return;
        }
        if (control && event->button == SDL_BUTTON_MIDDLE) {
-            action_home(im->controller, ACTION_DOWN | ACTION_UP);
+            action_home(input_manager->controller, ACTION_DOWN | ACTION_UP);
            return;
        }
        // double-click on black borders resize to fit the device screen
        if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
            bool outside =
-                is_outside_device_screen(im, event->x, event->y);
+                is_outside_device_screen(input_manager, event->x, event->y);
            if (outside) {
-                screen_resize_to_fit(im->screen);
+                screen_resize_to_fit(input_manager->screen);
                return;
            }
        }
@ -547,36 +453,23 @@ input_manager_process_mouse_button(struct input_manager *im,
    }

    struct control_msg msg;
-    if (convert_mouse_button(event, im->screen, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+    if (convert_mouse_button(event, input_manager->screen->frame_size, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
            LOGW("Could not request 'inject mouse button event'");
        }
    }
 }

-static bool
-convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
-                    struct control_msg *to) {
-    struct position position = {
-        .screen_size = screen->frame_size,
-        .point = get_mouse_point(screen),
-    };
-
-    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
-
-    to->inject_scroll_event.position = position;
-    to->inject_scroll_event.hscroll = from->x;
-    to->inject_scroll_event.vscroll = from->y;
-
-    return true;
-}
-
 void
-input_manager_process_mouse_wheel(struct input_manager *im,
+input_manager_process_mouse_wheel(struct input_manager *input_manager,
                                  const SDL_MouseWheelEvent *event) {
+    struct position position = {
+        .screen_size = input_manager->screen->frame_size,
+        .point = get_mouse_point(input_manager->screen),
+    };
    struct control_msg msg;
-    if (convert_mouse_wheel(event, im->screen, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+    if (convert_mouse_wheel(event, position, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
            LOGW("Could not request 'inject mouse wheel event'");
        }
    }
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@ -14,33 +14,32 @@ struct input_manager {
    struct controller *controller;
    struct video_buffer *video_buffer;
    struct screen *screen;
-    bool prefer_text;
 };

 void
-input_manager_process_text_input(struct input_manager *im,
+input_manager_process_text_input(struct input_manager *input_manager,
                                 const SDL_TextInputEvent *event);

 void
-input_manager_process_key(struct input_manager *im,
+input_manager_process_key(struct input_manager *input_manager,
                          const SDL_KeyboardEvent *event,
                          bool control);

 void
-input_manager_process_mouse_motion(struct input_manager *im,
+input_manager_process_mouse_motion(struct input_manager *input_manager,
                                   const SDL_MouseMotionEvent *event);

 void
-input_manager_process_touch(struct input_manager *im,
+input_manager_process_touch(struct input_manager *input_manager,
                            const SDL_TouchFingerEvent *event);

 void
-input_manager_process_mouse_button(struct input_manager *im,
+input_manager_process_mouse_button(struct input_manager *input_manager,
                                   const SDL_MouseButtonEvent *event,
                                   bool control);

 void
-input_manager_process_mouse_wheel(struct input_manager *im,
+input_manager_process_mouse_wheel(struct input_manager *input_manager,
                                  const SDL_MouseWheelEvent *event);

 #endif
--- a/app/src/lock_util.h
+++ b/app/src/lock_util.h
@ -0,0 +1,52 @@
+#ifndef LOCKUTIL_H
+#define LOCKUTIL_H
+
+#include <stdint.h>
+#include <SDL2/SDL_mutex.h>
+
+#include "config.h"
+#include "log.h"
+
+static inline void
+mutex_lock(SDL_mutex *mutex) {
+    if (SDL_LockMutex(mutex)) {
+        LOGC("Could not lock mutex");
+        abort();
+    }
+}
+
+static inline void
+mutex_unlock(SDL_mutex *mutex) {
+    if (SDL_UnlockMutex(mutex)) {
+        LOGC("Could not unlock mutex");
+        abort();
+    }
+}
+
+static inline void
+cond_wait(SDL_cond *cond, SDL_mutex *mutex) {
+    if (SDL_CondWait(cond, mutex)) {
+        LOGC("Could not wait on condition");
+        abort();
+    }
+}
+
+static inline int
+cond_wait_timeout(SDL_cond *cond, SDL_mutex *mutex, uint32_t ms) {
+    int r = SDL_CondWaitTimeout(cond, mutex, ms);
+    if (r < 0) {
+        LOGC("Could not wait on condition with timeout");
+        abort();
+    }
+    return r;
+}
+
+static inline void
+cond_signal(SDL_cond *cond) {
+    if (SDL_CondSignal(cond)) {
+        LOGC("Could not signal a condition");
+        abort();
+    }
+}
+
+#endif
--- a/app/src/util/log.h
+++ b/app/src/util/log.h
--- a/app/src/main.c
+++ b/app/src/main.c
@ -1,15 +1,215 @@
 #include "scrcpy.h"

+#include <getopt.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <libavformat/avformat.h>
 #define SDL_MAIN_HANDLED // avoid link error on Linux Windows Subsystem
 #include <SDL2/SDL.h>

 #include "config.h"
-#include "cli.h"
 #include "compat.h"
-#include "util/log.h"
+#include "log.h"
+#include "recorder.h"
+
+struct args {
+    const char *serial;
+    const char *crop;
+    const char *record_filename;
+    const char *window_title;
+    const char *push_target;
+    enum recorder_format record_format;
+    bool fullscreen;
+    bool no_control;
+    bool no_display;
+    bool help;
+    bool version;
+    bool show_touches;
+    uint16_t port;
+    uint16_t max_size;
+    uint32_t bit_rate;
+    int16_t window_x;
+    int16_t window_y;
+    uint16_t window_width;
+    uint16_t window_height;
+    bool always_on_top;
+    bool turn_screen_off;
+    bool render_expired_frames;
+    bool window_borderless;
+};
+
+static void usage(const char *arg0) {
+#ifdef __APPLE__
+# define CTRL_OR_CMD "Cmd"
+#else
+# define CTRL_OR_CMD "Ctrl"
+#endif
+    fprintf(stderr,
+        "Usage: %s [options]\n"
+        "\n"
+        "Options:\n"
+        "\n"
+        "    -b, --bit-rate value\n"
+        "        Encode the video at the given bit-rate, expressed in bits/s.\n"
+        "        Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
+        "        Default is %d.\n"
+        "\n"
+        "    -c, --crop width:height:x:y\n"
+        "        Crop the device screen on the server.\n"
+        "        The values are expressed in the device natural orientation\n"
+        "        (typically, portrait for a phone, landscape for a tablet).\n"
+        "        Any --max-size value is computed on the cropped size.\n"
+        "\n"
+        "    -f, --fullscreen\n"
+        "        Start in fullscreen.\n"
+        "\n"
+        "    -F, --record-format format\n"
+        "        Force recording format (either mp4 or mkv).\n"
+        "\n"
+        "    -h, --help\n"
+        "        Print this help.\n"
+        "\n"
+        "    -m, --max-size value\n"
+        "        Limit both the width and height of the video to value. The\n"
+        "        other dimension is computed so that the device aspect-ratio\n"
+        "        is preserved.\n"
+        "        Default is %d%s.\n"
+        "\n"
+        "    -n, --no-control\n"
+        "        Disable device control (mirror the device in read-only).\n"
+        "\n"
+        "    -N, --no-display\n"
+        "        Do not display device (only when screen recording is\n"
+        "        enabled).\n"
+        "\n"
+        "    -p, --port port\n"
+        "        Set the TCP port the client listens on.\n"
+        "        Default is %d.\n"
+        "\n"
+        "    --push-target path\n"
+        "        Set the target directory for pushing files to the device by\n"
+        "        drag & drop. It is passed as-is to \"adb push\".\n"
+        "        Default is \"/sdcard/\".\n"
+        "\n"
+        "    -r, --record file.mp4\n"
+        "        Record screen to file.\n"
+        "        The format is determined by the -F/--record-format option if\n"
+        "        set, or by the file extension (.mp4 or .mkv).\n"
+        "\n"
+        "    --render-expired-frames\n"
+        "        By default, to minimize latency, scrcpy always renders the\n"
+        "        last available decoded frame, and drops any previous ones.\n"
+        "        This flag forces to render all frames, at a cost of a\n"
+        "        possible increased latency.\n"
+        "\n"
+        "    -s, --serial serial\n"
+        "        The device serial number. Mandatory only if several devices\n"
+        "        are connected to adb.\n"
+        "\n"
+        "    -S, --turn-screen-off\n"
+        "        Turn the device screen off immediately.\n"
+        "\n"
+        "    -t, --show-touches\n"
+        "        Enable \"show touches\" on start, disable on quit.\n"
+        "        It only shows physical touches (not clicks from scrcpy).\n"
+        "\n"
+        "    -T, --always-on-top\n"
+        "        Make scrcpy window always on top (above other windows).\n"
+        "\n"
+        "    -v, --version\n"
+        "        Print the version of scrcpy.\n"
+        "\n"
+        "    --window_borderless\n"
+        "        Disable window decorations (display borderless window).\n"
+        "\n"
+        "    --window-title text\n"
+        "        Set a custom window title.\n"
+        "\n"
+        "    --window-x value\n"
+        "        Set the initial window horizontal position.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "    --window-y value\n"
+        "        Set the initial window vertical position.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "    --window-width value\n"
+        "        Set the initial window width.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "    --window-height value\n"
+        "        Set the initial window width.\n"
+        "        Default is -1 (automatic).\n"
+        "\n"
+        "Shortcuts:\n"
+        "\n"
+        "    " CTRL_OR_CMD "+f\n"
+        "        switch fullscreen mode\n"
+        "\n"
+        "    " CTRL_OR_CMD "+g\n"
+        "        resize window to 1:1 (pixel-perfect)\n"
+        "\n"
+        "    " CTRL_OR_CMD "+x\n"
+        "    Double-click on black borders\n"
+        "        resize window to remove black borders\n"
+        "\n"
+        "    Ctrl+h\n"
+        "    Middle-click\n"
+        "        click on HOME\n"
+        "\n"
+        "    " CTRL_OR_CMD "+b\n"
+        "    " CTRL_OR_CMD "+Backspace\n"
+        "    Right-click (when screen is on)\n"
+        "        click on BACK\n"
+        "\n"
+        "    " CTRL_OR_CMD "+s\n"
+        "        click on APP_SWITCH\n"
+        "\n"
+        "    Ctrl+m\n"
+        "        click on MENU\n"
+        "\n"
+        "    " CTRL_OR_CMD "+Up\n"
+        "        click on VOLUME_UP\n"
+        "\n"
+        "    " CTRL_OR_CMD "+Down\n"
+        "        click on VOLUME_DOWN\n"
+        "\n"
+        "    " CTRL_OR_CMD "+p\n"
+        "        click on POWER (turn screen on/off)\n"
+        "\n"
+        "    Right-click (when screen is off)\n"
+        "        power on\n"
+        "\n"
+        "    " CTRL_OR_CMD "+o\n"
+        "        turn device screen off (keep mirroring)\n"
+        "\n"
+        "    " CTRL_OR_CMD "+n\n"
+        "       expand notification panel\n"
+        "\n"
+        "    " CTRL_OR_CMD "+Shift+n\n"
+        "       collapse notification panel\n"
+        "\n"
+        "    " CTRL_OR_CMD "+c\n"
+        "        copy device clipboard to computer\n"
+        "\n"
+        "    " CTRL_OR_CMD "+v\n"
+        "        paste computer clipboard to device\n"
+        "\n"
+        "    " CTRL_OR_CMD "+Shift+v\n"
+        "        copy computer clipboard to device\n"
+        "\n"
+        "    " CTRL_OR_CMD "+i\n"
+        "        enable/disable FPS counter (print frames/second in logs)\n"
+        "\n"
+        "    Drag & drop APK file\n"
+        "        install APK from computer\n"
+        "\n",
+        arg0,
+        DEFAULT_BIT_RATE,
+        DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
+        DEFAULT_LOCAL_PORT);
+}

 static void
 print_version(void) {
@ -29,6 +229,325 @@ print_version(void) {
                                               LIBAVUTIL_VERSION_MICRO);
 }

+static bool
+parse_bit_rate(char *optarg, uint32_t *bit_rate) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Bit-rate parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    int mul = 1;
+    if (*endptr != '\0') {
+        if (optarg == endptr) {
+            LOGE("Invalid bit-rate: %s", optarg);
+            return false;
+        }
+        if ((*endptr == 'M' || *endptr == 'm') && endptr[1] == '\0') {
+            mul = 1000000;
+        } else if ((*endptr == 'K' || *endptr == 'k') && endptr[1] == '\0') {
+            mul = 1000;
+        } else {
+            LOGE("Invalid bit-rate unit: %s", optarg);
+            return false;
+        }
+    }
+    if (value < 0 || ((uint32_t) -1) / mul < value) {
+        LOGE("Bitrate must be positive and less than 2^32: %s", optarg);
+        return false;
+    }
+
+    *bit_rate = (uint32_t) value * mul;
+    return true;
+}
+
+static bool
+parse_max_size(char *optarg, uint16_t *max_size) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Max size parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    if (*endptr != '\0') {
+        LOGE("Invalid max size: %s", optarg);
+        return false;
+    }
+    if (value & ~0xffff) {
+        LOGE("Max size must be between 0 and 65535: %ld", value);
+        return false;
+    }
+
+    *max_size = (uint16_t) value;
+    return true;
+}
+
+static bool
+parse_window_position(char *optarg, int16_t *position) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Window position parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    if (*endptr != '\0') {
+        LOGE("Invalid window position: %s", optarg);
+        return false;
+    }
+    if (value < -1 || value > 0x7fff) {
+        LOGE("Window position must be between -1 and 32767: %ld", value);
+        return false;
+    }
+
+    *position = (int16_t) value;
+    return true;
+}
+
+static bool
+parse_window_dimension(char *optarg, uint16_t *dimension) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Window dimension parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    if (*endptr != '\0') {
+        LOGE("Invalid window dimension: %s", optarg);
+        return false;
+    }
+    if (value & ~0xffff) {
+        LOGE("Window position must be between 0 and 65535: %ld", value);
+        return false;
+    }
+
+    *dimension = (uint16_t) value;
+    return true;
+}
+
+static bool
+parse_port(char *optarg, uint16_t *port) {
+    char *endptr;
+    if (*optarg == '\0') {
+        LOGE("Invalid port parameter is empty");
+        return false;
+    }
+    long value = strtol(optarg, &endptr, 0);
+    if (*endptr != '\0') {
+        LOGE("Invalid port: %s", optarg);
+        return false;
+    }
+    if (value & ~0xffff) {
+        LOGE("Port out of range: %ld", value);
+        return false;
+    }
+
+    *port = (uint16_t) value;
+    return true;
+}
+
+static bool
+parse_record_format(const char *optarg, enum recorder_format *format) {
+    if (!strcmp(optarg, "mp4")) {
+        *format = RECORDER_FORMAT_MP4;
+        return true;
+    }
+    if (!strcmp(optarg, "mkv")) {
+        *format = RECORDER_FORMAT_MKV;
+        return true;
+    }
+    LOGE("Unsupported format: %s (expected mp4 or mkv)", optarg);
+    return false;
+}
+
+static enum recorder_format
+guess_record_format(const char *filename) {
+    size_t len = strlen(filename);
+    if (len < 4) {
+        return 0;
+    }
+    const char *ext = &filename[len - 4];
+    if (!strcmp(ext, ".mp4")) {
+        return RECORDER_FORMAT_MP4;
+    }
+    if (!strcmp(ext, ".mkv")) {
+        return RECORDER_FORMAT_MKV;
+    }
+    return 0;
+}
+
+#define OPT_RENDER_EXPIRED_FRAMES 1000
+#define OPT_PUSH_TARGET           1001
+#define OPT_WINDOW_TITLE          1002
+#define OPT_WINDOW_X              1003
+#define OPT_WINDOW_Y              1004
+#define OPT_WINDOW_WIDTH          1005
+#define OPT_WINDOW_HEIGHT         1006
+#define OPT_WINDOW_BORDERLESS     1007
+
+static bool
+parse_args(struct args *args, int argc, char *argv[]) {
+    static const struct option long_options[] = {
+        {"always-on-top",         no_argument,       NULL, 'T'},
+        {"bit-rate",              required_argument, NULL, 'b'},
+        {"crop",                  required_argument, NULL, 'c'},
+        {"fullscreen",            no_argument,       NULL, 'f'},
+        {"help",                  no_argument,       NULL, 'h'},
+        {"max-size",              required_argument, NULL, 'm'},
+        {"no-control",            no_argument,       NULL, 'n'},
+        {"no-display",            no_argument,       NULL, 'N'},
+        {"window-borderless",     no_argument,       NULL,
+                                                 OPT_WINDOW_BORDERLESS},
+        {"port",                  required_argument, NULL, 'p'},
+        {"push-target",           required_argument, NULL,
+                                                 OPT_PUSH_TARGET},
+        {"record",                required_argument, NULL, 'r'},
+        {"record-format",         required_argument, NULL, 'F'},
+        {"render-expired-frames", no_argument,       NULL,
+                                                 OPT_RENDER_EXPIRED_FRAMES},
+        {"serial",                required_argument, NULL, 's'},
+        {"show-touches",          no_argument,       NULL, 't'},
+        {"turn-screen-off",       no_argument,       NULL, 'S'},
+        {"version",               no_argument,       NULL, 'v'},
+        {"window-title",          required_argument, NULL, OPT_WINDOW_TITLE},
+        {"window-x",              required_argument, NULL, OPT_WINDOW_X},
+        {"window-y",              required_argument, NULL, OPT_WINDOW_Y},
+        {"window-width",          required_argument, NULL, OPT_WINDOW_WIDTH},
+        {"window-height",         required_argument, NULL, OPT_WINDOW_HEIGHT},
+        {NULL,                    0,                 NULL, 0  },
+    };
+    int c;
+    while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv", long_options,
+                            NULL)) != -1) {
+        switch (c) {
+            case 'b':
+                if (!parse_bit_rate(optarg, &args->bit_rate)) {
+                    return false;
+                }
+                break;
+            case 'c':
+                args->crop = optarg;
+                break;
+            case 'f':
+                args->fullscreen = true;
+                break;
+            case 'F':
+                if (!parse_record_format(optarg, &args->record_format)) {
+                    return false;
+                }
+                break;
+            case 'h':
+                args->help = true;
+                break;
+            case 'm':
+                if (!parse_max_size(optarg, &args->max_size)) {
+                    return false;
+                }
+                break;
+            case 'n':
+                args->no_control = true;
+                break;
+            case 'N':
+                args->no_display = true;
+                break;
+            case 'p':
+                if (!parse_port(optarg, &args->port)) {
+                    return false;
+                }
+                break;
+            case 'r':
+                args->record_filename = optarg;
+                break;
+            case 's':
+                args->serial = optarg;
+                break;
+            case 'S':
+                args->turn_screen_off = true;
+                break;
+            case 't':
+                args->show_touches = true;
+                break;
+            case 'T':
+                args->always_on_top = true;
+                break;
+            case 'v':
+                args->version = true;
+                break;
+            case OPT_RENDER_EXPIRED_FRAMES:
+                args->render_expired_frames = true;
+                break;
+            case OPT_WINDOW_TITLE:
+                args->window_title = optarg;
+                break;
+            case OPT_WINDOW_X:
+                if (!parse_window_position(optarg, &args->window_x)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_Y:
+                if (!parse_window_position(optarg, &args->window_y)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_WIDTH:
+                if (!parse_window_dimension(optarg, &args->window_width)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_HEIGHT:
+                if (!parse_window_dimension(optarg, &args->window_height)) {
+                    return false;
+                }
+                break;
+            case OPT_WINDOW_BORDERLESS:
+                args->window_borderless = true;
+                break;
+            case OPT_PUSH_TARGET:
+                args->push_target = optarg;
+                break;
+            default:
+                // getopt prints the error message on stderr
+                return false;
+        }
+    }
+
+    if (args->no_display && !args->record_filename) {
+        LOGE("-N/--no-display requires screen recording (-r/--record)");
+        return false;
+    }
+
+    if (args->no_display && args->fullscreen) {
+        LOGE("-f/--fullscreen-window is incompatible with -N/--no-display");
+        return false;
+    }
+
+    int index = optind;
+    if (index < argc) {
+        LOGE("Unexpected additional argument: %s", argv[index]);
+        return false;
+    }
+
+    if (args->record_format && !args->record_filename) {
+        LOGE("Record format specified without recording");
+        return false;
+    }
+
+    if (args->record_filename && !args->record_format) {
+        args->record_format = guess_record_format(args->record_filename);
+        if (!args->record_format) {
+            LOGE("No format specified for \"%s\" (try with -F mkv)",
+                 args->record_filename);
+            return false;
+        }
+    }
+
+    if (args->no_control && args->turn_screen_off) {
+        LOGE("Could not request to turn screen off if control is disabled");
+        return false;
+    }
+
+    return true;
+}
+
 int
 main(int argc, char *argv[]) {
 #ifdef __WINDOWS__
@ -37,23 +556,36 @@ main(int argc, char *argv[]) {
    setbuf(stdout, NULL);
    setbuf(stderr, NULL);
 #endif
-
-#ifndef NDEBUG
-    SDL_LogSetAllPriority(SDL_LOG_PRIORITY_DEBUG);
-#endif
-
-    struct scrcpy_cli_args args = {
-        .opts = SCRCPY_OPTIONS_DEFAULT,
+    struct args args = {
+        .serial = NULL,
+        .crop = NULL,
+        .record_filename = NULL,
+        .window_title = NULL,
+        .push_target = NULL,
+        .record_format = 0,
        .help = false,
        .version = false,
+        .show_touches = false,
+        .port = DEFAULT_LOCAL_PORT,
+        .max_size = DEFAULT_MAX_SIZE,
+        .bit_rate = DEFAULT_BIT_RATE,
+        .window_x = -1,
+        .window_y = -1,
+        .window_width = 0,
+        .window_height = 0,
+        .always_on_top = false,
+        .no_control = false,
+        .no_display = false,
+        .turn_screen_off = false,
+        .render_expired_frames = false,
+        .window_borderless = false,
    };
-
-    if (!scrcpy_parse_args(&args, argc, argv)) {
+    if (!parse_args(&args, argc, argv)) {
        return 1;
    }

    if (args.help) {
-        scrcpy_print_usage(argv[0]);
+        usage(argv[0]);
        return 0;
    }

@ -72,7 +604,34 @@ main(int argc, char *argv[]) {
        return 1;
    }

-    int res = scrcpy(&args.opts) ? 0 : 1;
+#ifdef BUILD_DEBUG
+    SDL_LogSetAllPriority(SDL_LOG_PRIORITY_DEBUG);
+#endif
+
+    struct scrcpy_options options = {
+        .serial = args.serial,
+        .crop = args.crop,
+        .port = args.port,
+        .record_filename = args.record_filename,
+        .window_title = args.window_title,
+        .push_target = args.push_target,
+        .record_format = args.record_format,
+        .max_size = args.max_size,
+        .bit_rate = args.bit_rate,
+        .window_x = args.window_x,
+        .window_y = args.window_y,
+        .window_width = args.window_width,
+        .window_height = args.window_height,
+        .show_touches = args.show_touches,
+        .fullscreen = args.fullscreen,
+        .always_on_top = args.always_on_top,
+        .control = !args.no_control,
+        .display = !args.no_display,
+        .turn_screen_off = args.turn_screen_off,
+        .render_expired_frames = args.render_expired_frames,
+        .window_borderless = args.window_borderless,
+    };
+    int res = scrcpy(&options) ? 0 : 1;

    avformat_network_deinit(); // ignore failure

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

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

 #include "config.h"
 #include "log.h"
@ -116,32 +115,3 @@ bool
 net_shutdown(socket_t socket, int how) {
    return !shutdown(socket, how);
 }
-
-bool
-net_init(void) {
-#ifdef __WINDOWS__
-    WSADATA wsa;
-    int res = WSAStartup(MAKEWORD(2, 2), &wsa) < 0;
-    if (res < 0) {
-        LOGC("WSAStartup failed with error %d", res);
-        return false;
-    }
-#endif
-    return true;
-}
-
-void
-net_cleanup(void) {
-#ifdef __WINDOWS__
-    WSACleanup();
-#endif
-}
-
-bool
-net_close(socket_t socket) {
-#ifdef __WINDOWS__
-    return !closesocket(socket);
-#else
-    return !close(socket);
-#endif
-}
--- a/app/src/util/net.h
+++ b/app/src/util/net.h
--- a/app/src/util/queue.h
+++ b/app/src/util/queue.h
@ -2,9 +2,9 @@
 #ifndef QUEUE_H
 #define QUEUE_H

-#include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <SDL2/SDL_assert.h>

 #include "config.h"

@ -67,7 +67,7 @@
 // type so that we can "return" it)
 #define queue_take(PQ, NEXTFIELD, PITEM) \
    (void) ({ \
-        assert(!queue_is_empty(PQ)); \
+        SDL_assert(!queue_is_empty(PQ)); \
        *(PITEM) = (PQ)->first; \
        (PQ)->first = (PQ)->first->NEXTFIELD; \
    })
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@ -1,12 +1,12 @@
 #include "receiver.h"

-#include <assert.h>
+#include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_clipboard.h>

 #include "config.h"
 #include "device_msg.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 bool
 receiver_init(struct receiver *receiver, socket_t control_socket) {
@ -23,7 +23,7 @@ receiver_destroy(struct receiver *receiver) {
 }

 static void
-process_msg(struct device_msg *msg) {
+process_msg(struct receiver *receiver, struct device_msg *msg) {
    switch (msg->type) {
        case DEVICE_MSG_TYPE_CLIPBOARD:
            LOGI("Device clipboard copied");
@ -33,7 +33,7 @@ process_msg(struct device_msg *msg) {
 }

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

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

        head += r;
-        assert(head <= len);
+        SDL_assert(head <= len);
        if (head == len) {
            return head;
        }
@ -64,7 +64,7 @@ run_receiver(void *data) {
    size_t head = 0;

    for (;;) {
-        assert(head < DEVICE_MSG_SERIALIZED_MAX_SIZE);
+        SDL_assert(head < DEVICE_MSG_SERIALIZED_MAX_SIZE);
        ssize_t r = net_recv(receiver->control_socket, buf,
                             DEVICE_MSG_SERIALIZED_MAX_SIZE - head);
        if (r <= 0) {
@ -72,7 +72,7 @@ run_receiver(void *data) {
            break;
        }

-        ssize_t consumed = process_msgs(buf, r);
+        ssize_t consumed = process_msgs(receiver, buf, r);
        if (consumed == -1) {
            // an error occurred
            break;
--- a/app/src/receiver.h
+++ b/app/src/receiver.h
@ -6,7 +6,7 @@
 #include <SDL2/SDL_thread.h>

 #include "config.h"
-#include "util/net.h"
+#include "net.h"

 // receive events from the device
 // managed by the controller
--- a/app/src/recorder.c
+++ b/app/src/recorder.c
@ -1,12 +1,12 @@
 #include "recorder.h"

-#include <assert.h>
 #include <libavutil/time.h>
+#include <SDL2/SDL_assert.h>

 #include "config.h"
 #include "compat.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 static const AVRational SCRCPY_TIME_BASE = {1, 1000000}; // timestamps in us

@ -116,7 +116,7 @@ recorder_get_format_name(enum recorder_format format) {
 bool
 recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
    const char *format_name = recorder_get_format_name(recorder->format);
-    assert(format_name);
+    SDL_assert(format_name);
    const AVOutputFormat *format = find_muxer(format_name);
    if (!format) {
        LOGE("Could not find muxer");
@ -174,14 +174,9 @@ recorder_open(struct recorder *recorder, const AVCodec *input_codec) {

 void
 recorder_close(struct recorder *recorder) {
-    if (recorder->header_written) {
-        int ret = av_write_trailer(recorder->ctx);
-        if (ret < 0) {
-            LOGE("Failed to write trailer to %s", recorder->filename);
-            recorder->failed = true;
-        }
-    } else {
-        // the recorded file is empty
+    int ret = av_write_trailer(recorder->ctx);
+    if (ret < 0) {
+        LOGE("Failed to write trailer to %s", recorder->filename);
        recorder->failed = true;
    }
    avio_close(recorder->ctx->pb);
@ -301,12 +296,8 @@ run_recorder(void *data) {
            continue;
        }

-        // config packets have no PTS, we must ignore them
-        if (rec->packet.pts != AV_NOPTS_VALUE
-            && previous->packet.pts != AV_NOPTS_VALUE) {
-            // we now know the duration of the previous packet
-            previous->packet.duration = rec->packet.pts - previous->packet.pts;
-        }
+        // we now know the duration of the previous packet
+        previous->packet.duration = rec->packet.pts - previous->packet.pts;

        bool ok = recorder_write(recorder, &previous->packet);
        record_packet_delete(previous);
@ -357,7 +348,7 @@ recorder_join(struct recorder *recorder) {
 bool
 recorder_push(struct recorder *recorder, const AVPacket *packet) {
    mutex_lock(recorder->mutex);
-    assert(!recorder->stopped);
+    SDL_assert(!recorder->stopped);

    if (recorder->failed) {
        // reject any new packet (this will stop the stream)
--- a/app/src/recorder.h
+++ b/app/src/recorder.h
@ -8,11 +8,10 @@

 #include "config.h"
 #include "common.h"
-#include "util/queue.h"
+#include "queue.h"

 enum recorder_format {
-    RECORDER_FORMAT_AUTO,
-    RECORDER_FORMAT_MP4,
+    RECORDER_FORMAT_MP4 = 1,
    RECORDER_FORMAT_MKV,
 };

--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@ -18,15 +18,15 @@
 #include "file_handler.h"
 #include "fps_counter.h"
 #include "input_manager.h"
+#include "log.h"
+#include "lock_util.h"
+#include "net.h"
 #include "recorder.h"
 #include "screen.h"
 #include "server.h"
 #include "stream.h"
 #include "tiny_xpm.h"
 #include "video_buffer.h"
-#include "util/lock.h"
-#include "util/log.h"
-#include "util/net.h"

 static struct server server = SERVER_INITIALIZER;
 static struct screen screen = SCREEN_INITIALIZER;
@ -42,7 +42,6 @@ static struct input_manager input_manager = {
    .controller = &controller,
    .video_buffer = &video_buffer,
    .screen = &screen,
-    .prefer_text = false, // initialized later
 };

 // init SDL and set appropriate hints
@ -103,7 +102,6 @@ sdl_init_and_configure(bool display) {
 // <https://stackoverflow.com/a/40693139/1987178>
 static int
 event_watcher(void *data, SDL_Event *event) {
-    (void) data;
    if (event->type == SDL_WINDOWEVENT
            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
        // called from another thread, not very safe, but it's a workaround!
@ -145,7 +143,12 @@ handle_event(SDL_Event *event, bool control) {
            }
            break;
        case SDL_WINDOWEVENT:
-            screen_handle_window_event(&screen, &event->window);
+            switch (event->window.event) {
+                case SDL_WINDOWEVENT_EXPOSED:
+                case SDL_WINDOWEVENT_SIZE_CHANGED:
+                    screen_render(&screen);
+                    break;
+            }
            break;
        case SDL_TEXTINPUT:
            if (!control) {
@ -202,7 +205,6 @@ handle_event(SDL_Event *event, bool control) {

 static bool
 event_loop(bool display, bool control) {
-    (void) display;
 #ifdef CONTINUOUS_RESIZING_WORKAROUND
    if (display) {
        SDL_AddEventWatch(event_watcher, NULL);
@ -215,7 +217,6 @@ event_loop(bool display, bool control) {
            case EVENT_RESULT_STOPPED_BY_USER:
                return true;
            case EVENT_RESULT_STOPPED_BY_EOS:
-                LOGW("Device disconnected");
                return false;
            case EVENT_RESULT_CONTINUE:
                break;
@ -258,7 +259,6 @@ sdl_priority_from_av_level(int level) {

 static void
 av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
-    (void) avcl;
    SDL_LogPriority priority = sdl_priority_from_av_level(level);
    if (priority == 0) {
        return;
@ -280,10 +280,9 @@ scrcpy(const struct scrcpy_options *options) {
    bool record = !!options->record_filename;
    struct server_params params = {
        .crop = options->crop,
-        .port_range = options->port_range,
+        .local_port = options->port,
        .max_size = options->max_size,
        .bit_rate = options->bit_rate,
-        .max_fps = options->max_fps,
        .control = options->control,
    };
    if (!server_start(&server, options->serial, &params)) {
@ -418,8 +417,6 @@ scrcpy(const struct scrcpy_options *options) {
        show_touches_waited = true;
    }

-    input_manager.prefer_text = options->prefer_text;
-
    ret = event_loop(options->display, options->control);
    LOGD("quit...");

--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@ -3,11 +3,9 @@

 #include <stdbool.h>
 #include <stdint.h>
+#include <recorder.h>

 #include "config.h"
-#include "common.h"
-#include "input_manager.h"
-#include "recorder.h"

 struct scrcpy_options {
    const char *serial;
@ -16,10 +14,9 @@ struct scrcpy_options {
    const char *window_title;
    const char *push_target;
    enum recorder_format record_format;
-    struct port_range port_range;
+    uint16_t port;
    uint16_t max_size;
    uint32_t bit_rate;
-    uint16_t max_fps;
    int16_t window_x;
    int16_t window_y;
    uint16_t window_width;
@ -31,39 +28,9 @@ struct scrcpy_options {
    bool display;
    bool turn_screen_off;
    bool render_expired_frames;
-    bool prefer_text;
    bool window_borderless;
 };

-#define SCRCPY_OPTIONS_DEFAULT { \
-    .serial = NULL, \
-    .crop = NULL, \
-    .record_filename = NULL, \
-    .window_title = NULL, \
-    .push_target = NULL, \
-    .record_format = RECORDER_FORMAT_AUTO, \
-    .port_range = { \
-        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST, \
-        .last = DEFAULT_LOCAL_PORT_RANGE_LAST, \
-    }, \
-    .max_size = DEFAULT_MAX_SIZE, \
-    .bit_rate = DEFAULT_BIT_RATE, \
-    .max_fps = 0, \
-    .window_x = -1, \
-    .window_y = -1, \
-    .window_width = 0, \
-    .window_height = 0, \
-    .show_touches = false, \
-    .fullscreen = false, \
-    .always_on_top = false, \
-    .control = true, \
-    .display = true, \
-    .turn_screen_off = false, \
-    .render_expired_frames = false, \
-    .prefer_text = false, \
-    .window_borderless = false, \
-}
-
 bool
 scrcpy(const struct scrcpy_options *options);

--- a/app/src/screen.c
+++ b/app/src/screen.c
@ -1,6 +1,5 @@
 #include "screen.h"

-#include <assert.h>
 #include <string.h>
 #include <SDL2/SDL.h>

@ -8,10 +7,10 @@
 #include "common.h"
 #include "compat.h"
 #include "icon.xpm"
+#include "lock_util.h"
+#include "log.h"
 #include "tiny_xpm.h"
 #include "video_buffer.h"
-#include "util/lock.h"
-#include "util/log.h"

 #define DISPLAY_MARGINS 96

@ -31,28 +30,23 @@ get_window_size(SDL_Window *window) {
 // get the windowed window size
 static struct size
 get_windowed_window_size(const struct screen *screen) {
-    if (screen->fullscreen || screen->maximized) {
+    if (screen->fullscreen) {
        return screen->windowed_window_size;
    }
    return get_window_size(screen->window);
 }

-// apply the windowed window size if fullscreen and maximized are disabled
-static void
-apply_windowed_size(struct screen *screen) {
-    if (!screen->fullscreen && !screen->maximized) {
-        SDL_SetWindowSize(screen->window, screen->windowed_window_size.width,
-                                          screen->windowed_window_size.height);
-    }
-}
-
 // set the window size to be applied when fullscreen is disabled
 static void
 set_window_size(struct screen *screen, struct size new_size) {
    // setting the window size during fullscreen is implementation defined,
    // so apply the resize only after fullscreen is disabled
-    screen->windowed_window_size = new_size;
-    apply_windowed_size(screen);
+    if (screen->fullscreen) {
+        // SDL_SetWindowSize will be called when fullscreen will be disabled
+        screen->windowed_window_size = new_size;
+    } else {
+        SDL_SetWindowSize(screen->window, new_size.width, new_size.height);
+    }
 }

 // get the preferred display bounds (i.e. the screen bounds with some margins)
@ -111,7 +105,7 @@ get_optimal_size(struct size current_size, struct size frame_size) {
    }

    // w and h must fit into 16 bits
-    assert(w < 0x10000 && h < 0x10000);
+    SDL_assert_release(w < 0x10000 && h < 0x10000);
    return (struct size) {w, h};
 }

@ -186,8 +180,8 @@ screen_init_rendering(struct screen *screen, const char *window_title,
        window_flags |= SDL_WINDOW_BORDERLESS;
    }

-    int x = window_x != -1 ? window_x : (int) SDL_WINDOWPOS_UNDEFINED;
-    int y = window_y != -1 ? window_y : (int) SDL_WINDOWPOS_UNDEFINED;
+    int x = window_x != -1 ? window_x : SDL_WINDOWPOS_UNDEFINED;
+    int y = window_y != -1 ? window_y : SDL_WINDOWPOS_UNDEFINED;
    screen->window = SDL_CreateWindow(window_title, x, y,
                                      window_size.width, window_size.height,
                                      window_flags);
@ -228,8 +222,6 @@ screen_init_rendering(struct screen *screen, const char *window_title,
        return false;
    }

-    screen->windowed_window_size = window_size;
-
    return true;
 }

@ -323,6 +315,10 @@ screen_render(struct screen *screen) {

 void
 screen_switch_fullscreen(struct screen *screen) {
+    if (!screen->fullscreen) {
+        // going to fullscreen, store the current windowed window size
+        screen->windowed_window_size = get_window_size(screen->window);
+    }
    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
    if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
        LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
@ -330,7 +326,11 @@ screen_switch_fullscreen(struct screen *screen) {
    }

    screen->fullscreen = !screen->fullscreen;
-    apply_windowed_size(screen);
+    if (!screen->fullscreen) {
+        // fullscreen disabled, restore expected windowed window size
+        SDL_SetWindowSize(screen->window, screen->windowed_window_size.width,
+                          screen->windowed_window_size.height);
+    }

    LOGD("Switched to %s mode", screen->fullscreen ? "fullscreen" : "windowed");
    screen_render(screen);
@ -338,75 +338,20 @@ screen_switch_fullscreen(struct screen *screen) {

 void
 screen_resize_to_fit(struct screen *screen) {
-    if (screen->fullscreen) {
-        return;
+    if (!screen->fullscreen) {
+        struct size optimal_size = get_optimal_window_size(screen,
+                                                           screen->frame_size);
+        SDL_SetWindowSize(screen->window, optimal_size.width,
+                          optimal_size.height);
+        LOGD("Resized to optimal size");
    }
-
-    if (screen->maximized) {
-        SDL_RestoreWindow(screen->window);
-        screen->maximized = false;
-    }
-
-    struct size optimal_size =
-        get_optimal_window_size(screen, screen->frame_size);
-    SDL_SetWindowSize(screen->window, optimal_size.width, optimal_size.height);
-    LOGD("Resized to optimal size");
 }

 void
 screen_resize_to_pixel_perfect(struct screen *screen) {
-    if (screen->fullscreen) {
-        return;
-    }
-
-    if (screen->maximized) {
-        SDL_RestoreWindow(screen->window);
-        screen->maximized = false;
-    }
-
-    SDL_SetWindowSize(screen->window, screen->frame_size.width,
-                      screen->frame_size.height);
-    LOGD("Resized to pixel-perfect");
-}
-
-void
-screen_handle_window_event(struct screen *screen,
-                           const SDL_WindowEvent *event) {
-    switch (event->event) {
-        case SDL_WINDOWEVENT_EXPOSED:
-            screen_render(screen);
-            break;
-        case SDL_WINDOWEVENT_SIZE_CHANGED:
-            if (!screen->fullscreen && !screen->maximized) {
-                // Backup the previous size: if we receive the MAXIMIZED event,
-                // then the new size must be ignored (it's the maximized size).
-                // We could not rely on the window flags due to race conditions
-                // (they could be updated asynchronously, at least on X11).
-                screen->windowed_window_size_backup =
-                    screen->windowed_window_size;
-
-                // Save the windowed size, so that it is available once the
-                // window is maximized or fullscreen is enabled.
-                screen->windowed_window_size = get_window_size(screen->window);
-            }
-            screen_render(screen);
-            break;
-        case SDL_WINDOWEVENT_MAXIMIZED:
-            // The backup size must be non-nul.
-            assert(screen->windowed_window_size_backup.width);
-            assert(screen->windowed_window_size_backup.height);
-            // Revert the last size, it was updated while screen was maximized.
-            screen->windowed_window_size = screen->windowed_window_size_backup;
-#ifdef DEBUG
-            // Reset the backup to invalid values to detect unexpected usage
-            screen->windowed_window_size_backup.width = 0;
-            screen->windowed_window_size_backup.height = 0;
-#endif
-            screen->maximized = true;
-            break;
-        case SDL_WINDOWEVENT_RESTORED:
-            screen->maximized = false;
-            apply_windowed_size(screen);
-            break;
+    if (!screen->fullscreen) {
+        SDL_SetWindowSize(screen->window, screen->frame_size.width,
+                          screen->frame_size.height);
+        LOGD("Resized to pixel-perfect");
    }
 }
--- a/app/src/screen.h
+++ b/app/src/screen.h
@ -15,37 +15,28 @@ struct screen {
    SDL_Renderer *renderer;
    SDL_Texture *texture;
    struct size frame_size;
-    // The window size the last time it was not maximized or fullscreen.
+    //used only in fullscreen mode to know the windowed window size
    struct size windowed_window_size;
-    // Since we receive the event SIZE_CHANGED before MAXIMIZED, we must be
-    // able to revert the size to its non-maximized value.
-    struct size windowed_window_size_backup;
    bool has_frame;
    bool fullscreen;
-    bool maximized;
    bool no_window;
 };

-#define SCREEN_INITIALIZER { \
-    .window = NULL, \
-    .renderer = NULL, \
-    .texture = NULL, \
-    .frame_size = { \
-        .width = 0,  \
-        .height = 0, \
-    }, \
+#define SCREEN_INITIALIZER {  \
+    .window = NULL,           \
+    .renderer = NULL,         \
+    .texture = NULL,          \
+    .frame_size = {           \
+        .width = 0,           \
+        .height = 0,          \
+    },                        \
    .windowed_window_size = { \
-        .width = 0, \
-        .height = 0, \
-    }, \
-    .windowed_window_size_backup = { \
-        .width = 0, \
-        .height = 0, \
-    }, \
-    .has_frame = false, \
-    .fullscreen = false, \
-    .maximized = false, \
-    .no_window = false, \
+        .width = 0,           \
+        .height = 0,          \
+    },                        \
+    .has_frame = false,   \
+    .fullscreen = false,  \
+    .no_window = false,   \
 }

 // initialize default values
@ -87,8 +78,4 @@ screen_resize_to_fit(struct screen *screen);
 void
 screen_resize_to_pixel_perfect(struct screen *screen);

-// react to window events
-void
-screen_handle_window_event(struct screen *screen, const SDL_WindowEvent *event);
-
 #endif
--- a/app/src/server.c
+++ b/app/src/server.c
@ -1,58 +1,37 @@
 #include "server.h"

-#include <assert.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <libgen.h>
 #include <stdio.h>
+#include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_timer.h>
-#include <SDL2/SDL_platform.h>

 #include "config.h"
 #include "command.h"
-#include "util/log.h"
-#include "util/net.h"
-#include "util/str_util.h"
+#include "log.h"
+#include "net.h"

 #define SOCKET_NAME "scrcpy"
 #define SERVER_FILENAME "scrcpy-server"

 #define DEFAULT_SERVER_PATH PREFIX "/share/scrcpy/" SERVER_FILENAME
-#define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
+#define DEVICE_SERVER_PATH "/data/local/tmp/" SERVER_FILENAME

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

 #ifndef PORTABLE
    LOGD("Using server: " DEFAULT_SERVER_PATH);
-    char *server_path = SDL_strdup(DEFAULT_SERVER_PATH);
-    if (!server_path) {
-        LOGE("Could not allocate memory");
-        return NULL;
-    }
    // the absolute path is hardcoded
-    return server_path;
+    return DEFAULT_SERVER_PATH;
 #else
-
    // use scrcpy-server in the same directory as the executable
    char *executable_path = get_executable_path();
    if (!executable_path) {
@ -88,17 +67,7 @@ get_server_path(void) {

 static bool
 push_server(const char *serial) {
-    char *server_path = get_server_path();
-    if (!server_path) {
-        return false;
-    }
-    if (!is_regular_file(server_path)) {
-        LOGE("'%s' does not exist or is not a regular file\n", server_path);
-        SDL_free(server_path);
-        return false;
-    }
-    process_t process = adb_push(serial, server_path, DEVICE_SERVER_PATH);
-    SDL_free(server_path);
+    process_t process = adb_push(serial, get_server_path(), DEVICE_SERVER_PATH);
    return process_check_success(process, "adb push");
 }

@ -126,6 +95,17 @@ disable_tunnel_forward(const char *serial, uint16_t local_port) {
    return process_check_success(process, "adb forward --remove");
 }

+static bool
+enable_tunnel(struct server *server) {
+    if (enable_tunnel_reverse(server->serial, server->local_port)) {
+        return true;
+    }
+
+    LOGW("'adb reverse' failed, fallback to 'adb forward'");
+    server->tunnel_forward = true;
+    return enable_tunnel_forward(server->serial, server->local_port);
+}
+
 static bool
 disable_tunnel(struct server *server) {
    if (server->tunnel_forward) {
@ -134,142 +114,35 @@ disable_tunnel(struct server *server) {
    return disable_tunnel_reverse(server->serial);
 }

-static socket_t
-listen_on_port(uint16_t port) {
-#define IPV4_LOCALHOST 0x7F000001
-    return net_listen(IPV4_LOCALHOST, port, 1);
-}
-
-static bool
-enable_tunnel_reverse_any_port(struct server *server,
-                               struct port_range port_range) {
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (!enable_tunnel_reverse(server->serial, port)) {
-            // 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.
-        server->server_socket = listen_on_port(port);
-        if (server->server_socket != INVALID_SOCKET) {
-            // success
-            server->local_port = port;
-            return true;
-        }
-
-        // failure, disable tunnel and try another port
-        if (!disable_tunnel_reverse(server->serial)) {
-            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, 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 server *server,
-                               struct port_range port_range) {
-    server->tunnel_forward = true;
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (enable_tunnel_forward(server->serial, port)) {
-            // success
-            server->local_port = port;
-            return true;
-        }
-
-        if (port < port_range.last) {
-            LOGW("Could not forward port %" PRIu16", retrying on %" PRIu16,
-                 port, 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;
-    }
-}
-
-static bool
-enable_tunnel_any_port(struct server *server, struct port_range port_range) {
-    if (enable_tunnel_reverse_any_port(server, 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(server, port_range);
-}
-
 static process_t
 execute_server(struct server *server, const struct server_params *params) {
    char max_size_string[6];
    char bit_rate_string[11];
-    char max_fps_string[6];
    sprintf(max_size_string, "%"PRIu16, params->max_size);
    sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
-    sprintf(max_fps_string, "%"PRIu16, params->max_fps);
    const char *const cmd[] = {
        "shell",
-        "CLASSPATH=" DEVICE_SERVER_PATH,
+        "CLASSPATH=/data/local/tmp/" SERVER_FILENAME,
        "app_process",
-#ifdef SERVER_DEBUGGER
-# define SERVER_DEBUGGER_PORT "5005"
-        "-agentlib:jdwp=transport=dt_socket,suspend=y,server=y,address="
-            SERVER_DEBUGGER_PORT,
-#endif
        "/", // unused
        "com.genymobile.scrcpy.Server",
-        SCRCPY_VERSION,
        max_size_string,
        bit_rate_string,
-        max_fps_string,
        server->tunnel_forward ? "true" : "false",
        params->crop ? params->crop : "-",
        "true", // always send frame meta (packet boundaries + timestamp)
        params->control ? "true" : "false",
    };
-#ifdef SERVER_DEBUGGER
-    LOGI("Server debugger waiting for a client on device port "
-         SERVER_DEBUGGER_PORT "...");
-    // From the computer, run
-    //     adb forward tcp:5005 tcp:5005
-    // Then, from Android Studio: Run > Debug > Edit configurations...
-    // On the left, click on '+', "Remote", with:
-    //     Host: localhost
-    //     Port: 5005
-    // Then click on "Debug"
-#endif
    return adb_execute(server->serial, cmd, sizeof(cmd) / sizeof(cmd[0]));
 }

+#define IPV4_LOCALHOST 0x7F000001
+
+static socket_t
+listen_on_port(uint16_t port) {
+    return net_listen(IPV4_LOCALHOST, port, 1);
+}
+
 static socket_t
 connect_and_read_byte(uint16_t port) {
    socket_t socket = net_connect(IPV4_LOCALHOST, port);
@ -306,7 +179,7 @@ connect_to_server(uint16_t port, uint32_t attempts, uint32_t delay) {

 static void
 close_socket(socket_t *socket) {
-    assert(*socket != INVALID_SOCKET);
+    SDL_assert(*socket != INVALID_SOCKET);
    net_shutdown(*socket, SHUT_RDWR);
    if (!net_close(*socket)) {
        LOGW("Could not close socket");
@ -323,7 +196,7 @@ server_init(struct server *server) {
 bool
 server_start(struct server *server, const char *serial,
             const struct server_params *params) {
-    server->port_range = params->port_range;
+    server->local_port = params->local_port;

    if (serial) {
        server->serial = SDL_strdup(serial);
@ -337,11 +210,30 @@ server_start(struct server *server, const char *serial,
        return false;
    }

-    if (!enable_tunnel_any_port(server, params->port_range)) {
+    if (!enable_tunnel(server)) {
        SDL_free(server->serial);
        return false;
    }

+    // if "adb reverse" does not work (e.g. over "adb connect"), it fallbacks to
+    // "adb forward", so the app socket is the client
+    if (!server->tunnel_forward) {
+        // 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.
+
+        server->server_socket = listen_on_port(params->local_port);
+        if (server->server_socket == INVALID_SOCKET) {
+            LOGE("Could not listen on port %" PRIu16, params->local_port);
+            disable_tunnel(server);
+            SDL_free(server->serial);
+            return false;
+        }
+    }
+
    // server will connect to our server socket
    server->process = execute_server(server, params);

@ -369,7 +261,7 @@ server_connect_to(struct server *server) {

        server->control_socket = net_accept(server->server_socket);
        if (server->control_socket == INVALID_SOCKET) {
-            // the video_socket will be cleaned up on destroy
+            // the video_socket will be clean up on destroy
            return false;
        }

@ -411,7 +303,7 @@ server_stop(struct server *server) {
        close_socket(&server->control_socket);
    }

-    assert(server->process != PROCESS_NONE);
+    SDL_assert(server->process != PROCESS_NONE);

    if (!cmd_terminate(server->process)) {
        LOGW("Could not terminate server");
--- a/app/src/server.h
+++ b/app/src/server.h
@ -6,8 +6,7 @@

 #include "config.h"
 #include "command.h"
-#include "common.h"
-#include "util/net.h"
+#include "net.h"

 struct server {
    char *serial;
@ -15,33 +14,27 @@ struct server {
    socket_t server_socket; // only used if !tunnel_forward
    socket_t video_socket;
    socket_t control_socket;
-    struct port_range port_range;
-    uint16_t local_port; // selected from port_range
+    uint16_t local_port;
    bool tunnel_enabled;
    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
 };

-#define SERVER_INITIALIZER { \
-    .serial = NULL, \
-    .process = PROCESS_NONE, \
-    .server_socket = INVALID_SOCKET, \
-    .video_socket = INVALID_SOCKET, \
+#define SERVER_INITIALIZER {          \
+    .serial = NULL,                   \
+    .process = PROCESS_NONE,          \
+    .server_socket = INVALID_SOCKET,  \
+    .video_socket = INVALID_SOCKET,   \
    .control_socket = INVALID_SOCKET, \
-    .port_range = { \
-        .first = 0, \
-        .last = 0, \
-    }, \
-    .local_port = 0, \
-    .tunnel_enabled = false, \
-    .tunnel_forward = false, \
+    .local_port = 0,                  \
+    .tunnel_enabled = false,          \
+    .tunnel_forward = false,          \
 }

 struct server_params {
    const char *crop;
-    struct port_range port_range;
+    uint16_t local_port;
    uint16_t max_size;
    uint32_t bit_rate;
-    uint16_t max_fps;
    bool control;
 };

--- a/app/src/util/str_util.c
+++ b/app/src/util/str_util.c
@ -1,7 +1,5 @@
 #include "str_util.h"

-#include <errno.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>

@ -62,88 +60,6 @@ strquote(const char *src) {
    return quoted;
 }

-bool
-parse_integer(const char *s, long *out) {
-    char *endptr;
-    if (*s == '\0') {
-        return false;
-    }
-    errno = 0;
-    long value = strtol(s, &endptr, 0);
-    if (errno == ERANGE) {
-        return false;
-    }
-    if (*endptr != '\0') {
-        return false;
-    }
-
-    *out = value;
-    return true;
-}
-
-size_t
-parse_integers(const char *s, const char sep, size_t max_items, long *out) {
-    size_t count = 0;
-    char *endptr;
-    do {
-        errno = 0;
-        long value = strtol(s, &endptr, 0);
-        if (errno == ERANGE) {
-            return 0;
-        }
-
-        if (endptr == s || (*endptr != sep && *endptr != '\0')) {
-            return 0;
-        }
-
-        out[count++] = value;
-        if (*endptr == sep) {
-            if (count >= max_items) {
-                // max items already reached, could not accept a new item
-                return 0;
-            }
-            // parse the next token during the next iteration
-            s = endptr + 1;
-        }
-    } while (*endptr != '\0');
-
-    return count;
-}
-
-bool
-parse_integer_with_suffix(const char *s, long *out) {
-    char *endptr;
-    if (*s == '\0') {
-        return false;
-    }
-    errno = 0;
-    long value = strtol(s, &endptr, 0);
-    if (errno == ERANGE) {
-        return false;
-    }
-    int mul = 1;
-    if (*endptr != '\0') {
-        if (s == endptr) {
-            return false;
-        }
-        if ((*endptr == 'M' || *endptr == 'm') && endptr[1] == '\0') {
-            mul = 1000000;
-        } else if ((*endptr == 'K' || *endptr == 'k') && endptr[1] == '\0') {
-            mul = 1000;
-        } else {
-            return false;
-        }
-    }
-
-    if ((value < 0 && LONG_MIN / mul > value) ||
-        (value > 0 && LONG_MAX / mul < value)) {
-        return false;
-    }
-
-    *out = value * mul;
-    return true;
-}
-
 size_t
 utf8_truncation_index(const char *utf8, size_t max_len) {
    size_t len = strlen(utf8);
--- a/app/src/util/str_util.h
+++ b/app/src/util/str_util.h
@ -1,7 +1,6 @@
 #ifndef STRUTIL_H
 #define STRUTIL_H

-#include <stdbool.h>
 #include <stddef.h>

 #include "config.h"
@ -26,23 +25,6 @@ xstrjoin(char *dst, const char *const tokens[], char sep, size_t n);
 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);
-
 // 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);
--- a/app/src/stream.c
+++ b/app/src/stream.c
@ -1,8 +1,8 @@
 #include "stream.h"

-#include <assert.h>
 #include <libavformat/avformat.h>
 #include <libavutil/time.h>
+#include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_events.h>
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
@ -10,11 +10,12 @@

 #include "config.h"
 #include "compat.h"
+#include "buffer_util.h"
 #include "decoder.h"
 #include "events.h"
+#include "lock_util.h"
+#include "log.h"
 #include "recorder.h"
-#include "util/buffer_util.h"
-#include "util/log.h"

 #define BUFSIZE 0x10000

@ -43,8 +44,7 @@ stream_recv_packet(struct stream *stream, AVPacket *packet) {

    uint64_t pts = buffer_read64be(header);
    uint32_t len = buffer_read32be(&header[8]);
-    assert(pts == NO_PTS || (pts & 0x8000000000000000) == 0);
-    assert(len);
+    SDL_assert(len);

    if (av_new_packet(packet, len)) {
        LOGE("Could not allocate packet");
@ -52,12 +52,12 @@ stream_recv_packet(struct stream *stream, AVPacket *packet) {
    }

    r = net_recv_all(stream->socket, packet->data, len);
-    if (r < 0 || ((uint32_t) r) < len) {
+    if (r < len) {
        av_packet_unref(packet);
        return false;
    }

-    packet->pts = pts != NO_PTS ? (int64_t) pts : AV_NOPTS_VALUE;
+    packet->pts = pts != NO_PTS ? pts : AV_NOPTS_VALUE;

    return true;
 }
@ -107,9 +107,8 @@ stream_parse(struct stream *stream, AVPacket *packet) {
                             AV_NOPTS_VALUE, AV_NOPTS_VALUE, -1);

    // PARSER_FLAG_COMPLETE_FRAMES is set
-    assert(r == in_len);
-    (void) r;
-    assert(out_len == in_len);
+    SDL_assert(r == in_len);
+    SDL_assert(out_len == in_len);

    if (stream->parser->key_frame == 1) {
        packet->flags |= AV_PKT_FLAG_KEY;
--- a/app/src/stream.h
+++ b/app/src/stream.h
@ -8,7 +8,7 @@
 #include <SDL2/SDL_thread.h>

 #include "config.h"
-#include "util/net.h"
+#include "net.h"

 struct video_buffer;

--- a/app/src/sys/unix/command.c
+++ b/app/src/sys/unix/command.c
@ -14,52 +14,13 @@
 #include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
-
-#include "util/log.h"
-
-bool
-cmd_search(const char *file) {
-    char *path = getenv("PATH");
-    if (!path)
-        return false;
-    path = strdup(path);
-    if (!path)
-        return false;
-
-    bool ret = false;
-    size_t file_len = strlen(file);
-    char *saveptr;
-    for (char *dir = strtok_r(path, ":", &saveptr); dir;
-            dir = strtok_r(NULL, ":", &saveptr)) {
-        size_t dir_len = strlen(dir);
-        char *fullpath = malloc(dir_len + file_len + 2);
-        if (!fullpath)
-            continue;
-        memcpy(fullpath, dir, dir_len);
-        fullpath[dir_len] = '/';
-        memcpy(fullpath + dir_len + 1, file, file_len + 1);
-
-        struct stat sb;
-        bool fullpath_executable = stat(fullpath, &sb) == 0 &&
-            sb.st_mode & S_IXUSR;
-        free(fullpath);
-        if (fullpath_executable) {
-            ret = true;
-            break;
-        }
-    }
-
-    free(path);
-    return ret;
-}
+#include "log.h"

 enum process_result
-cmd_execute(const char *const argv[], pid_t *pid) {
+cmd_execute(const char *path, const char *const argv[], pid_t *pid) {
    int fd[2];

    if (pipe(fd) == -1) {
@ -90,7 +51,7 @@ cmd_execute(const char *const argv[], pid_t *pid) {
        // child close read side
        close(fd[0]);
        if (fcntl(fd[1], F_SETFD, FD_CLOEXEC) == 0) {
-            execvp(argv[0], (char *const *)argv);
+            execvp(path, (char *const *)argv);
            if (errno == ENOENT) {
                ret = PROCESS_ERROR_MISSING_BINARY;
            } else {
@ -165,14 +126,3 @@ get_executable_path(void) {
    return NULL;
 #endif
 }
-
-bool
-is_regular_file(const char *path) {
-    struct stat path_stat;
-
-    if (stat(path, &path_stat)) {
-        perror("stat");
-        return false;
-    }
-    return S_ISREG(path_stat.st_mode);
-}
--- a/app/src/sys/unix/net.c
+++ b/app/src/sys/unix/net.c
@ -0,0 +1,21 @@
+#include "net.h"
+
+#include <unistd.h>
+
+#include "config.h"
+
+bool
+net_init(void) {
+    // do nothing
+    return true;
+}
+
+void
+net_cleanup(void) {
+    // do nothing
+}
+
+bool
+net_close(socket_t socket) {
+    return !close(socket);
+}
--- a/app/src/sys/win/command.c
+++ b/app/src/sys/win/command.c
@ -1,10 +1,8 @@
 #include "command.h"

-#include <sys/stat.h>
-
 #include "config.h"
-#include "util/log.h"
-#include "util/str_util.h"
+#include "log.h"
+#include "str_util.h"

 static int
 build_cmd(char *cmd, size_t len, const char *const argv[]) {
@ -21,7 +19,7 @@ build_cmd(char *cmd, size_t len, const char *const argv[]) {
 }

 enum process_result
-cmd_execute(const char *const argv[], HANDLE *handle) {
+cmd_execute(const char *path, const char *const argv[], HANDLE *handle) {
    STARTUPINFOW si;
    PROCESS_INFORMATION pi;
    memset(&si, 0, sizeof(si));
@ -92,22 +90,3 @@ get_executable_path(void) {
    buf[len] = '\0';
    return utf8_from_wide_char(buf);
 }
-
-bool
-is_regular_file(const char *path) {
-    wchar_t *wide_path = utf8_to_wide_char(path);
-    if (!wide_path) {
-        LOGC("Could not allocate wide char string");
-        return false;
-    }
-
-    struct _stat path_stat;
-    int r = _wstat(wide_path, &path_stat);
-    SDL_free(wide_path);
-
-    if (r) {
-        perror("stat");
-        return false;
-    }
-    return S_ISREG(path_stat.st_mode);
-}
--- a/app/src/sys/win/net.c
+++ b/app/src/sys/win/net.c
@ -0,0 +1,25 @@
+#include "net.h"
+
+#include "config.h"
+#include "log.h"
+
+bool
+net_init(void) {
+    WSADATA wsa;
+    int res = WSAStartup(MAKEWORD(2, 2), &wsa) < 0;
+    if (res < 0) {
+        LOGC("WSAStartup failed with error %d", res);
+        return false;
+    }
+    return true;
+}
+
+void
+net_cleanup(void) {
+    WSACleanup();
+}
+
+bool
+net_close(socket_t socket) {
+    return !closesocket(socket);
+}
--- a/app/src/tiny_xpm.c
+++ b/app/src/tiny_xpm.c
@ -1,13 +1,12 @@
 #include "tiny_xpm.h"

-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

 #include "config.h"
-#include "util/log.h"
+#include "log.h"

 struct index {
    char c;
@ -37,7 +36,7 @@ find_color(struct index *index, int len, char c, uint32_t *color) {
 // (non-const) "char *"
 SDL_Surface *
 read_xpm(char *xpm[]) {
-#ifndef NDEBUG
+#if SDL_ASSERT_LEVEL >= 2
    // patch the XPM to change the icon color in debug mode
    xpm[2] = ".	c #CC00CC";
 #endif
@ -52,26 +51,24 @@ read_xpm(char *xpm[]) {
    int chars = strtol(endptr + 1, &endptr, 10);

    // sanity checks
-    assert(0 <= width && width < 256);
-    assert(0 <= height && height < 256);
-    assert(0 <= colors && colors < 256);
-    assert(chars == 1); // this implementation does not support more
-
-    (void) chars;
+    SDL_assert(0 <= width && width < 256);
+    SDL_assert(0 <= height && height < 256);
+    SDL_assert(0 <= colors && colors < 256);
+    SDL_assert(chars == 1); // this implementation does not support more

    // init index
    struct index index[colors];
    for (int i = 0; i < colors; ++i) {
        const char *line = xpm[1+i];
        index[i].c = line[0];
-        assert(line[1] == '\t');
-        assert(line[2] == 'c');
-        assert(line[3] == ' ');
+        SDL_assert(line[1] == '\t');
+        SDL_assert(line[2] == 'c');
+        SDL_assert(line[3] == ' ');
        if (line[4] == '#') {
            index[i].color = 0xff000000 | strtol(&line[5], &endptr, 0x10);
-            assert(*endptr == '\0');
+            SDL_assert(*endptr == '\0');
        } else {
-            assert(!strcmp("None", &line[4]));
+            SDL_assert(!strcmp("None", &line[4]));
            index[i].color = 0;
        }
    }
@ -88,8 +85,7 @@ read_xpm(char *xpm[]) {
            char c = line[x];
            uint32_t color;
            bool color_found = find_color(index, colors, c, &color);
-            assert(color_found);
-            (void) color_found;
+            SDL_assert(color_found);
            pixels[y * width + x] = color;
        }
    }
--- a/app/src/util/lock.h
+++ b/app/src/util/lock.h
@ -1,74 +0,0 @@
-#ifndef LOCK_H
-#define LOCK_H
-
-#include <stdint.h>
-#include <SDL2/SDL_mutex.h>
-
-#include "config.h"
-#include "log.h"
-
-static inline void
-mutex_lock(SDL_mutex *mutex) {
-    int r = SDL_LockMutex(mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not lock mutex: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-static inline void
-mutex_unlock(SDL_mutex *mutex) {
-    int r = SDL_UnlockMutex(mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not unlock mutex: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-static inline void
-cond_wait(SDL_cond *cond, SDL_mutex *mutex) {
-    int r = SDL_CondWait(cond, mutex);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not wait on condition: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-static inline int
-cond_wait_timeout(SDL_cond *cond, SDL_mutex *mutex, uint32_t ms) {
-    int r = SDL_CondWaitTimeout(cond, mutex, ms);
-#ifndef NDEBUG
-    if (r < 0) {
-        LOGC("Could not wait on condition with timeout: %s", SDL_GetError());
-        abort();
-    }
-#endif
-    return r;
-}
-
-static inline void
-cond_signal(SDL_cond *cond) {
-    int r = SDL_CondSignal(cond);
-#ifndef NDEBUG
-    if (r) {
-        LOGC("Could not signal a condition: %s", SDL_GetError());
-        abort();
-    }
-#else
-    (void) r;
-#endif
-}
-
-#endif
--- a/app/src/video_buffer.c
+++ b/app/src/video_buffer.c
@ -1,13 +1,13 @@
 #include "video_buffer.h"

-#include <assert.h>
+#include <SDL2/SDL_assert.h>
 #include <SDL2/SDL_mutex.h>
 #include <libavutil/avutil.h>
 #include <libavformat/avformat.h>

 #include "config.h"
-#include "util/lock.h"
-#include "util/log.h"
+#include "lock_util.h"
+#include "log.h"

 bool
 video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
@ -91,7 +91,7 @@ video_buffer_offer_decoded_frame(struct video_buffer *vb,

 const AVFrame *
 video_buffer_consume_rendered_frame(struct video_buffer *vb) {
-    assert(!vb->rendering_frame_consumed);
+    SDL_assert(!vb->rendering_frame_consumed);
    vb->rendering_frame_consumed = true;
    fps_counter_add_rendered_frame(vb->fps_counter);
    if (vb->render_expired_frames) {
--- a/app/tests/test_buffer_util.c
+++ b/app/tests/test_buffer_util.c
@ -1,76 +0,0 @@
-#include <assert.h>
-
-#include "util/buffer_util.h"
-
-static void test_buffer_write16be(void) {
-    uint16_t val = 0xABCD;
-    uint8_t buf[2];
-
-    buffer_write16be(buf, val);
-
-    assert(buf[0] == 0xAB);
-    assert(buf[1] == 0xCD);
-}
-
-static void test_buffer_write32be(void) {
-    uint32_t val = 0xABCD1234;
-    uint8_t buf[4];
-
-    buffer_write32be(buf, val);
-
-    assert(buf[0] == 0xAB);
-    assert(buf[1] == 0xCD);
-    assert(buf[2] == 0x12);
-    assert(buf[3] == 0x34);
-}
-
-static void test_buffer_write64be(void) {
-    uint64_t val = 0xABCD1234567890EF;
-    uint8_t buf[8];
-
-    buffer_write64be(buf, val);
-
-    assert(buf[0] == 0xAB);
-    assert(buf[1] == 0xCD);
-    assert(buf[2] == 0x12);
-    assert(buf[3] == 0x34);
-    assert(buf[4] == 0x56);
-    assert(buf[5] == 0x78);
-    assert(buf[6] == 0x90);
-    assert(buf[7] == 0xEF);
-}
-
-static void test_buffer_read16be(void) {
-    uint8_t buf[2] = {0xAB, 0xCD};
-
-    uint16_t val = buffer_read16be(buf);
-
-    assert(val == 0xABCD);
-}
-
-static void test_buffer_read32be(void) {
-    uint8_t buf[4] = {0xAB, 0xCD, 0x12, 0x34};
-
-    uint32_t val = buffer_read32be(buf);
-
-    assert(val == 0xABCD1234);
-}
-
-static void test_buffer_read64be(void) {
-    uint8_t buf[8] = {0xAB, 0xCD, 0x12, 0x34,
-                      0x56, 0x78, 0x90, 0xEF};
-
-    uint64_t val = buffer_read64be(buf);
-
-    assert(val == 0xABCD1234567890EF);
-}
-
-int main(void) {
-    test_buffer_write16be();
-    test_buffer_write32be();
-    test_buffer_write64be();
-    test_buffer_read16be();
-    test_buffer_read32be();
-    test_buffer_read64be();
-    return 0;
-}
--- a/app/tests/test_cbuf.c
+++ b/app/tests/test_cbuf.c
@ -1,7 +1,7 @@
 #include <assert.h>
 #include <string.h>

-#include "util/cbuf.h"
+#include "cbuf.h"

 struct int_queue CBUF(int, 32);

--- a/app/tests/test_cli.c
+++ b/app/tests/test_cli.c
@ -1,129 +0,0 @@
-#include <assert.h>
-
-#include "cli.h"
-#include "common.h"
-
-static void test_flag_version(void) {
-    struct scrcpy_cli_args args = {
-        .opts = SCRCPY_OPTIONS_DEFAULT,
-        .help = false,
-        .version = false,
-    };
-
-    char *argv[] = {"scrcpy", "-v"};
-
-    bool ok = scrcpy_parse_args(&args, 2, argv);
-    assert(ok);
-    assert(!args.help);
-    assert(args.version);
-}
-
-static void test_flag_help(void) {
-    struct scrcpy_cli_args args = {
-        .opts = SCRCPY_OPTIONS_DEFAULT,
-        .help = false,
-        .version = false,
-    };
-
-    char *argv[] = {"scrcpy", "-v"};
-
-    bool ok = scrcpy_parse_args(&args, 2, argv);
-    assert(ok);
-    assert(!args.help);
-    assert(args.version);
-}
-
-static void test_options(void) {
-    struct scrcpy_cli_args args = {
-        .opts = SCRCPY_OPTIONS_DEFAULT,
-        .help = false,
-        .version = false,
-    };
-
-    char *argv[] = {
-        "scrcpy",
-        "--always-on-top",
-        "--bit-rate", "5M",
-        "--crop", "100:200:300:400",
-        "--fullscreen",
-        "--max-fps", "30",
-        "--max-size", "1024",
-        // "--no-control" is not compatible with "--turn-screen-off"
-        // "--no-display" is not compatible with "--fulscreen"
-        "--port", "1234:1236",
-        "--push-target", "/sdcard/Movies",
-        "--record", "file",
-        "--record-format", "mkv",
-        "--render-expired-frames",
-        "--serial", "0123456789abcdef",
-        "--show-touches",
-        "--turn-screen-off",
-        "--prefer-text",
-        "--window-title", "my device",
-        "--window-x", "100",
-        "--window-y", "-1",
-        "--window-width", "600",
-        "--window-height", "0",
-        "--window-borderless",
-    };
-
-    bool ok = scrcpy_parse_args(&args, ARRAY_LEN(argv), argv);
-    assert(ok);
-
-    const struct scrcpy_options *opts = &args.opts;
-    assert(opts->always_on_top);
-    fprintf(stderr, "%d\n", (int) opts->bit_rate);
-    assert(opts->bit_rate == 5000000);
-    assert(!strcmp(opts->crop, "100:200:300:400"));
-    assert(opts->fullscreen);
-    assert(opts->max_fps == 30);
-    assert(opts->max_size == 1024);
-    assert(opts->port_range.first == 1234);
-    assert(opts->port_range.last == 1236);
-    assert(!strcmp(opts->push_target, "/sdcard/Movies"));
-    assert(!strcmp(opts->record_filename, "file"));
-    assert(opts->record_format == RECORDER_FORMAT_MKV);
-    assert(opts->render_expired_frames);
-    assert(!strcmp(opts->serial, "0123456789abcdef"));
-    assert(opts->show_touches);
-    assert(opts->turn_screen_off);
-    assert(opts->prefer_text);
-    assert(!strcmp(opts->window_title, "my device"));
-    assert(opts->window_x == 100);
-    assert(opts->window_y == -1);
-    assert(opts->window_width == 600);
-    assert(opts->window_height == 0);
-    assert(opts->window_borderless);
-}
-
-static void test_options2(void) {
-    struct scrcpy_cli_args args = {
-        .opts = SCRCPY_OPTIONS_DEFAULT,
-        .help = false,
-        .version = false,
-    };
-
-    char *argv[] = {
-        "scrcpy",
-        "--no-control",
-        "--no-display",
-        "--record", "file.mp4", // cannot enable --no-display without recording
-    };
-
-    bool ok = scrcpy_parse_args(&args, ARRAY_LEN(argv), argv);
-    assert(ok);
-
-    const struct scrcpy_options *opts = &args.opts;
-    assert(!opts->control);
-    assert(!opts->display);
-    assert(!strcmp(opts->record_filename, "file.mp4"));
-    assert(opts->record_format == RECORDER_FORMAT_MP4);
-}
-
-int main(void) {
-    test_flag_version();
-    test_flag_help();
-    test_options();
-    test_options2();
-    return 0;
-};
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@ -236,21 +236,6 @@ static void test_serialize_set_screen_power_mode(void) {
    assert(!memcmp(buf, expected, sizeof(expected)));
 }

-static void test_serialize_rotate_device(void) {
-    struct control_msg msg = {
-        .type = CONTROL_MSG_TYPE_ROTATE_DEVICE,
-    };
-
-    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
-    int size = control_msg_serialize(&msg, buf);
-    assert(size == 1);
-
-    const unsigned char expected[] = {
-        CONTROL_MSG_TYPE_ROTATE_DEVICE,
-    };
-    assert(!memcmp(buf, expected, sizeof(expected)));
-}
-
 int main(void) {
    test_serialize_inject_keycode();
    test_serialize_inject_text();
@ -263,6 +248,5 @@ int main(void) {
    test_serialize_get_clipboard();
    test_serialize_set_clipboard();
    test_serialize_set_screen_power_mode();
-    test_serialize_rotate_device();
    return 0;
 }
--- a/app/tests/test_queue.c
+++ b/app/tests/test_queue.c
@ -1,6 +1,6 @@
 #include <assert.h>

-#include "util/queue.h"
+#include <queue.h>

 struct foo {
    int value;
--- a/app/tests/test_strutil.c
+++ b/app/tests/test_strutil.c
@ -1,10 +1,7 @@
 #include <assert.h>
-#include <limits.h>
-#include <stdio.h>
 #include <string.h>
-#include <SDL2/SDL.h>

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

 static void test_xstrncpy_simple(void) {
    char s[] = "xxxxxxxxxx";
@ -129,16 +126,6 @@ static void test_xstrjoin_truncated_after_sep(void) {
    assert(!strcmp("abc de ", s));
 }

-static void test_strquote(void) {
-    const char *s = "abcde";
-    char *out = strquote(s);
-
-    // add '"' at the beginning and the end
-    assert(!strcmp("\"abcde\"", out));
-
-    SDL_free(out);
-}
-
 static void test_utf8_truncate(void) {
    const char *s = "aÉbÔc";
    assert(strlen(s) == 7); // É and Ô are 2 bytes-wide
@ -170,122 +157,6 @@ static void test_utf8_truncate(void) {
    assert(count == 7); // no more chars
 }

-static void test_parse_integer(void) {
-    long value;
-    bool ok = parse_integer("1234", &value);
-    assert(ok);
-    assert(value == 1234);
-
-    ok = parse_integer("-1234", &value);
-    assert(ok);
-    assert(value == -1234);
-
-    ok = parse_integer("1234k", &value);
-    assert(!ok);
-
-    ok = parse_integer("123456789876543212345678987654321", &value);
-    assert(!ok); // out-of-range
-}
-
-static void test_parse_integers(void) {
-    long values[5];
-
-    size_t count = parse_integers("1234", ':', 5, values);
-    assert(count == 1);
-    assert(values[0] == 1234);
-
-    count = parse_integers("1234:5678", ':', 5, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == 5678);
-
-    count = parse_integers("1234:5678", ':', 2, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == 5678);
-
-    count = parse_integers("1234:-5678", ':', 2, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == -5678);
-
-    count = parse_integers("1:2:3:4:5", ':', 5, values);
-    assert(count == 5);
-    assert(values[0] == 1);
-    assert(values[1] == 2);
-    assert(values[2] == 3);
-    assert(values[3] == 4);
-    assert(values[4] == 5);
-
-    count = parse_integers("1234:5678", ':', 1, values);
-    assert(count == 0); // max_items == 1
-
-    count = parse_integers("1:2:3:4:5", ':', 3, values);
-    assert(count == 0); // max_items == 3
-
-    count = parse_integers(":1234", ':', 5, values);
-    assert(count == 0); // invalid
-
-    count = parse_integers("1234:", ':', 5, values);
-    assert(count == 0); // invalid
-
-    count = parse_integers("1234:", ':', 1, values);
-    assert(count == 0); // invalid, even when max_items == 1
-
-    count = parse_integers("1234::5678", ':', 5, values);
-    assert(count == 0); // invalid
-}
-
-static void test_parse_integer_with_suffix(void) {
-    long value;
-    bool ok = parse_integer_with_suffix("1234", &value);
-    assert(ok);
-    assert(value == 1234);
-
-    ok = parse_integer_with_suffix("-1234", &value);
-    assert(ok);
-    assert(value == -1234);
-
-    ok = parse_integer_with_suffix("1234k", &value);
-    assert(ok);
-    assert(value == 1234000);
-
-    ok = parse_integer_with_suffix("1234m", &value);
-    assert(ok);
-    assert(value == 1234000000);
-
-    ok = parse_integer_with_suffix("-1234k", &value);
-    assert(ok);
-    assert(value == -1234000);
-
-    ok = parse_integer_with_suffix("-1234m", &value);
-    assert(ok);
-    assert(value == -1234000000);
-
-    ok = parse_integer_with_suffix("123456789876543212345678987654321", &value);
-    assert(!ok); // out-of-range
-
-    char buf[32];
-
-    sprintf(buf, "%ldk", LONG_MAX / 2000);
-    ok = parse_integer_with_suffix(buf, &value);
-    assert(ok);
-    assert(value == LONG_MAX / 2000 * 1000);
-
-    sprintf(buf, "%ldm", LONG_MAX / 2000);
-    ok = parse_integer_with_suffix(buf, &value);
-    assert(!ok);
-
-    sprintf(buf, "%ldk", LONG_MIN / 2000);
-    ok = parse_integer_with_suffix(buf, &value);
-    assert(ok);
-    assert(value == LONG_MIN / 2000 * 1000);
-
-    sprintf(buf, "%ldm", LONG_MIN / 2000);
-    ok = parse_integer_with_suffix(buf, &value);
-    assert(!ok);
-}
-
 int main(void) {
    test_xstrncpy_simple();
    test_xstrncpy_just_fit();
@ -295,10 +166,6 @@ int main(void) {
    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();
    return 0;
 }
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@ -54,7 +54,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
    <module name="SuppressWarningsHolder"/>

    <!-- Checks for imports                              -->
-    <!-- See http://checkstyle.sf.net/config_imports.html -->
+    <!-- See http://checkstyle.sf.net/config_import.html -->
    <module name="AvoidStarImport">
      <property name="allowStaticMemberImports" value="true" />
    </module>
@ -99,7 +99,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
    <module name="WhitespaceAround" />

    <!-- Modifier Checks                                    -->
-    <!-- See http://checkstyle.sf.net/config_modifier.html -->
+    <!-- See http://checkstyle.sf.net/config_modifiers.html -->
    <module name="ModifierOrder" />
    <module name="RedundantModifier" />

--- a/cross_win32.txt
+++ b/cross_win32.txt
@ -15,6 +15,6 @@ cpu = 'i686'
 endian = 'little'

 [properties]
-prebuilt_ffmpeg_shared = 'ffmpeg-4.2.1-win32-shared'
-prebuilt_ffmpeg_dev = 'ffmpeg-4.2.1-win32-dev'
+prebuilt_ffmpeg_shared = 'ffmpeg-4.1.4-win32-shared'
+prebuilt_ffmpeg_dev = 'ffmpeg-4.1.4-win32-dev'
 prebuilt_sdl2 = 'SDL2-2.0.10/i686-w64-mingw32'
--- a/cross_win64.txt
+++ b/cross_win64.txt
@ -15,6 +15,6 @@ cpu = 'x86_64'
 endian = 'little'

 [properties]
-prebuilt_ffmpeg_shared = 'ffmpeg-4.2.1-win64-shared'
-prebuilt_ffmpeg_dev = 'ffmpeg-4.2.1-win64-dev'
+prebuilt_ffmpeg_shared = 'ffmpeg-4.1.4-win64-shared'
+prebuilt_ffmpeg_dev = 'ffmpeg-4.1.4-win64-dev'
 prebuilt_sdl2 = 'SDL2-2.0.10/x86_64-w64-mingw32'
--- a/meson.build
+++ b/meson.build
@ -1,10 +1,7 @@
 project('scrcpy', 'c',
-        version: '1.12.1',
+        version: '1.10',
        meson_version: '>= 0.37',
-        default_options: [
-            'c_std=c11',
-            'warning_level=2',
-        ])
+        default_options: 'c_std=c11')

 if get_option('compile_app')
    subdir('app')
--- a/meson_options.txt
+++ b/meson_options.txt
@ -5,4 +5,3 @@ option('windows_noconsole', type: 'boolean', value: false, description: 'Disable
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
 option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support')
-option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
--- a/prebuilt-deps/Makefile
+++ b/prebuilt-deps/Makefile
@ -10,24 +10,24 @@ prepare-win32: prepare-sdl2 prepare-ffmpeg-shared-win32 prepare-ffmpeg-dev-win32
 prepare-win64: prepare-sdl2 prepare-ffmpeg-shared-win64 prepare-ffmpeg-dev-win64 prepare-adb

 prepare-ffmpeg-shared-win32:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.1-win32-shared.zip \
-		9208255f409410d95147151d7e829b5699bf8d91bfe1e81c3f470f47c2fa66d2 \
-		ffmpeg-4.2.1-win32-shared
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.1.4-win32-shared.zip \
+		596608277f6b937c3dea7c46e854665d75b3de56790bae07f655ca331440f003 \
+		ffmpeg-4.1.4-win32-shared

 prepare-ffmpeg-dev-win32:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.2.1-win32-dev.zip \
-		c3469e6c5f031cbcc8cba88dee92d6548c5c6b6ff14f4097f18f72a92d0d70c4 \
-		ffmpeg-4.2.1-win32-dev
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.1.4-win32-dev.zip \
+		a80c86e263cfad26e202edfa5e6e939a2c88843ae26f031d3e0d981a39fd03fb \
+		ffmpeg-4.1.4-win32-dev

 prepare-ffmpeg-shared-win64:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip \
-		55063d3cf750a75485c7bf196031773d81a1b25d0980c7db48ecfc7701a42331 \
-		ffmpeg-4.2.1-win64-shared
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.1.4-win64-shared.zip \
+		a90889871de2cab8a79b392591313a188189a353f69dde1db98aebe20b280989 \
+		ffmpeg-4.1.4-win64-shared

 prepare-ffmpeg-dev-win64:
-	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.1-win64-dev.zip \
-		5af393be5f25c0a71aa29efce768e477c35347f7f8e0d9696767d5b9d405b74e \
-		ffmpeg-4.2.1-win64-dev
+	@./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.1.4-win64-dev.zip \
+		6c9d53f9e94ce1821e975ec668e5b9d6e9deb4a45d0d7e30264685d3dfbbb068 \
+		ffmpeg-4.1.4-win64-dev

 prepare-sdl2:
 	@./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.10-mingw.tar.gz \
@ -35,6 +35,6 @@ prepare-sdl2:
 		SDL2-2.0.10

 prepare-adb:
-	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r29.0.5-windows.zip \
-		2df06160056ec9a84c7334af2a1e42740befbb1a2e34370e7af544a2cc78152c \
+	@./prepare-dep https://dl.google.com/android/repository/platform-tools_r29.0.2-windows.zip \
+		d78f02e5e2c9c4c1d046dcd4e6fbdf586e5f57ef66eb0da5c2b49d745d85d5ee \
 		platform-tools
--- a/server/build.gradle
+++ b/server/build.gradle
@ -6,8 +6,8 @@ android {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
        targetSdkVersion 29
-        versionCode 14
-        versionName "1.12.1"
+        versionCode 11
+        versionName "1.10"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@ -11,9 +11,6 @@

 set -e

-SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=1.12.1
-
 PLATFORM=${ANDROID_PLATFORM:-29}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-29.0.2}

@ -33,14 +30,13 @@ mkdir -p "$CLASSES_DIR/com/genymobile/scrcpy"
 package com.genymobile.scrcpy;

 public final class BuildConfig {
-  public static final boolean DEBUG = $SCRCPY_DEBUG;
-  public static final String VERSION_NAME = "$SCRCPY_VERSION_NAME";
+  public static final boolean DEBUG = false;
 }
 EOF

 echo "Generating java from aidl..."
 cd "$SERVER_DIR/src/main/aidl"
-"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o"$CLASSES_DIR" \
+"$ANDROID_HOME/build-tools/$BUILD_TOOLS/aidl" -o "$CLASSES_DIR" \
    android/view/IRotationWatcher.aidl

 echo "Compiling java sources..."
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@ -15,7 +15,6 @@ public final class ControlMessage {
    public static final int TYPE_GET_CLIPBOARD = 7;
    public static final int TYPE_SET_CLIPBOARD = 8;
    public static final int TYPE_SET_SCREEN_POWER_MODE = 9;
-    public static final int TYPE_ROTATE_DEVICE = 10;

    private int type;
    private String text;
@ -48,7 +47,8 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createInjectTouchEvent(int action, long pointerId, Position position, float pressure, int buttons) {
+    public static ControlMessage createInjectTouchEvent(int action, long pointerId, Position position, float pressure,
+            int buttons) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_INJECT_TOUCH_EVENT;
        msg.action = action;
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@ -76,7 +76,6 @@ public class ControlMessageReader {
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_GET_CLIPBOARD:
-            case ControlMessage.TYPE_ROTATE_DEVICE:
                msg = ControlMessage.createEmpty(type);
                break;
            default:
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@ -13,8 +13,6 @@ import java.io.IOException;

 public class Controller {

-    private static final int DEVICE_ID_VIRTUAL = -1;
-
    private final Device device;
    private final DesktopConnection connection;
    private final DeviceMessageSender sender;
@ -23,8 +21,10 @@ public class Controller {

    private long lastTouchDown;
    private final PointersState pointersState = new PointersState();
-    private final MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
-    private final MotionEvent.PointerCoords[] pointerCoords = new MotionEvent.PointerCoords[PointersState.MAX_POINTERS];
+    private final MotionEvent.PointerProperties[] pointerProperties =
+            new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
+    private final MotionEvent.PointerCoords[] pointerCoords =
+            new MotionEvent.PointerCoords[PointersState.MAX_POINTERS];

    public Controller(Device device, DesktopConnection connection) {
        this.device = device;
@ -106,9 +106,6 @@ public class Controller {
            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
                device.setScreenPowerMode(msg.getAction());
                break;
-            case ControlMessage.TYPE_ROTATE_DEVICE:
-                device.rotateDevice();
-                break;
            default:
                // do nothing
        }
@ -179,9 +176,8 @@ public class Controller {
            }
        }

-        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
-                        InputDevice.SOURCE_TOUCHSCREEN, 0);
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties,
+                pointerCoords, 0, buttons, 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
        return injectEvent(event);
    }

@ -202,16 +198,15 @@ public class Controller {
        coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
        coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);

-        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, 0, 1f, 1f, DEVICE_ID_VIRTUAL, 0,
-                        InputDevice.SOURCE_MOUSE, 0);
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties,
+                pointerCoords, 0, 0, 1f, 1f, 0, 0, InputDevice.SOURCE_MOUSE, 0);
        return injectEvent(event);
    }

    private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) {
        long now = SystemClock.uptimeMillis();
-        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
-                InputDevice.SOURCE_KEYBOARD);
+        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD,
+                0, 0, InputDevice.SOURCE_KEYBOARD);
        return injectEvent(event);
    }

--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@ -2,7 +2,6 @@ package com.genymobile.scrcpy;

 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
-import com.genymobile.scrcpy.wrappers.WindowManager;

 import android.graphics.Rect;
 import android.os.Build;
@ -171,27 +170,6 @@ public final class Device {
        Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
    }

-    /**
-     * Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
-     */
-    public void rotateDevice() {
-        WindowManager wm = serviceManager.getWindowManager();
-
-        boolean accelerometerRotation = !wm.isRotationFrozen();
-
-        int currentRotation = wm.getRotation();
-        int newRotation = (currentRotation & 1) ^ 1; // 0->1, 1->0, 2->1, 3->0
-        String newRotationString = newRotation == 0 ? "portrait" : "landscape";
-
-        Ln.i("Device rotation requested: " + newRotationString);
-        wm.freezeRotation(newRotation);
-
-        // restore auto-rotate if necessary
-        if (accelerometerRotation) {
-            wm.thawRotation();
-        }
-    }
-
    static Rect flipRect(Rect crop) {
        return new Rect(crop.top, crop.left, crop.bottom, crop.right);
    }
--- a/server/src/main/java/com/genymobile/scrcpy/Ln.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Ln.java
@ -12,7 +12,10 @@ public final class Ln {
    private static final String PREFIX = "[server] ";

    enum Level {
-        DEBUG, INFO, WARN, ERROR
+        DEBUG,
+        INFO,
+        WARN,
+        ERROR;
    }

    private static final Level THRESHOLD = BuildConfig.DEBUG ? Level.DEBUG : Level.INFO;
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@ -5,7 +5,6 @@ import android.graphics.Rect;
 public class Options {
    private int maxSize;
    private int bitRate;
-    private int maxFps;
    private boolean tunnelForward;
    private Rect crop;
    private boolean sendFrameMeta; // send PTS so that the client may record properly
@ -27,14 +26,6 @@ public class Options {
        this.bitRate = bitRate;
    }

-    public int getMaxFps() {
-        return maxFps;
-    }
-
-    public void setMaxFps(int maxFps) {
-        this.maxFps = maxFps;
-    }
-
    public boolean isTunnelForward() {
        return tunnelForward;
    }
--- a/server/src/main/java/com/genymobile/scrcpy/Point.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Point.java
@ -28,7 +28,8 @@ public class Point {
            return false;
        }
        Point point = (Point) o;
-        return x == point.x && y == point.y;
+        return x == point.x
+                && y == point.y;
    }

    @Override
@ -38,6 +39,9 @@ public class Point {

    @Override
    public String toString() {
-        return "Point{" + "x=" + x + ", y=" + y + '}';
+        return "Point{"
+                + "x=" + x
+                + ", y=" + y
+                + '}';
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Position.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Position.java
@ -32,7 +32,8 @@ public class Position {
            return false;
        }
        Position position = (Position) o;
-        return Objects.equals(point, position.point) && Objects.equals(screenSize, position.screenSize);
+        return Objects.equals(point, position.point)
+                && Objects.equals(screenSize, position.screenSize);
    }

    @Override
@ -42,7 +43,10 @@ public class Position {

    @Override
    public String toString() {
-        return "Position{" + "point=" + point + ", screenSize=" + screenSize + '}';
+        return "Position{"
+                + "point=" + point
+                + ", screenSize=" + screenSize
+                + '}';
    }

 }
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@ -6,7 +6,6 @@ import android.graphics.Rect;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
-import android.os.Build;
 import android.os.IBinder;
 import android.view.Surface;

@ -17,30 +16,32 @@ import java.util.concurrent.atomic.AtomicBoolean;

 public class ScreenEncoder implements Device.RotationListener {

+    private static final int DEFAULT_FRAME_RATE = 60; // fps
    private static final int DEFAULT_I_FRAME_INTERVAL = 10; // seconds
-    private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100ms
-    private static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";

+    private static final int REPEAT_FRAME_DELAY = 6; // repeat after 6 frames
+
+    private static final int MICROSECONDS_IN_ONE_SECOND = 1_000_000;
    private static final int NO_PTS = -1;

    private final AtomicBoolean rotationChanged = new AtomicBoolean();
    private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);

    private int bitRate;
-    private int maxFps;
+    private int frameRate;
    private int iFrameInterval;
    private boolean sendFrameMeta;
    private long ptsOrigin;

-    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps, int iFrameInterval) {
+    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int frameRate, int iFrameInterval) {
        this.sendFrameMeta = sendFrameMeta;
        this.bitRate = bitRate;
-        this.maxFps = maxFps;
+        this.frameRate = frameRate;
        this.iFrameInterval = iFrameInterval;
    }

-    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps) {
-        this(sendFrameMeta, bitRate, maxFps, DEFAULT_I_FRAME_INTERVAL);
+    public ScreenEncoder(boolean sendFrameMeta, int bitRate) {
+        this(sendFrameMeta, bitRate, DEFAULT_FRAME_RATE, DEFAULT_I_FRAME_INTERVAL);
    }

    @Override
@ -53,10 +54,7 @@ public class ScreenEncoder implements Device.RotationListener {
    }

    public void streamScreen(Device device, FileDescriptor fd) throws IOException {
-        Workarounds.prepareMainLooper();
-        Workarounds.fillAppInfo();
-
-        MediaFormat format = createFormat(bitRate, maxFps, iFrameInterval);
+        MediaFormat format = createFormat(bitRate, frameRate, iFrameInterval);
        device.setRotationListener(this);
        boolean alive;
        try {
@ -139,23 +137,15 @@ public class ScreenEncoder implements Device.RotationListener {
        return MediaCodec.createEncoderByType("video/avc");
    }

-    @SuppressWarnings("checkstyle:MagicNumber")
-    private static MediaFormat createFormat(int bitRate, int maxFps, int iFrameInterval) {
+    private static MediaFormat createFormat(int bitRate, int frameRate, int iFrameInterval) throws IOException {
        MediaFormat format = new MediaFormat();
        format.setString(MediaFormat.KEY_MIME, "video/avc");
        format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
-        // must be present to configure the encoder, but does not impact the actual frame rate, which is variable
-        format.setInteger(MediaFormat.KEY_FRAME_RATE, 60);
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, iFrameInterval);
        // display the very first frame, and recover from bad quality when no new frames
-        format.setLong(MediaFormat.KEY_REPEAT_PREVIOUS_FRAME_AFTER, REPEAT_FRAME_DELAY_US); // µs
-        if (maxFps > 0) {
-            // The key existed privately before Android 10:
-            // <https://android.googlesource.com/platform/frameworks/base/+/625f0aad9f7a259b6881006ad8710adce57d1384%5E%21/>
-            // <https://github.com/Genymobile/scrcpy/issues/488#issuecomment-567321437>
-            format.setFloat(KEY_MAX_FPS_TO_ENCODER, maxFps);
-        }
+        format.setLong(MediaFormat.KEY_REPEAT_PREVIOUS_FRAME_AFTER, MICROSECONDS_IN_ONE_SECOND * REPEAT_FRAME_DELAY / frameRate); // µs
        return format;
    }

--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@ -1,15 +1,13 @@
 package com.genymobile.scrcpy;

 import android.graphics.Rect;
-import android.media.MediaCodec;
-import android.os.Build;

 import java.io.File;
 import java.io.IOException;

 public final class Server {

-    private static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
+    private static final String SERVER_PATH = "/data/local/tmp/scrcpy-server";

    private Server() {
        // not instantiable
@ -19,7 +17,7 @@ public final class Server {
        final Device device = new Device(options);
        boolean tunnelForward = options.isTunnelForward();
        try (DesktopConnection connection = DesktopConnection.open(device, tunnelForward)) {
-            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps());
+            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate());

            if (options.getControl()) {
                Controller controller = new Controller(device, connection);
@ -69,42 +67,29 @@ public final class Server {

    @SuppressWarnings("checkstyle:MagicNumber")
    private static Options createOptions(String... args) {
-        if (args.length < 1) {
-            throw new IllegalArgumentException("Missing client version");
-        }
-
-        String clientVersion = args[0];
-        if (!clientVersion.equals(BuildConfig.VERSION_NAME)) {
-            throw new IllegalArgumentException(
-                    "The server version (" + clientVersion + ") does not match the client " + "(" + BuildConfig.VERSION_NAME + ")");
-        }
-
-        if (args.length != 8) {
-            throw new IllegalArgumentException("Expecting 8 parameters");
+        if (args.length != 6) {
+            throw new IllegalArgumentException("Expecting 6 parameters");
        }

        Options options = new Options();

-        int maxSize = Integer.parseInt(args[1]) & ~7; // multiple of 8
+        int maxSize = Integer.parseInt(args[0]) & ~7; // multiple of 8
        options.setMaxSize(maxSize);

-        int bitRate = Integer.parseInt(args[2]);
+        int bitRate = Integer.parseInt(args[1]);
        options.setBitRate(bitRate);

-        int maxFps = Integer.parseInt(args[3]);
-        options.setMaxFps(maxFps);
-
        // use "adb forward" instead of "adb tunnel"? (so the server must listen)
-        boolean tunnelForward = Boolean.parseBoolean(args[4]);
+        boolean tunnelForward = Boolean.parseBoolean(args[2]);
        options.setTunnelForward(tunnelForward);

-        Rect crop = parseCrop(args[5]);
+        Rect crop = parseCrop(args[3]);
        options.setCrop(crop);

-        boolean sendFrameMeta = Boolean.parseBoolean(args[6]);
+        boolean sendFrameMeta = Boolean.parseBoolean(args[4]);
        options.setSendFrameMeta(sendFrameMeta);

-        boolean control = Boolean.parseBoolean(args[7]);
+        boolean control = Boolean.parseBoolean(args[5]);
        options.setControl(control);

        return options;
@ -135,26 +120,11 @@ public final class Server {
        }
    }

-    @SuppressWarnings("checkstyle:MagicNumber")
-    private static void suggestFix(Throwable e) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (e instanceof MediaCodec.CodecException) {
-                MediaCodec.CodecException mce = (MediaCodec.CodecException) e;
-                if (mce.getErrorCode() == 0xfffffc0e) {
-                    Ln.e("The hardware encoder is not able to encode at the given definition.");
-                    Ln.e("Try with a lower definition:");
-                    Ln.e("    scrcpy -m 1024");
-                }
-            }
-        }
-    }
-
    public static void main(String... args) throws Exception {
        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
            @Override
            public void uncaughtException(Thread t, Throwable e) {
                Ln.e("Exception on thread " + t, e);
-                suggestFix(e);
            }
        });

--- a/server/src/main/java/com/genymobile/scrcpy/Size.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Size.java
@ -38,7 +38,8 @@ public final class Size {
            return false;
        }
        Size size = (Size) o;
-        return width == size.width && height == size.height;
+        return width == size.width
+                && height == size.height;
    }

    @Override
@ -48,6 +49,9 @@ public final class Size {

    @Override
    public String toString() {
-        return "Size{" + "width=" + width + ", height=" + height + '}';
+        return "Size{"
+                + "width=" + width
+                + ", height=" + height
+                + '}';
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
@ -1,79 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.annotation.SuppressLint;
-import android.app.Application;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.Looper;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-public final class Workarounds {
-    private Workarounds() {
-        // not instantiable
-    }
-
-    public static void prepareMainLooper() {
-        // Some devices internally create a Handler when creating an input Surface, causing an exception:
-        //   "Can't create handler inside thread that has not called Looper.prepare()"
-        // <https://github.com/Genymobile/scrcpy/issues/240>
-        //
-        // Use Looper.prepareMainLooper() instead of Looper.prepare() to avoid a NullPointerException:
-        //   "Attempt to read from field 'android.os.MessageQueue android.os.Looper.mQueue'
-        //    on a null object reference"
-        // <https://github.com/Genymobile/scrcpy/issues/921>
-        Looper.prepareMainLooper();
-    }
-
-    @SuppressLint("PrivateApi")
-    public static void fillAppInfo() {
-        try {
-            // ActivityThread activityThread = new ActivityThread();
-            Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
-            Constructor<?> activityThreadConstructor = activityThreadClass.getDeclaredConstructor();
-            activityThreadConstructor.setAccessible(true);
-            Object activityThread = activityThreadConstructor.newInstance();
-
-            // ActivityThread.sCurrentActivityThread = activityThread;
-            Field sCurrentActivityThreadField = activityThreadClass.getDeclaredField("sCurrentActivityThread");
-            sCurrentActivityThreadField.setAccessible(true);
-            sCurrentActivityThreadField.set(null, activityThread);
-
-            // ActivityThread.AppBindData appBindData = new ActivityThread.AppBindData();
-            Class<?> appBindDataClass = Class.forName("android.app.ActivityThread$AppBindData");
-            Constructor<?> appBindDataConstructor = appBindDataClass.getDeclaredConstructor();
-            appBindDataConstructor.setAccessible(true);
-            Object appBindData = appBindDataConstructor.newInstance();
-
-            ApplicationInfo applicationInfo = new ApplicationInfo();
-            applicationInfo.packageName = "com.genymobile.scrcpy";
-
-            // appBindData.appInfo = applicationInfo;
-            Field appInfoField = appBindDataClass.getDeclaredField("appInfo");
-            appInfoField.setAccessible(true);
-            appInfoField.set(appBindData, applicationInfo);
-
-            // activityThread.mBoundApplication = appBindData;
-            Field mBoundApplicationField = activityThreadClass.getDeclaredField("mBoundApplication");
-            mBoundApplicationField.setAccessible(true);
-            mBoundApplicationField.set(activityThread, appBindData);
-
-            // Context ctx = activityThread.getSystemContext();
-            Method getSystemContextMethod = activityThreadClass.getDeclaredMethod("getSystemContext");
-            Context ctx = (Context) getSystemContextMethod.invoke(activityThread);
-
-            Application app = Instrumentation.newApplication(Application.class, ctx);
-
-            // activityThread.mInitialApplication = app;
-            Field mInitialApplicationField = activityThreadClass.getDeclaredField("mInitialApplication");
-            mInitialApplicationField.setAccessible(true);
-            mInitialApplicationField.set(activityThread, app);
-        } catch (Throwable throwable) {
-            // this is a workaround, so failing is not an error
-            Ln.d("Could not fill app info: " + throwable.getMessage());
-        }
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@ -22,37 +22,47 @@ public class ClipboardManager {
        this.manager = manager;
    }

-    private Method getGetPrimaryClipMethod() throws NoSuchMethodException {
+    private Method getGetPrimaryClipMethod() {
        if (getPrimaryClipMethod == null) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
-            } else {
-                getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
+            try {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);
+                } else {
+                    getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);
+                }
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
            }
        }
        return getPrimaryClipMethod;
    }

-    private Method getSetPrimaryClipMethod() throws NoSuchMethodException {
+    private Method getSetPrimaryClipMethod() {
        if (setPrimaryClipMethod == null) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
-            } else {
-                setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);
+            try {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);
+                } else {
+                    setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class,
+                            String.class, int.class);
+                }
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
            }
        }
        return setPrimaryClipMethod;
    }

-    private static ClipData getPrimaryClip(Method method, IInterface manager) throws InvocationTargetException, IllegalAccessException {
+    private static ClipData getPrimaryClip(Method method, IInterface manager) throws InvocationTargetException,
+            IllegalAccessException {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
            return (ClipData) method.invoke(manager, PACKAGE_NAME);
        }
        return (ClipData) method.invoke(manager, PACKAGE_NAME, USER_ID);
    }

-    private static void setPrimaryClip(Method method, IInterface manager, ClipData clipData)
-            throws InvocationTargetException, IllegalAccessException {
+    private static void setPrimaryClip(Method method, IInterface manager, ClipData clipData) throws InvocationTargetException,
+            IllegalAccessException {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
            method.invoke(manager, clipData, PACKAGE_NAME);
        } else {
@ -61,26 +71,32 @@ public class ClipboardManager {
    }

    public CharSequence getText() {
+        Method method = getGetPrimaryClipMethod();
+        if (method == null) {
+            return null;
+        }
        try {
-            Method method = getGetPrimaryClipMethod();
            ClipData clipData = getPrimaryClip(method, manager);
            if (clipData == null || clipData.getItemCount() == 0) {
                return null;
            }
            return clipData.getItemAt(0).getText();
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
            return null;
        }
    }

    public void setText(CharSequence text) {
+        Method method = getSetPrimaryClipMethod();
+        if (method == null) {
+            return;
+        }
+        ClipData clipData = ClipData.newPlainText(null, text);
        try {
-            Method method = getSetPrimaryClipMethod();
-            ClipData clipData = ClipData.newPlainText(null, text);
            setPrimaryClip(method, manager, clipData);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java
@ -21,19 +21,26 @@ public final class InputManager {
        this.manager = manager;
    }

-    private Method getInjectInputEventMethod() throws NoSuchMethodException {
+    private Method getInjectInputEventMethod() {
        if (injectInputEventMethod == null) {
-            injectInputEventMethod = manager.getClass().getMethod("injectInputEvent", InputEvent.class, int.class);
+            try {
+                injectInputEventMethod = manager.getClass().getMethod("injectInputEvent", InputEvent.class, int.class);
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
        return injectInputEventMethod;
    }

    public boolean injectInputEvent(InputEvent inputEvent, int mode) {
+        Method method = getInjectInputEventMethod();
+        if (method == null) {
+            return false;
+        }
        try {
-            Method method = getInjectInputEventMethod();
-            return (boolean) method.invoke(manager, inputEvent, mode);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+            return (Boolean) method.invoke(manager, inputEvent, mode);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
            return false;
        }
    }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java
@ -17,21 +17,28 @@ public final class PowerManager {
        this.manager = manager;
    }

-    private Method getIsScreenOnMethod() throws NoSuchMethodException {
+    private Method getIsScreenOnMethod() {
        if (isScreenOnMethod == null) {
-            @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
-                    String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
-            isScreenOnMethod = manager.getClass().getMethod(methodName);
+            try {
+                @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
+                        String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
+                isScreenOnMethod = manager.getClass().getMethod(methodName);
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
        return isScreenOnMethod;
    }

    public boolean isScreenOn() {
+        Method method = getIsScreenOnMethod();
+        if (method == null) {
+            return false;
+        }
        try {
-            Method method = getIsScreenOnMethod();
-            return (boolean) method.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+            return (Boolean) method.invoke(manager);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
            return false;
        }
    }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
@ -17,35 +17,49 @@ public class StatusBarManager {
        this.manager = manager;
    }

-    private Method getExpandNotificationsPanelMethod() throws NoSuchMethodException {
+    private Method getExpandNotificationsPanelMethod() {
        if (expandNotificationsPanelMethod == null) {
-            expandNotificationsPanelMethod = manager.getClass().getMethod("expandNotificationsPanel");
+            try {
+                expandNotificationsPanelMethod = manager.getClass().getMethod("expandNotificationsPanel");
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
        return expandNotificationsPanelMethod;
    }

-    private Method getCollapsePanelsMethod() throws NoSuchMethodException {
+    private Method getCollapsePanelsMethod() {
        if (collapsePanelsMethod == null) {
-            collapsePanelsMethod = manager.getClass().getMethod("collapsePanels");
+            try {
+                collapsePanelsMethod = manager.getClass().getMethod("collapsePanels");
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
        return collapsePanelsMethod;
    }

    public void expandNotificationsPanel() {
+        Method method = getExpandNotificationsPanelMethod();
+        if (method == null) {
+            return;
+        }
        try {
-            Method method = getExpandNotificationsPanelMethod();
            method.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }

    public void collapsePanels() {
+        Method method = getCollapsePanelsMethod();
+        if (method == null) {
+            return;
+        }
        try {
-            Method method = getCollapsePanelsMethod();
            method.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java
@ -84,23 +84,29 @@ public final class SurfaceControl {
        }
    }

-    private static Method getGetBuiltInDisplayMethod() throws NoSuchMethodException {
+    private static Method getGetBuiltInDisplayMethod() {
        if (getBuiltInDisplayMethod == null) {
-            // the method signature has changed in Android Q
-            // <https://github.com/Genymobile/scrcpy/issues/586>
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-                getBuiltInDisplayMethod = CLASS.getMethod("getBuiltInDisplay", int.class);
-            } else {
-                getBuiltInDisplayMethod = CLASS.getMethod("getInternalDisplayToken");
+            try {
+                // the method signature has changed in Android Q
+                // <https://github.com/Genymobile/scrcpy/issues/586>
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+                    getBuiltInDisplayMethod = CLASS.getMethod("getBuiltInDisplay", int.class);
+                } else {
+                    getBuiltInDisplayMethod = CLASS.getMethod("getInternalDisplayToken");
+                }
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
            }
        }
        return getBuiltInDisplayMethod;
    }

    public static IBinder getBuiltInDisplay() {
-
+        Method method = getGetBuiltInDisplayMethod();
+        if (method == null) {
+            return null;
+        }
        try {
-            Method method = getGetBuiltInDisplayMethod();
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
                // call getBuiltInDisplay(0)
                return (IBinder) method.invoke(null, 0);
@ -108,25 +114,32 @@ public final class SurfaceControl {

            // call getInternalDisplayToken()
            return (IBinder) method.invoke(null);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
            return null;
        }
    }

-    private static Method getSetDisplayPowerModeMethod() throws NoSuchMethodException {
+    private static Method getSetDisplayPowerModeMethod() {
        if (setDisplayPowerModeMethod == null) {
-            setDisplayPowerModeMethod = CLASS.getMethod("setDisplayPowerMode", IBinder.class, int.class);
+            try {
+                setDisplayPowerModeMethod = CLASS.getMethod("setDisplayPowerMode", IBinder.class, int.class);
+            } catch (NoSuchMethodException e) {
+                Ln.e("Could not find method", e);
+            }
        }
        return setDisplayPowerModeMethod;
    }

    public static void setDisplayPowerMode(IBinder displayToken, int mode) {
+        Method method = getSetDisplayPowerModeMethod();
+        if (method == null) {
+            return;
+        }
        try {
-            Method method = getSetDisplayPowerModeMethod();
            method.invoke(null, displayToken, mode);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+        } catch (InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Could not invoke " + method.getName(), e);
        }
    }

--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@ -1,95 +1,27 @@
 package com.genymobile.scrcpy.wrappers;

-import com.genymobile.scrcpy.Ln;
-
 import android.os.IInterface;
 import android.view.IRotationWatcher;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 public final class WindowManager {
    private final IInterface manager;
-    private Method getRotationMethod;
-    private Method freezeRotationMethod;
-    private Method isRotationFrozenMethod;
-    private Method thawRotationMethod;

    public WindowManager(IInterface manager) {
        this.manager = manager;
    }

-    private Method getGetRotationMethod() throws NoSuchMethodException {
-        if (getRotationMethod == null) {
-            Class<?> cls = manager.getClass();
-            try {
-                // method changed since this commit:
-                // https://android.googlesource.com/platform/frameworks/base/+/8ee7285128c3843401d4c4d0412cd66e86ba49e3%5E%21/#F2
-                getRotationMethod = cls.getMethod("getDefaultDisplayRotation");
-            } catch (NoSuchMethodException e) {
-                // old version
-                getRotationMethod = cls.getMethod("getRotation");
-            }
-        }
-        return getRotationMethod;
-    }
-
-    private Method getFreezeRotationMethod() throws NoSuchMethodException {
-        if (freezeRotationMethod == null) {
-            freezeRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
-        }
-        return freezeRotationMethod;
-    }
-
-    private Method getIsRotationFrozenMethod() throws NoSuchMethodException {
-        if (isRotationFrozenMethod == null) {
-            isRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
-        }
-        return isRotationFrozenMethod;
-    }
-
-    private Method getThawRotationMethod() throws NoSuchMethodException {
-        if (thawRotationMethod == null) {
-            thawRotationMethod = manager.getClass().getMethod("thawRotation");
-        }
-        return thawRotationMethod;
-    }
-
    public int getRotation() {
        try {
-            Method method = getGetRotationMethod();
-            return (int) method.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
-            return 0;
-        }
-    }
-
-    public void freezeRotation(int rotation) {
-        try {
-            Method method = getFreezeRotationMethod();
-            method.invoke(manager, rotation);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
-        }
-    }
-
-    public boolean isRotationFrozen() {
-        try {
-            Method method = getIsRotationFrozenMethod();
-            return (boolean) method.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
-            return false;
-        }
-    }
-
-    public void thawRotation() {
-        try {
-            Method method = getThawRotationMethod();
-            method.invoke(manager);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
+            Class<?> cls = manager.getClass();
+            try {
+                return (Integer) cls.getMethod("getRotation").invoke(manager);
+            } catch (NoSuchMethodException e) {
+                // method changed since this commit:
+                // https://android.googlesource.com/platform/frameworks/base/+/8ee7285128c3843401d4c4d0412cd66e86ba49e3%5E%21/#F2
+                return (Integer) cls.getMethod("getDefaultDisplayRotation").invoke(manager);
+            }
+        } catch (Exception e) {
+            throw new AssertionError(e);
        }
    }

@ -97,12 +29,11 @@ public final class WindowManager {
        try {
            Class<?> cls = manager.getClass();
            try {
+                cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);
+            } catch (NoSuchMethodException e) {
                // display parameter added since this commit:
                // https://android.googlesource.com/platform/frameworks/base/+/35fa3c26adcb5f6577849fd0df5228b1f67cf2c6%5E%21/#F1
                cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, 0);
-            } catch (NoSuchMethodException e) {
-                // old version
-                cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);
            }
        } catch (Exception e) {
            throw new AssertionError(e);
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@ -240,22 +240,6 @@ public class ControlMessageReaderTest {
        Assert.assertEquals(Device.POWER_MODE_NORMAL, event.getAction());
    }

-    @Test
-    public void testParseRotateDevice() throws IOException {
-        ControlMessageReader reader = new ControlMessageReader();
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_ROTATE_DEVICE);
-
-        byte[] packet = bos.toByteArray();
-
-        reader.readFrom(new ByteArrayInputStream(packet));
-        ControlMessage event = reader.next();
-
-        Assert.assertEquals(ControlMessage.TYPE_ROTATE_DEVICE, event.getType());
-    }
-
    @Test
    public void testMultiEvents() throws IOException {
        ControlMessageReader reader = new ControlMessageReader();
Author	SHA1	Message	Date
Diego Fernando Díaz A	ad6b8847d4	Add option to disable window decoration Add --window-borderless parameter. Signed-off-by: Romain Vimont <rom@rom1v.com>	2019-11-03 18:18:41 +01:00
Romain Vimont	fba89e6f73	Add option to specify the initial window size Add --window-width and --window-height parameters. If only one is provided, the other is computed so that the aspect ratio is preserved.	2019-11-03 18:18:41 +01:00
Romain Vimont	4bf2b80c75	Update manpage for --window-{x,y} options	2019-11-03 18:18:41 +01:00
Diego Fernando Díaz A	f983ec67fa	Add option to specify the initial window position Add --window-x and --window-y parameters. Signed-off-by: Romain Vimont <rom@rom1v.com>	2019-11-03 18:18:39 +01:00