Add compilation flag for HIDPI workaround

The HIDPI workaround is enabled by default. Expose a flag to be able to
disable it.

README.md

@@ -143,6 +143,7 @@ This is useful for example to mirror only one eye of the Oculus Go:
 
 ```bash
 scrcpy --crop 1224:1440:0:0   # 1224x1440 at offset (0,0)
+scrcpy -c 1224:1440:0:0       # short version
 ```
 
 If `--max-size` is also specified, resizing is applied after cropping.
@@ -225,6 +226,7 @@ The window of app can always be above others by:
 
 ```bash
 scrcpy --always-on-top
+scrcpy -T  # short version
 ```
 
 

app/meson.build

@@ -109,15 +109,15 @@ conf.set('DEFAULT_MAX_SIZE', '0')  # 0: unlimited
 # overridden by option --bit-rate
 conf.set('DEFAULT_BIT_RATE', '8000000')  # 8Mbps
 
-# enable High DPI support
-conf.set('HIDPI_SUPPORT', get_option('hidpi_support'))
-
 # disable console on Windows
 conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole'))
 
 # run a server debugger and wait for a client to be attached
 conf.set('SERVER_DEBUGGER', get_option('server_debugger'))
 
+# enable a workaround for bug #15
+conf.set('HIDPI_WORKAROUND', get_option('hidpi_workaround'))
+
 configure_file(configuration: conf, output: 'config.h')
 
 src_dir = include_directories('src')

app/scrcpy.1

@@ -61,13 +61,6 @@ Set the TCP port the client listens on.
 
 Default is 27183.
 
-.TP
-.B \-\-prefer\-text
-Inject alpha characters and space as text events instead of key events.
-
-This avoids issues when combining multiple keys to enter special characters,
-but breaks the expected behavior of alpha keys in games (typically WASD).
-
 .TP
 .BI "\-\-push\-target " path
 Set the target directory for pushing files to the device by drag & drop. It is passed as\-is to "adb push".

app/src/event_converter.c

@@ -5,7 +5,7 @@
 #define MAP(FROM, TO) case FROM: *to = TO; return true
 #define FAIL default: return false
 
-bool
+static bool
 convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to) {
     switch (from) {
         MAP(SDL_KEYDOWN, AKEY_EVENT_ACTION_DOWN);
@@ -33,7 +33,7 @@ autocomplete_metastate(enum android_metastate metastate) {
     return metastate;
 }
 
-enum android_metastate
+static enum android_metastate
 convert_meta_state(SDL_Keymod mod) {
     enum android_metastate metastate = 0;
     if (mod & KMOD_LSHIFT) {
@@ -74,9 +74,8 @@ convert_meta_state(SDL_Keymod mod) {
     return autocomplete_metastate(metastate);
 }
 
-bool
+static bool
-convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
+convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod) {
-                bool prefer_text) {
     switch (from) {
         MAP(SDLK_RETURN,       AKEYCODE_ENTER);
         MAP(SDLK_KP_ENTER,     AKEYCODE_NUMPAD_ENTER);
@@ -93,12 +92,6 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
         MAP(SDLK_DOWN,         AKEYCODE_DPAD_DOWN);
         MAP(SDLK_UP,           AKEYCODE_DPAD_UP);
     }
-
-    if (prefer_text) {
-        // do not forward alpha and space key events
-        return false;
-    }
-
     if (mod & (KMOD_LALT | KMOD_RALT | KMOD_LGUI | KMOD_RGUI)) {
         return false;
     }
@@ -135,7 +128,7 @@ convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
     }
 }
 
-enum android_motionevent_buttons
+static enum android_motionevent_buttons
 convert_mouse_buttons(uint32_t state) {
     enum android_motionevent_buttons buttons = 0;
     if (state & SDL_BUTTON_LMASK) {
@@ -157,6 +150,24 @@ convert_mouse_buttons(uint32_t state) {
 }
 
 bool
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
+
+    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
+        return false;
+    }
+
+    uint16_t mod = from->keysym.mod;
+    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod)) {
+        return false;
+    }
+
+    to->inject_keycode.metastate = convert_meta_state(mod);
+
+    return true;
+}
+
+static bool
 convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
     switch (from) {
         MAP(SDL_MOUSEBUTTONDOWN, AMOTION_EVENT_ACTION_DOWN);
@@ -166,6 +177,41 @@ convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to) {
 }
 
 bool
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons =
+        convert_mouse_buttons(SDL_BUTTON(from->button));
+
+    return true;
+}
+
+bool
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
+                     struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
+    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
+    to->inject_touch_event.position.screen_size = screen_size;
+    to->inject_touch_event.position.point.x = from->x;
+    to->inject_touch_event.position.point.y = from->y;
+    to->inject_touch_event.pressure = 1.f;
+    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
+
+    return true;
+}
+
+static bool
 convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
     switch (from) {
         MAP(SDL_FINGERMOTION, AMOTION_EVENT_ACTION_MOVE);
@@ -174,3 +220,39 @@ convert_touch_action(SDL_EventType from, enum android_motionevent_action *to) {
         FAIL;
     }
 }
