Commit 39781eef094dcb0e7969cecae17673bb3708faa1
2023-08-02T00:19:57
Only pass keypresses up the responder chain when text input is active This is another attempt to make sure we don't cause beeps from unhandled key presses while still allowing full text input functionalty. If this isn't selective enough, we might need to go up the responder chain to see what's going to handle the event before passing it along. Fixes https://github.com/libsdl-org/SDL/pull/6962 (cherry picked from commit a8abe612ed5597cbaabb903c0121b5b48baee91d) (cherry picked from commit 335e9c769a5d49fe023b528c48a45c8ce3ed60d0)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index c358648..dab0e54 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -412,7 +412,9 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
SDL_SendKeyboardKey(SDL_PRESSED, scancode);
}
}
- [super pressesBegan:presses withEvent:event];
+ if (SDL_TextInputActive()) {
+ [super pressesBegan:presses withEvent:event];
+ }
}
- (void)pressesEnded:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)event
@@ -423,7 +425,9 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
SDL_SendKeyboardKey(SDL_RELEASED, scancode);
}
}
- [super pressesEnded:presses withEvent:event];
+ if (SDL_TextInputActive()) {
+ [super pressesEnded:presses withEvent:event];
+ }
}
- (void)pressesCancelled:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)event
@@ -434,13 +438,17 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
SDL_SendKeyboardKey(SDL_RELEASED, scancode);
}
}
- [super pressesCancelled:presses withEvent:event];
+ if (SDL_TextInputActive()) {
+ [super pressesCancelled:presses withEvent:event];
+ }
}
- (void)pressesChanged:(NSSet<UIPress *> *)presses withEvent:(UIPressesEvent *)event
{
/* This is only called when the force of a press changes. */
- [super pressesChanged:presses withEvent:event];
+ if (SDL_TextInputActive()) {
+ [super pressesChanged:presses withEvent:event];
+ }
}
#endif /* TARGET_OS_TV || defined(__IPHONE_9_1) */