Update README and FAQ for the new Windows releases

Document how to generate a Windows release from Linux.

It solves the "no output" issue on Windows, so update the FAQ.

Makefile.CrossWindows

@@ -38,8 +38,7 @@ release: clean zip-win32 zip-win64 sums
 
 clean:
 	$(GRADLE) clean
-	rm -rf "$(SERVER_BUILD_DIR)" "$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)" \
-		   "$(WIN32_NOCONSOLE_BUILD_DIR)" "$(WIN64_NOCONSOLE_BUILD_DIR)" "$(DIST)"
+	rm -rf "$(SERVER_BUILD_DIR)" "$(WIN32_BUILD_DIR)" "$(WIN64_BUILD_DIR)" "$(DIST)"
 
 build-server:
 	[ -d "$(SERVER_BUILD_DIR)" ] || ( mkdir "$(SERVER_BUILD_DIR)" && \
@@ -55,7 +54,6 @@ build-win32: prepare-deps-win32
 		meson "$(WIN32_BUILD_DIR)" \
 			--cross-file cross_win32.txt \
 			--buildtype release --strip -Db_lto=true \
-			-Dcrossbuild_windows=true \
 			-Dbuild_server=false \
 			-Doverride_server_path=scrcpy-server.jar )
 	ninja -C "$(WIN32_BUILD_DIR)"
@@ -65,7 +63,6 @@ build-win32-noconsole: prepare-deps-win32
 		meson "$(WIN32_NOCONSOLE_BUILD_DIR)" \
 			--cross-file cross_win32.txt \
 			--buildtype release --strip -Db_lto=true \
-			-Dcrossbuild_windows=true \
 			-Dbuild_server=false \
 			-Dwindows_noconsole=true \
 			-Doverride_server_path=scrcpy-server.jar )
@@ -79,7 +76,6 @@ build-win64: prepare-deps-win64
 		meson "$(WIN64_BUILD_DIR)" \
 			--cross-file cross_win64.txt \
 			--buildtype release --strip -Db_lto=true \
-			-Dcrossbuild_windows=true \
 			-Dbuild_server=false \
 			-Doverride_server_path=scrcpy-server.jar )
 	ninja -C "$(WIN64_BUILD_DIR)"
@@ -89,7 +85,6 @@ build-win64-noconsole: prepare-deps-win64
 		meson "$(WIN64_NOCONSOLE_BUILD_DIR)" \
 			--cross-file cross_win64.txt \
 			--buildtype release --strip -Db_lto=true \
-			-Dcrossbuild_windows=true \
 			-Dbuild_server=false \
 			-Dwindows_noconsole=true \
 			-Doverride_server_path=scrcpy-server.jar )
@@ -133,4 +128,4 @@ zip-win64: dist-win64
 
 sums:
 	cd "$(DIST)"; \
-		sha256sum *.zip > SHA256SUMS.txt
+		sha256sum *.zip > SHA256SUM.txt

README.md

@@ -1,8 +1,8 @@
-# scrcpy (v1.2)
+# scrcpy
 
 This application provides display and control of Android devices connected on
-USB (or [over TCP/IP][article-tcpip]). It does not require any _root_ access.
-It works on _GNU/Linux_, _Windows_ and _MacOS_.
+USB. It does not require any _root_ access. It works on _GNU/Linux_, _Windows_
+and _MacOS_.
 
 ![screenshot](assets/screenshot-debian-600.jpg)
 
@@ -14,12 +14,16 @@ The Android part requires at least API 21 (Android 5.0).
 You need [adb]. It is available in the [Android SDK platform
 tools][platform-tools], or packaged in your distribution (`android-adb-tools`).
 