+
+bool
+convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
+              struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
+
+    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
+        return false;
+    }
+
+    to->inject_touch_event.pointer_id = from->fingerId;
+    to->inject_touch_event.position.screen_size = screen_size;
+    // SDL touch event coordinates are normalized in the range [0; 1]
+    to->inject_touch_event.position.point.x = from->x * screen_size.width;
+    to->inject_touch_event.position.point.y = from->y * screen_size.height;
+    to->inject_touch_event.pressure = from->pressure;
+    to->inject_touch_event.buttons = 0;
+    return true;
+}
+
+bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
+                    struct control_msg *to) {
+    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
+
+    to->inject_scroll_event.position = position;
+
+    int mul = from->direction == SDL_MOUSEWHEEL_NORMAL ? 1 : -1;
+    // SDL behavior seems inconsistent between horizontal and vertical scrolling
+    // so reverse the horizontal
+    // <https://wiki.libsdl.org/SDL_MouseWheelEvent#Remarks>
+    to->inject_scroll_event.hscroll = -mul * from->x;
+    to->inject_scroll_event.vscroll = mul * from->y;
+
+    return true;
+}

app/src/event_converter.h

@@ -7,23 +7,36 @@
 #include "config.h"
 #include "control_msg.h"
 
-bool
+struct complete_mouse_motion_event {
-convert_keycode_action(SDL_EventType from, enum android_keyevent_action *to);
+    SDL_MouseMotionEvent *mouse_motion_event;
+    struct size screen_size;
+};
 
-enum android_metastate
+struct complete_mouse_wheel_event {
-convert_meta_state(SDL_Keymod mod);
+    SDL_MouseWheelEvent *mouse_wheel_event;
+    struct point position;
+};
 
 bool
-convert_keycode(SDL_Keycode from, enum android_keycode *to, uint16_t mod,
+convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to);
-                bool prefer_text);
-
-enum android_motionevent_buttons
-convert_mouse_buttons(uint32_t state);
 
 bool
-convert_mouse_action(SDL_EventType from, enum android_motionevent_action *to);
+convert_mouse_button(const SDL_MouseButtonEvent *from, struct size screen_size,
+                     struct control_msg *to);
+
+// the video size may be different from the real device size, so we need the
+// size to which the absolute position apply, to scale it accordingly
+bool
+convert_mouse_motion(const SDL_MouseMotionEvent *from, struct size screen_size,
+                     struct control_msg *to);
 
 bool
-convert_touch_action(SDL_EventType from, enum android_motionevent_action *to);
+convert_touch(const SDL_TouchFingerEvent *from, struct size screen_size,
+              struct control_msg *to);
+
+// on Android, a scroll event requires the current mouse position
+bool
+convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct position position,
+                    struct control_msg *to);
 
 #endif

app/src/input_manager.c

@@ -212,17 +212,14 @@ clipboard_paste(struct controller *controller) {
 }
 
 void
