Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Removed SDL prefix from internal function pointers for screen keyboar…

…d access.
  • Loading branch information
philippwiesemann committed May 2, 2013
1 parent 4deff2a commit 2b69c542b9a90b7092feaf07402c3187175c5819
@@ -242,10 +242,10 @@ struct SDL_VideoDevice
void (*SetTextInputRect) (_THIS, SDL_Rect *rect);

/* Screen keyboard */
SDL_bool (*SDL_HasScreenKeyboardSupport) (_THIS);
void (*SDL_ShowScreenKeyboard) (_THIS, SDL_Window *window);
void (*SDL_HideScreenKeyboard) (_THIS, SDL_Window *window);
SDL_bool (*SDL_IsScreenKeyboardShown) (_THIS, SDL_Window *window);
SDL_bool (*HasScreenKeyboardSupport) (_THIS);
void (*ShowScreenKeyboard) (_THIS, SDL_Window *window);
void (*HideScreenKeyboard) (_THIS, SDL_Window *window);
SDL_bool (*IsScreenKeyboardShown) (_THIS, SDL_Window *window);

/* Clipboard */
int (*SetClipboardText) (_THIS, const char *text);
@@ -2900,8 +2900,8 @@ SDL_StartTextInput(void)

/* Then show the on-screen keyboard, if any */
window = SDL_GetFocusWindow();
if (window && _this && _this->SDL_ShowScreenKeyboard) {
_this->SDL_ShowScreenKeyboard(_this, window);
if (window && _this && _this->ShowScreenKeyboard) {
_this->ShowScreenKeyboard(_this, window);
}

/* Finally start the text input system */
@@ -2928,8 +2928,8 @@ SDL_StopTextInput(void)

/* Hide the on-screen keyboard, if any */
window = SDL_GetFocusWindow();
if (window && _this && _this->SDL_HideScreenKeyboard) {
_this->SDL_HideScreenKeyboard(_this, window);
if (window && _this && _this->HideScreenKeyboard) {
_this->HideScreenKeyboard(_this, window);
}

/* Finally disable text events */
@@ -2948,17 +2948,17 @@ SDL_SetTextInputRect(SDL_Rect *rect)
SDL_bool
SDL_HasScreenKeyboardSupport(void)
{
if (_this && _this->SDL_HasScreenKeyboardSupport) {
return _this->SDL_HasScreenKeyboardSupport(_this);
if (_this && _this->HasScreenKeyboardSupport) {
return _this->HasScreenKeyboardSupport(_this);
}
return SDL_FALSE;
}

SDL_bool
SDL_IsScreenKeyboardShown(SDL_Window *window)
{
if (window && _this && _this->SDL_IsScreenKeyboardShown) {
return _this->SDL_IsScreenKeyboardShown(_this, window);
if (window && _this && _this->IsScreenKeyboardShown) {
return _this->IsScreenKeyboardShown(_this, window);
}
return SDL_FALSE;
}
@@ -133,8 +133,8 @@ Android_CreateDevice(int devindex)
device->SetTextInputRect = Android_SetTextInputRect;

/* Screen keyboard */
device->SDL_HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
device->SDL_IsScreenKeyboardShown = Android_IsScreenKeyboardShown;
device->HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
device->IsScreenKeyboardShown = Android_IsScreenKeyboardShown;

/* Clipboard */
device->SetClipboardText = Android_SetClipboardText;
@@ -136,10 +136,10 @@ PSP_Create()
device->GL_GetSwapInterval = PSP_GL_GetSwapInterval;
device->GL_SwapWindow = PSP_GL_SwapWindow;
device->GL_DeleteContext = PSP_GL_DeleteContext;
device->SDL_HasScreenKeyboardSupport = PSP_SDL_HasScreenKeyboardSupport;
device->SDL_ShowScreenKeyboard = PSP_SDL_ShowScreenKeyboard;
device->SDL_HideScreenKeyboard = PSP_SDL_HideScreenKeyboard;
device->SDL_IsScreenKeyboardShown = PSP_SDL_IsScreenKeyboardShown;
device->HasScreenKeyboardSupport = PSP_HasScreenKeyboardSupport;
device->ShowScreenKeyboard = PSP_ShowScreenKeyboard;
device->HideScreenKeyboard = PSP_HideScreenKeyboard;
device->IsScreenKeyboardShown = PSP_IsScreenKeyboardShown;

device->PumpEvents = PSP_PumpEvents;

@@ -312,17 +312,17 @@ PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)


/* TO Write Me*/
SDL_bool PSP_SDL_HasScreenKeyboardSupport(_THIS)
SDL_bool PSP_HasScreenKeyboardSupport(_THIS)
{
return SDL_TRUE;
}
void PSP_SDL_ShowScreenKeyboard(_THIS, SDL_Window *window)
void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window)
{
}
void PSP_SDL_HideScreenKeyboard(_THIS, SDL_Window *window)
void PSP_HideScreenKeyboard(_THIS, SDL_Window *window)
{
}
SDL_bool PSP_SDL_IsScreenKeyboardShown(_THIS, SDL_Window *window)
SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window)
{
return SDL_FALSE;
}
@@ -92,10 +92,10 @@ void PSP_GL_SwapWindow(_THIS, SDL_Window * window);
void PSP_GL_DeleteContext(_THIS, SDL_GLContext context);

/*PSP on screen keyboard */
SDL_bool PSP_SDL_HasScreenKeyboardSupport(_THIS);
void PSP_SDL_ShowScreenKeyboard(_THIS, SDL_Window *window);
void PSP_SDL_HideScreenKeyboard(_THIS, SDL_Window *window);
SDL_bool PSP_SDL_IsScreenKeyboardShown(_THIS, SDL_Window *window);
SDL_bool PSP_HasScreenKeyboardSupport(_THIS);
void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window);

#endif /* __SDL_PANDORA_H__ */

@@ -87,10 +87,10 @@ static void UIKit_DeleteDevice(SDL_VideoDevice * device)
/* !!! FIXME: implement SetWindowBordered */

#if SDL_IPHONE_KEYBOARD
device->SDL_HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
device->SDL_ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
device->SDL_HideScreenKeyboard = UIKit_HideScreenKeyboard;
device->SDL_IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
device->HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
device->HideScreenKeyboard = UIKit_HideScreenKeyboard;
device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
#endif

/* OpenGL (ES) functions */

0 comments on commit 2b69c54

Please sign in to comment.