From dc628cc433b15a19d7c782f1fb1953e522c99e26 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sun, 2 Nov 2025 15:09:21 +0100
Subject: [PATCH] Enable "reset video" shortcut for camera

Make the existing "reset video" feature (MOD+Shift+R) also work for a
camera video source.
---
 app/src/input_manager.c                       | 21 +++++++++++++------
 .../genymobile/scrcpy/control/Controller.java | 12 ++++++++---
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/src/input_manager.c b/app/src/input_manager.c
index 542f2f6f..00ad12df 100644
--- a/app/src/input_manager.c
+++ b/app/src/input_manager.c
@@ -474,6 +474,19 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                 }
                 return;
         }
+
+        // Flatten conditions to avoid additional indentation levels
+        if (control) {
+            // Controls for all sources
+            switch (sdl_keycode) {
+                case SDLK_R:
+                    if (!repeat && shift && down && !paused) {
+                        reset_video(im);
+                    }
+                    return;
+            }
+        }
+
         if (control && !im->camera) {
             switch (sdl_keycode) {
                 case SDLK_H:
@@ -554,12 +567,8 @@ sc_input_manager_process_key(struct sc_input_manager *im,
                     }
                     return;
                 case SDLK_R:
-                    if (!repeat && down && !paused) {
-                        if (shift) {
-                            reset_video(im);
-                        } else {
-                            rotate_device(im);
-                        }
+                    if (!repeat && !shift && down && !paused) {
+                        rotate_device(im);
                     }
                     return;
                 case SDLK_K:
diff --git a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
index d9b4b197..9ef13d09 100644
--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
@@ -290,6 +290,15 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         int type = msg.getType();
 
+        // Events for all sources (display or camera)
+        switch (type) {
+            case ControlMessage.TYPE_RESET_VIDEO:
+                resetVideo();
+                return true;
+            default:
+                // fall through
+        }
+
         if (!camera) {
             switch (type) {
                 case ControlMessage.TYPE_INJECT_KEYCODE:
@@ -356,9 +365,6 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 case ControlMessage.TYPE_START_APP:
                     startAppAsync(msg.getText());
                     return true;
-                case ControlMessage.TYPE_RESET_VIDEO:
-                    resetVideo();
-                    return true;
                 default:
                     // fall through
             }