clean up

Expose APK path from Java
Add option --reinstall
2022-10-02 16:36:05 +02:00 · 2022-10-02 16:36:05 +02:00 · 2022-10-02 15:52:59 +02:00 · 2022-10-02 15:52:59 +02:00 · 2022-10-02 15:52:59 +02:00 · 2022-10-02 15:52:59 +02:00
58 changed files with 1210 additions and 229 deletions
--- a/app/data/scrcpy-console.desktop
+++ b/app/data/scrcpy-console.desktop
@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=scrcpy (console)
+GenericName=Android Remote Control
+Comment=Display and control your Android device
+# For some users, the PATH or ADB environment variables are set from the shell
+# startup file, like .bashrc or .zshrc… Run an interactive shell to get
+# environment correctly initialized.
+Exec=/bin/bash --norc --noprofile -i -c '"$SHELL" -i -c scrcpy || read -p "Press any key to quit..."'
+Icon=scrcpy
+Terminal=true
+Type=Application
+Categories=Utility;RemoteAccess;
+StartupNotify=false
--- a/app/data/scrcpy.desktop
+++ b/app/data/scrcpy.desktop
@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=scrcpy
+GenericName=Android Remote Control
+Comment=Display and control your Android device
+# For some users, the PATH or ADB environment variables are set from the shell
+# startup file, like .bashrc or .zshrc… Run an interactive shell to get
+# environment correctly initialized.
+Exec=/bin/sh -c '"$SHELL" -i -c scrcpy'
+Icon=scrcpy
+Terminal=false
+Type=Application
+Categories=Utility;RemoteAccess;
+StartupNotify=false
--- a/app/meson.build
+++ b/app/meson.build
@ -188,7 +188,7 @@ conf.set_quoted('SCRCPY_VERSION', meson.project_version())
 # the prefix used during configuration (meson --prefix=PREFIX)
 conf.set_quoted('PREFIX', get_option('prefix'))

-# build a "portable" version (with scrcpy-server accessible from the same
+# build a "portable" version (with scrcpy-server.apk accessible from the same
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))

@ -223,14 +223,26 @@ executable('scrcpy', src,
           install: true,
           c_args: [])

+# <https://mesonbuild.com/Builtin-options.html#directories>
+datadir = get_option('datadir') # by default 'share'
+
 install_man('scrcpy.1')
 install_data('data/icon.png',
             rename: 'scrcpy.png',
-             install_dir: 'share/icons/hicolor/256x256/apps')
+             install_dir: join_paths(datadir, 'icons/hicolor/256x256/apps'))
 install_data('data/zsh-completion/_scrcpy',
-             install_dir: 'share/zsh/site-functions')
+             install_dir: join_paths(datadir, 'zsh/site-functions'))
 install_data('data/bash-completion/scrcpy',
-             install_dir: 'share/bash-completion/completions')
+             install_dir: join_paths(datadir, 'bash-completion/completions'))
+
+# Desktop entry file for application launchers
+if host_machine.system() == 'linux'
+    # Install a launcher (ex: /usr/local/share/applications/scrcpy.desktop)
+    install_data('data/scrcpy.desktop',
+                 install_dir: join_paths(datadir, 'applications'))
+    install_data('data/scrcpy-console.desktop',
+                 install_dir: join_paths(datadir, 'applications'))
+endif


 ### TESTS
@ -245,8 +257,8 @@ if get_option('buildtype') == 'debug'
            'src/util/str.c',
            'src/util/strbuf.c',
        ]],
