iOS/tvOS: don't use draw observer unless fast forwarding (#18362)

Author: warmenhoven

menu/menu_defines.h

@@ -50,7 +50,8 @@ enum menu_state_flags
    MENU_ST_FLAG_SCREENSAVER_SUPPORTED       = (1 << 10),
    MENU_ST_FLAG_SCREENSAVER_ACTIVE          = (1 << 11),
    MENU_ST_FLAG_PENDING_RELOAD_CORE         = (1 << 12),
-   MENU_ST_FLAG_PENDING_STARTUP_PAGE        = (1 << 13)
+   MENU_ST_FLAG_PENDING_STARTUP_PAGE        = (1 << 13),
+   MENU_ST_FLAG_BLOCK_ALL_INPUT             = (1 << 14)
 };
 
 enum menu_scroll_mode

menu/menu_driver.c

@@ -5318,6 +5318,10 @@ unsigned menu_event(
       RETRO_DEVICE_ID_JOYPAD_Y
    };
 
+   /* Check if all menu input is blocked */
+   if (menu_st->flags & MENU_ST_FLAG_BLOCK_ALL_INPUT)
+      return MENU_ACTION_NOOP;
+
    ok_old                                          = ok_current;
 
    /* Get pointer (mouse + touchscreen) input

ui/drivers/cocoa/cocoa_common.m

@@ -120,8 +120,12 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
 #endif
 
    runloop_flags = runloop_get_flags();
-   if (!(runloop_flags & RUNLOOP_FLAG_IDLE))
+   if (runloop_flags & RUNLOOP_FLAG_FASTMOTION)
       CFRunLoopWakeUp(CFRunLoopGetMain());
+#if TARGET_OS_IPHONE
+   else
+      rarch_stop_draw_observer();
+#endif
 }
 
 void rarch_start_draw_observer(void)
@@ -173,8 +177,12 @@ -(void)step:(CADisplayLink*)target API_AVAILABLE(macos(14.0), ios(3.1), tvos(3.1
    }
 
    uint32_t runloop_flags = runloop_get_flags();
-   if (!(runloop_flags & RUNLOOP_FLAG_IDLE))
+   if (runloop_flags & RUNLOOP_FLAG_FASTMOTION)
+   {
+      /* Fast-forward: observer handles all iterations */
+      rarch_start_draw_observer();
       CFRunLoopWakeUp(CFRunLoopGetMain());
+   }
 #endif
 }
 #endif
@@ -195,14 +203,22 @@ + (CocoaView*)get
           * the display server will set the exact rate when needed */
          [view.displayLink setPreferredFrameRateRange:CAFrameRateRangeMake(60, 120, 120)];
       }
+      else
+      {
+         /* iOS 9-14: Use preferredFramesPerSecond as fallback */
+         view.displayLink.preferredFramesPerSecond = 120;
+      }
+#else
+      /* Building with SDK < iOS 15: Use preferredFramesPerSecond */
+      view.displayLink.preferredFramesPerSecond = 120;
 #endif
-      [view.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+      [view.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
 #elif defined(OSX) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
       if (@available(macOS 14.0, *))
       {
          view.displayLink = [view displayLinkWithTarget:view selector:@selector(step:)];
          view.displayLink.preferredFrameRateRange = CAFrameRateRangeMake(60, 120, 120);
-         [view.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+         [view.displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
       }
 #endif
    }
@@ -757,22 +773,26 @@ - (void)webServerDidCompleteBonjourRegistration:(GCDWebServer*)server
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Welcome to RetroArch" message:[NSString stringWithFormat:@"To transfer files from your computer, go to one of these addresses on your web browser:\n\n%@",servers] preferredStyle:UIAlertControllerStyleAlert];
         [alert addAction:[UIAlertAction actionWithTitle:@"OK"
             style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                rarch_start_draw_observer();
+                struct menu_state *menu_st = menu_state_get_ptr();
+                menu_st->flags &= ~MENU_ST_FLAG_BLOCK_ALL_INPUT;;
         }]];
         [alert addAction:[UIAlertAction actionWithTitle:@"Don't Show Again"
             style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                rarch_start_draw_observer();
+                struct menu_state *menu_st = menu_state_get_ptr();
+                menu_st->flags &= ~MENU_ST_FLAG_BLOCK_ALL_INPUT;
                 configuration_set_bool(settings, settings->bools.gcdwebserver_alert, false);
         }]];
 #if TARGET_OS_IOS
         [alert addAction:[UIAlertAction actionWithTitle:@"Stop Server" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             [[WebServer sharedInstance] webUploader].delegate = nil;
             [[WebServer sharedInstance] stopServers];
-           rarch_start_draw_observer();
+           struct menu_state *menu_st = menu_state_get_ptr();
+           menu_st->flags &= ~MENU_ST_FLAG_BLOCK_ALL_INPUT;;
         }]];
 #endif
         [self presentViewController:alert animated:YES completion:^{
-            rarch_stop_draw_observer();
+            struct menu_state *menu_st = menu_state_get_ptr();
+            menu_st->flags |= MENU_ST_FLAG_BLOCK_ALL_INPUT;
         }];
     });
 #endif

ui/drivers/ui_cocoatouch.m

@@ -860,8 +860,6 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application
       appicon_setting->values = options;
    }
 
-   rarch_start_draw_observer();
-
 #if TARGET_OS_TV
    update_topshelf();
 #endif
@@ -928,6 +926,14 @@ - (void)applicationDidEnterBackground:(UIApplication *)application
 #endif
    rarch_stop_draw_observer();
    command_event(CMD_EVENT_SAVE_FILES, NULL);
+
+   /* Clear any stuck or stale touches when backgrounding */
+   cocoa_input_data_t *apple = (cocoa_input_data_t*)input_state_get_ptr()->current_data;
+   if (apple)
+   {
+      apple->touch_count = 0;
+      memset(apple->touches, 0, sizeof(apple->touches));
+   }
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application
@@ -940,11 +946,18 @@ - (void)applicationWillResignActive:(UIApplication *)application
 {
    self.bgDate = [NSDate date];
    rarch_stop_draw_observer();
+
+   /* Clear any stuck or stale touches when losing focus */
+   cocoa_input_data_t *apple = (cocoa_input_data_t*)input_state_get_ptr()->current_data;
+   if (apple)
+   {
+      apple->touch_count = 0;
+      memset(apple->touches, 0, sizeof(apple->touches));
+   }
 }
 
 - (void)applicationDidBecomeActive:(UIApplication *)application
 {
-   rarch_start_draw_observer();
    NSError *error;
    settings_t *settings            = config_get_ptr();
    bool ui_companion_start_on_boot = settings->bools.ui_companion_start_on_boot;