From aa3f63fd497558a02feb3ddbc44f31eac091f39b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 10 Oct 2017 22:14:45 +0300 Subject: Remove most unused files. --- src/utils/sdl2helper.cpp | 271 ----------------------------------------------- 1 file changed, 271 deletions(-) delete mode 100644 src/utils/sdl2helper.cpp (limited to 'src/utils/sdl2helper.cpp') diff --git a/src/utils/sdl2helper.cpp b/src/utils/sdl2helper.cpp deleted file mode 100644 index 68fb9cf4d..000000000 --- a/src/utils/sdl2helper.cpp +++ /dev/null @@ -1,271 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifdef USE_SDL2 - -#include "utils/sdl2helper.h" - -#include "logger.h" - -#include "utils/foreach.h" -#include "utils/sdl2logger.h" -#include "utils/stringutils.h" - -#include - -PRAGMA48(GCC diagnostic push) -PRAGMA48(GCC diagnostic ignored "-Wshadow") -#include -#include -#include -#include -PRAGMA48(GCC diagnostic pop) - -#include "debug.h" - -bool SDL::getAllVideoModes(StringVect &modeList) -{ - std::set modes; - const int numDisplays = SDL_GetNumVideoDisplays(); - for (int display = 0; display < numDisplays; display ++) - { - const int numModes = SDL_GetNumDisplayModes(display); - if (numModes > 0) - { - for (int f = 0; f < numModes; f ++) - { - SDL_DisplayMode mode; - SDL_GetDisplayMode(display, f, &mode); - const int w = mode.w; - const int h = mode.h; - logger->log("%dx%dx%d", w, h, mode.refresh_rate); - modes.insert(strprintf("%dx%d", w, h)); - } - } - } - FOR_EACH (std::set::const_iterator, it, modes) - modeList.push_back(*it); - return true; -} - -void SDL::SetWindowTitle(SDL_Window *const window, const char *const title) -{ - SDL_SetWindowTitle(window, title); -} - -void SDL::SetWindowIcon(SDL_Window *const window, SDL_Surface *const icon) -{ - SDL_SetWindowIcon(window, icon); -} - -void SDL::grabInput(SDL_Window *const window, const bool grab) -{ - SDL_SetWindowGrab(window, grab ? SDL_TRUE : SDL_FALSE); -} - -void SDL::setGamma(SDL_Window *const window, const float gamma) -{ - SDL_SetWindowBrightness(window, gamma); -} - -void SDL::setVsync(const int val) -{ - SDL_GL_SetSwapInterval(val); -} - -bool SDL::getWindowWMInfo(SDL_Window *const window, SDL_SysWMinfo *const info) -{ - return SDL_GetWindowWMInfo(window, info); -} - -SDL_Thread *SDL::createThread(SDL_ThreadFunction fn, - const char *restrict const name, - void *restrict const data) -{ - return SDL_CreateThread(fn, name, data); -} - -void *SDL::createGLContext(SDL_Window *const window, - const int major, - const int minor, - const int profile) -{ - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile); -// SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); - SDL_ClearError(); - void *context = SDL_GL_CreateContext(window); - if (context == nullptr) - { - logger->log("Error to switch to context %d.%d: %s", - major, - minor, - SDL_GetError()); - } - if (context == nullptr && (major > 3 || (major == 3 && minor > 3))) - { - logger->log("Try fallback to OpenGL 3.3 context"); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); - SDL_ClearError(); - context = SDL_GL_CreateContext(window); - if (context == nullptr) - { - logger->log("Error to switch to context 3.3: %s", - SDL_GetError()); - } - if (context == nullptr && profile == 0x01) - { - logger->log("Try fallback to OpenGL 3.3 compatibility context"); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, 0x02); - SDL_ClearError(); - context = SDL_GL_CreateContext(window); - if (context == nullptr) - { - logger->log("Error to switch to compatibility context 3.3: %s", - SDL_GetError()); - } - } - } - if (context == nullptr && (major > 3 || (major == 3 && minor > 0))) - { - logger->log("Error to switch to core context %d.%d: %s", - major, - minor, - SDL_GetError()); - logger->log("Try fallback to OpenGL 3.0 core context"); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile); - context = SDL_GL_CreateContext(window); - if (context == nullptr) - { - logger->log("Error to switch to core context 3.0: %s", - SDL_GetError()); - } - } - if (context == nullptr && (major > 2 || (major == 2 && minor > 1))) - { - logger->log("Try fallback to OpenGL 2.1 compatibility context"); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1); - SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, 0x02); - context = SDL_GL_CreateContext(window); - if (context == nullptr) - { - logger->log("Error to switch to compatibility context 2.1: %s", - SDL_GetError()); - } - } - if (context == nullptr) - { - logger->log("Cant find working context."); - } - return context; -} - -void SDL::makeCurrentContext(void *const context A_UNUSED) -{ -} - -void SDL::initLogger() -{ - SDL2Logger::init(); -} - -void SDL::setLogLevel(const int level) -{ - SDL2Logger::setLogLevel(level); -} - -void SDL::WaitThread(SDL_Thread *const thread) -{ - if (thread != nullptr) - SDL_WaitThread(thread, nullptr); -} - -bool SDL::PollEvent(SDL_Event *event) -{ - SDL_PumpEvents(); - return SDL_PeepEvents(event, - 1, - SDL_GETEVENT, - SDL_FIRSTEVENT, - SDL_LASTEVENT) > 0; -} - -void SDL::allowScreenSaver(const bool allow) -{ - if (allow) - { -#if SDL_VERSION_ATLEAST(2, 0, 2) - SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1"); -#endif // SDL_VERSION_ATLEAST(2, 0, 2) - SDL_EnableScreenSaver(); - } - else - { -#if SDL_VERSION_ATLEAST(2, 0, 2) - SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "0"); -#endif // SDL_VERSION_ATLEAST(2, 0, 2) - SDL_DisableScreenSaver(); - } -} - -void SDL::getRenderers(StringVect &list, - const std::string ¤tRenderer) -{ - SDL_RendererInfo info; - const int num = SDL_GetNumRenderDrivers(); - for (int f = 0; f < num; f ++) - { - if (!SDL_GetRenderDriverInfo(f, &info)) - list.push_back(info.name); - } - if (!currentRenderer.empty()) - { - bool found(false); - FOR_EACH (StringVectCIter, it, list) - { - if (*it == currentRenderer) - { - found = true; - break; - } - } - if (!found) - list.push_back(currentRenderer); - } - std::sort(list.begin(), list.end()); -} - -void SDL::setRendererHint(const std::string &driver) -{ - if (!driver.empty()) - { - SDL_SetHint(SDL_HINT_RENDER_DRIVER, - driver.c_str()); - } -} - -#endif // USE_SDL2 -- cgit v1.2.3-70-g09d2