Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity
1801 commits 2 branches 1 tag 4.1 MiB
Commit graph

1801 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
e8dfb723af Move control-related code to screencontrol.c 
Move the code handling user input from scrcpy.c to a separate file,
screencontrol.c.
 2018-02-08 18:14:50 +01:00
Romain Vimont
e1749a0c09 Remove the "adb reverse" tunnel immediately 
As soon as we accepted a connection, we can remove the "adb reverse"
tunnel.
 2018-02-08 17:40:09 +01:00
Romain Vimont
3b06e7d500 Move device-related code to device.c 
Move the code to read the initial device info from scrcpy.c to a
separate file, device.c.
 2018-02-08 17:40:09 +01:00
Romain Vimont
28c5cc030b Move server-related code to server.c 
The file server.c already existed, but exposed a low-level API. Make it
higher-level, so that scrcpy.c does not handle server details directly.
 2018-02-08 17:40:09 +01:00
Romain Vimont
6c578b5caa Move screen-related code to screen.c 
The file scrcpy.c contains too many different things in addition to the
main logic, so move the screen code to a separate file, screen.c.
 2018-02-08 15:43:28 +01:00
Romain Vimont
14c58546a7 Add missing include guards 
In practice, these headers are included only once, but it's a good
practice to always use include guards.
 2018-02-08 15:26:08 +01:00
Romain Vimont
ffae15e36a Rename control to controller 
The struct decoder is defined in decoder.h.

For naming consistency, define the struct controller in controller.h.
 2018-02-08 13:26:01 +01:00
Romain Vimont
7b7fd77134 Add missing static 
Some functions in scrcpy.c are not used outside the file, so declare
them static.
 2018-02-08 09:08:55 +01:00
Romain Vimont
e55e42a442 Apply Genymobile rules for Android projects 
Apply Genymobile checkstyle and gradle build files organization.
 2018-02-07 20:58:18 +01:00
Romain Vimont
285fc97d02 Fix horizontal scrolling constant 
Use AXIS_HSCROLL (available since API 12) instead of AXIS_SCROLL (since
API 26).
 2018-02-07 20:50:58 +01:00
Romain Vimont
c6d01331ed Simplify EventController 
In handleEvent(), connection.receiveControlEvent() may never return
null: either it returns a valid ControlEvent, either it throws an
Exception.

Therefore, there is no need to propagate a flag to indicate whether it
returned a valid ControlEvent.
 2018-02-07 17:48:21 +01:00
Romain Vimont
03c5f97e3f Extract control event parsing to separate methods 
Use one parse method per control event type.
 2018-02-07 17:45:28 +01:00
Romain Vimont
1eaa27ed9e Remove instrumented test dependencies 
The server is not a real Android application, it's just a jar with a
main method. Instrumented tests are meaningless in this context.
 2018-02-07 16:47:31 +01:00
Romain Vimont
5f51d605c0 Recreate codec and display on rotation changed 
On some devices, we can reuse the same codec and display, but on some
others (e.g. Nexus 5X with Android 7.1.2), it crashes on codec.stop()
with an IllegalStateException.

Therefore, always recreate the codec and display, so that it works on
all devices.
 2018-02-07 16:32:16 +01:00
Romain Vimont
d5acc8adc5 Always release output buffer 
If rotation changed, the dequeued output buffer was never released. Move
it to a finally block to avoid the leak.
 2018-02-07 15:50:38 +01:00
Romain Vimont
f39de46a39 Add delay before stopping server 
Let some time to print any exception trace before killing it.
 2018-02-07 15:41:59 +01:00
Romain Vimont
cb1428223f Log user request to quit 
Log at debug level user requests to quit.
 2018-02-07 15:41:59 +01:00
Romain Vimont
7fe11033cb Include dependencies version 
On --version, also print the dependencies version scrcpy has been
compiled against.
 2018-02-07 15:41:59 +01:00
Romain Vimont
9f6464acff Expose application version 
Expose scrcpy version via -v or --version.
 2018-02-07 15:41:59 +01:00
Romain Vimont
8d30d40b79 Make SKIP_FRAMES a compilation flag 
The skip_frames flag was a non-configurable runtime flag. Since it is
not exposed to the user, there is no need for a (possible) runtime cost.

For testing purpose, we still want it to be configurable, so make it a
compilation flag.
 2018-02-07 15:40:24 +01:00
Romain Vimont
53ff1aa410 Use meson to configure default values 
Make meson generate config.h with configured values.
 2018-02-07 12:09:10 +01:00
Romain Vimont
cb7e29180f Change the window icon color in debug mode 
To highlight the debug/release mode of the running application, use a
different window icon color in debug mode.
 2018-02-07 11:48:25 +01:00
Romain Vimont
33062ffb8c Add Makefile recipe for debug build 
Expose commands to build the application in debug mode.
 2018-02-07 11:47:10 +01:00
Romain Vimont
71c2bfdd22 Parse XPM without SDL_image 
We encounter some problems with SDL2_image on MSYS2 (Windows), so
implement our own XPM parsing which does not depend on SDL_image.

