review round

Author: CMGS

README.md

@@ -25,7 +25,8 @@ docker run --rm -v "$PWD:/src" scrcpy-rfb-builder
 # -> dist/scrcpy-rfb-linux-<arch>
 ```
 
-Local build (needs cmake, git, libjpeg-turbo, zlib and FFmpeg dev packages):
+Local build (Linux only; needs cmake, git, libjpeg-turbo, zlib and FFmpeg dev
+packages):
 
 ```sh
 make        # cmake configure + build into build/
@@ -46,7 +47,10 @@ docker run --rm --network host ghcr.io/cocoonstack/scrcpy-rfb:master \
 
 ## Running
 
-Start a scrcpy 4.x server with H.264 video and a TCP listener, then:
+Start a scrcpy 4.x server with H.264 video and a TCP listener. The bridge
+expects `video_codec=h264 audio=false send_device_meta=false
+send_dummy_byte=false`: any extra preamble bytes on the video socket break
+its handshake. Then:
 
 ```sh
 scrcpy-rfb [--scrcpy-host 127.0.0.1] [--scrcpy-port 27183] \

patches/apply.cmake

@@ -1,19 +1,25 @@
 # Applied by FetchContent's patch step with the libvncserver source tree as
 # the working directory. Idempotent: a patch that already applies in reverse
 # is skipped so reconfigures don't fail.
+# GIT_CEILING_DIRECTORIES stops git apply from discovering an enclosing git
+# repository (a build/ dir inside this checkout): with one found, git resolves
+# patch paths against that repo instead of the CWD and silently applies nothing.
+get_filename_component(ceiling ".." ABSOLUTE)
 file(GLOB patches "${CMAKE_CURRENT_LIST_DIR}/*.patch")
 list(SORT patches)
 foreach(patch IN LISTS patches)
   execute_process(
-    COMMAND git apply --reverse --check "${patch}"
+    COMMAND ${CMAKE_COMMAND} -E env "GIT_CEILING_DIRECTORIES=${ceiling}"
+            git apply --reverse --check "${patch}"
     RESULT_VARIABLE already_applied
     OUTPUT_QUIET ERROR_QUIET
   )
   if(already_applied EQUAL 0)
     continue()
   endif()
   execute_process(
-    COMMAND git apply --whitespace=nowarn "${patch}"
+    COMMAND ${CMAKE_COMMAND} -E env "GIT_CEILING_DIRECTORIES=${ceiling}"
+            git apply --whitespace=nowarn "${patch}"
     RESULT_VARIABLE result
   )
   if(NOT result EQUAL 0)

src/scrcpy-rfb.c

@@ -881,17 +881,18 @@ static int send_touch(uint8_t action, int x, int y, int pressed) {
     return send_control(message, sizeof(message));
 }
 
-/* hscroll/vscroll are one wheel click each, encoded as scrcpy i16
- * fixed-point where 32767 is 1.0. Positive vscroll scrolls up. */
+/* hscroll/vscroll are one wheel click each. scrcpy's i16 fixed-point spans
+ * [-16, 16] clicks full-scale (the server multiplies the [-1, 1] decode by
+ * 16), so one click is 32768 / 16 = 2048. Positive vscroll scrolls up. */
 static int send_scroll(int x, int y, int hscroll, int vscroll) {
     uint8_t message[21] = {0};
     message[0] = SCRCPY_MSG_INJECT_SCROLL;
     AV_WB32(message + 1, (uint32_t) x);
     AV_WB32(message + 5, (uint32_t) y);
     AV_WB16(message + 9, (uint16_t) video_width);
     AV_WB16(message + 11, (uint16_t) video_height);
-    AV_WB16(message + 13, (uint16_t) (int16_t) (hscroll * 32767));
-    AV_WB16(message + 15, (uint16_t) (int16_t) (vscroll * 32767));
+    AV_WB16(message + 13, (uint16_t) (int16_t) (hscroll * 2048));
+    AV_WB16(message + 15, (uint16_t) (int16_t) (vscroll * 2048));
     AV_WB32(message + 17, 0);
     return send_control(message, sizeof(message));
 }