-On Windows, just [download scrcpy for Windows](#windows), `adb` is included.
+On Windows, if you use the [prebuilt application](#windows), it is already
+included. Otherwise, just download the [platform-tools][platform-tools-windows]
+and extract the following files to a directory accessible from your `PATH`:
+ - `adb.exe`
+ - `AdbWinApi.dll`
+ - `AdbWinUsbApi.dll`
 
 Make sure you [enabled adb debugging][enable-adb] on your device(s).
 
-The client requires [FFmpeg] and [LibSDL2]. On Windows, they are included in the
-[prebuilt application](#windows).
+The client requires [FFmpeg] and [LibSDL2].
 
 [adb]: https://developer.android.com/studio/command-line/adb.html
 [enable-adb]: https://developer.android.com/studio/command-line/adb.html#Enabling
@@ -76,25 +80,18 @@ Two [AUR] packages have been created by users:
 
 #### Windows
 
-For Windows, for simplicity, prebuilt archives with all the dependencies
-(including `adb`) are available:
+For Windows, for simplicity, a prebuilt archive with all the dependencies
+(including `adb`) is available:
 
- - [`scrcpy-win32-v1.2.zip`][direct-win32].  
-   _(SHA-256: a1fe1de67ec75dcf970ca5d97a04c26ff0f2d61871f2ef51b6f2f0bf666966b2)_
- - [`scrcpy-win64-v1.2.zip`][direct-win64].  
-   _(SHA-256: 35ae3bcee51771e7c51b8a8be87aef2295c9f267606a7cf83ebb0a4d583ef536)_
+ - [`scrcpy-windows-with-deps-v1.1.zip`][direct-windows-with-deps].  
+   _(SHA-256: 27eb36c15937601d1062c1dc0b45faae0e06fefea2019aadeb4fa7f76a07bb4c)_
 
-[direct-win32]: https://github.com/Genymobile/scrcpy/releases/download/v1.2/scrcpy-win32-v1.2.zip
-[direct-win64]: https://github.com/Genymobile/scrcpy/releases/download/v1.2/scrcpy-win64-v1.2.zip
+[direct-windows-with-deps]: https://github.com/Genymobile/scrcpy/releases/download/v1.1/scrcpy-windows-with-deps-v1.1.zip
+
+_(It's just a portable version including _dll_ copied from MSYS2.)_
 
 Instead, you may want to build it manually.
 
-In that case, download the [platform-tools][platform-tools-windows] and extract
-the following files to a directory accessible from your `PATH`:
- - `adb.exe`
- - `AdbWinApi.dll`
- - `AdbWinUsbApi.dll`
-
 ##### Cross-compile from Linux
 
 This is the preferred method (and the way the release is built).
@@ -247,10 +244,10 @@ Since the server binary, that will be pushed to the Android device, does not
 depend on your system and architecture, you may want to use the prebuilt binary
 instead:
 
- - [`scrcpy-server-v1.2.jar`][direct-scrcpy-server].  
-   _(SHA-256: cb39654ed2fda3d30ddff292806950ccc5c394375ea12b974f790c7f38f61f60)_
+ - [`scrcpy-server-v1.1.jar`][direct-scrcpy-server].  
+   _(SHA-256: 14826512bf38447ec94adf3b531676ce038d19e7e06757fb4e537882b17e77b3)_
 
-[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.2/scrcpy-server-v1.2.jar
+[direct-scrcpy-server]: https://github.com/Genymobile/scrcpy/releases/download/v1.1/scrcpy-server-v1.1.jar
 
 In that case, the build does not require Java or the Android SDK.
 
@@ -332,7 +329,6 @@ To run without installing:
  | turn screen on                         | _Right-click²_                |
  | paste computer clipboard to device     | `Ctrl`+`v`                    |
  | enable/disable FPS counter (on stdout) | `Ctrl`+`i`                    |
- | install APK from computer              | drag & drop APK file          |
 
 _¹Double-click on black borders to remove them._  
 _²Right-click turns the screen on if it was off, presses BACK otherwise._
@@ -378,8 +374,5 @@ Read the [developers page].
 
 ## Articles
 
-- [Introducing scrcpy][article-intro]
-- [Scrcpy now works wirelessly][article-tcpip]
-
-[article-intro]: https://blog.rom1v.com/2018/03/introducing-scrcpy/
-[article-tcpip]: https://www.genymotion.com/blog/open-source-project-scrcpy-now-works-wirelessly/
+- [Introducing scrcpy](https://blog.rom1v.com/2018/03/introducing-scrcpy/)
+- [Scrcpy now works wirelessly](https://www.genymotion.com/blog/open-source-project-scrcpy-now-works-wirelessly/)

app/meson.build

@@ -9,7 +9,6 @@ src = [
     'src/fpscounter.c',
     'src/frames.c',
     'src/inputmanager.c',
-    'src/installer.c',
     'src/lockutil.c',
     'src/net.c',
     'src/scrcpy.c',
@@ -19,7 +18,7 @@ src = [
     'src/tinyxpm.c',
 ]
 
-if not get_option('crossbuild_windows')
+if not meson.is_cross_build()
 
     # native build
     dependencies = [
@@ -85,7 +84,7 @@ conf = configuration_data()
 conf.set('BUILD_DEBUG', get_option('buildtype') == 'debug')
 
 # the version, updated on release
-conf.set_quoted('SCRCPY_VERSION', '1.2')
+conf.set_quoted('SCRCPY_VERSION', '1.1')
 
 # the prefix used during configuration (meson --prefix=PREFIX)
 conf.set_quoted('PREFIX', get_option('prefix'))
@@ -126,9 +125,6 @@ conf.set('SKIP_FRAMES', get_option('skip_frames'))
 # enable High DPI support
 conf.set('HIDPI_SUPPORT', get_option('hidpi_support'))
 
-# disable console on Windows
-conf.set('WINDOWS_NOCONSOLE', get_option('windows_noconsole'))
-
 configure_file(configuration: conf, output: 'config.h')
 
 src_dir = include_directories('src')

app/src/command.c

@@ -72,21 +72,6 @@ process_t adb_push(const char *serial, const char *local, const char *remote) {
     return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd));
 }
 
-process_t adb_install(const char *serial, const char *local) {
-#ifdef __WINDOWS__
-    // Windows will parse the string, so the local name must be quoted (see sys/win/command.c)
-    size_t len = strlen(local);
-    char quoted[len + 3];
-    memcpy(&quoted[1], local, len);
-    quoted[0] = '"';
-    quoted[len + 1] = '"';
-    quoted[len + 2] = '\0';
-    local = quoted;
-#endif
-    const char *const adb_cmd[] = {"install", "-r", local};
-    return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd));
-}
-
 process_t adb_remove_path(const char *serial, const char *path) {
     const char *const adb_cmd[] = {"shell", "rm", path};
     return adb_execute(serial, adb_cmd, ARRAY_LEN(adb_cmd));

app/src/command.h

@@ -42,7 +42,6 @@ process_t adb_forward_remove(const char *serial, uint16_t local_port);
 process_t adb_reverse(const char *serial, const char *device_socket_name, uint16_t local_port);
 process_t adb_reverse_remove(const char *serial, const char *device_socket_name);
 process_t adb_push(const char *serial, const char *local, const char *remote);
-process_t adb_install(const char *serial, const char *local);
 process_t adb_remove_path(const char *serial, const char *path);
 
 // convenience function to wait for a successful process execution

app/src/inputmanager.c

@@ -29,58 +29,52 @@ static struct point get_mouse_point(struct screen *screen) {
     };
 }
 
-static const int ACTION_DOWN = 1;
-static const int ACTION_UP = 1 << 1;
-
-static void send_keycode(struct controller *controller, enum android_keycode keycode, int actions, const char *name) {
+static void send_keycode(struct controller *controller, enum android_keycode keycode, const char *name) {
     // send DOWN event
     struct control_event control_event;
     control_event.type = CONTROL_EVENT_TYPE_KEYCODE;
+    control_event.keycode_event.action = AKEY_EVENT_ACTION_DOWN;
     control_event.keycode_event.keycode = keycode;
     control_event.keycode_event.metastate = 0;
 
-    if (actions & ACTION_DOWN) {
-        control_event.keycode_event.action = AKEY_EVENT_ACTION_DOWN;
-        if (!controller_push_event(controller, &control_event)) {
-            LOGW("Cannot send %s (DOWN)", name);
-            return;
-        }
+    if (!controller_push_event(controller, &control_event)) {
+        LOGW("Cannot send %s (DOWN)", name);
+        return;
     }
 
-    if (actions & ACTION_UP) {
-        control_event.keycode_event.action = AKEY_EVENT_ACTION_UP;
-        if (!controller_push_event(controller, &control_event)) {
-            LOGW("Cannot send %s (UP)", name);
-        }
+    // send UP event
+    control_event.keycode_event.action = AKEY_EVENT_ACTION_UP;
+    if (!controller_push_event(controller, &control_event)) {
+        LOGW("Cannot send %s (UP)", name);
     }
 }
 
-static inline void action_home(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_HOME, actions, "HOME");
+static inline void action_home(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_HOME, "HOME");
 }
 
-static inline void action_back(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_BACK, actions, "BACK");
+static inline void action_back(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_BACK, "BACK");
 }
 
-static inline void action_app_switch(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_APP_SWITCH, actions, "APP_SWITCH");
+static inline void action_app_switch(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_APP_SWITCH, "APP_SWITCH");
 }
 
-static inline void action_power(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_POWER, actions, "POWER");
+static inline void action_power(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_POWER, "POWER");
 }
 
-static inline void action_volume_up(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_VOLUME_UP, actions, "VOLUME_UP");
+static inline void action_volume_up(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_VOLUME_UP, "VOLUME_UP");
 }
 
-static inline void action_volume_down(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_VOLUME_DOWN, actions, "VOLUME_DOWN");
+static inline void action_volume_down(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_VOLUME_DOWN, "VOLUME_DOWN");
 }
 
-static inline void action_menu(struct controller *controller, int actions) {
-    send_keycode(controller, AKEYCODE_MENU, actions, "MENU");
+static inline void action_menu(struct controller *controller) {
+    send_keycode(controller, AKEYCODE_MENU, "MENU");
 }
 
 // turn the screen on if it was off, press BACK otherwise
@@ -147,74 +141,57 @@ void input_manager_process_key(struct input_manager *input_manager,
 
     // capture all Ctrl events
     if (ctrl) {
+        SDL_bool repeat = event->repeat;
+
+        // only consider keydown events, and ignore repeated events
+        if (repeat || event->type != SDL_KEYDOWN) {
+            return;
+        }
+
         SDL_bool shift = event->keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT);
         if (shift) {
-            // currently, there is no shortcut involving SHIFT
+            // currently, there is no shortcut implying SHIFT
             return;
         }
 
         SDL_Keycode keycode = event->keysym.sym;
-        int action = event->type == SDL_KEYDOWN ? ACTION_DOWN : ACTION_UP;
-        SDL_bool repeat = event->repeat;
         switch (keycode) {
             case SDLK_h:
-                if (!repeat) {
-                    action_home(input_manager->controller, action);
-                }
+                action_home(input_manager->controller);
                 return;
             case SDLK_b: // fall-through
             case SDLK_BACKSPACE:
-                if (!repeat) {
-                    action_back(input_manager->controller, action);
-                }
+                action_back(input_manager->controller);
                 return;
             case SDLK_s:
-                if (!repeat) {
-                    action_app_switch(input_manager->controller, action);
-                }
+                action_app_switch(input_manager->controller);
                 return;
             case SDLK_m:
-                if (!repeat) {
-                    action_menu(input_manager->controller, action);
-                }
+                action_menu(input_manager->controller);
                 return;
             case SDLK_p:
-                if (!repeat) {
-                    action_power(input_manager->controller, action);
-                }
+                action_power(input_manager->controller);
                 return;
             case SDLK_DOWN:
-                // forward repeated events
-                action_volume_down(input_manager->controller, action);
+                action_volume_down(input_manager->controller);
                 return;
             case SDLK_UP:
-                // forward repeated events
-                action_volume_up(input_manager->controller, action);
+                action_volume_up(input_manager->controller);
                 return;
             case SDLK_v:
-                if (!repeat && event->type == SDL_KEYDOWN) {
-                    clipboard_paste(input_manager->controller);
-                }
+                clipboard_paste(input_manager->controller);
                 return;
             case SDLK_f:
-                if (!repeat && event->type == SDL_KEYDOWN) {
-                    screen_switch_fullscreen(input_manager->screen);
-                }
+                screen_switch_fullscreen(input_manager->screen);
                 return;
             case SDLK_x:
-                if (!repeat && event->type == SDL_KEYDOWN) {
-                    screen_resize_to_fit(input_manager->screen);
-                }
+                screen_resize_to_fit(input_manager->screen);
                 return;
             case SDLK_g:
-                if (!repeat && event->type == SDL_KEYDOWN) {
-                    screen_resize_to_pixel_perfect(input_manager->screen);
-                }
+                screen_resize_to_pixel_perfect(input_manager->screen);
                 return;
             case SDLK_i:
-                if (!repeat && event->type == SDL_KEYDOWN) {
-                    switch_fps_counter_state(input_manager->frames);
-                }
+                switch_fps_counter_state(input_manager->frames);
                 return;
         }
 
@@ -251,7 +228,7 @@ void input_manager_process_mouse_button(struct input_manager *input_manager,
             return;
         }
         if (event->button == SDL_BUTTON_MIDDLE) {
-            action_home(input_manager->controller, ACTION_DOWN | ACTION_UP);
+            action_home(input_manager->controller);
             return;
         }
         // double-click on black borders resize to fit the device screen

app/src/installer.c

@@ -1,180 +0,0 @@
-#include "installer.h"
-
-#include <string.h>
-#include "command.h"
-#include "lockutil.h"
-#include "log.h"
-
-// NOTE(adopi) this can be more generic:
-// it could be used with a command queue instead of a filename queue
-// then we would have a generic invoker (useful if we want to handle more async commands)
-
-SDL_bool apk_queue_is_empty(const struct apk_queue *queue) {
-    return queue->head == queue->tail;
-}
-
-SDL_bool apk_queue_is_full(const struct apk_queue *queue) {
-    return (queue->head + 1) % APK_QUEUE_SIZE == queue->tail;
-}
-
-SDL_bool apk_queue_init(struct apk_queue *queue) {
-    queue->head = 0;
-    queue->tail = 0;
-    return SDL_TRUE;
-}
-
-void apk_queue_destroy(struct apk_queue *queue) {
-    int i = queue->tail;
-    while (i != queue->head) {
-        SDL_free(queue->data[i]);
-        i = (i + 1) % APK_QUEUE_SIZE;
-    }
-}
-
-SDL_bool apk_queue_push(struct apk_queue *queue, const char *apk) {
-    if (apk_queue_is_full(queue)) {
-        return SDL_FALSE;
-    }
-    queue->data[queue->head] = SDL_strdup(apk);
-    queue->head = (queue->head + 1) % APK_QUEUE_SIZE;
-    return SDL_TRUE;
-}
-
-SDL_bool apk_queue_take(struct apk_queue *queue, char **apk) {
-    if (apk_queue_is_empty(queue)) {
-        return SDL_FALSE;
-    }
-    // transfer ownership
-    *apk = queue->data[queue->tail];
-    queue->tail = (queue->tail + 1) % APK_QUEUE_SIZE;
-    return SDL_TRUE;
-}
-
-SDL_bool installer_init(struct installer *installer, const char *serial) {
-
-    if (!apk_queue_init(&installer->queue)) {
-        return SDL_FALSE;
-    }
-
-    if (!(installer->mutex = SDL_CreateMutex())) {
-        return SDL_FALSE;
-    }
-
-    if (!(installer->event_cond = SDL_CreateCond())) {
-        SDL_DestroyMutex(installer->mutex);
-        return SDL_FALSE;
-    }
-
-    if (serial) {
-        installer->serial = SDL_strdup(serial);
-        if (!installer->serial) {
-            LOGW("Cannot strdup serial");
-            return SDL_FALSE;
-        }
-    } else {
-        installer->serial = NULL;
-    }
-
-    // lazy initialization
-    installer->initialized = SDL_FALSE;
-
-    installer->stopped = SDL_FALSE;
-    installer->current_process = PROCESS_NONE;
-
-    return SDL_TRUE;
-}
-
-void installer_destroy(struct installer *installer) {
-    SDL_DestroyCond(installer->event_cond);
-    SDL_DestroyMutex(installer->mutex);
-    apk_queue_destroy(&installer->queue);
-    SDL_free((void *) installer->serial);
-}
-
-SDL_bool installer_install_apk(struct installer *installer, const char *apk) {
-    SDL_bool res;
-
-    // start installer if it's used for the first time
-    if (!installer->initialized) {
-        if (!installer_start(installer)) {
-            return SDL_FALSE;
-        }
-        installer->initialized = SDL_TRUE;
-    }
-
-    mutex_lock(installer->mutex);
-    SDL_bool was_empty = apk_queue_is_empty(&installer->queue);
-    res = apk_queue_push(&installer->queue, apk);
-    if (was_empty) {
-        cond_signal(installer->event_cond);
-    }
-    mutex_unlock(installer->mutex);
-    return res;
-}
-
-static int run_installer(void *data) {
-    struct installer *installer = data;
-
-    for (;;) {
-        mutex_lock(installer->mutex);
-        while (!installer->stopped && apk_queue_is_empty(&installer->queue)) {
-            cond_wait(installer->event_cond, installer->mutex);
-        }
-        if (installer->stopped) {
-            // stop immediately, do not process further events
-            mutex_unlock(installer->mutex);
-            break;
-        }
-        char *current_apk;
-#ifdef BUILD_DEBUG
-        bool non_empty = apk_queue_take(&installer->queue, &current_apk);
-        SDL_assert(non_empty);
-#else
-        apk_queue_take(&installer->queue, &current_apk);
-#endif
-
-        LOGI("Installing %s...", current_apk);
-        process_t process = adb_install(installer->serial, current_apk);
-        installer->current_process = process;
-
-        mutex_unlock(installer->mutex);
-
-        if (process_check_success(process, "adb install")) {
-            LOGI("%s installed successfully", current_apk);
-        } else {
-            LOGE("Failed to install %s", current_apk);
-        }
-        SDL_free(current_apk);
-    }
-    return 0;
-}
-
-SDL_bool installer_start(struct installer *installer) {
-    LOGD("Starting installer thread");
-
-    installer->thread = SDL_CreateThread(run_installer, "installer", installer);
-    if (!installer->thread) {
-        LOGC("Could not start installer thread");
-        return SDL_FALSE;
-    }
-
-    return SDL_TRUE;
-}
-
-void installer_stop(struct installer *installer) {
-    mutex_lock(installer->mutex);
-    installer->stopped = SDL_TRUE;
-    cond_signal(installer->event_cond);
-    if (installer->current_process != PROCESS_NONE) {
-        if (!cmd_terminate(installer->current_process)) {
-            LOGW("Cannot terminate install process");
-        }
-        cmd_simple_wait(installer->current_process, NULL);
-        installer->current_process = PROCESS_NONE;
-    }
-    mutex_unlock(installer->mutex);
-}
-
-void installer_join(struct installer *installer) {
-    SDL_WaitThread(installer->thread, NULL);
-}

app/src/installer.h

@@ -1,40 +0,0 @@
-#ifndef APK_INSTALLER_H
-#define APK_INSTALLER_H
-
-#include <SDL2/SDL_mutex.h>
-#include <SDL2/SDL_stdinc.h>
-#include <SDL2/SDL_thread.h>
-#include "command.h"
-
-#define APK_QUEUE_SIZE 16
-
-// NOTE(AdoPi) apk_queue and control_event can use a generic queue
-
-struct apk_queue {
-    char *data[APK_QUEUE_SIZE];
-    int tail;
-    int head;
-};
-
-struct installer {
-    const char *serial;
-    SDL_Thread *thread;
-    SDL_mutex *mutex;
-    SDL_cond *event_cond;
-    SDL_bool stopped;
-    SDL_bool initialized;
-    process_t current_process;
-    struct apk_queue queue;
-};
-
-SDL_bool installer_init(struct installer *installer, const char *serial);
-void installer_destroy(struct installer *installer);
-
-SDL_bool installer_start(struct installer *installer);
-void installer_stop(struct installer *installer);
-void installer_join(struct installer *installer);
-
-// install an apk
-SDL_bool installer_install_apk(struct installer *installer, const char *filename);
-
-#endif

app/src/main.c

@@ -98,9 +98,6 @@ static void usage(const char *arg0) {
         "\n"
         "    Ctrl+i\n"
         "        enable/disable FPS counter (print frames/second in logs)\n"
-        "\n"
-        "    Drag & drop APK file\n"
-        "        install APK from computer\n"
         "\n",
         arg0,
         DEFAULT_BIT_RATE,

app/src/scrcpy.c

@@ -22,14 +22,12 @@
 #include "screen.h"
 #include "server.h"
 #include "tinyxpm.h"
-#include "installer.h"
 
 static struct server server = SERVER_INITIALIZER;
 static struct screen screen = SCREEN_INITIALIZER;
 static struct frames frames;
 static struct decoder decoder;
 static struct controller controller;
-static struct installer installer;
 
 static struct input_manager input_manager = {
     .controller = &controller,
@@ -104,9 +102,6 @@ static void event_loop(void) {
             case SDL_MOUSEBUTTONUP:
                 input_manager_process_mouse_button(&input_manager, &event.button);
                 break;
-            case SDL_DROPFILE:
-                installer_install_apk(&installer, event.drop.file);
-                break;
         }
     }
 }
@@ -130,7 +125,7 @@ SDL_bool scrcpy(const struct scrcpy_options *options) {
         return SDL_FALSE;
     }
 
-    process_t proc_show_touches = PROCESS_NONE;
+    process_t proc_show_touches = NULL;
     SDL_bool show_touches_waited;
     if (options->show_touches) {
         LOGI("Enable show_touches");
@@ -174,12 +169,6 @@ SDL_bool scrcpy(const struct scrcpy_options *options) {
         goto finally_destroy_server;
     }
 
-    if (!installer_init(&installer, server.serial)) {
-        ret = SDL_FALSE;
-        server_stop(&server);
-        goto finally_destroy_frames;
-    }
-
     decoder_init(&decoder, &frames, device_socket);
 
     // now we consumed the header values, the socket receives the video stream
@@ -187,7 +176,7 @@ SDL_bool scrcpy(const struct scrcpy_options *options) {
     if (!decoder_start(&decoder)) {
         ret = SDL_FALSE;
         server_stop(&server);
-        goto finally_destroy_installer;
+        goto finally_destroy_frames;
     }
 
     if (!controller_init(&controller, device_socket)) {
@@ -225,10 +214,6 @@ finally_stop_decoder:
     // stop the server before decoder_join() to wake up the decoder
     server_stop(&server);
     decoder_join(&decoder);
-finally_destroy_installer:
-    installer_stop(&installer);
-    installer_join(&installer);
-    installer_destroy(&installer);
 finally_destroy_frames:
     frames_destroy(&frames);
 finally_destroy_server:

app/src/sys/unix/command.c

@@ -1,11 +1,9 @@
 #include "command.h"
 
 #include <signal.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include "log.h"
 
 pid_t cmd_execute(const char *path, const char *const argv[]) {
     pid_t pid = fork();
@@ -22,10 +20,6 @@ pid_t cmd_execute(const char *path, const char *const argv[]) {
 }
 
 SDL_bool cmd_terminate(pid_t pid) {
-    if (pid <= 0) {
-        LOGC("Requested to kill %d, this is an error. Please report the bug.\n", (int) pid);
-        abort();
-    }
     return kill(pid, SIGTERM) != -1;
 }
 

app/src/sys/win/command.c

@@ -1,6 +1,5 @@
 #include "command.h"
 
-#include "config.h"
 #include "log.h"
 #include "strutil.h"
 
@@ -21,12 +20,7 @@ HANDLE cmd_execute(const char *path, const char *const argv[]) {
         return NULL;
     }
 
-#ifdef WINDOWS_NOCONSOLE
-    int flags = CREATE_NO_WINDOW;
-#else
-    int flags = 0;
-#endif
-    if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, flags, NULL, NULL, &si, &pi)) {
+    if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
         return NULL;
     }
 

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 04 11:48:32 CEST 2018
+#Mon Jan 29 16:38:49 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

meson.build

@@ -1,4 +1,4 @@
-project('scrcpy', 'c', meson_version: '>= 0.37', default_options : 'c_std=c99')
+project('scrcpy', 'c', meson_version: '>= 0.37')
 
 if get_option('build_app')
     subdir('app')

meson_options.txt

@@ -1,6 +1,5 @@
 option('build_app', type: 'boolean', value: true, description: 'Build the client')
 option('build_server', type: 'boolean', value: true, description: 'Build the server')
-option('crossbuild_windows', type: 'boolean', value: false, description: 'Build for Windows from Linux')
 option('windows_noconsole', type: 'boolean', value: false, description: 'Disable console on Windows (pass -mwindows flag)')
 option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
 option('override_server_path', type: 'string', description: 'Hardcoded path to find the server at runtime')

server/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 3
-        versionName "1.2"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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

@@ -3,7 +3,6 @@ package com.genymobile.scrcpy;
 import com.genymobile.scrcpy.wrappers.ServiceManager;
 
 import android.graphics.Point;
-import android.graphics.Rect;
 import android.os.Build;
 import android.os.RemoteException;
 import android.view.IRotationWatcher;
@@ -19,32 +18,14 @@ public final class Device {
 
     private ScreenInfo screenInfo;
     private RotationListener rotationListener;
-    private boolean rotated;
 
     public Device(Options options) {
-        options.setCrop(new Rect(0, 0, 1280, 1440));
-
-        // TODO crop the crop to the device size!!!
-
-        final int maxSize = options.getMaxSize();
-        final Rect crop = options.getCrop();
-
-        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
-        rotated = (displayInfo.getRotation() & 1) != 0;
-
-        screenInfo = ScreenInfo.create(displayInfo.getSize(), maxSize, crop, rotated);
+        screenInfo = computeScreenInfo(options.getMaxSize());
         registerRotationWatcher(new IRotationWatcher.Stub() {
             @Override
-            public void onRotationChanged(int rotation) {
-                boolean rotated = (rotation & 1) != 0;
+            public void onRotationChanged(int rotation) throws RemoteException {
                 synchronized (Device.this) {
-                    // Do not call getDisplayInfo(), the resulting rotation may be inconsistent with
-                    // the rotation parameter (race condition).
-                    // Instead, compute the new size from the (rotated) old size.
-                    Size oldSize = screenInfo.getDeviceSize();
-                    Size newSize = rotated != Device.this.rotated ? oldSize.rotate() : oldSize;
-                    screenInfo = ScreenInfo.create(newSize, maxSize, crop, rotated);
-                    Device.this.rotated = rotated;
+                    screenInfo = screenInfo.withRotation(rotation);
 
                     // notify
                     if (rotationListener != null) {
@@ -59,9 +40,40 @@ public final class Device {
         return screenInfo;
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber")
+    private ScreenInfo computeScreenInfo(int maxSize) {
+        // Compute the video size and the padding of the content inside this video.
+        // Principle:
+        // - scale down the great side of the screen to maxSize (if necessary);
+        // - scale down the other side so that the aspect ratio is preserved;
+        // - round this value to the nearest multiple of 8 (H.264 only accepts multiples of 8)
+        DisplayInfo displayInfo = serviceManager.getDisplayManager().getDisplayInfo();
+        boolean rotated = (displayInfo.getRotation() & 1) != 0;
+        Size deviceSize = displayInfo.getSize();
+        int w = deviceSize.getWidth() & ~7; // in case it's not a multiple of 8
+        int h = deviceSize.getHeight() & ~7;
+        if (maxSize > 0) {
+            if (BuildConfig.DEBUG && maxSize % 8 != 0) {
+                throw new AssertionError("Max size must be a multiple of 8");
+            }
+            boolean portrait = h > w;
+            int major = portrait ? h : w;
+            int minor = portrait ? w : h;
+            if (major > maxSize) {
+                int minorExact = minor * maxSize / major;
+                // +4 to round the value to the nearest multiple of 8
+                minor = (minorExact + 4) & ~7;
+                major = maxSize;
+            }
+            w = portrait ? minor : major;
+            h = portrait ? major : minor;
+        }
+        Size videoSize = new Size(w, h);
+        return new ScreenInfo(deviceSize, videoSize, rotated);
+    }
+
     public Point getPhysicalPoint(Position position) {
-        // it hides the field on purpose, to read it with a lock
-        @SuppressWarnings("checkstyle:HiddenField")
+        @SuppressWarnings("checkstyle:HiddenField") // it hides the field on purpose, to read it with a lock
         ScreenInfo screenInfo = getScreenInfo(); // read with synchronization
         Size videoSize = screenInfo.getVideoSize();
         Size clientVideoSize = position.getScreenSize();
@@ -70,11 +82,11 @@ public final class Device {
             // the device may have been rotated since the event was generated, so ignore the event
             return null;
         }
-        Rect contentRect = screenInfo.getContentRect();
+        Size deviceSize = screenInfo.getDeviceSize();
         Point point = position.getPoint();
-        int deviceX = contentRect.left + point.x * contentRect.width() / videoSize.getWidth();
-        int deviceY = contentRect.top + point.y * contentRect.height() / videoSize.getHeight();
-        return new Point(deviceX, deviceY);
+        int scaledX = point.x * deviceSize.getWidth() / videoSize.getWidth();
+        int scaledY = point.y * deviceSize.getHeight() / videoSize.getHeight();
+        return new Point(scaledX, scaledY);
     }
 
     public static String getDeviceName() {

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

@@ -16,16 +16,5 @@ public final class DisplayInfo {
     public int getRotation() {
         return rotation;
     }
-
-    public DisplayInfo withRotation(int rotation) {
-        if (rotation == this.rotation) {
-            return this;
-        }
-        Size newSize = size;
-        if ((rotation & 1) != (this.rotation & 1)) {
-            newSize = size.rotate();
-        }
-        return new DisplayInfo(newSize, rotation);
-    }
 }
 

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

@@ -1,12 +1,9 @@
 package com.genymobile.scrcpy;
 
-import android.graphics.Rect;
-
 public class Options {
     private int maxSize;
     private int bitRate;
     private boolean tunnelForward;
-    private Rect crop;
 
     public int getMaxSize() {
         return maxSize;
@@ -31,12 +28,4 @@ public class Options {
     public void setTunnelForward(boolean tunnelForward) {
         this.tunnelForward = tunnelForward;
     }
-
-    public Rect getCrop() {
-        return crop;
-    }
-
-    public void setCrop(Rect crop) {
-        this.crop = crop;
-    }
 }

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

@@ -56,12 +56,12 @@ public class ScreenEncoder implements Device.RotationListener {
             do {
                 MediaCodec codec = createCodec();
                 IBinder display = createDisplay();
-                Rect contentRect = device.getScreenInfo().getContentRect();
+                Rect deviceRect = device.getScreenInfo().getDeviceSize().toRect();
                 Rect videoRect = device.getScreenInfo().getVideoSize().toRect();
                 setSize(format, videoRect.width(), videoRect.height());
                 configure(codec, format);
                 Surface surface = codec.createInputSurface();
-                setDisplaySurface(display, surface, contentRect, videoRect);
+                setDisplaySurface(display, surface, deviceRect, videoRect);
                 codec.start();
                 try {
                     alive = encode(codec, outputStream);

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

@@ -1,60 +1,14 @@
 package com.genymobile.scrcpy;
 
-import android.graphics.Rect;
-
 public final class ScreenInfo {
     private final Size deviceSize;
     private final Size videoSize;
-    private final Rect crop;
+    private final boolean rotated;
 
-    private ScreenInfo(Size deviceSize, Size videoSize, Rect crop, boolean rotated) {
+    public ScreenInfo(Size deviceSize, Size videoSize, boolean rotated) {
         this.deviceSize = deviceSize;
         this.videoSize = videoSize;
-        this.crop = crop;
-    }
-
-    public static ScreenInfo create(Size deviceSize, int maxSize, Rect crop, boolean rotated) {
-        Size inputSize;
-        if (crop == null) {
-            inputSize = deviceSize;
-        } else {
-            if (rotated) {
-                // the crop (provided by the user) is expressed in the natural orientation
-                // the device size (provided by the system) already takes the rotation into account
-                crop = rotateCrop(crop, deviceSize);
-            }
-            inputSize = new Size(crop.width(), crop.height());
-        }
-        Size videoSize = computeVideoSize(inputSize, maxSize);
-        return new ScreenInfo(deviceSize, videoSize, crop, rotated);
-    }
-
-    @SuppressWarnings("checkstyle:MagicNumber")
-    private static Size computeVideoSize(Size inputSize, int maxSize) {
-        // Compute the video size and the padding of the content inside this video.
-        // Principle:
-        // - scale down the great side of the screen to maxSize (if necessary);
-        // - scale down the other side so that the aspect ratio is preserved;
-        // - round this value to the nearest multiple of 8 (H.264 only accepts multiples of 8)
-        int w = inputSize.getWidth() & ~7; // in case it's not a multiple of 8
-        int h = inputSize.getHeight() & ~7;
-        if (maxSize > 0) {
-            if (BuildConfig.DEBUG && maxSize % 8 != 0) {
-                throw new AssertionError("Max size must be a multiple of 8");
-            }
-            boolean portrait = h > w;
-            int major = portrait ? h : w;
-            int minor = portrait ? w : h;
-            if (major > maxSize) {
-                int minorExact = minor * maxSize / major;
-                // +4 to round the value to the nearest multiple of 8
-                minor = (minorExact + 4) & ~7;
-                major = maxSize;
-            }
-            w = portrait ? minor : major;
-            h = portrait ? major : minor;
-        }
-        return new Size(w, h);
+        this.rotated = rotated;
     }
 
     public Size getDeviceSize() {
@@ -65,17 +19,11 @@ public final class ScreenInfo {
         return videoSize;
     }
 
-    public Rect getCrop() {
-        return crop;
-    }
-
-    public Rect getContentRect() {
-        Rect crop = getCrop();
-        return crop != null ? crop : deviceSize.toRect();
-    }
-
-    private static Rect rotateCrop(Rect crop, Size rotatedSize) {
-        int w = rotatedSize.getHeight(); // the size is already rotated
-        return new Rect(crop.top, w - crop.right, crop.bottom, w - crop.left);
+    public ScreenInfo withRotation(int rotation) {
+        boolean newRotated = (rotation & 1) != 0;
+        if (rotated == newRotated) {
+            return this;
+        }
+        return new ScreenInfo(deviceSize.rotate(), videoSize.rotate(), newRotated);
     }
 }