-input_manager_process_text_input(struct input_manager *im,
+input_manager_process_text_input(struct input_manager *input_manager,
                                  const SDL_TextInputEvent *event) {
-    if (!im->prefer_text) {
+    char c = event->text[0];
-        char c = event->text[0];
+    if (isalpha(c) || c == ' ') {
-        if (isalpha(c) || c == ' ') {
+        SDL_assert(event->text[1] == '\0');
-            SDL_assert(event->text[1] == '\0');
+        // letters and space are handled as raw key event
-            // letters and space are handled as raw key event
+        return;
-            return;
-        }
     }
-
     struct control_msg msg;
     msg.type = CONTROL_MSG_TYPE_INJECT_TEXT;
     msg.inject_text.text = SDL_strdup(event->text);
@@ -230,34 +227,14 @@ input_manager_process_text_input(struct input_manager *im,
         LOGW("Could not strdup input text");
         return;
     }
-    if (!controller_push_msg(im->controller, &msg)) {
+    if (!controller_push_msg(input_manager->controller, &msg)) {
         SDL_free(msg.inject_text.text);
         LOGW("Could not request 'inject text'");
     }
 }
 
-static bool
-convert_input_key(const SDL_KeyboardEvent *from, struct control_msg *to,
-                  bool prefer_text) {
-    to->type = CONTROL_MSG_TYPE_INJECT_KEYCODE;
-
-    if (!convert_keycode_action(from->type, &to->inject_keycode.action)) {
-        return false;
-    }
-
-    uint16_t mod = from->keysym.mod;
-    if (!convert_keycode(from->keysym.sym, &to->inject_keycode.keycode, mod,
-                         prefer_text)) {
-        return false;
-    }
-
-    to->inject_keycode.metastate = convert_meta_state(mod);
-
-    return true;
-}
-
 void
-input_manager_process_key(struct input_manager *im,
+input_manager_process_key(struct input_manager *input_manager,
                           const SDL_KeyboardEvent *event,
                           bool control) {
     // control: indicates the state of the command-line option --no-control
@@ -284,7 +261,7 @@ input_manager_process_key(struct input_manager *im,
         return;
     }
 
-    struct controller *controller = im->controller;
+    struct controller *controller = input_manager->controller;
 
     // capture all Ctrl events
     if (ctrl || cmd) {
@@ -359,23 +336,23 @@ input_manager_process_key(struct input_manager *im,
                 return;
             case SDLK_f:
                 if (!shift && cmd && !repeat && down) {
-                    screen_switch_fullscreen(im->screen);
+                    screen_switch_fullscreen(input_manager->screen);
                 }
                 return;
             case SDLK_x:
                 if (!shift && cmd && !repeat && down) {
-                    screen_resize_to_fit(im->screen);
+                    screen_resize_to_fit(input_manager->screen);
                 }
                 return;
             case SDLK_g:
                 if (!shift && cmd && !repeat && down) {
-                    screen_resize_to_pixel_perfect(im->screen);
+                    screen_resize_to_pixel_perfect(input_manager->screen);
                 }
                 return;
             case SDLK_i:
                 if (!shift && cmd && !repeat && down) {
                     struct fps_counter *fps_counter =
-                        im->video_buffer->fps_counter;
+                        input_manager->video_buffer->fps_counter;
                     switch_fps_counter_state(fps_counter);
                 }
                 return;
@@ -398,30 +375,15 @@ input_manager_process_key(struct input_manager *im,
     }
 
     struct control_msg msg;
-    if (convert_input_key(event, &msg, im->prefer_text)) {
+    if (convert_input_key(event, &msg)) {
         if (!controller_push_msg(controller, &msg)) {
             LOGW("Could not request 'inject keycode'");
         }
     }
 }
 
-static bool
-convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
-                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-    to->inject_touch_event.action = AMOTION_EVENT_ACTION_MOVE;
-    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
-    to->inject_touch_event.position.screen_size = screen->frame_size;
-    to->inject_touch_event.position.point.x = from->x;
-    to->inject_touch_event.position.point.y = from->y;
-    to->inject_touch_event.pressure = 1.f;
-    to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
-
-    return true;
-}
-
 void
-input_manager_process_mouse_motion(struct input_manager *im,
+input_manager_process_mouse_motion(struct input_manager *input_manager,
                                    const SDL_MouseMotionEvent *event) {
     if (!event->state) {
         // do not send motion events when no button is pressed
@@ -432,74 +394,33 @@ input_manager_process_mouse_motion(struct input_manager *im,
         return;
     }
     struct control_msg msg;
-    if (convert_mouse_motion(event, im->screen, &msg)) {
+    if (convert_mouse_motion(event, input_manager->screen->frame_size, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse motion event'");
         }
     }
 }
 
-static bool
-convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
-              struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-
-    if (!convert_touch_action(from->type, &to->inject_touch_event.action)) {
-        return false;
-    }
-
-    struct size frame_size = screen->frame_size;
-
-    to->inject_touch_event.pointer_id = from->fingerId;
-    to->inject_touch_event.position.screen_size = frame_size;
-    // SDL touch event coordinates are normalized in the range [0; 1]
-    to->inject_touch_event.position.point.x = from->x * frame_size.width;
-    to->inject_touch_event.position.point.y = from->y * frame_size.height;
-    to->inject_touch_event.pressure = from->pressure;
-    to->inject_touch_event.buttons = 0;
-    return true;
-}
-
 void
-input_manager_process_touch(struct input_manager *im,
+input_manager_process_touch(struct input_manager *input_manager,
                             const SDL_TouchFingerEvent *event) {
     struct control_msg msg;
-    if (convert_touch(event, im->screen, &msg)) {
+    if (convert_touch(event, input_manager->screen->frame_size, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject touch event'");
         }
     }
 }
 
 static bool
-is_outside_device_screen(struct input_manager *im, int x, int y)
+is_outside_device_screen(struct input_manager *input_manager, int x, int y)
 {
-    return x < 0 || x >= im->screen->frame_size.width ||
+    return x < 0 || x >= input_manager->screen->frame_size.width ||
-           y < 0 || y >= im->screen->frame_size.height;
+           y < 0 || y >= input_manager->screen->frame_size.height;
-}
-
-static bool
-convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
-                     struct control_msg *to) {
-    to->type = CONTROL_MSG_TYPE_INJECT_TOUCH_EVENT;
-
-    if (!convert_mouse_action(from->type, &to->inject_touch_event.action)) {
-        return false;
-    }
-
-    to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;
-    to->inject_touch_event.position.screen_size = screen->frame_size;
-    to->inject_touch_event.position.point.x = from->x;
-    to->inject_touch_event.position.point.y = from->y;
-    to->inject_touch_event.pressure = 1.f;
-    to->inject_touch_event.buttons =
-        convert_mouse_buttons(SDL_BUTTON(from->button));
-
-    return true;
 }
 
 void
-input_manager_process_mouse_button(struct input_manager *im,
+input_manager_process_mouse_button(struct input_manager *input_manager,
                                    const SDL_MouseButtonEvent *event,
                                    bool control) {
     if (event->which == SDL_TOUCH_MOUSEID) {
@@ -508,19 +429,19 @@ input_manager_process_mouse_button(struct input_manager *im,
     }
     if (event->type == SDL_MOUSEBUTTONDOWN) {
         if (control && event->button == SDL_BUTTON_RIGHT) {
-            press_back_or_turn_screen_on(im->controller);
+            press_back_or_turn_screen_on(input_manager->controller);
             return;
         }
         if (control && event->button == SDL_BUTTON_MIDDLE) {
-            action_home(im->controller, ACTION_DOWN | ACTION_UP);
+            action_home(input_manager->controller, ACTION_DOWN | ACTION_UP);
             return;
         }
         // double-click on black borders resize to fit the device screen
         if (event->button == SDL_BUTTON_LEFT && event->clicks == 2) {
             bool outside =
-                is_outside_device_screen(im, event->x, event->y);
+                is_outside_device_screen(input_manager, event->x, event->y);
             if (outside) {
-                screen_resize_to_fit(im->screen);
+                screen_resize_to_fit(input_manager->screen);
                 return;
             }
         }
@@ -532,41 +453,23 @@ input_manager_process_mouse_button(struct input_manager *im,
     }
 
     struct control_msg msg;
-    if (convert_mouse_button(event, im->screen, &msg)) {
+    if (convert_mouse_button(event, input_manager->screen->frame_size, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse button event'");
         }
     }
 }
 
-static bool
-convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
-                    struct control_msg *to) {
-    struct position position = {
-        .screen_size = screen->frame_size,
-        .point = get_mouse_point(screen),
-    };
-
-    to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;
-
-    to->inject_scroll_event.position = position;
-
-    int mul = from->direction == SDL_MOUSEWHEEL_NORMAL ? 1 : -1;
-    // SDL behavior seems inconsistent between horizontal and vertical scrolling
-    // so reverse the horizontal
-    // <https://wiki.libsdl.org/SDL_MouseWheelEvent#Remarks>
-    to->inject_scroll_event.hscroll = -mul * from->x;
-    to->inject_scroll_event.vscroll = mul * from->y;
-
-    return true;
-}
-
 void
-input_manager_process_mouse_wheel(struct input_manager *im,
+input_manager_process_mouse_wheel(struct input_manager *input_manager,
                                   const SDL_MouseWheelEvent *event) {
+    struct position position = {
+        .screen_size = input_manager->screen->frame_size,
+        .point = get_mouse_point(input_manager->screen),
+    };
     struct control_msg msg;
-    if (convert_mouse_wheel(event, im->screen, &msg)) {
+    if (convert_mouse_wheel(event, position, &msg)) {
-        if (!controller_push_msg(im->controller, &msg)) {
+        if (!controller_push_msg(input_manager->controller, &msg)) {
             LOGW("Could not request 'inject mouse wheel event'");
         }
     }

app/src/input_manager.h

@@ -14,33 +14,32 @@ struct input_manager {
     struct controller *controller;
     struct video_buffer *video_buffer;
     struct screen *screen;
-    bool prefer_text;
 };
 
 void
-input_manager_process_text_input(struct input_manager *im,
+input_manager_process_text_input(struct input_manager *input_manager,
                                  const SDL_TextInputEvent *event);
 
 void
-input_manager_process_key(struct input_manager *im,
+input_manager_process_key(struct input_manager *input_manager,
                           const SDL_KeyboardEvent *event,
                           bool control);
 
 void
-input_manager_process_mouse_motion(struct input_manager *im,
+input_manager_process_mouse_motion(struct input_manager *input_manager,
                                    const SDL_MouseMotionEvent *event);
 
 void
-input_manager_process_touch(struct input_manager *im,
+input_manager_process_touch(struct input_manager *input_manager,
                             const SDL_TouchFingerEvent *event);
 
 void
-input_manager_process_mouse_button(struct input_manager *im,
+input_manager_process_mouse_button(struct input_manager *input_manager,
                                    const SDL_MouseButtonEvent *event,
                                    bool control);
 
 void
-input_manager_process_mouse_wheel(struct input_manager *im,
+input_manager_process_mouse_wheel(struct input_manager *input_manager,
                                   const SDL_MouseWheelEvent *event);
 
 #endif

app/src/main.c

@@ -14,9 +14,24 @@
 #include "recorder.h"
 
 struct args {
-    struct scrcpy_options opts;
+    const char *serial;
+    const char *crop;
+    const char *record_filename;
+    const char *window_title;
+    const char *push_target;
+    enum recorder_format record_format;
+    bool fullscreen;
+    bool no_control;
+    bool no_display;
     bool help;
     bool version;
+    bool show_touches;
+    uint16_t port;
+    uint16_t max_size;
+    uint32_t bit_rate;
+    bool always_on_top;
+    bool turn_screen_off;
+    bool render_expired_frames;
 };
 
 static void usage(const char *arg0) {
@@ -67,13 +82,6 @@ static void usage(const char *arg0) {
         "        Set the TCP port the client listens on.\n"
         "        Default is %d.\n"
         "\n"
-        "    --prefer-text\n"
-        "        Inject alpha characters and space as text events instead of\n"
-        "        key events.\n"
-        "        This avoids issues when combining multiple keys to enter a\n"
-        "        special character, but breaks the expected behavior of alpha\n"
-        "        keys in games (typically WASD).\n"
-        "\n"
         "    --push-target path\n"
         "        Set the target directory for pushing files to the device by\n"
         "        drag & drop. It is passed as-is to \"adb push\".\n"
@@ -304,63 +312,50 @@ guess_record_format(const char *filename) {
 #define OPT_RENDER_EXPIRED_FRAMES 1000
 #define OPT_WINDOW_TITLE          1001
 #define OPT_PUSH_TARGET           1002
-#define OPT_ALWAYS_ON_TOP         1003
-#define OPT_CROP                  1004
-#define OPT_RECORD_FORMAT         1005
-#define OPT_PREFER_TEXT           1006
 
 static bool
 parse_args(struct args *args, int argc, char *argv[]) {
     static const struct option long_options[] = {
-        {"always-on-top",         no_argument,       NULL, OPT_ALWAYS_ON_TOP},
+        {"always-on-top",         no_argument,       NULL, 'T'},
         {"bit-rate",              required_argument, NULL, 'b'},
-        {"crop",                  required_argument, NULL, OPT_CROP},
+        {"crop",                  required_argument, NULL, 'c'},
         {"fullscreen",            no_argument,       NULL, 'f'},
         {"help",                  no_argument,       NULL, 'h'},
         {"max-size",              required_argument, NULL, 'm'},
         {"no-control",            no_argument,       NULL, 'n'},
         {"no-display",            no_argument,       NULL, 'N'},
         {"port",                  required_argument, NULL, 'p'},
-        {"push-target",           required_argument, NULL, OPT_PUSH_TARGET},
+        {"push-target",           required_argument, NULL,
+                                                 OPT_PUSH_TARGET},
         {"record",                required_argument, NULL, 'r'},
-        {"record-format",         required_argument, NULL, OPT_RECORD_FORMAT},
+        {"record-format",         required_argument, NULL, 'F'},
         {"render-expired-frames", no_argument,       NULL,
-                                                     OPT_RENDER_EXPIRED_FRAMES},
+                                                 OPT_RENDER_EXPIRED_FRAMES},
         {"serial",                required_argument, NULL, 's'},
         {"show-touches",          no_argument,       NULL, 't'},
         {"turn-screen-off",       no_argument,       NULL, 'S'},
-        {"prefer-text",           no_argument,       NULL, OPT_PREFER_TEXT},
         {"version",               no_argument,       NULL, 'v'},
         {"window-title",          required_argument, NULL,
-                                                     OPT_WINDOW_TITLE},
+                                                 OPT_WINDOW_TITLE},
         {NULL,                    0,                 NULL, 0  },
     };
-
-    struct scrcpy_options *opts = &args->opts;
-
     int c;
     while ((c = getopt_long(argc, argv, "b:c:fF:hm:nNp:r:s:StTv", long_options,
                             NULL)) != -1) {
         switch (c) {
             case 'b':
-                if (!parse_bit_rate(optarg, &opts->bit_rate)) {
+                if (!parse_bit_rate(optarg, &args->bit_rate)) {
                     return false;
                 }
                 break;
             case 'c':
-                LOGW("Deprecated option -c. Use --crop instead.");
+                args->crop = optarg;
-                // fall through
-            case OPT_CROP:
-                opts->crop = optarg;
                 break;
             case 'f':
-                opts->fullscreen = true;
+                args->fullscreen = true;
                 break;
             case 'F':
-                LOGW("Deprecated option -F. Use --record-format instead.");
+                if (!parse_record_format(optarg, &args->record_format)) {
-                // fall through
-            case OPT_RECORD_FORMAT:
-                if (!parse_record_format(optarg, &opts->record_format)) {
                     return false;
                 }
                 break;
@@ -368,53 +363,47 @@ parse_args(struct args *args, int argc, char *argv[]) {
                 args->help = true;
                 break;
             case 'm':
-                if (!parse_max_size(optarg, &opts->max_size)) {
+                if (!parse_max_size(optarg, &args->max_size)) {
                     return false;
                 }
                 break;
             case 'n':
-                opts->control = false;
+                args->no_control = true;
                 break;
             case 'N':
-                opts->display = false;
+                args->no_display = true;
                 break;
             case 'p':
-                if (!parse_port(optarg, &opts->port)) {
+                if (!parse_port(optarg, &args->port)) {
                     return false;
                 }
                 break;
             case 'r':
-                opts->record_filename = optarg;
+                args->record_filename = optarg;
                 break;
             case 's':
-                opts->serial = optarg;
+                args->serial = optarg;
                 break;
             case 'S':
-                opts->turn_screen_off = true;
+                args->turn_screen_off = true;
                 break;
             case 't':
-                opts->show_touches = true;
+                args->show_touches = true;
                 break;
             case 'T':
-                LOGW("Deprecated option -T. Use --always-on-top instead.");
+                args->always_on_top = true;
-                // fall through
-            case OPT_ALWAYS_ON_TOP:
-                opts->always_on_top = true;
                 break;
             case 'v':
                 args->version = true;
                 break;
             case OPT_RENDER_EXPIRED_FRAMES:
-                opts->render_expired_frames = true;
+                args->render_expired_frames = true;
                 break;
             case OPT_WINDOW_TITLE:
-                opts->window_title = optarg;
+                args->window_title = optarg;
                 break;
             case OPT_PUSH_TARGET:
-                opts->push_target = optarg;
+                args->push_target = optarg;
-                break;
-            case OPT_PREFER_TEXT:
-                opts->prefer_text = true;
                 break;
             default:
                 // getopt prints the error message on stderr
@@ -422,12 +411,12 @@ parse_args(struct args *args, int argc, char *argv[]) {
         }
     }
 
-    if (!opts->display && !opts->record_filename) {
+    if (args->no_display && !args->record_filename) {
         LOGE("-N/--no-display requires screen recording (-r/--record)");
         return false;
     }
 
-    if (!opts->display && opts->fullscreen) {
+    if (args->no_display && args->fullscreen) {
         LOGE("-f/--fullscreen-window is incompatible with -N/--no-display");
         return false;
     }
@@ -438,21 +427,21 @@ parse_args(struct args *args, int argc, char *argv[]) {
         return false;
     }
 
-    if (opts->record_format && !opts->record_filename) {
+    if (args->record_format && !args->record_filename) {
         LOGE("Record format specified without recording");
         return false;
     }
 
-    if (opts->record_filename && !opts->record_format) {
+    if (args->record_filename && !args->record_format) {
-        opts->record_format = guess_record_format(opts->record_filename);
+        args->record_format = guess_record_format(args->record_filename);
-        if (!opts->record_format) {
+        if (!args->record_format) {
             LOGE("No format specified for \"%s\" (try with -F mkv)",
-                 opts->record_filename);
+                 args->record_filename);
             return false;
         }
     }
 
-    if (!opts->control && opts->turn_screen_off) {
+    if (args->no_control && args->turn_screen_off) {
         LOGE("Could not request to turn screen off if control is disabled");
         return false;
     }
@@ -469,11 +458,24 @@ main(int argc, char *argv[]) {
     setbuf(stderr, NULL);
 #endif
     struct args args = {
-        .opts = SCRCPY_OPTIONS_DEFAULT,
+        .serial = NULL,
+        .crop = NULL,
+        .record_filename = NULL,
+        .window_title = NULL,
+        .push_target = NULL,
+        .record_format = 0,
         .help = false,
         .version = false,
+        .show_touches = false,
+        .port = DEFAULT_LOCAL_PORT,
+        .max_size = DEFAULT_MAX_SIZE,
+        .bit_rate = DEFAULT_BIT_RATE,
+        .always_on_top = false,
+        .no_control = false,
+        .no_display = false,
+        .turn_screen_off = false,
+        .render_expired_frames = false,
     };
-
     if (!parse_args(&args, argc, argv)) {
         return 1;
     }
@@ -502,7 +504,25 @@ main(int argc, char *argv[]) {
     SDL_LogSetAllPriority(SDL_LOG_PRIORITY_DEBUG);
 #endif
 
-    int res = scrcpy(&args.opts) ? 0 : 1;
+    struct scrcpy_options options = {
+        .serial = args.serial,
+        .crop = args.crop,
+        .port = args.port,
+        .record_filename = args.record_filename,
+        .window_title = args.window_title,
+        .push_target = args.push_target,
+        .record_format = args.record_format,
+        .max_size = args.max_size,
+        .bit_rate = args.bit_rate,
+        .show_touches = args.show_touches,
+        .fullscreen = args.fullscreen,
+        .always_on_top = args.always_on_top,
+        .control = !args.no_control,
+        .display = !args.no_display,
+        .turn_screen_off = args.turn_screen_off,
+        .render_expired_frames = args.render_expired_frames,
+    };
+    int res = scrcpy(&options) ? 0 : 1;
 
     avformat_network_deinit(); // ignore failure
 

app/src/recorder.c

@@ -174,14 +174,9 @@ recorder_open(struct recorder *recorder, const AVCodec *input_codec) {
 
 void
 recorder_close(struct recorder *recorder) {
-    if (recorder->header_written) {
+    int ret = av_write_trailer(recorder->ctx);
-        int ret = av_write_trailer(recorder->ctx);
+    if (ret < 0) {
-        if (ret < 0) {
+        LOGE("Failed to write trailer to %s", recorder->filename);
-            LOGE("Failed to write trailer to %s", recorder->filename);
-            recorder->failed = true;
-        }
-    } else {
-        // the recorded file is empty
         recorder->failed = true;
     }
     avio_close(recorder->ctx->pb);

app/src/recorder.h

@@ -11,8 +11,7 @@
 #include "queue.h"
 
 enum recorder_format {
-    RECORDER_FORMAT_AUTO,
+    RECORDER_FORMAT_MP4 = 1,
-    RECORDER_FORMAT_MP4,
     RECORDER_FORMAT_MKV,
 };
 

app/src/scrcpy.c

@@ -42,7 +42,6 @@ static struct input_manager input_manager = {
     .controller = &controller,
     .video_buffer = &video_buffer,
     .screen = &screen,
-    .prefer_text = false, // initialized later
 };
 
 // init SDL and set appropriate hints
@@ -146,9 +145,11 @@ handle_event(SDL_Event *event, bool control) {
         case SDL_WINDOWEVENT:
             switch (event->window.event) {
                 case SDL_WINDOWEVENT_EXPOSED:
-                case SDL_WINDOWEVENT_SIZE_CHANGED:
                     screen_render(&screen);
                     break;
+                case SDL_WINDOWEVENT_SIZE_CHANGED:
+                    screen_window_resized(&screen);
+                    break;
             }
             break;
         case SDL_TEXTINPUT:
@@ -415,8 +416,6 @@ scrcpy(const struct scrcpy_options *options) {
         show_touches_waited = true;
     }
 
-    input_manager.prefer_text = options->prefer_text;
-
     ret = event_loop(options->display, options->control);
     LOGD("quit...");
 

app/src/scrcpy.h

@@ -3,10 +3,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <recorder.h>
 
 #include "config.h"
-#include "input_manager.h"
-#include "recorder.h"
 
 struct scrcpy_options {
     const char *serial;
@@ -25,29 +24,8 @@ struct scrcpy_options {
     bool display;
     bool turn_screen_off;
     bool render_expired_frames;
-    bool prefer_text;
 };
 
-#define SCRCPY_OPTIONS_DEFAULT { \
-    .serial = NULL, \
-    .crop = NULL, \
-    .record_filename = NULL, \
-    .window_title = NULL, \
-    .push_target = NULL, \
-    .record_format = RECORDER_FORMAT_AUTO, \
-    .port = DEFAULT_LOCAL_PORT, \
-    .max_size = DEFAULT_LOCAL_PORT, \
-    .bit_rate = DEFAULT_BIT_RATE, \
-    .show_touches = false, \
-    .fullscreen = false, \
-    .always_on_top = false, \
-    .control = true, \
-    .display = true, \
-    .turn_screen_off = false, \
-    .render_expired_frames = false, \
-    .prefer_text = false, \
-}
-
 bool
 scrcpy(const struct scrcpy_options *options);
 

app/src/screen.c

@@ -134,16 +134,57 @@ create_texture(SDL_Renderer *renderer, struct size frame_size) {
                              frame_size.width, frame_size.height);
 }
 
+#ifdef HIDPI_WORKAROUND
+static void
+screen_get_sizes(struct screen *screen, struct screen_sizes *out) {
+    int ww, wh, dw, dh;
+    SDL_GetWindowSize(screen->window, &ww, &wh);
+    SDL_GL_GetDrawableSize(screen->window, &dw, &dh);
+    out->window.width = ww;
+    out->window.height = wh;
+    out->window.width = dw;
+    out->window.height = dh;
+}
+#endif
+
+// This may be called more than once to work around SDL bugs
+static bool
+screen_init_renderer_and_texture(struct screen *screen) {
+    screen->renderer = SDL_CreateRenderer(screen->window, -1,
+                                          SDL_RENDERER_ACCELERATED);
+    if (!screen->renderer) {
+        LOGC("Could not create renderer: %s", SDL_GetError());
+        return false;
+    }
+
+    if (SDL_RenderSetLogicalSize(screen->renderer, screen->frame_size.width,
+                                 screen->frame_size.height)) {
+        LOGE("Could not set renderer logical size: %s", SDL_GetError());
+        return false;
+    }
+
+    screen->texture = create_texture(screen->renderer, screen->frame_size);
+    if (!screen->texture) {
+        LOGC("Could not create texture: %s", SDL_GetError());
+        return false;
+    }
+
+#ifdef HIDPI_WORKAROUND
+    screen_get_sizes(screen, &screen->sizes);
+#endif
+
+    return true;
+}
+
 bool
 screen_init_rendering(struct screen *screen, const char *window_title,
                       struct size frame_size, bool always_on_top) {
     screen->frame_size = frame_size;
 
     struct size window_size = get_initial_optimal_size(frame_size);
-    uint32_t window_flags = SDL_WINDOW_HIDDEN | SDL_WINDOW_RESIZABLE;
+    uint32_t window_flags = SDL_WINDOW_HIDDEN
-#ifdef HIDPI_SUPPORT
+                          | SDL_WINDOW_RESIZABLE
-    window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+                          | SDL_WINDOW_ALLOW_HIGHDPI;
-#endif
     if (always_on_top) {
 #ifdef SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP
         window_flags |= SDL_WINDOW_ALWAYS_ON_TOP;
@@ -162,21 +203,6 @@ screen_init_rendering(struct screen *screen, const char *window_title,
         return false;
     }
 
-    screen->renderer = SDL_CreateRenderer(screen->window, -1,
-                                          SDL_RENDERER_ACCELERATED);
-    if (!screen->renderer) {
-        LOGC("Could not create renderer: %s", SDL_GetError());
-        screen_destroy(screen);
-        return false;
-    }
-
-    if (SDL_RenderSetLogicalSize(screen->renderer, frame_size.width,
-                                 frame_size.height)) {
-        LOGE("Could not set renderer logical size: %s", SDL_GetError());
-        screen_destroy(screen);
-        return false;
-    }
-
     SDL_Surface *icon = read_xpm(icon_xpm);
     if (icon) {
         SDL_SetWindowIcon(screen->window, icon);
@@ -187,9 +213,7 @@ screen_init_rendering(struct screen *screen, const char *window_title,
 
     LOGI("Initial texture: %" PRIu16 "x%" PRIu16, frame_size.width,
                                                   frame_size.height);
-    screen->texture = create_texture(screen->renderer, frame_size);
+    if (!screen_init_renderer_and_texture(screen)) {
-    if (!screen->texture) {
-        LOGC("Could not create texture: %s", SDL_GetError());
         screen_destroy(screen);
         return false;
     }
@@ -278,6 +302,43 @@ screen_update_frame(struct screen *screen, struct video_buffer *vb) {
     return true;
 }
 
+#ifdef HIDPI_WORKAROUND
+// workaround for <https://github.com/Genymobile/scrcpy/issues/15>
+static inline bool
+screen_fix_hidpi(struct screen *screen) {
+    struct screen_sizes cur;
+    screen_get_sizes(screen, &cur);
+
+    struct screen_sizes *prev = &screen->sizes;
+
+    bool width_ratio_changed = cur.window.width * prev->drawable.width !=
+                               cur.drawable.width * prev->window.width;
+    bool height_ratio_changed = cur.window.height * prev->drawable.height !=
+                                cur.drawable.height * prev->window.height;
+    if (width_ratio_changed || height_ratio_changed) {
+        SDL_DestroyTexture(screen->texture);
+        SDL_DestroyRenderer(screen->renderer);
+        if (!screen_init_renderer_and_texture(screen)) {
+            screen->texture = NULL;
+            screen->renderer = NULL;
+            return false;
+        }
+
+        LOGI("Renderer reset after hidpi scaling changed");
+    }
+
+    return true;
+}
+#endif
+
+void
+screen_window_resized(struct screen *screen) {
+#ifdef HIDPI_WORKAROUND
+    screen_fix_hidpi(screen);
+#endif
+    screen_render(screen);
+}
+
 void
 screen_render(struct screen *screen) {
     SDL_RenderClear(screen->renderer);

app/src/screen.h

@@ -20,6 +20,12 @@ struct screen {
     bool has_frame;
     bool fullscreen;
     bool no_window;
+#ifdef HIDPI_WORKAROUND
+    struct screen_sizes {
+        struct size window;
+        struct size drawable;
+    } sizes;
+#endif
 };
 
 #define SCREEN_INITIALIZER {  \
@@ -60,6 +66,10 @@ screen_destroy(struct screen *screen);
 bool
 screen_update_frame(struct screen *screen, struct video_buffer *vb);
 
+// update content after window resizing
+void
+screen_window_resized(struct screen *screen);
+
 // render the texture to the renderer
 void
 screen_render(struct screen *screen);

meson_options.txt

@@ -4,5 +4,5 @@ option('crossbuild_windows', type: 'boolean', value: false, description: 'Build
 option('windows_noconsole', type: 'boolean', value: false, description: 'Disable console on Windows (pass -mwindows flag)')
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
-option('hidpi_support', type: 'boolean', value: true, description: 'Enable High DPI support')
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
+option('hidpi_workaround', type: 'boolean', value: true, description: 'Enable a workaround for bug #15')

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

@@ -7,7 +7,6 @@ import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.os.IBinder;
-import android.os.Looper;
 import android.view.Surface;
 
 import java.io.FileDescriptor;
@@ -55,11 +54,6 @@ public class ScreenEncoder implements Device.RotationListener {
     }
 
     public void streamScreen(Device device, FileDescriptor fd) throws IOException {
-        // Some devices internally create a Handler when creating an input Surface, causing an exception:
-        // "Can't create handler inside thread that has not called Looper.prepare()"
-        // <https://github.com/Genymobile/scrcpy/issues/240>
-        Looper.prepareMainLooper();
-
         MediaFormat format = createFormat(bitRate, frameRate, iFrameInterval);
         device.setRotationListener(this);
         boolean alive;