Display and control your Android device
Support power off on close
Yu-Chen Lin1d615a0d51d5
diff --git a/app/src/cli.c b/app/src/cli.cindex 7f31b32c..484c48ef 100644--- a/app/src/cli.c+++ b/app/src/cli.c@@ -666,6 +666,7 @@ guess_record_format(const char *filename) {#define OPT_FORWARD_ALL_CLICKS 1023#define OPT_LEGACY_PASTE 1024#define OPT_ENCODER_NAME 1025+#define OPT_POWER_OFF_ON_CLOSE 1026boolscrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {@@ -716,6 +717,8 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {{"window-height", required_argument, NULL, OPT_WINDOW_HEIGHT},{"window-borderless", no_argument, NULL,OPT_WINDOW_BORDERLESS},+ {"power-off-on-close", no_argument, NULL,+ OPT_POWER_OFF_ON_CLOSE},{NULL, 0, NULL, 0 },};@@ -884,6 +887,9 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {case OPT_LEGACY_PASTE:opts->legacy_paste = true;break;+ case OPT_POWER_OFF_ON_CLOSE:+ opts->power_off_on_close = true;+ break;default:// getopt prints the error message on stderrreturn false;diff --git a/app/src/scrcpy.c b/app/src/scrcpy.cindex 7ed9cb2c..624ddbca 100644--- a/app/src/scrcpy.c+++ b/app/src/scrcpy.c@@ -300,6 +300,7 @@ scrcpy(const struct scrcpy_options *options) {.codec_options = options->codec_options,.encoder_name = options->encoder_name,.force_adb_forward = options->force_adb_forward,+ .power_off_on_close = options->power_off_on_close,};if (!server_start(&server, options->serial, ¶ms)) {goto end;diff --git a/app/src/scrcpy.h b/app/src/scrcpy.hindex b877a987..8ee70f60 100644--- a/app/src/scrcpy.h+++ b/app/src/scrcpy.h@@ -82,6 +82,7 @@ struct scrcpy_options {bool forward_key_repeat;bool forward_all_clicks;bool legacy_paste;+ bool power_off_on_close;};#define SCRCPY_OPTIONS_DEFAULT { \@@ -129,6 +130,7 @@ struct scrcpy_options {.forward_key_repeat = true, \.forward_all_clicks = false, \.legacy_paste = false, \+ .power_off_on_close = false, \}booldiff --git a/app/src/server.c b/app/src/server.cindex 096ac18f..a0b40f96 100644--- a/app/src/server.c+++ b/app/src/server.c@@ -293,6 +293,7 @@ execute_server(struct server *server, const struct server_params *params) {params->stay_awake ? "true" : "false",params->codec_options ? params->codec_options : "-",params->encoder_name ? params->encoder_name : "-",+ params->power_off_on_close ? "true" : "false",};#ifdef SERVER_DEBUGGERLOGI("Server debugger waiting for a client on device port "diff --git a/app/src/server.h b/app/src/server.hindex 83c528ef..15306e4f 100644--- a/app/src/server.h+++ b/app/src/server.h@@ -46,6 +46,7 @@ struct server_params {bool show_touches;bool stay_awake;bool force_adb_forward;+ bool power_off_on_close;};// init default valuesdiff --git a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java b/server/src/main/java/com/genymobile/scrcpy/CleanUp.javaindex efaa059a..ccdc9fd8 100644--- a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java+++ b/server/src/main/java/com/genymobile/scrcpy/CleanUp.java@@ -19,19 +19,21 @@ public final class CleanUp {// not instantiable}- public static void configure(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode) throws IOException {- boolean needProcess = disableShowTouches || restoreStayOn != -1 || restoreNormalPowerMode;+ public static void configure(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode, boolean powerOffScreen, int displayId)+ throws IOException {+ boolean needProcess = disableShowTouches || restoreStayOn != -1 || restoreNormalPowerMode || powerOffScreen;if (needProcess) {- startProcess(disableShowTouches, restoreStayOn, restoreNormalPowerMode);+ startProcess(disableShowTouches, restoreStayOn, restoreNormalPowerMode, powerOffScreen, displayId);} else {// There is no additional clean up to do when scrcpy diesunlinkSelf();}}- private static void startProcess(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode) throws IOException {+ private static void startProcess(boolean disableShowTouches, int restoreStayOn, boolean restoreNormalPowerMode, boolean powerOffScreen,+ int displayId) throws IOException {String[] cmd = {"app_process", "/", CleanUp.class.getName(), String.valueOf(disableShowTouches), String.valueOf(- restoreStayOn), String.valueOf(restoreNormalPowerMode)};+ restoreStayOn), String.valueOf(restoreNormalPowerMode), String.valueOf(powerOffScreen), String.valueOf(displayId)};ProcessBuilder builder = new ProcessBuilder(cmd);builder.environment().put("CLASSPATH", SERVER_PATH);@@ -61,6 +63,8 @@ public final class CleanUp {boolean disableShowTouches = Boolean.parseBoolean(args[0]);int restoreStayOn = Integer.parseInt(args[1]);boolean restoreNormalPowerMode = Boolean.parseBoolean(args[2]);+ boolean powerOffScreen = Boolean.parseBoolean(args[3]);+ int displayId = Integer.parseInt(args[4]);if (disableShowTouches || restoreStayOn != -1) {ServiceManager serviceManager = new ServiceManager();@@ -76,9 +80,12 @@ public final class CleanUp {}}- if (restoreNormalPowerMode) {- Ln.i("Restoring normal power mode");- if (Device.isScreenOn()) {+ if (Device.isScreenOn()) {+ if (powerOffScreen) {+ Ln.i("Power off screen");+ Device.powerOffScreen(displayId);+ } else if (restoreNormalPowerMode) {+ Ln.i("Restoring normal power mode");Device.setScreenPowerMode(Device.POWER_MODE_NORMAL);}}diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/server/src/main/java/com/genymobile/scrcpy/Options.javaindex 150d06a8..cf11df0f 100644--- a/server/src/main/java/com/genymobile/scrcpy/Options.java+++ b/server/src/main/java/com/genymobile/scrcpy/Options.java@@ -17,6 +17,7 @@ public class Options {private boolean stayAwake;private String codecOptions;private String encoderName;+ private boolean powerOffScreenOnClose;public Ln.Level getLogLevel() {return logLevel;@@ -129,4 +130,12 @@ public class Options {public void setEncoderName(String encoderName) {this.encoderName = encoderName;}++ public void setPowerOffScreenOnClose(boolean powerOffScreenOnClose) {+ this.powerOffScreenOnClose = powerOffScreenOnClose;+ }++ public boolean getPowerOffScreenOnClose() {+ return this.powerOffScreenOnClose;+ }}diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex 7887a5a7..674f314b 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -50,7 +50,7 @@ public final class Server {}}- CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn, true);+ CleanUp.configure(mustDisableShowTouchesOnCleanUp, restoreStayOn, true, options.getPowerOffScreenOnClose(), options.getDisplayId());boolean tunnelForward = options.isTunnelForward();@@ -135,7 +135,7 @@ public final class Server {"The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");}- final int expectedParameters = 15;+ final int expectedParameters = 16;if (args.length != expectedParameters) {throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");}@@ -185,6 +185,9 @@ public final class Server {String encoderName = "-".equals(args[14]) ? null : args[14];options.setEncoderName(encoderName);+ boolean powerOffScreenOnClose = Boolean.parseBoolean(args[15]);+ options.setPowerOffScreenOnClose(powerOffScreenOnClose);+return options;}