src/video/SDL_sysvideo.h
changeset 5147 ad50b3db78bd
parent 5145 2f44e6969a59
child 5148 5429daf5e3f9
     1.1 --- a/src/video/SDL_sysvideo.h	Tue Feb 01 19:15:42 2011 -0800
     1.2 +++ b/src/video/SDL_sysvideo.h	Tue Feb 01 19:19:43 2011 -0800
     1.3 @@ -24,6 +24,7 @@
     1.4  #ifndef _SDL_sysvideo_h
     1.5  #define _SDL_sysvideo_h
     1.6  
     1.7 +#include "SDL_events.h"
     1.8  #include "SDL_mouse.h"
     1.9  #include "SDL_keysym.h"
    1.10  #include "SDL_render.h"
    1.11 @@ -31,7 +32,6 @@
    1.12  
    1.13  /* The SDL video driver */
    1.14  
    1.15 -typedef struct SDL_Renderer SDL_Renderer;
    1.16  typedef struct SDL_RenderDriver SDL_RenderDriver;
    1.17  typedef struct SDL_WindowShaper SDL_WindowShaper;
    1.18  typedef struct SDL_ShapeDriver SDL_ShapeDriver;
    1.19 @@ -61,8 +61,9 @@
    1.20  /* Define the SDL renderer structure */
    1.21  struct SDL_Renderer
    1.22  {
    1.23 -    int (*ActivateRenderer) (SDL_Renderer * renderer);
    1.24 -    int (*DisplayModeChanged) (SDL_Renderer * renderer);
    1.25 +    const void *magic;
    1.26 +
    1.27 +    void (*WindowEvent) (SDL_Renderer * renderer, const SDL_WindowEvent *event);
    1.28      int (*CreateTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
    1.29      int (*QueryTexturePixels) (SDL_Renderer * renderer, SDL_Texture * texture,
    1.30                                 void **pixels, int *pitch);
    1.31 @@ -168,7 +169,6 @@
    1.32      Uint32 flags;
    1.33  
    1.34      SDL_VideoDisplay *display;
    1.35 -    SDL_Renderer *renderer;
    1.36  
    1.37      SDL_DisplayMode fullscreen_mode;
    1.38      
    1.39 @@ -208,8 +208,6 @@
    1.40      SDL_Window *windows;
    1.41      SDL_Window *fullscreen_window;
    1.42  
    1.43 -    SDL_Renderer *current_renderer;
    1.44 -
    1.45      SDL_VideoDevice *device;
    1.46  
    1.47      void *driverdata;
    1.48 @@ -344,6 +342,7 @@
    1.49      SDL_VideoDisplay *displays;
    1.50      int current_display;
    1.51      Uint8 window_magic;
    1.52 +    Uint8 renderer_magic;
    1.53      Uint8 texture_magic;
    1.54      Uint32 next_object_id;
    1.55      char * clipboard_text;
    1.56 @@ -439,7 +438,6 @@
    1.57  #endif
    1.58  
    1.59  #define SDL_CurrentDisplay	(&_this->displays[_this->current_display])
    1.60 -#define SDL_CurrentRenderer	(SDL_CurrentDisplay->current_renderer)
    1.61  
    1.62  extern SDL_VideoDevice *SDL_GetVideoDevice(void);
    1.63  extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode);
    1.64 @@ -461,7 +459,6 @@
    1.65  
    1.66  extern void SDL_OnWindowShown(SDL_Window * window);
    1.67  extern void SDL_OnWindowHidden(SDL_Window * window);
    1.68 -extern void SDL_OnWindowResized(SDL_Window * window);
    1.69  extern void SDL_OnWindowMinimized(SDL_Window * window);
    1.70  extern void SDL_OnWindowRestored(SDL_Window * window);
    1.71  extern void SDL_OnWindowFocusGained(SDL_Window * window);