From e4bb7c1d1feb51e3277db086207833611fc20603 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 17 Jul 2020 00:00:42 +0200
Subject: [PATCH] Accept Super as shortcut modifier

In addition to (left) Alt, also accept (left) Super. This is especially
convenient for macOS users (Super is the Cmd key).
---
 README.md        | 2 +-
 app/scrcpy.1     | 4 ++--
 app/src/cli.c    | 5 +++--
 app/src/scrcpy.h | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7eb5578a..3aa9180c 100644
--- a/README.md
+++ b/README.md
@@ -572,7 +572,7 @@ Also see [issue #14].
 ## Shortcuts
 
 In the following list, `MOD` is the shortcut modifier. By default, it's (left)
-`Alt`.
+`Alt` or (left) `Super`.
 
 It can be changed using `--shortcut-mod`. Possible keys are `lctrl`, `rctrl`,
 `lalt`, `ralt`, `lsuper` and `rsuper`. For example:
diff --git a/app/scrcpy.1 b/app/scrcpy.1
index 7ea778f3..d79b3964 100644
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -157,7 +157,7 @@ A shortcut can consist in several keys, separated by '+'. Several shortcuts can
 
 For example, to use either LCtrl+LAlt or LSuper for scrcpy shortcuts, pass "lctrl+lalt,lsuper".
 
-Default is "lalt" (left-Alt).
+Default is "lalt,lsuper" (left-Alt or left-Super).
 
 .TP
 .B \-S, \-\-turn\-screen\-off
@@ -218,7 +218,7 @@ Default is 0 (automatic).\n
 .SH SHORTCUTS
 
 In the following list, MOD is the shortcut modifier. By default, it's (left)
-Alt, but it can be configured by \-\-shortcut-mod.
+Alt or (left) Super, but it can be configured by \-\-shortcut-mod.
 
 .TP
 .B MOD+f
diff --git a/app/src/cli.c b/app/src/cli.c
index de32810e..216763a2 100644
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -149,7 +149,7 @@ scrcpy_print_usage(const char *arg0) {
         "        For example, to use either LCtrl+LAlt or LSuper for scrcpy\n"
         "        shortcuts, pass \"lctrl+lalt,lsuper\".\n"
         "\n"
-        "        Default is \"lalt\" (left-Alt).\n"
+        "        Default is \"lalt,lsuper\" (left-Alt or left-Super).\n"
         "\n"
         "    -S, --turn-screen-off\n"
         "        Turn the device screen off immediately.\n"
@@ -199,7 +199,8 @@ scrcpy_print_usage(const char *arg0) {
         "Shortcuts:\n"
         "\n"
         "    In the following list, MOD is the shortcut modifier. By default,\n"
-        "    it's (left) Alt, but it can be configured by --shortcut-mod.\n"
+        "    it's (left) Alt or (left) Super, but it can be configured by\n"
+        "    --shortcut-mod.\n"
         "\n"
         "    MOD+f\n"
         "        Switch fullscreen mode\n"
diff --git a/app/src/scrcpy.h b/app/src/scrcpy.h
index 220fcc2c..05af002f 100644
--- a/app/src/scrcpy.h
+++ b/app/src/scrcpy.h
@@ -95,8 +95,8 @@ struct scrcpy_options {
         .last = DEFAULT_LOCAL_PORT_RANGE_LAST, \
     }, \
     .shortcut_mods = { \
-        .data = {SC_MOD_LALT}, \
-        .count = 1, \
+        .data = {SC_MOD_LALT, SC_MOD_LSUPER}, \
+        .count = 2, \
     }, \
     .max_size = DEFAULT_MAX_SIZE, \
     .bit_rate = DEFAULT_BIT_RATE, \