The input XPM is considered safe (it's in our source repo), so do not
check XPM format errors. This implies that read_xpm() is not safe to
call on any unsafe input.

Although less straightforward, use SDL_CreateRGBSurfaceFrom() instead of
SDL_CreateRGBSurfaceWithFormatFrom() because it is available with SDL
versions older than 2.0.5.
 2018-02-05 19:24:33 +01:00
Romain Vimont
920bafce73 Revert "Fix Makefile for Windows" 
In MSYS2 on Windows, the behavior is the same as on Linux.

On systems where the behavior is not the same, just customize the GRADLE
variable:

    GRADLE=gradlew make release

This reverts commit de192cab1b.
 2018-02-05 19:24:00 +01:00
Romain Vimont
f22d4decca Enable mouse focus clickthrough only if available 
The hint SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH appeared in SDL 2.0.5. Ignore
it if the SDL version is older.
 2018-02-05 16:15:52 +01:00
Romain Vimont
de192cab1b Fix Makefile for Windows 
The default value of GRADLE is "./gradlew", which is the correct value
on Linux.

On Windows, it should use gradlew.bat (by calling "gradlew") instead.
 2018-02-05 14:52:19 +01:00
Romain Vimont
52c89c7afb Add window icon 
Add a bugdroid icon loaded from an XPM.
 2018-02-05 14:46:00 +01:00
Romain Vimont
5eb91a4ca7 Fix scrcpy() return value 
The scrcpy() function returns a SDL_bool to indicate its success, but
was initialized to 0 (SDL_FALSE) instead of SDL_TRUE.
 2018-02-04 12:39:17 +01:00
Romain Vimont
82ee55845c Add "make run" 
To run the app during development, add a recipe "run" to the Makefile.
 2018-02-04 12:17:34 +01:00
Romain Vimont
1ac37c4291 Hide services in Device 
Expose useful methods directly in Device, without exposing the service
managers.
 2018-02-02 17:06:57 +01:00
Romain Vimont
06333e1e08 Cache managers in ServiceManager 
To guarantee that we instantiate services only one, cache the value the
first time.
 2018-02-02 16:25:37 +01:00
Romain Vimont
69a359c7f4 Refactor actions calls 
The purpose of handle_shortcut() was to group all actions together,
whether they are initiated from a text input event or a keycode event.

However, it did not handle the case where it was initiated from a mouse
event (a right-click must turn the screen on), since the action was
identified by the shortcut char.

Instead, expose one function per action, to be called directly from
where the event is handled.
 2018-02-02 15:23:04 +01:00
Romain Vimont
d73dee9833 fixup! Handle all shortcuts in the same function 2018-02-02 15:17:03 +01:00
Romain Vimont
0a70e24e80 Add new shortcuts description in help 
Document the new shortcuts in the help (scrcpy --help).
 2018-02-02 15:10:44 +01:00
Romain Vimont
3365460658 Turn screen on on start 
When starting scrcpy, immediately turn the screen on.
 2018-02-02 14:57:33 +01:00
Romain Vimont
a139509f11 Turn screen on on right-click 
The right-click is almost useless on Android, so use it to turn the
screen on.

Add a new control event type (command) to request the server to turn the
screen on.
 2018-02-02 14:56:03 +01:00
Romain Vimont
228545cefd Reformat EventController 
Reformated by Android Studio.
 2018-02-02 14:52:00 +01:00
Romain Vimont
deba69d022 Handle all shortcuts in the same function 
Shortcuts are sometimes initiated from a keycode event, and sometimes
from a text input event.

Move the handling to a unique function.
 2018-02-02 12:01:38 +01:00
Romain Vimont
7f6a565401 Extract shortcut actions to separate functions 
To simplify event handling code, move all actions to separate functions.
 2018-02-02 11:52:19 +01:00
Romain Vimont
f8ad007a28 Move switch fullscreen logs 
Logs were printed by the caller of switch_fullscreen(). Move them inside
the function to simplify event handling code.
 2018-02-02 11:48:05 +01:00
Romain Vimont
6fe7b84629 Add shortcuts for physical keys 
Add shortcuts for HOME, BACK, APPS, POWER, VOLUME_UP and VOLUME_DOWN.
 2018-02-02 11:39:25 +01:00
Romain Vimont
1faf6cfd9d Rename the server scrcpy-server.jar 
The server is built as an APK to simplify the build, but in fact this is
a simple jar (it is not even signed).

In order to avoid confusion, rename it to .jar, so that users do not try
to "adb install" it.

Also rename it from "scrcpy" to "scrcpy-server" to distinguish from the
client-side.
 2018-02-02 09:37:10 +01:00
Romain Vimont
2172c53b7b Force the server target filename 
The server path may be customized using SCRCPY_APK. If its basename is
different from "scrcpy.apk", it will be pushed with a different name,
so the execution would fail.

Therefore, force the push target filename.
 2018-02-02 09:34:52 +01:00
Romain Vimont
ca44585f96 Do not send simple mouse move events 
Moving the mouse without any button pressed has no effect on Android.
Therefore, do not even send these very frequent events.
 2018-02-02 09:26:25 +01:00
Romain Vimont
79b28eb68f Enable mouse focus clickthrough 
Consider a click to gain focus as a click on the device.
 2018-02-01 20:52:44 +01:00
Romain Vimont
6b546a87ab Add bit-rate command-line option 
Add a command-line option (-b/--bit-rate) to customize the video
bit-rate.
 2018-02-01 17:11:40 +01:00
Romain Vimont
7fe7bbf58c Check empty string before strtol() 
There is no need to call strtol() if the input string is empty.
 2018-02-01 17:11:40 +01:00
Romain Vimont
3bc63708b4 Remove useless newlines in SDL_Log* 
Trailing new line is not necessary in SDL_Log* methods.
 2018-02-01 17:11:40 +01:00
Romain Vimont
2683fa20ed Add debug log for shortcuts 
Add a debug log for every succeeded shortcut action.
 2018-02-01 17:11:40 +01:00