Added VSync and windowed fullscreen options

The configuration and setup UI were adjusted to the new options.
This also fixes issues in applying new video settings.

Default resolution was changed from 800x600 to 1280x720. VSync is
enabled by default while FPS limit was disabled.

Display aspect ratio for the resolution options.

I had to work around some macOS issues:

* Don't change window size when it appears to be "maximized", since it
  just changes the rendering area while leaving the window maximized.

* Unset fullscreen display mode temporarily to allow changing resolutions,
  otherwise the rendering area no longer matches the screen and mouse
  input is also off.

* Removed SDL_WINDOW_ALLOW_HIGHDPI for now because it causes issues on
  macOS, since we're not actually handling the scaling factor.

A Video class and an SDLGraphics subclass were split off from Graphics.
This setup has Less duplication and leaves the OpenGLGraphics and
SDLGraphics better separated.

Fixes #57
Fixes #58

1 files changed, 8 insertions, 333 deletions

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 02144cab..b5b30995 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -20,12 +20,9 @@
  */
 
 #include "graphics.h"
-#include "log.h"
 
 #include "resources/image.h"
 
-#include "utils/gettext.h"
-
 #include <guichan/exception.hpp>
 
 void ImageRect::setAlpha(float alpha)
@@ -36,104 +33,6 @@ void ImageRect::setAlpha(float alpha)
     }
 }
 
-
-Graphics::~Graphics()
-{
-    _endDraw();
-}
-
-void Graphics::setTarget(SDL_Window *target)
-{
-    _endDraw();
-
-    mTarget = target;
-
-    if (mTarget)
-        _beginDraw();
-}
-
-bool Graphics::setVideoMode(int w, int h, bool fs)
-{
-    logger->log("Setting video mode %dx%d %s",
-            w, h, fs ? "fullscreen" : "windowed");
-
-    int windowFlags = SDL_WINDOW_ALLOW_HIGHDPI;
-
-    if (fs)
-        windowFlags |= SDL_WINDOW_FULLSCREEN;
-    else
-        windowFlags |= SDL_WINDOW_RESIZABLE;
-
-    // TODO_SDL2: Support SDL_WINDOW_FULLSCREEN_DESKTOP
-
-    SDL_Window *window = nullptr;
-    SDL_Renderer *renderer = nullptr;
-    SDL_CreateWindowAndRenderer(w, h, windowFlags, &window, &renderer);
-
-    if (!window)
-        return false;
-
-    SDL_SetWindowMinimumSize(window, 640, 480);
-    SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND);
-
-    setTarget(window);
-
-    mRenderer = renderer;
-    mWidth = w;
-    mHeight = h;
-    mFullscreen = fs;
-
-    if (const char *driver = SDL_GetCurrentVideoDriver())
-        logger->log("Using video driver: %s", driver);
-    else
-        logger->log("Using video driver: not initialized");
-
-    SDL_RendererInfo info;
-
-    if (SDL_GetRendererInfo(mRenderer, &info) == 0) {
-        logger->log("Using renderer: %s", info.name);
-
-        logger->log("The renderer is a software fallback: %s",
-                    (info.flags & SDL_RENDERER_SOFTWARE) ? "yes" : "no");
-        logger->log("The renderer is hardware accelerated: %s",
-                    (info.flags & SDL_RENDERER_ACCELERATED) ? "yes" : "no");
-        logger->log("Vsync: %s",
-                    (info.flags & SDL_RENDERER_PRESENTVSYNC) ? "on" : "off");
-        logger->log("Renderer supports rendering to texture: %s",
-                    (info.flags & SDL_RENDERER_TARGETTEXTURE) ? "yes" : "no");
-        logger->log("Max texture size: %dx%d",
-                    info.max_texture_width, info.max_texture_height);
-    }
-
-    return true;
-}
-
-bool Graphics::changeVideoMode(int w, int h, bool fs)
-{
-    // Just return success if we're already in this mode
-    if (mWidth == w &&
-            mHeight == h &&
-            mFullscreen == fs)
-        return true;
-
-    _endDraw();
-
-    bool success = setVideoMode(w, h, fs);
-
-    // If it didn't work, try to restore the previous mode. If that doesn't
-    // work either, we're in big trouble and bail out.
-    if (!success) {
-        if (!setVideoMode(mWidth, mHeight, mFullscreen)) {
-            logger->error(_("Failed to change video mode and couldn't "
-                            "switch back to the previous mode!"));
-        }
-    }
-
-    _beginDraw();
-
-    return success;
-}
-
 void Graphics::videoResized(int w, int h)
 {
     mWidth = w;
@@ -155,39 +54,14 @@ bool Graphics::drawImage(Image *image, int x, int y)
     if (!image)
         return false;
 
-    return drawImage(image, 0, 0, x, y, image->mBounds.w, image->mBounds.h);
-}
-
-bool Graphics::drawRescaledImage(Image *image, int srcX, int srcY,
-                               int dstX, int dstY,
-                               int width, int height,
-                               int desiredWidth, int desiredHeight,
-                               bool useColor)
-{
-    // Check that preconditions for blitting are met.
-    if (!mTarget || !image || !image->mTexture)
-        return false;
-
-    dstX += mClipStack.top().xOffset;
-    dstY += mClipStack.top().yOffset;
-
-    srcX += image->mBounds.x;
-    srcY += image->mBounds.y;
-
-    SDL_Rect dstRect;
-    SDL_Rect srcRect;
-    dstRect.x = dstX; dstRect.y = dstY;
-    srcRect.x = srcX; srcRect.y = srcY;
-    srcRect.w = width;
-    srcRect.h = height;
-    dstRect.w = desiredWidth;
-    dstRect.h = desiredHeight;
-
-    return !(SDL_RenderCopy(mRenderer, image->mTexture, &srcRect, &dstRect) < 0);
+    return drawImage(image, 0, 0, x, y, image->getWidth(), image->getHeight());
 }
 
-bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
-                         int width, int height, bool useColor)
+bool Graphics::drawImage(Image *image,
+                         int srcX, int srcY,
+                         int dstX, int dstY,
+                         int width, int height,
+                         bool useColor)
 {
     if (!image)
         return false;
@@ -201,50 +75,11 @@ bool Graphics::drawImage(Image *image, int srcX, int srcY, int dstX, int dstY,
 
 void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h)
 {
-    // Check that preconditions for blitting are met.
     if (!image)
         return;
 
-    const int iw = image->getWidth();
-    const int ih = image->getHeight();
-
-    drawRescaledImagePattern(image, x, y, w, h, iw, ih);
-}
-
-void Graphics::drawRescaledImagePattern(Image *image,
-                                        int x, int y,
-                                        int w, int h,
-                                        int scaledWidth, int scaledHeight)
-{
-    // Check that preconditions for blitting are met.
-    if (!mTarget || !image || !image->mTexture)
-        return;
-
-    if (scaledHeight == 0 || scaledWidth == 0)
-        return;
-
-    for (int py = 0; py < h; py += scaledHeight)     // Y position on pattern plane
-    {
-        int dh = (py + scaledHeight >= h) ? h - py : scaledHeight;
-        int srcY = image->mBounds.y;
-        int dstY = y + py + mClipStack.top().yOffset;
-
-        for (int px = 0; px < w; px += scaledWidth) // X position on pattern plane
-        {
-            int dw = (px + scaledWidth >= w) ? w - px : scaledWidth;
-            int srcX = image->mBounds.x;
-            int dstX = x + px + mClipStack.top().xOffset;
-
-            SDL_Rect dstRect;
-            SDL_Rect srcRect;
-            dstRect.x = dstX; dstRect.y = dstY;
-            dstRect.w = dw;   dstRect.h = dh;
-            srcRect.x = srcX; srcRect.y = srcY;
-            srcRect.w = dw;   srcRect.h = dh;
-
-            SDL_RenderCopy(mRenderer, image->mTexture, &srcRect, &dstRect);
-        }
-    }
+    drawRescaledImagePattern(image, x, y, w, h,
+                             image->getWidth(), image->getHeight());
 }
 
 void Graphics::drawImageRect(int x, int y, int w, int h,
@@ -298,163 +133,3 @@ void Graphics::drawImageRect(int x, int y, int w, int h,
             imgRect.grid[1], imgRect.grid[5], imgRect.grid[7], imgRect.grid[3],
             imgRect.grid[4]);
 }
-
-void Graphics::updateScreen()
-{
-    SDL_RenderPresent(mRenderer);
-}
-
-SDL_Surface *Graphics::getScreenshot()
-{
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-    int rmask = 0xff000000;
-    int gmask = 0x00ff0000;
-    int bmask = 0x0000ff00;
-#else
-    int rmask = 0x000000ff;
-    int gmask = 0x0000ff00;
-    int bmask = 0x00ff0000;
-#endif
-    int amask = 0x00000000;
-
-    SDL_Surface *screenshot = SDL_CreateRGBSurface(0, mWidth,
-            mHeight, 24, rmask, gmask, bmask, amask);
-
-    SDL_RenderReadPixels(mRenderer, nullptr,
-                         screenshot->format->format,
-                         screenshot->pixels,
-                         screenshot->pitch);
-
-    return screenshot;
-}
-
-bool Graphics::pushClipArea(gcn::Rectangle area)
-{
-    bool result = gcn::Graphics::pushClipArea(area);
-    updateSDLClipRect();
-    return result;
-}
-
-void Graphics::popClipArea()
-{
-    gcn::Graphics::popClipArea();
-    updateSDLClipRect();
-}
-
-void Graphics::updateSDLClipRect()
-{
-    if (mClipStack.empty())
-    {
-        SDL_RenderSetClipRect(mRenderer, nullptr);
-        return;
-    }
-
-    const gcn::ClipRectangle &carea = mClipStack.top();
-    SDL_Rect rect;
-    rect.x = carea.x;
-    rect.y = carea.y;
-    rect.w = carea.width;
-    rect.h = carea.height;
-
-    SDL_RenderSetClipRect(mRenderer, &rect);
-}
-
-void Graphics::drawPoint(int x, int y)
-{
-    if (mClipStack.empty())
-    {
-        throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
-    }
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    x += top.xOffset;
-    y += top.yOffset;
-
-    if (!top.isPointInRect(x, y))
-        return;
-
-    SDL_SetRenderDrawColor(mRenderer,
-                           (Uint8)(mColor.r),
-                           (Uint8)(mColor.g),
-                           (Uint8)(mColor.b),
-                           (Uint8)(mColor.a));
-    SDL_RenderDrawPoint(mRenderer, x, y);
-}
-
-void Graphics::drawLine(int x1, int y1, int x2, int y2)
-{
-    if (mClipStack.empty())
-    {
-        throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
-    }
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    x1 += top.xOffset;
-    y1 += top.yOffset;
-    x2 += top.xOffset;
-    y2 += top.yOffset;
-
-    SDL_SetRenderDrawColor(mRenderer,
-                           (Uint8)(mColor.r),
-                           (Uint8)(mColor.g),
-                           (Uint8)(mColor.b),
-                           (Uint8)(mColor.a));
-    SDL_RenderDrawLine(mRenderer, x1, y1, x2, y2);
-}
-
-void Graphics::drawRectangle(const gcn::Rectangle &rectangle)
-{
-    if (mClipStack.empty())
-    {
-        throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
-    }
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    SDL_Rect rect;
-    rect.x = rectangle.x + top.xOffset;
-    rect.y = rectangle.y + top.yOffset;
-    rect.w = rectangle.width;
-    rect.h = rectangle.height;
-
-    SDL_SetRenderDrawColor(mRenderer,
-                           (Uint8)(mColor.r),
-                           (Uint8)(mColor.g),
-                           (Uint8)(mColor.b),
-                           (Uint8)(mColor.a));
-    SDL_RenderDrawRect(mRenderer, &rect);
-}
-
-void Graphics::fillRectangle(const gcn::Rectangle &rectangle)
-{
-    if (mClipStack.empty())
-    {
-        throw GCN_EXCEPTION("Clip stack is empty, perhaps you called a draw funtion outside of _beginDraw() and _endDraw()?");
-    }
-
-    const gcn::ClipRectangle &top = mClipStack.top();
-
-    gcn::Rectangle area = rectangle;
-    area.x += top.xOffset;
-    area.y += top.yOffset;
-
-    if(!area.isIntersecting(top))
-    {
-        return;
-    }
-
-    SDL_Rect rect;
-    rect.x = area.x;
-    rect.y = area.y;
-    rect.w = area.width;
-    rect.h = area.height;
-
-    SDL_SetRenderDrawColor(mRenderer,
-                           (Uint8)(mColor.r),
-                           (Uint8)(mColor.g),
-                           (Uint8)(mColor.b),
-                           (Uint8)(mColor.a));
-    SDL_RenderFillRect(mRenderer, &rect);
-}