From 75a23d99a58749df444514cfd6ec6a221923ff26 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 11 Nov 2013 20:51:19 -0800 Subject: [PATCH] Fixed bug 2212 - SDL_SetTextInputRect has no effect on iOS philhassey Overview: While SDL_SetTextInputRect works perfectly to move my window out of the way of the virtual keyboard using SDL2/Android, on iOS this function has no effect. Steps to Reproduce: Call SDL_SetTextInputRect with a rect near the bottom of the screen before calling SDL_StartTextInput. Actual Results: The iOS virtual keyboard is displayed after calling SDL_StartTextInput, but the screen is not shifted to reveal the TextInputRect region. Expected Results: The screen should be shifted to reveal the TextInputRect region (like with SDL2/Android.) This patch implements SDL_SetTextInputRect for uikit/iOS. It sets up notification handlers to respond to changes in the display of the keyboard. These handlers then change the frame of the view so it is moved out of the way of the keyboard as per SetTextInputRect. --- src/video/uikit/SDL_uikitvideo.m | 1 + src/video/uikit/SDL_uikitview.h | 5 ++ src/video/uikit/SDL_uikitview.m | 104 +++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/src/video/uikit/SDL_uikitvideo.m b/src/video/uikit/SDL_uikitvideo.m index 74b24b8dad5bb..7be5b1d666448 100644 --- a/src/video/uikit/SDL_uikitvideo.m +++ b/src/video/uikit/SDL_uikitvideo.m @@ -89,6 +89,7 @@ static void UIKit_DeleteDevice(SDL_VideoDevice * device) device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard; device->HideScreenKeyboard = UIKit_HideScreenKeyboard; device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown; + device->SetTextInputRect = UIKit_SetTextInputRect; #endif /* OpenGL (ES) functions */ diff --git a/src/video/uikit/SDL_uikitview.h b/src/video/uikit/SDL_uikitview.h index ff8a7d2cfd14b..3921be136fd39 100644 --- a/src/video/uikit/SDL_uikitview.h +++ b/src/video/uikit/SDL_uikitview.h @@ -45,6 +45,8 @@ #if SDL_IPHONE_KEYBOARD UITextField *textField; BOOL keyboardVisible; + SDL_Rect textInputRect; + int keyboardHeight; #endif @public @@ -60,11 +62,14 @@ - (void)hideKeyboard; - (void)initializeKeyboard; @property (readonly) BOOL keyboardVisible; +@property (nonatomic,assign) SDL_Rect textInputRect; +@property (nonatomic,assign) int keyboardHeight; SDL_bool UIKit_HasScreenKeyboardSupport(_THIS); void UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window); void UIKit_HideScreenKeyboard(_THIS, SDL_Window *window); SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window); +void UIKit_SetTextInputRect(_THIS, SDL_Rect *rect); #endif diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m index 66129be23e591..ca9cd06613793 100644 --- a/src/video/uikit/SDL_uikitview.m +++ b/src/video/uikit/SDL_uikitview.m @@ -35,6 +35,8 @@ #include "SDL_uikitmodes.h" #include "SDL_uikitwindow.h" +void _uikit_keyboard_init() ; + @implementation SDL_uikitview - (void)dealloc @@ -197,6 +199,9 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event */ #if SDL_IPHONE_KEYBOARD +@synthesize textInputRect = textInputRect; +@synthesize keyboardHeight = keyboardHeight; + /* Is the iPhone virtual keyboard visible onscreen? */ - (BOOL)keyboardVisible { @@ -225,6 +230,8 @@ - (void)initializeKeyboard /* add the UITextField (hidden) to our view */ [self addSubview: textField]; [textField release]; + + _uikit_keyboard_init(); } /* reveal onscreen virtual keyboard */ @@ -352,6 +359,103 @@ SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window) return view.keyboardVisible; } + +void _uikit_keyboard_update() { + SDL_Window *window = SDL_GetFocusWindow(); + if (!window) { return; } + SDL_WindowData *data = (SDL_WindowData *)window->driverdata; + if (!data) { return; } + SDL_uikitview *view = data->view; + if (!view) { return; } + + SDL_Rect r = view.textInputRect; + int height = view.keyboardHeight; + int offsetx = 0; + int offsety = 0; + if (height) { + int sw,sh; + SDL_GetWindowSize(window,&sw,&sh); + int bottom = (r.y + r.h); + int kbottom = sh - height; + if (kbottom < bottom) { + offsety = kbottom-bottom; + } + } + UIInterfaceOrientation ui_orient = [[UIApplication sharedApplication] statusBarOrientation]; + if (ui_orient == UIInterfaceOrientationLandscapeLeft) { + int tmp = offsetx; offsetx = offsety; offsety = tmp; + } + if (ui_orient == UIInterfaceOrientationLandscapeRight) { + offsety = -offsety; + int tmp = offsetx; offsetx = offsety; offsety = tmp; + } + if (ui_orient == UIInterfaceOrientationPortraitUpsideDown) { + offsety = -offsety; + } + if ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)]) { + float scale = [UIScreen mainScreen].scale; + offsetx /= scale; + offsety /= scale; + } + view.frame = CGRectMake(offsetx,offsety,view.frame.size.width,view.frame.size.height); +} + +void _uikit_keyboard_set_height(int height) { + SDL_uikitview *view = getWindowView(SDL_GetFocusWindow()); + if (view == nil) { + return ; + } + + view.keyboardHeight = height; + _uikit_keyboard_update(); +} + +void _uikit_keyboard_init() { + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; + NSOperationQueue *queue = [NSOperationQueue mainQueue]; + [center addObserverForName:UIKeyboardWillShowNotification + object:nil + queue:queue + usingBlock:^(NSNotification *notification) { + int height = 0; + CGSize keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size; + height = keyboardSize.height; + UIInterfaceOrientation ui_orient = [[UIApplication sharedApplication] statusBarOrientation]; + if (ui_orient == UIInterfaceOrientationLandscapeRight || ui_orient == UIInterfaceOrientationLandscapeLeft) { + height = keyboardSize.width; + } + if ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)]) { + height *= [UIScreen mainScreen].scale; + } + _uikit_keyboard_set_height(height); + } + ]; + [center addObserverForName:UIKeyboardDidHideNotification + object:nil + queue:queue + usingBlock:^(NSNotification *notification) { + _uikit_keyboard_set_height(0); + } + ]; +} + +void +UIKit_SetTextInputRect(_THIS, SDL_Rect *rect) +{ + if (!rect) { + SDL_InvalidParamError("rect"); + return; + } + + SDL_uikitview *view = getWindowView(SDL_GetFocusWindow()); + if (view == nil) { + return ; + } + + view.textInputRect = *rect; +} + + #endif /* SDL_IPHONE_KEYBOARD */ #endif /* SDL_VIDEO_DRIVER_UIKIT */