Generate getopt params from option structures

Use the option descriptions to generate the optstring and longopts
parameters for the getopt_long() command.

That way, the options are completely described in a single place.

README.md

@@ -582,6 +582,14 @@ scrcpy --turn-screen-off --stay-awake
 scrcpy -Sw
 ```
 
+#### Power off on close
+
+To turn the device screen off when closing scrcpy:
+
+```bash
+scrcpy --power-off-on-close
+```
+
 
 #### Show touches
 
@@ -830,7 +838,7 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
  | Turn device screen on                       | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>o</kbd>
  | Rotate device screen                        | <kbd>MOD</kbd>+<kbd>r</kbd>
  | Expand notification panel                   | <kbd>MOD</kbd>+<kbd>n</kbd> \| _5th-click³_
- | Expand settings panel                       |  <kbd>MOD</kbd>+<kbd>n</kbd>+<kbd>n</kbd> \| _Double-5th-click³_
+ | Expand settings panel                       | <kbd>MOD</kbd>+<kbd>n</kbd>+<kbd>n</kbd> \| _Double-5th-click³_
  | Collapse panels                             | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>n</kbd>
  | Copy to clipboard⁴                          | <kbd>MOD</kbd>+<kbd>c</kbd>
  | Cut to clipboard⁴                           | <kbd>MOD</kbd>+<kbd>x</kbd>
@@ -838,6 +846,8 @@ _<kbd>[Super]</kbd> is typically the <kbd>Windows</kbd> or <kbd>Cmd</kbd> key._
  | Inject computer clipboard text              | <kbd>MOD</kbd>+<kbd>Shift</kbd>+<kbd>v</kbd>
  | Enable/disable FPS counter (on stdout)      | <kbd>MOD</kbd>+<kbd>i</kbd>
  | Pinch-to-zoom                               | <kbd>Ctrl</kbd>+_click-and-move_
+ | Drag & drop APK file                        | Install APK from computer
+ | Drag & drop non-APK file                    | [Push file to device](#push-file-to-device)
 
 _¹Double-click on black borders to remove them._  
 _²Right-click turns the screen on if it was off, presses BACK otherwise._  

app/meson.build

@@ -27,6 +27,7 @@ src = [
     'src/util/log.c',
     'src/util/net.c',
     'src/util/process.c',
+    'src/util/strbuf.c',
     'src/util/str_util.c',
     'src/util/thread.c',
     'src/util/tick.c',
@@ -186,6 +187,7 @@ if get_option('buildtype') == 'debug'
             'tests/test_cli.c',
             'src/cli.c',
             'src/options.c',
+            'src/util/strbuf.c',
             'src/util/str_util.c',
         ]],
         ['test_clock', [
@@ -195,6 +197,7 @@ if get_option('buildtype') == 'debug'
         ['test_control_msg_serialize', [
             'tests/test_control_msg_serialize.c',
             'src/control_msg.c',
+            'src/util/strbuf.c',
             'src/util/str_util.c',
         ]],
         ['test_device_msg_deserialize', [
@@ -204,8 +207,13 @@ if get_option('buildtype') == 'debug'
         ['test_queue', [
             'tests/test_queue.c',
         ]],
+        ['test_strbuf', [
+            'tests/test_strbuf.c',
+            'src/util/strbuf.c',
+        ]],
         ['test_strutil', [
             'tests/test_strutil.c',
+            'src/util/strbuf.c',
             'src/util/str_util.c',
         ]],
     ]

app/scrcpy.1

@@ -136,6 +136,10 @@ Set the TCP port (range) used by the client to listen.
 
 Default is 27183:27199.
 
+.TP
+.B \-\-power\-off\-on\-close
+Turn the device screen off when closing scrcpy.
+
 .TP
 .B \-\-prefer\-text
 Inject alpha characters and space as text events instead of key events.
@@ -364,6 +368,10 @@ Pinch-to-zoom from the center of the screen
 .B Drag & drop APK file
 Install APK from computer
 
+.TP
+.B Drag & drop non-APK file
+Push file to device (see \fB\-\-push\-target\fR)
+
 
 .SH Environment variables
 

app/src/compat.h

@@ -43,6 +43,11 @@
 # define SCRCPY_SDL_HAS_WINDOW_ALWAYS_ON_TOP
 #endif
 
+#if SDL_VERSION_ATLEAST(2, 0, 6)
+// <https://github.com/libsdl-org/SDL/commit/d7a318de563125e5bb465b1000d6bc9576fbc6fc>
+# define SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
+#endif
+
 #if SDL_VERSION_ATLEAST(2, 0, 8)
 // <https://hg.libsdl.org/SDL/rev/dfde5d3f9781>
 # define SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR

app/src/events.h

@@ -1,5 +1,2 @@
-#define EVENT_NEW_FRAME                 SDL_USEREVENT
-#define EVENT_STREAM_STOPPED           (SDL_USEREVENT + 1)
-#define EVENT_SERVER_CONNECTION_FAILED (SDL_USEREVENT + 2)
-#define EVENT_SERVER_CONNECTED         (SDL_USEREVENT + 3)
-#define EVENT_SERVER_DISCONNECTED      (SDL_USEREVENT + 4)
+#define EVENT_NEW_FRAME       SDL_USEREVENT
+#define EVENT_STREAM_STOPPED (SDL_USEREVENT + 1)

app/src/scrcpy.c

@@ -79,29 +79,8 @@ BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
 }
 #endif // _WIN32
 
-// init SDL and set appropriate hints
-static bool
-sdl_init_and_configure(bool display, const char *render_driver,
-                       bool disable_screensaver) {
-    uint32_t flags = display ? SDL_INIT_VIDEO : SDL_INIT_EVENTS;
-    if (SDL_Init(flags)) {
-        LOGC("Could not initialize SDL: %s", SDL_GetError());
-        return false;
-    }
-
-    atexit(SDL_Quit);
-
-#ifdef _WIN32
-    // Clean up properly on Ctrl+C on Windows
-    bool ok = SetConsoleCtrlHandler(windows_ctrl_handler, TRUE);
-    if (!ok) {
-        LOGW("Could not set Ctrl+C handler");
-    }
-#endif // _WIN32
-
-    if (!display) {
-        return true;
-    }
+static void
+sdl_set_hints(const char *render_driver) {
 
     if (render_driver && !SDL_SetHint(SDL_HINT_RENDER_DRIVER, render_driver)) {
         LOGW("Could not set render driver");
@@ -119,6 +98,15 @@ sdl_init_and_configure(bool display, const char *render_driver,
     }
 #endif
 
+#ifdef SCRCPY_SDL_HAS_HINT_TOUCH_MOUSE_EVENTS
+    // Disable synthetic mouse events from touch events
+    // Touch events with id SDL_TOUCH_MOUSEID are ignored anyway, but it is
+    // better not to generate them in the first place.
+    if (!SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0")) {
+        LOGW("Could not disable synthetic mouse events");
+    }
+#endif
+
 #ifdef SCRCPY_SDL_HAS_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR
     // Disable compositor bypassing on X11
     if (!SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0")) {
@@ -130,6 +118,21 @@ sdl_init_and_configure(bool display, const char *render_driver,
     if (!SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0")) {
         LOGW("Could not disable minimize on focus loss");
     }
+}
+
+static void
+sdl_configure(bool display, bool disable_screensaver) {
+#ifdef _WIN32
+    // Clean up properly on Ctrl+C on Windows
+    bool ok = SetConsoleCtrlHandler(windows_ctrl_handler, TRUE);
+    if (!ok) {
+        LOGW("Could not set Ctrl+C handler");
+    }
+#endif // _WIN32
+
+    if (!display) {
+        return;
+    }
 
     if (disable_screensaver) {
         LOGD("Screensaver disabled");
@@ -138,8 +141,6 @@ sdl_init_and_configure(bool display, const char *render_driver,
         LOGD("Screensaver enabled");
         SDL_EnableScreenSaver();
     }
-
-    return true;
 }
 
 static bool
@@ -158,10 +159,6 @@ static enum event_result
 handle_event(struct scrcpy *s, const struct scrcpy_options *options,
              SDL_Event *event) {
     switch (event->type) {
-        case EVENT_SERVER_DISCONNECTED:
-            LOGD("Server disconnected");
-            // Do nothing, will be managed by the "stream stopped" event
-            break;
         case EVENT_STREAM_STOPPED:
             LOGD("Video stream stopped");
             return EVENT_RESULT_STOPPED_BY_EOS;
@@ -220,32 +217,6 @@ event_loop(struct scrcpy *s, const struct scrcpy_options *options) {
     return false;
 }
 
-static bool
-await_for_server(void) {
-    SDL_Event event;
-    while (SDL_WaitEvent(&event)) {
-        // Should never receive disconnected event before connected
-        assert(event.type != EVENT_SERVER_DISCONNECTED);
-
-        switch (event.type) {
-            case SDL_QUIT:
-                LOGD("User requested to quit");
-                return false;
-            case EVENT_SERVER_CONNECTION_FAILED:
-                LOGE("Server connection failed");
-                return false;
-            case EVENT_SERVER_CONNECTED:
-                LOGD("Server connected");
-                return true;
-            default:
-                break;
-        }
-    }
-
-    LOGE("SDL_WaitEvent() error: %s", SDL_GetError());
-    return false;
-}
-
 static SDL_LogPriority
 sdl_priority_from_av_level(int level) {
     switch (level) {
@@ -291,35 +262,23 @@ stream_on_eos(struct stream *stream, void *userdata) {
     PUSH_EVENT(EVENT_STREAM_STOPPED);
 }
 
-static void
-server_on_connection_failed(struct server *server, void *userdata) {
-    (void) server;
-    (void) userdata;
-
-    PUSH_EVENT(EVENT_SERVER_CONNECTION_FAILED);
-}
-
-static void
-server_on_connected(struct server *server, void *userdata) {
-    (void) server;
-    (void) userdata;
-
-    PUSH_EVENT(EVENT_SERVER_CONNECTED);
-}
-
-static void
-server_on_disconnected(struct server *server, void *userdata) {
-    (void) server;
-    (void) userdata;
-
-    PUSH_EVENT(EVENT_SERVER_DISCONNECTED);
-}
-
 bool
 scrcpy(struct scrcpy_options *options) {
     static struct scrcpy scrcpy;
     struct scrcpy *s = &scrcpy;
 
+    // Minimal SDL initialization
+    if (SDL_Init(SDL_INIT_EVENTS)) {
+        LOGC("Could not initialize SDL: %s", SDL_GetError());
+        return false;
+    }
+
+    atexit(SDL_Quit);
+
+    if (!server_init(&s->server)) {
+        return false;
+    }
+
     bool ret = false;
 
     bool server_started = false;
@@ -336,7 +295,6 @@ scrcpy(struct scrcpy_options *options) {
     bool controller_started = false;
     bool screen_initialized = false;
 
-    bool record = !!options->record_filename;
     struct server_params params = {
         .serial = options->serial,
         .log_level = options->log_level,
@@ -355,37 +313,32 @@ scrcpy(struct scrcpy_options *options) {
         .force_adb_forward = options->force_adb_forward,
         .power_off_on_close = options->power_off_on_close,
     };
-
-    static const struct server_callbacks cbs = {
-        .on_connection_failed = server_on_connection_failed,
-        .on_connected = server_on_connected,
-        .on_disconnected = server_on_disconnected,
-    };
-    if (!server_init(&s->server, &params, &cbs, NULL)) {
-        return false;
-    }
-
-    // TODO SDL_Init(SDL_INIT_EVENTS) before starting server
-    if (!server_start(&s->server)) {
+    if (!server_start(&s->server, &params)) {
         goto end;
     }
 
     server_started = true;
 
-    if (!sdl_init_and_configure(options->display, options->render_driver,
-                                options->disable_screensaver)) {
+    if (options->display) {
+        sdl_set_hints(options->render_driver);
+    }
+
+    // Initialize SDL video in addition if display is enabled
+    if (options->display && SDL_Init(SDL_INIT_VIDEO)) {
+        LOGC("Could not initialize SDL: %s", SDL_GetError());
         goto end;
     }
 
-    // Await for server without blocking Ctrl+C handling
-    if (!await_for_server()) {
+    sdl_configure(options->display, options->disable_screensaver);
+
+    struct server_info info;
+
+    if (!server_connect_to(&s->server, &info)) {
         goto end;
     }
 
-    struct server_info *info = &s->server.info;
-
     if (options->display && options->control) {
-        if (!file_handler_init(&s->file_handler, options->serial,
+        if (!file_handler_init(&s->file_handler, s->server.serial,
                                options->push_target)) {
             goto end;
         }
@@ -403,11 +356,11 @@ scrcpy(struct scrcpy_options *options) {
     }
 
     struct recorder *rec = NULL;
-    if (record) {
+    if (options->record_filename) {
         if (!recorder_init(&s->recorder,
                            options->record_filename,
                            options->record_format,
-                           info->frame_size)) {
+                           info.frame_size)) {
             goto end;
         }
         rec = &s->recorder;
@@ -453,11 +406,11 @@ scrcpy(struct scrcpy_options *options) {
 
     if (options->display) {
         const char *window_title =
-            options->window_title ? options->window_title : info->device_name;
+            options->window_title ? options->window_title : info.device_name;
 
         struct screen_params screen_params = {
             .window_title = window_title,
-            .frame_size = info->frame_size,
+            .frame_size = info.frame_size,
             .always_on_top = options->always_on_top,
             .window_x = options->window_x,
             .window_y = options->window_y,
@@ -481,7 +434,7 @@ scrcpy(struct scrcpy_options *options) {
 #ifdef HAVE_V4L2
     if (options->v4l2_device) {
         if (!sc_v4l2_sink_init(&s->v4l2_sink, options->v4l2_device,
-                               info->frame_size, options->v4l2_buffer)) {
+                               info.frame_size, options->v4l2_buffer)) {
             goto end;
         }
 

app/src/server.c

@@ -61,44 +61,6 @@ get_server_path(void) {
     return server_path;
 }
 
-static void
-server_params_destroy(struct server_params *params) {
-    // The server stores a copy of the params provided by the user
-    free((char *) params->serial);
-    free((char *) params->crop);
-    free((char *) params->codec_options);
-    free((char *) params->encoder_name);
-}
-
-static bool
-server_params_copy(struct server_params *dst, const struct server_params *src) {
-    *dst = *src;
-
-    // The params reference user-allocated memory, so we must copy them to
-    // handle them from another thread
-
-#define COPY(FIELD) \
-    dst->FIELD = NULL; \
-    if (src->FIELD) { \
-        dst->FIELD = strdup(src->FIELD); \
-        if (!dst->FIELD) { \
-            goto error; \
-        } \
-    }
-
-    COPY(serial);
-    COPY(crop);
-    COPY(codec_options);
-    COPY(encoder_name);
-#undef COPY
-
-    return true;
-
-error:
-    server_params_destroy(dst);
-    return false;
-}
-
 static bool
 push_server(const char *serial) {
     char *server_path = get_server_path();
@@ -141,11 +103,10 @@ disable_tunnel_forward(const char *serial, uint16_t local_port) {
 
 static bool
 disable_tunnel(struct server *server) {
-    const char *serial = server->params.serial;
     if (server->tunnel_forward) {
-        return disable_tunnel_forward(serial, server->local_port);
+        return disable_tunnel_forward(server->serial, server->local_port);
     }
-    return disable_tunnel_reverse(serial);
+    return disable_tunnel_reverse(server->serial);
 }
 
 static sc_socket
@@ -157,10 +118,9 @@ listen_on_port(uint16_t port) {
 static bool
 enable_tunnel_reverse_any_port(struct server *server,
                                struct sc_port_range port_range) {
-    const char *serial = server->params.serial;
     uint16_t port = port_range.first;
     for (;;) {
-        if (!enable_tunnel_reverse(serial, port)) {
+        if (!enable_tunnel_reverse(server->serial, port)) {
             // the command itself failed, it will fail on any port
             return false;
         }
@@ -179,7 +139,7 @@ enable_tunnel_reverse_any_port(struct server *server,
         }
 
         // failure, disable tunnel and try another port
-        if (!disable_tunnel_reverse(serial)) {
+        if (!disable_tunnel_reverse(server->serial)) {
             LOGW("Could not remove reverse tunnel on port %" PRIu16, port);
         }
 
@@ -205,11 +165,9 @@ static bool
 enable_tunnel_forward_any_port(struct server *server,
                                struct sc_port_range port_range) {
     server->tunnel_forward = true;
-
-    const char *serial = server->params.serial;
     uint16_t port = port_range.first;
     for (;;) {
-        if (enable_tunnel_forward(serial, port)) {
+        if (enable_tunnel_forward(server->serial, port)) {
             // success
             server->local_port = port;
             return true;
@@ -271,8 +229,6 @@ log_level_to_server_string(enum sc_log_level level) {
 
 static process_t
 execute_server(struct server *server, const struct server_params *params) {
-    const char *serial = server->params.serial;
-
     char max_size_string[6];
     char bit_rate_string[11];
     char max_fps_string[6];
@@ -330,7 +286,7 @@ execute_server(struct server *server, const struct server_params *params) {
     //     Port: 5005
     // Then click on "Debug"
 #endif
-    return adb_execute(serial, cmd, ARRAY_LEN(cmd));
+    return adb_execute(server->serial, cmd, ARRAY_LEN(cmd));
 }
 
 static sc_socket
@@ -360,7 +316,6 @@ connect_to_server(uint16_t port, uint32_t attempts, uint32_t delay) {
             // it worked!
             return socket;
         }
-        // TODO use mutex + condvar + bool stopped
         if (attempts) {
             SDL_Delay(delay);
         }
@@ -369,31 +324,22 @@ connect_to_server(uint16_t port, uint32_t attempts, uint32_t delay) {
 }
 
 bool
-server_init(struct server *server, const struct server_params *params,
-            const struct server_callbacks *cbs, void *cbs_userdata) {
-    bool ok = server_params_copy(&server->params, params);
-    if (!ok) {
-        LOGE("Could not copy server params");
-        return false;
-    }
-
+server_init(struct server *server) {
+    server->serial = NULL;
     server->process = PROCESS_NONE;
 
-    ok = sc_mutex_init(&server->mutex);
+    bool ok = sc_mutex_init(&server->mutex);
     if (!ok) {
-        server_params_destroy(&server->params);
         return false;
     }
 
     ok = sc_cond_init(&server->process_terminated_cond);
     if (!ok) {
         sc_mutex_destroy(&server->mutex);
-        server_params_destroy(&server->params);
         return false;
     }
 
     server->process_terminated = false;
-    server->connected = false;
 
     server->server_socket = SC_INVALID_SOCKET;
     server->video_socket = SC_INVALID_SOCKET;
@@ -404,69 +350,13 @@ server_init(struct server *server, const struct server_params *params,
     server->tunnel_enabled = false;
     server->tunnel_forward = false;
 
-    assert(cbs);
-    assert(cbs->on_connection_failed);
-    assert(cbs->on_connected);
-    assert(cbs->on_disconnected);
-
-    server->cbs = cbs;
-    server->cbs_userdata = cbs_userdata;
-
     return true;
 }
 
 static int
-run_server_connect(void *data) {
+run_wait_server(void *data) {
     struct server *server = data;
-
-    if (!server_connect_to(server, &server->info)) {
-        server->cbs->on_connection_failed(server, server->cbs_userdata);
-        goto end;
-    }
-
-    server->connected = true;
-    server->cbs->on_connected(server, server->cbs_userdata);
-
-end:
-    return 0;
-}
-
-static int
-run_server(void *data) {
-    struct server *server = data;
-
-    const struct server_params *params = &server->params;
-
-    if (!push_server(params->serial)) {
-        server->cbs->on_connection_failed(server, server->cbs_userdata);
-        goto end;
-    }
-
-    if (!enable_tunnel_any_port(server, params->port_range,
-                                params->force_adb_forward)) {
-        server->cbs->on_connection_failed(server, server->cbs_userdata);
-        goto end;
-    }
-
-    server->process = execute_server(server, params);
-    if (server->process == PROCESS_NONE) {
-        server->cbs->on_connection_failed(server, server->cbs_userdata);
-        goto end;
-    }
-
-    sc_thread connect_thread;
-    bool ok = sc_thread_create(&connect_thread, run_server_connect,
-                               "server-connect", server);
-    if (!ok) {
-        LOGW("Could not create thread, killing the server...");
-        process_terminate(server->process);
-        server->cbs->on_connection_failed(server, server->cbs_userdata);
-        process_wait(server->process, false); // ignore exit code
-        goto end;
-    }
-
     process_wait(server->process, false); // ignore exit code
-    LOGD("Server terminated");
 
     sc_mutex_lock(&server->mutex);
     server->process_terminated = true;
@@ -480,22 +370,59 @@ run_server(void *data) {
         net_interrupt(server->server_socket);
     }
 
-    sc_thread_join(&connect_thread, NULL);
-
-    // Written by connect_thread, sc_thread_join() provides the necessary
-    // memory barrier
-    if (server->connected) {
-        server->cbs->on_disconnected(server, server->cbs_userdata);
-    }
-    // Otherwise, ->on_connection_failed() is already called
-
-end:
+    LOGD("Server terminated");
     return 0;
 }
 
 bool
-server_start(struct server *server) {
-    return sc_thread_create(&server->thread, run_server, "server", server);
+server_start(struct server *server, const struct server_params *params) {
+    if (params->serial) {
+        server->serial = strdup(params->serial);
+        if (!server->serial) {
+            return false;
+        }
+    }
+
+    if (!push_server(params->serial)) {
+        /* server->serial will be freed on server_destroy() */
+        return false;
+    }
+
+    if (!enable_tunnel_any_port(server, params->port_range,
+                                params->force_adb_forward)) {
+        return false;
+    }
+
+    // server will connect to our server socket
+    server->process = execute_server(server, params);
+    if (server->process == PROCESS_NONE) {
+        goto error;
+    }
+
+    // If the server process dies before connecting to the server socket, then
+    // the client will be stuck forever on accept(). To avoid the problem, we
+    // must be able to wake up the accept() call when the server dies. To keep
+    // things simple and multiplatform, just spawn a new thread waiting for the
+    // server process and calling shutdown()/close() on the server socket if
+    // necessary to wake up any accept() blocking call.
+    bool ok = sc_thread_create(&server->wait_server_thread, run_wait_server,
+                               "wait-server", server);
+    if (!ok) {
+        process_terminate(server->process);
+        process_wait(server->process, true); // ignore exit code
+        goto error;
+    }
+
+    server->tunnel_enabled = true;
+
+    return true;
+
+error:
+    // The server socket (if any) will be closed on server_destroy()
+
+    disable_tunnel(server);
+
+    return false;
 }
 
 static bool
@@ -608,7 +535,7 @@ server_stop(struct server *server) {
         process_terminate(server->process);
     }
 
-    sc_thread_join(&server->thread, NULL);
+    sc_thread_join(&server->wait_server_thread, NULL);
     process_close(server->process);
 }
 
@@ -629,8 +556,7 @@ server_destroy(struct server *server) {
             LOGW("Could not close control socket");
         }
     }
-
-    server_params_destroy(&server->params);
+    free(server->serial);
     sc_cond_destroy(&server->process_terminated_cond);
     sc_mutex_destroy(&server->mutex);
 }

app/src/server.h

@@ -20,6 +20,23 @@ struct server_info {
     struct sc_size frame_size;
 };
 
+struct server {
+    char *serial;
+    process_t process;
+    sc_thread wait_server_thread;
+
+    sc_mutex mutex;
+    sc_cond process_terminated_cond;
+    bool process_terminated;
+
+    sc_socket server_socket; // only used if !tunnel_forward
+    sc_socket video_socket;
+    sc_socket control_socket;
+    uint16_t local_port; // selected from port_range
+    bool tunnel_enabled;
+    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
+};
+
 struct server_params {
     const char *serial;
     enum sc_log_level log_level;
@@ -39,48 +56,15 @@ struct server_params {
     bool power_off_on_close;
 };
 
-struct server {
-    // The internal allocated strings are copies owned by the server
-    struct server_params params;
-
-    process_t process;
-    sc_thread thread;
-
-    sc_mutex mutex;
-    sc_cond process_terminated_cond;
-    bool process_terminated;
-
-    bool connected; // written by connect_thread
-    struct server_info info; // initialized once connected
-
-    sc_socket server_socket; // only used if !tunnel_forward
-    sc_socket video_socket;
-    sc_socket control_socket;
-    uint16_t local_port; // selected from port_range
-    bool tunnel_enabled;
-    bool tunnel_forward; // use "adb forward" instead of "adb reverse"
-
-    const struct server_callbacks *cbs;
-    void *cbs_userdata;
-};
-
-struct server_callbacks {
-    void (*on_connection_failed)(struct server *server, void *userdata);
-    void (*on_connected)(struct server *server, void *userdata);
-    void (*on_disconnected)(struct server *server, void *userdata);
-};
-
-// init the server with the given params
+// init default values
 bool
-server_init(struct server *server, const struct server_params *params,
-            const struct server_callbacks *cbs, void *cbs_userdata);
+server_init(struct server *server);
 
 // push, enable tunnel et start the server
 bool
-server_start(struct server *server);
+server_start(struct server *server, const struct server_params *params);
 
 // block until the communication with the server is established
-// device_name must point to a buffer of at least DEVICE_NAME_FIELD_LENGTH bytes
 bool
 server_connect_to(struct server *server, struct server_info *info);
 

app/src/util/str_util.c

@@ -1,9 +1,11 @@
 #include "str_util.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
+#include "util/strbuf.h"
 
 #ifdef _WIN32
 # include <windows.h>
@@ -209,3 +211,76 @@ utf8_from_wide_char(const wchar_t *ws) {
 }
 
 #endif
+
+char *wrap_lines(const char *input, unsigned columns, unsigned indent) {
+    struct sc_strbuf buf;
+
+    // The output string should not be a lot longer than the input string (just
+    // a few '\n' added), so this initial capacity should almost always avoid
+    // internal realloc() in string buffer
+    size_t cap = strlen(input) * 3 / 2;
+
+    if (!sc_strbuf_init(&buf, cap)) {
+        return false;
+    }
+
+    assert(indent < columns);
+
+#define APPEND(S,N) if (!sc_strbuf_append(&buf, S, N)) goto error
+#define APPEND_CHAR(C) if (!sc_strbuf_append_char(&buf, C)) goto error
+#define APPEND_N(C,N) if (!sc_strbuf_append_n(&buf, C, N)) goto error
+#define APPEND_INDENT() if (indent) APPEND_N(' ', indent)
+
+    APPEND_INDENT();
+
+    // The last separator encountered, it must be inserted only conditionnaly,
+    // depending on the next token
+    char pending = 0;
+
+    // col tracks the current column in the current line
+    size_t col = indent;
+    while (*input) {
+        size_t sep_idx = strcspn(input, "\n ");
+        bool wrap = col + sep_idx > columns;
+
+        char sep = input[sep_idx];
+        if (sep == ' ')
+            sep = ' ';
+
+        if (wrap) {
+            APPEND_CHAR('\n');
+            APPEND_INDENT();
+            col = indent;
+        } else if (pending) {
+            APPEND_CHAR(pending);
+            ++col;
+            if (pending == '\n')
+            {
+                APPEND_INDENT();
+                col = indent;
+            }
+        }
+
+        if (sep_idx) {
+            APPEND(input, sep_idx);
+            col += sep_idx;
+        }
+
+        pending = sep;
+
+        input += sep_idx;
+        if (*input != '\0') {
+            // Skip the separator
+            ++input;
+        }
+    }
+
+    if (pending)
+        APPEND_CHAR(pending);
+
+    return buf.s;
+
+error:
+    free(buf.s);
+    return NULL;
+}

app/src/util/str_util.h

@@ -62,4 +62,8 @@ char *
 utf8_from_wide_char(const wchar_t *s);
 #endif
 
+// Wrap input lines at words boundaries (spaces) so that they fit in 'columns'
+// columns, left-indented by 'indent' spaces
+char *wrap_lines(const char *input, unsigned columns, unsigned indent);
+
 #endif

app/src/util/strbuf.c

@@ -0,0 +1,87 @@
+#include "strbuf.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <stdio.h>
+
+bool
+sc_strbuf_init(struct sc_strbuf *buf, size_t init_cap) {
+    buf->s = malloc(init_cap + 1); // +1 for '\0'
+    if (!buf->s) {
+        return false;
+    }
+
+    buf->len = 0;
+    buf->cap = init_cap;
+    return true;
+}
+
+static bool
+sc_strbuf_reserve(struct sc_strbuf *buf, size_t len) {
+    if (buf->len + len > buf->cap) {
+        size_t new_cap = buf->cap * 3 / 2 + len;
+        char *s = realloc(buf->s, new_cap + 1); // +1 for '\0'
+        if (!s) {
+            // Leave the old buf->s
+            return false;
+        }
+        buf->s = s;
+        buf->cap = new_cap;
+    }
+    return true;
+}
+
+bool
+sc_strbuf_append(struct sc_strbuf *buf, const char *s, size_t len) {
+    assert(s);
+    assert(*s);
+    assert(strlen(s) >= len);
+    if (!sc_strbuf_reserve(buf, len)) {
+        return false;
+    }
+
+    memcpy(&buf->s[buf->len], s, len);
+    buf->len += len;
+    buf->s[buf->len] = '\0';
+
+    return true;
+}
+
+bool
+sc_strbuf_append_char(struct sc_strbuf *buf, const char c) {
+    if (!sc_strbuf_reserve(buf, 1)) {
+        return false;
+    }
+
+    buf->s[buf->len] = c;
+    buf->len ++;
+    buf->s[buf->len] = '\0';
+
+    return true;
+}
+
+bool
+sc_strbuf_append_n(struct sc_strbuf *buf, const char c, size_t n) {
+    if (!sc_strbuf_reserve(buf, n)) {
+        return false;
+    }
+
+    memset(&buf->s[buf->len], c, n);
+    buf->len += n;
+    buf->s[buf->len] = '\0';
+
+    return true;
+}
+
+void
+sc_strbuf_shrink(struct sc_strbuf *buf) {
+    assert(buf->len <= buf->cap);
+    if (buf->len != buf->cap) {
+        char *s = realloc(buf->s, buf->len + 1); // +1 for '\0'
+        assert(s); // decreasing the size may not fail
+        buf->s = s;
+        buf->cap = buf->len;
+    }
+}

app/src/util/strbuf.h

@@ -0,0 +1,40 @@
+#ifndef SC_STRBUF_H
+#define SC_STRBUF_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <string.h>
+
+struct sc_strbuf {
+    char *s;
+    size_t len;
+    size_t cap;
+};
+
+// buf->s must be manually freed by the caller
+bool
+sc_strbuf_init(struct sc_strbuf *buf, size_t init_cap);
+
+bool
+sc_strbuf_append(struct sc_strbuf *buf, const char *s, size_t len);
+
+bool
+sc_strbuf_append_char(struct sc_strbuf *buf, const char c);
+
+bool
+sc_strbuf_append_n(struct sc_strbuf *buf, const char c, size_t n);
+
+static inline bool
+sc_strbuf_append_str(struct sc_strbuf *buf, const char *s) {
+    return sc_strbuf_append(buf, s, strlen(s));
+}
+
+// Append static string (i.e. the string size is known at compile time, for
+// example a string literal)
+#define sc_strbuf_append_staticstr(BUF, S) \
+    sc_strbuf_append(BUF, S, sizeof(S) - 1)
+
+void
+sc_strbuf_shrink(struct sc_strbuf *buf);
+
+#endif

app/src/util/tick.h

@@ -1,6 +1,8 @@
 #ifndef SC_TICK_H
 #define SC_TICK_H
 
+#include "common.h"
+
 #include <stdint.h>
 
 typedef int64_t sc_tick;

app/tests/test_strbuf.c

@@ -0,0 +1,47 @@
+#include "common.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "util/strbuf.h"
+
+static void test_strbuf_simple(void) {
+    struct sc_strbuf buf;
+    bool ok = sc_strbuf_init(&buf, 10);
+    assert(ok);
+
+    ok = sc_strbuf_append_staticstr(&buf, "Hello");
+    assert(ok);
+
+    ok = sc_strbuf_append_char(&buf, ' ');
+    assert(ok);
+
+    ok = sc_strbuf_append_staticstr(&buf, "world");
+    assert(ok);
+
+    ok = sc_strbuf_append_staticstr(&buf, "!\n");
+    assert(ok);
+
+    ok = sc_strbuf_append_staticstr(&buf, "This is a test");
+    assert(ok);
+
+    ok = sc_strbuf_append_n(&buf, '.', 3);
+    assert(ok);
+
+    assert(!strcmp(buf.s, "Hello world!\nThis is a test..."));
+
+    sc_strbuf_shrink(&buf);
+    assert(buf.len == buf.cap);
+    assert(!strcmp(buf.s, "Hello world!\nThis is a test..."));
+
+    free(buf.s);
+}
+
+int main(int argc, char *argv[]) {
+    (void) argc;
+    (void) argv;
+
+    test_strbuf_simple();
+    return 0;
+}

app/tests/test_strutil.c

@@ -299,6 +299,45 @@ static void test_strlist_contains(void) {
     assert(strlist_contains("xyz", '\0', "xyz"));
 }
 
+static void test_wrap_lines(void) {
+    const char *s = "This is a text to test line wrapping. The lines must be "
+                    "wrapped either at a space or a line break.\n"
+                    "\n"
+                    "This rectangle must remains a rectangle because it is "
+                    "drawn in lines having lengths lower than the specified "
+                    "number of columns:\n"
+                    "  +----+\n"
+                    "  |    |\n"
+                    "  +----+\n";
+
+    //                     |----      1    1    2  2|
+    //                     |0    5    0    5    0  3| <-- 24 columns
+    const char *expected = "    This is a text to\n"
+                           "    test line wrapping.\n"
+                           "    The lines must be\n"
+                           "    wrapped either at a\n"
+                           "    space or a line\n"
+                           "    break.\n"
+                           "    \n"
+                           "    This rectangle must\n"
+                           "    remains a rectangle\n"
+                           "    because it is drawn\n"
+                           "    in lines having\n"
+                           "    lengths lower than\n"
+                           "    the specified number\n"
+                           "    of columns:\n"
+                           "      +----+\n"
+                           "      |    |\n"
+                           "      +----+\n";
+
+    char *formatted = wrap_lines(s, 24, 4);
+    assert(formatted);
+
+    assert(!strcmp(formatted, expected));
+
+    free(formatted);
+}
+
 int main(int argc, char *argv[]) {
     (void) argc;
     (void) argv;
@@ -317,5 +356,6 @@ int main(int argc, char *argv[]) {
     test_parse_integers();
     test_parse_integer_with_suffix();
     test_strlist_contains();
+    test_wrap_lines();
     return 0;
 }