Add option for disabling screensaver

PR #1502 <#1502> Signed-off-by: Romain Vimont <[email protected]>
Genymobile · Jun 18, 2020 · 4d49142 · 4d49142
1 parent 1e4ee54
commit 4d49142
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -479,6 +479,17 @@ scrcpy -t
 Note that it only shows _physical_ touches (with the finger on the device).
 
 
+#### Disable screensaver
+
+By default, scrcpy does not prevent the screensaver to run on the computer.
+
+To disable it:
+
+```bash
+scrcpy --disable-screensaver
+```
+
+
 ### Input control
 
 #### Rotate device screen

diff --git a/app/scrcpy.1 b/app/scrcpy.1
@@ -43,6 +43,10 @@ The values are expressed in the device natural orientation (typically, portrait
 .B \-\-max\-size
 value is computed on the cropped size.
 
+.TP
+.BI "\-\-disable-screensaver"
+Disable screensaver while scrcpy is running.
+
 .TP
 .BI "\-\-display " id
 Specify the display id to mirror.

diff --git a/app/src/cli.c b/app/src/cli.c
@@ -45,6 +45,9 @@ scrcpy_print_usage(const char *arg0) {
         "        (typically, portrait for a phone, landscape for a tablet).\n"
         "        Any --max-size value is computed on the cropped size.\n"
         "\n"
+        "    --disable-screensaver\n"
+        "        Disable screensaver while scrcpy is running.\n"
+        "\n"
         "    --display id\n"
         "        Specify the display id to mirror.\n"
         "\n"
@@ -526,6 +529,7 @@ guess_record_format(const char *filename) {
 #define OPT_NO_MIPMAPS             1017
 #define OPT_CODEC_OPTIONS          1018
 #define OPT_FORCE_ADB_FORWARD      1019
+#define OPT_DISABLE_SCREENSAVER    1020
 
 bool
 scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@@ -534,6 +538,8 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
         {"bit-rate",               required_argument, NULL, 'b'},
         {"codec-options",          required_argument, NULL, OPT_CODEC_OPTIONS},
         {"crop",                   required_argument, NULL, OPT_CROP},
+        {"disable-screensaver",    no_argument,       NULL,
+                                                  OPT_DISABLE_SCREENSAVER},
         {"display",                required_argument, NULL, OPT_DISPLAY_ID},
         {"force-adb-forward",      no_argument,       NULL,
                                                   OPT_FORCE_ADB_FORWARD},
@@ -716,6 +722,9 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
             case OPT_FORCE_ADB_FORWARD:
                 opts->force_adb_forward = true;
                 break;
+            case OPT_DISABLE_SCREENSAVER:
+                opts->disable_screensaver = true;
+                break;
             default:
                 // getopt prints the error message on stderr
                 return false;

diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c
@@ -63,7 +63,8 @@ BOOL WINAPI windows_ctrl_handler(DWORD ctrl_type) {
 
 // init SDL and set appropriate hints
 static bool
-sdl_init_and_configure(bool display, const char *render_driver) {
+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());
@@ -112,8 +113,13 @@ sdl_init_and_configure(bool display, const char *render_driver) {
         LOGW("Could not disable minimize on focus loss");
     }
 
-    // Do not disable the screensaver when scrcpy is running
-    SDL_EnableScreenSaver();
+    if (disable_screensaver) {
+        LOGD("Screensaver disabled");
+        SDL_DisableScreenSaver();
+    } else {
+        LOGD("Screensaver enabled");
+        SDL_EnableScreenSaver();
+    }
 
     return true;
 }
@@ -321,7 +327,8 @@ scrcpy(const struct scrcpy_options *options) {
     bool controller_initialized = false;
     bool controller_started = false;
 
-    if (!sdl_init_and_configure(options->display, options->render_driver)) {
+    if (!sdl_init_and_configure(options->display, options->render_driver,
+                                options->disable_screensaver)) {
         goto end;
     }
 

diff --git a/app/src/scrcpy.h b/app/src/scrcpy.h
@@ -43,6 +43,7 @@ struct scrcpy_options {
     bool mipmaps;
     bool stay_awake;
     bool force_adb_forward;
+    bool disable_screensaver;
 };
 
 #define SCRCPY_OPTIONS_DEFAULT { \
@@ -81,6 +82,7 @@ struct scrcpy_options {
     .mipmaps = true, \
     .stay_awake = false, \
     .force_adb_forward = false, \
+    .disable_screensaver = false, \
 }
 
 bool