Removed SDL prefix from internal function pointers for screen keyboard access.
authorPhilipp Wiesemann <philipp.wiesemann@arcor.de>
Thu, 02 May 2013 23:12:03 +0200
changeset 7135 20db445af8c7
parent 7134 09ee216e6a25
child 7136 65c709a5da8a
Removed SDL prefix from internal function pointers for screen keyboard access.
src/video/SDL_sysvideo.h
src/video/SDL_video.c
src/video/android/SDL_androidvideo.c
src/video/psp/SDL_pspvideo.c
src/video/psp/SDL_pspvideo.h
src/video/uikit/SDL_uikitvideo.m
--- a/src/video/SDL_sysvideo.h	Wed May 01 22:14:29 2013 -0700
+++ b/src/video/SDL_sysvideo.h	Thu May 02 23:12:03 2013 +0200
@@ -242,10 +242,10 @@
     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);
--- a/src/video/SDL_video.c	Wed May 01 22:14:29 2013 -0700
+++ b/src/video/SDL_video.c	Thu May 02 23:12:03 2013 +0200
@@ -2900,8 +2900,8 @@
 
     /* 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 @@
 
     /* 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,8 +2948,8 @@
 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;
 }
@@ -2957,8 +2957,8 @@
 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;
 }
--- a/src/video/android/SDL_androidvideo.c	Wed May 01 22:14:29 2013 -0700
+++ b/src/video/android/SDL_androidvideo.c	Thu May 02 23:12:03 2013 +0200
@@ -133,8 +133,8 @@
     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;
--- a/src/video/psp/SDL_pspvideo.c	Wed May 01 22:14:29 2013 -0700
+++ b/src/video/psp/SDL_pspvideo.c	Thu May 02 23:12:03 2013 +0200
@@ -136,10 +136,10 @@
     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 @@
 
 
 /* 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;
 }
--- a/src/video/psp/SDL_pspvideo.h	Wed May 01 22:14:29 2013 -0700
+++ b/src/video/psp/SDL_pspvideo.h	Thu May 02 23:12:03 2013 +0200
@@ -92,10 +92,10 @@
 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__ */
 
--- a/src/video/uikit/SDL_uikitvideo.m	Wed May 01 22:14:29 2013 -0700
+++ b/src/video/uikit/SDL_uikitvideo.m	Thu May 02 23:12:03 2013 +0200
@@ -87,10 +87,10 @@
     /* !!! 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 */