Use the physical size for the renderer

Position and scale the frames manually instead of relying on the
renderer "logical size".

This will allow to handle client rotation properly.

.gitignore

@@ -2,3 +2,4 @@ build/
 /dist/
 .idea/
 .gradle/
+/x/

README.md

@@ -353,6 +353,21 @@ scrcpy --no-control
 scrcpy -n
 ```
 
+#### Display
+
+If several displays are available, it is possible to select the display to
+mirror:
+
+```bash
+scrcpy --display 1
+```
+
+The list of display ids can be retrieved by:
+
+```
+adb shell dumpsys display   # search "mDisplayId=" in the output
+```
+
 #### Turn screen off
 
 It is possible to turn the device screen off while mirroring on start with a

app/scrcpy.1

@@ -33,6 +33,15 @@ The values are expressed in the device natural orientation (typically, portrait
 .B \-\-max\-size
 value is computed on the cropped size.
 
+.TP
+.BI "\-\-display " id
+Specify the display id to mirror.
+
+The list of possible display ids can be listed by "adb shell dumpsys display"
+(search "mDisplayId=" in the output).
+
+Default is 0.
+
 .TP
 .B \-f, \-\-fullscreen
 Start in fullscreen.

app/src/cli.c

@@ -36,6 +36,15 @@ scrcpy_print_usage(const char *arg0) {
         "        (typically, portrait for a phone, landscape for a tablet).\n"
         "        Any --max-size value is computed on the cropped size.\n"
         "\n"
+        "    --display id\n"
+        "        Specify the display id to mirror.\n"
+        "\n"
+        "        The list of possible display ids can be listed by:\n"
+        "            adb shell dumpsys display\n"
+        "        (search \"mDisplayId=\" in the output)\n"
+        "\n"
+        "        Default is 0.\n"
+        "\n"
         "    -f, --fullscreen\n"
         "        Start in fullscreen.\n"
         "\n"
@@ -363,6 +372,18 @@ parse_port_range(const char *s, struct port_range *port_range) {
     return true;
 }
 
+static bool
+parse_display_id(const char *s, uint16_t *display_id) {
+    long value;
+    bool ok = parse_integer_arg(s, &value, false, 0, 0xFFFF, "display id");
+    if (!ok) {
+        return false;
+    }
+
+    *display_id = (uint16_t) value;
+    return true;
+}
+
 static bool
 parse_record_format(const char *optarg, enum recorder_format *format) {
     if (!strcmp(optarg, "mp4")) {
@@ -407,6 +428,7 @@ guess_record_format(const char *filename) {
 #define OPT_WINDOW_BORDERLESS      1011
 #define OPT_MAX_FPS                1012
 #define OPT_LOCK_VIDEO_ORIENTATION 1013
+#define OPT_DISPLAY_ID             1014
 
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -414,6 +436,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
         {"always-on-top",          no_argument,       NULL, OPT_ALWAYS_ON_TOP},
         {"bit-rate",               required_argument, NULL, 'b'},
         {"crop",                   required_argument, NULL, OPT_CROP},
+        {"display",                required_argument, NULL, OPT_DISPLAY_ID},
         {"fullscreen",             no_argument,       NULL, 'f'},
         {"help",                   no_argument,       NULL, 'h'},
         {"lock-video-orientation", required_argument, NULL,
@@ -462,6 +485,11 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
             case OPT_CROP:
                 opts->crop = optarg;
                 break;
+            case OPT_DISPLAY_ID:
+                if (!parse_display_id(optarg, &opts->display_id)) {
+                    return false;
+                }
+                break;
             case 'f':
                 opts->fullscreen = true;
                 break;

app/src/fps_counter.c

@@ -23,7 +23,7 @@ fps_counter_init(struct fps_counter *counter) {
     }
 
     counter->thread = NULL;
-    SDL_AtomicSet(&counter->started, 0);
+    atomic_init(&counter->started, 0);
     // no need to initialize the other fields, they are unused until started
 
     return true;
@@ -35,6 +35,16 @@ fps_counter_destroy(struct fps_counter *counter) {
     SDL_DestroyMutex(counter->mutex);
 }
 
+static inline bool
+is_started(struct fps_counter *counter) {
+    return atomic_load_explicit(&counter->started, memory_order_acquire);
+}
+
+static inline void
+set_started(struct fps_counter *counter, bool started) {
+    atomic_store_explicit(&counter->started, started, memory_order_release);
+}
+
 // must be called with mutex locked
 static void
 display_fps(struct fps_counter *counter) {
@@ -70,10 +80,10 @@ run_fps_counter(void *data) {
 
     mutex_lock(counter->mutex);
     while (!counter->interrupted) {
-        while (!counter->interrupted && !SDL_AtomicGet(&counter->started)) {
+        while (!counter->interrupted && !is_started(counter)) {
             cond_wait(counter->state_cond, counter->mutex);
         }
-        while (!counter->interrupted && SDL_AtomicGet(&counter->started)) {
+        while (!counter->interrupted && is_started(counter)) {
             uint32_t now = SDL_GetTicks();
             check_interval_expired(counter, now);
 
@@ -96,7 +106,7 @@ fps_counter_start(struct fps_counter *counter) {
     counter->nr_skipped = 0;
     mutex_unlock(counter->mutex);
 
-    SDL_AtomicSet(&counter->started, 1);
+    set_started(counter, true);
     cond_signal(counter->state_cond);
 
     // counter->thread is always accessed from the same thread, no need to lock
@@ -114,13 +124,13 @@ fps_counter_start(struct fps_counter *counter) {
 
 void
 fps_counter_stop(struct fps_counter *counter) {
-    SDL_AtomicSet(&counter->started, 0);
+    set_started(counter, false);
     cond_signal(counter->state_cond);
 }
 
 bool
 fps_counter_is_started(struct fps_counter *counter) {
-    return SDL_AtomicGet(&counter->started);
+    return is_started(counter);
 }
 
 void
@@ -145,7 +155,7 @@ fps_counter_join(struct fps_counter *counter) {
 
 void
 fps_counter_add_rendered_frame(struct fps_counter *counter) {
-    if (!SDL_AtomicGet(&counter->started)) {
+    if (!is_started(counter)) {
         return;
     }
 
@@ -158,7 +168,7 @@ fps_counter_add_rendered_frame(struct fps_counter *counter) {
 
 void
 fps_counter_add_skipped_frame(struct fps_counter *counter) {
-    if (!SDL_AtomicGet(&counter->started)) {
+    if (!is_started(counter)) {
         return;
     }
 

app/src/fps_counter.h

@@ -1,9 +1,9 @@
 #ifndef FPSCOUNTER_H
 #define FPSCOUNTER_H
 
+#include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <SDL2/SDL_atomic.h>
 #include <SDL2/SDL_mutex.h>
 #include <SDL2/SDL_thread.h>
 
@@ -16,7 +16,7 @@ struct fps_counter {
 
     // atomic so that we can check without locking the mutex
     // if the FPS counter is disabled, we don't want to lock unnecessarily
-    SDL_atomic_t started;
+    atomic_bool started;
 
     // the following fields are protected by the mutex
     bool interrupted;

app/src/input_manager.c

@@ -7,33 +7,6 @@
 #include "util/lock.h"
 #include "util/log.h"
 
-// Convert window coordinates (as provided by SDL_GetMouseState() to renderer
-// coordinates (as provided in SDL mouse events)
-//
-// See my question:
-// <https://stackoverflow.com/questions/49111054/how-to-get-mouse-position-on-mouse-wheel-event>
-static void
-convert_to_renderer_coordinates(SDL_Renderer *renderer, int *x, int *y) {
-    SDL_Rect viewport;
-    float scale_x, scale_y;
-    SDL_RenderGetViewport(renderer, &viewport);
-    SDL_RenderGetScale(renderer, &scale_x, &scale_y);
-    *x = (int) (*x / scale_x) - viewport.x;
-    *y = (int) (*y / scale_y) - viewport.y;
-}
-
-static struct point
-get_mouse_point(struct screen *screen) {
-    int x;
-    int y;
-    SDL_GetMouseState(&x, &y);
-    convert_to_renderer_coordinates(screen->renderer, &x, &y);
-    return (struct point) {
-        .x = x,
-        .y = y,
-    };
-}
-
 static const int ACTION_DOWN = 1;
 static const int ACTION_UP = 1 << 1;
 
@@ -427,8 +400,8 @@ convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,
     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.position.point =
+        screen_convert_to_frame_coords(screen, from->x, from->y);
     to->inject_touch_event.pressure = 1.f;
     to->inject_touch_event.buttons = convert_mouse_buttons(from->state);
 
@@ -464,12 +437,14 @@ convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,
     }
 
     struct size frame_size = screen->frame_size;
+    // SDL touch event coordinates are normalized in the range [0; 1]
+    float x = from->x * frame_size.width;
+    float y = from->y * frame_size.height;
 
     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.position.point =
+        screen_convert_to_frame_coords(screen, x, y);
     to->inject_touch_event.pressure = from->pressure;
     to->inject_touch_event.buttons = 0;
     return true;
@@ -504,8 +479,8 @@ convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,
 
     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.position.point =
+        screen_convert_to_frame_coords(screen, from->x, from->y);
     to->inject_touch_event.pressure = 1.f;
     to->inject_touch_event.buttons =
         convert_mouse_buttons(SDL_BUTTON(from->button));
@@ -557,9 +532,15 @@ input_manager_process_mouse_button(struct input_manager *im,
 static bool
 convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,
                     struct control_msg *to) {
+
+    // mouse_x and mouse_y are expressed in pixels relatice to the window
+    int mouse_x;
+    int mouse_y;
+    SDL_GetMouseState(&mouse_x, &mouse_y);
+
     struct position position = {
         .screen_size = screen->frame_size,
-        .point = get_mouse_point(screen),
+        .point = screen_convert_to_frame_coords(screen, mouse_x, mouse_y),
     };
 
     to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;

app/src/scrcpy.c

@@ -286,6 +286,7 @@ scrcpy(const struct scrcpy_options *options) {
         .max_fps = options->max_fps,
         .lock_video_orientation = options->lock_video_orientation,
         .control = options->control,
+        .display_id = options->display_id,
     };
     if (!server_start(&server, options->serial, &params)) {
         return false;

app/src/scrcpy.h

@@ -25,6 +25,7 @@ struct scrcpy_options {
     int16_t window_y; // WINDOW_POSITION_UNDEFINED for "auto"
     uint16_t window_width;
     uint16_t window_height;
+    uint16_t display_id;
     bool show_touches;
     bool fullscreen;
     bool always_on_top;
@@ -55,6 +56,7 @@ struct scrcpy_options {
     .window_y = WINDOW_POSITION_UNDEFINED, \
     .window_width = 0, \
     .window_height = 0, \
+    .display_id = 0, \
     .show_touches = false, \
     .fullscreen = false, \
     .always_on_top = false, \

app/src/screen.c

@@ -149,6 +149,32 @@ get_initial_optimal_size(struct size frame_size, uint16_t req_width,
     return window_size;
 }
 
+static void
+update_frame_rect(struct screen *screen) {
+    int ww;
+    int wh;
+    SDL_GL_GetDrawableSize(screen->window, &ww, &wh);
+
+    // 32 bits because we need to multiply two 16 bits values
+    uint32_t fw = screen->frame_size.width;
+    uint32_t fh = screen->frame_size.height;
+
+    SDL_Rect *rect = &screen->rect;
+
+    bool keep_width = fw * wh > fh * ww;
+    if (keep_width) {
+        rect->x = 0;
+        rect->w = ww;
+        rect->h = ww * fh / fw;
+        rect->y = (wh - rect->h) / 2;
+    } else {
+        rect->y = 0;
+        rect->h = wh;
+        rect->w = wh * fw / fh;
+        rect->x = (ww - rect->w) / 2;
+    }
+}
+
 void
 screen_init(struct screen *screen) {
     *screen = (struct screen) SCREEN_INITIALIZER;
@@ -206,13 +232,6 @@ screen_init_rendering(struct screen *screen, const char *window_title,
         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);
@@ -258,12 +277,6 @@ static bool
 prepare_for_frame(struct screen *screen, struct size new_frame_size) {
     if (screen->frame_size.width != new_frame_size.width
             || screen->frame_size.height != new_frame_size.height) {
-        if (SDL_RenderSetLogicalSize(screen->renderer, new_frame_size.width,
-                                     new_frame_size.height)) {
-            LOGE("Could not set renderer logical size: %s", SDL_GetError());
-            return false;
-        }
-
         // frame dimension changed, destroy texture
         SDL_DestroyTexture(screen->texture);
 
@@ -309,6 +322,7 @@ screen_update_frame(struct screen *screen, struct video_buffer *vb) {
         mutex_unlock(vb->mutex);
         return false;
     }
+    update_frame_rect(screen);
     update_texture(screen, frame);
     mutex_unlock(vb->mutex);
 
@@ -316,10 +330,16 @@ screen_update_frame(struct screen *screen, struct video_buffer *vb) {
     return true;
 }
 
+void
+screen_window_resized(struct screen *screen) {
+    update_frame_rect(screen);
+    screen_render(screen);
+}
+
 void
 screen_render(struct screen *screen) {
     SDL_RenderClear(screen->renderer);
-    SDL_RenderCopy(screen->renderer, screen->texture, NULL, NULL);
+    SDL_RenderCopy(screen->renderer, screen->texture, NULL, &screen->rect);
     SDL_RenderPresent(screen->renderer);
 }
 
@@ -391,7 +411,7 @@ screen_handle_window_event(struct screen *screen,
                 // window is maximized or fullscreen is enabled.
                 screen->windowed_window_size = get_window_size(screen->window);
             }
-            screen_render(screen);
+            screen_window_resized(screen);
             break;
         case SDL_WINDOWEVENT_MAXIMIZED:
             // The backup size must be non-nul.
@@ -412,3 +432,11 @@ screen_handle_window_event(struct screen *screen,
             break;
     }
 }
+
+struct point
+screen_convert_to_frame_coords(struct screen *screen, float x, float y) {
+    struct point out;
+    out.x = (x - screen->rect.x) * screen->frame_size.width / screen->rect.w;
+    out.y = (y - screen->rect.y) * screen->frame_size.height / screen->rect.h;
+    return out;
+}

app/src/screen.h

@@ -22,6 +22,7 @@ struct screen {
     // Since we receive the event SIZE_CHANGED before MAXIMIZED, we must be
     // able to revert the size to its non-maximized value.
     struct size windowed_window_size_backup;
+    struct SDL_Rect rect;
     bool has_frame;
     bool fullscreen;
     bool maximized;
@@ -44,6 +45,12 @@ struct screen {
         .width = 0, \
         .height = 0, \
     }, \
+    .rect = { \
+        .x = 0, \
+        .y = 0, \
+        .w = 0, \
+        .h = 0, \
+    }, \
     .has_frame = false, \
     .fullscreen = false, \
     .maximized = false, \
@@ -74,6 +81,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);
@@ -94,4 +105,9 @@ screen_resize_to_pixel_perfect(struct screen *screen);
 void
 screen_handle_window_event(struct screen *screen, const SDL_WindowEvent *event);
 
+// convert point from window coordinates to frame coordinates
+// x and y are expressed in pixels (float to allow partial pixels)
+struct point
+screen_convert_to_frame_coords(struct screen *screen, float x, float y);
+
 #endif

app/src/server.c

@@ -5,6 +5,7 @@
 #include <inttypes.h>
 #include <libgen.h>
 #include <stdio.h>
+#include <SDL2/SDL_thread.h>
 #include <SDL2/SDL_timer.h>
 #include <SDL2/SDL_platform.h>
 
@@ -234,10 +235,12 @@ execute_server(struct server *server, const struct server_params *params) {
     char bit_rate_string[11];
     char max_fps_string[6];
     char lock_video_orientation_string[3];
+    char display_id_string[6];
     sprintf(max_size_string, "%"PRIu16, params->max_size);
     sprintf(bit_rate_string, "%"PRIu32, params->bit_rate);
     sprintf(max_fps_string, "%"PRIu16, params->max_fps);
     sprintf(lock_video_orientation_string, "%"PRIi8, params->lock_video_orientation);
+    sprintf(display_id_string, "%"PRIu16, params->display_id);
     const char *const cmd[] = {
         "shell",
         "CLASSPATH=" DEVICE_SERVER_PATH,
@@ -264,6 +267,7 @@ execute_server(struct server *server, const struct server_params *params) {
         params->crop ? params->crop : "-",
         "true", // always send frame meta (packet boundaries + timestamp)
         params->control ? "true" : "false",
+        display_id_string,
     };
 #ifdef SERVER_DEBUGGER
     LOGI("Server debugger waiting for a client on device port "
@@ -314,14 +318,12 @@ connect_to_server(uint16_t port, uint32_t attempts, uint32_t delay) {
 }
 
 static void
-close_socket(socket_t *socket) {
-    assert(*socket != INVALID_SOCKET);
-    net_shutdown(*socket, SHUT_RDWR);
-    if (!net_close(*socket)) {
+close_socket(socket_t socket) {
+    assert(socket != INVALID_SOCKET);
+    net_shutdown(socket, SHUT_RDWR);
+    if (!net_close(socket)) {
         LOGW("Could not close socket");
-        return;
     }
-    *socket = INVALID_SOCKET;
 }
 
 void
@@ -329,6 +331,22 @@ server_init(struct server *server) {
     *server = (struct server) SERVER_INITIALIZER;
 }
 
+static int
+run_wait_server(void *data) {
+    struct server *server = data;
+    cmd_simple_wait(server->process, NULL); // ignore exit code
+    // no need for synchronization, server_socket is initialized before this
+    // thread was created
+    if (server->server_socket != INVALID_SOCKET
+            && !atomic_flag_test_and_set(&server->server_socket_closed)) {
+        // On Linux, accept() is unblocked by shutdown(), but on Windows, it is
+        // unblocked by closesocket(). Therefore, call both (close_socket()).
+        close_socket(server->server_socket);
+    }
+    LOGD("Server terminated");
+    return 0;
+}
+
 bool
 server_start(struct server *server, const char *serial,
              const struct server_params *params) {
@@ -342,30 +360,50 @@ server_start(struct server *server, const char *serial,
     }
 
     if (!push_server(serial)) {
-        SDL_free(server->serial);
-        return false;
+        goto error1;
     }
 
     if (!enable_tunnel_any_port(server, params->port_range)) {
-        SDL_free(server->serial);
-        return false;
+        goto error1;
     }
 
     // server will connect to our server socket
     server->process = execute_server(server, params);
-
     if (server->process == PROCESS_NONE) {
-        if (!server->tunnel_forward) {
-            close_socket(&server->server_socket);
-        }
-        disable_tunnel(server);
-        SDL_free(server->serial);
-        return false;
+        goto error2;
+    }
+
+    // If the server process dies before connecting to the server socket, then
+    // the client will be stuck forever on accept(). To avoid the problem, we
+    // must be able to wake up the accept() call when the server dies. To keep
+    // things simple and multiplatform, just spawn a new thread waiting for the
+    // server process and calling shutdown()/close() on the server socket if
+    // necessary to wake up any accept() blocking call.
+    server->wait_server_thread =
+        SDL_CreateThread(run_wait_server, "wait-server", server);
+    if (!server->wait_server_thread) {
+        cmd_terminate(server->process);
+        cmd_simple_wait(server->process, NULL); // ignore exit code
+        goto error2;
     }
 
     server->tunnel_enabled = true;
 
     return true;
+
+error2:
+    if (!server->tunnel_forward) {
+        bool was_closed =
+            atomic_flag_test_and_set(&server->server_socket_closed);
+        // the thread is not started, the flag could not be already set
+        assert(!was_closed);
+        (void) was_closed;
+        close_socket(server->server_socket);
+    }
+    disable_tunnel(server);
+error1:
+    SDL_free(server->serial);
+    return false;
 }
 
 bool
@@ -383,7 +421,11 @@ server_connect_to(struct server *server) {
         }
 
         // we don't need the server socket anymore
-        close_socket(&server->server_socket);
+        if (!atomic_flag_test_and_set(&server->server_socket_closed)) {
+            // close it from here
+            close_socket(server->server_socket);
+            // otherwise, it is closed by run_wait_server()
+        }
     } else {
         uint32_t attempts = 100;
         uint32_t delay = 100; // ms
@@ -410,29 +452,27 @@ server_connect_to(struct server *server) {
 
 void
 server_stop(struct server *server) {
-    if (server->server_socket != INVALID_SOCKET) {
-        close_socket(&server->server_socket);
+    if (server->server_socket != INVALID_SOCKET
+            && !atomic_flag_test_and_set(&server->server_socket_closed)) {
+        close_socket(server->server_socket);
     }
     if (server->video_socket != INVALID_SOCKET) {
-        close_socket(&server->video_socket);
+        close_socket(server->video_socket);
     }
     if (server->control_socket != INVALID_SOCKET) {
-        close_socket(&server->control_socket);
+        close_socket(server->control_socket);
     }
 
     assert(server->process != PROCESS_NONE);
 
-    if (!cmd_terminate(server->process)) {
-        LOGW("Could not terminate server");
-    }
-
-    cmd_simple_wait(server->process, NULL); // ignore exit code
-    LOGD("Server terminated");
+    cmd_terminate(server->process);
 
     if (server->tunnel_enabled) {
         // ignore failure
         disable_tunnel(server);
     }
+
+    SDL_WaitThread(server->wait_server_thread, NULL);
 }
 
 void

app/src/server.h

@@ -1,8 +1,10 @@
 #ifndef SERVER_H
 #define SERVER_H
 
+#include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <SDL2/SDL_thread.h>
 
 #include "config.h"
 #include "command.h"
@@ -12,6 +14,8 @@
 struct server {
     char *serial;
     process_t process;
+    SDL_Thread *wait_server_thread;
+    atomic_flag server_socket_closed;
     socket_t server_socket; // only used if !tunnel_forward
     socket_t video_socket;
     socket_t control_socket;
@@ -24,6 +28,8 @@ struct server {
 #define SERVER_INITIALIZER { \
     .serial = NULL, \
     .process = PROCESS_NONE, \
+    .wait_server_thread = NULL, \
+    .server_socket_closed = ATOMIC_FLAG_INIT, \
     .server_socket = INVALID_SOCKET, \
     .video_socket = INVALID_SOCKET, \
     .control_socket = INVALID_SOCKET, \
@@ -44,6 +50,7 @@ struct server_params {
     uint16_t max_fps;
     int8_t lock_video_orientation;
     bool control;
+    uint16_t display_id;
 };
 
 // init default values

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.6.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

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

@@ -75,19 +75,29 @@ public class Controller {
         ControlMessage msg = connection.receiveControlMessage();
         switch (msg.getType()) {
             case ControlMessage.TYPE_INJECT_KEYCODE:
-                injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState());
+                if (device.supportsInputEvents()) {
+                    injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState());
+                }
                 break;
             case ControlMessage.TYPE_INJECT_TEXT:
-                injectText(msg.getText());
+                if (device.supportsInputEvents()) {
+                    injectText(msg.getText());
+                }
                 break;
             case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
-                injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getButtons());
+                if (device.supportsInputEvents()) {
+                    injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getButtons());
+                }
                 break;
             case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
-                injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
+                if (device.supportsInputEvents()) {
+                    injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll());
+                }
                 break;
             case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
-                pressBackOrTurnScreenOn();
+                if (device.supportsInputEvents()) {
+                    pressBackOrTurnScreenOn();
+                }
                 break;
             case ControlMessage.TYPE_EXPAND_NOTIFICATION_PANEL:
                 device.expandNotificationPanel();
@@ -103,7 +113,9 @@ public class Controller {
                 device.setClipboardText(msg.getText());
                 break;
             case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
-                device.setScreenPowerMode(msg.getAction());
+                if (device.supportsInputEvents()) {
+                    device.setScreenPowerMode(msg.getAction());
+                }
                 break;
             case ControlMessage.TYPE_ROTATE_DEVICE:
                 device.rotateDevice();

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

@@ -1,5 +1,6 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import com.genymobile.scrcpy.wrappers.WindowManager;
@@ -25,9 +26,35 @@ public final class Device {
     private ScreenInfo screenInfo;
     private RotationListener rotationListener;
 
+    /**
+     * Logical display identifier
+     */
+    private final int displayId;
+
+    /**
+     * The surface flinger layer stack associated with this logical display
+     */
+    private final int layerStack;
+
+    /**
+     * The FLAG_PRESENTATION from the DisplayInfo
+     */
+    private final boolean isPresentationDisplay;
+
     public Device(Options options) {
-        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
+        displayId = options.getDisplayId();
+        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo(displayId);
+        if (displayInfo == null) {
+            int[] displayIds = serviceManager.getDisplayManager().getDisplayIds();
+            throw new InvalidDisplayIdException(displayId, displayIds);
+        }
+
+        int displayInfoFlags = displayInfo.getFlags();
+
         screenInfo = ScreenInfo.computeScreenInfo(displayInfo, options.getCrop(), options.getMaxSize(), options.getLockedVideoOrientation());
+        layerStack = displayInfo.getLayerStack();
+        isPresentationDisplay = (displayInfoFlags & DisplayInfo.FLAG_PRESENTATION) != 0;
+
         registerRotationWatcher(new IRotationWatcher.Stub() {
             @Override
             public void onRotationChanged(int rotation) throws RemoteException {
@@ -41,12 +68,24 @@ public final class Device {
                 }
             }
         });
+
+        if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
+            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
+        }
+
+        if (!supportsInputEvents()) {
+            Ln.w("Input events are not supported for displays with FLAG_PRESENTATION enabled for devices with API lower than 29");
+        }
     }
 
     public synchronized ScreenInfo getScreenInfo() {
         return screenInfo;
     }
 
+    public int getLayerStack() {
+        return layerStack;
+    }
+
     public Point getPhysicalPoint(Position position) {
         // it hides the field on purpose, to read it with a lock
         @SuppressWarnings("checkstyle:HiddenField")
@@ -76,7 +115,22 @@ public final class Device {
         return Build.MODEL;
     }
 
+    public boolean supportsInputEvents() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return true;
+        }
+        return !isPresentationDisplay;
+    }
+
     public boolean injectInputEvent(InputEvent inputEvent, int mode) {
+        if (!supportsInputEvents()) {
+            throw new AssertionError("Could not inject input event if !supportsInputEvents()");
+        }
+
+        if (displayId != 0 && !InputManager.setDisplayId(inputEvent, displayId)) {
+            return false;
+        }
+
         return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
     }
 
@@ -109,8 +163,10 @@ public final class Device {
     }
 
     public void setClipboardText(String text) {
-        serviceManager.getClipboardManager().setText(text);
-        Ln.i("Device clipboard set");
+        boolean ok = serviceManager.getClipboardManager().setText(text);
+        if (ok) {
+            Ln.i("Device clipboard set");
+        }
     }
 
     /**
@@ -122,8 +178,10 @@ public final class Device {
             Ln.e("Could not get built-in display");
             return;
         }
-        SurfaceControl.setDisplayPowerMode(d, mode);
-        Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
+        boolean ok = SurfaceControl.setDisplayPowerMode(d, mode);
+        if (ok) {
+            Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
+        }
     }
 
     /**

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

@@ -1,12 +1,25 @@
 package com.genymobile.scrcpy;
 
 public final class DisplayInfo {
+    private final int displayId;
     private final Size size;
     private final int rotation;
+    private final int layerStack;
+    private final int flags;
 
-    public DisplayInfo(Size size, int rotation) {
+    public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 0x00000001;
+    public static final int FLAG_PRESENTATION = 0x00000008;
+
+    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags) {
+        this.displayId = displayId;
         this.size = size;
         this.rotation = rotation;
+        this.layerStack = layerStack;
+        this.flags = flags;
+    }
+
+    public int getDisplayId() {
+        return displayId;
     }
 
     public Size getSize() {
@@ -16,5 +29,13 @@ public final class DisplayInfo {
     public int getRotation() {
         return rotation;
     }
+
+    public int getLayerStack() {
+        return layerStack;
+    }
+
+    public int getFlags() {
+        return flags;
+    }
 }
 

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

@@ -0,0 +1,21 @@
+package com.genymobile.scrcpy;
+
+public class InvalidDisplayIdException extends RuntimeException {
+
+    private final int displayId;
+    private final int[] availableDisplayIds;
+
+    public InvalidDisplayIdException(int displayId, int[] availableDisplayIds) {
+        super("There is no display having id " + displayId);
+        this.displayId = displayId;
+        this.availableDisplayIds = availableDisplayIds;
+    }
+
+    public int getDisplayId() {
+        return displayId;
+    }
+
+    public int[] getAvailableDisplayIds() {
+        return availableDisplayIds;
+    }
+}

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

@@ -11,6 +11,7 @@ public class Options {
     private Rect crop;
     private boolean sendFrameMeta; // send PTS so that the client may record properly
     private boolean control;
+    private int displayId;
 
     public int getMaxSize() {
         return maxSize;
@@ -75,4 +76,12 @@ public class Options {
     public void setControl(boolean control) {
         this.control = control;
     }
+
+    public int getDisplayId() {
+        return displayId;
+    }
+
+    public void setDisplayId(int displayId) {
+        this.displayId = displayId;
+    }
 }

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

@@ -71,10 +71,12 @@ public class ScreenEncoder implements Device.RotationListener {
                 // does not include the locked video orientation
                 Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
                 int videoRotation = screenInfo.getVideoRotation();
+                int layerStack = device.getLayerStack();
+
                 setSize(format, videoRect.width(), videoRect.height());
                 configure(codec, format);
                 Surface surface = codec.createInputSurface();
-                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect);
+                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
                 codec.start();
                 try {
                     alive = encode(codec, fd);
@@ -177,12 +179,12 @@ public class ScreenEncoder implements Device.RotationListener {
         format.setInteger(MediaFormat.KEY_HEIGHT, height);
     }
 
-    private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect) {
+    private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect, int layerStack) {
         SurfaceControl.openTransaction();
         try {
             SurfaceControl.setDisplaySurface(display, surface);
             SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
-            SurfaceControl.setDisplayLayerStack(display, 0);
+            SurfaceControl.setDisplayLayerStack(display, layerStack);
         } finally {
             SurfaceControl.closeTransaction();
         }

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

@@ -80,8 +80,8 @@ public final class Server {
                     "The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
         }
 
-        if (args.length != 9) {
-            throw new IllegalArgumentException("Expecting 9 parameters");
+        if (args.length != 10) {
+            throw new IllegalArgumentException("Expecting 10 parameters");
         }
 
         Options options = new Options();
@@ -111,6 +111,9 @@ public final class Server {
         boolean control = Boolean.parseBoolean(args[8]);
         options.setControl(control);
 
+        int displayId = Integer.parseInt(args[9]);
+        options.setDisplayId(displayId);
+
         return options;
     }
 
@@ -149,6 +152,16 @@ public final class Server {
                 }
             }
         }
+        if (e instanceof InvalidDisplayIdException) {
+            InvalidDisplayIdException idie = (InvalidDisplayIdException) e;
+            int[] displayIds = idie.getAvailableDisplayIds();
+            if (displayIds != null && displayIds.length > 0) {
+                Ln.e("Try to use one of the available display ids:");
+                for (int id : displayIds) {
+                    Ln.e("    scrcpy --display " + id);
+                }
+            }
+        }
     }
 
     public static void main(String... args) throws Exception {

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

@@ -74,13 +74,15 @@ public class ClipboardManager {
         }
     }
 
-    public void setText(CharSequence text) {
+    public boolean setText(CharSequence text) {
         try {
             Method method = getSetPrimaryClipMethod();
             ClipData clipData = ClipData.newPlainText(null, text);
             setPrimaryClip(method, manager, clipData);
+            return true;
         } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
             Ln.e("Could not invoke method", e);
+            return false;
         }
     }
 }

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

@@ -12,15 +12,28 @@ public final class DisplayManager {
         this.manager = manager;
     }
 
-    public DisplayInfo getDisplayInfo() {
+    public DisplayInfo getDisplayInfo(int displayId) {
         try {
-            Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, 0);
+            Object displayInfo = manager.getClass().getMethod("getDisplayInfo", int.class).invoke(manager, displayId);
+            if (displayInfo == null) {
+                return null;
+            }
             Class<?> cls = displayInfo.getClass();
             // width and height already take the rotation into account
             int width = cls.getDeclaredField("logicalWidth").getInt(displayInfo);
             int height = cls.getDeclaredField("logicalHeight").getInt(displayInfo);
             int rotation = cls.getDeclaredField("rotation").getInt(displayInfo);
-            return new DisplayInfo(new Size(width, height), rotation);
+            int layerStack = cls.getDeclaredField("layerStack").getInt(displayInfo);
+            int flags = cls.getDeclaredField("flags").getInt(displayInfo);
+            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
+        } catch (Exception e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    public int[] getDisplayIds() {
+        try {
+            return (int[]) manager.getClass().getMethod("getDisplayIds").invoke(manager);
         } catch (Exception e) {
             throw new AssertionError(e);
         }

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

@@ -17,6 +17,8 @@ public final class InputManager {
     private final IInterface manager;
     private Method injectInputEventMethod;
 
+    private static Method setDisplayIdMethod;
+
     public InputManager(IInterface manager) {
         this.manager = manager;
     }
@@ -37,4 +39,23 @@ public final class InputManager {
             return false;
         }
     }
+
+    private static Method getSetDisplayIdMethod() throws NoSuchMethodException {
+        if (setDisplayIdMethod == null) {
+            setDisplayIdMethod = InputEvent.class.getMethod("setDisplayId", int.class);
+        }
+        return setDisplayIdMethod;
+    }
+
+    public static boolean setDisplayId(InputEvent inputEvent, int displayId) {
+        try {
+            Method method = getSetDisplayIdMethod();
+            method.invoke(inputEvent, displayId);
+            return true;
+        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+            // just a warning, it might happen on old devices
+            Ln.w("Cannot associate a display id to the input event");
+            return false;
+        }
+    }
 }

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

@@ -121,12 +121,14 @@ public final class SurfaceControl {
         return setDisplayPowerModeMethod;
     }
 
-    public static void setDisplayPowerMode(IBinder displayToken, int mode) {
+    public static boolean setDisplayPowerMode(IBinder displayToken, int mode) {
         try {
             Method method = getSetDisplayPowerModeMethod();
             method.invoke(null, displayToken, mode);
+            return true;
         } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
             Ln.e("Could not invoke method", e);
+            return false;
         }
     }