Do not warn on terminating the server

If the server is already dead, terminating it fails. This is expected.

.gitignore

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

app/src/fps_counter.c

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

app/src/fps_counter.h

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

app/src/input_manager.c

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

app/src/screen.c

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

app/src/screen.h

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

app/src/server.c

@@ -338,7 +338,7 @@ run_wait_server(void *data) {
     // no need for synchronization, server_socket is initialized before this
     // thread was created
     if (server->server_socket != INVALID_SOCKET
-            && !atomic_flag_test_and_set(&server->server_socket_closed)) {
+            && SDL_AtomicCAS(&server->server_socket_closed, 0, 1)) {
         // On Linux, accept() is unblocked by shutdown(), but on Windows, it is
         // unblocked by closesocket(). Therefore, call both (close_socket()).
         close_socket(server->server_socket);
@@ -393,11 +393,8 @@ server_start(struct server *server, const char *serial,
 
 error2:
     if (!server->tunnel_forward) {
-        bool was_closed =
-            atomic_flag_test_and_set(&server->server_socket_closed);
-        // the thread is not started, the flag could not be already set
-        assert(!was_closed);
-        (void) was_closed;
+        // the wait server thread is not started, SDL_AtomicSet() is sufficient
+        SDL_AtomicSet(&server->server_socket_closed, 1);
         close_socket(server->server_socket);
     }
     disable_tunnel(server);
@@ -421,7 +418,7 @@ server_connect_to(struct server *server) {
         }
 
         // we don't need the server socket anymore
-        if (!atomic_flag_test_and_set(&server->server_socket_closed)) {
+        if (SDL_AtomicCAS(&server->server_socket_closed, 0, 1)) {
             // close it from here
             close_socket(server->server_socket);
             // otherwise, it is closed by run_wait_server()
@@ -453,7 +450,7 @@ server_connect_to(struct server *server) {
 void
 server_stop(struct server *server) {
     if (server->server_socket != INVALID_SOCKET
-            && !atomic_flag_test_and_set(&server->server_socket_closed)) {
+            && SDL_AtomicCAS(&server->server_socket_closed, 0, 1)) {
         close_socket(server->server_socket);
     }
     if (server->video_socket != INVALID_SOCKET) {

app/src/server.h

@@ -1,9 +1,9 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-#include <stdatomic.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <SDL2/SDL_atomic.h>
 #include <SDL2/SDL_thread.h>
 
 #include "config.h"
@@ -15,7 +15,7 @@ struct server {
     char *serial;
     process_t process;
     SDL_Thread *wait_server_thread;
-    atomic_flag server_socket_closed;
+    SDL_atomic_t server_socket_closed;
     socket_t server_socket; // only used if !tunnel_forward
     socket_t video_socket;
     socket_t control_socket;
@@ -29,7 +29,7 @@ struct server {
     .serial = NULL, \
     .process = PROCESS_NONE, \
     .wait_server_thread = NULL, \
-    .server_socket_closed = ATOMIC_FLAG_INIT, \
+    .server_socket_closed = {0}, \
     .server_socket = INVALID_SOCKET, \
     .video_socket = INVALID_SOCKET, \
     .control_socket = INVALID_SOCKET, \

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

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

@@ -163,10 +163,8 @@ public final class Device {
     }
 
     public void setClipboardText(String text) {
-        boolean ok = serviceManager.getClipboardManager().setText(text);
-        if (ok) {
-            Ln.i("Device clipboard set");
-        }
+        serviceManager.getClipboardManager().setText(text);
+        Ln.i("Device clipboard set");
     }
 
     /**
@@ -178,10 +176,8 @@ public final class Device {
             Ln.e("Could not get built-in display");
             return;
         }
-        boolean ok = SurfaceControl.setDisplayPowerMode(d, mode);
-        if (ok) {
-            Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
-        }
+        SurfaceControl.setDisplayPowerMode(d, mode);
+        Ln.i("Device screen turned " + (mode == Device.POWER_MODE_OFF ? "off" : "on"));
     }
 
     /**

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

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

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

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