From fc8942aa03dd18b20d6b2e450b13ba56d2c3489e Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Mon, 25 Apr 2022 18:44:42 +0200
Subject: [PATCH] Apply requested window size in OTG mode

Fixes #3099 <https://github.com/Genymobile/scrcpy/issues/3099>
PR #3219 <https://github.com/Genymobile/scrcpy/pull/3219>
---
 app/src/usb/scrcpy_otg.c | 2 ++
 app/src/usb/screen_otg.c | 9 +++++++--
 app/src/usb/screen_otg.h | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/usb/scrcpy_otg.c b/app/src/usb/scrcpy_otg.c
index db5e64d8..052facff 100644
--- a/app/src/usb/scrcpy_otg.c
+++ b/app/src/usb/scrcpy_otg.c
@@ -162,6 +162,8 @@ scrcpy_otg(struct scrcpy_options *options) {
         .always_on_top = options->always_on_top,
         .window_x = options->window_x,
         .window_y = options->window_y,
+        .window_width = options->window_width,
+        .window_height = options->window_height,
         .window_borderless = options->window_borderless,
     };
 
diff --git a/app/src/usb/screen_otg.c b/app/src/usb/screen_otg.c
index 93b0ba6e..450cbe1e 100644
--- a/app/src/usb/screen_otg.c
+++ b/app/src/usb/screen_otg.c
@@ -69,8 +69,8 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
           ? params->window_x : (int) SDL_WINDOWPOS_UNDEFINED;
     int y = params->window_y != SC_WINDOW_POSITION_UNDEFINED
           ? params->window_y : (int) SDL_WINDOWPOS_UNDEFINED;
-    int width = 256;
-    int height = 256;
+    int width = params->window_width ? params->window_width : 256;
+    int height = params->window_height ? params->window_height : 256;
 
     uint32_t window_flags = SDL_WINDOW_ALLOW_HIGHDPI;
     if (params->always_on_top) {
@@ -97,6 +97,11 @@ sc_screen_otg_init(struct sc_screen_otg *screen,
     if (icon) {
         SDL_SetWindowIcon(screen->window, icon);
 
+        if (!SDL_RenderSetLogicalSize(screen->renderer, icon->w, icon->h)) {
+            LOGW("Could not set renderer logical size: %s", SDL_GetError());
+            // don't fail
+        }
+
         screen->texture = SDL_CreateTextureFromSurface(screen->renderer, icon);
         scrcpy_icon_destroy(icon);
         if (!screen->texture) {
diff --git a/app/src/usb/screen_otg.h b/app/src/usb/screen_otg.h
index 0973ce59..a0acf40b 100644
--- a/app/src/usb/screen_otg.h
+++ b/app/src/usb/screen_otg.h
@@ -29,6 +29,8 @@ struct sc_screen_otg_params {
     bool always_on_top;
     int16_t window_x; // accepts SC_WINDOW_POSITION_UNDEFINED
     int16_t window_y; // accepts SC_WINDOW_POSITION_UNDEFINED
+    uint16_t window_width;
+    uint16_t window_height;
     bool window_borderless;
 };