pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor code cleanup in uikit/SDL_uikitview.m (no functional changes)

Browse source
This commit is contained in:
Kees Bakker 2011-09-28 21:25:46 +02:00
parent 7e6128661d
commit f1c04b8c14
1 changed files with 35 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/video/uikit/SDL_uikitview.m
View file

@ -311,100 +311,69 @@
/* iPhone keyboard addition functions */ /* iPhone keyboard addition functions */
#if SDL_IPHONE_KEYBOARD #if SDL_IPHONE_KEYBOARD
SDL_uikitview * getWindowView(SDL_Window * window)
{
if (window == NULL) {
SDL_SetError("Window does not exist");
return nil;
}
SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
SDL_uikitview *view = data != NULL ? data->view : nil;
if (view == nil) {
SDL_SetError("Window has no view");
}
return view;
}
int SDL_iPhoneKeyboardShow(SDL_Window * window) int SDL_iPhoneKeyboardShow(SDL_Window * window)
{ {
SDL_WindowData *data; SDL_uikitview *view = getWindowView(window);
SDL_uikitview *view; if (view == nil) {
if (NULL == window) {
SDL_SetError("Window does not exist");
return -1; return -1;
} }
data = (SDL_WindowData *)window->driverdata; [view showKeyboard];
view = data->view; return 0;
if (nil == view) {
SDL_SetError("Window has no view");
return -1;
}
else {
[view showKeyboard];
return 0;
}
} }
int SDL_iPhoneKeyboardHide(SDL_Window * window) int SDL_iPhoneKeyboardHide(SDL_Window * window)
{ {
SDL_WindowData *data; SDL_uikitview *view = getWindowView(window);
SDL_uikitview *view; if (view == nil) {
if (NULL == window) {
SDL_SetError("Window does not exist");
return -1; return -1;
} }
data = (SDL_WindowData *)window->driverdata; [view hideKeyboard];
view = data->view; return 0;
if (NULL == view) {
SDL_SetError("Window has no view");
return -1;
}
else {
[view hideKeyboard];
return 0;
}
} }
SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window)
{ {
SDL_WindowData *data; SDL_uikitview *view = getWindowView(window);
SDL_uikitview *view; if (view == nil) {
if (NULL == window) {
SDL_SetError("Window does not exist");
return -1;
}
data = (SDL_WindowData *)window->driverdata;
view = data->view;
if (NULL == view) {
SDL_SetError("Window has no view");
return 0; return 0;
} }
else {
return view.keyboardVisible; return view.keyboardVisible;
}
} }
int SDL_iPhoneKeyboardToggle(SDL_Window * window) int SDL_iPhoneKeyboardToggle(SDL_Window * window)
{ {
SDL_WindowData *data; SDL_uikitview *view = getWindowView(window);
SDL_uikitview *view; if (view == nil) {
if (NULL == window) {
SDL_SetError("Window does not exist");
return -1; return -1;
} }
data = (SDL_WindowData *)window->driverdata; if (SDL_iPhoneKeyboardIsShown(window)) {
view = data->view; SDL_iPhoneKeyboardHide(window);
if (NULL == view) {
SDL_SetError("Window has no view");
return -1;
} }
else { else {
if (SDL_iPhoneKeyboardIsShown(window)) { SDL_iPhoneKeyboardShow(window);
SDL_iPhoneKeyboardHide(window);
}
else {
SDL_iPhoneKeyboardShow(window);
}
return 0;
} }
return 0;
} }
#else #else