-        ['test_buffer_util', [
-            'tests/test_buffer_util.c',
+        ['test_binary', [
+            'tests/test_binary.c',
        ]],
        ['test_cbuf', [
            'tests/test_cbuf.c',
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@ -110,6 +110,10 @@ However, the option is only available when the HID keyboard is enabled (or a phy

 Also see \fB\-\-hid\-mouse\fR.

+.TP
+.B \-\-install
+Install the server (via "adb install") rather than pushing it to /data/local/tmp (via "adb push").
+
 .TP
 .B \-\-legacy\-paste
 Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+Shift+v).
@ -242,6 +246,10 @@ option if set, or by the file extension (.mp4 or .mkv).
 .BI "\-\-record\-format " format
 Force recording format (either mp4 or mkv).

+.TP
+.B \-\-reinstall
+Reinstall the server (via "adb install"), even if the correct version is already installed. Implies \fB\-\-install\fR.
+
 .TP
 .BI "\-\-render\-driver " name
 Request SDL to use the given render driver (this is just a hint).
--- a/app/src/adb/adb.c
+++ b/app/src/adb/adb.c
@ -329,6 +329,17 @@ sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
    return process_check_success_intr(intr, pid, "adb install", flags);
 }

+bool
+sc_adb_uninstall(struct sc_intr *intr, const char *serial, const char *pkg,
+                 unsigned flags) {
+    assert(serial);
+    const char *const argv[] =
+        SC_ADB_COMMAND("-s", serial, "uninstall", pkg);
+
+    sc_pid pid = sc_adb_execute(argv, flags);
+    return process_check_success_intr(intr, pid, "adb uninstall", flags);
+}
+
 bool
 sc_adb_tcpip(struct sc_intr *intr, const char *serial, uint16_t port,
             unsigned flags) {
@ -401,6 +412,7 @@ sc_adb_list_devices(struct sc_intr *intr, unsigned flags,
 #define BUFSIZE 65536
    char *buf = malloc(BUFSIZE);
    if (!buf) {
+        LOG_OOM();
        return false;
    }

@ -434,6 +446,7 @@ sc_adb_list_devices(struct sc_intr *intr, unsigned flags,
             "Please report an issue.");
        return false;
    }
+#undef BUFSIZE

    // It is parsed as a NUL-terminated string
    buf[r] = '\0';
@ -712,3 +725,99 @@ sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags) {

    return sc_adb_parse_device_ip(buf);
 }
+
+char *
+sc_adb_get_installed_apk_path(struct sc_intr *intr, const char *serial,
+                              unsigned flags) {
+    assert(serial);
+    const char *const argv[] =
+        SC_ADB_COMMAND("-s", serial, "shell", "pm", "list", "package", "-f",
+                       SC_ANDROID_PACKAGE);
+
+    sc_pipe pout;
+    sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
+    if (pid == SC_PROCESS_NONE) {
+        LOGD("Could not execute \"pm list packages\"");
+        return NULL;
+    }
+
+    // "pm list packages -f <package>" output should contain only one line, so
+    // the output should be short
+    char buf[1024];
+    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, sizeof(buf) - 1);
+    sc_pipe_close(pout);
+
+    bool ok = process_check_success_intr(intr, pid, "pm list packages", flags);
+    if (!ok) {
+        return NULL;
+    }
+
+    if (r == -1) {
+        return NULL;
+    }
+
+    assert((size_t) r < sizeof(buf));
+    if (r == sizeof(buf) - 1)  {
+        // The implementation assumes that the output of "pm list packages"
+        // fits in the buffer in a single pass
+        LOGW("Result of \"pm list package\" does not fit in 1Kb. "
+             "Please report an issue.");
+        return NULL;
+    }
+
+    // It is parsed as a NUL-terminated string
+    buf[r] = '\0';
+
+    return sc_adb_parse_installed_apk_path(buf);
+}
+
+char *
+sc_adb_get_installed_apk_version(struct sc_intr *intr, const char *serial,
+                                 unsigned flags) {
+    assert(serial);
+    const char *const argv[] =
+        SC_ADB_COMMAND("-s", serial, "shell", "dumpsys", "package",
+                       SC_ANDROID_PACKAGE);
+
+    sc_pipe pout;
+    sc_pid pid = sc_adb_execute_p(argv, flags, &pout);
+    if (pid == SC_PROCESS_NONE) {
+        LOGD("Could not execute \"dumpsys package\"");
+        return NULL;
+    }
+
+    // "dumpsys package" output can be huge (e.g. 16k), but versionName is at
+    // the beginning, typically in the first 1024 bytes (64k should be enough
+    // for the whole output anyway)
+#define BUFSIZE 65536
+    char *buf = malloc(BUFSIZE);
+    if (!buf) {
+        return false;
+    }
+    ssize_t r = sc_pipe_read_all_intr(intr, pid, pout, buf, BUFSIZE - 1);
+    sc_pipe_close(pout);
+
+    bool ok = process_check_success_intr(intr, pid, "dumpsys package", flags);
+    if (!ok) {
+        free(buf);
+        return NULL;
+    }
+
+    if (r == -1) {
+        free(buf);
+        return NULL;
+    }
+
+    assert((size_t) r < BUFSIZE);
+#undef BUFSIZE
+    // if r == sizeof(buf), then the output is truncated, but we don't care,
+    // versionName is at the beginning in practice, and is unlikely to be
+    // truncated at 64k
+
+    // It is parsed as a NUL-terminated string
+    buf[r] = '\0';
+
+    char *version = sc_adb_parse_installed_apk_version(buf);
+    free(buf);
+    return version;
+}
--- a/app/src/adb/adb.h
+++ b/app/src/adb/adb.h
@ -15,6 +15,8 @@

 #define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)

+#define SC_ANDROID_PACKAGE "com.genymobile.scrcpy"
+
 const char *
 sc_adb_get_executable(void);

@ -64,6 +66,10 @@ bool
 sc_adb_install(struct sc_intr *intr, const char *serial, const char *local,
               unsigned flags);

+bool
+sc_adb_uninstall(struct sc_intr *intr, const char *serial, const char *pkg,
+                 unsigned flags);
+
 /**
 * Execute `adb tcpip <port>`
 */
@ -114,4 +120,18 @@ sc_adb_getprop(struct sc_intr *intr, const char *serial, const char *prop,
 char *
 sc_adb_get_device_ip(struct sc_intr *intr, const char *serial, unsigned flags);

+/**
+ * Return the path of the installed APK for com.genymobile.scrcpy (if any)
+ */
+char *
+sc_adb_get_installed_apk_path(struct sc_intr *intr, const char *serial,
+                              unsigned flags);
+
+/**
+ * Return the version of the installed APK for com.genymobile.scrcpy (if any)
+ */
+char *
+sc_adb_get_installed_apk_version(struct sc_intr *intr, const char *serial,
+                                 unsigned flags);
+
 #endif
--- a/app/src/adb/adb_parser.c
+++ b/app/src/adb/adb_parser.c
@ -225,3 +225,62 @@ sc_adb_parse_device_ip(char *str) {

    return NULL;
 }
+
+char *
+sc_adb_parse_installed_apk_path(char *str) {
+    // str is expected to look like:
+    // "package:/data/app/.../base.apk=com.genymobile.scrcpy"
+    //          ^^^^^^^^^^^^^^^^^^^^^^
+    // We want to extract the path (which may contain '=', even in practice)
+
+    if (strncmp(str, "package:", 8)) {
+        // Does not start with "package:"
+        return NULL;
+    }
+
+    char *s = str + 8;
+    size_t len = strcspn(s, " \r\n");
+    s[len] = '\0';
+
+    char *p = strrchr(s, '=');
+    if (!p) {
+        // No '=' found
+        return NULL;
+    }
+
+    // Truncate at the last '='
+    *p = '\0';
+
+    return strdup(s);
+}
+
+char *
+sc_adb_parse_installed_apk_version(const char *str) {
+    // str is the (beginning of the) output of `dumpsys package`
+    // We want to extract the version string from a line starting with 4 spaces
+    // then `versionName=` then the version string.
+
+#define VERSION_NAME_PREFIX "\n    versionName="
+    char *s = strstr(str, VERSION_NAME_PREFIX);
+    if (!s) {
+        // Not found
+        return NULL;
+    }
+
+    s+= sizeof(VERSION_NAME_PREFIX) - 1;
+
+    size_t len = strspn(s, "0123456789.");
+    if (!len) {
+        LOGW("Unexpected version name with no value");
+        return NULL;
+    }
+
+    char *version = malloc(len + 1);
+    if (!version) {
+        return NULL;
+    }
+
+    memcpy(version, s, len);
+    version[len] = '\0';
+    return version;
+}
--- a/app/src/adb/adb_parser.h
+++ b/app/src/adb/adb_parser.h
@ -27,4 +27,24 @@ sc_adb_parse_devices(char *str, struct sc_vec_adb_devices *out_vec);
 char *
 sc_adb_parse_device_ip(char *str);

+/**
+ * Parse the package path from the output of
+ * `adb shell pm list packages -f <package>`
+ *
+ * The parameter must be a NUL-terminated string.
+ *
+ * Warning: this function modifies the buffer for optimization purposes.
+ */
+char *
+sc_adb_parse_installed_apk_path(char *str);
+
+/**
+ * Parse the package version from the output of
+ * `adb shell dumpsys package <package>`
+ *
+ * The parameter must be a NUL-terminated string.
+ */
+char *
+sc_adb_parse_installed_apk_version(const char *str);
+
 #endif
--- a/app/src/cli.c
+++ b/app/src/cli.c
@ -57,6 +57,8 @@
 #define OPT_NO_CLEANUP             1037
 #define OPT_PRINT_FPS              1038
 #define OPT_NO_POWER_ON            1039
+#define OPT_INSTALL                1040
+#define OPT_REINSTALL              1041

 struct sc_option {
    char shortopt;
@ -207,6 +209,12 @@ static const struct sc_option options[] = {
        .longopt = "help",
        .text = "Print this help.",
    },
+    {
+        .longopt_id = OPT_INSTALL,
+        .longopt = "install",
+        .text = "Install the server (via 'adb install') rather than pushing "
+                "it to /data/local/tmp (via 'adb push').",
+    },
    {
        .longopt_id = OPT_LEGACY_PASTE,
        .longopt = "legacy-paste",
@ -378,6 +386,13 @@ static const struct sc_option options[] = {
        .argdesc = "format",
        .text = "Force recording format (either mp4 or mkv).",
    },
+    {
+        .longopt_id = OPT_REINSTALL,
+        .longopt = "reinstall",
+        .text = "Reinstall the server (via 'adb install'), even if the correct "
+                "version is already installed.\n"
+                "Implies --install.",
+    },
    {
        .longopt_id = OPT_RENDER_DRIVER,
        .longopt = "render-driver",
@ -1610,6 +1625,13 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_PRINT_FPS:
                opts->start_fps_counter = true;
                break;
+            case OPT_INSTALL:
+                opts->install = true;
+                break;
+            case OPT_REINSTALL:
+                opts->install = true;
+                opts->reinstall = true;
+                break;
            case OPT_OTG:
 #ifdef HAVE_USB
                opts->otg = true;
--- a/app/src/clock.c
+++ b/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: %g * pts + %" PRItick,
+        LOGD("Clock estimation: %f * pts + %" PRItick,
             clock->slope, clock->offset);
 #endif
    }
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>

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

@ -37,7 +37,7 @@ static const char *const android_motionevent_action_labels[] = {
    "move",
    "cancel",
    "outside",
-    "ponter-down",
+    "pointer-down",
    "pointer-up",
    "hover-move",
    "scroll",
@ -78,16 +78,6 @@ 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;
@ -109,18 +99,20 @@ 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 =
-                to_fixed_point_16(msg->inject_touch_event.pressure);
+                sc_float_to_u16fp(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);
-            sc_write32be(&buf[13],
-                             (uint32_t) msg->inject_scroll_event.hscroll);
-            sc_write32be(&buf[17],
-                             (uint32_t) msg->inject_scroll_event.vscroll);
-            sc_write32be(&buf[21], msg->inject_scroll_event.buttons);
-            return 25;
+            int16_t hscroll =
+                sc_float_to_i16fp(msg->inject_scroll_event.hscroll);
+            int16_t vscroll =
+                sc_float_to_i16fp(msg->inject_scroll_event.vscroll);
+            sc_write16be(&buf[13], (uint16_t) hscroll);
+            sc_write16be(&buf[15], (uint16_t) vscroll);
+            sc_write32be(&buf[17], msg->inject_scroll_event.buttons);
+            return 21;
        case SC_CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
            buf[1] = msg->inject_keycode.action;
            return 2;
@ -170,7 +162,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=%g buttons=%06lx",
+                             " pressure=%f buttons=%06lx",
                         id == POINTER_ID_MOUSE ? "mouse" : "vfinger",
                         MOTIONEVENT_ACTION_LABEL(action),
                         msg->inject_touch_event.position.point.x,
@ -180,7 +172,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=%g buttons=%06lx",
+                             PRIi32 " pressure=%f buttons=%06lx",
                         id,
                         MOTIONEVENT_ACTION_LABEL(action),
                         msg->inject_touch_event.position.point.x,
@ -191,8 +183,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=%" PRIi32
-                         " vscroll=%" PRIi32 " buttons=%06lx",
+            LOG_CMSG("scroll position=%" PRIi32 ",%" PRIi32 " hscroll=%f"
+                         " vscroll=%f buttons=%06lx",
                     msg->inject_scroll_event.position.point.x,
                     msg->inject_scroll_event.position.point.y,
                     msg->inject_scroll_event.hscroll,
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@ -68,8 +68,8 @@ struct sc_control_msg {
        } inject_touch_event;
        struct {
            struct sc_position position;
-            int32_t hscroll;
-            int32_t vscroll;
+            float hscroll;
+            float vscroll;
            enum android_motionevent_buttons buttons;
        } inject_scroll_event;
        struct {
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@ -7,7 +7,7 @@
 #include "decoder.h"
 #include "events.h"
 #include "recorder.h"
-#include "util/buffer_util.h"
+#include "util/binary.h"
 #include "util/log.h"

 #define SC_PACKET_HEADER_SIZE 12
@ -37,8 +37,8 @@ sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
    // CK...... ........ ........ ........ ........ ........ ........ ........
    // ^^<------------------------------------------------------------------->
    // ||                                PTS
-    // | `- config packet
-    //  `-- key frame
+    // | `- key frame
+    //  `-- config packet

    uint8_t header[SC_PACKET_HEADER_SIZE];
    ssize_t r = net_recv_all(demuxer->socket, header, SC_PACKET_HEADER_SIZE);
--- a/app/src/device_msg.c
+++ b/app/src/device_msg.c
@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>

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

 ssize_t
--- a/app/src/input_events.h
+++ b/app/src/input_events.h
@ -358,8 +358,8 @@ struct sc_mouse_click_event {

 struct sc_mouse_scroll_event {
    struct sc_position position;
-    int32_t hscroll;
-    int32_t vscroll;
+    float hscroll;
+    float vscroll;
    uint8_t buttons_state; // bitwise-OR of sc_mouse_button values
 };

--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@ -747,8 +747,13 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
            .point = sc_screen_convert_window_to_frame_coords(im->screen,
                                                              mouse_x, mouse_y),
        },
-        .hscroll = event->x,
-        .vscroll = event->y,
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+        .hscroll = CLAMP(event->preciseX, -1.0f, 1.0f),
+        .vscroll = CLAMP(event->preciseY, -1.0f, 1.0f),
+#else
+        .hscroll = CLAMP(event->x, -1, 1),
+        .vscroll = CLAMP(event->y, -1, 1),
+#endif
        .buttons_state =
            sc_mouse_buttons_state_from_sdl(buttons, im->forward_all_clicks),
    };
--- a/app/src/options.c
+++ b/app/src/options.c
@ -65,4 +65,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .cleanup = true,
    .start_fps_counter = false,
    .power_on = true,
+    .install = false,
+    .reinstall = false,
 };
--- a/app/src/options.h
+++ b/app/src/options.h
@ -140,6 +140,8 @@ struct scrcpy_options {
    bool cleanup;
    bool start_fps_counter;
    bool power_on;
+    bool install;
+    bool reinstall;
 };

 extern const struct scrcpy_options scrcpy_options_default;
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@ -325,6 +325,8 @@ scrcpy(struct scrcpy_options *options) {
        .tcpip_dst = options->tcpip_dst,
        .cleanup = options->cleanup,
        .power_on = options->power_on,
+        .install = options->install,
+        .reinstall = options->reinstall,
    };

    static const struct sc_server_callbacks cbs = {
--- a/app/src/server.c
+++ b/app/src/server.c
@ -14,10 +14,11 @@
 #include "util/process_intr.h"
 #include "util/str.h"

-#define SC_SERVER_FILENAME "scrcpy-server"
+#define SC_SERVER_FILENAME "scrcpy-server.apk"
+#define SC_SERVER_PACKAGE "com.genymobile.scrcpy"

 #define SC_SERVER_PATH_DEFAULT PREFIX "/share/scrcpy/" SC_SERVER_FILENAME
-#define SC_DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
+#define SC_DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.apk"

 static char *
 get_server_path(void) {
@ -104,7 +105,10 @@ error:
 }

 static bool
-push_server(struct sc_intr *intr, const char *serial) {
+push_server(struct sc_intr *intr, const char *serial, bool install,
+            bool reinstall) {
+    assert(install || !reinstall); // reinstall implies install
+
    char *server_path = get_server_path();
    if (!server_path) {
        return false;
@ -114,7 +118,28 @@ push_server(struct sc_intr *intr, const char *serial) {
        free(server_path);
        return false;
    }
-    bool ok = sc_adb_push(intr, serial, server_path, SC_DEVICE_SERVER_PATH, 0);
+    bool ok;
+
+    if (install) {
+        char *version = sc_adb_get_installed_apk_version(intr, serial, 0);
+        bool same_version = version && !strcmp(version, SCRCPY_VERSION);
+        free(version);
+        if (!reinstall && same_version) {
+            LOGI("Server " SCRCPY_VERSION " already installed");
+            ok = true;
+        } else {
+            LOGI("Installing server " SCRCPY_VERSION);
+            // If a server with a different signature is installed, or if a
+            // newer server is already installed, we must uninstall it first.
+            ok = sc_adb_uninstall(intr, serial, SC_SERVER_PACKAGE,
+                                  SC_ADB_SILENT);
+            (void) ok; // expected to fail if it is not installed
+            ok = sc_adb_install(intr, serial, server_path, 0);
+        }
+    } else {
+        ok = sc_adb_push(intr, serial, server_path, SC_DEVICE_SERVER_PATH, 0);
+    }
+
    free(server_path);
    return ok;
 }
@ -152,6 +177,38 @@ sc_server_sleep(struct sc_server *server, sc_tick deadline) {
    return !stopped;
 }

+static char *
+get_classpath_cmd(struct sc_intr *intr, const char *serial, bool install) {
+    if (!install) {
+        // In push mode, the path is known statically
+        char *cp = strdup("CLASSPATH=" SC_DEVICE_SERVER_PATH);
+        if (!cp) {
+            LOG_OOM();
+        }
+        return cp;
+    }
+
+    char *apk_path = sc_adb_get_installed_apk_path(intr, serial, 0);
+    if (!apk_path) {
+        LOGE("Could not get device apk path");
+        return NULL;
+    }
+
+#define PREFIX_SIZE (sizeof("CLASSPATH=") - 1)
+    size_t len = strlen(apk_path);
+    char *cp = malloc(PREFIX_SIZE + len + 1);
+    if (!cp) {
+        LOG_OOM();
+        free(apk_path);
+        return NULL;
+    }
+
+    memcpy(cp, "CLASSPATH=", PREFIX_SIZE);
+    memcpy(cp + PREFIX_SIZE, apk_path, len + 1);
+    free(apk_path);
+    return cp;
+}
+
 static sc_pid
 execute_server(struct sc_server *server,
               const struct sc_server_params *params) {
@ -160,13 +217,20 @@ execute_server(struct sc_server *server,
    const char *serial = server->serial;
    assert(serial);

+    char *classpath = get_classpath_cmd(&server->intr, serial, params->install);
+    if (!classpath) {
+        return SC_PROCESS_NONE;
+    }
+
+    LOGD("Using %s", classpath);
+
    const char *cmd[128];
    unsigned count = 0;
    cmd[count++] = sc_adb_get_executable();
    cmd[count++] = "-s";
    cmd[count++] = serial;
    cmd[count++] = "shell";
-    cmd[count++] = "CLASSPATH=" SC_DEVICE_SERVER_PATH;
+    cmd[count++] = classpath;
    cmd[count++] = "app_process";

 #ifdef SERVER_DEBUGGER
@ -252,6 +316,10 @@ execute_server(struct sc_server *server,
        // By default, power_on is true
        ADD_PARAM("power_on=false");
    }
+    if (params->install) {
+        // By default, installed is false
+        ADD_PARAM("installed=true");
+    }

 #undef ADD_PARAM

@ -272,6 +340,8 @@ execute_server(struct sc_server *server,
    pid = sc_adb_execute(cmd, 0);

 end:
+    free(classpath);
+
    for (unsigned i = dyn_idx; i < count; ++i) {
        free((char *) cmd[i]);
    }
@ -755,8 +825,9 @@ run_server(void *data) {
    assert(serial);
    LOGD("Device serial: %s", serial);

-    ok = push_server(&server->intr, serial);
+    ok = push_server(&server->intr, serial, params->install, params->reinstall);
    if (!ok) {
+        LOGE("Failed to push server");
        goto error_connection_failed;
    }

--- a/app/src/server.h
+++ b/app/src/server.h
@ -48,6 +48,8 @@ struct sc_server_params {
    bool select_tcpip;
    bool cleanup;
    bool power_on;
+    bool install;
+    bool reinstall;
 };

 struct sc_server {
--- a/app/src/sys/unix/process.c
+++ b/app/src/sys/unix/process.c
@ -92,8 +92,14 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
                close(in[0]);
            }
            close(in[1]);
+        } else {
+            int devnull = open("/dev/null", O_RDONLY | O_CREAT, 0666);
+            if (devnull != -1) {
+                dup2(devnull, STDIN_FILENO);
+            } else {
+                LOGE("Could not open /dev/null for stdin");
+            }
        }
-        // Do not close stdin in the child process, this makes adb fail on Linux

        if (pout) {
            if (out[1] != STDOUT_FILENO) {
@ -102,8 +108,12 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
            }
            close(out[0]);
        } else if (!inherit_stdout) {
-            // Close stdout in the child process
-            close(STDOUT_FILENO);
+            int devnull = open("/dev/null", O_WRONLY | O_CREAT, 0666);
+            if (devnull != -1) {
+                dup2(devnull, STDOUT_FILENO);
+            } else {
+                LOGE("Could not open /dev/null for stdout");
+            }
        }

        if (perr) {
@ -113,8 +123,12 @@ sc_process_execute_p(const char *const argv[], sc_pid *pid, unsigned flags,
            }
            close(err[0]);
        } else if (!inherit_stderr) {
-            // Close stderr in the child process
-            close(STDERR_FILENO);
+            int devnull = open("/dev/null", O_WRONLY | O_CREAT, 0666);
+            if (devnull != -1) {
+                dup2(devnull, STDERR_FILENO);
+            } else {
+                LOGE("Could not open /dev/null for stderr");
+            }
        }

        close(internal[0]);
--- a/app/src/usb/usb.c
+++ b/app/src/usb/usb.c
@ -23,6 +23,11 @@ read_string(libusb_device_handle *handle, uint8_t desc_index) {

    // When non-negative, 'result' contains the number of bytes written
    char *s = malloc(result + 1);
+    if (!s) {
+        LOG_OOM();
+        return NULL;
+    }
+
    memcpy(s, buffer, result);
    s[result] = '\0';
    return s;
--- a/app/src/util/buffer_util.h
+++ b/app/src/util/buffer_util.h
@ -1,8 +1,9 @@
-#ifndef SC_BUFFER_UTIL_H
-#define SC_BUFFER_UTIL_H
+#ifndef SC_BINARY_H
+#define SC_BINARY_H

 #include "common.h"

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

@ -43,4 +44,33 @@ 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
--- a/app/src/util/net.c
+++ b/app/src/util/net.c
@ -3,11 +3,10 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
-#include <SDL2/SDL_platform.h>

 #include "log.h"

-#ifdef __WINDOWS__
+#ifdef _WIN32
 # include <ws2tcpip.h>
  typedef int socklen_t;
  typedef SOCKET sc_raw_socket;
@ -29,7 +28,7 @@

 bool
 net_init(void) {
-#ifdef __WINDOWS__
+#ifdef _WIN32
    WSADATA wsa;
    int res = WSAStartup(MAKEWORD(2, 2), &wsa) < 0;
    if (res < 0) {
@ -42,14 +41,14 @@ net_init(void) {

 void
 net_cleanup(void) {
-#ifdef __WINDOWS__
+#ifdef _WIN32
    WSACleanup();
 #endif
 }

 static inline sc_socket
 wrap(sc_raw_socket sock) {
-#ifdef __WINDOWS__
+#ifdef _WIN32
    if (sock == INVALID_SOCKET) {
        return SC_SOCKET_NONE;
    }
@ -72,7 +71,7 @@ wrap(sc_raw_socket sock) {

 static inline sc_raw_socket
 unwrap(sc_socket socket) {
-#ifdef __WINDOWS__
+#ifdef _WIN32
    if (socket == SC_SOCKET_NONE) {
        return INVALID_SOCKET;
    }
@ -160,8 +159,8 @@ net_connect(sc_socket socket, uint32_t addr, uint16_t port) {
 }

 bool
-net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog) {
-    sc_raw_socket raw_sock = unwrap(socket);
+net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog) {
+    sc_raw_socket raw_sock = unwrap(server_socket);

    int reuse = 1;
    if (setsockopt(raw_sock, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse,
@ -248,7 +247,7 @@ net_interrupt(sc_socket socket) {

    sc_raw_socket raw_sock = unwrap(socket);

-#ifdef __WINDOWS__
+#ifdef _WIN32
    if (!atomic_flag_test_and_set(&socket->closed)) {
        return !closesocket(raw_sock);
    }
@ -262,7 +261,7 @@ bool
 net_close(sc_socket socket) {
    sc_raw_socket raw_sock = unwrap(socket);

-#ifdef __WINDOWS__
+#ifdef _WIN32
    bool ret = true;
    if (!atomic_flag_test_and_set(&socket->closed)) {
        ret = !closesocket(raw_sock);
--- a/app/src/util/net.h
+++ b/app/src/util/net.h
@ -5,9 +5,8 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL2/SDL_platform.h>

-#ifdef __WINDOWS__
+#ifdef _WIN32

 # include <winsock2.h>
 # include <stdatomic.h>
@ -17,7 +16,7 @@
      atomic_flag closed;
  } *sc_socket;

-#else // not __WINDOWS__
+#else // not _WIN32

 # include <sys/socket.h>
 # define SC_SOCKET_NONE -1
@ -40,7 +39,7 @@ bool
 net_connect(sc_socket socket, uint32_t addr, uint16_t port);

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

 sc_socket
 net_accept(sc_socket server_socket);
--- a/app/src/util/net_intr.c
+++ b/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 socket, uint32_t addr,
+net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,
                uint16_t port, int backlog) {
-    if (!sc_intr_set_socket(intr, socket)) {
+    if (!sc_intr_set_socket(intr, server_socket)) {
        // Already interrupted
        return false;
    }

-    bool ret = net_listen(socket, addr, port, backlog);
+    bool ret = net_listen(server_socket, addr, port, backlog);

    sc_intr_set_socket(intr, SC_SOCKET_NONE);
    return ret;
--- a/app/src/util/net_intr.h
+++ b/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 socket, uint32_t addr,
+net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,
                uint16_t port, int backlog);

 sc_socket
--- a/app/tests/test_adb_parser.c
+++ b/app/tests/test_adb_parser.c
@ -241,6 +241,54 @@ static void test_get_ip_truncated(void) {
    assert(!ip);
 }

+static void test_apk_path(void) {
+    char str[] = "package:/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile."
+                 "scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk=com.genymobile."
+                 "scrcpy\n";
+
+    const char *expected = "/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile"
+                           ".scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk";
+    char *path = sc_adb_parse_installed_apk_path(str);
+    assert(!strcmp(path, expected));
+    free(path);
+}
+
+static void test_apk_path_invalid(void) {
+    // Does not start with "package:"
+    char str[] = "garbage:/data/app/~~71mguyc6p-kNjQdNaNkToA==/com.genymobile."
+                 "scrcpy-l6fiqqUSU7Ok7QLg-rIyJA==/base.apk=com.genymobile."
+                 "scrcpy\n";
+
+    char *path = sc_adb_parse_installed_apk_path(str);
+    assert(!path);
+}
+
+static void test_apk_version(void) {
+    char str[] =
+        "Key Set Manager:\n"
+        "  [com.genymobile.scrcpy]\n"
+        "      Signing KeySets: 128\n"
+        "\n"
+        "Packages:\n"
+        "  Package [com.genymobile.scrcpy] (89abcdef):\n"
+        "    userId=12345\n"
+        "    pkg=Package{012345 com.genymobile.scrcpy}\n"
+        "    codePath=/data/app/~~abcdef==/com.genymobile.scrcpy-012345==\n"
+        "    resourcePath=/data/app/~~abcdef==/com.genymobile.scrcpy-013245==\n"
+        "    primaryCpuAbi=null\n"
+        "    secondaryCpuAbi=null\n"
+        "    versionCode=12400 minSdk=21 targetSdk=31\n"
+        "    versionName=1.24\n"
+        "    splits=[base]\n"
+        "    apkSigningVersion=2\n"
+        "    applicationInfo=ApplicationInfo{012345 com.genymobile.scrcpy}\n";
+
+    const char *expected = "1.24";
+    char *version = sc_adb_parse_installed_apk_version(str);
+    assert(!strcmp(version, expected));
+    free(version);
+}
+
 int main(int argc, char *argv[]) {
    (void) argc;
    (void) argv;
@ -263,5 +311,9 @@ int main(int argc, char *argv[]) {
    test_get_ip_no_wlan_without_eol();
    test_get_ip_truncated();

+    test_apk_path();
+    test_apk_path_invalid();
+    test_apk_version();
+
    return 0;
 }
--- a/app/tests/test_binary.c
+++ b/app/tests/test_binary.c
@ -0,0 +1,114 @@
+#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;
+}
--- a/app/tests/test_buffer_util.c
+++ b/app/tests/test_buffer_util.c
@ -1,81 +0,0 @@
-#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;
-}
--- a/app/tests/test_control_msg_serialize.c
+++ b/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 == 25);
+    assert(size == 21);

    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
-        0x00, 0x00, 0x00, 0x01, // 1
-        0xFF, 0xFF, 0xFF, 0xFF, // -1
+        0x7F, 0xFF, // 1 (float encoded as i16)
+        0x80, 0x00, // -1 (float encoded as i16)
        0x00, 0x00, 0x00, 0x01, // 1
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
--- a/build.gradle
+++ b/build.gradle
@ -4,10 +4,10 @@ buildscript {

    repositories {
        google()
-        jcenter()
+        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'

        // 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()
-        jcenter()
+        mavenCentral()
    }
    tasks.withType(JavaCompile) {
        options.compilerArgs << "-Xlint:deprecation"
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/2
+++ b/2
@ -21,5 +21,5 @@ then
 fi

 SCRCPY_ICON_PATH="app/data/icon.png" \
-SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server" \
+SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server.apk" \
 "$BUILDDIR/app/scrcpy" "$@"
--- a/server/.gitignore
+++ b/server/.gitignore
@ -6,3 +6,4 @@
 /build
 /captures
 .externalNativeBuild
+/keystore.properties
--- a/server/HOWTO_keystore.txt
+++ b/server/HOWTO_keystore.txt
@ -0,0 +1,12 @@
+For an APK to be installable, it must be signed: <https://developer.android.com/training/articles/keystore>
+
+For that purpose, create a keystore by executing this command:
+
+    keytool -genkey -v -keystore ~/.android/scrcpy.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias scrcpy -dname cn=scrcpy
+
+(Adapt ~/.android/scrcpy.keystore if you want to generate it to another location.)
+
+Then create server/keystore.properties and edit its properties:
+
+    cp keystore.properties.sample keystore.properties
+    vim keystore.properties  # fill the properties
--- a/server/build.gradle
+++ b/server/build.gradle
@ -1,25 +1,40 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
    defaultConfig {
        applicationId "com.genymobile.scrcpy"
        minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
        versionCode 12400
        versionName "1.24"
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }
+    signingConfigs {
+        release {
+            // to be defined in server/keystore.properties (see server/HOWTO_keystore.txt)
+            def keystorePropsFile = rootProject.file("server/keystore.properties")
+            if (keystorePropsFile.exists()) {
+                def props = new Properties()
+                props.load(new FileInputStream(keystorePropsFile))
+
+                storeFile rootProject.file(props['storeFile'])
+                storePassword props['storePassword']
+                keyAlias props['keyAlias']
+                keyPassword props['keyPassword']
+            }
+        }
+    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
        }
    }
 }

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

--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@ -14,13 +14,42 @@ set -e
 SCRCPY_DEBUG=false
 SCRCPY_VERSION_NAME=1.24

-PLATFORM=${ANDROID_PLATFORM:-31}
-BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-31.0.0}
+SERVER_DIR="$(realpath $(dirname "$0"))"
+KEYSTORE_PROPERTIES_FILE="$SERVER_DIR/keystore.properties"
+
+if [[ ! -f "$KEYSTORE_PROPERTIES_FILE" ]]
+then
+    echo "The file '$KEYSTORE_PROPERTIES_FILE' does not exist." >&2
+    echo "Please read '$SERVER_DIR/HOWTO_keystore.txt'." >&2
+    exit 1
+fi
+
+declare -A props
+while IFS='=' read -r key value
+do
+    props["$key"]="$value"
+done < "$KEYSTORE_PROPERTIES_FILE"
+
+KEYSTORE_FILE=${props['storeFile']}
+KEYSTORE_PASSWORD=${props['storePassword']}
+KEYSTORE_KEY_ALIAS=${props['keyAlias']}
+KEYSTORE_KEY_PASSWORD=${props['keyPassword']}
+
+if [[ ! -f "$KEYSTORE_FILE" ]]
+then
+    echo "Keystore '$KEYSTORE_FILE' (read from '$KEYSTORE_PROPERTIES_FILE')" \
+         "does not exist." >&2
+    echo "Please read '$SERVER_DIR/HOWTO_keystore.txt'." >&2
+    exit 2
+fi
+
+PLATFORM=${ANDROID_PLATFORM:-33}
+BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-33.0.0}
+BUILD_TOOLS_DIR="$ANDROID_HOME/build-tools/$BUILD_TOOLS"

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

 echo "Platform: android-$PLATFORM"
@ -41,9 +70,8 @@ EOF

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

 echo "Compiling java sources..."
@ -59,20 +87,15 @@ cd "$CLASSES_DIR"
 if [[ $PLATFORM -lt 31 ]]
 then
    # use dx
-    "$ANDROID_HOME/build-tools/$BUILD_TOOLS/dx" --dex \
-        --output "$BUILD_DIR/classes.dex" \
+    "$BUILD_TOOLS_DIR/dx" --dex --output "$BUILD_DIR/classes.dex" \
        android/view/*.class \
        android/content/*.class \
        com/genymobile/scrcpy/*.class \
        com/genymobile/scrcpy/wrappers/*.class
-
-    echo "Archiving..."
    cd "$BUILD_DIR"
-    jar cvf "$SERVER_BINARY" classes.dex
-    rm -rf classes.dex classes
 else
    # use d8
-    "$ANDROID_HOME/build-tools/$BUILD_TOOLS/d8" --classpath "$ANDROID_JAR" \
+    "$BUILD_TOOLS_DIR/d8" --classpath "$ANDROID_JAR" \
        --output "$BUILD_DIR/classes.zip" \
        android/view/*.class \
        android/content/*.class \
@ -80,8 +103,24 @@ else
        com/genymobile/scrcpy/wrappers/*.class

    cd "$BUILD_DIR"
-    mv classes.zip "$SERVER_BINARY"
-    rm -rf classes
+    unzip -o classes.zip classes.dex  # we need the inner classes.dex
 fi

+echo "Packaging..."
+# note: if a res directory exists, add: -S "$SERVER_DIR/src/main/res"
+"$BUILD_TOOLS_DIR/aapt" package -f \
+    -M "$SERVER_DIR/src/main/AndroidManifest.xml" \
+    -I "$ANDROID_JAR" \
+    -F "$SERVER_BINARY.unaligned"
+"$BUILD_TOOLS_DIR/aapt" add "$SERVER_BINARY.unaligned" classes.dex
+"$BUILD_TOOLS_DIR/zipalign" -p 4 "$SERVER_BINARY.unaligned" "$SERVER_BINARY"
+rm "$SERVER_BINARY.unaligned"
+
+"$BUILD_TOOLS_DIR/apksigner" sign \
+    --ks "$KEYSTORE_FILE" \
+    --ks-pass "pass:$KEYSTORE_PASSWORD" \
+    --ks-key-alias "$KEYSTORE_KEY_ALIAS" \
+    --key-pass "pass:$KEYSTORE_KEY_PASSWORD" \
+    "$SERVER_BINARY"
+
 echo "Server generated in $BUILD_DIR/$SERVER_BINARY"
--- a/server/keystore.properties.sample
+++ b/server/keystore.properties.sample
@ -0,0 +1,4 @@
+storeFile=/path/to/your/keystore
+storePassword=PASSWORD
+keyAlias=scrcpy
+keyPassword=PASSWORD
--- a/server/meson.build
+++ b/server/meson.build
@ -6,19 +6,19 @@ if prebuilt_server == ''
                  # gradle is responsible for tracking source changes
                  build_by_default: true,
                  build_always_stale: true,
-                  output: 'scrcpy-server',
+                  output: 'scrcpy-server.apk',
                  command: [find_program('./scripts/build-wrapper.sh'), meson.current_source_dir(), '@OUTPUT@', get_option('buildtype')],
                  console: true,
                  install: true,
                  install_dir: 'share/scrcpy')
 else
    if not prebuilt_server.startswith('/')
-        # relative path needs some trick
-        prebuilt_server = meson.source_root() + '/' + prebuilt_server
+        # prebuilt server path is relative to the root scrcpy directory
+        prebuilt_server = '../' + prebuilt_server
    endif
    custom_target('scrcpy-server-prebuilt',
                  input: prebuilt_server,
-                  output: 'scrcpy-server',
+                  output: 'scrcpy-server.apk',
                  command: ['cp', '@INPUT@', '@OUTPUT@'],
                  install: true,
                  install_dir: 'share/scrcpy')
--- a/server/scripts/build-wrapper.sh
+++ b/server/scripts/build-wrapper.sh
@ -25,5 +25,5 @@ then
    cp "$PROJECT_ROOT/build/outputs/apk/debug/server-debug.apk" "$OUTPUT"
 else
    "$GRADLE" -p "$PROJECT_ROOT" assembleRelease
-    cp "$PROJECT_ROOT/build/outputs/apk/release/server-release-unsigned.apk" "$OUTPUT"
+    cp "$PROJECT_ROOT/build/outputs/apk/release/server-release.apk" "$OUTPUT"
 fi
--- a/server/src/main/java/com/genymobile/scrcpy/Binary.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Binary.java
@ -0,0 +1,38 @@
+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);
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@ -16,7 +16,7 @@ import java.io.IOException;
 */
 public final class CleanUp {

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

    // A simple struct to be passed from the main process to the cleanup process
    public static class Config implements Parcelable {
@ -37,6 +37,8 @@ public final class CleanUp {
        private static final int FLAG_RESTORE_NORMAL_POWER_MODE = 2;
        private static final int FLAG_POWER_OFF_SCREEN = 4;

+        private boolean installed;
+
        private int displayId;

        // Restore the value (between 0 and 7), -1 to not restore
@ -52,6 +54,7 @@ public final class CleanUp {
        }

        protected Config(Parcel in) {
+            installed = in.readInt() != 0;
            displayId = in.readInt();
            restoreStayOn = in.readInt();
            byte options = in.readByte();
@ -62,6 +65,7 @@ public final class CleanUp {

        @Override
        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(installed ? 1 : 0);
            dest.writeInt(displayId);
            dest.writeInt(restoreStayOn);
            byte options = 0;
@ -116,9 +120,10 @@ public final class CleanUp {
        // not instantiable
    }

-    public static void configure(int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode, boolean powerOffScreen)
+    public static void configure(boolean installed, int displayId, int restoreStayOn, boolean disableShowTouches, boolean restoreNormalPowerMode, boolean powerOffScreen)
            throws IOException {
        Config config = new Config();
+        config.installed = installed;
        config.displayId = displayId;
        config.disableShowTouches = disableShowTouches;
        config.restoreStayOn = restoreStayOn;
@ -127,8 +132,9 @@ public final class CleanUp {

        if (config.hasWork()) {
            startProcess(config);
-        } else {
-            // There is no additional clean up to do when scrcpy dies
+        } else if (!installed) {
+            // There is no additional clean up to do when scrcpy dies.
+            // If the APK has been pushed to /data/local/tmp, remove it.
            unlinkSelf();
        }
    }
@ -136,6 +142,7 @@ public final class CleanUp {
    private static void startProcess(Config config) throws IOException {
        String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};

+        // TODO if scrcpy is "installed", then we must find the install path!
        ProcessBuilder builder = new ProcessBuilder(cmd);
        builder.environment().put("CLASSPATH", SERVER_PATH);
        builder.start();
@ -150,7 +157,12 @@ public final class CleanUp {
    }

    public static void main(String... args) {
-        unlinkSelf();
+        Config config = Config.fromBase64(args[0]);
+
+        if (!config.installed) {
+            // If the APK has been pushed to /data/local/tmp, remove it.
+            unlinkSelf();
+        }

        try {
            // Wait for the server to die
@ -161,8 +173,6 @@ public final class CleanUp {

        Ln.i("Cleaning up");

-        Config config = Config.fromBase64(args[0]);
-
        if (config.disableShowTouches || config.restoreStayOn != -1) {
            ServiceManager serviceManager = new ServiceManager();
            Settings settings = new Settings(serviceManager);
--- a/server/src/main/java/com/genymobile/scrcpy/Command.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Command.java
@ -30,4 +30,14 @@ 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;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@ -33,8 +33,8 @@ public final class ControlMessage {
    private long pointerId;
    private float pressure;
    private Position position;
-    private int hScroll;
-    private int vScroll;
+    private float hScroll;
+    private float vScroll;
    private int copyKey;
    private boolean paste;
    private int repeat;
@ -71,7 +71,7 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createInjectScrollEvent(Position position, int hScroll, int vScroll, int buttons) {
+    public static ControlMessage createInjectScrollEvent(Position position, float hScroll, float vScroll, int buttons) {
        ControlMessage msg = new ControlMessage();
        msg.type = TYPE_INJECT_SCROLL_EVENT;
        msg.position = position;
@ -156,11 +156,11 @@ public final class ControlMessage {
        return position;
    }

-    public int getHScroll() {
+    public float getHScroll() {
        return hScroll;
    }

-    public int getVScroll() {
+    public float getVScroll() {
        return vScroll;
    }

--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@ -10,7 +10,7 @@ public class ControlMessageReader {

    static final int INJECT_KEYCODE_PAYLOAD_LENGTH = 13;
    static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 27;
-    static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 24;
+    static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
    static final int BACK_OR_SCREEN_ON_LENGTH = 1;
    static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
    static final int GET_CLIPBOARD_LENGTH = 1;
@ -103,7 +103,7 @@ public class ControlMessageReader {
        if (buffer.remaining() < INJECT_KEYCODE_PAYLOAD_LENGTH) {
            return null;
        }
-        int action = toUnsigned(buffer.get());
+        int action = Binary.toUnsigned(buffer.get());
        int keycode = buffer.getInt();
        int repeat = buffer.getInt();
        int metaState = buffer.getInt();
@ -136,13 +136,10 @@ public class ControlMessageReader {
        if (buffer.remaining() < INJECT_TOUCH_EVENT_PAYLOAD_LENGTH) {
            return null;
        }
-        int action = toUnsigned(buffer.get());
+        int action = Binary.toUnsigned(buffer.get());
        long pointerId = buffer.getLong();
        Position position = readPosition(buffer);
-        // 16 bits fixed-point
-        int pressureInt = toUnsigned(buffer.getShort());
-        // convert it to a float between 0 and 1 (0x1p16f is 2^16 as float)
-        float pressure = pressureInt == 0xffff ? 1f : (pressureInt / 0x1p16f);
+        float pressure = Binary.u16FixedPointToFloat(buffer.getShort());
        int buttons = buffer.getInt();
        return ControlMessage.createInjectTouchEvent(action, pointerId, position, pressure, buttons);
    }
@ -152,8 +149,8 @@ public class ControlMessageReader {
            return null;
        }
        Position position = readPosition(buffer);
-        int hScroll = buffer.getInt();
-        int vScroll = buffer.getInt();
+        float hScroll = Binary.i16FixedPointToFloat(buffer.getShort());
+        float vScroll = Binary.i16FixedPointToFloat(buffer.getShort());
        int buttons = buffer.getInt();
        return ControlMessage.createInjectScrollEvent(position, hScroll, vScroll, buttons);
    }
@ -162,7 +159,7 @@ public class ControlMessageReader {
        if (buffer.remaining() < BACK_OR_SCREEN_ON_LENGTH) {
            return null;
        }
-        int action = toUnsigned(buffer.get());
+        int action = Binary.toUnsigned(buffer.get());
        return ControlMessage.createBackOrScreenOn(action);
    }

@ -170,7 +167,7 @@ public class ControlMessageReader {
        if (buffer.remaining() < GET_CLIPBOARD_LENGTH) {
            return null;
        }
-        int copyKey = toUnsigned(buffer.get());
+        int copyKey = Binary.toUnsigned(buffer.get());
        return ControlMessage.createGetClipboard(copyKey);
    }

@ -198,16 +195,8 @@ public class ControlMessageReader {
    private static Position readPosition(ByteBuffer buffer) {
        int x = buffer.getInt();
        int y = buffer.getInt();
-        int screenWidth = toUnsigned(buffer.getShort());
-        int screenHeight = toUnsigned(buffer.getShort());
+        int screenWidth = Binary.toUnsigned(buffer.getShort());
+        int screenHeight = Binary.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;
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@ -223,7 +223,7 @@ public class Controller {
        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
    }

-    private boolean injectScroll(Position position, int hScroll, int vScroll, int buttons) {
+    private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
        long now = SystemClock.uptimeMillis();
        Point point = device.getPhysicalPoint(position);
        if (point == null) {
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@ -7,6 +7,7 @@ import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import com.genymobile.scrcpy.wrappers.WindowManager;

 import android.content.IOnPrimaryClipChangedListener;
+import android.content.pm.ApplicationInfo;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
@ -21,6 +22,8 @@ import java.util.concurrent.atomic.AtomicBoolean;

 public final class Device {

+    private static final String SCRCPY_PACKAGE_NAME = "com.genymobile.scrcpy";
+
    public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF;
    public static final int POWER_MODE_NORMAL = SurfaceControl.POWER_MODE_NORMAL;

@ -319,4 +322,12 @@ public final class Device {
    public static Settings getSettings() {
        return SETTINGS;
    }
+
+    public static String getApkPath() {
+        ApplicationInfo info = SERVICE_MANAGER.getPackageManager().getApplicationInfo(SCRCPY_PACKAGE_NAME);
+        if (info == null) {
+            return null;
+        }
+        return info.sourceDir;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/IO.java
+++ b/server/src/main/java/com/genymobile/scrcpy/IO.java
@ -6,7 +6,9 @@ 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() {
@ -37,4 +39,13 @@ 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();
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@ -23,6 +23,7 @@ public class Options {
    private boolean downsizeOnError = true;
    private boolean cleanup = true;
    private boolean powerOn = true;
+    private boolean installed = false;

    // Options not used by the scrcpy client, but useful to use scrcpy-server directly
    private boolean sendDeviceMeta = true; // send device name and size
@ -196,4 +197,12 @@ public class Options {
    public void setSendDummyByte(boolean sendDummyByte) {
        this.sendDummyByte = sendDummyByte;
    }
+
+    public boolean getInstalled() {
+        return installed;
+    }
+
+    public void setInstalled(boolean installed) {
+        this.installed = installed;
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@ -52,8 +52,8 @@ public final class Server {

        if (options.getCleanup()) {
            try {
-                CleanUp.configure(options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp, restoreNormalPowerMode,
-                        options.getPowerOffScreenOnClose());
+                CleanUp.configure(options.getInstalled(), options.getDisplayId(), restoreStayOn, mustDisableShowTouchesOnCleanUp,
+                        restoreNormalPowerMode, options.getPowerOffScreenOnClose());
            } catch (IOException e) {
                Ln.e("Could not configure cleanup", e);
            }
@ -252,6 +252,10 @@ public final class Server {
                    boolean powerOn = Boolean.parseBoolean(value);
                    options.setPowerOn(powerOn);
                    break;
+                case "installed":
+                    boolean installed = Boolean.parseBoolean(value);
+                    options.setInstalled(installed);
+                    break;
                case "send_device_meta":
                    boolean sendDeviceMeta = Boolean.parseBoolean(value);
                    options.setSendDeviceMeta(sendDeviceMeta);
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@ -1,22 +1,78 @@
 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 android.os.IInterface;
+import android.view.Display;
+
+import java.lang.reflect.Field;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 public final class DisplayManager {
-    private final IInterface manager;
+    private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal

-    public DisplayManager(IInterface manager) {
+    public DisplayManager(Object manager) {
        this.manager = manager;
    }

+    // public to call it from unit tests
+    public static DisplayInfo parseDisplayInfo(String dumpsysDisplayOutput, int displayId) {
+        Pattern regex = Pattern.compile(
+                "^    mOverrideDisplayInfo=DisplayInfo\\{\".*?\", displayId " + displayId + ".*?(, FLAG_.*)?, real ([0-9]+) x ([0-9]+).*?, "
+                        + "rotation ([0-9]+).*?, layerStack ([0-9]+)",
+                Pattern.MULTILINE);
+        Matcher m = regex.matcher(dumpsysDisplayOutput);
+        if (!m.find()) {
+            return null;
+        }
+        int flags = parseDisplayFlags(m.group(1));
+        int width = Integer.parseInt(m.group(2));
+        int height = Integer.parseInt(m.group(3));
+        int rotation = Integer.parseInt(m.group(4));
+        int layerStack = Integer.parseInt(m.group(5));
+
+        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
+    }
+
+    private static DisplayInfo getDisplayInfoFromDumpsysDisplay(int displayId) {
+        try {
+            String dumpsysDisplayOutput = Command.execReadOutput("dumpsys", "display");
+            return parseDisplayInfo(dumpsysDisplayOutput, displayId);
+        } catch (Exception e) {
+            Ln.e("Could not get display info from \"dumpsys display\" output", e);
+            return null;
+        }
+    }
+
+    private static int parseDisplayFlags(String text) {
+        Pattern regex = Pattern.compile("FLAG_[A-Z_]+");
+        if (text == null) {
+            return 0;
+        }
+
+        int flags = 0;
+        Matcher m = regex.matcher(text);
+        while (m.find()) {
+            String flagString = m.group();
+            try {
+                Field filed = Display.class.getDeclaredField(flagString);
+                flags |= filed.getInt(null);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                // Silently ignore, some flags reported by "dumpsys display" are @TestApi
+            }
+        }
+        return flags;
+    }
+
    public DisplayInfo getDisplayInfo(int displayId) {
        try {
            Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, displayId);
            if (displayInfo == null) {
-                return null;
+                // fallback when displayInfo is null
+                return getDisplayInfoFromDumpsysDisplay(displayId);
            }
            Class<?> cls = displayInfo.getClass();
            // width and height already take the rotation into account
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/PackageManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/PackageManager.java
@ -0,0 +1,36 @@
+package com.genymobile.scrcpy.wrappers;
+
+import com.genymobile.scrcpy.Ln;
+
+import android.content.pm.ApplicationInfo;
+import android.os.IInterface;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class PackageManager {
+
+    private IInterface manager;
+    private Method getApplicationInfoMethod;
+
+    public PackageManager(IInterface manager) {
+        this.manager = manager;
+    }
+
+    private Method getGetApplicationInfoMethod() throws NoSuchMethodException {
+        if (getApplicationInfoMethod == null) {
+            getApplicationInfoMethod = manager.getClass().getDeclaredMethod("getApplicationInfo", String.class, int.class, int.class);
+        }
+        return getApplicationInfoMethod;
+    }
+
+    public ApplicationInfo getApplicationInfo(String packageName) {
+        try {
+            Method method = getGetApplicationInfoMethod();
+            return (ApplicationInfo) method.invoke(manager, packageName, 0, ServiceManager.USER_ID);
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+            Ln.e("Cannot get application info", e);
+            return null;
+        }
+    }
+}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java
@ -22,6 +22,7 @@ public final class ServiceManager {
    private StatusBarManager statusBarManager;
    private ClipboardManager clipboardManager;
    private ActivityManager activityManager;
+    private PackageManager packageManager;

    public ServiceManager() {
        try {
@ -50,7 +51,14 @@ public final class ServiceManager {

    public DisplayManager getDisplayManager() {
        if (displayManager == null) {
-            displayManager = new DisplayManager(getService("display", "android.hardware.display.IDisplayManager"));
+            try {
+                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;
    }
@ -112,4 +120,20 @@ public final class ServiceManager {

        return activityManager;
    }
+
+    public PackageManager getPackageManager() {
+        if (packageManager == null) {
+            try {
+                //IInterface manager = getService("package", "android.content.pm.IPackageManager");
+                Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
+                Method getPackageManager = activityThreadClass.getDeclaredMethod("getPackageManager");
+                IInterface manager = (IInterface) getPackageManager.invoke(null);
+                return new PackageManager(manager);
+            } catch (Exception e) {
+                throw new AssertionError(e);
+            }
+        }
+
+        return packageManager;
+    }
 }
--- a/server/src/test/java/com/genymobile/scrcpy/BinaryTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/BinaryTest.java
@ -0,0 +1,42 @@
+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);
+    }
+}
--- a/server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/CommandParserTest.java
@ -0,0 +1,186 @@
+package com.genymobile.scrcpy;
+
+import com.genymobile.scrcpy.wrappers.DisplayManager;
+
+import android.view.Display;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CommandParserTest {
+    @Test
+    public void testParseDisplayInfoFromDumpsysDisplay() {
+        /* @formatter:off */
+        String partialOutput = "Logical Displays: size=1\n"
+                + "  Display 0:\n"
+                + "mDisplayId=0\n"
+                + "    mLayerStack=0\n"
+                + "    mHasContent=true\n"
+                + "    mDesiredDisplayModeSpecs={baseModeId=2 primaryRefreshRateRange=[90 90] appRequestRefreshRateRange=[90 90]}\n"
+                + "    mRequestedColorMode=0\n"
+                + "    mDisplayOffset=(0, 0)\n"
+                + "    mDisplayScalingDisabled=false\n"
+                + "    mPrimaryDisplayDevice=Built-in Screen\n"
+                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, "
+                + "real 1440 x 3120, largest app 1440 x 3120, smallest app 1440 x 3120, appVsyncOff 2000000, presDeadline 11111111, mode 2, "
+                + "defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, width=1080, "
+                + "height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], "
+                + "mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, minimalPostProcessingSupported false, rotation 0, state OFF, "
+                + "type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 (515.154 x 514.597) dpi, layerStack 0, colorMode 0, "
+                + "supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo DeviceProductInfo{name=, manufacturerPnpId=QCM, "
+                + "productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, relativeAddress=null}, removeMode 0}\n"
+                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
+                + "FLAG_TRUSTED, real 1440 x 3120, largest app 3120 x 2983, smallest app 1440 x 1303, appVsyncOff 2000000, presDeadline 11111111, "
+                + "mode 2, defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, "
+                + "width=1080, height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities "
+                + "HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, "
+                + "minimalPostProcessingSupported false, rotation 0, state ON, type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 "
+                + "(515.154 x 514.597) dpi, layerStack 0, colorMode 0, supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo "
+                + "DeviceProductInfo{name=, manufacturerPnpId=QCM, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, "
+                + "relativeAddress=null}, removeMode 0}\n"
+                + "    mRequestedMinimalPostProcessing=false\n";
+        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
+        Assert.assertNotNull(displayInfo);
+        Assert.assertEquals(0, displayInfo.getDisplayId());
+        Assert.assertEquals(0, displayInfo.getRotation());
+        Assert.assertEquals(0, displayInfo.getLayerStack());
+        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
+        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
+        Assert.assertEquals(1440, displayInfo.getSize().getWidth());
+        Assert.assertEquals(3120, displayInfo.getSize().getHeight());
+    }
+
+    @Test
+    public void testParseDisplayInfoFromDumpsysDisplayWithRotation() {
+        /* @formatter:off */
+        String partialOutput = "Logical Displays: size=1\n"
+                + "  Display 0:\n"
+                + "mDisplayId=0\n"
+                + "    mLayerStack=0\n"
+                + "    mHasContent=true\n"
+                + "    mDesiredDisplayModeSpecs={baseModeId=2 primaryRefreshRateRange=[90 90] appRequestRefreshRateRange=[90 90]}\n"
+                + "    mRequestedColorMode=0\n"
+                + "    mDisplayOffset=(0, 0)\n"
+                + "    mDisplayScalingDisabled=false\n"
+                + "    mPrimaryDisplayDevice=Built-in Screen\n"
+                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, "
+                + "real 1440 x 3120, largest app 1440 x 3120, smallest app 1440 x 3120, appVsyncOff 2000000, presDeadline 11111111, mode 2, "
+                + "defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, width=1080, "
+                + "height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], "
+                + "mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, minimalPostProcessingSupported false, rotation 0, state ON, "
+                + "type INTERNAL, uniqueId \"local:0\", app 1440 x 3120, density 600 (515.154 x 514.597) dpi, layerStack 0, colorMode 0, "
+                + "supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo DeviceProductInfo{name=, manufacturerPnpId=QCM, "
+                + "productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, relativeAddress=null}, removeMode 0}\n"
+                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0, FLAG_SECURE, FLAG_SUPPORTS_PROTECTED_BUFFERS, "
+                + "FLAG_TRUSTED, real 3120 x 1440, largest app 3120 x 2983, smallest app 1440 x 1303, appVsyncOff 2000000, presDeadline 11111111, "
+                + "mode 2, defaultMode 1, modes [{id=1, width=1440, height=3120, fps=60.0}, {id=2, width=1440, height=3120, fps=90.0}, {id=3, "
+                + "width=1080, height=2340, fps=90.0}, {id=4, width=1080, height=2340, fps=60.0}], hdrCapabilities "
+                + "HdrCapabilities{mSupportedHdrTypes=[2, 3, 4], mMaxLuminance=540.0, mMaxAverageLuminance=270.1, mMinLuminance=0.2}, "
+                + "minimalPostProcessingSupported false, rotation 3, state ON, type INTERNAL, uniqueId \"local:0\", app 3120 x 1440, density 600 "
+                + "(515.154 x 514.597) dpi, layerStack 0, colorMode 0, supportedColorModes [0, 7, 9], address {port=129, model=0}, deviceProductInfo "
+                + "DeviceProductInfo{name=, manufacturerPnpId=QCM, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, "
+                + "relativeAddress=null}, removeMode 0}\n"
+                + "    mRequestedMinimalPostProcessing=false";
+        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
+        Assert.assertNotNull(displayInfo);
+        Assert.assertEquals(0, displayInfo.getDisplayId());
+        Assert.assertEquals(3, displayInfo.getRotation());
+        Assert.assertEquals(0, displayInfo.getLayerStack());
+        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
+        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
+        Assert.assertEquals(3120, displayInfo.getSize().getWidth());
+        Assert.assertEquals(1440, displayInfo.getSize().getHeight());
+    }
+
+    @Test
+    public void testParseDisplayInfoFromDumpsysDisplayAPI31() {
+        /* @formatter:off */
+        String partialOutput = "Logical Displays: size=1\n"
+                + "  Display 0:\n"
+                + "    mDisplayId=0\n"
+                + "    mPhase=1\n"
+                + "    mLayerStack=0\n"
+                + "    mHasContent=true\n"
+                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
+                + "Infinity]}\n"
+                + "    mRequestedColorMode=0\n"
+                + "    mDisplayOffset=(0, 0)\n"
+                + "    mDisplayScalingDisabled=false\n"
+                + "    mPrimaryDisplayDevice=Built-in Screen\n"
+                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
+                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
+                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, FLAG_SECURE, "
+                + "FLAG_SUPPORTS_PROTECTED_BUFFERS, FLAG_TRUSTED, real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
+                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "    mRequestedMinimalPostProcessing=false\n"
+                + "    mFrameRateOverrides=[]\n"
+                + "    mPendingFrameRateOverrideUids={}\n";
+        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
+        Assert.assertNotNull(displayInfo);
+        Assert.assertEquals(0, displayInfo.getDisplayId());
+        Assert.assertEquals(0, displayInfo.getRotation());
+        Assert.assertEquals(0, displayInfo.getLayerStack());
+        // FLAG_TRUSTED does not exist in Display (@TestApi), so it won't be reported
+        Assert.assertEquals(Display.FLAG_SECURE | Display.FLAG_SUPPORTS_PROTECTED_BUFFERS, displayInfo.getFlags());
+        Assert.assertEquals(1080, displayInfo.getSize().getWidth());
+        Assert.assertEquals(2280, displayInfo.getSize().getHeight());
+    }
+
+    @Test
+    public void testParseDisplayInfoFromDumpsysDisplayAPI31NoFlags() {
+        /* @formatter:off */
+        String partialOutput = "Logical Displays: size=1\n"
+                + "  Display 0:\n"
+                + "    mDisplayId=0\n"
+                + "    mPhase=1\n"
+                + "    mLayerStack=0\n"
+                + "    mHasContent=true\n"
+                + "    mDesiredDisplayModeSpecs={baseModeId=1 allowGroupSwitching=false primaryRefreshRateRange=[0 60] appRequestRefreshRateRange=[0 "
+                + "Infinity]}\n"
+                + "    mRequestedColorMode=0\n"
+                + "    mDisplayOffset=(0, 0)\n"
+                + "    mDisplayScalingDisabled=false\n"
+                + "    mPrimaryDisplayDevice=Built-in Screen\n"
+                + "    mBaseDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
+                + "real 1080 x 2280, largest app 1080 x 2280, smallest app 1080 x 2280, appVsyncOff "
+                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2280, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "    mOverrideDisplayInfo=DisplayInfo{\"Built-in Screen\", displayId 0\", displayGroupId 0, "
+                + "real 1080 x 2280, largest app 2148 x 2065, smallest app 1080 x 997, appVsyncOff "
+                + "1000000, presDeadline 16666666, mode 1, defaultMode 1, modes [{id=1, width=1080, height=2280, fps=60.000004, "
+                + "alternativeRefreshRates=[]}], hdrCapabilities HdrCapabilities{mSupportedHdrTypes=[], mMaxLuminance=500.0, "
+                + "mMaxAverageLuminance=500.0, mMinLuminance=0.0}, userDisabledHdrTypes [], minimalPostProcessingSupported false, rotation 0, state "
+                + "ON, type INTERNAL, uniqueId \"local:0\", app 1080 x 2148, density 440 (440.0 x 440.0) dpi, layerStack 0, colorMode 0, "
+                + "supportedColorModes [0], address {port=0, model=0}, deviceProductInfo DeviceProductInfo{name=EMU_display_0, "
+                + "manufacturerPnpId=GGL, productId=1, modelYear=null, manufactureDate=ManufactureDate{week=27, year=2006}, connectionToSinkType=0}, "
+                + "removeMode 0, refreshRateOverride 0.0, brightnessMinimum 0.0, brightnessMaximum 1.0, brightnessDefault 0.39763778}\n"
+                + "    mRequestedMinimalPostProcessing=false\n"
+                + "    mFrameRateOverrides=[]\n"
+                + "    mPendingFrameRateOverrideUids={}\n";
+        DisplayInfo displayInfo = DisplayManager.parseDisplayInfo(partialOutput, 0);
+        Assert.assertNotNull(displayInfo);
+        Assert.assertEquals(0, displayInfo.getDisplayId());
+        Assert.assertEquals(0, displayInfo.getRotation());
+        Assert.assertEquals(0, displayInfo.getLayerStack());
+        Assert.assertEquals(0, displayInfo.getFlags());
+        Assert.assertEquals(1080, displayInfo.getSize().getWidth());
+        Assert.assertEquals(2280, displayInfo.getSize().getHeight());
+    }
+}
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/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.writeInt(1);
-        dos.writeInt(-1);
+        dos.writeShort(0); // 0.0f encoded as i16
+        dos.writeShort(0x8000); // -1.0f encoded as i16
        dos.writeInt(1);

        byte[] packet = bos.toByteArray();
@ -143,8 +143,8 @@ public class ControlMessageReaderTest {
        Assert.assertEquals(1026, event.getPosition().getPoint().getY());
        Assert.assertEquals(1080, event.getPosition().getScreenSize().getWidth());
        Assert.assertEquals(1920, event.getPosition().getScreenSize().getHeight());
-        Assert.assertEquals(1, event.getHScroll());
-        Assert.assertEquals(-1, event.getVScroll());
+        Assert.assertEquals(0f, event.getHScroll(), 0f);
+        Assert.assertEquals(-1f, event.getVScroll(), 0f);
        Assert.assertEquals(1, event.getButtons());
    }
Author	SHA1	Message	Date
Romain Vimont	7b75a3c966	clean up	2022-10-02 16:36:05 +02:00
Romain Vimont	64b70724e0	Expose APK path from Java	2022-10-02 16:36:05 +02:00
Romain Vimont	2bc1f59b5b	Add option --reinstall With --install, the server is installed only if the current version is not already installed. Passing --reinstall force reinstallation is all cases.	2022-10-02 15:52:59 +02:00
Romain Vimont	bef5b11e45	Add option --install When this flag is set, the scrcpy is installed rather than pushed to /data/local/tmp.	2022-10-02 15:52:59 +02:00
Romain Vimont	c96c77656a	Add "adb uninstall" This will allow to uninstall the server when necessary.	2022-10-02 15:52:59 +02:00
Romain Vimont	a73a04da87	Add util function to get the APK version Use "dumpsys package com.genymobile.scrcpy" to get the APK version.	2022-10-02 15:52:59 +02:00
Romain Vimont	00766b8ab6	Add util function to get the APK path Use "pm list package -f" to find where the APK is actually installed on the device.	2022-10-02 15:52:59 +02:00
Romain Vimont	88499cd101	Make build_without_gradle generate a signed APK	2022-10-02 15:52:59 +02:00
Romain Vimont	b5b431fa32	Sign APK with credentials from keystore.properties	2022-10-02 15:52:59 +02:00
Romain Vimont	f34075ff52	Rename server to scrcpy-server.apk This will allow to install it.	2022-10-02 15:52:59 +02:00
Romain Vimont	7505f7117e	Fix typo in logs	2022-09-27 14:12:37 +02:00
SeungHoon Han	949b64dff2	Add fallback to get DisplayInfo PR #3416 <https://github.com/Genymobile/scrcpy/pull/3416> Signed-off-by: Romain Vimont <rom@rom1v.com>	2022-09-25 16:22:51 +02:00
Romain Vimont	00e9e69c2a	Use /dev/null instead of closing fds Some adb commands do not like when stdin, stdout or stderr are closed (they hang forever). Open /dev/null for each.	2022-09-25 15:42:33 +02:00
Romain Vimont	4a5cdcd390	Extract $BUILD_TOOLS_DIR In the script to build without gradle, the build-tools full path is used at several places. Use a separate variable for readability.	2022-09-25 14:26:07 +02:00
Romain Vimont	e5e210506f	Add scrcpy-console.desktop Add a launcher which opens a terminal, and keep it open in case of errors (so that the user has time to read error messages). The behavior is the same as scrcpy-console.bat on Windows. PR #3351 <https://github.com/Genymobile/scrcpy/pull/3351>	2022-09-09 19:06:29 +02:00
Chih-Hsuan Yen	a2a22f497f	Use shell environment to execute launcher Make Exec= compatible with $PATH configured in .bashrc or .zshrc… PR #3351 <https://github.com/Genymobile/scrcpy/pull/3351> Refs #296 <https://github.com/Genymobile/scrcpy/pull/296#discussion_r224987002> Signed-off-by: Romain Vimont <rom@rom1v.com>	2022-09-09 19:06:29 +02:00
Addison Snelling	51a1762cbd	Add desktop entry file for Linux app launchers Refs <https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html> PR #3351 <https://github.com/Genymobile/scrcpy/pull/3351> Replaces PR #296 <https://github.com/Genymobile/scrcpy/pull/296> Fixes #295 <https://github.com/Genymobile/scrcpy/issues/295> Fixes #748 <https://github.com/Genymobile/scrcpy/issues/748> Fixes #1636 <https://github.com/Genymobile/scrcpy/issues/1636> Co-authored-by: Chih-Hsuan Yen <yan12125@gmail.com> Signed-off-by: Romain Vimont <rom@rom1v.com>	2022-09-09 19:06:29 +02:00
Romain Vimont	c1ec1d1023	Replace hardcoded 'share/' by datadir variable Meson defines a variable for the data directory. PR #3351 <https://github.com/Genymobile/scrcpy/pull/3351>	2022-09-09 19:06:29 +02:00
Romain Vimont	0a0a446ea6	Upgrade Android SDK to 33	2022-09-02 14:42:37 +02:00
Romain Vimont	fccfc43b9e	Upgrade gradle build tools to 7.2.2 Plugin version 7.2.2. Gradle version 7.3.3. Refs: <https://developer.android.com/studio/releases/gradle-plugin#updating-gradle>	2022-09-02 14:40:16 +02:00
Romain Vimont	121bb71dfe	Move from jcenter() to mavenCentral() Refs <https://developer.android.com/studio/build/jcenter-migration> Refs <https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/>	2022-09-02 14:31:15 +02:00
Simon Chan	57056d078d	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>	2022-08-28 15:23:08 +02:00
Romain Vimont	1f138aef41	Add conversion from float to fixed-point i16 To encode float values between -1 and 1. PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	1ab6c19486	Add unit test for float encoding PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	fd3483c837	Extract conversion from float to u16 fixed-point PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	041cdf6cf5	Rename buffer_util.h to binary.h It will allow to expose more binary util functions not related to buffers. PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	136ab8c199	Add unit test for float decoding PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	3848ce86f1	Extract conversion from u16 fixed-point to float PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	5b8e9aa0e9	Move toUnsigned() to a Binary util class PR #3369 <https://github.com/Genymobile/scrcpy/pull/3369>	2022-08-28 15:23:08 +02:00
Romain Vimont	3a66b5fd01	Remove deprecated meson.source_root() This method is deprecated since Meson 0.56.0: <https://mesonbuild.com/Release-notes-for-0-56-0.html#mesonbuild_root-and-mesonsource_root-are-deprecated> We could replace it with meson.project_source_root(), but this would make Meson 0.56 or above mandatory. Since the path in always computed from the server/ directory, just add '..' to reference the root project directory. Refs `c456e38264`	2022-08-28 15:16:31 +02:00
Derek Wu	9c1722f428	Use DisplayManagerGlobal instance Use the client instance to communicate with the DisplayManager server. Fixes #3446 <https://github.com/Genymobile/scrcpy/issues/3446> Signed-off-by: Romain Vimont <rom@rom1v.com>	2022-08-19 18:03:38 +02:00
Romain Vimont	d19606eb0c	Rename net_listen() parameter For consistency with net_accept(), which necessarily uses a server socket, name the net_listen() parameter "server_socket".	2022-08-17 16:40:45 +02:00
Romain Vimont	d23b3e88a4	Replace '%g' by '%f' as printf format For some reason, '%g' does not work correctly with MinGW. Refs #3369 <https://github.com/Genymobile/scrcpy/pull/3369> PR #3399 <https://github.com/Genymobile/scrcpy/pull/3399>	2022-08-03 23:25:09 +02:00
Romain Vimont	a47848f304	Detect Windows using _WIN32 in network util For consistency, always use _WIN32 instead of a mix of __WINDOWS__ and _WIN32.	2022-07-27 14:54:27 +02:00
Romain Vimont	db8c1ce8e1	Fix protocol documentation in comments Flags were in the correct order in the schema, but their description were reversed.	2022-07-20 11:41:04 +02:00
Romain Vimont	4aeb78ece2	Add missing allocation failure check	2022-07-19 12:17:02 +02:00
Romain Vimont	396e4bd925	Add missing LOG_OOM() on malloc failure	2022-07-19 12:15:06 +02:00
Romain Vimont	7f2f5950f2	Remove useless dependencies reference There is no libs/ directory with local jar files.	2022-06-20 21:23:05 +02:00