From 88ee6bc928e82a407a976665b1401cf23c3879df Mon Sep 17 00:00:00 2001
From: Romain Vimont <rvimont@genymobile.com>
Date: Fri, 23 Mar 2018 10:10:24 +0100
Subject: [PATCH] Swap MENU and APP_SWITCH shortcuts

Ctrl+s was mapped to MENU, while Ctrl+m was mapped to APP_SWITCH.

To avoid confusion, swap the shortcuts:
 - Ctrl+m like _M_enu
 - Ctrl+s like _S_witch
---
 README.md              | 4 ++--
 app/src/inputmanager.c | 4 ++--
 app/src/main.c         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8ca43de9..7e902b10 100644
--- a/README.md
+++ b/README.md
@@ -257,8 +257,8 @@ To run without installing:
  | resize window to remove black borders  | `Ctrl`+`x` \| _Double-click¹_ |
  | click on `HOME`                        | `Ctrl`+`h` \| _Middle-click_  |
  | click on `BACK`                        | `Ctrl`+`b` \| _Right-click²_  |
- | click on `APP_SWITCH`                  | `Ctrl`+`m`                    |
- | click on `MENU`                        | `Ctrl`+`s`                    |
+ | click on `APP_SWITCH`                  | `Ctrl`+`s`                    |
+ | click on `MENU`                        | `Ctrl`+`m`                    |
  | click on `VOLUME_UP`                   | `Ctrl`+`+`                    |
  | click on `VOLUME_DOWN`                 | `Ctrl`+`-`                    |
  | click on `POWER`                       | `Ctrl`+`p`                    |
diff --git a/app/src/inputmanager.c b/app/src/inputmanager.c
index 35d9cbee..a0ffb87c 100644
--- a/app/src/inputmanager.c
+++ b/app/src/inputmanager.c
@@ -180,10 +180,10 @@ void input_manager_process_key(struct input_manager *input_manager,
             case SDLK_BACKSPACE:
                 action_back(input_manager->controller);
                 return;
-            case SDLK_m:
+            case SDLK_s:
                 action_app_switch(input_manager->controller);
                 return;
-            case SDLK_s:
+            case SDLK_m:
                 action_menu(input_manager->controller);
                 return;
             case SDLK_p:
diff --git a/app/src/main.c b/app/src/main.c
index 2b1f2c92..740801b3 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -70,10 +70,10 @@ static void usage(const char *arg0) {
         "    Right-click (when screen is on)\n"
         "        click on BACK\n"
         "\n"
-        "    Ctrl+m\n"
+        "    Ctrl+s\n"
         "        click on APP_SWITCH\n"
         "\n"
-        "    Ctrl+s\n"
+        "    Ctrl+m\n"
         "        click on MENU\n"
         "\n"
         "    Ctrl+'+'\n"