92a458e846
Remove unreachable return statements
5 years ago
73e0311d14
Add missing return on file_handler failure
...
Mistake introduced by 84334cf7db
5 years ago
007f616302
Add missing includes
...
Include these headers explicitly instead of relying on transitivity.
5 years ago
7b29f5fd2d
Do not pass default values to the server
...
By default, only pass the version and the bit rate (the default bitrate
is a client compilation option).
5 years ago
04e5537f8c
Pass server parameters as key=value pairs
...
The options values to configure the server were identified by their
command-line argument index. Now that there are a lot of arguments, many
of them being booleans, it became unreadable and error-prone.
Identify the arguments by a key string instead, and make them optional.
This will also simplify running the server manually for debugging.
5 years ago
2eb881c5f1
Allocate and format server command args
...
This simplifies formatting.
5 years ago
5434ea543c
Remove local "serial" variable
...
In execute_server(), the serial is used only once. Moreover, it can be
retrieved from the `params` argument directly.
5 years ago
d5f6697f3a
Add (v)asprintf compatibility functions
...
In case they are not available on the platform.
5 years ago
d6c0054545
Move check_functions in meson script
...
Move the variable to the place it is actually used.
5 years ago
6f487a2892
Add missing includes in compat implementation
...
These includes are necessary for the strdup() compat implementation.
5 years ago
dc0ac01e00
Define common feature test macros for all systems
...
_POSIX_C_SOURCE, _XOPEN_SOURCE and _GNU_SOURCE are also used on Windows.
Fix regression introduced by ba547e3895
5 years ago
6abff46c9f
Add option to disable clipboard autosync
...
By default, scrcpy automatically synchronizes the computer clipboard to
the device clipboard before injecting Ctrl+v, and the device clipboard
to the computer clipboard whenever it changes.
This new option --no-clipboard-autosync disables this automatic
synchronization.
Fixes #2228 <https://github.com/Genymobile/scrcpy/issues/2228 >
PR #2817 <https://github.com/Genymobile/scrcpy/pull/2817 >
5 years ago
5d17bcf1bc
Wait SET_CLIPBOARD ack before Ctrl+v via HID
...
To allow seamless copy-paste, on Ctrl+v, a SET_CLIPBOARD request is
performed before injecting Ctrl+v.
But when HID keyboard is enabled, the Ctrl+v injection is not sent on
the same channel as the clipboard request, so they are not serialized,
and may occur in any order. If Ctrl+v happens to be injected before the
new clipboard content is set, then the old content is pasted instead,
which is incorrect.
To minimize the probability of occurrence of the wrong order, a delay of
2 milliseconds was added before injecting Ctrl+v. Then 5ms. But even
with 5ms, the wrong behavior sometimes happens.
To handle it properly, add an acknowledgement mechanism, so that Ctrl+v
is injected over AOA only after the SET_CLIPBOARD request has been
performed and acknowledged by the server.
Refs e4163321f045b0f8123a#2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
2d5525eac1
Move PRIu64 Windows workaround to compat.h
...
So that we can use it from several files.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
2a0730ee9b
Add device clipboard set acknowledgement
...
Add a device message type so that the device could send acknowledgements
for SET_CLIPBOARD requests.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
901d837165
Add sequence number to set_clipboard request
...
This will allow the client to request an acknowledgement.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
aba1fc03c3
Add acksync helper to wait for acks
...
This will allow to send requests with sequence numbers to the server
and wait for acknowledgements.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
5b3856c3b6
Explicitly indicate when device clipboard is set
...
Pass the information that device clipboard has been set to the key
processor. This avoids the keyprocessor to "guess", and paves the way to
implement a proper acknowledgement mechanism.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
854de9659a
Do not inject Ctrl+v if clipboard sync failed
...
This prevents to paste the current Android clipboard, which would be
unexpected.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
ea8028332c
Synchronize computer-to-device empty clipboard
...
Set the device clipboard to empty string if necessary. Otherwise, the
current device clipboard will be pasted on Ctrl+v.
PR #2814 <https://github.com/Genymobile/scrcpy/pull/2814 >
5 years ago
0427a981e5
Use UINT64_C macro for uint64_t constant in tests
...
A long constant might not be sufficient.
5 years ago
68eaee5bb0
Force adb forward if tunnel host/port is provided
...
Tunnel host and port are only meaningful in "adb forward" mode.
They indicate where the client must connect to communicate with the
server. In "adb reverse" mode, the client _listens_, it does not
_connect_.
Refs #2807 <https://github.com/Genymobile/scrcpy/pull/2807 >
5 years ago
7bdbde7363
Add options to configure tunnel host and port
...
In "adb forward" mode, by default, scrcpy connects to localhost:PORT,
where PORT is the local port passed to "adb forward". This assumes that
the tunnel is established on the local host with a local adb server
(which is the common case).
For advanced usage, add --tunnel-host and --tunnel-port to force the
connection to a different destination.
Fixes #2801 <https://github.com/Genymobile/scrcpy/issues/2801 >
PR #2807 <https://github.com/Genymobile/scrcpy/pull/2807 >
Signed-off-by: Romain Vimont <rom@rom1v.com>
5 years ago
52e5181c84
Add function to parse IPv4 addresses
...
PR #2807 <https://github.com/Genymobile/scrcpy/pull/2807 >
Signed-off-by: Romain Vimont <rom@rom1v.com>
5 years ago
ba547e3895
Configure feature test macros in meson
...
Refs #2807 <https://github.com/Genymobile/scrcpy/pull/2807 >
Co-authored-by: RipleyTom <RipleyTom@users.noreply.github.com>
5 years ago
226f3b2c91
Add missing include config.h
5 years ago
6da6d905c2
Print scrcpy header first
...
Inconditionnally print the scrcpy version first, without using LOGI().
The log level is configured only after parsing the command line
parameters (it may be changed via -V), and command line parsing logs
should not appear before the scrcpy version.
5 years ago
b25404ee4b
Print help to stdout
...
The output of -h/--help was printed on stderr, although it is not an
error.
Printing on stdout allows to pipe the result directly:
scrcpy --help | less
Instead of (in bash):
scrcpy --help |& less
5 years ago
4cfc1cd70a
Assert that long options are correctly set
5 years ago
2fc80eae2d
Simplify adb_tunnel
...
With the new adb functions, the static adb_tunnel functions become
unnecessary.
5 years ago
3fdbd994e0
Privatize low-level adb functions
...
Only expose the interruptible user-friendly API.
5 years ago
ce225f019a
Use new user-friendly adb API
...
Replace the adb_exec_*() calls by the new adb functions to simplify.
5 years ago
b7559744a7
Expose new user-friendly adb functions
...
Expose interruptible adb functions which return the expected result
directly, without exposing the process (sc_pid) to the caller.
5 years ago
afb5a5e80f
Rename adb functions to adb_exec_*
...
This paves the way to replace them by more user-friendly functions that
will call them internally.
5 years ago
84334cf7db
Use sc_intr in file_handler
...
Replace manual interruption handling by the recent sc_intr mechanism.
5 years ago
0ba2686e1d
Simplify file_handler
...
Call the target functions directly.
5 years ago
55648d4d64
Improve file_handler readability
...
Use local variables as short name aliases.
5 years ago
13fd693b50
Simplify adb_execute_p()
...
Only pass the stdout pipe as parameter, scrcpy never writes to stdin or
reads from stderr of an adb process.
5 years ago
0426ae885c
Make "adb get-serialno" interruptible
...
All process executions must be interruptible, so that Ctrl+c reacts
immediately.
5 years ago
ea454e9cee
Add interruptible function to read from pipe
...
This will avoid to block Ctrl+c if the process the pipe is read from
takes too much time.
5 years ago
cb65531533
Simplify sc_str_truncate()
...
Use strcspn() to get the prefix length directly.
5 years ago
9619ade706
Generalize string trunctation util function
...
Add an additional argument to let the client pass the possible end
chars.
5 years ago
f2781a8b6d
Expose util function to truncate first line
...
Move the local implementation from adb functions to the string util
functions.
5 years ago
443cb14d6e
Assume non-NULL serial in file_handler
...
The previous commit guarantees to always initialize the serial, so the
file_handle may assume it is never NULL.
5 years ago
b30c3a429f
Always retrieve device serial
...
This allows to execute all adb commands with the specific -s parameter,
even if it is not provided by the user.
In practice, calling adb without -s works if there is exactly one device
connected. But some adb commands (for example "adb push" on drag & drop)
could be executed after another device is connected, so the actual
device serial must be known.
5 years ago
632bd5697b
Add missing error handling
...
If "adb get-serialno" fails, attempting to read from the uninitialized
pipe is incorrect.
5 years ago
de50846905
Close process on check success
...
The interruptible version of the function to check process success
(sc_process_check_success_intr()) did not accept a close parameter to
avoid a race condition. But as the result, the processes were not closed
at all.
Add a close parameter, and close the process separately to avoid the
race condition.
5 years ago
9cb14b5166
Inherit only specific handles on Windows
...
To be able to communicate with a child process via stdin, stdout and
stderr, the CreateProcess() parameter bInheritHandles must be set to
TRUE. But this causes *all* handles to be inherited, including sockets.
As a result, the server socket was inherited by the process running adb
to execute the server on the device, so it could not be closed properly,
causing other scrcpy instances to fail.
To fix the issue, use an extended API to explicitly set the HANDLEs to
inherit:
- <https://stackoverflow.com/a/28185363/1987178 >
- <https://devblogs.microsoft.com/oldnewthing/20111216-00/?p=8873 >
Fixes #2779 <https://github.com/Genymobile/scrcpy/issues/2779 >
PR #2783 <https://github.com/Genymobile/scrcpy/pull/2783 >
5 years ago
9cb8766220
Factorize resource release after CreateProcess()
...
Free the wide characters string in all cases before checking for errors.
5 years ago
fd4ec784e0
Remove useless assignments on error
...
Leave the output parameter untouched on error.
5 years ago
52cebe1597
Fix Windows sc_pipe function names
...
The implementation name was incorrect (it was harmless, because they are
not used on Windows).
5 years ago
6a27062f48
Stop connection attempts if interrupted
...
If the interruptor is interrupted, every network call will fail, but the
retry-on-error mechanism must also be stopped.
5 years ago
739ff9dce0
Fix compilation errors with old SDL versions
...
SDL_PixelFormatEnum has been introduced in SDL 2.0.10:
<cc6a8ac87ea1c11854f2Fixes #2777 <https://github.com/Genymobile/scrcpy/issues/2777 >
PR #2781 <https://github.com/Genymobile/scrcpy/pull/2781 >
Reviewed-by: Yu-Chen Lin <npes87184@gmail.com>
5 years ago
45b0f8123a
Increase delay to inject HID on Ctrl+v
...
2 milliseconds turn out to be insufficient sometimes. It seems that 5
milliseconds is enough (and still not noticeable).
5 years ago
c1a34881d7
Use sc_ prefix for server
5 years ago
057c7a4df4
Move str_util to str
...
Simplify naming.
5 years ago
979ce64dc0
Improve string util API
...
Use prefixed names and improve documentation.
5 years ago
9a0bd545d5
Rename SC_INVALID_SOCKET to SC_SOCKET_NONE
...
For consistency with SC_PROCESS_NONE.
5 years ago
c4d008b96a
Extract adb tunnel to a separate component
...
This simplifies the server code.
5 years ago
0d45c29d13
Move IPV4_LOCALHOST to net.h
...
This constant will be used from several files.
5 years ago
37c840a4c8
Interrupt on process terminated
...
Interrupt any blocking call on process terminated, like on
server_stop().
This allows to interrupt any blocking accept() with correct
synchronization without additional complexity.
5 years ago
f488cbd7e7
Make server interruptible
...
Use an interruptor to immediately wake up blocking calls on
server_stop().
5 years ago
40340509d9
Add interruptor utilities
...
Expose wrapper functions for interrupting blocking calls, for process
and sockets.
5 years ago
e0896142db
Introduce interruptor tool
...
An interruptor instance will help to wake up a blocking call from
another thread (typically to terminate immediately on Ctrl+C).
5 years ago
0426708544
Run the server from a dedicated thread
...
Define server callbacks, start the server asynchronously and listen to
connection events to initialize scrcpy properly.
It will help to simplify the server code, and allows to run the UI event
loop while the server is connecting. In particular, this will allow to
receive SIGINT/Ctrl+C events during connection to interrupt immediately.
5 years ago
5b9c88693e
Wait using a condition variable in server
...
Currently, server_stop() is called from the same thread as
server_connect_to(), so interruption may never happen.
This is a step to prepare executing the server from a dedicated thread.
5 years ago
a54dc8212f
Reorder server functions
...
This will avoid forward declarations in future commits.
5 years ago
882e4cff5f
Copy server params
...
This is a preliminary step necessary to move the server to a separate
thread.
5 years ago
9fa4d1cd4a
Reorder server and server_params
...
This will allow to define a server_params field in server.
5 years ago
0bfa75a48b
Split socket creation and connect/listen
...
This will allow to assign the socket to a variable before connecting or
listening, so that it can be interrupted from another thread.
5 years ago
ed19901db1
Set video and control sockets only on success
...
Store the video and control sockets only if server_connect_to() returns
successfully.
5 years ago
e69356c550
Initialize tunnel_enabled flag internally
...
Set the flag from the inner methods, to avoid bypassing the assignment
by mistake (on error for example).
5 years ago
03de9224fc
Introduce process observer
...
Add a tool to easily observe process termination.
This allows to move this complexity out of the server code.
5 years ago
aa011832c1
Improve process API
...
Prefix symbols and constants names and improve documentation.
5 years ago
7e93abcf6d
Factorize common impl of process_execute()
...
Both implementations are the same. Move them to the common process.c.
5 years ago
e80e6631e4
Remove duplicate function declaration
...
The function process_terminate() was declared twice.
5 years ago
fcc04f967b
Improve file API
...
Prefix symbols and constants names and improve documentation.
5 years ago
d4c262301f
Move functions from process to file
...
Move filesystem-related functions from process.[ch] to file.[ch].
5 years ago
be55e250ca
Make screen_render() static
...
It is only used from screen.c.
5 years ago
7a733328bc
Adapt help to terminal size
...
If the error stream is a terminal, and we can retrieve the terminal
size, wrap the help content according to the terminal width.
5 years ago
38332f683c
Add util function to get terminal size
5 years ago
3f51a2ab43
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.
5 years ago
74ab0a4df8
Structure shortcuts help
5 years ago
f59e9e3cb0
Structure command line options help
...
It will allow to correctly print the help for the current terminal size
(even if for now it is hardcoded to 80 columns).
5 years ago
9ec3406568
Add line wrapper
...
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.
5 years ago
6dba1922c1
Add string buffer util
...
This will help to build strings incrementally.
5 years ago
570a003c39
Remove deprecated -T option
...
The short option -T is deprecated since v1.11. Only the long version
(--always-on-top) remains.
5 years ago
b62df7ee91
Remove deprecated -c option
...
The short option -c is deprecated since v1.11. Only the long version
(--crop) remains.
5 years ago
30d40f4e78
Document --power-off-on-close
...
The option was not documented.
Refs #824 <https://github.com/Genymobile/scrcpy/pull/824 >
5 years ago
f489f7fcad
Mention drag & drop for non-APK files in help
5 years ago
f65c3fde69
Fix typos in help
5 years ago
48fcfa96ab
Add missing include "common.h"
5 years ago
676fa73d2c
Wrap device name and size in a struct
...
As a benefit, this avoids to take care of the device name length on the
caller side.
5 years ago
58ea238fb2
Remove unnecessary variable
...
Test directly if a record filename is provided, without an intermediate
boolean variable.
5 years ago
13c4aa1a3b
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.
5 years ago
caf594c90e
Split SDL initialization
...
Initialize SDL_INIT_EVENTS first (very quick) and SDL_INIT_VIDEO after
the server (quite long).
5 years ago
688477ff65
Move SDL initialization
...
Inline SDL initialization in scrcpy(). This will allow to split
minimal initialization and video initialization.
5 years ago
ac539e1312
Set SDL hints before initialization
...
In theory, some SDL hints should be initialized before calling
SDL_Init().
5 years ago
a57c7d3a2b
Extract SDL hints
...
Set all SDL hints in a separate function.
5 years ago
d2d18466d4
Factorize SDL event push
...
Add a macro and inline function to call SDL_PushEvent() and log on error
(without actually handling the error, because there is nothing we could
do).
5 years ago
Romain Vimont
RipleyTom