Use precise scrolling values

Since SDL 2.0.18, the amount scrolled horizontally or vertically is
exposed as a float (between 0 and 1). Forward a precise value to the
Android device when possible.

Refs <https://wiki.libsdl.org/SDL_MouseWheelEvent>
Fixes #3363 <https://github.com/Genymobile/scrcpy/issues/3363>
PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>

Signed-off-by: Romain Vimont <rom@rom1v.com>

app/meson.build

@@ -245,8 +245,8 @@ if get_option('buildtype') == 'debug'
             'src/util/str.c',
             'src/util/strbuf.c',
         ]],
-        ['test_binary', [
+        ['test_buffer_util', [
-            'tests/test_binary.c',
+            'tests/test_buffer_util.c',
         ]],
         ['test_cbuf', [
             'tests/test_cbuf.c',

app/src/clock.c

@@ -98,7 +98,7 @@ sc_clock_update(struct sc_clock *clock, sc_tick system, sc_tick stream) {
         sc_clock_estimate(clock, &clock->slope, &clock->offset);
 
 #ifndef SC_CLOCK_NDEBUG
-        LOGD("Clock estimation: %f * pts + %" PRItick,
+        LOGD("Clock estimation: %g * pts + %" PRItick,
              clock->slope, clock->offset);
 #endif
     }

app/src/control_msg.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util/binary.h"
+#include "util/buffer_util.h"
 #include "util/log.h"
 #include "util/str.h"
 
@@ -78,6 +78,16 @@ write_string(const char *utf8, size_t max_len, unsigned char *buf) {
     return 4 + len;
 }
 
+static uint16_t
+to_fixed_point_16(float f) {
+    assert(f >= 0.0f && f <= 1.0f);
+    uint32_t u = f * 0x1p16f; // 2^16
+    if (u >= 0xffff) {
+        u = 0xffff;
+    }
+    return (uint16_t) u;
+}
+
 size_t
 sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
     buf[0] = msg->type;
@@ -99,18 +109,19 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, unsigned char *buf) {
             sc_write64be(&buf[2], msg->inject_touch_event.pointer_id);
             write_position(&buf[10], &msg->inject_touch_event.position);
             uint16_t pressure =
-                sc_float_to_u16fp(msg->inject_touch_event.pressure);
+                to_fixed_point_16(msg->inject_touch_event.pressure);
             sc_write16be(&buf[22], pressure);
             sc_write32be(&buf[24], msg->inject_touch_event.buttons);
             return 28;
         case SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:
             write_position(&buf[1], &msg->inject_scroll_event.position);
-            int16_t hscroll =
+            // map [-1, 1] to [0, 1], then to uint16
-                sc_float_to_i16fp(msg->inject_scroll_event.hscroll);
+            uint16_t hscroll =
-            int16_t vscroll =
+                to_fixed_point_16((msg->inject_scroll_event.hscroll + 1) / 2);
-                sc_float_to_i16fp(msg->inject_scroll_event.vscroll);
+            uint16_t vscroll =
-            sc_write16be(&buf[13], (uint16_t) hscroll);
+                to_fixed_point_16((msg->inject_scroll_event.vscroll + 1) / 2);
-            sc_write16be(&buf[15], (uint16_t) vscroll);
+            sc_write16be(&buf[13], hscroll);
+            sc_write16be(&buf[15], vscroll);
             sc_write32be(&buf[17], msg->inject_scroll_event.buttons);
             return 21;
         case SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
@@ -162,7 +173,7 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
             if (id == POINTER_ID_MOUSE || id == POINTER_ID_VIRTUAL_FINGER) {
                 // string pointer id
                 LOG_CMSG("touch [id=%s] %-4s position=%" PRIi32 ",%" PRIi32
-                             " pressure=%f buttons=%06lx",
+                             " pressure=%g buttons=%06lx",
                          id == POINTER_ID_MOUSE ? "mouse" : "vfinger",
                          MOTIONEVENT_ACTION_LABEL(action),
                          msg->inject_touch_event.position.point.x,
@@ -172,7 +183,7 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
             } else {
                 // numeric pointer id
                 LOG_CMSG("touch [id=%" PRIu64_ "] %-4s position=%" PRIi32 ",%"
-                             PRIi32 " pressure=%f buttons=%06lx",
+                             PRIi32 " pressure=%g buttons=%06lx",
                          id,
                          MOTIONEVENT_ACTION_LABEL(action),
                          msg->inject_touch_event.position.point.x,
@@ -183,8 +194,8 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
             break;
         }
         case SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT:
-            LOG_CMSG("scroll position=%" PRIi32 ",%" PRIi32 " hscroll=%f"
+            LOG_CMSG("scroll position=%" PRIi32 ",%" PRIi32 " hscroll=%g"
-                         " vscroll=%f buttons=%06lx",
+                         " vscroll=%g buttons=%06lx",
                      msg->inject_scroll_event.position.point.x,
                      msg->inject_scroll_event.position.point.y,
                      msg->inject_scroll_event.hscroll,

app/src/demuxer.c

@@ -7,7 +7,7 @@
 #include "decoder.h"
 #include "events.h"
 #include "recorder.h"
-#include "util/binary.h"
+#include "util/buffer_util.h"
 #include "util/log.h"
 
 #define SC_PACKET_HEADER_SIZE 12

app/src/device_msg.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util/binary.h"
+#include "util/buffer_util.h"
 #include "util/log.h"
 
 ssize_t

app/src/util/buffer_util.h

@@ -1,9 +1,8 @@
-#ifndef SC_BINARY_H
+#ifndef SC_BUFFER_UTIL_H
-#define SC_BINARY_H
+#define SC_BUFFER_UTIL_H
 
 #include "common.h"
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -44,33 +43,4 @@ sc_read64be(const uint8_t *buf) {
     return ((uint64_t) msb << 32) | lsb;
 }
 
-/**
- * Convert a float between 0 and 1 to an unsigned 16-bit fixed-point value
- */
-static inline uint16_t
-sc_float_to_u16fp(float f) {
-    assert(f >= 0.0f && f <= 1.0f);
-    uint32_t u = f * 0x1p16f; // 2^16
-    if (u >= 0xffff) {
-        assert(u == 0x10000); // for f == 1.0f
-        u = 0xffff;
-    }
-    return (uint16_t) u;
-}
-
-/**
- * Convert a float between -1 and 1 to a signed 16-bit fixed-point value
- */
-static inline int16_t
-sc_float_to_i16fp(float f) {
-    assert(f >= -1.0f && f <= 1.0f);
-    int32_t i = f * 0x1p15f; // 2^15
-    assert(i >= -0x8000);
-    if (i >= 0x7fff) {
-        assert(i == 0x8000); // for f == 1.0f
-        i = 0x7fff;
-    }
-    return (int16_t) i;
-}
-
 #endif

app/src/util/net.c

@@ -3,10 +3,11 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <SDL2/SDL_platform.h>
 
 #include "log.h"
 
-#ifdef _WIN32
+#ifdef __WINDOWS__
 # include <ws2tcpip.h>
   typedef int socklen_t;
   typedef SOCKET sc_raw_socket;
@@ -28,7 +29,7 @@
 
 bool
 net_init(void) {
-#ifdef _WIN32
+#ifdef __WINDOWS__
     WSADATA wsa;
     int res = WSAStartup(MAKEWORD(2, 2), &wsa) < 0;
     if (res < 0) {
@@ -41,14 +42,14 @@ net_init(void) {
 
 void
 net_cleanup(void) {
-#ifdef _WIN32
+#ifdef __WINDOWS__
     WSACleanup();
 #endif
 }
 
 static inline sc_socket
 wrap(sc_raw_socket sock) {
-#ifdef _WIN32
+#ifdef __WINDOWS__
     if (sock == INVALID_SOCKET) {
         return SC_SOCKET_NONE;
     }
@@ -71,7 +72,7 @@ wrap(sc_raw_socket sock) {
 
 static inline sc_raw_socket
 unwrap(sc_socket socket) {
-#ifdef _WIN32
+#ifdef __WINDOWS__
     if (socket == SC_SOCKET_NONE) {
         return INVALID_SOCKET;
     }
@@ -159,8 +160,8 @@ net_connect(sc_socket socket, uint32_t addr, uint16_t port) {
 }
 
 bool
-net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog) {
+net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog) {
-    sc_raw_socket raw_sock = unwrap(server_socket);
+    sc_raw_socket raw_sock = unwrap(socket);
 
     int reuse = 1;
     if (setsockopt(raw_sock, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse,
@@ -247,7 +248,7 @@ net_interrupt(sc_socket socket) {
 
     sc_raw_socket raw_sock = unwrap(socket);
 
-#ifdef _WIN32
+#ifdef __WINDOWS__
     if (!atomic_flag_test_and_set(&socket->closed)) {
         return !closesocket(raw_sock);
     }
@@ -261,7 +262,7 @@ bool
 net_close(sc_socket socket) {
     sc_raw_socket raw_sock = unwrap(socket);
 
-#ifdef _WIN32
+#ifdef __WINDOWS__
     bool ret = true;
     if (!atomic_flag_test_and_set(&socket->closed)) {
         ret = !closesocket(raw_sock);

app/src/util/net.h

@@ -5,8 +5,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <SDL2/SDL_platform.h>
 
-#ifdef _WIN32
+#ifdef __WINDOWS__
 
 # include <winsock2.h>
 # include <stdatomic.h>
@@ -16,7 +17,7 @@
       atomic_flag closed;
   } *sc_socket;
 
-#else // not _WIN32
+#else // not __WINDOWS__
 
 # include <sys/socket.h>
 # define SC_SOCKET_NONE -1
@@ -39,7 +40,7 @@ bool
 net_connect(sc_socket socket, uint32_t addr, uint16_t port);
 
 bool
-net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog);
+net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog);
 
 sc_socket
 net_accept(sc_socket server_socket);

app/src/util/net_intr.c

@@ -15,14 +15,14 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
 }
 
 bool
-net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,
+net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
                 uint16_t port, int backlog) {
-    if (!sc_intr_set_socket(intr, server_socket)) {
+    if (!sc_intr_set_socket(intr, socket)) {
         // Already interrupted
         return false;
     }
 
-    bool ret = net_listen(server_socket, addr, port, backlog);
+    bool ret = net_listen(socket, addr, port, backlog);
 
     sc_intr_set_socket(intr, SC_SOCKET_NONE);
     return ret;

app/src/util/net_intr.h

@@ -11,7 +11,7 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
                  uint16_t port);
 
 bool
-net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,
+net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
                 uint16_t port, int backlog);
 
 sc_socket

app/tests/test_binary.c

@@ -1,114 +0,0 @@
-#include "common.h"
-
-#include <assert.h>
-
-#include "util/binary.h"
-
-static void test_write16be(void) {
-    uint16_t val = 0xABCD;
-    uint8_t buf[2];
-
-    sc_write16be(buf, val);
-
-    assert(buf[0] == 0xAB);
-    assert(buf[1] == 0xCD);
-}
-
-static void test_write32be(void) {
-    uint32_t val = 0xABCD1234;
-    uint8_t buf[4];
-
-    sc_write32be(buf, val);
-
-    assert(buf[0] == 0xAB);
-    assert(buf[1] == 0xCD);
-    assert(buf[2] == 0x12);
-    assert(buf[3] == 0x34);
-}
-
-static void test_write64be(void) {
-    uint64_t val = 0xABCD1234567890EF;
-    uint8_t buf[8];
-
-    sc_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_read16be(void) {
-    uint8_t buf[2] = {0xAB, 0xCD};
-
-    uint16_t val = sc_read16be(buf);
-
-    assert(val == 0xABCD);
-}
-
-static void test_read32be(void) {
-    uint8_t buf[4] = {0xAB, 0xCD, 0x12, 0x34};
-
-    uint32_t val = sc_read32be(buf);
-
-    assert(val == 0xABCD1234);
-}
-
-static void test_read64be(void) {
-    uint8_t buf[8] = {0xAB, 0xCD, 0x12, 0x34,
-                      0x56, 0x78, 0x90, 0xEF};
-
-    uint64_t val = sc_read64be(buf);
-
-    assert(val == 0xABCD1234567890EF);
-}
-
-static void test_float_to_u16fp(void) {
-    assert(sc_float_to_u16fp(0.0f) == 0);
-    assert(sc_float_to_u16fp(0.03125f) == 0x800);
-    assert(sc_float_to_u16fp(0.0625f) == 0x1000);
-    assert(sc_float_to_u16fp(0.125f) == 0x2000);
-    assert(sc_float_to_u16fp(0.25f) == 0x4000);
-    assert(sc_float_to_u16fp(0.5f) == 0x8000);
-    assert(sc_float_to_u16fp(0.75f) == 0xc000);
-    assert(sc_float_to_u16fp(1.0f) == 0xffff);
-}
-
-static void test_float_to_i16fp(void) {
-    assert(sc_float_to_i16fp(0.0f) == 0);
-    assert(sc_float_to_i16fp(0.03125f) == 0x400);
-    assert(sc_float_to_i16fp(0.0625f) == 0x800);
-    assert(sc_float_to_i16fp(0.125f) == 0x1000);
-    assert(sc_float_to_i16fp(0.25f) == 0x2000);
-    assert(sc_float_to_i16fp(0.5f) == 0x4000);
-    assert(sc_float_to_i16fp(0.75f) == 0x6000);
-    assert(sc_float_to_i16fp(1.0f) == 0x7fff);
-
-    assert(sc_float_to_i16fp(-0.03125f) == -0x400);
-    assert(sc_float_to_i16fp(-0.0625f) == -0x800);
-    assert(sc_float_to_i16fp(-0.125f) == -0x1000);
-    assert(sc_float_to_i16fp(-0.25f) == -0x2000);
-    assert(sc_float_to_i16fp(-0.5f) == -0x4000);
-    assert(sc_float_to_i16fp(-0.75f) == -0x6000);
-    assert(sc_float_to_i16fp(-1.0f) == -0x8000);
-}
-
-int main(int argc, char *argv[]) {
-    (void) argc;
-    (void) argv;
-
-    test_write16be();
-    test_write32be();
-    test_write64be();
-    test_read16be();
-    test_read32be();
-    test_read64be();
-
-    test_float_to_u16fp();
-    test_float_to_i16fp();
-    return 0;
-}

app/tests/test_buffer_util.c

@@ -0,0 +1,81 @@
+#include "common.h"
+
+#include <assert.h>
+
+#include "util/buffer_util.h"
+
+static void test_buffer_write16be(void) {
+    uint16_t val = 0xABCD;
+    uint8_t buf[2];
+
+    sc_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];
+
+    sc_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];
+
+    sc_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 = sc_read16be(buf);
+
+    assert(val == 0xABCD);
+}
+
+static void test_buffer_read32be(void) {
+    uint8_t buf[4] = {0xAB, 0xCD, 0x12, 0x34};
+
+    uint32_t val = sc_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 = sc_read64be(buf);
+
+    assert(val == 0xABCD1234567890EF);
+}
+
+int main(int argc, char *argv[]) {
+    (void) argc;
+    (void) argv;
+
+    test_buffer_write16be();
+    test_buffer_write32be();
+    test_buffer_write64be();
+    test_buffer_read16be();
+    test_buffer_read32be();
+    test_buffer_read64be();
+    return 0;
+}

app/tests/test_control_msg_serialize.c

@@ -132,14 +132,14 @@ static void test_serialize_inject_scroll_event(void) {
 
     unsigned char buf[SC_CONTROL_MSG_MAX_SIZE];
     size_t size = sc_control_msg_serialize(&msg, buf);
-    assert(size == 21);
+    assert(size == 25);
 
     const unsigned char expected[] = {
         SC_CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT,
         0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x04, 0x02, // 260 1026
         0x04, 0x38, 0x07, 0x80, // 1080 1920
-        0x7F, 0xFF, // 1 (float encoded as i16)
+        0x00, 0x00, 0x00, 0x01, // 1
-        0x80, 0x00, // -1 (float encoded as i16)
+        0xFF, 0xFF, 0xFF, 0xFF, // -1
         0x00, 0x00, 0x00, 0x01, // 1
     };
     assert(!memcmp(buf, expected, sizeof(expected)));

build.gradle

@@ -4,10 +4,10 @@ buildscript {
 
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:deprecation"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

server/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 31
         versionCode 12400
         versionName "1.24"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

server/build_without_gradle.sh

@@ -14,8 +14,8 @@ set -e
 SCRCPY_DEBUG=false
 SCRCPY_VERSION_NAME=1.24
 
-PLATFORM=${ANDROID_PLATFORM:-33}
+PLATFORM=${ANDROID_PLATFORM:-31}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-33.0.0}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-31.0.0}
 
 BUILD_DIR="$(realpath ${BUILD_DIR:-build_manual})"
 CLASSES_DIR="$BUILD_DIR/classes"

server/meson.build

@@ -13,8 +13,8 @@ if prebuilt_server == ''
                   install_dir: 'share/scrcpy')
 else
     if not prebuilt_server.startswith('/')
-        # prebuilt server path is relative to the root scrcpy directory
+        # relative path needs some trick
-        prebuilt_server = '../' + prebuilt_server
+        prebuilt_server = meson.source_root() + '/' + prebuilt_server
     endif
     custom_target('scrcpy-server-prebuilt',
                   input: prebuilt_server,

server/src/main/java/com/genymobile/scrcpy/Binary.java

@@ -1,38 +0,0 @@
-package com.genymobile.scrcpy;
-
-public final class Binary {
-    private Binary() {
-        // not instantiable
-    }
-
-    public static int toUnsigned(short value) {
-        return value & 0xffff;
-    }
-
-    public static int toUnsigned(byte value) {
-        return value & 0xff;
-    }
-
-    /**
-     * Convert unsigned 16-bit fixed-point to a float between 0 and 1
-     *
-     * @param value encoded value
-     * @return Float value between 0 and 1
-     */
-    public static float u16FixedPointToFloat(short value) {
-        int unsignedShort = Binary.toUnsigned(value);
-        // 0x1p16f is 2^16 as float
-        return unsignedShort == 0xffff ? 1f : (unsignedShort / 0x1p16f);
-    }
-
-    /**
-     * Convert signed 16-bit fixed-point to a float between -1 and 1
-     *
-     * @param value encoded value
-     * @return Float value between -1 and 1
-     */
-    public static float i16FixedPointToFloat(short value) {
-        // 0x1p15f is 2^15 as float
-        return value == 0x7fff ? 1f : (value / 0x1p15f);
-    }
-}

server/src/main/java/com/genymobile/scrcpy/Command.java

@@ -30,14 +30,4 @@ public final class Command {
         }
         return result;
     }
-
-    public static String execReadOutput(String... cmd) throws IOException, InterruptedException {
-        Process process = Runtime.getRuntime().exec(cmd);
-        String output = IO.toString(process.getInputStream());
-        int exitCode = process.waitFor();
-        if (exitCode != 0) {
-            throw new IOException("Command " + Arrays.toString(cmd) + " returned with value " + exitCode);
-        }
-        return output;
-    }
 }

server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java

@@ -103,7 +103,7 @@ public class ControlMessageReader {
         if (buffer.remaining() < INJECT_KEYCODE_PAYLOAD_LENGTH) {
             return null;
         }
-        int action = Binary.toUnsigned(buffer.get());
+        int action = toUnsigned(buffer.get());
         int keycode = buffer.getInt();
         int repeat = buffer.getInt();
         int metaState = buffer.getInt();
@@ -136,10 +136,10 @@ public class ControlMessageReader {
         if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
             return null;
         }
-        int action = Binary.toUnsigned(buffer.get());
+        int action = toUnsigned(buffer.get());
         long pointerId = buffer.getLong();
         Position position = readPosition(buffer);
-        float pressure = Binary.u16FixedPointToFloat(buffer.getShort());
+        float pressure = fixedPointToFloat(buffer.getShort());
         int buttons = buffer.getInt();
         return ControlMessage.createInjectTouchEvent(action, pointerId, position, pressure, buttons);
     }
@@ -149,8 +149,9 @@ public class ControlMessageReader {
             return null;
         }
         Position position = readPosition(buffer);
-        float hScroll = Binary.i16FixedPointToFloat(buffer.getShort());
+        // map from [0; 1] to [-1; 1]
-        float vScroll = Binary.i16FixedPointToFloat(buffer.getShort());
+        float hScroll = fixedPointToFloat(buffer.getShort());
+        float vScroll = fixedPointToFloat(buffer.getShort());
         int buttons = buffer.getInt();
         return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll, buttons);
     }
@@ -159,7 +160,7 @@ public class ControlMessageReader {
         if (buffer.remaining() < BACK_OR_SCREEN_ON_LENGTH) {
             return null;
         }
-        int action = Binary.toUnsigned(buffer.get());
+        int action = toUnsigned(buffer.get());
         return ControlMessage.createBackOrScreenOn(action);
     }
 
@@ -167,7 +168,7 @@ public class ControlMessageReader {
         if (buffer.remaining() < GET_CLIPBOARD_LENGTH) {
             return null;
         }
-        int copyKey = Binary.toUnsigned(buffer.get());
+        int copyKey = toUnsigned(buffer.get());
         return ControlMessage.createGetClipboard(copyKey);
     }
 
@@ -195,8 +196,22 @@ public class ControlMessageReader {
     private static Position readPosition(ByteBuffer buffer) {
         int x = buffer.getInt();
         int y = buffer.getInt();
-        int screenWidth = Binary.toUnsigned(buffer.getShort());
+        int screenWidth = toUnsigned(buffer.getShort());
-        int screenHeight = Binary.toUnsigned(buffer.getShort());
+        int screenHeight = toUnsigned(buffer.getShort());
         return new Position(x, y, screenWidth, screenHeight);
     }
+
+    private static int toUnsigned(short value) {
+        return value & 0xffff;
+    }
+
+    private static int toUnsigned(byte value) {
+        return value & 0xff;
+    }
+
+    private static float fixedPointToFloat(short value) {
+        int unsignedShort = toUnsigned(value);
+        // convert 16 bits fixed-point to a float between 0 and 1 (0x1p16f is 2^16 as float)
+        return unsignedShort == 0xffff ? 1f : (unsignedShort / 0x1p16f);
+    }
 }

server/src/main/java/com/genymobile/scrcpy/IO.java

@@ -6,9 +6,7 @@ import android.system.OsConstants;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.Scanner;
 
 public final class IO {
     private IO() {
@@ -39,13 +37,4 @@ public final class IO {
     public static void writeFully(FileDescriptor fd, byte[] buffer, int offset, int len) throws IOException {
         writeFully(fd, ByteBuffer.wrap(buffer, offset, len));
     }
-
-    public static String toString(InputStream inputStream) {
-        StringBuilder builder = new StringBuilder();
-        Scanner scanner = new Scanner(inputStream);
-        while (scanner.hasNextLine()) {
-            builder.append(scanner.nextLine()).append('\n');
-        }
-        return builder.toString();
-    }
 }

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java

@@ -1,48 +1,22 @@
 package com.genymobile.scrcpy.wrappers;
 
-import com.genymobile.scrcpy.Command;
 import com.genymobile.scrcpy.DisplayInfo;
-import com.genymobile.scrcpy.Ln;
 import com.genymobile.scrcpy.Size;
 
-import java.util.regex.Matcher;
+import android.os.IInterface;
-import java.util.regex.Pattern;
 
 public final class DisplayManager {
-    private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal
+    private final IInterface manager;
 
-    public DisplayManager(Object manager) {
+    public DisplayManager(IInterface manager) {
         this.manager = manager;
     }
 
-    private DisplayInfo parseDumpsysDisplay(int displayId) {
-        try {
-            String dumpDisplay = Command.execReadOutput("dumpsys", "display");
-            Pattern regex = Pattern.compile(
-                    "^    mBaseDisplayInfo=DisplayInfo\\{\".*\", displayId " + displayId + ".+, real ([0-9]+) x ([0-9]+).+, rotation ([0-9]+).*, " +
-                            "layerStack ([0-9]+).*");
-            Matcher m = regex.matcher(dumpDisplay);
-            if (!m.find()) {
-                return null;
-            }
-            int width = Integer.parseInt(m.group(1));
-            int height = Integer.parseInt(m.group(2));
-            int rotation = Integer.parseInt(m.group(3));
-            int layerStack = Integer.parseInt(m.group(4));
-            int flags = 0; // TODO
-            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
-        } catch (Exception e) {
-            Ln.e("Could not get display info from \"dumpsys display\" output", e);
-            return null;
-        }
-    }
-
     public DisplayInfo getDisplayInfo(int displayId) {
         try {
             Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, displayId);
             if (displayInfo == null) {
-                // fallback when displayInfo is null
+                return null;
-                return parseDumpsysDisplay(displayId);
             }
             Class<?> cls = displayInfo.getClass();
             // width and height already take the rotation into account

server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java

@@ -50,14 +50,7 @@ public final class ServiceManager {
 
     public DisplayManager getDisplayManager() {
         if (displayManager == null) {
-            try {
+            displayManager = new DisplayManager(getService("display", "android.hardware.display.IDisplayManager"));
-                Class<?> clazz = Class.forName("android.hardware.display.DisplayManagerGlobal");
-                Method getInstanceMethod = clazz.getDeclaredMethod("getInstance");
-                Object dmg = getInstanceMethod.invoke(null);
-                displayManager = new DisplayManager(dmg);
-            } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-                throw new AssertionError(e);
-            }
         }
         return displayManager;
     }

server/src/test/java/com/genymobile/scrcpy/BinaryTest.java

@@ -1,42 +0,0 @@
-package com.genymobile.scrcpy;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class BinaryTest {
-
-    @Test
-    public void testU16FixedPointToFloat() {
-        final float delta = 0.0f; // on these values, there MUST be no rounding error
-        Assert.assertEquals(0.0f, Binary.u16FixedPointToFloat((short) 0), delta);
-        Assert.assertEquals(0.03125f, Binary.u16FixedPointToFloat((short) 0x800), delta);
-        Assert.assertEquals(0.0625f, Binary.u16FixedPointToFloat((short) 0x1000), delta);
-        Assert.assertEquals(0.125f, Binary.u16FixedPointToFloat((short) 0x2000), delta);
-        Assert.assertEquals(0.25f, Binary.u16FixedPointToFloat((short) 0x4000), delta);
-        Assert.assertEquals(0.5f, Binary.u16FixedPointToFloat((short) 0x8000), delta);
-        Assert.assertEquals(0.75f, Binary.u16FixedPointToFloat((short) 0xc000), delta);
-        Assert.assertEquals(1.0f, Binary.u16FixedPointToFloat((short) 0xffff), delta);
-    }
-
-    @Test
-    public void testI16FixedPointToFloat() {
-        final float delta = 0.0f; // on these values, there MUST be no rounding error
-
-        Assert.assertEquals(0.0f, Binary.i16FixedPointToFloat((short) 0), delta);
-        Assert.assertEquals(0.03125f, Binary.i16FixedPointToFloat((short) 0x400), delta);
-        Assert.assertEquals(0.0625f, Binary.i16FixedPointToFloat((short) 0x800), delta);
-        Assert.assertEquals(0.125f, Binary.i16FixedPointToFloat((short) 0x1000), delta);
-        Assert.assertEquals(0.25f, Binary.i16FixedPointToFloat((short) 0x2000), delta);
-        Assert.assertEquals(0.5f, Binary.i16FixedPointToFloat((short) 0x4000), delta);
-        Assert.assertEquals(0.75f, Binary.i16FixedPointToFloat((short) 0x6000), delta);
-        Assert.assertEquals(1.0f, Binary.i16FixedPointToFloat((short) 0x7fff), delta);
-
-        Assert.assertEquals(-0.03125f, Binary.i16FixedPointToFloat((short) -0x400), delta);
-        Assert.assertEquals(-0.0625f, Binary.i16FixedPointToFloat((short) -0x800), delta);
-        Assert.assertEquals(-0.125f, Binary.i16FixedPointToFloat((short) -0x1000), delta);
-        Assert.assertEquals(-0.25f, Binary.i16FixedPointToFloat((short) -0x2000), delta);
-        Assert.assertEquals(-0.5f, Binary.i16FixedPointToFloat((short) -0x4000), delta);
-        Assert.assertEquals(-0.75f, Binary.i16FixedPointToFloat((short) -0x6000), delta);
-        Assert.assertEquals(-1.0f, Binary.i16FixedPointToFloat((short) -0x8000), delta);
-    }
-}

server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java

@@ -126,8 +126,8 @@ public class ControlMessageReaderTest {
         dos.writeInt(1026);
         dos.writeShort(1080);
         dos.writeShort(1920);
-        dos.writeShort(0); // 0.0f encoded as i16
+        dos.writeShort(0x8000);
-        dos.writeShort(0x8000); // -1.0f encoded as i16
+        dos.writeShort(0);
         dos.writeInt(1);
 
         byte[] packet = bos.toByteArray();