Document missing package to build for Windows

To build ffmpeg, libz is necessary. Refs #4955 <https://github.com/Genymobile/scrcpy/issues/4955>
Fix typo in documentation
2026-02-28 09:14:42 +01:00 · 2024-05-29 10:32:58 +02:00 · 2024-04-02 18:01:21 +02:00
43 changed files with 432 additions and 1136 deletions
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -25,6 +25,7 @@ _scrcpy() {
        -e --select-tcpip
        -f --fullscreen
        --force-adb-forward
+        --forward-all-clicks
        -h --help
        -K
        --keyboard=
@@ -40,7 +41,6 @@ _scrcpy() {
        -M
        --max-fps=
        --mouse=
-        --mouse-bind=
        -n --no-control
        -N --no-playback
        --no-audio
@@ -50,7 +50,6 @@ _scrcpy() {
        --no-downsize-on-error
        --no-key-repeat
        --no-mipmaps
-        --no-mouse-hover
        --no-power-on
        --no-video
        --no-video-playback
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -32,9 +32,10 @@ arguments=(
    {-e,--select-tcpip}'[Use TCP/IP device]'
    {-f,--fullscreen}'[Start in fullscreen]'
    '--force-adb-forward[Do not attempt to use \"adb reverse\" to connect to the device]'
+    '--forward-all-clicks[Forward clicks to device]'
    {-h,--help}'[Print the help]'
    '-K[Use UHID keyboard (same as --keyboard=uhid)]'
-    '--keyboard=[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'
+    '--keyboard[Set the keyboard input mode]:mode:(disabled sdk uhid aoa)'
    '--kill-adb-on-close[Kill adb when scrcpy terminates]'
    '--legacy-paste[Inject computer clipboard text as a sequence of key events on Ctrl+v]'
    '--list-camera-sizes[List the valid camera capture sizes]'
@@ -45,8 +46,7 @@ arguments=(
    {-m,--max-size=}'[Limit both the width and height of the video to value]'
    '-M[Use UHID mouse (same as --mouse=uhid)]'
    '--max-fps=[Limit the frame rate of screen capture]'
-    '--mouse=[Set the mouse input mode]:mode:(disabled sdk uhid aoa)'
-    '--mouse-bind=[Configure bindings of secondary clicks]'
+    '--mouse[Set the mouse input mode]:mode:(disabled sdk uhid aoa)'
    {-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
    {-N,--no-playback}'[Disable video and audio playback]'
    '--no-audio[Disable audio forwarding]'
@@ -56,7 +56,6 @@ arguments=(
    '--no-downsize-on-error[Disable lowering definition on MediaCodec error]'
    '--no-key-repeat[Do not forward repeated key events when a key is held down]'
    '--no-mipmaps[Disable the generation of mipmaps]'
-    '--no-mouse-hover[Do not forward mouse hover events]'
    '--no-power-on[Do not power on the device on start]'
    '--no-video[Disable video forwarding]'
    '--no-video-playback[Disable video playback]'
--- a/app/deps/libusb.sh
+++ b/app/deps/libusb.sh
@@ -5,9 +5,9 @@ cd "$DEPS_DIR"
 . common

 VERSION=1.0.27
-FILENAME=libusb-$VERSION.tar.gz
+FILENAME=libusb-$VERSION.tar.bz2
 PROJECT_DIR=libusb-$VERSION
-SHA256SUM=e8f18a7a36ecbb11fb820bd71540350d8f61bcd9db0d2e8c18a6fb80b214a3de
+SHA256SUM=ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575

 cd "$SOURCES_DIR"

@@ -15,7 +15,7 @@ if [[ -d "$PROJECT_DIR" ]]
 then
    echo "$PWD/$PROJECT_DIR" found
 else
-    get_file "https://github.com/libusb/libusb/archive/refs/tags/v$VERSION.tar.gz" "$FILENAME" "$SHA256SUM"
+    get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/libusb-$VERSION.tar.bz2" "$FILENAME" "$SHA256SUM"
    tar xf "$FILENAME"  # First level directory is "$PROJECT_DIR"
 fi

@@ -33,7 +33,6 @@ else
    mkdir "$HOST"
    cd "$HOST"

-    "$SOURCES_DIR/$PROJECT_DIR"/bootstrap.sh
    "$SOURCES_DIR/$PROJECT_DIR"/configure \
        --prefix="$INSTALL_DIR/$HOST" \
        --host="$HOST_TRIPLET" \
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -163,6 +163,10 @@ Start in fullscreen.
 .B \-\-force\-adb\-forward
 Do not attempt to use "adb reverse" to connect to the device.

+.TP
+.B \-\-forward\-all\-clicks
+By default, right-click triggers BACK (or POWER on) and middle-click triggers HOME. This option disables these shortcuts and forward the clicks to the device instead.
+
 .TP
 .B \-h, \-\-help
 Print this help.
@@ -257,23 +261,6 @@ LAlt, LSuper or RSuper toggle the capture mode, to give control of the mouse bac

 Also see \fB\-\-keyboard\fR.

-.TP
-.BI "\-\-mouse\-bind " xxxx
-Configure bindings of secondary clicks.
-
-The argument must be exactly 4 characters, one for each secondary click (in order: right click, middle click, 4th click, 5th click).
-
-Each character must be one of the following:
-
- - '+': forward the click to the device
- - '-': ignore the click
- - 'b': trigger shortcut BACK (or turn screen on if off)
- - 'h': trigger shortcut HOME
- - 's': trigger shortcut APP_SWITCH
- - 'n': trigger shortcut "expand notification panel"
-
-Default is 'bhsn' for SDK mouse, and '++++' for AOA and UHID.
-

 .TP
 .B \-n, \-\-no\-control
@@ -317,10 +304,6 @@ Do not forward repeated key events when a key is held down.
 .B \-\-no\-mipmaps
 If the renderer is OpenGL 3.0+ or OpenGL ES 2.0+, then mipmaps are automatically generated to improve downscaling quality. This option disables the generation of mipmaps.

-.TP
-.B \-\-no\-mouse\-hover
-Do not forward mouse hover (mouse motion without any clicks) events.
-
 .TP
 .B \-\-no\-power\-on
 Do not power on the device on start.
@@ -333,10 +316,6 @@ Disable video forwarding.
 .B \-\-no\-video\-playback
 Disable video playback on the computer.

-.TP
-.B \-\-no\-window
-Disable scrcpy window. Implies --no-video-playback and --no-control.
-
 .TP
 .BI "\-\-orientation " value
 Same as --display-orientation=value --record-orientation=value.
@@ -441,9 +420,9 @@ Turn the device screen off immediately.
 .BI "\-\-shortcut\-mod " key\fR[+...]][,...]
 Specify the modifiers to use for scrcpy shortcuts. Possible keys are "lctrl", "rctrl", "lalt", "ralt", "lsuper" and "rsuper".

-Several shortcut modifiers can be specified, separated by ','.
+A shortcut can consist in several keys, separated by '+'. Several shortcuts can be specified, separated by ','.

-For example, to use either LCtrl or LSuper for scrcpy shortcuts, pass "lctrl,lsuper".
+For example, to use either LCtrl+LAlt or LSuper for scrcpy shortcuts, pass "lctrl+lalt,lsuper".

 Default is "lalt,lsuper" (left-Alt or left-Super).

@@ -598,14 +577,6 @@ Flip display horizontally
 .B MOD+Shift+Up, MOD+Shift+Down
 Flip display vertically

-.TP
-.B MOD+z
-Pause or re-pause display
-
-.TP
-.B MOD+Shift+z
-Unpause display
-
 .TP
 .B MOD+g
 Resize window to 1:1 (pixel\-perfect)
--- a/app/src/audio_player.c
+++ b/app/src/audio_player.c
@@ -194,11 +194,7 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
            // Still insufficient, drop old samples to make space
            skipped_samples = sc_audiobuf_read(&ap->buf, NULL, remaining);
            assert(skipped_samples == remaining);
-        }

-        SDL_UnlockAudioDevice(ap->device);
-
-        if (written < samples) {
            // Now there is enough space
            uint32_t w = sc_audiobuf_write(&ap->buf,
                                           swr_buf + TO_BYTES(written),
@@ -206,6 +202,8 @@ sc_audio_player_frame_sink_push(struct sc_frame_sink *sink,
            assert(w == remaining);
            (void) w;
        }
+
+        SDL_UnlockAudioDevice(ap->device);
    }

    uint32_t underflow = 0;
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -97,9 +97,6 @@ enum {
    OPT_MOUSE,
    OPT_HID_KEYBOARD_DEPRECATED,
    OPT_HID_MOUSE_DEPRECATED,
-    OPT_NO_WINDOW,
-    OPT_MOUSE_BIND,
-    OPT_NO_MOUSE_HOVER,
 };

 struct sc_option {
@@ -354,9 +351,11 @@ static const struct sc_option options[] = {
                "device.",
    },
    {
-        // deprecated
        .longopt_id = OPT_FORWARD_ALL_CLICKS,
        .longopt = "forward-all-clicks",
+        .text = "By default, right-click triggers BACK (or POWER on) and "
+                "middle-click triggers HOME. This option disables these "
+                "shortcuts and forwards the clicks to the device instead.",
    },
    {
        .shortopt = 'h',
@@ -490,23 +489,6 @@ static const struct sc_option options[] = {
                "control of the mouse back to the computer.\n"
                "Also see --keyboard.",
    },
-    {
-        .longopt_id = OPT_MOUSE_BIND,
-        .longopt = "mouse-bind",
-        .argdesc = "xxxx",
-        .text = "Configure bindings of secondary clicks.\n"
-                "The argument must be exactly 4 characters, one for each "
-                "secondary click (in order: right click, middle click, 4th "
-                "click, 5th click).\n"
-                "Each character must be one of the following:\n"
-                " '+': forward the click to the device\n"
-                " '-': ignore the click\n"
-                " 'b': trigger shortcut BACK (or turn screen on if off)\n"
-                " 'h': trigger shortcut HOME\n"
-                " 's': trigger shortcut APP_SWITCH\n"
-                " 'n': trigger shortcut \"expand notification panel\"\n"
-                "Default is 'bhsn' for SDK mouse, and '++++' for AOA and UHID.",
-    },
    {
        .shortopt = 'n',
        .longopt = "no-control",
@@ -569,12 +551,6 @@ static const struct sc_option options[] = {
                "mipmaps are automatically generated to improve downscaling "
                "quality. This option disables the generation of mipmaps.",
    },
-    {
-        .longopt_id = OPT_NO_MOUSE_HOVER,
-        .longopt = "no-mouse-hover",
-        .text = "Do not forward mouse hover (mouse motion without any clicks) "
-                "events.",
-    },
    {
        .longopt_id = OPT_NO_POWER_ON,
        .longopt = "no-power-on",
@@ -590,12 +566,6 @@ static const struct sc_option options[] = {
        .longopt = "no-video-playback",
        .text = "Disable video playback on the computer.",
    },
-    {
-        .longopt_id = OPT_NO_WINDOW,
-        .longopt = "no-window",
-        .text = "Disable scrcpy window. Implies --no-video-playback and "
-                "--no-control.",
-    },
    {
        .longopt_id = OPT_ORIENTATION,
        .longopt = "orientation",
@@ -739,10 +709,10 @@ static const struct sc_option options[] = {
        .text = "Specify the modifiers to use for scrcpy shortcuts.\n"
                "Possible keys are \"lctrl\", \"rctrl\", \"lalt\", \"ralt\", "
                "\"lsuper\" and \"rsuper\".\n"
-                "Several shortcut modifiers can be specified, separated by "
-                "','.\n"
-                "For example, to use either LCtrl or LSuper for scrcpy "
-                "shortcuts, pass \"lctrl,lsuper\".\n"
+                "A shortcut can consist in several keys, separated by '+'. "
+                "Several shortcuts can be specified, separated by ','.\n"
+                "For example, to use either LCtrl+LAlt or LSuper for scrcpy "
+                "shortcuts, pass \"lctrl+lalt,lsuper\".\n"
                "Default is \"lalt,lsuper\" (left-Alt or left-Super).",
    },
    {
@@ -930,14 +900,6 @@ static const struct sc_shortcut shortcuts[] = {
        .shortcuts = { "MOD+Shift+Up", "MOD+Shift+Down" },
        .text = "Flip display vertically",
    },
-    {
-        .shortcuts = { "MOD+z" },
-        .text = "Pause or re-pause display",
-    },
-    {
-        .shortcuts = { "MOD+Shift+z" },
-        .text = "Unpause display",
-    },
    {
        .shortcuts = { "MOD+g" },
        .text = "Resize window to 1:1 (pixel-perfect)",
@@ -1710,62 +1672,82 @@ parse_log_level(const char *s, enum sc_log_level *log_level) {
    return false;
 }

-static enum sc_shortcut_mod
+// item is a list of mod keys separated by '+' (e.g. "lctrl+lalt")
+// returns a bitwise-or of SC_SHORTCUT_MOD_* constants (or 0 on error)
+static unsigned
 parse_shortcut_mods_item(const char *item, size_t len) {
+    unsigned mod = 0;
+
+    for (;;) {
+        char *plus = strchr(item, '+');
+        // strchr() does not consider the "len" parameter, to it could find an
+        // occurrence too far in the string (there is no strnchr())
+        bool has_plus = plus && plus < item + len;
+
+        assert(!has_plus || plus > item);
+        size_t key_len = has_plus ? (size_t) (plus - item) : len;
+
 #define STREQ(literal, s, len) \
    ((sizeof(literal)-1 == len) && !memcmp(literal, s, len))

-    if (STREQ("lctrl", item, len)) {
-        return SC_SHORTCUT_MOD_LCTRL;
-    }
-    if (STREQ("rctrl", item, len)) {
-        return SC_SHORTCUT_MOD_RCTRL;
-    }
-    if (STREQ("lalt", item, len)) {
-        return SC_SHORTCUT_MOD_LALT;
-    }
-    if (STREQ("ralt", item, len)) {
-        return SC_SHORTCUT_MOD_RALT;
-    }
-    if (STREQ("lsuper", item, len)) {
-        return SC_SHORTCUT_MOD_LSUPER;
-    }
-    if (STREQ("rsuper", item, len)) {
-        return SC_SHORTCUT_MOD_RSUPER;
-    }
+        if (STREQ("lctrl", item, key_len)) {
+            mod |= SC_SHORTCUT_MOD_LCTRL;
+        } else if (STREQ("rctrl", item, key_len)) {
+            mod |= SC_SHORTCUT_MOD_RCTRL;
+        } else if (STREQ("lalt", item, key_len)) {
+            mod |= SC_SHORTCUT_MOD_LALT;
+        } else if (STREQ("ralt", item, key_len)) {
+            mod |= SC_SHORTCUT_MOD_RALT;
+        } else if (STREQ("lsuper", item, key_len)) {
+            mod |= SC_SHORTCUT_MOD_LSUPER;
+        } else if (STREQ("rsuper", item, key_len)) {
+            mod |= SC_SHORTCUT_MOD_RSUPER;
+        } else {
+            LOGE("Unknown modifier key: %.*s "
+                 "(must be one of: lctrl, rctrl, lalt, ralt, lsuper, rsuper)",
+                 (int) key_len, item);
+            return 0;
+        }
 #undef STREQ

-    bool has_plus = strchr(item, '+');
-    if (has_plus) {
-        LOGE("Shortcut mod combination with '+' is not supported anymore: "
-             "'%.*s' (see #4741)", (int) len, item);
-        return 0;
+        if (!has_plus) {
+            break;
+        }
+
+        item = plus + 1;
+        assert(len >= key_len + 1);
+        len -= key_len + 1;
    }

-    LOGE("Unknown modifier key: %.*s "
-         "(must be one of: lctrl, rctrl, lalt, ralt, lsuper, rsuper)",
-         (int) len, item);
-
-    return 0;
+    return mod;
 }

 static bool
-parse_shortcut_mods(const char *s, uint8_t *shortcut_mods) {
-    uint8_t mods = 0;
+parse_shortcut_mods(const char *s, struct sc_shortcut_mods *mods) {
+    unsigned count = 0;
+    unsigned current = 0;

-    // A list of shortcut modifiers, for example "lctrl,rctrl,rsuper"
+    // LCtrl+LAlt or RCtrl or LCtrl+RSuper: "lctrl+lalt,rctrl,lctrl+rsuper"

    for (;;) {
        char *comma = strchr(s, ',');
-        assert(!comma || comma > s);
-        size_t limit = comma ? (size_t) (comma - s) : strlen(s);
-
-        enum sc_shortcut_mod mod = parse_shortcut_mods_item(s, limit);
-        if (!mod) {
+        if (comma && count == SC_MAX_SHORTCUT_MODS - 1) {
+            assert(count < SC_MAX_SHORTCUT_MODS);
+            LOGW("Too many shortcut modifiers alternatives");
            return false;
        }

-        mods |= mod;
+        assert(!comma || comma > s);
+        size_t limit = comma ? (size_t) (comma - s) : strlen(s);
+
+        unsigned mod = parse_shortcut_mods_item(s, limit);
+        if (!mod) {
+            LOGE("Invalid modifier keys: %.*s", (int) limit, s);
+            return false;
+        }
+
+        mods->data[current++] = mod;
+        ++count;

        if (!comma) {
            break;
@@ -1774,7 +1756,7 @@ parse_shortcut_mods(const char *s, uint8_t *shortcut_mods) {
        s = comma + 1;
    }

-    *shortcut_mods = mods;
+    mods->count = count;

    return true;
 }
@@ -1782,7 +1764,7 @@ parse_shortcut_mods(const char *s, uint8_t *shortcut_mods) {
 #ifdef SC_TEST
 // expose the function to unit-tests
 bool
-sc_parse_shortcut_mods(const char *s, uint8_t *mods) {
+sc_parse_shortcut_mods(const char *s, struct sc_shortcut_mods *mods) {
    return parse_shortcut_mods(s, mods);
 }
 #endif
@@ -2061,63 +2043,11 @@ parse_pause_on_exit(const char *s, enum sc_pause_on_exit *pause_on_exit) {
    }

    LOGE("Unsupported pause on exit mode: %s "
-         "(expected true, false or if-error)", s);
+         "(expected true, false or if-error)", optarg);
    return false;

 }

-static bool
-parse_mouse_binding(char c, enum sc_mouse_binding *b) {
-    switch (c) {
-        case '+':
-            *b = SC_MOUSE_BINDING_CLICK;
-            return true;
-        case '-':
-            *b = SC_MOUSE_BINDING_DISABLED;
-            return true;
-        case 'b':
-            *b = SC_MOUSE_BINDING_BACK;
-            return true;
-        case 'h':
-            *b = SC_MOUSE_BINDING_HOME;
-            return true;
-        case 's':
-            *b = SC_MOUSE_BINDING_APP_SWITCH;
-            return true;
-        case 'n':
-            *b = SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL;
-            return true;
-        default:
-            LOGE("Invalid mouse binding: '%c' "
-                 "(expected '+', '-', 'b', 'h', 's' or 'n')", c);
-            return false;
-    }
-}
-
-static bool
-parse_mouse_bindings(const char *s, struct sc_mouse_bindings *mb) {
-    if (strlen(s) != 4) {
-        LOGE("Invalid mouse bindings: '%s' (expected exactly 4 characters from "
-             "{'+', '-', 'b', 'h', 's', 'n'})", s);
-        return false;
-    }
-
-    if (!parse_mouse_binding(s[0], &mb->right_click)) {
-        return false;
-    }
-    if (!parse_mouse_binding(s[1], &mb->middle_click)) {
-        return false;
-    }
-    if (!parse_mouse_binding(s[2], &mb->click4)) {
-        return false;
-    }
-    if (!parse_mouse_binding(s[3], &mb->click5)) {
-        return false;
-    }
-
-    return true;
-}
-
 static bool
 parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                       const char *optstring, const struct option *longopts) {
@@ -2200,14 +2130,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case OPT_MOUSE_BIND:
-                if (!parse_mouse_bindings(optarg, &opts->mouse_bindings)) {
-                    return false;
-                }
-                break;
-            case OPT_NO_MOUSE_HOVER:
-                opts->mouse_hover = false;
-                break;
            case OPT_HID_MOUSE_DEPRECATED:
                LOGE("--hid-mouse has been removed, use --mouse=aoa or "
                     "--mouse=uhid instead.");
@@ -2405,14 +2327,7 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                }
                break;
            case OPT_FORWARD_ALL_CLICKS:
-                LOGW("--forward-all-clicks is deprecated, "
-                     "use --mouse-bind=++++ instead.");
-                opts->mouse_bindings = (struct sc_mouse_bindings) {
-                    .right_click = SC_MOUSE_BINDING_CLICK,
-                    .middle_click = SC_MOUSE_BINDING_CLICK,
-                    .click4 = SC_MOUSE_BINDING_CLICK,
-                    .click5 = SC_MOUSE_BINDING_CLICK,
-                };
+                opts->forward_all_clicks = true;
                break;
            case OPT_LEGACY_PASTE:
                opts->legacy_paste = true;
@@ -2563,9 +2478,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_CAMERA_HIGH_SPEED:
                opts->camera_high_speed = true;
                break;
-            case OPT_NO_WINDOW:
-                opts->window = false;
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -2603,12 +2515,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    v4l2 = !!opts->v4l2_device;
 #endif

-    if (!opts->window) {
-        // Without window, there cannot be any video playback or control
-        opts->video_playback = false;
-        opts->control = false;
-    }
-
    if (!opts->video) {
        opts->video_playback = false;
        // Do not power on the device on start if video capture is disabled
@@ -2630,8 +2536,8 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        opts->audio = false;
    }

-    if (!opts->video && !opts->audio && !opts->control && !otg) {
-        LOGE("No video, no audio, no control, no OTG: nothing to do");
+    if (!opts->video && !opts->audio && !otg) {
+        LOGE("No video, no audio, no OTG: nothing to do");
        return false;
    }

@@ -2642,9 +2548,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],

    if (opts->audio_playback && opts->audio_buffer == -1) {
        if (opts->audio_codec == SC_CODEC_FLAC) {
-            // Use 50 ms audio buffer by default, but use a higher value for
-            // FLAC, which is not low latency (the default encoder produces
-            // blocks of 4096 samples, which represent ~85.333ms).
+            // Use 50 ms audio buffer by default, but use a higher value for FLAC,
+            // which is not low latency (the default encoder produces blocks of
+            // 4096 samples, which represent ~85.333ms).
            LOGI("FLAC audio: audio buffer increased to 120 ms (use "
                 "--audio-buffer to set a custom value)");
            opts->audio_buffer = SC_TICK_FROM_MS(120);
@@ -2655,11 +2561,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],

 #ifdef HAVE_V4L2
    if (v4l2) {
-        if (!opts->video) {
-            LOGE("V4L2 sink requires video capture, but --no-video was set.");
-            return false;
-        }
-
        if (opts->lock_video_orientation ==
                SC_LOCK_VIDEO_ORIENTATION_UNLOCKED) {
            LOGI("Video orientation is locked for v4l2 sink. "
@@ -2679,57 +2580,16 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }
 #endif

-    if (opts->control) {
-        if (opts->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AUTO) {
-            opts->keyboard_input_mode = otg ? SC_KEYBOARD_INPUT_MODE_AOA
-                                            : SC_KEYBOARD_INPUT_MODE_SDK;
-        }
-        if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_AUTO) {
-            if (otg) {
-                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_AOA;
-            } else if (!opts->video_playback) {
-                LOGI("No video mirroring, mouse mode switched to UHID");
-                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_UHID;
-            } else {
-                opts->mouse_input_mode = SC_MOUSE_INPUT_MODE_SDK;
-            }
-        } else if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK
-                    && !opts->video_playback) {
-            LOGE("SDK mouse mode requires video playback. Try --mouse=uhid.");
-            return false;
-        }
+    if (opts->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AUTO) {
+        opts->keyboard_input_mode = otg ? SC_KEYBOARD_INPUT_MODE_AOA
+                                        : SC_KEYBOARD_INPUT_MODE_SDK;
    }
-
-    // If mouse bindings are not explictly set, configure default bindings
-    if (opts->mouse_bindings.right_click == SC_MOUSE_BINDING_AUTO) {
-        assert(opts->mouse_bindings.middle_click == SC_MOUSE_BINDING_AUTO);
-        assert(opts->mouse_bindings.click4 == SC_MOUSE_BINDING_AUTO);
-        assert(opts->mouse_bindings.click5 == SC_MOUSE_BINDING_AUTO);
-
-        // By default, forward all clicks only for UHID and AOA
-        if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK) {
-            opts->mouse_bindings = (struct sc_mouse_bindings) {
-                .right_click = SC_MOUSE_BINDING_BACK,
-                .middle_click = SC_MOUSE_BINDING_HOME,
-                .click4 = SC_MOUSE_BINDING_APP_SWITCH,
-                .click5 = SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL,
-            };
-        } else {
-            opts->mouse_bindings = (struct sc_mouse_bindings) {
-                .right_click = SC_MOUSE_BINDING_CLICK,
-                .middle_click = SC_MOUSE_BINDING_CLICK,
-                .click4 = SC_MOUSE_BINDING_CLICK,
-                .click5 = SC_MOUSE_BINDING_CLICK,
-            };
-        }
+    if (opts->mouse_input_mode == SC_MOUSE_INPUT_MODE_AUTO) {
+        opts->mouse_input_mode = otg ? SC_MOUSE_INPUT_MODE_AOA
+                                     : SC_MOUSE_INPUT_MODE_SDK;
    }

    if (otg) {
-        if (!opts->control) {
-            LOGE("--no-control is not allowed in OTG mode");
-            return false;
-        }
-
        enum sc_keyboard_input_mode kmode = opts->keyboard_input_mode;
        if (kmode != SC_KEYBOARD_INPUT_MODE_AOA
                && kmode != SC_KEYBOARD_INPUT_MODE_DISABLED) {
@@ -2768,12 +2628,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        }
    }

-    if (opts->mouse_input_mode != SC_MOUSE_INPUT_MODE_SDK
-            && !opts->mouse_hover) {
-        LOGE("--no-mouse-over is specific to --mouse=sdk");
-        return false;
-    }
-
    if ((opts->tunnel_host || opts->tunnel_port) && !opts->force_adb_forward) {
        LOGI("Tunnel host/port is set, "
             "--force-adb-forward automatically enabled.");
@@ -2838,11 +2692,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }

    if (opts->record_filename) {
-        if (!opts->video && !opts->audio) {
-            LOGE("Video and audio disabled, nothing to record");
-            return false;
-        }
-
        if (!opts->record_format) {
            opts->record_format = guess_record_format(opts->record_filename);
            if (!opts->record_format) {
@@ -2949,11 +2798,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
    }
 # endif

-    if (opts->start_fps_counter && !opts->video_playback) {
-        LOGW("--print-fps has no effect without video playback");
-        opts->start_fps_counter = false;
-    }
-
    if (otg) {
        // OTG mode is compatible with only very few options.
        // Only report obvious errors.
--- a/app/src/cli.h
+++ b/app/src/cli.h
@@ -28,7 +28,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]);

 #ifdef SC_TEST
 bool
-sc_parse_shortcut_mods(const char *s, uint8_t *shortcut_mods);
+sc_parse_shortcut_mods(const char *s, struct sc_shortcut_mods *mods);
 #endif

 #endif
--- a/app/src/controller.c
+++ b/app/src/controller.c
@@ -6,19 +6,8 @@

 #define SC_CONTROL_MSG_QUEUE_MAX 64

-static void
-sc_controller_receiver_on_error(struct sc_receiver *receiver, void *userdata) {
-    (void) receiver;
-
-    struct sc_controller *controller = userdata;
-    // Forward the event to the controller listener
-    controller->cbs->on_error(controller, controller->cbs_userdata);
-}
-
 bool
-sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
-                   const struct sc_controller_callbacks *cbs,
-                   void *cbs_userdata) {
+sc_controller_init(struct sc_controller *controller, sc_socket control_socket) {
    sc_vecdeque_init(&controller->queue);

    bool ok = sc_vecdeque_reserve(&controller->queue, SC_CONTROL_MSG_QUEUE_MAX);
@@ -26,12 +15,7 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
        return false;
    }

-    static const struct sc_receiver_callbacks receiver_cbs = {
-        .on_error = sc_controller_receiver_on_error,
-    };
-
-    ok = sc_receiver_init(&controller->receiver, control_socket, &receiver_cbs,
-                          controller);
+    ok = sc_receiver_init(&controller->receiver, control_socket);
    if (!ok) {
        sc_vecdeque_destroy(&controller->queue);
        return false;
@@ -55,10 +39,6 @@ sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
    controller->control_socket = control_socket;
    controller->stopped = false;

-    assert(cbs && cbs->on_error);
-    controller->cbs = cbs;
-    controller->cbs_userdata = cbs_userdata;
-
    return true;
 }

@@ -145,16 +125,10 @@ run_controller(void *data) {
        sc_control_msg_destroy(&msg);
        if (!ok) {
            LOGD("Could not write msg to socket");
-            goto error;
+            break;
        }
    }
-
    return 0;
-
-error:
-    controller->cbs->on_error(controller, controller->cbs_userdata);
-
-    return 1; // ignored
 }

 bool
--- a/app/src/controller.h
+++ b/app/src/controller.h
@@ -22,19 +22,10 @@ struct sc_controller {
    bool stopped;
    struct sc_control_msg_queue queue;
    struct sc_receiver receiver;
-
-    const struct sc_controller_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct sc_controller_callbacks {
-    void (*on_error)(struct sc_controller *controller, void *userdata);
 };

 bool
-sc_controller_init(struct sc_controller *controller, sc_socket control_socket,
-                   const struct sc_controller_callbacks *cbs,
-                   void *cbs_userdata);
+sc_controller_init(struct sc_controller *controller, sc_socket control_socket);

 void
 sc_controller_configure(struct sc_controller *controller,
--- a/app/src/display.c
+++ b/app/src/display.c
@@ -1,34 +1,11 @@
 #include "display.h"

 #include <assert.h>
-#include <libavutil/pixfmt.h>

 #include "util/log.h"

-static bool
-sc_display_init_novideo_icon(struct sc_display *display,
-                             SDL_Surface *icon_novideo) {
-    assert(icon_novideo);
-
-    if (SDL_RenderSetLogicalSize(display->renderer,
-                                 icon_novideo->w, icon_novideo->h)) {
-        LOGW("Could not set renderer logical size: %s", SDL_GetError());
-        // don't fail
-    }
-
-    display->texture = SDL_CreateTextureFromSurface(display->renderer,
-                                                    icon_novideo);
-    if (!display->texture) {
-        LOGE("Could not create texture: %s", SDL_GetError());
-        return false;
-    }
-
-    return true;
-}
-
 bool
-sc_display_init(struct sc_display *display, SDL_Window *window,
-                SDL_Surface *icon_novideo, bool mipmaps) {
+sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps) {
    display->renderer =
        SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
    if (!display->renderer) {
@@ -88,19 +65,6 @@ sc_display_init(struct sc_display *display, SDL_Window *window,
    display->texture = NULL;
    display->pending.flags = 0;
    display->pending.frame = NULL;
-    display->has_frame = false;
-
-    if (icon_novideo) {
-        // Without video, set a static scrcpy icon as window content
-        bool ok = sc_display_init_novideo_icon(display, icon_novideo);
-        if (!ok) {
-#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
-            SDL_GL_DeleteContext(display->gl_context);
-#endif
-            SDL_DestroyRenderer(display->renderer);
-            return false;
-        }
-    }

    return true;
 }
@@ -232,25 +196,9 @@ sc_display_set_texture_size(struct sc_display *display, struct sc_size size) {
    return SC_DISPLAY_RESULT_OK;
 }

-static SDL_YUV_CONVERSION_MODE
-sc_display_to_sdl_color_range(enum AVColorRange color_range) {
-    return color_range == AVCOL_RANGE_JPEG ? SDL_YUV_CONVERSION_JPEG
-                                           : SDL_YUV_CONVERSION_AUTOMATIC;
-}
-
 static bool
 sc_display_update_texture_internal(struct sc_display *display,
                                   const AVFrame *frame) {
-    if (!display->has_frame) {
-        // First frame
-        display->has_frame = true;
-
-        // Configure YUV color range conversion
-        SDL_YUV_CONVERSION_MODE sdl_color_range =
-            sc_display_to_sdl_color_range(frame->color_range);
-        SDL_SetYUVConversionMode(sdl_color_range);
-    }
-
    int ret = SDL_UpdateYUVTexture(display->texture, NULL,
                                   frame->data[0], frame->linesize[0],
                                   frame->data[1], frame->linesize[1],
--- a/app/src/display.h
+++ b/app/src/display.h
@@ -33,8 +33,6 @@ struct sc_display {
        struct sc_size size;
        AVFrame *frame;
    } pending;
-
-    bool has_frame;
 };

 enum sc_display_result {
@@ -44,8 +42,7 @@ enum sc_display_result {
 };

 bool
-sc_display_init(struct sc_display *display, SDL_Window *window,
-                SDL_Surface *icon_novideo, bool mipmaps);
+sc_display_init(struct sc_display *display, SDL_Window *window, bool mipmaps);

 void
 sc_display_destroy(struct sc_display *display);
--- a/app/src/events.h
+++ b/app/src/events.h
@@ -7,4 +7,3 @@
 #define SC_EVENT_RECORDER_ERROR           (SDL_USEREVENT + 6)
 #define SC_EVENT_SCREEN_INIT_SIZE         (SDL_USEREVENT + 7)
 #define SC_EVENT_TIME_LIMIT_REACHED       (SDL_USEREVENT + 8)
-#define SC_EVENT_CONTROLLER_ERROR         (SDL_USEREVENT + 9)
--- a/app/src/icon.c
+++ b/app/src/icon.c
@@ -78,19 +78,7 @@ decode_image(const char *path) {
        goto close_input;
    }

-
-// In ffmpeg/doc/APIchanges:
-// 2021-04-27 - 46dac8cf3d - lavf 59.0.100 - avformat.h
-//   av_find_best_stream now uses a const AVCodec ** parameter
-//   for the returned decoder.
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 0, 100)
-    const AVCodec *codec;
-#else
-    AVCodec *codec;
-#endif
-
-    int stream =
-        av_find_best_stream(ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &codec, 0);
+    int stream = av_find_best_stream(ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
    if (stream < 0 ) {
        LOGE("Could not find best image stream");
        goto close_input;
@@ -98,6 +86,12 @@ decode_image(const char *path) {

    AVCodecParameters *params = ctx->streams[stream]->codecpar;

+    const AVCodec *codec = avcodec_find_decoder(params->codec_id);
+    if (!codec) {
+        LOGE("Could not find image decoder");
+        goto close_input;
+    }
+
    AVCodecContext *codec_ctx = avcodec_alloc_context3(codec);
    if (!codec_ctx) {
        LOG_OOM();
--- a/app/src/input_events.h
+++ b/app/src/input_events.h
@@ -9,7 +9,6 @@
 #include <SDL2/SDL_events.h>

 #include "coords.h"
-#include "options.h"

 /* The representation of input events in scrcpy is very close to the SDL API,
 * for simplicity.
@@ -438,21 +437,15 @@ sc_mouse_button_from_sdl(uint8_t button) {

 static inline uint8_t
 sc_mouse_buttons_state_from_sdl(uint32_t buttons_state,
-                                const struct sc_mouse_bindings *mb) {
+                                bool forward_all_clicks) {
    assert(buttons_state < 0x100); // fits in uint8_t

    uint8_t mask = SC_MOUSE_BUTTON_LEFT;
-    if (!mb || mb->right_click == SC_MOUSE_BINDING_CLICK) {
-        mask |= SC_MOUSE_BUTTON_RIGHT;
-    }
-    if (!mb || mb->middle_click == SC_MOUSE_BINDING_CLICK) {
-        mask |= SC_MOUSE_BUTTON_MIDDLE;
-    }
-    if (!mb || mb->click4 == SC_MOUSE_BINDING_CLICK) {
-        mask |= SC_MOUSE_BUTTON_X1;
-    }
-    if (!mb || mb->click5 == SC_MOUSE_BINDING_CLICK) {
-        mask |= SC_MOUSE_BUTTON_X2;
+    if (forward_all_clicks) {
+        mask |= SC_MOUSE_BUTTON_RIGHT
+              | SC_MOUSE_BUTTON_MIDDLE
+              | SC_MOUSE_BUTTON_X1
+              | SC_MOUSE_BUTTON_X2;
    }

    return buttons_state & mask;
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -10,7 +10,7 @@
 #define SC_SDL_SHORTCUT_MODS_MASK (KMOD_CTRL | KMOD_ALT | KMOD_GUI)

 static inline uint16_t
-to_sdl_mod(uint8_t shortcut_mod) {
+to_sdl_mod(unsigned shortcut_mod) {
    uint16_t sdl_mod = 0;
    if (shortcut_mod & SC_SHORTCUT_MOD_LCTRL) {
        sdl_mod |= KMOD_LCTRL;
@@ -38,26 +38,15 @@ is_shortcut_mod(struct sc_input_manager *im, uint16_t sdl_mod) {
    // keep only the relevant modifier keys
    sdl_mod &= SC_SDL_SHORTCUT_MODS_MASK;

-    // at least one shortcut mod pressed?
-    return sdl_mod & im->sdl_shortcut_mods;
-}
+    assert(im->sdl_shortcut_mods.count);
+    assert(im->sdl_shortcut_mods.count < SC_MAX_SHORTCUT_MODS);
+    for (unsigned i = 0; i < im->sdl_shortcut_mods.count; ++i) {
+        if (im->sdl_shortcut_mods.data[i] == sdl_mod) {
+            return true;
+        }
+    }

-static bool
-is_shortcut_key(struct sc_input_manager *im, SDL_Keycode keycode) {
-    return (im->sdl_shortcut_mods & KMOD_LCTRL && keycode == SDLK_LCTRL)
-        || (im->sdl_shortcut_mods & KMOD_RCTRL && keycode == SDLK_RCTRL)
-        || (im->sdl_shortcut_mods & KMOD_LALT  && keycode == SDLK_LALT)
-        || (im->sdl_shortcut_mods & KMOD_RALT  && keycode == SDLK_RALT)
-        || (im->sdl_shortcut_mods & KMOD_LGUI  && keycode == SDLK_LGUI)
-        || (im->sdl_shortcut_mods & KMOD_RGUI  && keycode == SDLK_RGUI);
-}
-
-static inline bool
-mouse_bindings_has_secondary_click(const struct sc_mouse_bindings *mb) {
-    return mb->right_click == SC_MOUSE_BINDING_CLICK
-        || mb->middle_click == SC_MOUSE_BINDING_CLICK
-        || mb->click4 == SC_MOUSE_BINDING_CLICK
-        || mb->click5 == SC_MOUSE_BINDING_CLICK;
+    return false;
 }

 void
@@ -75,13 +64,19 @@ sc_input_manager_init(struct sc_input_manager *im,
    im->kp = params->kp;
    im->mp = params->mp;

-    im->mouse_bindings = params->mouse_bindings;
-    im->has_secondary_click =
-        mouse_bindings_has_secondary_click(&im->mouse_bindings);
+    im->forward_all_clicks = params->forward_all_clicks;
    im->legacy_paste = params->legacy_paste;
    im->clipboard_autosync = params->clipboard_autosync;

-    im->sdl_shortcut_mods = to_sdl_mod(params->shortcut_mods);
+    const struct sc_shortcut_mods *shortcut_mods = params->shortcut_mods;
+    assert(shortcut_mods->count);
+    assert(shortcut_mods->count < SC_MAX_SHORTCUT_MODS);
+    for (unsigned i = 0; i < shortcut_mods->count; ++i) {
+        uint16_t sdl_mod = to_sdl_mod(shortcut_mods->data[i]);
+        assert(sdl_mod);
+        im->sdl_shortcut_mods.data[i] = sdl_mod;
+    }
+    im->sdl_shortcut_mods.count = shortcut_mods->count;

    im->vfinger_down = false;
    im->vfinger_invert_x = false;
@@ -376,8 +371,8 @@ simulate_virtual_finger(struct sc_input_manager *im,
    msg.inject_touch_event.position.screen_size = im->screen->frame_size;
    msg.inject_touch_event.position.point = point;
    msg.inject_touch_event.pointer_id =
-        im->has_secondary_click ? POINTER_ID_VIRTUAL_MOUSE
-                                : POINTER_ID_VIRTUAL_FINGER;
+        im->forward_all_clicks ? POINTER_ID_VIRTUAL_MOUSE
+                               : POINTER_ID_VIRTUAL_FINGER;
    msg.inject_touch_event.pressure = up ? 0.0f : 1.0f;
    msg.inject_touch_event.action_button = 0;
    msg.inject_touch_event.buttons = 0;
@@ -407,8 +402,6 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                             const SDL_KeyboardEvent *event) {
    // controller is NULL if --no-control is requested
    bool control = im->controller;
-    bool paused = im->screen->paused;
-    bool video = im->screen->video;

    SDL_Keycode keycode = event->keysym.sym;
    uint16_t mod = event->keysym.mod;
@@ -417,12 +410,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    bool shift = event->keysym.mod & KMOD_SHIFT;
    bool repeat = event->repeat;

-    // Either the modifier includes a shortcut modifier, or the key
-    // press/release is a modifier key.
-    // The second condition is necessary to ignore the release of the modifier
-    // key (because in this case mod is 0).
-    bool is_shortcut = is_shortcut_mod(im, mod)
-                    || is_shortcut_key(im, keycode);
+    bool smod = is_shortcut_mod(im, mod);

    if (down && !repeat) {
        if (keycode == im->last_keycode && mod == im->last_mod) {
@@ -434,72 +422,68 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        }
    }

-    if (is_shortcut) {
+    // The shortcut modifier is pressed
+    if (smod) {
        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
        switch (keycode) {
            case SDLK_h:
-                if (im->kp && !shift && !repeat && !paused) {
+                if (im->kp && !shift && !repeat) {
                    action_home(im, action);
                }
                return;
            case SDLK_b: // fall-through
            case SDLK_BACKSPACE:
-                if (im->kp && !shift && !repeat && !paused) {
+                if (im->kp && !shift && !repeat) {
                    action_back(im, action);
                }
                return;
            case SDLK_s:
-                if (im->kp && !shift && !repeat && !paused) {
+                if (im->kp && !shift && !repeat) {
                    action_app_switch(im, action);
                }
                return;
            case SDLK_m:
-                if (im->kp && !shift && !repeat && !paused) {
+                if (im->kp && !shift && !repeat) {
                    action_menu(im, action);
                }
                return;
            case SDLK_p:
-                if (im->kp && !shift && !repeat && !paused) {
+                if (im->kp && !shift && !repeat) {
                    action_power(im, action);
                }
                return;
            case SDLK_o:
-                if (control && !repeat && down && !paused) {
+                if (control && !repeat && down) {
                    enum sc_screen_power_mode mode = shift
                                                   ? SC_SCREEN_POWER_MODE_NORMAL
                                                   : SC_SCREEN_POWER_MODE_OFF;
                    set_screen_power_mode(im, mode);
                }
                return;
-            case SDLK_z:
-                if (video && down && !repeat) {
-                    sc_screen_set_paused(im->screen, !shift);
-                }
-                return;
            case SDLK_DOWN:
                if (shift) {
-                    if (video && !repeat && down) {
+                    if (!repeat & down) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_180);
                    }
-                } else if (im->kp && !paused) {
+                } else if (im->kp) {
                    // forward repeated events
                    action_volume_down(im, action);
                }
                return;
            case SDLK_UP:
                if (shift) {
-                    if (video && !repeat && down) {
+                    if (!repeat & down) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_180);
                    }
-                } else if (im->kp && !paused) {
+                } else if (im->kp) {
                    // forward repeated events
                    action_volume_up(im, action);
                }
                return;
            case SDLK_LEFT:
-                if (video && !repeat && down) {
+                if (!repeat && down) {
                    if (shift) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_0);
@@ -510,7 +494,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_RIGHT:
-                if (video && !repeat && down) {
+                if (!repeat && down) {
                    if (shift) {
                        apply_orientation_transform(im,
                                                    SC_ORIENTATION_FLIP_0);
@@ -521,17 +505,17 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_c:
-                if (im->kp && !shift && !repeat && down && !paused) {
+                if (im->kp && !shift && !repeat && down) {
                    get_device_clipboard(im, SC_COPY_KEY_COPY);
                }
                return;
            case SDLK_x:
-                if (im->kp && !shift && !repeat && down && !paused) {
+                if (im->kp && !shift && !repeat && down) {
                    get_device_clipboard(im, SC_COPY_KEY_CUT);
                }
                return;
            case SDLK_v:
-                if (im->kp && !repeat && down && !paused) {
+                if (im->kp && !repeat && down) {
                    if (shift || im->legacy_paste) {
                        // inject the text as input events
                        clipboard_paste(im);
@@ -543,27 +527,27 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_f:
-                if (video && !shift && !repeat && down) {
+                if (!shift && !repeat && down) {
                    sc_screen_switch_fullscreen(im->screen);
                }
                return;
            case SDLK_w:
-                if (video && !shift && !repeat && down) {
+                if (!shift && !repeat && down) {
                    sc_screen_resize_to_fit(im->screen);
                }
                return;
            case SDLK_g:
-                if (video && !shift && !repeat && down) {
+                if (!shift && !repeat && down) {
                    sc_screen_resize_to_pixel_perfect(im->screen);
                }
                return;
            case SDLK_i:
-                if (video && !shift && !repeat && down) {
+                if (!shift && !repeat && down) {
                    switch_fps_counter_state(im);
                }
                return;
            case SDLK_n:
-                if (control && !repeat && down && !paused) {
+                if (control && !repeat && down) {
                    if (shift) {
                        collapse_panels(im);
                    } else if (im->key_repeat == 0) {
@@ -574,12 +558,12 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                }
                return;
            case SDLK_r:
-                if (control && !shift && !repeat && down && !paused) {
+                if (control && !shift && !repeat && down) {
                    rotate_device(im);
                }
                return;
            case SDLK_k:
-                if (control && !shift && !repeat && down && !paused
+                if (control && !shift && !repeat && down
                        && im->kp && im->kp->hid) {
                    // Only if the current keyboard is hid
                    open_hard_keyboard_settings(im);
@@ -590,7 +574,7 @@ sc_input_manager_process_key(struct sc_input_manager *im,
        return;
    }

-    if (!im->kp || paused) {
+    if (!im->kp) {
        return;
    }

@@ -635,39 +619,29 @@ sc_input_manager_process_key(struct sc_input_manager *im,
    im->kp->ops->process_key(im->kp, &evt, ack_to_wait);
 }

-static struct sc_position
-sc_input_manager_get_position(struct sc_input_manager *im, int32_t x,
-                                                           int32_t y) {
-    if (im->mp->relative_mode) {
-        // No absolute position
-        return (struct sc_position) {
-            .screen_size = {0, 0},
-            .point = {0, 0},
-        };
-    }
-
-    return (struct sc_position) {
-        .screen_size = im->screen->frame_size,
-        .point = sc_screen_convert_window_to_frame_coords(im->screen, x, y),
-    };
-}
-
 static void
 sc_input_manager_process_mouse_motion(struct sc_input_manager *im,
                                      const SDL_MouseMotionEvent *event) {
+
    if (event->which == SDL_TOUCH_MOUSEID) {
        // simulated from touch events, so it's a duplicate
        return;
    }

    struct sc_mouse_motion_event evt = {
-        .position = sc_input_manager_get_position(im, event->x, event->y),
-        .pointer_id = im->has_secondary_click ? POINTER_ID_MOUSE
-                                              : POINTER_ID_GENERIC_FINGER,
+        .position = {
+            .screen_size = im->screen->frame_size,
+            .point = sc_screen_convert_window_to_frame_coords(im->screen,
+                                                              event->x,
+                                                              event->y),
+        },
+        .pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
+                                             : POINTER_ID_GENERIC_FINGER,
        .xrel = event->xrel,
        .yrel = event->yrel,
        .buttons_state =
-            sc_mouse_buttons_state_from_sdl(event->state, &im->mouse_bindings),
+            sc_mouse_buttons_state_from_sdl(event->state,
+                                            im->forward_all_clicks),
    };

    assert(im->mp->ops->process_mouse_motion);
@@ -718,109 +692,81 @@ sc_input_manager_process_touch(struct sc_input_manager *im,
    im->mp->ops->process_touch(im->mp, &evt);
 }

-static enum sc_mouse_binding
-sc_input_manager_get_binding(const struct sc_mouse_bindings *bindings,
-                             uint8_t sdl_button) {
-    switch (sdl_button) {
-        case SDL_BUTTON_LEFT:
-            return SC_MOUSE_BINDING_CLICK;
-        case SDL_BUTTON_RIGHT:
-            return bindings->right_click;
-        case SDL_BUTTON_MIDDLE:
-            return bindings->middle_click;
-        case SDL_BUTTON_X1:
-            return bindings->click4;
-        case SDL_BUTTON_X2:
-            return bindings->click5;
-        default:
-            return SC_MOUSE_BINDING_DISABLED;
-    }
-}
-
 static void
 sc_input_manager_process_mouse_button(struct sc_input_manager *im,
                                      const SDL_MouseButtonEvent *event) {
+    bool control = im->controller;
+
    if (event->which == SDL_TOUCH_MOUSEID) {
        // simulated from touch events, so it's a duplicate
        return;
    }

-    bool control = im->controller;
-    bool paused = im->screen->paused;
    bool down = event->type == SDL_MOUSEBUTTONDOWN;
-    if (control && !paused) {
-        enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;
+    if (!im->forward_all_clicks) {
+        if (control) {
+            enum sc_action action = down ? SC_ACTION_DOWN : SC_ACTION_UP;

-        enum sc_mouse_binding binding =
-            sc_input_manager_get_binding(&im->mouse_bindings, event->button);
-        assert(binding != SC_MOUSE_BINDING_AUTO);
-        switch (binding) {
-            case SC_MOUSE_BINDING_DISABLED:
-                // ignore click
+            if (im->kp && event->button == SDL_BUTTON_X1) {
+                action_app_switch(im, action);
+                return;
+            }
+            if (event->button == SDL_BUTTON_X2 && down) {
+                if (event->clicks < 2) {
+                    expand_notification_panel(im);
+                } else {
+                    expand_settings_panel(im);
+                }
+                return;
+            }
+            if (im->kp && event->button == SDL_BUTTON_RIGHT) {
+                press_back_or_turn_screen_on(im, action);
+                return;
+            }
+            if (im->kp && event->button == SDL_BUTTON_MIDDLE) {
+                action_home(im, action);
                return;
-            case SC_MOUSE_BINDING_BACK:
-                if (im->kp) {
-                    press_back_or_turn_screen_on(im, action);
-                }
-                return;
-            case SC_MOUSE_BINDING_HOME:
-                if (im->kp) {
-                    action_home(im, action);
-                }
-                return;
-            case SC_MOUSE_BINDING_APP_SWITCH:
-                if (im->kp) {
-                    action_app_switch(im, action);
-                }
-                return;
-            case SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL:
-                if (down) {
-                    if (event->clicks < 2) {
-                        expand_notification_panel(im);
-                    } else {
-                        expand_settings_panel(im);
-                    }
-                }
-                return;
-            default:
-                assert(binding == SC_MOUSE_BINDING_CLICK);
-                break;
-        }
-    }
-
-    // double-click on black borders resizes to fit the device screen
-    bool video = im->screen->video;
-    bool mouse_relative_mode = im->mp && im->mp->relative_mode;
-    if (video && !mouse_relative_mode && event->button == SDL_BUTTON_LEFT
-            && event->clicks == 2) {
-        int32_t x = event->x;
-        int32_t y = event->y;
-        sc_screen_hidpi_scale_coords(im->screen, &x, &y);
-        SDL_Rect *r = &im->screen->rect;
-        bool outside = x < r->x || x >= r->x + r->w
-                    || y < r->y || y >= r->y + r->h;
-        if (outside) {
-            if (down) {
-                sc_screen_resize_to_fit(im->screen);
            }
-            return;
        }
+
+        // double-click on black borders resize to fit the device screen
+        if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
+            int32_t x = event->x;
+            int32_t y = event->y;
+            sc_screen_hidpi_scale_coords(im->screen, &x, &y);
+            SDL_Rect *r = &im->screen->rect;
+            bool outside = x < r->x || x >= r->x + r->w
+                        || y < r->y || y >= r->y + r->h;
+            if (outside) {
+                if (down) {
+                    sc_screen_resize_to_fit(im->screen);
+                }
+                return;
+            }
+        }
+        // otherwise, send the click event to the device
    }

-    if (!im->mp || paused) {
+    if (!im->mp) {
        return;
    }

    uint32_t sdl_buttons_state = SDL_GetMouseState(NULL, NULL);

    struct sc_mouse_click_event evt = {
-        .position = sc_input_manager_get_position(im, event->x, event->y),
+        .position = {
+            .screen_size = im->screen->frame_size,
+            .point = sc_screen_convert_window_to_frame_coords(im->screen,
+                                                              event->x,
+                                                              event->y),
+        },
        .action = sc_action_from_sdl_mousebutton_type(event->type),
        .button = sc_mouse_button_from_sdl(event->button),
-        .pointer_id = im->has_secondary_click ? POINTER_ID_MOUSE
-                                              : POINTER_ID_GENERIC_FINGER,
-        .buttons_state = sc_mouse_buttons_state_from_sdl(sdl_buttons_state,
-                                                         &im->mouse_bindings),
+        .pointer_id = im->forward_all_clicks ? POINTER_ID_MOUSE
+                                             : POINTER_ID_GENERIC_FINGER,
+        .buttons_state =
+            sc_mouse_buttons_state_from_sdl(sdl_buttons_state,
+                                            im->forward_all_clicks),
    };

    assert(im->mp->ops->process_mouse_click);
@@ -888,7 +834,11 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
    uint32_t buttons = SDL_GetMouseState(&mouse_x, &mouse_y);

    struct sc_mouse_scroll_event evt = {
-        .position = sc_input_manager_get_position(im, mouse_x, mouse_y),
+        .position = {
+            .screen_size = im->screen->frame_size,
+            .point = sc_screen_convert_window_to_frame_coords(im->screen,
+                                                              mouse_x, mouse_y),
+        },
 #if SDL_VERSION_ATLEAST(2, 0, 18)
        .hscroll = CLAMP(event->preciseX, -1.0f, 1.0f),
        .vscroll = CLAMP(event->preciseY, -1.0f, 1.0f),
@@ -896,8 +846,8 @@ sc_input_manager_process_mouse_wheel(struct sc_input_manager *im,
        .hscroll = CLAMP(event->x, -1, 1),
        .vscroll = CLAMP(event->y, -1, 1),
 #endif
-        .buttons_state = sc_mouse_buttons_state_from_sdl(buttons,
-                                                         &im->mouse_bindings),
+        .buttons_state =
+            sc_mouse_buttons_state_from_sdl(buttons, im->forward_all_clicks),
    };

    im->mp->ops->process_mouse_scroll(im->mp, &evt);
@@ -935,10 +885,9 @@ void
 sc_input_manager_handle_event(struct sc_input_manager *im,
                              const SDL_Event *event) {
    bool control = im->controller;
-    bool paused = im->screen->paused;
    switch (event->type) {
        case SDL_TEXTINPUT:
-            if (!im->kp || paused) {
+            if (!im->kp) {
                break;
            }
            sc_input_manager_process_text_input(im, &event->text);
@@ -950,13 +899,13 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
            sc_input_manager_process_key(im, &event->key);
            break;
        case SDL_MOUSEMOTION:
-            if (!im->mp || paused) {
+            if (!im->mp) {
                break;
            }
            sc_input_manager_process_mouse_motion(im, &event->motion);
            break;
        case SDL_MOUSEWHEEL:
-            if (!im->mp || paused) {
+            if (!im->mp) {
                break;
            }
            sc_input_manager_process_mouse_wheel(im, &event->wheel);
@@ -970,7 +919,7 @@ sc_input_manager_handle_event(struct sc_input_manager *im,
        case SDL_FINGERMOTION:
        case SDL_FINGERDOWN:
        case SDL_FINGERUP:
-            if (!im->mp || paused) {
+            if (!im->mp) {
                break;
            }
            sc_input_manager_process_touch(im, &event->tfinger);
--- a/app/src/input_manager.h
+++ b/app/src/input_manager.h
@@ -22,12 +22,14 @@ struct sc_input_manager {
    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;

-    struct sc_mouse_bindings mouse_bindings;
-    bool has_secondary_click;
+    bool forward_all_clicks;
    bool legacy_paste;
    bool clipboard_autosync;

-    uint16_t sdl_shortcut_mods;
+    struct {
+        unsigned data[SC_MAX_SHORTCUT_MODS];
+        unsigned count;
+    } sdl_shortcut_mods;

    bool vfinger_down;
    bool vfinger_invert_x;
@@ -50,10 +52,10 @@ struct sc_input_manager_params {
    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;

-    struct sc_mouse_bindings mouse_bindings;
+    bool forward_all_clicks;
    bool legacy_paste;
    bool clipboard_autosync;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
+    const struct sc_shortcut_mods *shortcut_mods;
 };

 void
--- a/app/src/mouse_sdk.c
+++ b/app/src/mouse_sdk.c
@@ -58,18 +58,17 @@ convert_touch_action(enum sc_touch_action action) {
 static void
 sc_mouse_processor_process_mouse_motion(struct sc_mouse_processor *mp,
                                    const struct sc_mouse_motion_event *event) {
-    struct sc_mouse_sdk *m = DOWNCAST(mp);
-
-    if (!m->mouse_hover && !event->buttons_state) {
+    if (!event->buttons_state) {
        // Do not send motion events when no click is pressed
        return;
    }

+    struct sc_mouse_sdk *m = DOWNCAST(mp);
+
    struct sc_control_msg msg = {
        .type = SC_CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT,
        .inject_touch_event = {
-            .action = event->buttons_state ? AMOTION_EVENT_ACTION_MOVE
-                                           : AMOTION_EVENT_ACTION_HOVER_MOVE,
+            .action = AMOTION_EVENT_ACTION_MOVE,
            .pointer_id = event->pointer_id,
            .position = event->position,
            .pressure = 1.f,
@@ -146,10 +145,8 @@ sc_mouse_processor_process_touch(struct sc_mouse_processor *mp,
 }

 void
-sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller,
-                  bool mouse_hover) {
+sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller) {
    m->controller = controller;
-    m->mouse_hover = mouse_hover;

    static const struct sc_mouse_processor_ops ops = {
        .process_mouse_motion = sc_mouse_processor_process_mouse_motion,
--- a/app/src/mouse_sdk.h
+++ b/app/src/mouse_sdk.h
@@ -13,11 +13,9 @@ struct sc_mouse_sdk {
    struct sc_mouse_processor mouse_processor; // mouse processor trait

    struct sc_controller *controller;
-    bool mouse_hover;
 };

 void
-sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller,
-                  bool mouse_hover);
+sc_mouse_sdk_init(struct sc_mouse_sdk *m, struct sc_controller *controller);

 #endif
--- a/app/src/options.c
+++ b/app/src/options.c
@@ -23,12 +23,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .record_format = SC_RECORD_FORMAT_AUTO,
    .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_AUTO,
    .mouse_input_mode = SC_MOUSE_INPUT_MODE_AUTO,
-    .mouse_bindings = {
-        .right_click = SC_MOUSE_BINDING_AUTO,
-        .middle_click = SC_MOUSE_BINDING_AUTO,
-        .click4 = SC_MOUSE_BINDING_AUTO,
-        .click5 = SC_MOUSE_BINDING_AUTO,
-    },
    .camera_facing = SC_CAMERA_FACING_ANY,
    .port_range = {
        .first = DEFAULT_LOCAL_PORT_RANGE_FIRST,
@@ -36,7 +30,10 @@ const struct scrcpy_options scrcpy_options_default = {
    },
    .tunnel_host = 0,
    .tunnel_port = 0,
-    .shortcut_mods = SC_SHORTCUT_MOD_LALT | SC_SHORTCUT_MOD_LSUPER,
+    .shortcut_mods = {
+        .data = {SC_SHORTCUT_MOD_LALT, SC_SHORTCUT_MOD_LSUPER},
+        .count = 2,
+    },
    .max_size = 0,
    .video_bit_rate = 0,
    .audio_bit_rate = 0,
@@ -74,6 +71,7 @@ const struct scrcpy_options scrcpy_options_default = {
    .force_adb_forward = false,
    .disable_screensaver = false,
    .forward_key_repeat = true,
+    .forward_all_clicks = false,
    .legacy_paste = false,
    .power_off_on_close = false,
    .clipboard_autosync = true,
@@ -91,8 +89,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .kill_adb_on_close = false,
    .camera_high_speed = false,
    .list = 0,
-    .window = true,
-    .mouse_hover = true,
 };

 enum sc_orientation
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -155,23 +155,6 @@ enum sc_mouse_input_mode {
    SC_MOUSE_INPUT_MODE_AOA,
 };

-enum sc_mouse_binding {
-    SC_MOUSE_BINDING_AUTO,
-    SC_MOUSE_BINDING_DISABLED,
-    SC_MOUSE_BINDING_CLICK,
-    SC_MOUSE_BINDING_BACK,
-    SC_MOUSE_BINDING_HOME,
-    SC_MOUSE_BINDING_APP_SWITCH,
-    SC_MOUSE_BINDING_EXPAND_NOTIFICATION_PANEL,
-};
-
-struct sc_mouse_bindings {
-    enum sc_mouse_binding right_click;
-    enum sc_mouse_binding middle_click;
-    enum sc_mouse_binding click4;
-    enum sc_mouse_binding click5;
-};
-
 enum sc_key_inject_mode {
    // Inject special keys, letters and space as key events.
    // Inject numbers and punctuation as text events.
@@ -186,6 +169,8 @@ enum sc_key_inject_mode {
    SC_KEY_INJECT_MODE_RAW,
 };

+#define SC_MAX_SHORTCUT_MODS 8
+
 enum sc_shortcut_mod {
    SC_SHORTCUT_MOD_LCTRL = 1 << 0,
    SC_SHORTCUT_MOD_RCTRL = 1 << 1,
@@ -195,6 +180,11 @@ enum sc_shortcut_mod {
    SC_SHORTCUT_MOD_RSUPER = 1 << 5,
 };

+struct sc_shortcut_mods {
+    unsigned data[SC_MAX_SHORTCUT_MODS];
+    unsigned count;
+};
+
 struct sc_port_range {
    uint16_t first;
    uint16_t last;
@@ -225,12 +215,11 @@ struct scrcpy_options {
    enum sc_record_format record_format;
    enum sc_keyboard_input_mode keyboard_input_mode;
    enum sc_mouse_input_mode mouse_input_mode;
-    struct sc_mouse_bindings mouse_bindings;
    enum sc_camera_facing camera_facing;
    struct sc_port_range port_range;
    uint32_t tunnel_host;
    uint16_t tunnel_port;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
+    struct sc_shortcut_mods shortcut_mods;
    uint16_t max_size;
    uint32_t video_bit_rate;
    uint32_t audio_bit_rate;
@@ -268,6 +257,7 @@ struct scrcpy_options {
    bool force_adb_forward;
    bool disable_screensaver;
    bool forward_key_repeat;
+    bool forward_all_clicks;
    bool legacy_paste;
    bool power_off_on_close;
    bool clipboard_autosync;
@@ -289,8 +279,6 @@ struct scrcpy_options {
 #define SC_OPTION_LIST_CAMERAS 0x4
 #define SC_OPTION_LIST_CAMERA_SIZES 0x8
    uint8_t list;
-    bool window;
-    bool mouse_hover;
 };

 extern const struct scrcpy_options scrcpy_options_default;
--- a/app/src/receiver.c
+++ b/app/src/receiver.c
@@ -10,8 +10,7 @@
 #include "util/str.h"

 bool
-sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
-                 const struct sc_receiver_callbacks *cbs, void *cbs_userdata) {
+sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket) {
    bool ok = sc_mutex_init(&receiver->mutex);
    if (!ok) {
        return false;
@@ -21,10 +20,6 @@ sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
    receiver->acksync = NULL;
    receiver->uhid_devices = NULL;

-    assert(cbs && cbs->on_error);
-    receiver->cbs = cbs;
-    receiver->cbs_userdata = cbs_userdata;
-
    return true;
 }

@@ -157,8 +152,6 @@ run_receiver(void *data) {
        }
    }

-    receiver->cbs->on_error(receiver, receiver->cbs_userdata);
-
    return 0;
 }

--- a/app/src/receiver.h
+++ b/app/src/receiver.h
@@ -19,18 +19,10 @@ struct sc_receiver {

    struct sc_acksync *acksync;
    struct sc_uhid_devices *uhid_devices;
-
-    const struct sc_receiver_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct sc_receiver_callbacks {
-    void (*on_error)(struct sc_receiver *receiver, void *userdata);
 };

 bool
-sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket,
-                 const struct sc_receiver_callbacks *cbs, void *cbs_userdata);
+sc_receiver_init(struct sc_receiver *receiver, sc_socket control_socket);

 void
 sc_receiver_destroy(struct sc_receiver *receiver);
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -174,9 +174,6 @@ event_loop(struct scrcpy *s) {
            case SC_EVENT_DEMUXER_ERROR:
                LOGE("Demuxer error");
                return SCRCPY_EXIT_FAILURE;
-            case SC_EVENT_CONTROLLER_ERROR:
-                LOGE("Controller error");
-                return SCRCPY_EXIT_FAILURE;
            case SC_EVENT_RECORDER_ERROR:
                LOGE("Recorder error");
                return SCRCPY_EXIT_FAILURE;
@@ -268,16 +265,6 @@ sc_audio_demuxer_on_ended(struct sc_demuxer *demuxer,
    }
 }

-static void
-sc_controller_on_error(struct sc_controller *controller, void *userdata) {
-    // Note: this function may be called twice, once from the controller thread
-    // and once from the receiver thread
-    (void) controller;
-    (void) userdata;
-
-    PUSH_EVENT(SC_EVENT_CONTROLLER_ERROR);
-}
-
 static void
 sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
    (void) server;
@@ -421,7 +408,7 @@ scrcpy(struct scrcpy_options *options) {
        return SCRCPY_EXIT_FAILURE;
    }

-    if (options->window) {
+    if (options->video_playback) {
        // Set hints before starting the server thread to avoid race conditions
        // in SDL
        sdl_set_hints(options->render_driver);
@@ -443,7 +430,7 @@ scrcpy(struct scrcpy_options *options) {
    assert(!options->video_playback || options->video);
    assert(!options->audio_playback || options->audio);

-    if (options->window ||
+    if (options->video_playback ||
            (options->control && options->clipboard_autosync)) {
        // Initialize the video subsystem even if --no-video or
        // --no-video-playback is passed so that clipboard synchronization
@@ -566,12 +553,7 @@ scrcpy(struct scrcpy_options *options) {
    struct sc_mouse_processor *mp = NULL;

    if (options->control) {
-        static const struct sc_controller_callbacks controller_cbs = {
-            .on_error = sc_controller_on_error,
-        };
-
-        if (!sc_controller_init(&s->controller, s->server.control_socket,
-            &controller_cbs, NULL)) {
+        if (!sc_controller_init(&s->controller, s->server.control_socket)) {
            goto end;
        }
        controller_initialized = true;
@@ -681,8 +663,7 @@ scrcpy(struct scrcpy_options *options) {
        }

        if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_SDK) {
-            sc_mouse_sdk_init(&s->mouse_sdk, &s->controller,
-                              options->mouse_hover);
+            sc_mouse_sdk_init(&s->mouse_sdk, &s->controller);
            mp = &s->mouse_sdk.mouse_processor;
        } else if (options->mouse_input_mode == SC_MOUSE_INPUT_MODE_UHID) {
            bool ok = sc_mouse_uhid_init(&s->mouse_uhid, &s->controller);
@@ -703,20 +684,19 @@ scrcpy(struct scrcpy_options *options) {
    // There is a controller if and only if control is enabled
    assert(options->control == !!controller);

-    if (options->window) {
+    if (options->video_playback) {
        const char *window_title =
            options->window_title ? options->window_title : info->device_name;

        struct sc_screen_params screen_params = {
-            .video = options->video_playback,
            .controller = controller,
            .fp = fp,
            .kp = kp,
            .mp = mp,
-            .mouse_bindings = options->mouse_bindings,
+            .forward_all_clicks = options->forward_all_clicks,
            .legacy_paste = options->legacy_paste,
            .clipboard_autosync = options->clipboard_autosync,
-            .shortcut_mods = options->shortcut_mods,
+            .shortcut_mods = &options->shortcut_mods,
            .window_title = window_title,
            .always_on_top = options->always_on_top,
            .window_x = options->window_x,
@@ -730,15 +710,12 @@ scrcpy(struct scrcpy_options *options) {
            .start_fps_counter = options->start_fps_counter,
        };

-        struct sc_frame_source *src;
-        if (options->video_playback) {
-            src = &s->video_decoder.frame_source;
-            if (options->display_buffer) {
-                sc_delay_buffer_init(&s->display_buffer,
-                                     options->display_buffer, true);
-                sc_frame_source_add_sink(src, &s->display_buffer.frame_sink);
-                src = &s->display_buffer.frame_source;
-            }
+        struct sc_frame_source *src = &s->video_decoder.frame_source;
+        if (options->display_buffer) {
+            sc_delay_buffer_init(&s->display_buffer, options->display_buffer,
+                                 true);
+            sc_frame_source_add_sink(src, &s->display_buffer.frame_sink);
+            src = &s->display_buffer.frame_source;
        }

        if (!sc_screen_init(&s->screen, &screen_params)) {
@@ -746,9 +723,7 @@ scrcpy(struct scrcpy_options *options) {
        }
        screen_initialized = true;

-        if (options->video_playback) {
-            sc_frame_source_add_sink(src, &s->screen.frame_sink);
-        }
+        sc_frame_source_add_sink(src, &s->screen.frame_sink);
    }

    if (options->audio_playback) {
@@ -830,12 +805,9 @@ scrcpy(struct scrcpy_options *options) {
    ret = event_loop(s);
    LOGD("quit...");

-    if (options->video_playback) {
-        // Close the window immediately on closing, because screen_destroy()
-        // may only be called once the video demuxer thread is joined (it may
-        // take time)
-        sc_screen_hide_window(&s->screen);
-    }
+    // Close the window immediately on closing, because screen_destroy() may
+    // only be called once the video demuxer thread is joined (it may take time)
+    sc_screen_hide_window(&s->screen);

 end:
    if (timeout_started) {
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -205,8 +205,6 @@ sc_screen_toggle_mouse_capture(struct sc_screen *screen) {

 static void
 sc_screen_update_content_rect(struct sc_screen *screen) {
-    assert(screen->video);
-
    int dw;
    int dh;
    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
@@ -248,8 +246,6 @@ sc_screen_update_content_rect(struct sc_screen *screen) {
 // changed, so that the content rectangle is recomputed
 static void
 sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
-    assert(screen->video);
-
    if (update_content_rect) {
        sc_screen_update_content_rect(screen);
    }
@@ -259,13 +255,6 @@ sc_screen_render(struct sc_screen *screen, bool update_content_rect) {
    (void) res; // any error already logged
 }

-static void
-sc_screen_render_novideo(struct sc_screen *screen) {
-    enum sc_display_result res =
-        sc_display_render(&screen->display, NULL, SC_ORIENTATION_0);
-    (void) res; // any error already logged
-}
-
 #if defined(__APPLE__) || defined(__WINDOWS__)
 # define CONTINUOUS_RESIZING_WORKAROUND
 #endif
@@ -279,8 +268,6 @@ sc_screen_render_novideo(struct sc_screen *screen) {
 static int
 event_watcher(void *data, SDL_Event *event) {
    struct sc_screen *screen = data;
-    assert(screen->video);
-
    if (event->type == SDL_WINDOWEVENT
            && event->window.event == SDL_WINDOWEVENT_RESIZED) {
        // In practice, it seems to always be called from the same thread in
@@ -339,7 +326,6 @@ sc_screen_frame_sink_close(struct sc_frame_sink *sink) {
 static bool
 sc_screen_frame_sink_push(struct sc_frame_sink *sink, const AVFrame *frame) {
    struct sc_screen *screen = DOWNCAST(sink);
-    assert(screen->video);

    bool previous_skipped;
    bool ok = sc_frame_buffer_push(&screen->fb, frame, &previous_skipped);
@@ -376,11 +362,6 @@ sc_screen_init(struct sc_screen *screen,
    screen->maximized = false;
    screen->minimized = false;
    screen->mouse_capture_key_pressed = 0;
-    screen->paused = false;
-    screen->resume_frame = NULL;
-    screen->orientation = SC_ORIENTATION_0;
-
-    screen->video = params->video;

    screen->req.x = params->window_x;
    screen->req.y = params->window_y;
@@ -398,75 +379,41 @@ sc_screen_init(struct sc_screen *screen,
        goto error_destroy_frame_buffer;
    }

-    if (screen->video) {
-        screen->orientation = params->orientation;
-        if (screen->orientation != SC_ORIENTATION_0) {
-            LOGI("Initial display orientation set to %s",
-                 sc_orientation_get_name(screen->orientation));
-        }
+    screen->orientation = params->orientation;
+    if (screen->orientation != SC_ORIENTATION_0) {
+        LOGI("Initial display orientation set to %s",
+             sc_orientation_get_name(screen->orientation));
    }

-    uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
+    uint32_t window_flags = SDL_WINDOW_HIDDEN
+                          | SDL_WINDOW_RESIZABLE
+                          | SDL_WINDOW_ALLOW_HIGHDPI;
    if (params->always_on_top) {
        window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
    }
    if (params->window_borderless) {
        window_flags |= SDL_WINDOW_BORDERLESS;
    }
-    if (params->video) {
-        // The window will be shown on first frame
-        window_flags |= SDL_WINDOW_HIDDEN
-                      | SDL_WINDOW_RESIZABLE;
-    }
-
-    const char *title = params->window_title;
-    assert(title);
-
-    int x = SDL_WINDOWPOS_UNDEFINED;
-    int y = SDL_WINDOWPOS_UNDEFINED;
-    int width = 256;
-    int height = 256;
-    if (params->window_x != SC_WINDOW_POSITION_UNDEFINED) {
-        x = params->window_x;
-    }
-    if (params->window_y != SC_WINDOW_POSITION_UNDEFINED) {
-        y = params->window_y;
-    }
-    if (params->window_width) {
-        width = params->window_width;
-    }
-    if (params->window_height) {
-        height = params->window_height;
-    }

    // The window will be positioned and sized on first video frame
-    screen->window = SDL_CreateWindow(title, x, y, width, height, window_flags);
+    screen->window =
+        SDL_CreateWindow(params->window_title, 0, 0, 0, 0, window_flags);
    if (!screen->window) {
        LOGE("Could not create window: %s", SDL_GetError());
        goto error_destroy_fps_counter;
    }

+    ok = sc_display_init(&screen->display, screen->window, params->mipmaps);
+    if (!ok) {
+        goto error_destroy_window;
+    }
+
    SDL_Surface *icon = scrcpy_icon_load();
    if (icon) {
        SDL_SetWindowIcon(screen->window, icon);
-    } else if (params->video) {
-        // just a warning
-        LOGW("Could not load icon");
-    } else {
-        // without video, the icon is used as window content, it must be present
-        LOGE("Could not load icon");
-        goto error_destroy_fps_counter;
-    }
-
-    SDL_Surface *icon_novideo = params->video ? NULL : icon;
-    bool mipmaps = params->video && params->mipmaps;
-    ok = sc_display_init(&screen->display, screen->window, icon_novideo,
-                         mipmaps);
-    if (icon) {
        scrcpy_icon_destroy(icon);
-    }
-    if (!ok) {
-        goto error_destroy_window;
+    } else {
+        LOGW("Could not load icon");
    }

    screen->frame = av_frame_alloc();
@@ -481,7 +428,7 @@ sc_screen_init(struct sc_screen *screen,
        .screen = screen,
        .kp = params->kp,
        .mp = params->mp,
-        .mouse_bindings = params->mouse_bindings,
+        .forward_all_clicks = params->forward_all_clicks,
        .legacy_paste = params->legacy_paste,
        .clipboard_autosync = params->clipboard_autosync,
        .shortcut_mods = params->shortcut_mods,
@@ -490,9 +437,7 @@ sc_screen_init(struct sc_screen *screen,
    sc_input_manager_init(&screen->im, &im_params);

 #ifdef CONTINUOUS_RESIZING_WORKAROUND
-    if (screen->video) {
-        SDL_AddEventWatch(event_watcher, screen);
-    }
+    SDL_AddEventWatch(event_watcher, screen);
 #endif

    static const struct sc_frame_sink_ops ops = {
@@ -507,11 +452,6 @@ sc_screen_init(struct sc_screen *screen,
    screen->open = false;
 #endif

-    if (!screen->video && sc_screen_is_relative_mode(screen)) {
-        // Capture mouse immediately if video mirroring is disabled
-        sc_screen_set_mouse_capture(screen, true);
-    }
-
    return true;

 error_destroy_display:
@@ -582,8 +522,6 @@ sc_screen_destroy(struct sc_screen *screen) {
 static void
 resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,
                   struct sc_size new_content_size) {
-    assert(screen->video);
-
    struct sc_size window_size = get_window_size(screen);
    struct sc_size target_size = {
        .width = (uint32_t) window_size.width * new_content_size.width
@@ -597,8 +535,6 @@ resize_for_content(struct sc_screen *screen, struct sc_size old_content_size,

 static void
 set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {
-    assert(screen->video);
-
    if (!screen->fullscreen && !screen->maximized && !screen->minimized) {
        resize_for_content(screen, screen->content_size, new_content_size);
    } else if (!screen->resize_pending) {
@@ -613,8 +549,6 @@ set_content_size(struct sc_screen *screen, struct sc_size new_content_size) {

 static void
 apply_pending_resize(struct sc_screen *screen) {
-    assert(screen->video);
-
    assert(!screen->fullscreen);
    assert(!screen->maximized);
    assert(!screen->minimized);
@@ -628,8 +562,6 @@ apply_pending_resize(struct sc_screen *screen) {
 void
 sc_screen_set_orientation(struct sc_screen *screen,
                          enum sc_orientation orientation) {
-    assert(screen->video);
-
    if (orientation == screen->orientation) {
        return;
    }
@@ -664,8 +596,6 @@ sc_screen_init_size(struct sc_screen *screen) {
 // recreate the texture and resize the window if the frame size has changed
 static enum sc_display_result
 prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
-    assert(screen->video);
-
    if (screen->frame_size.width == new_frame_size.width
            && screen->frame_size.height == new_frame_size.height) {
        return SC_DISPLAY_RESULT_OK;
@@ -684,12 +614,13 @@ prepare_for_frame(struct sc_screen *screen, struct sc_size new_frame_size) {
 }

 static bool
-sc_screen_apply_frame(struct sc_screen *screen) {
-    assert(screen->video);
+sc_screen_update_frame(struct sc_screen *screen) {
+    av_frame_unref(screen->frame);
+    sc_frame_buffer_consume(&screen->fb, screen->frame);
+    AVFrame *frame = screen->frame;

    sc_fps_counter_add_rendered_frame(&screen->fps_counter);

-    AVFrame *frame = screen->frame;
    struct sc_size new_frame_size = {frame->width, frame->height};
    enum sc_display_result res = prepare_for_frame(screen, new_frame_size);
    if (res == SC_DISPLAY_RESULT_ERROR) {
@@ -724,62 +655,8 @@ sc_screen_apply_frame(struct sc_screen *screen) {
    return true;
 }

-static bool
-sc_screen_update_frame(struct sc_screen *screen) {
-    assert(screen->video);
-
-    if (screen->paused) {
-        if (!screen->resume_frame) {
-            screen->resume_frame = av_frame_alloc();
-            if (!screen->resume_frame) {
-                LOG_OOM();
-                return false;
-            }
-        } else {
-            av_frame_unref(screen->resume_frame);
-        }
-        sc_frame_buffer_consume(&screen->fb, screen->resume_frame);
-        return true;
-    }
-
-    av_frame_unref(screen->frame);
-    sc_frame_buffer_consume(&screen->fb, screen->frame);
-    return sc_screen_apply_frame(screen);
-}
-
-void
-sc_screen_set_paused(struct sc_screen *screen, bool paused) {
-    assert(screen->video);
-
-    if (!paused && !screen->paused) {
-        // nothing to do
-        return;
-    }
-
-    if (screen->paused && screen->resume_frame) {
-        // If display screen was paused, refresh the frame immediately, even if
-        // the new state is also paused.
-        av_frame_free(&screen->frame);
-        screen->frame = screen->resume_frame;
-        screen->resume_frame = NULL;
-        sc_screen_apply_frame(screen);
-    }
-
-    if (!paused) {
-        LOGI("Display screen unpaused");
-    } else if (!screen->paused) {
-        LOGI("Display screen paused");
-    } else {
-        LOGI("Display screen re-paused");
-    }
-
-    screen->paused = paused;
-}
-
 void
 sc_screen_switch_fullscreen(struct sc_screen *screen) {
-    assert(screen->video);
-
    uint32_t new_mode = screen->fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP;
    if (SDL_SetWindowFullscreen(screen->window, new_mode)) {
        LOGW("Could not switch fullscreen mode: %s", SDL_GetError());
@@ -797,8 +674,6 @@ sc_screen_switch_fullscreen(struct sc_screen *screen) {

 void
 sc_screen_resize_to_fit(struct sc_screen *screen) {
-    assert(screen->video);
-
    if (screen->fullscreen || screen->maximized || screen->minimized) {
        return;
    }
@@ -823,8 +698,6 @@ sc_screen_resize_to_fit(struct sc_screen *screen) {

 void
 sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
-    assert(screen->video);
-
    if (screen->fullscreen || screen->minimized) {
        return;
    }
@@ -868,13 +741,6 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
            return true;
        }
        case SDL_WINDOWEVENT:
-            if (!screen->video
-                    && event->window.event == SDL_WINDOWEVENT_EXPOSED) {
-                sc_screen_render_novideo(screen);
-            }
-
-            // !video implies !has_frame
-            assert(screen->video || !screen->has_frame);
            if (!screen->has_frame) {
                // Do nothing
                return true;
@@ -978,8 +844,6 @@ sc_screen_handle_event(struct sc_screen *screen, const SDL_Event *event) {
 struct sc_point
 sc_screen_convert_drawable_to_frame_coords(struct sc_screen *screen,
                                           int32_t x, int32_t y) {
-    assert(screen->video);
-
    enum sc_orientation orientation = screen->orientation;

    int32_t w = screen->content_size.width;
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -26,8 +26,6 @@ struct sc_screen {
    bool open; // track the open/close state to assert correct behavior
 #endif

-    bool video;
-
    struct sc_display display;
    struct sc_input_manager im;
    struct sc_frame_buffer fb;
@@ -66,23 +64,18 @@ struct sc_screen {
    SDL_Keycode mouse_capture_key_pressed;

    AVFrame *frame;
-
-    bool paused;
-    AVFrame *resume_frame;
 };

 struct sc_screen_params {
-    bool video;
-
    struct sc_controller *controller;
    struct sc_file_pusher *fp;
    struct sc_key_processor *kp;
    struct sc_mouse_processor *mp;

-    struct sc_mouse_bindings mouse_bindings;
+    bool forward_all_clicks;
    bool legacy_paste;
    bool clipboard_autosync;
-    uint8_t shortcut_mods; // OR of enum sc_shortcut_mod values
+    const struct sc_shortcut_mods *shortcut_mods;

    const char *window_title;
    bool always_on_top;
@@ -142,10 +135,6 @@ void
 sc_screen_set_orientation(struct sc_screen *screen,
                          enum sc_orientation orientation);

-// set the display pause state
-void
-sc_screen_set_paused(struct sc_screen *screen, bool paused);
-
 // react to SDL events
 // If this function returns false, scrcpy must exit with an error.
 bool
--- a/app/src/sys/win/process.c
+++ b/app/src/sys/win/process.c
@@ -176,8 +176,6 @@ sc_process_execute_p(const char *const argv[], HANDLE *handle, unsigned flags,
        free(lpAttributeList);
    }

-    CloseHandle(pi.hThread);
-
    // These handles are used by the child process, close them for this process
    if (pin) {
        CloseHandle(stdin_read_handle);
--- a/app/src/usb/screen_otg.c
+++ b/app/src/usb/screen_otg.c
@@ -169,7 +169,7 @@ sc_screen_otg_process_mouse_motion(struct sc_screen_otg *screen,
        // .position not used for HID events
        .xrel = event->xrel,
        .yrel = event->yrel,
-        .buttons_state = sc_mouse_buttons_state_from_sdl(event->state, NULL),
+        .buttons_state = sc_mouse_buttons_state_from_sdl(event->state, true),
    };

    assert(mp->ops->process_mouse_motion);
@@ -189,7 +189,7 @@ sc_screen_otg_process_mouse_button(struct sc_screen_otg *screen,
        .action = sc_action_from_sdl_mousebutton_type(event->type),
        .button = sc_mouse_button_from_sdl(event->button),
        .buttons_state =
-            sc_mouse_buttons_state_from_sdl(sdl_buttons_state, NULL),
+            sc_mouse_buttons_state_from_sdl(sdl_buttons_state, true),
    };

    assert(mp->ops->process_mouse_click);
@@ -209,7 +209,7 @@ sc_screen_otg_process_mouse_wheel(struct sc_screen_otg *screen,
        .hscroll = event->x,
        .vscroll = event->y,
        .buttons_state =
-            sc_mouse_buttons_state_from_sdl(sdl_buttons_state, NULL),
+            sc_mouse_buttons_state_from_sdl(sdl_buttons_state, true),
    };

    assert(mp->ops->process_mouse_scroll);
--- a/app/src/util/audiobuf.c
+++ b/app/src/util/audiobuf.c
@@ -46,9 +46,6 @@ sc_audiobuf_read(struct sc_audiobuf *buf, void *to_, uint32_t samples_count) {
    uint32_t head = atomic_load_explicit(&buf->head, memory_order_acquire);

    uint32_t can_read = (buf->alloc_size + head - tail) % buf->alloc_size;
-    if (!can_read) {
-        return 0;
-    }
    if (samples_count > can_read) {
        samples_count = can_read;
    }
@@ -89,9 +86,6 @@ sc_audiobuf_write(struct sc_audiobuf *buf, const void *from_,
    uint32_t tail = atomic_load_explicit(&buf->tail, memory_order_acquire);

    uint32_t can_write = (buf->alloc_size + tail - head - 1) % buf->alloc_size;
-    if (!can_write) {
-        return 0;
-    }
    if (samples_count > can_write) {
        samples_count = can_write;
    }
--- a/app/tests/test_cli.c
+++ b/app/tests/test_cli.c
@@ -124,22 +124,32 @@ static void test_options2(void) {
 }

 static void test_parse_shortcut_mods(void) {
-    uint8_t mods;
+    struct sc_shortcut_mods mods;
    bool ok;

    ok = sc_parse_shortcut_mods("lctrl", &mods);
    assert(ok);
-    assert(mods == SC_SHORTCUT_MOD_LCTRL);
+    assert(mods.count == 1);
+    assert(mods.data[0] == SC_SHORTCUT_MOD_LCTRL);
+
+    ok = sc_parse_shortcut_mods("lctrl+lalt", &mods);
+    assert(ok);
+    assert(mods.count == 1);
+    assert(mods.data[0] == (SC_SHORTCUT_MOD_LCTRL | SC_SHORTCUT_MOD_LALT));

    ok = sc_parse_shortcut_mods("rctrl,lalt", &mods);
    assert(ok);
-    assert(mods == (SC_SHORTCUT_MOD_RCTRL | SC_SHORTCUT_MOD_LALT));
+    assert(mods.count == 2);
+    assert(mods.data[0] == SC_SHORTCUT_MOD_RCTRL);
+    assert(mods.data[1] == SC_SHORTCUT_MOD_LALT);

-    ok = sc_parse_shortcut_mods("lsuper,rsuper,lctrl", &mods);
+    ok = sc_parse_shortcut_mods("lsuper,rsuper+lalt,lctrl+rctrl+ralt", &mods);
    assert(ok);
-    assert(mods == (SC_SHORTCUT_MOD_LSUPER
-                  | SC_SHORTCUT_MOD_RSUPER
-                  | SC_SHORTCUT_MOD_LCTRL));
+    assert(mods.count == 3);
+    assert(mods.data[0] == SC_SHORTCUT_MOD_LSUPER);
+    assert(mods.data[1] == (SC_SHORTCUT_MOD_RSUPER | SC_SHORTCUT_MOD_LALT));
+    assert(mods.data[2] == (SC_SHORTCUT_MOD_LCTRL | SC_SHORTCUT_MOD_RCTRL |
+                            SC_SHORTCUT_MOD_RALT));

    ok = sc_parse_shortcut_mods("", &mods);
    assert(!ok);
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.1.3'

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
--- a/doc/audio.md
+++ b/doc/audio.md
@@ -28,21 +28,14 @@ To disable only the audio playback, see [no playback](video.md#no-playback).

 ## Audio only

-To play audio only, disable video and control:
+To play audio only, disable the video:

 ```bash
-scrcpy --no-video --no-control
-```
-
-To play audio without a window:
-
-```bash
-# --no-video and --no-control are implied by --no-window
-scrcpy --no-window
+scrcpy --no-video
 # interrupt with Ctrl+C
 ```

-Without video, the audio latency is typically not criticial, so it might be
+Without video, the audio latency is typically not critical, so it might be
 interesting to add [buffering](#buffering) to minimize glitches:

 ```
--- a/doc/build.md
+++ b/doc/build.md
@@ -94,7 +94,7 @@ This is the preferred method (and the way the release is built).
 From _Debian_, install _mingw_:

 ```bash
-sudo apt install mingw-w64 mingw-w64-tools
+sudo apt install mingw-w64 mingw-w64-tools libz-mingw-w64-dev
 ```

 You also need the JDK to build the server:
--- a/doc/control.md
+++ b/doc/control.md
@@ -15,31 +15,6 @@ scrcpy -n   # short version
 Read [keyboard](keyboard.md) and [mouse](mouse.md).


-## Control only
-
-To control the device without mirroring:
-
-```bash
-scrcpy --no-video --no-audio
-```
-
-By default, mouse mode is switched to UHID if video mirroring is disabled (a
-relative mouse mode is required).
-
-To also use a UHID keyboard, set it explicitly:
-
-```bash
-scrcpy --no-video --no-audio --keyboard=uhid
-scrcpy --no-video --no-audio -K  # short version
-```
-
-To use AOA instead (over USB only):
-
-```bash
-scrcpy --no-video --no-audio --keyboard=aoa --mouse=aoa
-```
-
-
 ## Copy-paste

 Any time the Android clipboard changes, it is automatically synchronized to the
@@ -106,6 +81,15 @@ only inverts _x_.
 This only works for the default mouse mode (`--mouse=sdk`).


+## Right-click and middle-click
+
+By default, right-click triggers BACK (or POWER on) and middle-click triggers
+HOME. To disable these shortcuts and forward the clicks to the device instead:
+
+```bash
+scrcpy --forward-all-clicks
+```
+
 ## File drop

 ### Install APK
--- a/doc/mouse.md
+++ b/doc/mouse.md
@@ -18,14 +18,6 @@ Note that on some devices, an additional option must be enabled in developer
 options for this mouse mode to work. See
 [prerequisites](/README.md#prerequisites).

-### Mouse hover
-
-By default, mouse hover (mouse motion without any clicks) events are forwarded
-to the device. This can be disabled with:
-
-```
-scrcpy --no-mouse-hover
-```

 ## Physical mouse simulation

@@ -76,43 +68,3 @@ debugging disabled (see [OTG](otg.md)).
 Note: On Windows, it may only work in [OTG mode](otg.md), not while mirroring
 (it is not possible to open a USB device if it is already open by another
 process like the _adb daemon_).
-
-
-## Mouse bindings
-
-By default, with SDK mouse, right-click triggers BACK (or POWER on) and
-middle-click triggers HOME. In addition, the 4th click triggers APP_SWITCH and
-the 5th click expands the notification panel.
-
-In AOA and UHID mouse modes, all clicks are forwarded by default.
-
-The shortcuts can be configured using `--mouse-bind=xxxx` for any mouse mode.
-The argument must be exactly 4 characters, one for each secondary click:
-
-```
--mouse-bind=xxxx
-             ^^^^
-             ||||
-             ||| `- 5th click
-             || `-- 4th click
-             | `--- middle click
-              `---- right click
-```
-
-Each character must be one of the following:
-
- - `+`: forward the click to the device
- - `-`: ignore the click
- - `b`: trigger shortcut BACK (or turn screen on if off)
- - `h`: trigger shortcut HOME
- - `s`: trigger shortcut APP_SWITCH
- - `n`: trigger shortcut "expand notification panel"
-
-For example:
-
-```bash
-scrcpy --mouse-bind=bhsn  # the default mode with SDK mouse
-scrcpy --mouse-bind=++++  # forward all clicks (default for AOA/UHID)
-scrcpy --mouse-bind=++bh  # forward right and middle clicks,
-                          # use 4th and 5th for BACK and HOME
-```
--- a/doc/otg.md
+++ b/doc/otg.md
@@ -1,21 +1,19 @@
 # OTG

 By default, _scrcpy_ injects input events at the Android API level. As an
-alternative, it is possible to send HID events, so that scrcpy behaves as if it
-was a [physical keyboard] and/or a [physical mouse] connected to the Android
-device (see [keyboard](keyboard.md) and [mouse](mouse.md)).
+alternative, when connected over USB, it is possible to send HID events, so that
+scrcpy behaves as if it was a physical keyboard and/or mouse connected to the
+Android device.

-[physical keyboard]: keyboard.md#physical-keyboard-simulation
-[physical mouse]: physical-keyboard-simulation
+A special mode allows to control the device without mirroring, using AOA
+[keyboard](keyboard.md#aoa) and [mouse](mouse.md#aoa). Therefore, it is possible
+to run _scrcpy_ with only physical keyboard and mouse simulation (HID), as if
+the computer keyboard and mouse were plugged directly to the device via an OTG
+cable.

-A special mode (OTG) allows to control the device using AOA
-[keyboard](keyboard.md#aoa) and [mouse](mouse.md#aoa), without using _adb_ at
-all (so USB debugging is not necessary). In this mode, video and audio are
-disabled, and `--keyboard=aoa and `--mouse=aoa` are implicitly set.
+In this mode, `adb` (USB debugging) is not necessary, and mirroring is disabled.

-Therefore, it is possible to run _scrcpy_ with only physical keyboard and mouse
-simulation, as if the computer keyboard and mouse were plugged directly to the
-device via an OTG cable.
+This is similar to `--keyboard=aoa --mouse=aoa`, but without mirroring.

 To enable OTG mode:

@@ -25,7 +23,7 @@ scrcpy --otg
 scrcpy --otg -s 0123456789abcdef
 ```

-It is possible to disable keyboard or mouse:
+It is possible to disable HID keyboard or HID mouse:

 ```bash
 scrcpy --otg --keyboard=disabled
@@ -37,22 +35,3 @@ It only works if the device is connected over USB.
 ## OTG issues on Windows

 See [FAQ](/FAQ.md#otg-issues-on-windows).
-
-
-## Control only
-
-Note that the purpose of OTG is to control the device without USB debugging
-(adb).
-
-If you want to solely control the device without mirroring while USB debugging
-is enabled, then OTG mode is not necessary.
-
-Instead, disable video and audio, and select UHID (or AOA):
-
-```bash
-scrcpy --no-video --no-audio --keyboard=uhid --mouse=uhid
-scrcpy --no-video --no-audio -KM  # short version
-scrcpy --no-video --no-audio --keyboard=aoa --mouse=aoa
-```
-
-One benefit of UHID is that it also works wirelessly.
--- a/doc/recording.md
+++ b/doc/recording.md
@@ -58,10 +58,12 @@ orientation](video.md#orientation).

 ## No playback

-To disable playback and control while recording:
+To disable playback while recording:

 ```bash
-scrcpy --no-playback --no-control --record=file.mp4
+scrcpy --no-playback --record=file.mp4
+scrcpy -Nr file.mkv
+# interrupt recording with Ctrl+C
 ```

 It is also possible to disable video and audio playback separately:
@@ -71,13 +73,6 @@ It is also possible to disable video and audio playback separately:
 scrcpy --record=file.mkv --no-audio-playback
 ```

-To also disable the window:
-
-```bash
-scrcpy --no-playback --no-window --record=file.mp4
-# interrupt recording with Ctrl+C
-```
-
 ## Time limit

 To limit the recording time:
--- a/doc/shortcuts.md
+++ b/doc/shortcuts.md
@@ -13,8 +13,8 @@ It can be changed using `--shortcut-mod`. Possible keys are `lctrl`, `rctrl`,
 # use RCtrl for shortcuts
 scrcpy --shortcut-mod=rctrl

-# use either LCtrl or LSuper for shortcuts
-scrcpy --shortcut-mod=lctrl,lsuper
+# use either LCtrl+LAlt or LSuper for shortcuts
+scrcpy --shortcut-mod=lctrl+lalt,lsuper
 ```

 _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
@@ -28,8 +28,6 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
 | Rotate display right                        | <kbd>MOD</kbd>+<kbd>→</kbd> _(right)_
 | Flip display horizontally                   | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>←</kbd> _(left)_ \| <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>→</kbd> _(right)_
 | Flip display vertically                     | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>↑</kbd> _(up)_ \| <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>↓</kbd> _(down)_
- | Pause or re-pause display                   | <kbd>MOD</kbd>+<kbd>z</kbd>
- | Unpause display                             | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>z</kbd>
 | Resize window to 1:1 (pixel-perfect)        | <kbd>MOD</kbd>+<kbd>g</kbd>
 | Resize window to remove black borders       | <kbd>MOD</kbd>+<kbd>w</kbd> \| _Double-left-click¹_
 | Click on `HOME`                             | <kbd>MOD</kbd>+<kbd>h</kbd> \| _Middle-click_
--- a/doc/window.md
+++ b/doc/window.md
@@ -1,14 +1,5 @@
 # Window

-## Disable window
-
-To disable window (may be useful for recording or for playing audio only):
-
-```bash
-scrcpy --no-window --record=file.mp4
-# Ctrl+C to interrupt
-```
-
 ## Title

 By default, the window title is the device model. It can be changed:
--- a/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CameraCapture.java
@@ -127,10 +127,6 @@ public class CameraCapture extends SurfaceCapture {

        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
        android.util.Size[] sizes = highSpeed ? configs.getHighSpeedVideoSizes() : configs.getOutputSizes(MediaCodec.class);
-        if (sizes == null) {
-            return null;
-        }
-
        Stream<android.util.Size> stream = Arrays.stream(sizes);
        if (maxSize > 0) {
            stream = stream.filter(it -> it.getWidth() <= maxSize && it.getHeight() <= maxSize);
--- a/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/LogUtils.java
@@ -118,16 +118,12 @@ public final class LogUtils {
                        StreamConfigurationMap configs = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);

                        android.util.Size[] sizes = configs.getOutputSizes(MediaCodec.class);
-                        if (sizes == null || sizes.length == 0) {
-                            builder.append("\n        (none)");
-                        } else {
-                            for (android.util.Size size : sizes) {
-                                builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
-                            }
+                        for (android.util.Size size : sizes) {
+                            builder.append("\n        - ").append(size.getWidth()).append('x').append(size.getHeight());
                        }

                        android.util.Size[] highSpeedSizes = configs.getHighSpeedVideoSizes();
-                        if (highSpeedSizes != null && highSpeedSizes.length > 0) {
+                        if (highSpeedSizes.length > 0) {
                            builder.append("\n      High speed capture (--camera-high-speed):");
                            for (android.util.Size size : highSpeedSizes) {
                                Range<Integer>[] highFpsRanges = configs.getHighSpeedVideoFpsRanges();
--- a/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/ScreenCapture.java
@@ -45,18 +45,18 @@ public class ScreenCapture extends SurfaceCapture implements Device.RotationList
        }

        try {
+            display = createDisplay();
+            setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
+            Ln.d("Display: using SurfaceControl API");
+        } catch (Exception surfaceControlException) {
            Rect videoRect = screenInfo.getVideoSize().toRect();
-            virtualDisplay = ServiceManager.getDisplayManager()
-                    .createVirtualDisplay("scrcpy", videoRect.width(), videoRect.height(), device.getDisplayId(), surface);
-            Ln.d("Display: using DisplayManager API");
-        } catch (Exception displayManagerException) {
            try {
-                display = createDisplay();
-                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
-                Ln.d("Display: using SurfaceControl API");
-            } catch (Exception surfaceControlException) {
-                Ln.e("Could not create display using DisplayManager", displayManagerException);
+                virtualDisplay = ServiceManager.getDisplayManager()
+                        .createVirtualDisplay("scrcpy", videoRect.width(), videoRect.height(), device.getDisplayId(), surface);
+                Ln.d("Display: using DisplayManager API");
+            } catch (Exception displayManagerException) {
                Ln.e("Could not create display using SurfaceControl", surfaceControlException);
+                Ln.e("Could not create display using DisplayManager", displayManagerException);
                throw new AssertionError("Could not create display");
            }
        }
@@ -68,11 +68,6 @@ public class ScreenCapture extends SurfaceCapture implements Device.RotationList
        device.setFoldListener(null);
        if (display != null) {
            SurfaceControl.destroyDisplay(display);
-            display = null;
-        }
-        if (virtualDisplay != null) {
-            virtualDisplay.release();
-            virtualDisplay = null;
        }
    }

--- a/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/SurfaceEncoder.java
@@ -3,7 +3,6 @@ package com.genymobile.scrcpy;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
-import android.os.Build;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.view.Surface;
@@ -48,7 +47,7 @@ public class SurfaceEncoder implements AsyncProcessor {
        this.downsizeOnError = downsizeOnError;
    }

-    private void streamCapture() throws IOException, ConfigurationException {
+    private void streamScreen() throws IOException, ConfigurationException {
        Codec codec = streamer.getCodec();
        MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
        MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);
@@ -221,9 +220,6 @@ public class SurfaceEncoder implements AsyncProcessor {
        // must be present to configure the encoder, but does not impact the actual frame rate, which is variable
        format.setInteger(MediaFormat.KEY_FRAME_RATE, 60);
        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            format.setInteger(MediaFormat.KEY_COLOR_RANGE, MediaFormat.COLOR_RANGE_LIMITED);
-        }
        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, DEFAULT_I_FRAME_INTERVAL);
        // display the very first frame, and recover from bad quality when no new frames
        format.setLong(MediaFormat.KEY_REPEAT_PREVIOUS_FRAME_AFTER, REPEAT_FRAME_DELAY_US); // µs
@@ -254,7 +250,7 @@ public class SurfaceEncoder implements AsyncProcessor {
            Looper.prepare();

            try {
-                streamCapture();
+                streamScreen();
            } catch (ConfigurationException e) {
                // Do not print stack trace, a user-friendly error-message has already been logged
            } catch (IOException e) {
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@@ -12,15 +12,12 @@ import java.lang.reflect.Method;
 public final class WindowManager {
    private final IInterface manager;
    private Method getRotationMethod;
-
+    private Method freezeRotationMethod;
    private Method freezeDisplayRotationMethod;
-    private int freezeDisplayRotationMethodVersion;
-
+    private Method isRotationFrozenMethod;
    private Method isDisplayRotationFrozenMethod;
-    private int isDisplayRotationFrozenMethodVersion;
-
+    private Method thawRotationMethod;
    private Method thawDisplayRotationMethod;
-    private int thawDisplayRotationMethodVersion;

    static WindowManager create() {
        IInterface manager = ServiceManager.getService("window", "android.view.IWindowManager");
@@ -46,61 +43,50 @@ public final class WindowManager {
        return getRotationMethod;
    }

+    private Method getFreezeRotationMethod() throws NoSuchMethodException {
+        if (freezeRotationMethod == null) {
+            freezeRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
+        }
+        return freezeRotationMethod;
+    }
+
+    // New method added by this commit:
+    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
    private Method getFreezeDisplayRotationMethod() throws NoSuchMethodException {
        if (freezeDisplayRotationMethod == null) {
-            try {
-                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
-                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
-                freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class, String.class);
-                freezeDisplayRotationMethodVersion = 0;
-            } catch (NoSuchMethodException e) {
-                try {
-                    // New method added by this commit:
-                    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
-                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
-                    freezeDisplayRotationMethodVersion = 1;
-                } catch (NoSuchMethodException e1) {
-                    freezeDisplayRotationMethod = manager.getClass().getMethod("freezeRotation", int.class);
-                    freezeDisplayRotationMethodVersion = 2;
-                }
-            }
+            freezeDisplayRotationMethod = manager.getClass().getMethod("freezeDisplayRotation", int.class, int.class);
        }
        return freezeDisplayRotationMethod;
    }

+    private Method getIsRotationFrozenMethod() throws NoSuchMethodException {
+        if (isRotationFrozenMethod == null) {
+            isRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
+        }
+        return isRotationFrozenMethod;
+    }
+
+    // New method added by this commit:
+    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
    private Method getIsDisplayRotationFrozenMethod() throws NoSuchMethodException {
        if (isDisplayRotationFrozenMethod == null) {
-            try {
-                // New method added by this commit:
-                // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
-                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isDisplayRotationFrozen", int.class);
-                isDisplayRotationFrozenMethodVersion = 0;
-            } catch (NoSuchMethodException e) {
-                isDisplayRotationFrozenMethod = manager.getClass().getMethod("isRotationFrozen");
-                isDisplayRotationFrozenMethodVersion = 1;
-            }
+            isDisplayRotationFrozenMethod = manager.getClass().getMethod("isDisplayRotationFrozen", int.class);
        }
        return isDisplayRotationFrozenMethod;
    }

+    private Method getThawRotationMethod() throws NoSuchMethodException {
+        if (thawRotationMethod == null) {
+            thawRotationMethod = manager.getClass().getMethod("thawRotation");
+        }
+        return thawRotationMethod;
+    }
+
+    // New method added by this commit:
+    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
    private Method getThawDisplayRotationMethod() throws NoSuchMethodException {
        if (thawDisplayRotationMethod == null) {
-            try {
-                // Android 15 preview and 14 QPR3 Beta added a String caller parameter for debugging:
-                // <https://android.googlesource.com/platform/frameworks/base/+/670fb7f5c0d23cf51ead25538bcb017e03ed73ac%5E%21/>
-                thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class, String.class);
-                thawDisplayRotationMethodVersion = 0;
-            } catch (NoSuchMethodException e) {
-                try {
-                    // New method added by this commit:
-                    // <https://android.googlesource.com/platform/frameworks/base/+/90c9005e687aa0f63f1ac391adc1e8878ab31759%5E%21/>
-                    thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
-                    thawDisplayRotationMethodVersion = 1;
-                } catch (NoSuchMethodException e1) {
-                    thawDisplayRotationMethod = manager.getClass().getMethod("thawRotation");
-                    thawDisplayRotationMethodVersion = 2;
-                }
-            }
+            thawDisplayRotationMethod = manager.getClass().getMethod("thawDisplayRotation", int.class);
        }
        return thawDisplayRotationMethod;
    }
@@ -117,21 +103,16 @@ public final class WindowManager {

    public void freezeRotation(int displayId, int rotation) {
        try {
-            Method method = getFreezeDisplayRotationMethod();
-            switch (freezeDisplayRotationMethodVersion) {
-                case 0:
-                    method.invoke(manager, displayId, rotation, "scrcpy#freezeRotation");
-                    break;
-                case 1:
-                    method.invoke(manager, displayId, rotation);
-                    break;
-                default:
-                    if (displayId != 0) {
-                        Ln.e("Secondary display rotation not supported on this device");
-                        return;
-                    }
+            try {
+                Method method = getFreezeDisplayRotationMethod();
+                method.invoke(manager, displayId, rotation);
+            } catch (ReflectiveOperationException e) {
+                if (displayId == 0) {
+                    Method method = getFreezeRotationMethod();
                    method.invoke(manager, rotation);
-                    break;
+                } else {
+                    Ln.e("Could not invoke method", e);
+                }
            }
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
@@ -140,16 +121,17 @@ public final class WindowManager {

    public boolean isRotationFrozen(int displayId) {
        try {
-            Method method = getIsDisplayRotationFrozenMethod();
-            switch (isDisplayRotationFrozenMethodVersion) {
-                case 0:
-                    return (boolean) method.invoke(manager, displayId);
-                default:
-                    if (displayId != 0) {
-                        Ln.e("Secondary display rotation not supported on this device");
-                        return false;
-                    }
+            try {
+                Method method = getIsDisplayRotationFrozenMethod();
+                return (boolean) method.invoke(manager, displayId);
+            } catch (ReflectiveOperationException e) {
+                if (displayId == 0) {
+                    Method method = getIsRotationFrozenMethod();
                    return (boolean) method.invoke(manager);
+                } else {
+                    Ln.e("Could not invoke method", e);
+                    return false;
+                }
            }
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
@@ -159,21 +141,16 @@ public final class WindowManager {

    public void thawRotation(int displayId) {
        try {
-            Method method = getThawDisplayRotationMethod();
-            switch (thawDisplayRotationMethodVersion) {
-                case 0:
-                    method.invoke(manager, displayId, "scrcpy#thawRotation");
-                    break;
-                case 1:
-                    method.invoke(manager, displayId);
-                    break;
-                default:
-                    if (displayId != 0) {
-                        Ln.e("Secondary display rotation not supported on this device");
-                        return;
-                    }
+            try {
+                Method method = getThawDisplayRotationMethod();
+                method.invoke(manager, displayId);
+            } catch (ReflectiveOperationException e) {
+                if (displayId == 0) {
+                    Method method = getThawRotationMethod();
                    method.invoke(manager);
-                    break;
+                } else {
+                    Ln.e("Could not invoke method", e);
+                }
            }
        } catch (ReflectiveOperationException e) {
            Ln.e("Could not invoke method", e);
@@ -189,10 +166,6 @@ public final class WindowManager {
                cls.getMethod("watchRotation", IRotationWatcher.class, int.class).invoke(manager, rotationWatcher, displayId);
            } catch (NoSuchMethodException e) {
                // old version
-                if (displayId != 0) {
-                    Ln.e("Secondary display rotation not supported on this device");
-                    return;
-                }
                cls.getMethod("watchRotation", IRotationWatcher.class).invoke(manager, rotationWatcher);
            }
        } catch (Exception e) {
Author	SHA1	Message	Date
Romain Vimont	b5849db32f	Document missing package to build for Windows To build ffmpeg, libz is necessary. Refs #4955 <https://github.com/Genymobile/scrcpy/issues/4955>	2024-05-29 10:32:58 +02:00
Romain Vimont	206809a99a	Fix typo in documentation	2024-04-02 18:01:21 +02:00