Add GitHub Actions release workflow

Fixes #4490 <https://github.com/Genymobile/scrcpy/issues/4490> PR #5306 <https://github.com/Genymobile/scrcpy/pull/5306>
Rework release.mk for CI
2026-03-17 09:34:36 +01:00 · 2024-10-27 20:31:24 +01:00 · 2024-10-27 20:29:13 +01:00 · 2024-10-27 20:26:38 +01:00 · 2024-10-27 20:26:26 +01:00 · 2024-10-27 20:26:13 +01:00
36 changed files with 513 additions and 1263 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,147 @@
+name: Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Version name (default is ref name)'
+
+jobs:
+  build-scrcpy-server:
+    runs-on: ubuntu-latest
+    env:
+      GRADLE: gradle  # use native gradle instead of ./gradlew in release.mk
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Test scrcpy-server
+        run: make -f release.mk test-server
+
+      - name: Build scrcpy-server
+        run: make -f release.mk build-server
+
+      - name: Upload scrcpy-server artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: scrcpy-server
+          path: build-server/server/scrcpy-server
+
+  test-client:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev
+
+      - name: Build
+        run: |
+          meson setup d -Db_sanitize=address,undefined
+
+      - name: Test
+        run: |
+          meson test -Cd
+
+  build-win32:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
+             mingw-w64 mingw-w64-tools libz-mingw-w64-dev
+
+      - name: Workaround for old meson version run by Github Actions
+        run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt
+
+      - name: Build scrcpy win32
+        run: make -f release.mk build-win32
+
+      - name: Upload build-win32 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-win32-intermediate
+          path: build-win32/dist/
+
+  build-win64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
+             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
+             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
+             mingw-w64 mingw-w64-tools libz-mingw-w64-dev
+
+      - name: Workaround for old meson version run by Github Actions
+        run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt
+
+      - name: Build scrcpy win64
+        run: make -f release.mk build-win64
+
+      - name: Upload build-win64 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-win64-intermediate
+          path: build-win64/dist/
+
+  package:
+    needs:
+      - build-scrcpy-server
+      - build-win32
+      - build-win64
+    runs-on: ubuntu-latest
+    env:
+      # $VERSION is used by release.mk
+      VERSION: ${{ github.event.inputs.name || github.ref_name }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download scrcpy-server
+        uses: actions/download-artifact@v4
+        with:
+          name: scrcpy-server
+          path: build-server/server/
+
+      - name: Download build-win32
+        uses: actions/download-artifact@v4
+        with:
+          name: build-win32-intermediate
+          path: build-win32/dist/
+
+      - name: Download build-win64
+        uses: actions/download-artifact@v4
+        with:
+          name: build-win64-intermediate
+          path: build-win64/dist/
+
+      - name: Package
+        run: make -f release.mk package
+
+      - name: Upload release artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: scrcpy-release-${{ env.VERSION }}
+          path: release-${{ env.VERSION }}
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -33,7 +33,6 @@ _scrcpy() {
        --keyboard=
        --kill-adb-on-close
        --legacy-paste
-        --list-apps
        --list-camera-sizes
        --list-cameras
        --list-displays
@@ -47,8 +46,6 @@ _scrcpy() {
        --mouse-bind=
        -n --no-control
        -N --no-playback
-        --new-display
-        --new-display=
        --no-audio
        --no-audio-playback
        --no-cleanup
@@ -79,7 +76,6 @@ _scrcpy() {
        -s --serial=
        -S --turn-screen-off
        --shortcut-mod=
-        --start-app=
        -t --show-touches
        --tcpip
        --tcpip=
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -40,7 +40,6 @@ arguments=(
    '--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-apps[List Android apps installed on the device]'
    '--list-camera-sizes[List the valid camera capture sizes]'
    '--list-cameras[List cameras available on the device]'
    '--list-displays[List displays available on the device]'
@@ -53,7 +52,6 @@ arguments=(
    '--mouse-bind=[Configure bindings of secondary clicks]'
    {-n,--no-control}'[Disable device control \(mirror the device in read only\)]'
    {-N,--no-playback}'[Disable video and audio playback]'
-    '--new-display=[Create a new display]'
    '--no-audio[Disable audio forwarding]'
    '--no-audio-playback[Disable audio playback]'
    '--no-cleanup[Disable device cleanup actions on exit]'
@@ -82,7 +80,6 @@ arguments=(
    {-s,--serial=}'[The device serial number \(mandatory for multiple devices only\)]:serial:($("${ADB-adb}" devices | awk '\''$2 == "device" {print $1}'\''))'
    {-S,--turn-screen-off}'[Turn the device screen off immediately]'
    '--shortcut-mod=[\[key1,key2+key3,...\] Specify the modifiers to use for scrcpy shortcuts]:shortcut mod:(lctrl rctrl lalt ralt lsuper rsuper)'
-    '--start-app=[Start an Android app]'
    {-t,--show-touches}'[Show physical touches]'
    '--tcpip[\(optional \[ip\:port\]\) Configure and connect the device over TCP/IP]'
    '--time-limit=[Set the maximum mirroring time, in seconds]'
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -227,10 +227,6 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S

 This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.

-.TP
-.B \-\-list\-apps
-List Android apps installed on the device.
-
 .TP
 .B \-\-list\-camera\-sizes
 List the valid camera capture sizes.
@@ -318,17 +314,6 @@ Disable device control (mirror the device in read\-only).
 .B \-N, \-\-no\-playback
 Disable video and audio playback on the computer (equivalent to \fB\-\-no\-video\-playback \-\-no\-audio\-playback\fR).

-.TP
-\fB\-\-new\-display\fR[=[\fIwidth\fRx\fIheight\fR][/\fIdpi\fR]]
-Create a new display with the specified resolution and density. If not provided, they default to the main display dimensions and DPI, and \fB\-\-max\-size\fR is considered.
-
-Examples:
-
-    \-\-new\-display=1920x1080
-    \-\-new\-display=1920x1080/420
-    \-\-new\-display       # default screen size and density
-    \-\-new\-display=240   # default screen size and 240 dpi
-
 .TP
 .B \-\-no\-audio
 Disable audio forwarding.
@@ -493,22 +478,6 @@ For example, to use either LCtrl or LSuper for scrcpy shortcuts, pass "lctrl,lsu

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

-.TP
-.BI "\-\-start\-app " name
-Start an Android app, by its exact package name.
-
-Add a '?' prefix to select an app whose name starts with the given name, case-insensitive (it may take some time to retrieve the app names on the device):
-
-    scrcpy --start-app=?firefox
-
-Add a '+' prefix to force-stop before starting the app:
-
-    scrcpy --new-display --start-app=+org.mozilla.firefox
-
-Both prefixes can be used, in that order:
-
-    scrcpy --start-app=+?firefox
-
 .TP
 .B \-t, \-\-show\-touches
 Enable "show touches" on start, restore the initial value on exit.
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -102,9 +102,6 @@ enum {
    OPT_NO_MOUSE_HOVER,
    OPT_AUDIO_DUP,
    OPT_GAMEPAD,
-    OPT_NEW_DISPLAY,
-    OPT_LIST_APPS,
-    OPT_START_APP,
 };

 struct sc_option {
@@ -445,11 +442,6 @@ static const struct sc_option options[] = {
                "This is a workaround for some devices not behaving as "
                "expected when setting the device clipboard programmatically.",
    },
-    {
-        .longopt_id = OPT_LIST_APPS,
-        .longopt = "list-apps",
-        .text = "List Android apps installed on the device.",
-    },
    {
        .longopt_id = OPT_LIST_CAMERAS,
        .longopt = "list-cameras",
@@ -565,20 +557,6 @@ static const struct sc_option options[] = {
        .text = "Disable video and audio playback on the computer (equivalent "
                "to --no-video-playback --no-audio-playback).",
    },
-    {
-        .longopt_id = OPT_NEW_DISPLAY,
-        .longopt = "new-display",
-        .argdesc = "[<width>x<height>][/<dpi>]",
-        .optional_arg = true,
-        .text = "Create a new display with the specified resolution and "
-                "density. If not provided, they default to the main display "
-                "dimensions and DPI, and --max-size is considered.\n"
-                "Examples:\n"
-                "    --new-display=1920x1080\n"
-                "    --new-display=1920x1080/420  # force 420 dpi\n"
-                "    --new-display       # default screen size and density\n"
-                "    --new-display=240   # default screen size and 240 dpi",
-    },
    {
        .longopt_id = OPT_NO_AUDIO,
        .longopt = "no-audio",
@@ -806,20 +784,6 @@ static const struct sc_option options[] = {
                "shortcuts, pass \"lctrl,lsuper\".\n"
                "Default is \"lalt,lsuper\" (left-Alt or left-Super).",
    },
-    {
-        .longopt_id = OPT_START_APP,
-        .longopt = "start-app",
-        .argdesc = "name",
-        .text = "Start an Android app, by its exact package name.\n"
-                "Add a '?' prefix to select an app whose name starts with the "
-                "given name, case-insensitive (it may take some time to "
-                "retrieve the app names on the device):\n"
-                "    scrcpy --start-app=?firefox\n"
-                "Add a '+' prefix to force-stop before starting the app:\n"
-                "    scrcpy --new-display --start-app=+org.mozilla.firefox\n"
-                "Both prefixes can be used, in that order:\n"
-                "    scrcpy --start-app=+?firefox",
-    },
    {
        .shortopt = 't',
        .longopt = "show-touches",
@@ -2631,9 +2595,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            case OPT_LIST_CAMERA_SIZES:
                opts->list |= SC_OPTION_LIST_CAMERA_SIZES;
                break;
-            case OPT_LIST_APPS:
-                opts->list |= SC_OPTION_LIST_APPS;
-                break;
            case OPT_REQUIRE_AUDIO:
                opts->require_audio = true;
                break;
@@ -2707,12 +2668,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                    return false;
                }
                break;
-            case OPT_NEW_DISPLAY:
-                opts->new_display = optarg ? optarg : "auto";
-                break;
-            case OPT_START_APP:
-                opts->start_app = optarg;
-                break;
            default:
                // getopt prints the error message on stderr
                return false;
@@ -2963,11 +2918,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            return false;
        }

-        if (opts->new_display) {
-            LOGE("--new-display is only available with --video-source=display");
-            return false;
-        }
-
        if (opts->camera_id && opts->camera_facing != SC_CAMERA_FACING_ANY) {
            LOGE("Cannot specify both --camera-id and --camera-facing");
            return false;
@@ -3004,11 +2954,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
        return false;
    }

-    if (opts->display_id != 0 && opts->new_display) {
-        LOGE("Cannot specify both --display-id and --new-display");
-        return false;
-    }
-
    if (opts->audio && opts->audio_source == SC_AUDIO_SOURCE_AUTO) {
        // Select the audio source according to the video source
        if (opts->video_source == SC_VIDEO_SOURCE_DISPLAY) {
@@ -3141,10 +3086,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
            LOGE("Cannot request power off on close if control is disabled");
            return false;
        }
-        if (opts->start_app) {
-            LOGE("Cannot start an Android app if control is disabled");
-            return false;
-        }
    }

 # ifdef _WIN32
--- a/app/src/control_msg.c
+++ b/app/src/control_msg.c
@@ -183,10 +183,6 @@ sc_control_msg_serialize(const struct sc_control_msg *msg, uint8_t *buf) {
        case SC_CONTROL_MSG_TYPE_UHID_DESTROY:
            sc_write16be(&buf[1], msg->uhid_destroy.id);
            return 3;
-        case SC_CONTROL_MSG_TYPE_START_APP: {
-            size_t len = write_string_tiny(&buf[1], msg->start_app.name, 255);
-            return 1 + len;
-        }
        case SC_CONTROL_MSG_TYPE_EXPAND_NOTIFICATION_PANEL:
        case SC_CONTROL_MSG_TYPE_EXPAND_SETTINGS_PANEL:
        case SC_CONTROL_MSG_TYPE_COLLAPSE_PANELS:
@@ -312,9 +308,6 @@ sc_control_msg_log(const struct sc_control_msg *msg) {
        case SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
            LOG_CMSG("open hard keyboard settings");
            break;
-        case SC_CONTROL_MSG_TYPE_START_APP:
-            LOG_CMSG("start app \"%s\"", msg->start_app.name);
-            break;
        default:
            LOG_CMSG("unknown type: %u", (unsigned) msg->type);
            break;
@@ -340,9 +333,6 @@ sc_control_msg_destroy(struct sc_control_msg *msg) {
        case SC_CONTROL_MSG_TYPE_SET_CLIPBOARD:
            free(msg->set_clipboard.text);
            break;
-        case SC_CONTROL_MSG_TYPE_START_APP:
-            free(msg->start_app.name);
-            break;
        default:
            // do nothing
            break;
--- a/app/src/control_msg.h
+++ b/app/src/control_msg.h
@@ -41,7 +41,6 @@ enum sc_control_msg_type {
    SC_CONTROL_MSG_TYPE_UHID_INPUT,
    SC_CONTROL_MSG_TYPE_UHID_DESTROY,
    SC_CONTROL_MSG_TYPE_OPEN_HARD_KEYBOARD_SETTINGS,
-    SC_CONTROL_MSG_TYPE_START_APP,
 };

 enum sc_screen_power_mode {
@@ -111,9 +110,6 @@ struct sc_control_msg {
        struct {
            uint16_t id;
        } uhid_destroy;
-        struct {
-            char *name;
-        } start_app;
    };
 };

--- a/app/src/options.c
+++ b/app/src/options.c
@@ -103,8 +103,6 @@ const struct scrcpy_options scrcpy_options_default = {
    .window = true,
    .mouse_hover = true,
    .audio_dup = false,
-    .new_display = NULL,
-    .start_app = NULL,
 };

 enum sc_orientation
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -304,13 +304,10 @@ struct scrcpy_options {
 #define SC_OPTION_LIST_DISPLAYS 0x2
 #define SC_OPTION_LIST_CAMERAS 0x4
 #define SC_OPTION_LIST_CAMERA_SIZES 0x8
-#define SC_OPTION_LIST_APPS 0x10
    uint8_t list;
    bool window;
    bool mouse_hover;
    bool audio_dup;
-    const char *new_display; // [<width>x<height>][/<dpi>] parsed by the server
-    const char *start_app;
 };

 extern const struct scrcpy_options scrcpy_options_default;
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -431,7 +431,6 @@ scrcpy(struct scrcpy_options *options) {
        .lock_video_orientation = options->lock_video_orientation,
        .control = options->control,
        .display_id = options->display_id,
-        .new_display = options->new_display,
        .video = options->video,
        .audio = options->audio,
        .audio_dup = options->audio_dup,
@@ -907,25 +906,6 @@ aoa_complete:
        init_sdl_gamepads();
    }

-    if (options->control && options->start_app) {
-        assert(controller);
-
-        char *name = strdup(options->start_app);
-        if (!name) {
-            LOG_OOM();
-            goto end;
-        }
-
-        struct sc_control_msg msg;
-        msg.type = SC_CONTROL_MSG_TYPE_START_APP;
-        msg.start_app.name = name;
-
-        if (!sc_controller_push_msg(controller, &msg)) {
-            LOGW("Could not request start app '%s'", name);
-            free(name);
-        }
-    }
-
    ret = event_loop(s);
    terminate_event_loop();
    LOGD("quit...");
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -355,10 +355,6 @@ execute_server(struct sc_server *server,
        // By default, power_on is true
        ADD_PARAM("power_on=false");
    }
-    if (params->new_display) {
-        VALIDATE_STRING(params->new_display);
-        ADD_PARAM("new_display=%s", params->new_display);
-    }
    if (params->list & SC_OPTION_LIST_ENCODERS) {
        ADD_PARAM("list_encoders=true");
    }
@@ -371,9 +367,6 @@ execute_server(struct sc_server *server,
    if (params->list & SC_OPTION_LIST_CAMERA_SIZES) {
        ADD_PARAM("list_camera_sizes=true");
    }
-    if (params->list & SC_OPTION_LIST_APPS) {
-        ADD_PARAM("list_apps=true");
-    }

 #undef ADD_PARAM

--- a/app/src/server.h
+++ b/app/src/server.h
@@ -48,7 +48,6 @@ struct sc_server_params {
    int8_t lock_video_orientation;
    bool control;
    uint32_t display_id;
-    const char *new_display;
    bool video;
    bool audio;
    bool audio_dup;
--- a/release.mk
+++ b/release.mk
@@ -9,13 +9,12 @@
 # the server to the device.

 .PHONY: default clean \
-	test \
+	test test-client test-server \
 	build-server \
-	prepare-deps \
+	prepare-deps-win32 prepare-deps-win64 \
 	build-win32 build-win64 \
-	dist-win32 dist-win64 \
 	zip-win32 zip-win64 \
-	release
+	package release

 GRADLE ?= ./gradlew

@@ -26,7 +25,7 @@ WIN64_BUILD_DIR := build-win64

 VERSION ?= $(shell git describe --tags --exclude='*install-release' --always)

-DIST := dist
+ZIP := zip
 WIN32_TARGET_DIR := scrcpy-win32-$(VERSION)
 WIN64_TARGET_DIR := scrcpy-win64-$(VERSION)
 WIN32_TARGET := $(WIN32_TARGET_DIR).zip
@@ -34,33 +33,28 @@ WIN64_TARGET := $(WIN64_TARGET_DIR).zip

 RELEASE_DIR := release-$(VERSION)

-release: clean test build-server zip-win32 zip-win64
-	mkdir -p "$(RELEASE_DIR)"
-	cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \
-		"$(RELEASE_DIR)/scrcpy-server-$(VERSION)"
-	cp "$(DIST)/$(WIN32_TARGET)" "$(RELEASE_DIR)"
-	cp "$(DIST)/$(WIN64_TARGET)" "$(RELEASE_DIR)"
-	cd "$(RELEASE_DIR)" && \
-		sha256sum "scrcpy-server-$(VERSION)" \
-			"scrcpy-win32-$(VERSION).zip" \
-			"scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt
-	@echo "Release generated in $(RELEASE_DIR)/"
+release: clean test build-server build-win32 build-win64 package

 clean:
 	$(GRADLE) clean
-	rm -rf "$(DIST)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \
+	rm -rf "$(ZIP)" "$(TEST_BUILD_DIR)" "$(SERVER_BUILD_DIR)" \
 		"$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)"

-test:
+test-client:
 	[ -d "$(TEST_BUILD_DIR)" ] || ( mkdir "$(TEST_BUILD_DIR)" && \
 		meson setup "$(TEST_BUILD_DIR)" -Db_sanitize=address )
 	ninja -C "$(TEST_BUILD_DIR)"
+
+test-server:
 	$(GRADLE) -p server check

+test: test-client test-server
+
 build-server:
-	[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \
-		meson setup "$(SERVER_BUILD_DIR)" --buildtype release -Dcompile_app=false )
-	ninja -C "$(SERVER_BUILD_DIR)"
+	$(GRADLE) -p server assembleRelease
+	mkdir -p "$(SERVER_BUILD_DIR)/server"
+	cp server/build/outputs/apk/release/server-release-unsigned.apk \
+		"$(SERVER_BUILD_DIR)/server/scrcpy-server"

 prepare-deps-win32:
 	@app/deps/adb.sh win32
@@ -86,6 +80,15 @@ build-win32: prepare-deps-win32
 		-Dcompile_server=false \
 		-Dportable=true
 	ninja -C "$(WIN32_BUILD_DIR)"
+	# Group intermediate outputs into a 'dist' directory
+	mkdir -p "$(WIN32_BUILD_DIR)/dist"
+	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-console.bat "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-noconsole.vbs "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/icon.png "$(WIN32_BUILD_DIR)/dist/"
+	cp app/data/open_a_terminal_here.bat "$(WIN32_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win32/bin/*.dll "$(WIN32_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win32/bin/adb.exe "$(WIN32_BUILD_DIR)/dist/"

 build-win64: prepare-deps-win64
 	rm -rf "$(WIN64_BUILD_DIR)"
@@ -99,33 +102,40 @@ build-win64: prepare-deps-win64
 		-Dcompile_server=false \
 		-Dportable=true
 	ninja -C "$(WIN64_BUILD_DIR)"
+	# Group intermediate outputs into a 'dist' directory
+	mkdir -p "$(WIN64_BUILD_DIR)/dist"
+	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-console.bat "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/scrcpy-noconsole.vbs "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/icon.png "$(WIN64_BUILD_DIR)/dist/"
+	cp app/data/open_a_terminal_here.bat "$(WIN64_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win64/bin/*.dll "$(WIN64_BUILD_DIR)/dist/"
+	cp app/deps/work/install/win64/bin/adb.exe "$(WIN64_BUILD_DIR)/dist/"

-dist-win32: build-server build-win32
-	mkdir -p "$(DIST)/$(WIN32_TARGET_DIR)"
-	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/deps/work/install/win32/bin/*.dll "$(DIST)/$(WIN32_TARGET_DIR)/"
-	cp app/deps/work/install/win32/bin/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"
-
-dist-win64: build-server build-win64
-	mkdir -p "$(DIST)/$(WIN64_TARGET_DIR)"
-	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/data/scrcpy-console.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/deps/work/install/win64/bin/*.dll "$(DIST)/$(WIN64_TARGET_DIR)/"
-	cp app/deps/work/install/win64/bin/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"
-
-zip-win32: dist-win32
-	cd "$(DIST)"; \
+zip-win32:
+	mkdir -p "$(ZIP)/$(WIN32_TARGET_DIR)"
+	cp -r "$(WIN32_BUILD_DIR)/dist/." "$(ZIP)/$(WIN32_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(ZIP)/$(WIN32_TARGET_DIR)/"
+	cd "$(ZIP)"; \
 		zip -r "$(WIN32_TARGET)" "$(WIN32_TARGET_DIR)"
+	rm -rf "$(ZIP)/$(WIN32_TARGET_DIR)"

-zip-win64: dist-win64
-	cd "$(DIST)"; \
+zip-win64:
+	mkdir -p "$(ZIP)/$(WIN64_TARGET_DIR)"
+	cp -r "$(WIN64_BUILD_DIR)/dist/." "$(ZIP)/$(WIN64_TARGET_DIR)/"
+	cp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(ZIP)/$(WIN64_TARGET_DIR)/"
+	cd "$(ZIP)"; \
 		zip -r "$(WIN64_TARGET)" "$(WIN64_TARGET_DIR)"
+	rm -rf "$(ZIP)/$(WIN64_TARGET_DIR)"
+
+package: zip-win32 zip-win64
+	mkdir -p "$(RELEASE_DIR)"
+	cp "$(SERVER_BUILD_DIR)/server/scrcpy-server" \
+		"$(RELEASE_DIR)/scrcpy-server-$(VERSION)"
+	cp "$(ZIP)/$(WIN32_TARGET)" "$(RELEASE_DIR)"
+	cp "$(ZIP)/$(WIN64_TARGET)" "$(RELEASE_DIR)"
+	cd "$(RELEASE_DIR)" && \
+		sha256sum "scrcpy-server-$(VERSION)" \
+			"scrcpy-win32-$(VERSION).zip" \
+			"scrcpy-win64-$(VERSION).zip" > SHA256SUMS.txt
+	@echo "Release generated in $(RELEASE_DIR)/"
--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java
@@ -139,10 +139,8 @@ public final class CleanUp {

        if (Device.isScreenOn()) {
            if (powerOffScreen) {
-                if (displayId != Device.DISPLAY_ID_NONE) {
-                    Ln.i("Power off screen");
-                    Device.powerOffScreen(displayId);
-                }
+                Ln.i("Power off screen");
+                Device.powerOffScreen(displayId);
            } else if (restoreNormalPowerMode) {
                Ln.i("Restoring normal power mode");
                Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);
--- a/server/src/main/java/com/genymobile/scrcpy/Options.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java
@@ -2,7 +2,6 @@ package com.genymobile.scrcpy;

 import com.genymobile.scrcpy.audio.AudioCodec;
 import com.genymobile.scrcpy.audio.AudioSource;
-import com.genymobile.scrcpy.device.NewDisplay;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.CodecOption;
 import com.genymobile.scrcpy.util.Ln;
@@ -55,13 +54,10 @@ public class Options {
    private boolean cleanup = true;
    private boolean powerOn = true;

-    private NewDisplay newDisplay;
-
    private boolean listEncoders;
    private boolean listDisplays;
    private boolean listCameras;
    private boolean listCameraSizes;
-    private boolean listApps;

    // Options not used by the scrcpy client, but useful to use scrcpy-server directly
    private boolean sendDeviceMeta = true; // send device name and size
@@ -209,12 +205,8 @@ public class Options {
        return powerOn;
    }

-    public NewDisplay getNewDisplay() {
-        return newDisplay;
-    }
-
    public boolean getList() {
-        return listEncoders || listDisplays || listCameras || listCameraSizes || listApps;
+        return listEncoders || listDisplays || listCameras || listCameraSizes;
    }

    public boolean getListEncoders() {
@@ -233,10 +225,6 @@ public class Options {
        return listCameraSizes;
    }

-    public boolean getListApps() {
-        return listApps;
-    }
-
    public boolean getSendDeviceMeta() {
        return sendDeviceMeta;
    }
@@ -400,9 +388,6 @@ public class Options {
                case "list_camera_sizes":
                    options.listCameraSizes = Boolean.parseBoolean(value);
                    break;
-                case "list_apps":
-                    options.listApps = Boolean.parseBoolean(value);
-                    break;
                case "camera_id":
                    if (!value.isEmpty()) {
                        options.cameraId = value;
@@ -433,9 +418,6 @@ public class Options {
                case "camera_high_speed":
                    options.cameraHighSpeed = Boolean.parseBoolean(value);
                    break;
-                case "new_display":
-                    options.newDisplay = parseNewDisplay(value);
-                    break;
                case "send_device_meta":
                    options.sendDeviceMeta = Boolean.parseBoolean(value);
                    break;
@@ -522,32 +504,4 @@ public class Options {
            throw new IllegalArgumentException("Invalid float value for " + key + ": \"" + value + "\"");
        }
    }
-
-    private static NewDisplay parseNewDisplay(String newDisplay) {
-        // input format: "auto", or "<width>x<height>", or "<width>x<height>:<dpi>"
-        if ("auto".equals(newDisplay)) {
-            return new NewDisplay();
-        }
-
-        String[] tokens = newDisplay.split("/");
-
-        Size size;
-        if (!tokens[0].isEmpty()) {
-            size = parseSize(tokens[0]);
-        } else {
-            size = null;
-        }
-
-        int dpi;
-        if (tokens.length >= 2) {
-            dpi = Integer.parseInt(tokens[1]);
-            if (dpi <= 0) {
-                throw new IllegalArgumentException("Invalid non-positive dpi: " + tokens[1]);
-            }
-        } else {
-            dpi = 0;
-        }
-
-        return new NewDisplay(size, dpi);
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -9,17 +9,16 @@ import com.genymobile.scrcpy.audio.AudioRawRecorder;
 import com.genymobile.scrcpy.audio.AudioSource;
 import com.genymobile.scrcpy.control.ControlChannel;
 import com.genymobile.scrcpy.control.Controller;
+import com.genymobile.scrcpy.control.DeviceMessage;
 import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.DesktopConnection;
 import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.NewDisplay;
 import com.genymobile.scrcpy.device.Streamer;
 import com.genymobile.scrcpy.util.Ln;
 import com.genymobile.scrcpy.util.LogUtils;
 import com.genymobile.scrcpy.util.Settings;
 import com.genymobile.scrcpy.util.SettingsException;
 import com.genymobile.scrcpy.video.CameraCapture;
-import com.genymobile.scrcpy.video.NewDisplayCapture;
 import com.genymobile.scrcpy.video.ScreenCapture;
 import com.genymobile.scrcpy.video.SurfaceCapture;
 import com.genymobile.scrcpy.video.SurfaceEncoder;
@@ -130,11 +129,8 @@ public final class Server {
        CleanUp cleanUp = null;
        Thread initThread = null;

-        NewDisplay newDisplay = options.getNewDisplay();
-        int displayId = newDisplay == null ? options.getDisplayId() : Device.DISPLAY_ID_NONE;
-
        if (options.getCleanup()) {
-            cleanUp = CleanUp.configure(displayId);
+            cleanUp = CleanUp.configure(options.getDisplayId());
            initThread = startInitThread(options, cleanUp);
        }

@@ -144,6 +140,9 @@ public final class Server {
        boolean video = options.getVideo();
        boolean audio = options.getAudio();
        boolean sendDummyByte = options.getSendDummyByte();
+        boolean camera = video && options.getVideoSource() == VideoSource.CAMERA;
+
+        final Device device = camera ? null : new Device(options);

        Workarounds.apply();

@@ -155,11 +154,13 @@ public final class Server {
                connection.sendDeviceMeta(Device.getDeviceName());
            }

-            Controller controller = null;
-
            if (control) {
                ControlChannel controlChannel = connection.getControlChannel();
-                controller = new Controller(displayId, controlChannel, cleanUp, options.getClipboardAutosync(), options.getPowerOn());
+                Controller controller = new Controller(device, controlChannel, cleanUp, options.getClipboardAutosync(), options.getPowerOn());
+                device.setClipboardListener(text -> {
+                    DeviceMessage msg = DeviceMessage.createClipboard(text);
+                    controller.getSender().send(msg);
+                });
                asyncProcessors.add(controller);
            }

@@ -189,13 +190,7 @@ public final class Server {
                        options.getSendFrameMeta());
                SurfaceCapture surfaceCapture;
                if (options.getVideoSource() == VideoSource.DISPLAY) {
-                    if (newDisplay != null) {
-                        surfaceCapture = new NewDisplayCapture(controller, newDisplay, options.getMaxSize());
-                    } else {
-                        assert displayId != Device.DISPLAY_ID_NONE;
-                        surfaceCapture = new ScreenCapture(controller, displayId, options.getMaxSize(), options.getCrop(),
-                                options.getLockVideoOrientation());
-                    }
+                    surfaceCapture = new ScreenCapture(device);
                } else {
                    surfaceCapture = new CameraCapture(options.getCameraId(), options.getCameraFacing(), options.getCameraSize(),
                            options.getMaxSize(), options.getCameraAspectRatio(), options.getCameraFps(), options.getCameraHighSpeed());
@@ -287,11 +282,6 @@ public final class Server {
                Workarounds.apply();
                Ln.i(LogUtils.buildCameraListMessage(options.getListCameraSizes()));
            }
-            if (options.getListApps()) {
-                Workarounds.apply();
-                Ln.i("Processing Android apps... (this may take some time)");
-                Ln.i(LogUtils.buildAppListMessage());
-            }
            // Just print the requested data, do not mirror
            return;
        }
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessage.java
@@ -23,7 +23,6 @@ public final class ControlMessage {
    public static final int TYPE_UHID_INPUT = 13;
    public static final int TYPE_UHID_DESTROY = 14;
    public static final int TYPE_OPEN_HARD_KEYBOARD_SETTINGS = 15;
-    public static final int TYPE_START_APP = 16;

    public static final long SEQUENCE_INVALID = 0;

@@ -156,13 +155,6 @@ public final class ControlMessage {
        return msg;
    }

-    public static ControlMessage createStartApp(String name) {
-        ControlMessage msg = new ControlMessage();
-        msg.type = TYPE_START_APP;
-        msg.text = name;
-        return msg;
-    }
-
    public int getType() {
        return type;
    }
--- a/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/ControlMessageReader.java
@@ -53,8 +53,6 @@ public class ControlMessageReader {
                return parseUhidInput();
            case ControlMessage.TYPE_UHID_DESTROY:
                return parseUhidDestroy();
-            case ControlMessage.TYPE_START_APP:
-                return parseStartApp();
            default:
                throw new ControlProtocolException("Unknown event type: " + type);
        }
@@ -157,11 +155,6 @@ public class ControlMessageReader {
        return ControlMessage.createUhidDestroy(id);
    }

-    private ControlMessage parseStartApp() throws IOException {
-        String name = parseString(1);
-        return ControlMessage.createStartApp(name);
-    }
-
    private Position parsePosition() throws IOException {
        int x = dis.readInt();
        int y = dis.readInt();
--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@@ -4,17 +4,12 @@ import com.genymobile.scrcpy.AndroidVersions;
 import com.genymobile.scrcpy.AsyncProcessor;
 import com.genymobile.scrcpy.CleanUp;
 import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DeviceApp;
 import com.genymobile.scrcpy.device.Point;
 import com.genymobile.scrcpy.device.Position;
 import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.util.LogUtils;
-import com.genymobile.scrcpy.video.VirtualDisplayListener;
-import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.InputManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

-import android.content.IOnPrimaryClipChangedListener;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
@@ -24,40 +19,11 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;

 import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;

-public class Controller implements AsyncProcessor, VirtualDisplayListener {
-
-    /*
-     * For event injection, there are two display ids:
-     *  - the displayId passed to the constructor (which comes from --display-id passed by the client, 0 for the main display);
-     *  - the virtualDisplayId used for mirroring, notified by the capture instance via the VirtualDisplayListener interface.
-     *
-     * (In case the ScreenCapture uses the "SurfaceControl API", then both ids are equals, but this is an implementation detail.)
-     *
-     * In order to make events work correctly in all cases:
-     *  - virtualDisplayId must be used for events relative to the display (mouse and touch events with coordinates);
-     *  - displayId must be used for other events (like key events).
-     *
-     * If a new separate virtual display is created (using --new-display), then displayId == Device.DISPLAY_ID_NONE. In that case, all events are
-     * sent to the virtual display id.
-     */
-
-    private static final class DisplayData {
-        private final int virtualDisplayId;
-        private final PositionMapper positionMapper;
-
-        private DisplayData(int virtualDisplayId, PositionMapper positionMapper) {
-            this.virtualDisplayId = virtualDisplayId;
-            this.positionMapper = positionMapper;
-        }
-    }
+public class Controller implements AsyncProcessor {

    private static final int DEFAULT_DEVICE_ID = 0;

@@ -65,14 +31,12 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    private static final int POINTER_ID_MOUSE = -1;

    private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
-    private ExecutorService startAppExecutor;

    private Thread thread;

    private UhidManager uhidManager;

-    private final int displayId;
-    private final boolean supportsInputEvents;
+    private final Device device;
    private final ControlChannel controlChannel;
    private final CleanUp cleanUp;
    private final DeviceMessageSender sender;
@@ -81,11 +45,6 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

    private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);

-    private final AtomicBoolean isSettingClipboard = new AtomicBoolean();
-
-    private final AtomicReference<DisplayData> displayData = new AtomicReference<>();
-    private final Object displayDataAvailable = new Object(); // condition variable
-
    private long lastTouchDown;
    private final PointersState pointersState = new PointersState();
    private final MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[PointersState.MAX_POINTERS];
@@ -93,54 +52,14 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

    private boolean keepPowerModeOff;

-    public Controller(int displayId, ControlChannel controlChannel, CleanUp cleanUp, boolean clipboardAutosync, boolean powerOn) {
-        this.displayId = displayId;
+    public Controller(Device device, ControlChannel controlChannel, CleanUp cleanUp, boolean clipboardAutosync, boolean powerOn) {
+        this.device = device;
        this.controlChannel = controlChannel;
        this.cleanUp = cleanUp;
        this.clipboardAutosync = clipboardAutosync;
        this.powerOn = powerOn;
        initPointers();
        sender = new DeviceMessageSender(controlChannel);
-
-        // main display or any display on Android >= Q
-        supportsInputEvents = Device.supportsInputEvents(displayId);
-        if (!supportsInputEvents) {
-            Ln.w("Input events are not supported for secondary displays before Android 10");
-        }
-
-        if (clipboardAutosync) {
-            // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
-            ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
-            if (clipboardManager != null) {
-                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
-                    @Override
-                    public void dispatchPrimaryClipChanged() {
-                        if (isSettingClipboard.get()) {
-                            // This is a notification for the change we are currently applying, ignore it
-                            return;
-                        }
-                        String text = Device.getClipboardText();
-                        if (text != null) {
-                            DeviceMessage msg = DeviceMessage.createClipboard(text);
-                            sender.send(msg);
-                        }
-                    }
-                });
-            } else {
-                Ln.w("No clipboard manager, copy-paste between device and computer will not work");
-            }
-        }
-    }
-
-    @Override
-    public void onNewVirtualDisplay(int virtualDisplayId, PositionMapper positionMapper) {
-        DisplayData data = new DisplayData(virtualDisplayId, positionMapper);
-        DisplayData old = this.displayData.getAndSet(data);
-        if (old == null) {
-            synchronized (displayDataAvailable) {
-                displayDataAvailable.notify();
-            }
-        }
    }

    private UhidManager getUhidManager() {
@@ -166,8 +85,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

    private void control() throws IOException {
        // on start, power on the device
-        if (powerOn && displayId != Device.DISPLAY_ID_NONE && !Device.isScreenOn()) {
-            Device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, displayId, Device.INJECT_MODE_ASYNC);
+        if (powerOn && !Device.isScreenOn()) {
+            device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, Device.INJECT_MODE_ASYNC);

            // dirty hack
            // After POWER is injected, the device is powered on asynchronously.
@@ -220,6 +139,10 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        sender.join();
    }

+    public DeviceMessageSender getSender() {
+        return sender;
+    }
+
    private boolean handleEvent() throws IOException {
        ControlMessage msg;
        try {
@@ -231,27 +154,27 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

        switch (msg.getType()) {
            case ControlMessage.TYPE_INJECT_KEYCODE:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                    injectKeycode(msg.getAction(), msg.getKeycode(), msg.getRepeat(), msg.getMetaState());
                }
                break;
            case ControlMessage.TYPE_INJECT_TEXT:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                    injectText(msg.getText());
                }
                break;
            case ControlMessage.TYPE_INJECT_TOUCH_EVENT:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                    injectTouch(msg.getAction(), msg.getPointerId(), msg.getPosition(), msg.getPressure(), msg.getActionButton(), msg.getButtons());
                }
                break;
            case ControlMessage.TYPE_INJECT_SCROLL_EVENT:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                    injectScroll(msg.getPosition(), msg.getHScroll(), msg.getVScroll(), msg.getButtons());
                }
                break;
            case ControlMessage.TYPE_BACK_OR_SCREEN_ON:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                    pressBackOrTurnScreenOn(msg.getAction());
                }
                break;
@@ -271,7 +194,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                setClipboard(msg.getText(), msg.getPaste(), msg.getSequence());
                break;
            case ControlMessage.TYPE_SET_SCREEN_POWER_MODE:
-                if (supportsInputEvents) {
+                if (device.supportsInputEvents()) {
                    int mode = msg.getAction();
                    boolean setPowerModeOk = Device.setScreenPowerMode(mode);
                    if (setPowerModeOk) {
@@ -285,7 +208,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                }
                break;
            case ControlMessage.TYPE_ROTATE_DEVICE:
-                Device.rotateDevice(getActionDisplayId());
+                device.rotateDevice();
                break;
            case ControlMessage.TYPE_UHID_CREATE:
                getUhidManager().open(msg.getId(), msg.getText(), msg.getData());
@@ -299,9 +222,6 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
            case ControlMessage.TYPE_OPEN_HARD_KEYBOARD_SETTINGS:
                openHardKeyboardSettings();
                break;
-            case ControlMessage.TYPE_START_APP:
-                startAppAsync(msg.getText());
-                break;
            default:
                // do nothing
        }
@@ -313,7 +233,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        if (keepPowerModeOff && action == KeyEvent.ACTION_UP && (keycode == KeyEvent.KEYCODE_POWER || keycode == KeyEvent.KEYCODE_WAKEUP)) {
            schedulePowerModeOff();
        }
-        return injectKeyEvent(action, keycode, repeat, metaState, Device.INJECT_MODE_ASYNC);
+        return device.injectKeyEvent(action, keycode, repeat, metaState, Device.INJECT_MODE_ASYNC);
    }

    private boolean injectChar(char c) {
@@ -323,10 +243,8 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        if (events == null) {
            return false;
        }
-
-        int actionDisplayId = getActionDisplayId();
        for (KeyEvent event : events) {
-            if (!Device.injectEvent(event, actionDisplayId, Device.INJECT_MODE_ASYNC)) {
+            if (!device.injectEvent(event, Device.INJECT_MODE_ASYNC)) {
                return false;
            }
        }
@@ -348,12 +266,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    private boolean injectTouch(int action, long pointerId, Position position, float pressure, int actionButton, int buttons) {
        long now = SystemClock.uptimeMillis();

-        // it hides the field on purpose, to read it from the atomic once
-        @SuppressWarnings("checkstyle:HiddenField")
-        DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a touch event without a display";
-
-        Point point = displayData.positionMapper.map(position);
+        Point point = device.getPhysicalPoint(position);
        if (point == null) {
            Ln.w("Ignore touch event, it was generated for a different device size");
            return false;
@@ -412,7 +325,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                    // First button pressed: ACTION_DOWN
                    MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
                            pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(downEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!device.injectEvent(downEvent, Device.INJECT_MODE_ASYNC)) {
                        return false;
                    }
                }
@@ -423,7 +336,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                if (!InputManager.setActionButton(pressEvent, actionButton)) {
                    return false;
                }
-                if (!Device.injectEvent(pressEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!device.injectEvent(pressEvent, Device.INJECT_MODE_ASYNC)) {
                    return false;
                }

@@ -437,7 +350,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                    return false;
                }
-                if (!Device.injectEvent(releaseEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!device.injectEvent(releaseEvent, Device.INJECT_MODE_ASYNC)) {
                    return false;
                }

@@ -445,7 +358,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                    // Last button released: ACTION_UP
                    MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
                            pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(upEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!device.injectEvent(upEvent, Device.INJECT_MODE_ASYNC)) {
                        return false;
                    }
                }
@@ -456,20 +369,14 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                DEFAULT_DEVICE_ID, 0, source, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
    }

    private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
        long now = SystemClock.uptimeMillis();
-
-        // it hides the field on purpose, to read it from the atomic once
-        @SuppressWarnings("checkstyle:HiddenField")
-        DisplayData displayData = this.displayData.get();
-        assert displayData != null : "Cannot receive a scroll event without a display";
-
-        Point point = displayData.positionMapper.map(position);
+        Point point = device.getPhysicalPoint(position);
        if (point == null) {
-            Ln.w("Ignore scroll event, it was generated for a different device size");
+            // ignore event
            return false;
        }

@@ -484,7 +391,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                DEFAULT_DEVICE_ID, 0, InputDevice.SOURCE_MOUSE, 0);
-        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
+        return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
    }

    /**
@@ -499,7 +406,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {

    private boolean pressBackOrTurnScreenOn(int action) {
        if (Device.isScreenOn()) {
-            return injectKeyEvent(action, KeyEvent.KEYCODE_BACK, 0, 0, Device.INJECT_MODE_ASYNC);
+            return device.injectKeyEvent(action, KeyEvent.KEYCODE_BACK, 0, 0, Device.INJECT_MODE_ASYNC);
        }

        // Screen is off
@@ -512,15 +419,15 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        if (keepPowerModeOff) {
            schedulePowerModeOff();
        }
-        return pressReleaseKeycode(KeyEvent.KEYCODE_POWER, Device.INJECT_MODE_ASYNC);
+        return device.pressReleaseKeycode(KeyEvent.KEYCODE_POWER, Device.INJECT_MODE_ASYNC);
    }

    private void getClipboard(int copyKey) {
        // On Android >= 7, press the COPY or CUT key if requested
-        if (copyKey != ControlMessage.COPY_KEY_NONE && Build.VERSION.SDK_INT >= AndroidVersions.API_24_ANDROID_7_0 && supportsInputEvents) {
+        if (copyKey != ControlMessage.COPY_KEY_NONE && Build.VERSION.SDK_INT >= AndroidVersions.API_24_ANDROID_7_0 && device.supportsInputEvents()) {
            int key = copyKey == ControlMessage.COPY_KEY_COPY ? KeyEvent.KEYCODE_COPY : KeyEvent.KEYCODE_CUT;
            // Wait until the event is finished, to ensure that the clipboard text we read just after is the correct one
-            pressReleaseKeycode(key, Device.INJECT_MODE_WAIT_FOR_FINISH);
+            device.pressReleaseKeycode(key, Device.INJECT_MODE_WAIT_FOR_FINISH);
        }

        // If clipboard autosync is enabled, then the device clipboard is synchronized to the computer clipboard whenever it changes, in
@@ -536,16 +443,14 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
    }

    private boolean setClipboard(String text, boolean paste, long sequence) {
-        isSettingClipboard.set(true);
-        boolean ok = Device.setClipboardText(text);
-        isSettingClipboard.set(false);
+        boolean ok = device.setClipboardText(text);
        if (ok) {
            Ln.i("Device clipboard set");
        }

        // On Android >= 7, also press the PASTE key if requested
-        if (paste && Build.VERSION.SDK_INT >= AndroidVersions.API_24_ANDROID_7_0 && supportsInputEvents) {
-            pressReleaseKeycode(KeyEvent.KEYCODE_PASTE, Device.INJECT_MODE_ASYNC);
+        if (paste && Build.VERSION.SDK_INT >= AndroidVersions.API_24_ANDROID_7_0 && device.supportsInputEvents()) {
+            device.pressReleaseKeycode(KeyEvent.KEYCODE_PASTE, Device.INJECT_MODE_ASYNC);
        }

        if (sequence != ControlMessage.SEQUENCE_INVALID) {
@@ -561,118 +466,4 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
        Intent intent = new Intent("android.settings.HARD_KEYBOARD_SETTINGS");
        ServiceManager.getActivityManager().startActivity(intent);
    }
-
-    private boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState, int injectMode) {
-        return Device.injectKeyEvent(action, keyCode, repeat, metaState, getActionDisplayId(), injectMode);
-    }
-
-    private boolean pressReleaseKeycode(int keyCode, int injectMode) {
-        return Device.pressReleaseKeycode(keyCode, getActionDisplayId(), injectMode);
-    }
-
-    private int getActionDisplayId() {
-        if (displayId != Device.DISPLAY_ID_NONE) {
-            // Real screen mirrored, use the source display id
-            return displayId;
-        }
-
-        // Virtual display created by --new-display, use the virtualDisplayId
-        DisplayData data = displayData.get();
-        if (data == null) {
-            // If no virtual display id is initialized yet, use the main display id
-            return 0;
-        }
-
-        return data.virtualDisplayId;
-    }
-
-    private void startAppAsync(String name) {
-        if (startAppExecutor == null) {
-            startAppExecutor = Executors.newSingleThreadExecutor();
-        }
-
-        // Listing and selecting the app may take a lot of time
-        startAppExecutor.submit(() -> startApp(name));
-    }
-
-    private void startApp(String name) {
-        boolean forceStopBeforeStart = name.startsWith("+");
-        if (forceStopBeforeStart) {
-            name = name.substring(1);
-        }
-
-        DeviceApp app;
-        boolean searchByName = name.startsWith("?");
-        if (searchByName) {
-            name = name.substring(1);
-
-            Ln.i("Processing Android apps... (this may take some time)");
-            List<DeviceApp> apps = Device.findByName(name);
-            if (apps.isEmpty()) {
-                Ln.w("No app found for name \"" + name + "\"");
-                return;
-            }
-
-            if (apps.size() > 1) {
-                String title = "No unique app found for name \"" + name + "\":";
-                Ln.w(LogUtils.buildAppListMessage(title, apps));
-                return;
-            }
-
-            app = apps.get(0);
-        } else {
-            app = Device.findByPackageName(name);
-            if (app == null) {
-                Ln.w("No app found for package \"" + name + "\"");
-                return;
-            }
-        }
-
-        int startAppDisplayId = getStartAppDisplayId();
-        if (startAppDisplayId == Device.DISPLAY_ID_NONE) {
-            Ln.e("No known display id to start app \"" + name + "\"");
-            return;
-        }
-
-        Ln.i("Starting app \"" + app.getName() + "\" [" + app.getPackageName() + "] on display " + startAppDisplayId + "...");
-        Device.startApp(app.getPackageName(), startAppDisplayId, forceStopBeforeStart);
-    }
-
-    private int getStartAppDisplayId() {
-        if (displayId != Device.DISPLAY_ID_NONE) {
-            return displayId;
-        }
-
-        // Mirroring a new virtual display id (using --new-display-id feature)
-        try {
-            // Wait for at most 1 second until a virtual display id is known
-            DisplayData data = waitDisplayData(1000);
-            if (data != null) {
-                return data.virtualDisplayId;
-            }
-        } catch (InterruptedException e) {
-            // do nothing
-        }
-
-        // No display id available
-        return Device.DISPLAY_ID_NONE;
-    }
-
-    private DisplayData waitDisplayData(long timeoutMillis) throws InterruptedException {
-        long deadline = System.currentTimeMillis() + timeoutMillis;
-
-        synchronized (displayDataAvailable) {
-            DisplayData data = displayData.get();
-            while (data == null) {
-                long timeout = deadline - System.currentTimeMillis();
-                if (timeout < 0) {
-                    return null;
-                }
-                displayDataAvailable.wait(timeout);
-                data = displayData.get();
-            }
-
-            return data;
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/PositionMapper.java
@@ -1,46 +0,0 @@
-package com.genymobile.scrcpy.control;
-
-import com.genymobile.scrcpy.device.Point;
-import com.genymobile.scrcpy.device.Position;
-import com.genymobile.scrcpy.device.Size;
-import com.genymobile.scrcpy.video.ScreenInfo;
-
-import android.graphics.Rect;
-
-public final class PositionMapper {
-
-    private final Size videoSize;
-    private final Rect contentRect;
-    private final int coordsRotation;
-
-    public PositionMapper(Size videoSize, Rect contentRect, int videoRotation) {
-        this.videoSize = videoSize;
-        this.contentRect = contentRect;
-        this.coordsRotation = reverseRotation(videoRotation);
-    }
-
-    public static PositionMapper from(ScreenInfo screenInfo) {
-        return new PositionMapper(screenInfo.getUnlockedVideoSize(), screenInfo.getContentRect(), screenInfo.getVideoRotation());
-    }
-
-    private static int reverseRotation(int rotation) {
-        return (4 - rotation) % 4;
-    }
-
-    public Point map(Position position) {
-        // reverse the video rotation to apply the events
-        Position devicePosition = position.rotate(coordsRotation);
-
-        Size clientVideoSize = devicePosition.getScreenSize();
-        if (!videoSize.equals(clientVideoSize)) {
-            // The client sends a click relative to a video with wrong dimensions,
-            // the device may have been rotated since the event was generated, so ignore the event
-            return null;
-        }
-
-        Point point = devicePosition.getPoint();
-        int convertedX = contentRect.left + point.getX() * contentRect.width() / videoSize.getWidth();
-        int convertedY = contentRect.top + point.getY() * contentRect.height() / videoSize.getHeight();
-        return new Point(convertedX, convertedY);
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/device/Device.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Device.java
@@ -1,9 +1,10 @@
 package com.genymobile.scrcpy.device;

 import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.FakeContext;
+import com.genymobile.scrcpy.Options;
 import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.wrappers.ActivityManager;
+import com.genymobile.scrcpy.util.LogUtils;
+import com.genymobile.scrcpy.video.ScreenInfo;
 import com.genymobile.scrcpy.wrappers.ClipboardManager;
 import com.genymobile.scrcpy.wrappers.DisplayControl;
 import com.genymobile.scrcpy.wrappers.InputManager;
@@ -11,28 +12,22 @@ import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;
 import com.genymobile.scrcpy.wrappers.WindowManager;

-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.app.ActivityOptions;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
+import android.content.IOnPrimaryClipChangedListener;
+import android.graphics.Rect;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.IBinder;
 import android.os.SystemClock;
+import android.view.IDisplayFoldListener;
+import android.view.IRotationWatcher;
 import android.view.InputDevice;
 import android.view.InputEvent;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
+import java.util.concurrent.atomic.AtomicBoolean;

 public final class Device {

-    public static final int DISPLAY_ID_NONE = -1;
-
    public static final int POWER_MODE_OFF = SurfaceControl.POWER_MODE_OFF;
    public static final int POWER_MODE_NORMAL = SurfaceControl.POWER_MODE_NORMAL;

@@ -43,8 +38,177 @@ public final class Device {
    public static final int LOCK_VIDEO_ORIENTATION_UNLOCKED = -1;
    public static final int LOCK_VIDEO_ORIENTATION_INITIAL = -2;

-    private Device() {
-        // not instantiable
+    public interface RotationListener {
+        void onRotationChanged(int rotation);
+    }
+
+    public interface FoldListener {
+        void onFoldChanged(int displayId, boolean folded);
+    }
+
+    public interface ClipboardListener {
+        void onClipboardTextChanged(String text);
+    }
+
+    private final Rect crop;
+    private int maxSize;
+    private final int lockVideoOrientation;
+
+    private Size deviceSize;
+    private ScreenInfo screenInfo;
+    private RotationListener rotationListener;
+    private FoldListener foldListener;
+    private ClipboardListener clipboardListener;
+    private final AtomicBoolean isSettingClipboard = new AtomicBoolean();
+
+    /**
+     * Logical display identifier
+     */
+    private final int displayId;
+
+    /**
+     * The surface flinger layer stack associated with this logical display
+     */
+    private final int layerStack;
+
+    private final boolean supportsInputEvents;
+
+    public Device(Options options) throws ConfigurationException {
+        displayId = options.getDisplayId();
+        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+        if (displayInfo == null) {
+            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
+            throw new ConfigurationException("Unknown display id: " + displayId);
+        }
+
+        int displayInfoFlags = displayInfo.getFlags();
+
+        deviceSize = displayInfo.getSize();
+        crop = options.getCrop();
+        maxSize = options.getMaxSize();
+        lockVideoOrientation = options.getLockVideoOrientation();
+
+        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
+        layerStack = displayInfo.getLayerStack();
+
+        ServiceManager.getWindowManager().registerRotationWatcher(new IRotationWatcher.Stub() {
+            @Override
+            public void onRotationChanged(int rotation) {
+                synchronized (Device.this) {
+                    screenInfo = screenInfo.withDeviceRotation(rotation);
+
+                    // notify
+                    if (rotationListener != null) {
+                        rotationListener.onRotationChanged(rotation);
+                    }
+                }
+            }
+        }, displayId);
+
+        if (Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10) {
+            ServiceManager.getWindowManager().registerDisplayFoldListener(new IDisplayFoldListener.Stub() {
+                @Override
+                public void onDisplayFoldChanged(int displayId, boolean folded) {
+                    if (Device.this.displayId != displayId) {
+                        // Ignore events related to other display ids
+                        return;
+                    }
+
+                    synchronized (Device.this) {
+                        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
+                        if (displayInfo == null) {
+                            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
+                            return;
+                        }
+
+                        deviceSize = displayInfo.getSize();
+                        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), deviceSize, crop, maxSize, lockVideoOrientation);
+                        // notify
+                        if (foldListener != null) {
+                            foldListener.onFoldChanged(displayId, folded);
+                        }
+                    }
+                }
+            });
+        }
+
+        if (options.getControl() && options.getClipboardAutosync()) {
+            // If control and autosync are enabled, synchronize Android clipboard to the computer automatically
+            ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
+            if (clipboardManager != null) {
+                clipboardManager.addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {
+                    @Override
+                    public void dispatchPrimaryClipChanged() {
+                        if (isSettingClipboard.get()) {
+                            // This is a notification for the change we are currently applying, ignore it
+                            return;
+                        }
+                        synchronized (Device.this) {
+                            if (clipboardListener != null) {
+                                String text = getClipboardText();
+                                if (text != null) {
+                                    clipboardListener.onClipboardTextChanged(text);
+                                }
+                            }
+                        }
+                    }
+                });
+            } else {
+                Ln.w("No clipboard manager, copy-paste between device and computer will not work");
+            }
+        }
+
+        if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
+            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
+        }
+
+        // main display or any display on Android >= 10
+        supportsInputEvents = displayId == 0 || Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10;
+        if (!supportsInputEvents) {
+            Ln.w("Input events are not supported for secondary displays before Android 10");
+        }
+    }
+
+    public int getDisplayId() {
+        return displayId;
+    }
+
+    public synchronized void setMaxSize(int newMaxSize) {
+        maxSize = newMaxSize;
+        screenInfo = ScreenInfo.computeScreenInfo(screenInfo.getReverseVideoRotation(), deviceSize, crop, newMaxSize, lockVideoOrientation);
+    }
+
+    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")
+        ScreenInfo screenInfo = getScreenInfo(); // read with synchronization
+
+        // ignore the locked video orientation, the events will apply in coordinates considered in the physical device orientation
+        Size unlockedVideoSize = screenInfo.getUnlockedVideoSize();
+
+        int reverseVideoRotation = screenInfo.getReverseVideoRotation();
+        // reverse the video rotation to apply the events
+        Position devicePosition = position.rotate(reverseVideoRotation);
+
+        Size clientVideoSize = devicePosition.getScreenSize();
+        if (!unlockedVideoSize.equals(clientVideoSize)) {
+            // The client sends a click relative to a video with wrong dimensions,
+            // the device may have been rotated since the event was generated, so ignore the event
+            return null;
+        }
+        Rect contentRect = screenInfo.getContentRect();
+        Point point = devicePosition.getPoint();
+        int convertedX = contentRect.left + point.getX() * contentRect.width() / unlockedVideoSize.getWidth();
+        int convertedY = contentRect.top + point.getY() * contentRect.height() / unlockedVideoSize.getHeight();
+        return new Point(convertedX, convertedY);
    }

    public static String getDeviceName() {
@@ -55,6 +219,10 @@ public final class Device {
        return displayId == 0 || Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10;
    }

+    public boolean supportsInputEvents() {
+        return supportsInputEvents;
+    }
+
    public static boolean injectEvent(InputEvent inputEvent, int displayId, int injectMode) {
        if (!supportsInputEvents(displayId)) {
            throw new AssertionError("Could not inject input event if !supportsInputEvents()");
@@ -67,6 +235,10 @@ public final class Device {
        return ServiceManager.getInputManager().injectInputEvent(inputEvent, injectMode);
    }

+    public boolean injectEvent(InputEvent event, int injectMode) {
+        return injectEvent(event, displayId, injectMode);
+    }
+
    public static boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState, int displayId, int injectMode) {
        long now = SystemClock.uptimeMillis();
        KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
@@ -74,15 +246,35 @@ public final class Device {
        return injectEvent(event, displayId, injectMode);
    }

+    public boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState, int injectMode) {
+        return injectKeyEvent(action, keyCode, repeat, metaState, displayId, injectMode);
+    }
+
    public static boolean pressReleaseKeycode(int keyCode, int displayId, int injectMode) {
        return injectKeyEvent(KeyEvent.ACTION_DOWN, keyCode, 0, 0, displayId, injectMode)
                && injectKeyEvent(KeyEvent.ACTION_UP, keyCode, 0, 0, displayId, injectMode);
    }

+    public boolean pressReleaseKeycode(int keyCode, int injectMode) {
+        return pressReleaseKeycode(keyCode, displayId, injectMode);
+    }
+
    public static boolean isScreenOn() {
        return ServiceManager.getPowerManager().isScreenOn();
    }

+    public synchronized void setRotationListener(RotationListener rotationListener) {
+        this.rotationListener = rotationListener;
+    }
+
+    public synchronized void setFoldListener(FoldListener foldlistener) {
+        this.foldListener = foldlistener;
+    }
+
+    public synchronized void setClipboardListener(ClipboardListener clipboardListener) {
+        this.clipboardListener = clipboardListener;
+    }
+
    public static void expandNotificationPanel() {
        ServiceManager.getStatusBarManager().expandNotificationsPanel();
    }
@@ -107,7 +299,7 @@ public final class Device {
        return s.toString();
    }

-    public static boolean setClipboardText(String text) {
+    public boolean setClipboardText(String text) {
        ClipboardManager clipboardManager = ServiceManager.getClipboardManager();
        if (clipboardManager == null) {
            return false;
@@ -122,7 +314,10 @@ public final class Device {
            return false;
        }

-        return clipboardManager.setText(text);
+        isSettingClipboard.set(true);
+        boolean ok = clipboardManager.setText(text);
+        isSettingClipboard.set(false);
+        return ok;
    }

    /**
@@ -172,8 +367,6 @@ public final class Device {
    }

    public static boolean powerOffScreen(int displayId) {
-        assert displayId != DISPLAY_ID_NONE;
-
        if (!isScreenOn()) {
            return true;
        }
@@ -183,9 +376,7 @@ public final class Device {
    /**
     * Disable auto-rotation (if enabled), set the screen rotation and re-enable auto-rotation (if it was enabled).
     */
-    public static void rotateDevice(int displayId) {
-        assert displayId != DISPLAY_ID_NONE;
-
+    public void rotateDevice() {
        WindowManager wm = ServiceManager.getWindowManager();

        boolean accelerometerRotation = !wm.isRotationFrozen(displayId);
@@ -204,8 +395,6 @@ public final class Device {
    }

    private static int getCurrentRotation(int displayId) {
-        assert displayId != DISPLAY_ID_NONE;
-
        if (displayId == 0) {
            return ServiceManager.getWindowManager().getRotation();
        }
@@ -213,98 +402,4 @@ public final class Device {
        DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
        return displayInfo.getRotation();
    }
-
-    public static List<DeviceApp> listApps() {
-        List<DeviceApp> apps = new ArrayList<>();
-        PackageManager pm = FakeContext.get().getPackageManager();
-        for (ApplicationInfo appInfo : getLaunchableApps(pm)) {
-            apps.add(toApp(pm, appInfo));
-        }
-
-        return apps;
-    }
-
-    @SuppressLint("QueryPermissionsNeeded")
-    private static List<ApplicationInfo> getLaunchableApps(PackageManager pm) {
-        List<ApplicationInfo> result = new ArrayList<>();
-        for (ApplicationInfo appInfo : pm.getInstalledApplications(PackageManager.GET_META_DATA)) {
-            if (getLaunchIntent(pm, appInfo.packageName) != null) {
-                result.add(appInfo);
-            }
-        }
-
-        return result;
-    }
-
-    public static Intent getLaunchIntent(PackageManager pm, String packageName) {
-        Intent launchIntent = pm.getLaunchIntentForPackage(packageName);
-        if (launchIntent != null) {
-            return launchIntent;
-        }
-
-        return pm.getLeanbackLaunchIntentForPackage(packageName);
-    }
-
-    private static DeviceApp toApp(PackageManager pm, ApplicationInfo appInfo) {
-        String name = pm.getApplicationLabel(appInfo).toString();
-        boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
-        return new DeviceApp(appInfo.packageName, name, system, appInfo.enabled);
-    }
-
-    @SuppressLint("QueryPermissionsNeeded")
-    public static DeviceApp findByPackageName(String packageName) {
-        PackageManager pm = FakeContext.get().getPackageManager();
-        // No need to filter by "launchable" apps, an error will be reported on start if the app is not launchable
-        for (ApplicationInfo appInfo : pm.getInstalledApplications(PackageManager.GET_META_DATA)) {
-            if (packageName.equals(appInfo.packageName)) {
-                return toApp(pm, appInfo);
-            }
-        }
-
-        return null;
-    }
-
-    @SuppressLint("QueryPermissionsNeeded")
-    public static List<DeviceApp> findByName(String searchName) {
-        List<DeviceApp> result = new ArrayList<>();
-        searchName = searchName.toLowerCase(Locale.getDefault());
-
-        PackageManager pm = FakeContext.get().getPackageManager();
-        for (ApplicationInfo appInfo : getLaunchableApps(pm)) {
-            if (appInfo.enabled) {
-                String name = pm.getApplicationLabel(appInfo).toString();
-                if (name.toLowerCase(Locale.getDefault()).startsWith(searchName)) {
-                    boolean system = (appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
-                    result.add(new DeviceApp(appInfo.packageName, name, system, appInfo.enabled));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    public static void startApp(String packageName, int displayId, boolean forceStop) {
-        PackageManager pm = FakeContext.get().getPackageManager();
-
-        Intent launchIntent = getLaunchIntent(pm, packageName);
-        if (launchIntent == null) {
-            Ln.w("Cannot create launch intent for app " + packageName);
-            return;
-        }
-
-        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        Bundle options = null;
-        if (Build.VERSION.SDK_INT >= AndroidVersions.API_26_ANDROID_8_0) {
-            ActivityOptions launchOptions = ActivityOptions.makeBasic();
-            launchOptions.setLaunchDisplayId(displayId);
-            options = launchOptions.toBundle();
-        }
-
-        ActivityManager am = ServiceManager.getActivityManager();
-        if (forceStop) {
-            am.forceStopPackage(packageName);
-        }
-        am.startActivity(launchIntent, options);
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/DeviceApp.java
@@ -1,32 +0,0 @@
-package com.genymobile.scrcpy.device;
-
-public final class DeviceApp {
-
-    private final String packageName;
-    private final String name;
-    private final boolean system;
-    private final boolean enabled;
-
-    public DeviceApp(String packageName, String name, boolean system, boolean enabled) {
-        this.packageName = packageName;
-        this.name = name;
-        this.system = system;
-        this.enabled = enabled;
-    }
-
-    public String getPackageName() {
-        return packageName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public boolean isSystem() {
-        return system;
-    }
-
-    public boolean isEnabled() {
-        return enabled;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/DisplayInfo.java
@@ -6,17 +6,15 @@ public final class DisplayInfo {
    private final int rotation;
    private final int layerStack;
    private final int flags;
-    private final int dpi;

    public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 0x00000001;

-    public DisplayInfo(int displayId, Size size, int rotation, int layerStack, int flags, int dpi) {
+    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;
-        this.dpi = dpi;
    }

    public int getDisplayId() {
@@ -38,9 +36,5 @@ public final class DisplayInfo {
    public int getFlags() {
        return flags;
    }
-
-    public int getDpi() {
-        return dpi;
-    }
 }

--- a/server/src/main/java/com/genymobile/scrcpy/device/NewDisplay.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/NewDisplay.java
@@ -1,31 +0,0 @@
-package com.genymobile.scrcpy.device;
-
-public final class NewDisplay {
-    private Size size;
-    private int dpi;
-
-    public NewDisplay() {
-        // Auto size and dpi
-    }
-
-    public NewDisplay(Size size, int dpi) {
-        this.size = size;
-        this.dpi = dpi;
-    }
-
-    public Size getSize() {
-        return size;
-    }
-
-    public int getDpi() {
-        return dpi;
-    }
-
-    public boolean hasExplicitSize() {
-        return size != null;
-    }
-
-    public boolean hasExplicitDpi() {
-        return dpi != 0;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/device/Size.java
+++ b/server/src/main/java/com/genymobile/scrcpy/device/Size.java
@@ -21,10 +21,6 @@ public final class Size {
        return height;
    }

-    public int getMax() {
-        return Math.max(width, height);
-    }
-
    public Size rotate() {
        return new Size(height, width);
    }
--- a/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
+++ b/server/src/main/java/com/genymobile/scrcpy/util/LogUtils.java
@@ -1,13 +1,10 @@
 package com.genymobile.scrcpy.util;

-import com.genymobile.scrcpy.device.Device;
-import com.genymobile.scrcpy.device.DeviceApp;
 import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.wrappers.DisplayManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;

-import android.annotation.SuppressLint;
 import android.graphics.Rect;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCharacteristics;
@@ -16,9 +13,7 @@ import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.MediaCodec;
 import android.util.Range;

-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;

@@ -159,59 +154,4 @@ public final class LogUtils {
        }
        return set;
    }
-
-
-    public static String buildAppListMessage() {
-        List<DeviceApp> apps = Device.listApps();
-        return buildAppListMessage("List of apps:", apps);
-    }
-
-    @SuppressLint("QueryPermissionsNeeded")
-    public static String buildAppListMessage(String title, List<DeviceApp> apps) {
-        StringBuilder builder = new StringBuilder(title);
-
-        // Sort by:
-        //  1. system flag (system apps are before non-system apps)
-        //  2. name
-        //  3. package name
-        Collections.sort(apps, (thisApp, otherApp) -> {
-            // System apps first
-            int cmp = -Boolean.compare(thisApp.isSystem(), otherApp.isSystem());
-            if (cmp != 0) {
-                return cmp;
-            }
-
-            cmp = Objects.compare(thisApp.getName(), otherApp.getName(), String::compareTo);
-            if (cmp != 0) {
-                return cmp;
-            }
-
-            return Objects.compare(thisApp.getPackageName(), otherApp.getPackageName(), String::compareTo);
-        });
-
-        final int column = 30;
-        for (DeviceApp app : apps) {
-            String name = app.getName();
-            int padding = column - name.length();
-            builder.append("\n ");
-            if (app.isSystem()) {
-                builder.append("* ");
-            } else {
-                builder.append("- ");
-
-            }
-            builder.append(name);
-            if (padding > 0) {
-                builder.append(String.format("%" + padding + "s", " "));
-            } else {
-                builder.append("\n   ").append(String.format("%" + column + "s", " "));
-            }
-            builder.append(" [").append(app.getPackageName()).append(']');
-            if (!app.isEnabled()) {
-                builder.append(" (disabled)");
-            }
-        }
-
-        return builder.toString();
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/NewDisplayCapture.java
@@ -1,146 +0,0 @@
-package com.genymobile.scrcpy.video;
-
-import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.control.PositionMapper;
-import com.genymobile.scrcpy.device.DisplayInfo;
-import com.genymobile.scrcpy.device.NewDisplay;
-import com.genymobile.scrcpy.device.Size;
-import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.wrappers.ServiceManager;
-
-import android.graphics.Rect;
-import android.hardware.display.DisplayManager;
-import android.hardware.display.VirtualDisplay;
-import android.os.Build;
-import android.view.Surface;
-
-public class NewDisplayCapture extends SurfaceCapture {
-
-    // Internal fields copied from android.hardware.display.DisplayManager
-    private static final int VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH = 1 << 6;
-    private static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 1 << 7;
-    private static final int VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL = 1 << 8;
-    private static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 1 << 9;
-    private static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1 << 10;
-    private static final int VIRTUAL_DISPLAY_FLAG_OWN_DISPLAY_GROUP = 1 << 11;
-    private static final int VIRTUAL_DISPLAY_FLAG_ALWAYS_UNLOCKED = 1 << 12;
-    private static final int VIRTUAL_DISPLAY_FLAG_TOUCH_FEEDBACK_DISABLED = 1 << 13;
-    private static final int VIRTUAL_DISPLAY_FLAG_OWN_FOCUS = 1 << 14;
-    private static final int VIRTUAL_DISPLAY_FLAG_DEVICE_DISPLAY_GROUP = 1 << 15;
-
-    private final VirtualDisplayListener vdListener;
-    private final NewDisplay newDisplay;
-
-    private Size mainDisplaySize;
-    private int mainDisplayDpi;
-    private int maxSize; // only used if newDisplay.getSize() != null
-
-    private VirtualDisplay virtualDisplay;
-    private Size size;
-    private int dpi;
-
-    public NewDisplayCapture(VirtualDisplayListener vdListener, NewDisplay newDisplay, int maxSize) {
-        this.vdListener = vdListener;
-        this.newDisplay = newDisplay;
-        this.maxSize = maxSize;
-    }
-
-    @Override
-    public void init() {
-        size = newDisplay.getSize();
-        dpi = newDisplay.getDpi();
-        if (size == null || dpi == 0) {
-            DisplayInfo displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(0);
-            if (displayInfo != null) {
-                mainDisplaySize = displayInfo.getSize();
-                mainDisplayDpi = displayInfo.getDpi();
-            } else {
-                Ln.w("Main display not found, fallback to 1920x1080 240dpi");
-                mainDisplaySize = new Size(1920, 1080);
-                mainDisplayDpi = 240;
-            }
-        }
-    }
-
-    @Override
-    public void prepare() {
-        if (!newDisplay.hasExplicitSize()) {
-            size = ScreenInfo.computeVideoSize(mainDisplaySize.getWidth(), mainDisplaySize.getHeight(), maxSize);
-        }
-        if (!newDisplay.hasExplicitDpi()) {
-            dpi = scaleDpi(mainDisplaySize, mainDisplayDpi, size);
-        }
-    }
-
-    @Override
-    public void start(Surface surface) {
-        if (virtualDisplay != null) {
-            virtualDisplay.release();
-            virtualDisplay = null;
-        }
-
-        int virtualDisplayId;
-        try {
-            int flags = DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC
-                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
-                    | VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH
-                    | VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT
-                    | VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
-                    | VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS;
-            if (Build.VERSION.SDK_INT >= AndroidVersions.API_33_ANDROID_13) {
-                flags |= VIRTUAL_DISPLAY_FLAG_TRUSTED
-                        | VIRTUAL_DISPLAY_FLAG_OWN_DISPLAY_GROUP
-                        | VIRTUAL_DISPLAY_FLAG_ALWAYS_UNLOCKED
-                        | VIRTUAL_DISPLAY_FLAG_TOUCH_FEEDBACK_DISABLED;
-                if (Build.VERSION.SDK_INT >= AndroidVersions.API_34_ANDROID_14) {
-                     flags |= VIRTUAL_DISPLAY_FLAG_OWN_FOCUS
-                             | VIRTUAL_DISPLAY_FLAG_DEVICE_DISPLAY_GROUP;
-                }
-            }
-            virtualDisplay = ServiceManager.getDisplayManager()
-                    .createNewVirtualDisplay("scrcpy", size.getWidth(), size.getHeight(), dpi, surface, flags);
-            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
-            Ln.i("New display id: " + virtualDisplayId);
-        } catch (Exception e) {
-            Ln.e("Could not create display", e);
-            throw new AssertionError("Could not create display");
-        }
-
-        if (vdListener != null) {
-            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
-            Rect contentRect = new Rect(0, 0, size.getWidth(), size.getHeight());
-            PositionMapper positionMapper = new PositionMapper(size, contentRect, 0);
-            vdListener.onNewVirtualDisplay(virtualDisplayId, positionMapper);
-        }
-    }
-
-    @Override
-    public void release() {
-        if (virtualDisplay != null) {
-            virtualDisplay.release();
-            virtualDisplay = null;
-        }
-    }
-
-    @Override
-    public synchronized Size getSize() {
-        return size;
-    }
-
-    @Override
-    public synchronized boolean setMaxSize(int newMaxSize) {
-        if (newDisplay.hasExplicitSize()) {
-            // Cannot retry with a different size if the display size was explicitly provided
-            return false;
-        }
-
-        maxSize = newMaxSize;
-        return true;
-    }
-
-    private static int scaleDpi(Size initialSize, int initialDpi, Size size) {
-        int den = initialSize.getMax();
-        int num = size.getMax();
-        return initialDpi * num / den;
-    }
-}
--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenCapture.java
@@ -1,97 +1,44 @@
 package com.genymobile.scrcpy.video;

 import com.genymobile.scrcpy.AndroidVersions;
-import com.genymobile.scrcpy.control.PositionMapper;
-import com.genymobile.scrcpy.device.DisplayInfo;
+import com.genymobile.scrcpy.device.Device;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.Ln;
-import com.genymobile.scrcpy.util.LogUtils;
-import com.genymobile.scrcpy.wrappers.DisplayManager;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 import com.genymobile.scrcpy.wrappers.SurfaceControl;

 import android.graphics.Rect;
 import android.hardware.display.VirtualDisplay;
 import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.IBinder;
-import android.view.IDisplayFoldListener;
-import android.view.IRotationWatcher;
 import android.view.Surface;

-public class ScreenCapture extends SurfaceCapture {
-
-    private final VirtualDisplayListener vdListener;
-    private final int displayId;
-    private int maxSize;
-    private final Rect crop;
-    private final int lockVideoOrientation;
-
-    private DisplayInfo displayInfo;
-    private ScreenInfo screenInfo;
+public class ScreenCapture extends SurfaceCapture implements Device.RotationListener, Device.FoldListener {

+    private final Device device;
    private IBinder display;
    private VirtualDisplay virtualDisplay;

-    private DisplayManager.DisplayListenerHandle displayListenerHandle;
-    private HandlerThread handlerThread;
-
-    // On Android 14, the DisplayListener may be broken (it never send events). This is fixed in recent Android 14 upgrades, but we can't really know.
-    // So register a RotationWatcher and a DisplayFoldListener as a fallback, until we receive the first event from DisplayListener (which proves
-    // that it works).
-    private boolean displayListenerWorks; // only accessed from the display listener thread
-    private IRotationWatcher rotationWatcher;
-    private IDisplayFoldListener displayFoldListener;
-
-    public ScreenCapture(VirtualDisplayListener vdListener, int displayId, int maxSize, Rect crop, int lockVideoOrientation) {
-        this.vdListener = vdListener;
-        this.displayId = displayId;
-        this.maxSize = maxSize;
-        this.crop = crop;
-        this.lockVideoOrientation = lockVideoOrientation;
+    public ScreenCapture(Device device) {
+        this.device = device;
    }

    @Override
    public void init() {
-        if (Build.VERSION.SDK_INT == AndroidVersions.API_34_ANDROID_14) {
-            registerDisplayListenerFallbacks();
-        }
-
-        handlerThread = new HandlerThread("DisplayListener");
-        handlerThread.start();
-        Handler handler = new Handler(handlerThread.getLooper());
-        displayListenerHandle = ServiceManager.getDisplayManager().registerDisplayListener(displayId -> {
-            if (Build.VERSION.SDK_INT == AndroidVersions.API_34_ANDROID_14) {
-                if (!displayListenerWorks) {
-                    // On the first display listener event, we know it works, we can unregister the fallbacks
-                    displayListenerWorks = true;
-                    unregisterDisplayListenerFallbacks();
-                }
-            }
-            if (this.displayId == displayId) {
-                requestReset();
-            }
-        }, handler);
-    }
-
-    @Override
-    public void prepare() {
-        displayInfo = ServiceManager.getDisplayManager().getDisplayInfo(displayId);
-        if (displayInfo == null) {
-            Ln.e("Display " + displayId + " not found\n" + LogUtils.buildDisplayListMessage());
-            throw new AssertionError("Display " + display + " not found");
-        }
-
-        if ((displayInfo.getFlags() & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {
-            Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");
-        }
-
-        screenInfo = ScreenInfo.computeScreenInfo(displayInfo.getRotation(), displayInfo.getSize(), crop, maxSize, lockVideoOrientation);
+        device.setRotationListener(this);
+        device.setFoldListener(this);
    }

    @Override
    public void start(Surface surface) {
+        ScreenInfo screenInfo = device.getScreenInfo();
+        Rect contentRect = screenInfo.getContentRect();
+
+        // does not include the locked video orientation
+        Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
+        int videoRotation = screenInfo.getVideoRotation();
+        int layerStack = device.getLayerStack();
+
        if (display != null) {
            SurfaceControl.destroyDisplay(display);
            display = null;
@@ -101,32 +48,15 @@ public class ScreenCapture extends SurfaceCapture {
            virtualDisplay = null;
        }

-        Size displaySize = screenInfo.getVideoSize();
-
-        int virtualDisplayId;
-        PositionMapper positionMapper;
        try {
+            Rect videoRect = screenInfo.getVideoSize().toRect();
            virtualDisplay = ServiceManager.getDisplayManager()
-                    .createVirtualDisplay("scrcpy", displaySize.getWidth(), displaySize.getHeight(), displayId, surface);
-            virtualDisplayId = virtualDisplay.getDisplay().getDisplayId();
-            Rect contentRect = new Rect(0, 0, displaySize.getWidth(), displaySize.getHeight());
-            // The position are relative to the virtual display, not the original display
-            positionMapper = new PositionMapper(displaySize, contentRect, 0);
+                    .createVirtualDisplay("scrcpy", videoRect.width(), videoRect.height(), device.getDisplayId(), surface);
            Ln.d("Display: using DisplayManager API");
        } catch (Exception displayManagerException) {
            try {
                display = createDisplay();
-
-                Rect contentRect = screenInfo.getContentRect();
-
-                // does not include the locked video orientation
-                Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
-                int videoRotation = screenInfo.getVideoRotation();
-                int layerStack = displayInfo.getLayerStack();
-
                setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
-                virtualDisplayId = displayId;
-                positionMapper = PositionMapper.from(screenInfo);
                Ln.d("Display: using SurfaceControl API");
            } catch (Exception surfaceControlException) {
                Ln.e("Could not create display using DisplayManager", displayManagerException);
@@ -134,19 +64,12 @@ public class ScreenCapture extends SurfaceCapture {
                throw new AssertionError("Could not create display");
            }
        }
-
-        if (vdListener != null) {
-            vdListener.onNewVirtualDisplay(virtualDisplayId, positionMapper);
-        }
    }

    @Override
    public void release() {
-        if (Build.VERSION.SDK_INT == AndroidVersions.API_34_ANDROID_14) {
-            unregisterDisplayListenerFallbacks();
-        }
-        handlerThread.quitSafely();
-        ServiceManager.getDisplayManager().unregisterDisplayListener(displayListenerHandle);
+        device.setRotationListener(null);
+        device.setFoldListener(null);
        if (display != null) {
            SurfaceControl.destroyDisplay(display);
            display = null;
@@ -159,15 +82,25 @@ public class ScreenCapture extends SurfaceCapture {

    @Override
    public Size getSize() {
-        return screenInfo.getVideoSize();
+        return device.getScreenInfo().getVideoSize();
    }

    @Override
-    public boolean setMaxSize(int newMaxSize) {
-        maxSize = newMaxSize;
+    public boolean setMaxSize(int maxSize) {
+        device.setMaxSize(maxSize);
        return true;
    }

+    @Override
+    public void onFoldChanged(int displayId, boolean folded) {
+        requestReset();
+    }
+
+    @Override
+    public void onRotationChanged(int rotation) {
+        requestReset();
+    }
+
    private static IBinder createDisplay() throws Exception {
        // Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
        // On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
@@ -186,45 +119,4 @@ public class ScreenCapture extends SurfaceCapture {
            SurfaceControl.closeTransaction();
        }
    }
-
-    private void registerDisplayListenerFallbacks() {
-        if (displayId == 0) {
-            rotationWatcher = new IRotationWatcher.Stub() {
-                @Override
-                public void onRotationChanged(int rotation) {
-                    Ln.i("=== rotation");
-                    requestReset();
-                }
-            };
-            ServiceManager.getWindowManager().registerRotationWatcher(rotationWatcher, displayId);
-        }
-
-        // Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10 (but implied by == API_34_ANDROID 14)
-        displayFoldListener = new IDisplayFoldListener.Stub() {
-            @Override
-            public void onDisplayFoldChanged(int displayId, boolean folded) {
-                if (ScreenCapture.this.displayId != displayId) {
-                    // Ignore events related to other display ids
-                    return;
-                }
-
-                requestReset();
-            }
-        };
-        ServiceManager.getWindowManager().registerDisplayFoldListener(displayFoldListener);
-    }
-
-    private void unregisterDisplayListenerFallbacks() {
-        synchronized (this) {
-            if (rotationWatcher != null) {
-                ServiceManager.getWindowManager().unregisterRotationWatcher(rotationWatcher);
-                rotationWatcher = null;
-            }
-            if (displayFoldListener != null) {
-                // Build.VERSION.SDK_INT >= AndroidVersions.API_29_ANDROID_10 (but implied by == API_34_ANDROID 14)
-                ServiceManager.getWindowManager().unregisterDisplayFoldListener(displayFoldListener);
-                displayFoldListener = null;
-            }
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/ScreenInfo.java
@@ -112,7 +112,7 @@ public final class ScreenInfo {
        return rect.width() + ":" + rect.height() + ":" + rect.left + ":" + rect.top;
    }

-    public static Size computeVideoSize(int w, int h, int maxSize) {
+    private static Size computeVideoSize(int w, int h, int maxSize) {
        // Compute the video size and the padding of the content inside this video.
        // Principle:
        // - scale down the great side of the screen to maxSize (if necessary);
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceCapture.java
@@ -1,6 +1,5 @@
 package com.genymobile.scrcpy.video;

-import com.genymobile.scrcpy.device.ConfigurationException;
 import com.genymobile.scrcpy.device.Size;

 import android.view.Surface;
@@ -33,22 +32,15 @@ public abstract class SurfaceCapture {
    }

    /**
-     * Called once before the first capture starts.
+     * Called once before the capture starts.
     */
-    public abstract void init() throws ConfigurationException, IOException;
+    public abstract void init() throws IOException;

    /**
-     * Called after the last capture ends (if and only if {@link #init()} has been called).
+     * Called after the capture ends (if and only if {@link #init()} has been called).
     */
    public abstract void release();

-    /**
-     * Called once before each capture starts, before {@link #getSize()}.
-     */
-    public void prepare() {
-        // empty by default
-    }
-
    /**
     * Start the capture to the target surface.
     *
--- a/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/SurfaceEncoder.java
@@ -68,17 +68,12 @@ public class SurfaceEncoder implements AsyncProcessor {
        capture.init();

        try {
+            streamer.writeVideoHeader(capture.getSize());
+
            boolean alive;
-            boolean headerWritten = false;

            do {
-                capture.prepare();
                Size size = capture.getSize();
-                if (!headerWritten) {
-                    streamer.writeVideoHeader(size);
-                    headerWritten = true;
-                }
-
                format.setInteger(MediaFormat.KEY_WIDTH, size.getWidth());
                format.setInteger(MediaFormat.KEY_HEIGHT, size.getHeight());

--- a/server/src/main/java/com/genymobile/scrcpy/video/VirtualDisplayListener.java
+++ b/server/src/main/java/com/genymobile/scrcpy/video/VirtualDisplayListener.java
@@ -1,7 +0,0 @@
-package com.genymobile.scrcpy.video;
-
-import com.genymobile.scrcpy.control.PositionMapper;
-
-public interface VirtualDisplayListener {
-    void onNewVirtualDisplay(int displayId, PositionMapper positionMapper);
-}
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java
@@ -118,12 +118,8 @@ public final class ActivityManager {
        return startActivityAsUserMethod;
    }

-    public int startActivity(Intent intent) {
-        return startActivity(intent, null);
-    }
-
    @SuppressWarnings("ConstantConditions")
-    public int startActivity(Intent intent, Bundle options) {
+    public int startActivity(Intent intent) {
        try {
            Method method = getStartActivityAsUserMethod();
            return (int) method.invoke(
@@ -137,7 +133,7 @@ public final class ActivityManager {
                    /* requestCode */ 0,
                    /* startFlags */ 0,
                    /* profilerInfo */ null,
-                    /* bOptions */ options,
+                    /* bOptions */ null,
                    /* userId */ /* UserHandle.USER_CURRENT */ -2);
        } catch (Throwable e) {
            Ln.e("Could not invoke method", e);
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java
@@ -1,48 +1,22 @@
 package com.genymobile.scrcpy.wrappers;

-import com.genymobile.scrcpy.FakeContext;
 import com.genymobile.scrcpy.device.DisplayInfo;
 import com.genymobile.scrcpy.device.Size;
 import com.genymobile.scrcpy.util.Command;
 import com.genymobile.scrcpy.util.Ln;

 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.hardware.display.VirtualDisplay;
-import android.os.Handler;
 import android.view.Display;
 import android.view.Surface;

-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

@SuppressLint("PrivateApi,DiscouragedPrivateApi")
 public final class DisplayManager {
-
-    // android.hardware.display.DisplayManager.EVENT_FLAG_DISPLAY_CHANGED
-    public static final long EVENT_FLAG_DISPLAY_CHANGED = 1L << 2;
-
-    public interface DisplayListener {
-        /**
-         * Called whenever the properties of a logical {@link android.view.Display},
-         * such as size and density, have changed.
-         *
-         * @param displayId The id of the logical display that changed.
-         */
-        void onDisplayChanged(int displayId);
-    }
-
-    public static final class DisplayListenerHandle {
-        private final Object displayListenerProxy;
-        private DisplayListenerHandle(Object displayListenerProxy) {
-            this.displayListenerProxy = displayListenerProxy;
-        }
-    }
-
    private final Object manager; // instance of hidden class android.hardware.display.DisplayManagerGlobal
    private Method createVirtualDisplayMethod;

@@ -65,7 +39,7 @@ public final class DisplayManager {
    public static DisplayInfo parseDisplayInfo(String dumpsysDisplayOutput, int displayId) {
        Pattern regex = Pattern.compile(
                "^    mOverrideDisplayInfo=DisplayInfo\\{\".*?, displayId " + displayId + ".*?(, FLAG_.*)?, real ([0-9]+) x ([0-9]+).*?, "
-                        + "rotation ([0-9]+).*?, density ([0-9]+).*?, layerStack ([0-9]+)",
+                        + "rotation ([0-9]+).*?, layerStack ([0-9]+)",
                Pattern.MULTILINE);
        Matcher m = regex.matcher(dumpsysDisplayOutput);
        if (!m.find()) {
@@ -75,10 +49,9 @@ public final class DisplayManager {
        int width = Integer.parseInt(m.group(2));
        int height = Integer.parseInt(m.group(3));
        int rotation = Integer.parseInt(m.group(4));
-        int density = Integer.parseInt(m.group(5));
-        int layerStack = Integer.parseInt(m.group(6));
+        int layerStack = Integer.parseInt(m.group(5));

-        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags, density);
+        return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
    }

    private static DisplayInfo getDisplayInfoFromDumpsysDisplay(int displayId) {
@@ -125,8 +98,7 @@ public final class DisplayManager {
            int rotation = cls.getDeclaredField("rotation").getInt(displayInfo);
            int layerStack = cls.getDeclaredField("layerStack").getInt(displayInfo);
            int flags = cls.getDeclaredField("flags").getInt(displayInfo);
-            int dpi = cls.getDeclaredField("logicalDensityDpi").getInt(displayInfo);
-            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags, dpi);
+            return new DisplayInfo(displayId, new Size(width, height), rotation, layerStack, flags);
        } catch (ReflectiveOperationException e) {
            throw new AssertionError(e);
        }
@@ -152,58 +124,4 @@ public final class DisplayManager {
        Method method = getCreateVirtualDisplayMethod();
        return (VirtualDisplay) method.invoke(null, name, width, height, displayIdToMirror, surface);
    }
-
-    public VirtualDisplay createNewVirtualDisplay(String name, int width, int height, int dpi, Surface surface, int flags) throws Exception {
-        Constructor<android.hardware.display.DisplayManager> ctor = android.hardware.display.DisplayManager.class.getDeclaredConstructor(
-                Context.class);
-        ctor.setAccessible(true);
-        android.hardware.display.DisplayManager dm = ctor.newInstance(FakeContext.get());
-        return dm.createVirtualDisplay(name, width, height, dpi, surface, flags);
-    }
-
-    public DisplayListenerHandle registerDisplayListener(DisplayListener listener, Handler handler) {
-        try {
-            Class<?> displayListenerClass = Class.forName("android.hardware.display.DisplayManager$DisplayListener");
-            Object displayListenerProxy = Proxy.newProxyInstance(
-                    ClassLoader.getSystemClassLoader(),
-                    new Class[] {displayListenerClass},
-                    (proxy, method, args) -> {
-                        if ("onDisplayChanged".equals(method.getName())) {
-                            listener.onDisplayChanged((int) args[0]);
-                        }
-                        return null;
-                    });
-            try {
-                manager.getClass()
-                        .getMethod("registerDisplayListener", displayListenerClass, Handler.class, long.class, String.class)
-                        .invoke(manager, displayListenerProxy, handler, EVENT_FLAG_DISPLAY_CHANGED, FakeContext.PACKAGE_NAME);
-            } catch (NoSuchMethodException e) {
-                try {
-                    manager.getClass()
-                            .getMethod("registerDisplayListener", displayListenerClass, Handler.class, long.class)
-                            .invoke(manager, displayListenerProxy, handler, EVENT_FLAG_DISPLAY_CHANGED);
-                } catch (NoSuchMethodException e2) {
-                    manager.getClass()
-                            .getMethod("registerDisplayListener", displayListenerClass, Handler.class)
-                            .invoke(manager, displayListenerProxy, handler);
-                }
-            }
-
-            return new DisplayListenerHandle(displayListenerProxy);
-        } catch (Exception e) {
-            // Rotation and screen size won't be updated, not a fatal error
-            Ln.e("Could not register display listener", e);
-        }
-
-        return null;
-    }
-
-    public void unregisterDisplayListener(DisplayListenerHandle listener) {
-        try {
-            Class<?> displayListenerClass = Class.forName("android.hardware.display.DisplayManager$DisplayListener");
-            manager.getClass().getMethod("unregisterDisplayListener", displayListenerClass).invoke(manager, listener.displayListenerProxy);
-        } catch (Exception e) {
-            Ln.e("Could not unregister display listener", e);
-        }
-    }
 }
--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java
@@ -201,29 +201,13 @@ public final class WindowManager {
        }
    }

-    public void unregisterRotationWatcher(IRotationWatcher rotationWatcher) {
-        try {
-            manager.getClass().getMethod("removeRotationWatcher", IRotationWatcher.class).invoke(manager, rotationWatcher);
-        } catch (Exception e) {
-            Ln.e("Could not unregister rotation watcher", e);
-        }
-    }
-
    @TargetApi(AndroidVersions.API_29_ANDROID_10)
    public void registerDisplayFoldListener(IDisplayFoldListener foldListener) {
        try {
-            manager.getClass().getMethod("registerDisplayFoldListener", IDisplayFoldListener.class).invoke(manager, foldListener);
+            Class<?> cls = manager.getClass();
+            cls.getMethod("registerDisplayFoldListener", IDisplayFoldListener.class).invoke(manager, foldListener);
        } catch (Exception e) {
            Ln.e("Could not register display fold listener", e);
        }
    }
-
-    @TargetApi(AndroidVersions.API_29_ANDROID_10)
-    public void unregisterDisplayFoldListener(IDisplayFoldListener foldListener) {
-        try {
-            manager.getClass().getMethod("unregisterDisplayFoldListener", IDisplayFoldListener.class).invoke(manager, foldListener);
-        } catch (Exception e) {
-            Ln.e("Could not unregister display fold listener", e);
-        }
-    }
 }
--- a/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
+++ b/server/src/test/java/com/genymobile/scrcpy/control/ControlMessageReaderTest.java
@@ -399,27 +399,6 @@ public class ControlMessageReaderTest {
        Assert.assertEquals(-1, bis.read()); // EOS
    }

-    @Test
-    public void testParseStartApp() throws IOException {
-        byte[] name = "firefox".getBytes(StandardCharsets.UTF_8);
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(bos);
-        dos.writeByte(ControlMessage.TYPE_START_APP);
-        dos.writeByte(name.length);
-        dos.write(name);
-        byte[] packet = bos.toByteArray();
-
-        ByteArrayInputStream bis = new ByteArrayInputStream(packet);
-        ControlMessageReader reader = new ControlMessageReader(bis);
-
-        ControlMessage event = reader.read();
-        Assert.assertEquals(ControlMessage.TYPE_START_APP, event.getType());
-        Assert.assertEquals("firefox", event.getText());
-
-        Assert.assertEquals(-1, bis.read()); // EOS
-    }
-
    @Test
    public void testMultiEvents() throws IOException {
        ByteArrayOutputStream bos = new ByteArrayOutputStream();
Author	SHA1	Message	Date
Romain Vimont	a5844e198e	Add GitHub Actions release workflow Fixes #4490 <https://github.com/Genymobile/scrcpy/issues/4490> PR #5306 <https://github.com/Genymobile/scrcpy/pull/5306>	2024-10-27 20:31:24 +01:00
Romain Vimont	2687d20280	Rework release.mk for CI Make it possible to build scrcpy-server and Windows binaries in parallel from different GitHub Actions workflows, and to package everything as a final step. PR #5306 <https://github.com/Genymobile/scrcpy/pull/5306>	2024-10-27 20:29:13 +01:00
Romain Vimont	9c0a328498	Build server without meson in release.mk This avoids to install meson/ninja to build scrcpy-server on the CI. PR #5306 <https://github.com/Genymobile/scrcpy/pull/5306>	2024-10-27 20:26:38 +01:00
Romain Vimont	02ef3d57ce	Split client and server tests in release.mk This will allow to run server tests separately on the CI. PR #5306 <https://github.com/Genymobile/scrcpy/pull/5306>	2024-10-27 20:26:26 +01:00
Romain Vimont	538a32a539	Fix .PHONY in release.mk The prepare-deps recipe does not exist anymore. It has been split into prepare-deps-win32 and prepare-deps-win64. PR #5306 <https://github.com/Genymobile/scrcpy/pull/5306>	2024-10-27 20:26:13 +01:00
Romain Vimont	9578aae34e	Use explicit constant for @TargetApi	2024-10-22 19:47:56 +02:00