Handle down/up actions for BACK or POWER ON

Pressing right-click generates either BACK or POWER ON, depending on the current screen state. Forward DOWN and UP events separately to the device, to generate key events accordingly. Ref #1062 <https://github.com/Genymobile/scrcpy/issues/1062>
Handle down/up actions separately for HOME
2020-01-08 22:48:22 +01:00 · 2020-01-08 22:13:10 +01:00
35 changed files with 306 additions and 711 deletions
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -189,7 +189,7 @@ The client uses 4 threads:
   recording,
 - the **controller** thread, sending _control messages_ to the server,
 - the **receiver** thread (managed by the controller), receiving _device
-   messages_ from the server.
+   messages_ from the client.

 In addition, another thread can be started if necessary to handle APK
 installation or file push requests (via drag&drop on the main window) or to
@@ -214,7 +214,7 @@ When a new decoded frame is available, the decoder _swaps_ the decoding and
 rendering frame (with proper synchronization). Thus, it immediatly starts
 to decode a new frame while the main thread renders the last one.

-If a [recorder] is present (i.e. `--record` is enabled), then it muxes the raw
+If a [recorder] is present (i.e. `--record` is enabled), then its muxes the raw
 H.264 packet to the output video file.

 [stream]: https://github.com/Genymobile/scrcpy/blob/ffe0417228fb78ab45b7ee4e202fc06fc8875bf3/app/src/stream.h
--- a/2
+++ b/2
@@ -188,7 +188,7 @@
      identification within third-party archives.

   Copyright (C) 2018 Genymobile
-   Copyright (C) 2018-2020 Romain Vimont
+   Copyright (C) 2018-2019 Romain Vimont

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/README.ko.md
+++ b/README.ko.md
@@ -475,7 +475,7 @@ _²화면이 꺼진 상태에서 우클릭 시 다시 켜지며, 그 외의 상
 ## 라이선스

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2020 Romain Vimont
+    Copyright (C) 2018-2019 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@@ -37,11 +37,8 @@ control it using keyboard and mouse.

 ### Linux

-In Debian (_testing_ and _sid_ for now):
-
-```
-apt install scrcpy
-```
+On Linux, you typically need to [build the app manually][BUILD]. Don't worry,
+it's not that hard.

 A [Snap] package is available: [`scrcpy`][snap-link].

@@ -59,10 +56,6 @@ For Gentoo, an [Ebuild] is available: [`scrcpy/`][ebuild-link].
 [Ebuild]: https://wiki.gentoo.org/wiki/Ebuild
 [ebuild-link]: https://github.com/maggu2810/maggu2810-overlay/tree/master/app-mobilephone/scrcpy

-You could also [build the app manually][BUILD] (don't worry, it's not that
-hard).
-
-

 ### Windows

