From c462aaf37492deb1b535d8a215996b0caa1f9505 Mon Sep 17 00:00:00 2001
From: Yoshi Sugawara <yoshi.sugawara@gmail.com>
Date: Tue, 21 Jul 2020 11:33:37 -1000
Subject: [PATCH] iOS Metal: implement the metric method for the graphics
 context to support getting the dpi - this is needed to make the touch
 interactions with the menus work. Update the metal and opengl graphics
 context to support a lower dpi for larger screen iPhones to make better use
 of the screen

---
 gfx/drivers/metal.m                | 103 ++++++++++++++++++++++++++++-
 gfx/drivers_context/cocoa_gl_ctx.m |  10 ++-
 2 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m
index 8ca56d686a..9b39a688b0 100644
--- a/gfx/drivers/metal.m
+++ b/gfx/drivers/metal.m
@@ -54,11 +54,108 @@
 
 #import "../video_coord_array.h"
 
-/* Temporary workaround for metal not being able to poll flags during init */
-static gfx_ctx_driver_t metal_fake_context;
-
 static uint32_t metal_get_flags(void *data);
 
+#pragma mark Graphics Context for Metal
+
+// The graphics context for the Metal driver is just a stubbed out version
+// It supports getting metrics such as dpi which is needed for iOS/tvOS
+
+static bool metal_gfx_ctx_get_metrics(void *data, enum display_metric_types type,
+            float *value)
+{
+#ifdef HAVE_COCOATOUCH
+    CGRect screenRect = [[UIScreen mainScreen] bounds];
+    CGFloat scale = [[UIScreen mainScreen] scale];
+    float   displayHeight        = screenRect.size.height;
+    float   physicalWidth        = screenRect.size.width  * scale;
+    float   physicalHeight       = screenRect.size.height * scale;
+    float   dpi                  = 160                     * scale;
+    CGFloat maxSize              = fmaxf(physicalWidth, physicalHeight);
+    NSInteger idiom_type         = UI_USER_INTERFACE_IDIOM();
+    switch (idiom_type)
+    {
+       case -1:
+          break;
+       case UIUserInterfaceIdiomPad:
+          dpi = 132 * scale;
+          break;
+       case UIUserInterfaceIdiomPhone:
+            if (maxSize >= 2208.0) {
+                // Larger iPhones: iPhone Plus, X, XR, XS, XS Max, 11, 11 Pro Max
+                dpi = 81 * scale;
+            } else {
+                dpi = 163 * scale;
+            }
+          break;
+       case UIUserInterfaceIdiomTV:
+       case UIUserInterfaceIdiomCarPlay:
+          /* TODO */
+          break;
+    }
+    (void)displayHeight;
+
+    switch (type)
+    {
+        case DISPLAY_METRIC_MM_WIDTH:
+            *value = physicalWidth;
+            break;
+        case DISPLAY_METRIC_MM_HEIGHT:
+            *value = physicalHeight;
+            break;
+        case DISPLAY_METRIC_DPI:
+            *value = dpi;
+            break;
+        case DISPLAY_METRIC_NONE:
+        default:
+            *value = 0;
+            return false;
+    }
+    return true;
+#else
+    return false;
+#endif
+}
+
+/* Temporary workaround for metal not being able to poll flags during init */
+static gfx_ctx_driver_t metal_fake_context = {
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL, /* get_refresh_rate */
+       NULL, /* get_video_output_size */
+       NULL, /* get_video_output_prev */
+       NULL, /* get_video_output_next */
+#ifdef HAVE_COCOATOUCH
+       metal_gfx_ctx_get_metrics,
+#else
+       NULL,
+#endif
+       NULL, /* translate_aspect */
+       NULL, /* update_title */
+       NULL,
+       NULL, /* set_resize */
+       NULL,
+       NULL,
+       false,
+       NULL,
+       NULL,
+       NULL,
+       NULL, /* image_buffer_init */
+       NULL, /* image_buffer_write */
+       NULL, /* show_mouse */
+       "metal",
+       NULL,
+       NULL,
+       NULL,
+       NULL, /* get_context_data */
+       NULL  /* make_current */
+};
+
 static bool metal_set_shader(void *data,
       enum rarch_shader_type type, const char *path);
 
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index 08538a49f1..8f51daf59c 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -411,7 +411,8 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty
     float   physical_width        = screen_rect.size.width  * scale;
     float   physical_height       = screen_rect.size.height * scale;
     float   dpi                   = 160                     * scale;
-    unsigned idiom_type           = UI_USER_INTERFACE_IDIOM();
+    CGFloat maxSize               = fmaxf(physical_width, physical_height);
+    NSInteger idiom_type           = UI_USER_INTERFACE_IDIOM();
 
     switch (idiom_type)
     {
@@ -422,7 +423,12 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty
           dpi = 132 * scale;
           break;
        case UIUserInterfaceIdiomPhone:
-          dpi = 163 * scale;
+          if (maxSize >= 2208.0) {
+              // Larger iPhones: iPhone Plus, X, XR, XS, XS Max, 11, 11 Pro Max
+              dpi = 81 * scale;
+          } else {
+              dpi = 163 * scale;
+          }
           break;
        case UIUserInterfaceIdiomTV:
        case UIUserInterfaceIdiomCarPlay: