opts

Add a tool to wrap lines at words boundaries (spaces) to fit in a
specified number of columns, left-indented by a specified number of
spaces.

README.md

@@ -582,14 +582,6 @@ 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
 
@@ -838,7 +830,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>
@@ -846,8 +838,6 @@ _<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

@@ -29,7 +29,6 @@ src = [
     'src/util/process.c',
     'src/util/strbuf.c',
     'src/util/str_util.c',
-    'src/util/term.c',
     'src/util/thread.c',
     'src/util/tick.c',
 ]
@@ -190,7 +189,6 @@ if get_option('buildtype') == 'debug'
             'src/options.c',
             'src/util/strbuf.c',
             'src/util/str_util.c',
-            'src/util/term.c',
         ]],
         ['test_clock', [
             'tests/test_clock.c',

app/scrcpy.1

@@ -136,10 +136,6 @@ 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.
@@ -368,10 +364,6 @@ 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/util/str_util.c

@@ -213,8 +213,6 @@ utf8_from_wide_char(const wchar_t *ws) {
 #endif
 
 char *wrap_lines(const char *input, unsigned columns, unsigned indent) {
-    assert(indent < columns);
-
     struct sc_strbuf buf;
 
     // The output string should not be a lot longer than the input string (just
@@ -226,6 +224,8 @@ char *wrap_lines(const char *input, unsigned columns, unsigned indent) {
         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
@@ -241,12 +241,7 @@ char *wrap_lines(const char *input, unsigned columns, unsigned indent) {
     size_t col = indent;
     while (*input) {
         size_t sep_idx = strcspn(input, "\n ");
-        size_t new_col = col + sep_idx;
-        if (pending == ' ') {
-            // The pending space counts
-            ++new_col;
-        }
-        bool wrap = new_col > columns;
+        bool wrap = col + sep_idx > columns;
 
         char sep = input[sep_idx];
         if (sep == ' ')

app/src/util/strbuf.c

@@ -21,6 +21,7 @@ sc_strbuf_init(struct sc_strbuf *buf, size_t init_cap) {
 static bool
 sc_strbuf_reserve(struct sc_strbuf *buf, size_t len) {
     if (buf->len + len > buf->cap) {
+        fprintf(stderr, "realloc\n");
         size_t new_cap = buf->cap * 3 / 2 + len;
         char *s = realloc(buf->s, new_cap + 1); // +1 for '\0'
         if (!s) {
@@ -74,14 +75,3 @@ sc_strbuf_append_n(struct sc_strbuf *buf, const char c, size_t n) {
 
     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

@@ -34,7 +34,4 @@ sc_strbuf_append_str(struct sc_strbuf *buf, const char *s) {
 #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/term.c

@@ -1,51 +0,0 @@
-#include "term.h"
-
-#include <assert.h>
-
-#ifdef _WIN32
-# include <windows.h>
-#else
-# include <unistd.h>
-# include <sys/ioctl.h>
-#endif
-
-bool
-sc_term_get_size(unsigned *rows, unsigned *cols) {
-#ifdef _WIN32
-    CONSOLE_SCREEN_BUFFER_INFO csbi;
-
-    bool ok =
-        GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
-    if (!ok) {
-        return false;
-    }
-
-    if (rows) {
-        assert(csbi.srWindow.Bottom >= csbi.srWindow.Top);
-        *rows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
-    }
-
-    if (cols) {
-        assert(csbi.srWindow.Right >= csbi.srWindow.Left);
-        *cols = csbi.srWindow.Right - csbi.srWindow.Left + 1;
-    }
-
-    return true;
-#else
-    struct winsize ws;
-    int r = ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws);
-    if (r == -1) {
-        return false;
-    }
-
-    if (rows) {
-        *rows = ws.ws_row;
-    }
-
-    if (cols) {
-        *cols = ws.ws_col;
-    }
-
-    return true;
-#endif
-}

app/src/util/term.h

@@ -1,11 +0,0 @@
-#ifndef SC_TERM_H
-#define SC_TERM_H
-
-#include "common.h"
-
-#include <stdbool.h>
-
-bool
-sc_term_get_size(unsigned *rows, unsigned *cols);
-
-#endif

app/tests/test_strbuf.c

@@ -30,11 +30,6 @@ static void test_strbuf_simple(void) {
     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);
 }
 

app/tests/test_strutil.c

@@ -301,7 +301,7 @@ static void test_strlist_contains(void) {
 
 static void test_wrap_lines(void) {
     const char *s = "This is a text to test line wrapping. The lines must be "
-                    "wrapped at a space or a line break.\n"
+                    "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 "
@@ -315,8 +315,9 @@ static void test_wrap_lines(void) {
     const char *expected = "    This is a text to\n"
                            "    test line wrapping.\n"
                            "    The lines must be\n"
-                           "    wrapped at a space\n"
-                           "    or a line break.\n"
+                           "    wrapped either at a\n"
+                           "    space or a line\n"
+                           "    break.\n"
                            "    \n"
                            "    This rectangle must\n"
                            "    remains a rectangle\n"