@@ -77,20 +70,6 @@ For Windows, for simplicity, prebuilt archives with all the dependencies
 [direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win32-v1.12.1.zip
 [direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.12.1/scrcpy-win64-v1.12.1.zip

-It is also available in [Chocolatey]:
-
-[Chocolatey]: https://chocolatey.org/
-
-```bash
-choco install scrcpy
-```
-
-You need `adb`, accessible from your `PATH`. If you don't have it yet:
-
-```bash
-choco install adb
-```
-
 You can also [build the app manually][BUILD].


@@ -179,21 +158,6 @@ scrcpy --crop 1224:1440:0:0   # 1224x1440 at offset (0,0)
 If `--max-size` is also specified, resizing is applied after cropping.


-#### Lock video orientation
-
-
-To lock the orientation of the mirroring:
-
-```bash
-scrcpy --lock-video-orientation 0   # natural orientation
-scrcpy --lock-video-orientation 1   # 90° counterclockwise
-scrcpy --lock-video-orientation 2   # 180°
-scrcpy --lock-video-orientation 3   # 90° clockwise
-```
-
-This affects recording orientation.
-
-
 ### Recording

 It is possible to record the screen while mirroring:
@@ -252,13 +216,6 @@ scrcpy --serial 0123456789abcdef
 scrcpy -s 0123456789abcdef  # short version
 ```

-If the device is connected over TCP/IP:
-
-```bash
-scrcpy --serial 192.168.0.1:5555
-scrcpy -s 192.168.0.1:5555  # short version
-```
-
 You can start several instances of _scrcpy_ for several devices.

 #### SSH tunnel
@@ -534,7 +491,7 @@ Read the [developers page].
 ## Licence

    Copyright (C) 2018 Genymobile
-    Copyright (C) 2018-2020 Romain Vimont
+    Copyright (C) 2018-2019 Romain Vimont

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/app/meson.build
+++ b/app/meson.build
@@ -96,21 +96,14 @@ conf.set_quoted('PREFIX', get_option('prefix'))
 # directory as the executable)
 conf.set('PORTABLE', get_option('portable'))

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

 # the default max video size for both dimensions, in pixels
 # overridden by option --max-size
 conf.set('DEFAULT_MAX_SIZE', '0')  # 0: unlimited

-# the default video orientation
-# natural device orientation is 0 and each increment adds 90 degrees
-# counterclockwise
-# overridden by option --lock-video-orientation
-conf.set('DEFAULT_LOCK_VIDEO_ORIENTATION', '-1')  # -1: unlocked
-
 # the default video bitrate, in bits/second
 # overridden by option --bit-rate
 conf.set('DEFAULT_BIT_RATE', '8000000')  # 8Mbps
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -41,12 +41,6 @@ Start in fullscreen.
 .B \-h, \-\-help
 Print this help.

-.TP
-.BI "\-\-lock\-video\-orientation " value
-Lock video orientation to \fIvalue\fR. Values are integers in the range [-1..3]. Natural device orientation is 0 and each increment adds 90 degrees counterclockwise.
-
-Default is -1 (unlocked).
-
 .TP
 .BI "\-\-max\-fps " value
 Limit the framerate of screen capture (officially supported since Android 10, but may work on earlier versions).
@@ -66,10 +60,10 @@ Disable device control (mirror the device in read\-only).
 Do not display device (only when screen recording is enabled).

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

-Default is 27183:27199.
+Default is 27183.

 .TP
 .B \-\-prefer\-text
@@ -267,7 +261,7 @@ Copyright \(co 2018 Genymobile
 Genymobile
 .UE

-Copyright \(co 2018\-2020
+Copyright \(co 2018\-2019
 .MT rom@rom1v.com
 Romain Vimont
 .ME
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -41,12 +41,6 @@ scrcpy_print_usage(const char *arg0) {
        "    -h, --help\n"
        "        Print this help.\n"
        "\n"
-        "    --lock-video-orientation value\n"
-        "        Lock video orientation to value. Values are integers in the\n"
-        "        range [-1..3]. Natural device orientation is 0 and each\n"
-        "        increment adds 90 degrees counterclockwise.\n"
-        "        Default is %d%s.\n"
-        "\n"
        "    --max-fps value\n"
        "        Limit the frame rate of screen capture (officially supported\n"
        "        since Android 10, but may work on earlier versions).\n"
@@ -64,9 +58,9 @@ scrcpy_print_usage(const char *arg0) {
        "        Do not display device (only when screen recording is\n"
        "        enabled).\n"
        "\n"
-        "    -p, --port port[:port]\n"
-        "        Set the TCP port (range) used by the client to listen.\n"
-        "        Default is %d:%d.\n"
+        "    -p, --port port\n"
+        "        Set the TCP port the client listens on.\n"
+        "        Default is %d.\n"
        "\n"
        "    --prefer-text\n"
        "        Inject alpha characters and space as text events instead of\n"
@@ -198,9 +192,8 @@ scrcpy_print_usage(const char *arg0) {
        "\n",
        arg0,
        DEFAULT_BIT_RATE,
-        DEFAULT_LOCK_VIDEO_ORIENTATION, DEFAULT_LOCK_VIDEO_ORIENTATION >= 0 ? "" : " (unlocked)",
        DEFAULT_MAX_SIZE, DEFAULT_MAX_SIZE ? "" : " (unlimited)",
-        DEFAULT_LOCAL_PORT_RANGE_FIRST, DEFAULT_LOCAL_PORT_RANGE_LAST);
+        DEFAULT_LOCAL_PORT);
 }

 static bool
@@ -228,27 +221,6 @@ parse_integer_arg(const char *s, long *out, bool accept_suffix, long min,
    return true;
 }

-static size_t
-parse_integers_arg(const char *s, size_t max_items, long *out, long min,
-                   long max, const char *name) {
-    size_t count = parse_integers(s, ':', max_items, out);
-    if (!count) {
-        LOGE("Could not parse %s: %s", name, s);
-        return 0;
-    }
-
-    for (size_t i = 0; i < count; ++i) {
-        long value = out[i];
-        if (value < min || value > max) {
-            LOGE("Could not parse %s: value (%ld) out-of-range (%ld; %ld)",
-                 name, value, min, max);
-            return 0;
-        }
-    }
-
-    return count;
-}
-
 static bool
 parse_bit_rate(const char *s, uint32_t *bit_rate) {
    long value;
@@ -287,19 +259,6 @@ parse_max_fps(const char *s, uint16_t *max_fps) {
    return true;
 }

-static bool
-parse_lock_video_orientation(const char *s, int8_t *lock_video_orientation) {
-    long value;
-    bool ok = parse_integer_arg(s, &value, false, -1, 3,
-                                "lock video orientation");
-    if (!ok) {
-        return false;
-    }
-
-    *lock_video_orientation = (int8_t) value;
-    return true;
-}
-
 static bool
 parse_window_position(const char *s, int16_t *position) {
    long value;
@@ -327,30 +286,14 @@ parse_window_dimension(const char *s, uint16_t *dimension) {
 }

 static bool
-parse_port_range(const char *s, struct port_range *port_range) {
-    long values[2];
-    size_t count = parse_integers_arg(s, 2, values, 0, 0xFFFF, "port");
-    if (!count) {
+parse_port(const char *s, uint16_t *port) {
+    long value;
+    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "port");
+    if (!ok) {
        return false;
    }

-    uint16_t v0 = (uint16_t) values[0];
-    if (count == 1) {
-        port_range->first = v0;
-        port_range->last = v0;
-        return true;
-    }
-
-    assert(count == 2);
-    uint16_t v1 = (uint16_t) values[1];
-    if (v0 < v1) {
-        port_range->first = v0;
-        port_range->last = v1;
-    } else {
-        port_range->first = v1;
-        port_range->last = v0;
-    }
-
+    *port = (uint16_t) value;
    return true;
 }

@@ -384,54 +327,51 @@ guess_record_format(const char *filename) {
    return 0;
 }

-#define OPT_RENDER_EXPIRED_FRAMES  1000
-#define OPT_WINDOW_TITLE           1001
-#define OPT_PUSH_TARGET            1002
-#define OPT_ALWAYS_ON_TOP          1003
-#define OPT_CROP                   1004
-#define OPT_RECORD_FORMAT          1005
-#define OPT_PREFER_TEXT            1006
-#define OPT_WINDOW_X               1007
-#define OPT_WINDOW_Y               1008
-#define OPT_WINDOW_WIDTH           1009
-#define OPT_WINDOW_HEIGHT          1010
-#define OPT_WINDOW_BORDERLESS      1011
-#define OPT_MAX_FPS                1012
-#define OPT_LOCK_VIDEO_ORIENTATION 1013
+#define OPT_RENDER_EXPIRED_FRAMES 1000
+#define OPT_WINDOW_TITLE          1001
+#define OPT_PUSH_TARGET           1002
+#define OPT_ALWAYS_ON_TOP         1003
+#define OPT_CROP                  1004
+#define OPT_RECORD_FORMAT         1005
+#define OPT_PREFER_TEXT           1006
+#define OPT_WINDOW_X              1007
+#define OPT_WINDOW_Y              1008
+#define OPT_WINDOW_WIDTH          1009
+#define OPT_WINDOW_HEIGHT         1010
+#define OPT_WINDOW_BORDERLESS     1011
+#define OPT_MAX_FPS               1012

 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
    static const struct option long_options[] = {
-        {"always-on-top",          no_argument,       NULL, OPT_ALWAYS_ON_TOP},
-        {"bit-rate",               required_argument, NULL, 'b'},
-        {"crop",                   required_argument, NULL, OPT_CROP},
-        {"fullscreen",             no_argument,       NULL, 'f'},
-        {"help",                   no_argument,       NULL, 'h'},
-        {"lock-video-orientation", required_argument, NULL,
-                                                  OPT_LOCK_VIDEO_ORIENTATION},
-        {"max-fps",                required_argument, NULL, OPT_MAX_FPS},
-        {"max-size",               required_argument, NULL, 'm'},
-        {"no-control",             no_argument,       NULL, 'n'},
-        {"no-display",             no_argument,       NULL, 'N'},
-        {"port",                   required_argument, NULL, 'p'},
-        {"push-target",            required_argument, NULL, OPT_PUSH_TARGET},
-        {"record",                 required_argument, NULL, 'r'},
-        {"record-format",          required_argument, NULL, OPT_RECORD_FORMAT},
-        {"render-expired-frames",  no_argument,       NULL,
-                                                  OPT_RENDER_EXPIRED_FRAMES},
-        {"serial",                 required_argument, NULL, 's'},
-        {"show-touches",           no_argument,       NULL, 't'},
-        {"turn-screen-off",        no_argument,       NULL, 'S'},
-        {"prefer-text",            no_argument,       NULL, OPT_PREFER_TEXT},
-        {"version",                no_argument,       NULL, 'v'},
-        {"window-title",           required_argument, NULL, OPT_WINDOW_TITLE},
-        {"window-x",               required_argument, NULL, OPT_WINDOW_X},
-        {"window-y",               required_argument, NULL, OPT_WINDOW_Y},
-        {"window-width",           required_argument, NULL, OPT_WINDOW_WIDTH},
-        {"window-height",          required_argument, NULL, OPT_WINDOW_HEIGHT},
-        {"window-borderless",      no_argument,       NULL,
-                                                  OPT_WINDOW_BORDERLESS},
-        {NULL,                     0,                 NULL, 0  },
+        {"always-on-top",         no_argument,       NULL, OPT_ALWAYS_ON_TOP},
+        {"bit-rate",              required_argument, NULL, 'b'},
+        {"crop",                  required_argument, NULL, OPT_CROP},
+        {"fullscreen",            no_argument,       NULL, 'f'},
+        {"help",                  no_argument,       NULL, 'h'},
+        {"max-fps",               required_argument, NULL, OPT_MAX_FPS},
+        {"max-size",              required_argument, NULL, 'm'},
+        {"no-control",            no_argument,       NULL, 'n'},
+        {"no-display",            no_argument,       NULL, 'N'},
+        {"port",                  required_argument, NULL, 'p'},
+        {"push-target",           required_argument, NULL, OPT_PUSH_TARGET},
+        {"record",                required_argument, NULL, 'r'},
+        {"record-format",         required_argument, NULL, OPT_RECORD_FORMAT},
+        {"render-expired-frames", no_argument,       NULL,
+                                                     OPT_RENDER_EXPIRED_FRAMES},
+        {"serial",                required_argument, NULL, 's'},
+        {"show-touches",          no_argument,       NULL, 't'},
+        {"turn-screen-off",       no_argument,       NULL, 'S'},
+        {"prefer-text",           no_argument,       NULL, OPT_PREFER_TEXT},
+        {"version",               no_argument,       NULL, 'v'},
+        {"window-title",          required_argument, NULL, OPT_WINDOW_TITLE},
+        {"window-x",              required_argument, NULL, OPT_WINDOW_X},
+        {"window-y",              required_argument, NULL, OPT_WINDOW_Y},
+        {"window-width",          required_argument, NULL, OPT_WINDOW_WIDTH},
+        {"window-height",         required_argument, NULL, OPT_WINDOW_HEIGHT},
+        {"window-borderless",     no_argument,       NULL,
+                                                     OPT_WINDOW_BORDERLESS},
+        {NULL,                    0,                 NULL, 0  },
    };

    struct scrcpy_options *opts = &args->opts;
@@ -477,11 +417,6 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                    return false;
                }
                break;
-            case OPT_LOCK_VIDEO_ORIENTATION:
-                if (!parse_lock_video_orientation(optarg, &opts->lock_video_orientation)) {
-                    return false;
-                }
-                break;
            case 'n':
                opts->control = false;
                break;
@@ -489,7 +424,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
                opts->display = false;
                break;
            case 'p':
-                if (!parse_port_range(optarg, &opts->port_range)) {
+                if (!parse_port(optarg, &opts->port)) {
                    return false;
                }
                break;
--- a/app/src/command.c
+++ b/app/src/command.c
@@ -55,32 +55,6 @@ argv_to_string(const char *const *argv, char *buf, size_t bufsize) {
    return idx;
 }

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

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

--- a/app/src/common.h
+++ b/app/src/common.h
@@ -27,9 +27,4 @@ struct position {
    struct point point;
 };

-struct port_range {
-    uint16_t first;
-    uint16_t last;
-};
-
 #endif
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -75,6 +75,8 @@ control_msg_serialize(const struct control_msg *msg, unsigned char *buf) {
            buf[1] = msg->set_screen_power_mode.mode;
            return 2;
        case CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON:
+            buf[1] = msg->back_or_screen_on.action;
+            return 2;
        case CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_COLLAPSE_NOTIFICATION_PANEL:
        case CONTROL_MSG_TYPE_GET_CLIPBOARD:
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -66,6 +66,9 @@ struct control_msg {
        struct {
            enum screen_power_mode mode;
        } set_screen_power_mode;
+        struct {
+            enum android_keyevent_action action;
+        } back_or_screen_on;
    };
 };

--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -99,9 +99,14 @@ action_menu(struct controller *controller, int actions) {

 // turn the screen on if it was off, press BACK otherwise
 static void
-press_back_or_turn_screen_on(struct controller *controller) {
+press_back_or_turn_screen_on(struct controller *controller, int action) {
+    assert(action == ACTION_DOWN || action == ACTION_UP);
+
    struct control_msg msg;
    msg.type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON;
+    msg.back_or_screen_on.action = action == ACTION_DOWN
+                                 ? AKEY_EVENT_ACTION_DOWN
+                                 : AKEY_EVENT_ACTION_UP;

    if (!controller_push_msg(controller, &msg)) {
        LOGW("Could not request 'press back or turn screen on'");
@@ -521,31 +526,36 @@ input_manager_process_mouse_button(struct input_manager *im,
        // simulated from touch events, so it's a duplicate
        return;
    }
-    if (event->type == SDL_MOUSEBUTTONDOWN) {
-        if (control && event->button == SDL_BUTTON_RIGHT) {
-            press_back_or_turn_screen_on(im->controller);
+
+    // double-click on black borders resize to fit the device screen
+    if (event->type == SDL_MOUSEBUTTONDOWN
+            && event->button == SDL_BUTTON_LEFT
+            && event->clicks == 2) {
+        bool outside = is_outside_device_screen(im, event->x, event->y);
+        if (outside) {
+            screen_resize_to_fit(im->screen);
            return;
        }
-        if (control && event->button == SDL_BUTTON_MIDDLE) {
-            action_home(im->controller, ACTION_DOWN | ACTION_UP);
-            return;
-        }
-        // double-click on black borders resize to fit the device screen
-        if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
-            bool outside =
-                is_outside_device_screen(im, event->x, event->y);
-            if (outside) {
-                screen_resize_to_fit(im->screen);
-                return;
-            }
-        }
-        // otherwise, send the click event to the device
    }

    if (!control) {
        return;
    }

+    if (event->button == SDL_BUTTON_MIDDLE) {
+        int action = event->type == SDL_MOUSEBUTTONDOWN ? ACTION_DOWN
+                                                        : ACTION_UP;
+        action_home(im->controller, action);
+        return;
+    }
+
+    if (event->button == SDL_BUTTON_RIGHT) {
+        int action = event->type == SDL_MOUSEBUTTONDOWN ? ACTION_DOWN
+                                                        : ACTION_UP;
+        press_back_or_turn_screen_on(im->controller, action);
+        return;
+    }
+
    struct control_msg msg;
    if (convert_mouse_button(event, im->screen, &msg)) {
        if (!controller_push_msg(im->controller, &msg)) {
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -60,9 +60,9 @@ sdl_init_and_configure(bool display) {
        return true;
    }

-    // Linear filtering
-    if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1")) {
-        LOGW("Could not enable linear filtering");
+    // Use the best available scale quality
+    if (!SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "2")) {
+        LOGW("Could not enable bilinear filtering");
    }

 #ifdef SCRCPY_SDL_HAS_HINT_MOUSE_FOCUS_CLICKTHROUGH
@@ -280,11 +280,10 @@ scrcpy(const struct scrcpy_options *options) {
    bool record = !!options->record_filename;
    struct server_params params = {
        .crop = options->crop,
-        .port_range = options->port_range,
+        .local_port = options->port,
        .max_size = options->max_size,
        .bit_rate = options->bit_rate,
        .max_fps = options->max_fps,
-        .lock_video_orientation = options->lock_video_orientation,
        .control = options->control,
    };
    if (!server_start(&server, options->serial, &params)) {
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -5,7 +5,6 @@
 #include <stdint.h>

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

@@ -16,11 +15,10 @@ struct scrcpy_options {
    const char *window_title;
    const char *push_target;
    enum recorder_format record_format;
-    struct port_range port_range;
+    uint16_t port;
    uint16_t max_size;
    uint32_t bit_rate;
    uint16_t max_fps;
-    int8_t lock_video_orientation;
    int16_t window_x;
    int16_t window_y;
    uint16_t window_width;
@@ -43,14 +41,10 @@ struct scrcpy_options {
    .window_title = NULL, \
    .push_target = NULL, \
    .record_format = RECORDER_FORMAT_AUTO, \
-    .port_range = { \
-        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST, \
-        .last = DEFAULT_LOCAL_PORT_RANGE_LAST, \
-    }, \
+    .port = DEFAULT_LOCAL_PORT, \
    .max_size = DEFAULT_MAX_SIZE, \
    .bit_rate = DEFAULT_BIT_RATE, \
    .max_fps = 0, \
-    .lock_video_orientation = DEFAULT_LOCK_VIDEO_ORIENTATION, \
    .window_x = -1, \
    .window_y = -1, \
    .window_width = 0, \
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -126,6 +126,17 @@ disable_tunnel_forward(const char *serial, uint16_t local_port) {
    return process_check_success(process, "adb forward --remove");
 }

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

-static socket_t
-listen_on_port(uint16_t port) {
-#define IPV4_LOCALHOST 0x7F000001
-    return net_listen(IPV4_LOCALHOST, port, 1);
-}
-
-static bool
-enable_tunnel_reverse_any_port(struct server *server,
-                               struct port_range port_range) {
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (!enable_tunnel_reverse(server->serial, port)) {
-            // the command itself failed, it will fail on any port
-            return false;
-        }
-
-        // At the application level, the device part is "the server" because it
-        // serves video stream and control. However, at the network level, the
-        // client listens and the server connects to the client. That way, the
-        // client can listen before starting the server app, so there is no
-        // need to try to connect until the server socket is listening on the
-        // device.
-        server->server_socket = listen_on_port(port);
-        if (server->server_socket != INVALID_SOCKET) {
-            // success
-            server->local_port = port;
-            return true;
-        }
-
-        // failure, disable tunnel and try another port
-        if (!disable_tunnel_reverse(server->serial)) {
-            LOGW("Could not remove reverse tunnel on port %" PRIu16, port);
-        }
-
-        // check before incrementing to avoid overflow on port 65535
-        if (port < port_range.last) {
-            LOGW("Could not listen on port %" PRIu16", retrying on %" PRIu16,
-                 port, port + 1);
-            port++;
-            continue;
-        }
-
-        if (port_range.first == port_range.last) {
-            LOGE("Could not listen on port %" PRIu16, port_range.first);
-        } else {
-            LOGE("Could not listen on any port in range %" PRIu16 ":%" PRIu16,
-                 port_range.first, port_range.last);
-        }
-        return false;
-    }
-}
-
-static bool
-enable_tunnel_forward_any_port(struct server *server,
-                               struct port_range port_range) {
-    server->tunnel_forward = true;
-    uint16_t port = port_range.first;
-    for (;;) {
-        if (enable_tunnel_forward(server->serial, port)) {
-            // success
-            server->local_port = port;
-            return true;
-        }
-
-        if (port < port_range.last) {
-            LOGW("Could not forward port %" PRIu16", retrying on %" PRIu16,
-                 port, port + 1);
-            port++;
-            continue;
-        }
-
-        if (port_range.first == port_range.last) {
-            LOGE("Could not forward port %" PRIu16, port_range.first);
-        } else {
-            LOGE("Could not forward any port in range %" PRIu16 ":%" PRIu16,
-                 port_range.first, port_range.last);
-        }
-        return false;
-    }
-}
-
-static bool
-enable_tunnel_any_port(struct server *server, struct port_range port_range) {
-    if (enable_tunnel_reverse_any_port(server, port_range)) {
-        return true;
-    }
-
-    // if "adb reverse" does not work (e.g. over "adb connect"), it fallbacks to
-    // "adb forward", so the app socket is the client
-
-    LOGW("'adb reverse' failed, fallback to 'adb forward'");
-    return enable_tunnel_forward_any_port(server, port_range);
-}
-
 static process_t
 execute_server(struct server *server, const struct server_params *params) {
    char max_size_string[6];
    char bit_rate_string[11];
    char max_fps_string[6];
-    char lock_video_orientation_string[3];
    sprintf(max_size_string, "%"PRIu16, params->max_size);
    sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
    sprintf(max_fps_string, "%"PRIu16, params->max_fps);
-    sprintf(lock_video_orientation_string, "%"PRIi8, params->lock_video_orientation);
    const char *const cmd[] = {
        "shell",
        "CLASSPATH=" DEVICE_SERVER_PATH,
@@ -253,7 +168,6 @@ execute_server(struct server *server, const struct server_params *params) {
        max_size_string,
        bit_rate_string,
        max_fps_string,
-        lock_video_orientation_string,
        server->tunnel_forward ? "true" : "false",
        params->crop ? params->crop : "-",
        "true", // always send frame meta (packet boundaries + timestamp)
@@ -273,6 +187,13 @@ execute_server(struct server *server, const struct server_params *params) {
    return adb_execute(server->serial, cmd, sizeof(cmd) / sizeof(cmd[0]));
 }

+#define IPV4_LOCALHOST 0x7F000001
+
+static socket_t
+listen_on_port(uint16_t port) {
+    return net_listen(IPV4_LOCALHOST, port, 1);
+}
+
 static socket_t
 connect_and_read_byte(uint16_t port) {
    socket_t socket = net_connect(IPV4_LOCALHOST, port);
@@ -326,7 +247,7 @@ server_init(struct server *server) {
 bool
 server_start(struct server *server, const char *serial,
             const struct server_params *params) {
-    server->port_range = params->port_range;
+    server->local_port = params->local_port;

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

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

+    // if "adb reverse" does not work (e.g. over "adb connect"), it fallbacks to
+    // "adb forward", so the app socket is the client
+    if (!server->tunnel_forward) {
+        // At the application level, the device part is "the server" because it
+        // serves video stream and control. However, at the network level, the
+        // client listens and the server connects to the client. That way, the
+        // client can listen before starting the server app, so there is no
+        // need to try to connect until the server socket is listening on the
+        // device.
+
+        server->server_socket = listen_on_port(params->local_port);
+        if (server->server_socket == INVALID_SOCKET) {
+            LOGE("Could not listen on port %" PRIu16, params->local_port);
+            disable_tunnel(server);
+            SDL_free(server->serial);
+            return false;
+        }
+    }
+
    // server will connect to our server socket
    server->process = execute_server(server, params);

--- a/app/src/server.h
+++ b/app/src/server.h
@@ -6,7 +6,6 @@

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

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

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

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

--- a/app/src/sys/unix/command.c
+++ b/app/src/sys/unix/command.c
@@ -14,7 +14,6 @@
 #include <limits.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -22,42 +21,6 @@

 #include "util/log.h"

-bool
-cmd_search(const char *file) {
-    char *path = getenv("PATH");
-    if (!path)
-        return false;
-    path = strdup(path);
-    if (!path)
-        return false;
-
-    bool ret = false;
-    size_t file_len = strlen(file);
-    char *saveptr;
-    for (char *dir = strtok_r(path, ":", &saveptr); dir;
-            dir = strtok_r(NULL, ":", &saveptr)) {
-        size_t dir_len = strlen(dir);
-        char *fullpath = malloc(dir_len + file_len + 2);
-        if (!fullpath)
-            continue;
-        memcpy(fullpath, dir, dir_len);
-        fullpath[dir_len] = '/';
-        memcpy(fullpath + dir_len + 1, file, file_len + 1);
-
-        struct stat sb;
-        bool fullpath_executable = stat(fullpath, &sb) == 0 &&
-            sb.st_mode & S_IXUSR;
-        free(fullpath);
-        if (fullpath_executable) {
-            ret = true;
-            break;
-        }
-    }
-
-    free(path);
-    return ret;
-}
-
 enum process_result
 cmd_execute(const char *const argv[], pid_t *pid) {
    int fd[2];
--- a/app/src/sys/win/command.c
+++ b/app/src/sys/win/command.c
@@ -1,11 +1,11 @@
 #include "command.h"

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

+#include <sys/stat.h>
+
 static int
 build_cmd(char *cmd, size_t len, const char *const argv[]) {
    // Windows command-line parsing is WTF:
--- a/app/src/util/str_util.c
+++ b/app/src/util/str_util.c
@@ -81,35 +81,6 @@ parse_integer(const char *s, long *out) {
    return true;
 }

-size_t
-parse_integers(const char *s, const char sep, size_t max_items, long *out) {
-    size_t count = 0;
-    char *endptr;
-    do {
-        errno = 0;
-        long value = strtol(s, &endptr, 0);
-        if (errno == ERANGE) {
-            return 0;
-        }
-
-        if (endptr == s || (*endptr != sep && *endptr != '\0')) {
-            return 0;
-        }
-
-        out[count++] = value;
-        if (*endptr == sep) {
-            if (count >= max_items) {
-                // max items already reached, could not accept a new item
-                return 0;
-            }
-            // parse the next token during the next iteration
-            s = endptr + 1;
-        }
-    } while (*endptr != '\0');
-
-    return count;
-}
-
 bool
 parse_integer_with_suffix(const char *s, long *out) {
    char *endptr;
--- a/app/src/util/str_util.h
+++ b/app/src/util/str_util.h
@@ -31,11 +31,6 @@ strquote(const char *src);
 bool
 parse_integer(const char *s, long *out);

-// parse s as integers separated by sep (for example '1234:2000')
-// returns the number of integers on success, 0 on failure
-size_t
-parse_integers(const char *s, const char sep, size_t max_items, long *out);
-
 // parse s as an integer into value
 // like parse_integer(), but accept 'k'/'K' (x1000) and 'm'/'M' (x1000000) as
 // suffix
--- a/app/tests/test_cli.c
+++ b/app/tests/test_cli.c
@@ -48,10 +48,9 @@ static void test_options(void) {
        "--fullscreen",
        "--max-fps", "30",
        "--max-size", "1024",
-        "--lock-video-orientation", "2",
        // "--no-control" is not compatible with "--turn-screen-off"
        // "--no-display" is not compatible with "--fulscreen"
-        "--port", "1234:1236",
+        "--port", "1234",
        "--push-target", "/sdcard/Movies",
        "--record", "file",
        "--record-format", "mkv",
@@ -79,9 +78,7 @@ static void test_options(void) {
    assert(opts->fullscreen);
    assert(opts->max_fps == 30);
    assert(opts->max_size == 1024);
-    assert(opts->lock_video_orientation == 2);
-    assert(opts->port_range.first == 1234);
-    assert(opts->port_range.last == 1236);
+    assert(opts->port == 1234);
    assert(!strcmp(opts->push_target, "/sdcard/Movies"));
    assert(!strcmp(opts->record_filename, "file"));
    assert(opts->record_format == RECORDER_FORMAT_MKV);
--- a/app/tests/test_control_msg_serialize.c
+++ b/app/tests/test_control_msg_serialize.c
@@ -140,14 +140,18 @@ static void test_serialize_inject_scroll_event(void) {
 static void test_serialize_back_or_screen_on(void) {
    struct control_msg msg = {
        .type = CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
+        .back_or_screen_on = {
+            .action = AKEY_EVENT_ACTION_UP,
+        },
    };

    unsigned char buf[CONTROL_MSG_SERIALIZED_MAX_SIZE];
    int size = control_msg_serialize(&msg, buf);
-    assert(size == 1);
+    assert(size == 2);

    const unsigned char expected[] = {
        CONTROL_MSG_TYPE_BACK_OR_SCREEN_ON,
+        AKEY_EVENT_ACTION_UP,
    };
    assert(!memcmp(buf, expected, sizeof(expected)));
 }
--- a/app/tests/test_strutil.c
+++ b/app/tests/test_strutil.c
@@ -187,55 +187,6 @@ static void test_parse_integer(void) {
    assert(!ok); // out-of-range
 }

-static void test_parse_integers(void) {
-    long values[5];
-
-    size_t count = parse_integers("1234", ':', 5, values);
-    assert(count == 1);
-    assert(values[0] == 1234);
-
-    count = parse_integers("1234:5678", ':', 5, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == 5678);
-
-    count = parse_integers("1234:5678", ':', 2, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == 5678);
-
-    count = parse_integers("1234:-5678", ':', 2, values);
-    assert(count == 2);
-    assert(values[0] == 1234);
-    assert(values[1] == -5678);
-
-    count = parse_integers("1:2:3:4:5", ':', 5, values);
-    assert(count == 5);
-    assert(values[0] == 1);
-    assert(values[1] == 2);
-    assert(values[2] == 3);
-    assert(values[3] == 4);
-    assert(values[4] == 5);
-
-    count = parse_integers("1234:5678", ':', 1, values);
-    assert(count == 0); // max_items == 1
-
-    count = parse_integers("1:2:3:4:5", ':', 3, values);
-    assert(count == 0); // max_items == 3
-
-    count = parse_integers(":1234", ':', 5, values);
-    assert(count == 0); // invalid
-
-    count = parse_integers("1234:", ':', 5, values);
-    assert(count == 0); // invalid
-
-    count = parse_integers("1234:", ':', 1, values);
-    assert(count == 0); // invalid, even when max_items == 1
-
-    count = parse_integers("1234::5678", ':', 5, values);
-    assert(count == 0); // invalid
-}
-
 static void test_parse_integer_with_suffix(void) {
    long value;
    bool ok = parse_integer_with_suffix("1234", &value);
@@ -298,7 +249,6 @@ int main(void) {
    test_strquote();
    test_utf8_truncate();
    test_parse_integer();
-    test_parse_integers();
    test_parse_integer_with_suffix();
    return 0;
 }
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
@@ -85,6 +85,13 @@ public final class ControlMessage {
        return msg;
    }

+    public static ControlMessage createBackOrScreenOn(int action) {
+        ControlMessage msg = new ControlMessage();
+        msg.type = TYPE_BACK_OR_SCREEN_ON;
+        msg.action = action;
+        return msg;
+    }
+
    public static ControlMessage createEmpty(int type) {
        ControlMessage msg = new ControlMessage();
        msg.type = type;
--- a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
@@ -13,6 +13,7 @@ public class ControlMessageReader {
    private static final int INJECT_TOUCH_EVENT_PAYLOAD_LENGTH = 21;
    private static final int INJECT_SCROLL_EVENT_PAYLOAD_LENGTH = 20;
    private static final int SET_SCREEN_POWER_MODE_PAYLOAD_LENGTH = 1;
+    private static final int BACK_OR_SCREEN_ON_PAYLOAD_LENGTH = 1;

    public static final int TEXT_MAX_LENGTH = 300;
    public static final int CLIPBOARD_TEXT_MAX_LENGTH = 4093;
@@ -73,6 +74,8 @@ public class ControlMessageReader {
                msg = parseSetScreenPowerMode();
                break;
            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
+                msg = parseBackOrScreenOn();
+                break;
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_COLLAPSE_NOTIFICATION_PANEL:
            case ControlMessage.TYPE_GET_CLIPBOARD:
@@ -164,6 +167,14 @@ public class ControlMessageReader {
        return ControlMessage.createSetScreenPowerMode(mode);
    }

+    private ControlMessage parseBackOrScreenOn() {
+        if (buffer.remaining() < BACK_OR_SCREEN_ON_PAYLOAD_LENGTH) {
+            return null;
+        }
+        int action = toUnsigned(buffer.get());
+        return ControlMessage.createBackOrScreenOn(action);
+    }
+
    private static Position readPosition(ByteBuffer buffer) {
        int x = buffer.getInt();
        int y = buffer.getInt();
--- a/server/src/main/java/com/genymobile/scrcpy/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Controller.java
@@ -26,6 +26,9 @@ public class Controller {
    private final MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
    private final MotionEvent.PointerCoords[] pointerCoords = new MotionEvent.PointerCoords[PointersState.MAX_POINTERS];

+    private boolean backPressed;
+    private boolean powerPressed;
+
    public Controller(Device device, DesktopConnection connection) {
        this.device = device;
        this.connection = connection;
@@ -88,7 +91,7 @@ public class Controller {
                injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
                break;
            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
-                pressBackOrTurnScreenOn();
+                pressBackOrTurnScreenOn(msg.getAction());
                break;
            case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
                device.expandNotificationPanel();
@@ -223,8 +226,33 @@ public class Controller {
        return device.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
    }

-    private boolean pressBackOrTurnScreenOn() {
-        int keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
-        return injectKeycode(keycode);
+    private boolean pressBackOrTurnScreenOn(int action) {
+        int keycode = -1;
+        if (action == KeyEvent.ACTION_UP) {
+            // if BACK or POWER were pressed, this action is the corresponding release event (regardless of the screen state)
+            if (backPressed) {
+                keycode = KeyEvent.KEYCODE_BACK;
+                backPressed = false;
+            } else if (powerPressed) {
+                keycode = KeyEvent.KEYCODE_POWER;
+                powerPressed = false;
+            }
+        }
+
+        if (keycode == -1) {
+            keycode = device.isScreenOn() ? KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_POWER;
+        }
+
+        if (action == KeyEvent.ACTION_DOWN) {
+            if (keycode == KeyEvent.KEYCODE_BACK) {
+                backPressed = true;
+                powerPressed = false;
+            } else {
+                backPressed = false;
+                powerPressed = true;
+            }
+        }
+
+        return injectKeyEvent(action, keycode, 0, 0);
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java
@@ -26,13 +26,12 @@ public final class Device {
    private RotationListener rotationListener;

    public Device(Options options) {
-        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
-        screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
+        screenInfo = computeScreenInfo(options.getCrop(), options.getMaxSize());
        registerRotationWatcher(new IRotationWatcher.Stub() {
            @Override
            public void onRotationChanged(int rotation) throws RemoteException {
                synchronized (Device.this) {
-                    screenInfo = screenInfo.withDeviceRotation(rotation);
+                    screenInfo = screenInfo.withRotation(rotation);

                    // notify
                    if (rotationListener != null) {
@@ -47,29 +46,75 @@ public final class Device {
        return screenInfo;
    }

+    private ScreenInfo computeScreenInfo(Rect crop, int maxSize) {
+        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
+        boolean rotated = (displayInfo.getRotation() & 1) != 0;
+        Size deviceSize = displayInfo.getSize();
+        Rect contentRect = new Rect(0, 0, deviceSize.getWidth(), deviceSize.getHeight());
+        if (crop != null) {
+            if (rotated) {
+                // the crop (provided by the user) is expressed in the natural orientation
+                crop = flipRect(crop);
+            }
+            if (!contentRect.intersect(crop)) {
+                // intersect() changes contentRect so that it is intersected with crop
+                Ln.w("Crop rectangle (" + formatCrop(crop) + ") does not intersect device screen (" + formatCrop(deviceSize.toRect()) + ")");
+                contentRect = new Rect(); // empty
+            }
+        }
+
+        Size videoSize = computeVideoSize(contentRect.width(), contentRect.height(), maxSize);
+        return new ScreenInfo(contentRect, videoSize, rotated);
+    }
+
+    private static String formatCrop(Rect rect) {
+        return rect.width() + ":" + rect.height() + ":" + rect.left + ":" + rect.top;
+    }
+
+    @SuppressWarnings("checkstyle:MagicNumber")
+    private static Size computeVideoSize(int w, int h, int maxSize) {
+        // Compute the video size and the padding of the content inside this video.
+        // Principle:
+        // - scale down the great side of the screen to maxSize (if necessary);
+        // - scale down the other side so that the aspect ratio is preserved;
+        // - round this value to the nearest multiple of 8 (H.264 only accepts multiples of 8)
+        w &= ~7; // in case it's not a multiple of 8
+        h &= ~7;
+        if (maxSize > 0) {
+            if (BuildConfig.DEBUG && maxSize % 8 != 0) {
+                throw new AssertionError("Max size must be a multiple of 8");
+            }
+            boolean portrait = h > w;
+            int major = portrait ? h : w;
+            int minor = portrait ? w : h;
+            if (major > maxSize) {
+                int minorExact = minor * maxSize / major;
+                // +4 to round the value to the nearest multiple of 8
+                minor = (minorExact + 4) & ~7;
+                major = maxSize;
+            }
+            w = portrait ? minor : major;
+            h = portrait ? major : minor;
+        }
+        return new Size(w, h);
+    }
+
    public Point getPhysicalPoint(Position position) {
        // it hides the field on purpose, to read it with a lock
        @SuppressWarnings("checkstyle:HiddenField")
        ScreenInfo screenInfo = getScreenInfo(); // read with synchronization
-
-        // ignore the locked video orientation, the events will apply in coordinates considered in the physical device orientation
-        Size unlockedVideoSize = screenInfo.getUnlockedVideoSize();
-
-        int reverseVideoRotation = screenInfo.getReverseVideoRotation();
-        // reverse the video rotation to apply the events
-        Position devicePosition = position.rotate(reverseVideoRotation);
-
-        Size clientVideoSize = devicePosition.getScreenSize();
-        if (!unlockedVideoSize.equals(clientVideoSize)) {
+        Size videoSize = screenInfo.getVideoSize();
+        Size clientVideoSize = position.getScreenSize();
+        if (!videoSize.equals(clientVideoSize)) {
            // The client sends a click relative to a video with wrong dimensions,
            // the device may have been rotated since the event was generated, so ignore the event
            return null;
        }
        Rect contentRect = screenInfo.getContentRect();
-        Point point = devicePosition.getPoint();
-        int convertedX = contentRect.left + point.getX() * contentRect.width() / unlockedVideoSize.getWidth();
-        int convertedY = contentRect.top + point.getY() * contentRect.height() / unlockedVideoSize.getHeight();
-        return new Point(convertedX, convertedY);
+        Point point = position.getPoint();
+        int scaledX = contentRect.left + point.getX() * contentRect.width() / videoSize.getWidth();
+        int scaledY = contentRect.top + point.getY() * contentRect.height() / videoSize.getHeight();
+        return new Point(scaledX, scaledY);
    }

    public static String getDeviceName() {
@@ -146,4 +191,8 @@ public final class Device {
            wm.thawRotation();
        }
    }
+
+    static Rect flipRect(Rect crop) {
+        return new Rect(crop.top, crop.left, crop.bottom, crop.right);
+    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -6,7 +6,6 @@ public class Options {
    private int maxSize;
    private int bitRate;
    private int maxFps;
-    private int lockedVideoOrientation;
    private boolean tunnelForward;
    private Rect crop;
    private boolean sendFrameMeta; // send PTS so that the client may record properly
@@ -36,14 +35,6 @@ public class Options {
        this.maxFps = maxFps;
    }

-    public int getLockedVideoOrientation() {
-        return lockedVideoOrientation;
-    }
-
-    public void setLockedVideoOrientation(int lockedVideoOrientation) {
-        this.lockedVideoOrientation = lockedVideoOrientation;
-    }
-
    public boolean isTunnelForward() {
        return tunnelForward;
    }
--- a/server/src/main/java/com/genymobile/scrcpy/Position.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Position.java
@@ -23,19 +23,6 @@ public class Position {
        return screenSize;
    }

-    public Position rotate(int rotation) {
-        switch (rotation) {
-            case 1:
-                return new Position(new Point(screenSize.getHeight() - point.getY(), point.getX()), screenSize.rotate());
-            case 2:
-                return new Position(new Point(screenSize.getWidth() - point.getX(), screenSize.getHeight() - point.getY()), screenSize);
-            case 3:
-                return new Position(new Point(point.getY(), screenSize.getWidth() - point.getX()), screenSize.rotate());
-            default:
-                return this;
-        }
-    }
-
    @Override
    public boolean equals(Object o) {
        if (this == o) {
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java
@@ -6,6 +6,7 @@ import android.graphics.Rect;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
+import android.os.Build;
 import android.os.IBinder;
 import android.view.Surface;

@@ -27,21 +28,19 @@ public class ScreenEncoder implements Device.RotationListener {

    private int bitRate;
    private int maxFps;
-    private int lockedVideoOrientation;
    private int iFrameInterval;
    private boolean sendFrameMeta;
    private long ptsOrigin;

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

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

    @Override
@@ -64,17 +63,12 @@ public class ScreenEncoder implements Device.RotationListener {
            do {
                MediaCodec codec = createCodec();
                IBinder display = createDisplay();
-                ScreenInfo screenInfo = device.getScreenInfo();
-                Rect contentRect = screenInfo.getContentRect();
-                /// include the locked video orientation
-                Rect videoRect = screenInfo.getVideoSize().toRect();
-                // does not include the locked video orientation
-                Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
-                int videoRotation = screenInfo.getVideoRotation();
+                Rect contentRect = device.getScreenInfo().getContentRect();
+                Rect videoRect = device.getScreenInfo().getVideoSize().toRect();
                setSize(format, videoRect.width(), videoRect.height());
                configure(codec, format);
                Surface surface = codec.createInputSurface();
-                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect);
+                setDisplaySurface(display, surface, contentRect, videoRect);
                codec.start();
                try {
                    alive = encode(codec, fd);
@@ -178,11 +172,11 @@ public class ScreenEncoder implements Device.RotationListener {
        format.setInteger(MediaFormat.KEY_HEIGHT, height);
    }

-    private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect) {
+    private static void setDisplaySurface(IBinder display, Surface surface, Rect deviceRect, Rect displayRect) {
        SurfaceControl.openTransaction();
        try {
            SurfaceControl.setDisplaySurface(display, surface);
-            SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
+            SurfaceControl.setDisplayProjection(display, 0, deviceRect, displayRect);
            SurfaceControl.setDisplayLayerStack(display, 0);
        } finally {
            SurfaceControl.closeTransaction();
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java
@@ -3,162 +3,29 @@ package com.genymobile.scrcpy;
 import android.graphics.Rect;

 public final class ScreenInfo {
-    /**
-     * Device (physical) size, possibly cropped
-     */
    private final Rect contentRect; // device size, possibly cropped
+    private final Size videoSize;
+    private final boolean rotated;

-    /**
-     * Video size, possibly smaller than the device size, already taking the device rotation and crop into account.
-     * <p>
-     * However, it does not include the locked video orientation.
-     */
-    private final Size unlockedVideoSize;
-
-    /**
-     * Device rotation, related to the natural device orientation (0, 1, 2 or 3)
-     */
-    private final int deviceRotation;
-
-    /**
-     * The locked video orientation (-1: disabled, 0: normal, 1: 90° CCW, 2: 180°, 3: 90° CW)
-     */
-    private final int lockedVideoOrientation;
-
-    public ScreenInfo(Rect contentRect, Size unlockedVideoSize, int deviceRotation, int lockedVideoOrientation) {
+    public ScreenInfo(Rect contentRect, Size videoSize, boolean rotated) {
        this.contentRect = contentRect;
-        this.unlockedVideoSize = unlockedVideoSize;
-        this.deviceRotation = deviceRotation;
-        this.lockedVideoOrientation = lockedVideoOrientation;
+        this.videoSize = videoSize;
+        this.rotated = rotated;
    }

    public Rect getContentRect() {
        return contentRect;
    }

-    /**
-     * Return the video size as if locked video orientation was not set.
-     *
-     * @return the unlocked video size
-     */
-    public Size getUnlockedVideoSize() {
-        return unlockedVideoSize;
-    }
-
-    /**
-     * Return the actual video size if locked video orientation is set.
-     *
-     * @return the actual video size
-     */
    public Size getVideoSize() {
-        if (getVideoRotation() % 2 == 0) {
-            return unlockedVideoSize;
-        }
-
-        return unlockedVideoSize.rotate();
+        return videoSize;
    }

-    public int getDeviceRotation() {
-        return deviceRotation;
-    }
-
-    public ScreenInfo withDeviceRotation(int newDeviceRotation) {
-        if (newDeviceRotation == deviceRotation) {
+    public ScreenInfo withRotation(int rotation) {
+        boolean newRotated = (rotation & 1) != 0;
+        if (rotated == newRotated) {
            return this;
        }
-        // true if changed between portrait and landscape
-        boolean orientationChanged = (deviceRotation + newDeviceRotation) % 2 != 0;
-        Rect newContentRect;
-        Size newUnlockedVideoSize;
-        if (orientationChanged) {
-            newContentRect = flipRect(contentRect);
-            newUnlockedVideoSize = unlockedVideoSize.rotate();
-        } else {
-            newContentRect = contentRect;
-            newUnlockedVideoSize = unlockedVideoSize;
-        }
-        return new ScreenInfo(newContentRect, newUnlockedVideoSize, newDeviceRotation, lockedVideoOrientation);
-    }
-
-    public static ScreenInfo computeScreenInfo(DisplayInfo displayInfo, Rect crop, int maxSize, int lockedVideoOrientation) {
-        int rotation = displayInfo.getRotation();
-        Size deviceSize = displayInfo.getSize();
-        Rect contentRect = new Rect(0, 0, deviceSize.getWidth(), deviceSize.getHeight());
-        if (crop != null) {
-            if (rotation % 2 != 0) { // 180s preserve dimensions
-                // the crop (provided by the user) is expressed in the natural orientation
-                crop = flipRect(crop);
-            }
-            if (!contentRect.intersect(crop)) {
-                // intersect() changes contentRect so that it is intersected with crop
-                Ln.w("Crop rectangle (" + formatCrop(crop) + ") does not intersect device screen (" + formatCrop(deviceSize.toRect()) + ")");
-                contentRect = new Rect(); // empty
-            }
-        }
-
-        Size videoSize = computeVideoSize(contentRect.width(), contentRect.height(), maxSize);
-        return new ScreenInfo(contentRect, videoSize, rotation, lockedVideoOrientation);
-    }
-
-    private static String formatCrop(Rect rect) {
-        return rect.width() + ":" + rect.height() + ":" + rect.left + ":" + rect.top;
-    }
-
-    @SuppressWarnings("checkstyle:MagicNumber")
-    private static Size computeVideoSize(int w, int h, int maxSize) {
-        // Compute the video size and the padding of the content inside this video.
-        // Principle:
-        // - scale down the great side of the screen to maxSize (if necessary);
-        // - scale down the other side so that the aspect ratio is preserved;
-        // - round this value to the nearest multiple of 8 (H.264 only accepts multiples of 8)
-        w &= ~7; // in case it's not a multiple of 8
-        h &= ~7;
-        if (maxSize > 0) {
-            if (BuildConfig.DEBUG && maxSize % 8 != 0) {
-                throw new AssertionError("Max size must be a multiple of 8");
-            }
-            boolean portrait = h > w;
-            int major = portrait ? h : w;
-            int minor = portrait ? w : h;
-            if (major > maxSize) {
-                int minorExact = minor * maxSize / major;
-                // +4 to round the value to the nearest multiple of 8
-                minor = (minorExact + 4) & ~7;
-                major = maxSize;
-            }
-            w = portrait ? minor : major;
-            h = portrait ? major : minor;
-        }
-        return new Size(w, h);
-    }
-
-    private static Rect flipRect(Rect crop) {
-        return new Rect(crop.top, crop.left, crop.bottom, crop.right);
-    }
-
-    /**
-     * Return the rotation to apply to the device rotation to get the requested locked video orientation
-     *
-     * @return the rotation offset
-     */
-    public int getVideoRotation() {
-        if (lockedVideoOrientation == -1) {
-            // no offset
-            return 0;
-        }
-        return (deviceRotation + 4 - lockedVideoOrientation) % 4;
-    }
-
-    /**
-     * Return the rotation to apply to the requested locked video orientation to get the device rotation
-     *
-     * @return the (reverse) rotation offset
-     */
-    public int getReverseVideoRotation() {
-        if (lockedVideoOrientation == -1) {
-            // no offset
-            return 0;
-        }
-        return (lockedVideoOrientation + 4 - deviceRotation) % 4;
+        return new ScreenInfo(Device.flipRect(contentRect), videoSize.rotate(), newRotated);
    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -19,8 +19,7 @@ public final class Server {
        final Device device = new Device(options);
        boolean tunnelForward = options.isTunnelForward();
        try (DesktopConnection connection = DesktopConnection.open(device, tunnelForward)) {
-            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps(),
-                    options.getLockedVideoOrientation());
+            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps());

            if (options.getControl()) {
                Controller controller = new Controller(device, connection);
@@ -80,8 +79,8 @@ public final class Server {
                    "The server version (" + clientVersion + ") does not match the client " + "(" + BuildConfig.VERSION_NAME + ")");
        }

-        if (args.length != 9) {
-            throw new IllegalArgumentException("Expecting 9 parameters");
+        if (args.length != 8) {
+            throw new IllegalArgumentException("Expecting 8 parameters");
        }

        Options options = new Options();
@@ -95,20 +94,17 @@ public final class Server {
        int maxFps = Integer.parseInt(args[3]);
        options.setMaxFps(maxFps);

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

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

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

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

        return options;
--- a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Workarounds.java
@@ -73,7 +73,7 @@ public final class Workarounds {
            mInitialApplicationField.set(activityThread, app);
        } catch (Throwable throwable) {
            // this is a workaround, so failing is not an error
-            Ln.d("Could not fill app info: " + throwable.getMessage());
+            Ln.w("Could not fill app info: " + throwable.getMessage());
        }
    }
 }
--- a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java
@@ -145,6 +145,7 @@ public class ControlMessageReaderTest {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
        DataOutputStream dos = new DataOutputStream(bos);
        dos.writeByte(ControlMessage.TYPE_BACK_OR_SCREEN_ON);
+        dos.writeByte(KeyEvent.ACTION_UP);

        byte[] packet = bos.toByteArray();

@@ -152,6 +153,7 @@ public class ControlMessageReaderTest {
        ControlMessage event = reader.next();

        Assert.assertEquals(ControlMessage.TYPE_BACK_OR_SCREEN_ON, event.getType());
+        Assert.assertEquals(KeyEvent.ACTION_UP, event.getAction());
    }

    @Test