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 713520db445af8c7
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
     1.1 --- a/src/video/SDL_sysvideo.h	Wed May 01 22:14:29 2013 -0700
     1.2 +++ b/src/video/SDL_sysvideo.h	Thu May 02 23:12:03 2013 +0200
     1.3 @@ -242,10 +242,10 @@
     1.4      void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
     1.5  
     1.6      /* Screen keyboard */
     1.7 -    SDL_bool (*SDL_HasScreenKeyboardSupport) (_THIS);
     1.8 -    void (*SDL_ShowScreenKeyboard) (_THIS, SDL_Window *window);
     1.9 -    void (*SDL_HideScreenKeyboard) (_THIS, SDL_Window *window);
    1.10 -    SDL_bool (*SDL_IsScreenKeyboardShown) (_THIS, SDL_Window *window);
    1.11 +    SDL_bool (*HasScreenKeyboardSupport) (_THIS);
    1.12 +    void (*ShowScreenKeyboard) (_THIS, SDL_Window *window);
    1.13 +    void (*HideScreenKeyboard) (_THIS, SDL_Window *window);
    1.14 +    SDL_bool (*IsScreenKeyboardShown) (_THIS, SDL_Window *window);
    1.15  
    1.16      /* Clipboard */
    1.17      int (*SetClipboardText) (_THIS, const char *text);
     2.1 --- a/src/video/SDL_video.c	Wed May 01 22:14:29 2013 -0700
     2.2 +++ b/src/video/SDL_video.c	Thu May 02 23:12:03 2013 +0200
     2.3 @@ -2900,8 +2900,8 @@
     2.4  
     2.5      /* Then show the on-screen keyboard, if any */
     2.6      window = SDL_GetFocusWindow();
     2.7 -    if (window && _this && _this->SDL_ShowScreenKeyboard) {
     2.8 -        _this->SDL_ShowScreenKeyboard(_this, window);
     2.9 +    if (window && _this && _this->ShowScreenKeyboard) {
    2.10 +        _this->ShowScreenKeyboard(_this, window);
    2.11      }
    2.12  
    2.13      /* Finally start the text input system */
    2.14 @@ -2928,8 +2928,8 @@
    2.15  
    2.16      /* Hide the on-screen keyboard, if any */
    2.17      window = SDL_GetFocusWindow();
    2.18 -    if (window && _this && _this->SDL_HideScreenKeyboard) {
    2.19 -        _this->SDL_HideScreenKeyboard(_this, window);
    2.20 +    if (window && _this && _this->HideScreenKeyboard) {
    2.21 +        _this->HideScreenKeyboard(_this, window);
    2.22      }
    2.23  
    2.24      /* Finally disable text events */
    2.25 @@ -2948,8 +2948,8 @@
    2.26  SDL_bool
    2.27  SDL_HasScreenKeyboardSupport(void)
    2.28  {
    2.29 -    if (_this && _this->SDL_HasScreenKeyboardSupport) {
    2.30 -        return _this->SDL_HasScreenKeyboardSupport(_this);
    2.31 +    if (_this && _this->HasScreenKeyboardSupport) {
    2.32 +        return _this->HasScreenKeyboardSupport(_this);
    2.33      }
    2.34      return SDL_FALSE;
    2.35  }
    2.36 @@ -2957,8 +2957,8 @@
    2.37  SDL_bool
    2.38  SDL_IsScreenKeyboardShown(SDL_Window *window)
    2.39  {
    2.40 -    if (window && _this && _this->SDL_IsScreenKeyboardShown) {
    2.41 -        return _this->SDL_IsScreenKeyboardShown(_this, window);
    2.42 +    if (window && _this && _this->IsScreenKeyboardShown) {
    2.43 +        return _this->IsScreenKeyboardShown(_this, window);
    2.44      }
    2.45      return SDL_FALSE;
    2.46  }
     3.1 --- a/src/video/android/SDL_androidvideo.c	Wed May 01 22:14:29 2013 -0700
     3.2 +++ b/src/video/android/SDL_androidvideo.c	Thu May 02 23:12:03 2013 +0200
     3.3 @@ -133,8 +133,8 @@
     3.4      device->SetTextInputRect = Android_SetTextInputRect;
     3.5  
     3.6      /* Screen keyboard */
     3.7 -    device->SDL_HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
     3.8 -    device->SDL_IsScreenKeyboardShown = Android_IsScreenKeyboardShown;
     3.9 +    device->HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
    3.10 +    device->IsScreenKeyboardShown = Android_IsScreenKeyboardShown;
    3.11  
    3.12      /* Clipboard */
    3.13      device->SetClipboardText = Android_SetClipboardText;
     4.1 --- a/src/video/psp/SDL_pspvideo.c	Wed May 01 22:14:29 2013 -0700
     4.2 +++ b/src/video/psp/SDL_pspvideo.c	Thu May 02 23:12:03 2013 +0200
     4.3 @@ -136,10 +136,10 @@
     4.4      device->GL_GetSwapInterval = PSP_GL_GetSwapInterval;
     4.5      device->GL_SwapWindow = PSP_GL_SwapWindow;
     4.6      device->GL_DeleteContext = PSP_GL_DeleteContext;
     4.7 -	device->SDL_HasScreenKeyboardSupport = PSP_SDL_HasScreenKeyboardSupport;
     4.8 -	device->SDL_ShowScreenKeyboard = PSP_SDL_ShowScreenKeyboard;
     4.9 -	device->SDL_HideScreenKeyboard = PSP_SDL_HideScreenKeyboard;
    4.10 -	device->SDL_IsScreenKeyboardShown = PSP_SDL_IsScreenKeyboardShown;    
    4.11 +	device->HasScreenKeyboardSupport = PSP_HasScreenKeyboardSupport;
    4.12 +	device->ShowScreenKeyboard = PSP_ShowScreenKeyboard;
    4.13 +	device->HideScreenKeyboard = PSP_HideScreenKeyboard;
    4.14 +	device->IsScreenKeyboardShown = PSP_IsScreenKeyboardShown;
    4.15      
    4.16      device->PumpEvents = PSP_PumpEvents;
    4.17  
    4.18 @@ -312,17 +312,17 @@
    4.19  
    4.20  
    4.21  /* TO Write Me*/
    4.22 -SDL_bool PSP_SDL_HasScreenKeyboardSupport(_THIS)
    4.23 +SDL_bool PSP_HasScreenKeyboardSupport(_THIS)
    4.24  {
    4.25  	return SDL_TRUE;
    4.26  }
    4.27 -void PSP_SDL_ShowScreenKeyboard(_THIS, SDL_Window *window)
    4.28 +void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window)
    4.29  {
    4.30  }
    4.31 -void PSP_SDL_HideScreenKeyboard(_THIS, SDL_Window *window)
    4.32 +void PSP_HideScreenKeyboard(_THIS, SDL_Window *window)
    4.33  {
    4.34  }
    4.35 -SDL_bool PSP_SDL_IsScreenKeyboardShown(_THIS, SDL_Window *window)
    4.36 +SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window)
    4.37  {
    4.38  	return SDL_FALSE;
    4.39  }
     5.1 --- a/src/video/psp/SDL_pspvideo.h	Wed May 01 22:14:29 2013 -0700
     5.2 +++ b/src/video/psp/SDL_pspvideo.h	Thu May 02 23:12:03 2013 +0200
     5.3 @@ -92,10 +92,10 @@
     5.4  void PSP_GL_DeleteContext(_THIS, SDL_GLContext context);
     5.5  
     5.6  /*PSP on screen keyboard */
     5.7 -SDL_bool PSP_SDL_HasScreenKeyboardSupport(_THIS);
     5.8 -void PSP_SDL_ShowScreenKeyboard(_THIS, SDL_Window *window);
     5.9 -void PSP_SDL_HideScreenKeyboard(_THIS, SDL_Window *window);
    5.10 -SDL_bool PSP_SDL_IsScreenKeyboardShown(_THIS, SDL_Window *window);
    5.11 +SDL_bool PSP_HasScreenKeyboardSupport(_THIS);
    5.12 +void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
    5.13 +void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
    5.14 +SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window);
    5.15      
    5.16  #endif /* __SDL_PANDORA_H__ */
    5.17  
     6.1 --- a/src/video/uikit/SDL_uikitvideo.m	Wed May 01 22:14:29 2013 -0700
     6.2 +++ b/src/video/uikit/SDL_uikitvideo.m	Thu May 02 23:12:03 2013 +0200
     6.3 @@ -87,10 +87,10 @@
     6.4      /* !!! FIXME: implement SetWindowBordered */
     6.5  
     6.6  #if SDL_IPHONE_KEYBOARD
     6.7 -    device->SDL_HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
     6.8 -    device->SDL_ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
     6.9 -    device->SDL_HideScreenKeyboard = UIKit_HideScreenKeyboard;
    6.10 -    device->SDL_IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
    6.11 +    device->HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
    6.12 +    device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
    6.13 +    device->HideScreenKeyboard = UIKit_HideScreenKeyboard;
    6.14 +    device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
    6.15  #endif
    6.16  
    6.17      /* OpenGL (ES) functions */