include/SDL_video.h
changeset 5244 762e40fb8e28
parent 5243 3a8a452b49f0
child 5246 58265e606e4e
     1.1 --- a/include/SDL_video.h	Thu Feb 10 11:39:08 2011 -0800
     1.2 +++ b/include/SDL_video.h	Thu Feb 10 12:14:37 2011 -0800
     1.3 @@ -236,7 +236,6 @@
     1.4   *  \brief Returns the number of available video displays.
     1.5   *  
     1.6   *  \sa SDL_GetDisplayBounds()
     1.7 - *  \sa SDL_SelectVideoDisplay()
     1.8   */
     1.9  extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void);
    1.10  
    1.11 @@ -248,34 +247,14 @@
    1.12   *  
    1.13   *  \sa SDL_GetNumVideoDisplays()
    1.14   */
    1.15 -extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int index, SDL_Rect * rect);
    1.16 +extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect);
    1.17  
    1.18  /**
    1.19 - *  \brief Set the index of the currently selected display.
    1.20 - *  
    1.21 - *  \return 0 on success, or -1 if the index is out of range.
    1.22 - *  
    1.23 - *  \sa SDL_GetNumVideoDisplays()
    1.24 - *  \sa SDL_GetCurrentVideoDisplay()
    1.25 - */
    1.26 -extern DECLSPEC int SDLCALL SDL_SelectVideoDisplay(int index);
    1.27 -
    1.28 -/**
    1.29 - *  \brief Get the index of the currently selected display.
    1.30 - *  
    1.31 - *  \return The index of the currently selected display.
    1.32 - *  
    1.33 - *  \sa SDL_GetNumVideoDisplays()
    1.34 - *  \sa SDL_SelectVideoDisplay()
    1.35 - */
    1.36 -extern DECLSPEC int SDLCALL SDL_GetCurrentVideoDisplay(void);
    1.37 -
    1.38 -/**
    1.39 - *  \brief Returns the number of available display modes for the current display.
    1.40 + *  \brief Returns the number of available display modes.
    1.41   *  
    1.42   *  \sa SDL_GetDisplayMode()
    1.43   */
    1.44 -extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(void);
    1.45 +extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex);
    1.46  
    1.47  /**
    1.48   *  \brief Fill in information about a specific display mode.
    1.49 @@ -288,19 +267,18 @@
    1.50   *  
    1.51   *  \sa SDL_GetNumDisplayModes()
    1.52   */
    1.53 -extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int index,
    1.54 +extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex,
    1.55                                                 SDL_DisplayMode * mode);
    1.56  
    1.57  /**
    1.58 - *  \brief Fill in information about the desktop display mode for the current 
    1.59 - *         display.
    1.60 + *  \brief Fill in information about the desktop display mode.
    1.61   */
    1.62 -extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(SDL_DisplayMode * mode);
    1.63 +extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode);
    1.64  
    1.65  /**
    1.66   *  \brief Fill in information about the current display mode.
    1.67   */
    1.68 -extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(SDL_DisplayMode * mode);
    1.69 +extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode);
    1.70  
    1.71  
    1.72  /**
    1.73 @@ -323,16 +301,13 @@
    1.74   *  \sa SDL_GetNumDisplayModes()
    1.75   *  \sa SDL_GetDisplayMode()
    1.76   */
    1.77 -extern DECLSPEC SDL_DisplayMode *SDLCALL SDL_GetClosestDisplayMode(const
    1.78 -                                                                   SDL_DisplayMode
    1.79 -                                                                   * mode,
    1.80 -                                                                   SDL_DisplayMode
    1.81 -                                                                   * closest);
    1.82 +extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest);
    1.83  
    1.84  /**
    1.85 - *  \brief Set the display mode used when a fullscreen window is visible
    1.86 - *         on the currently selected display.  By default the window's
    1.87 - *         dimensions and the desktop format and refresh rate are used.
    1.88 + *  \brief Set the display mode used when a fullscreen window is visible.
    1.89 + *
    1.90 + *  By default the window's dimensions and the desktop format and refresh rate
    1.91 + *  are used.
    1.92   *  
    1.93   *  \param mode The mode to use, or NULL for the default mode.
    1.94   *  
    1.95 @@ -347,7 +322,7 @@
    1.96  
    1.97  /**
    1.98   *  \brief Fill in information about the display mode used when a fullscreen
    1.99 - *         window is visible on the currently selected display.
   1.100 + *         window is visible.
   1.101   *
   1.102   *  \sa SDL_SetWindowDisplayMode()
   1.103   *  \sa SDL_SetWindowFullscreen()