From 89f6264172de327a53db26cdc15b475ca3c7e62e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 22 Aug 2013 00:19:17 +0300 Subject: add sdlhelper with some low level SDL functions. --- src/CMakeLists.txt | 4 +++ src/Makefile.am | 4 +++ src/graphicsmanager.cpp | 34 ++----------------------- src/gui/setup_video.cpp | 3 ++- src/utils/sdl2helper.cpp | 40 ++++++++++++++++++++++++++++++ src/utils/sdl2helper.h | 35 ++++++++++++++++++++++++++ src/utils/sdlhelper.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ src/utils/sdlhelper.h | 38 ++++++++++++++++++++++++++++ 8 files changed, 189 insertions(+), 33 deletions(-) create mode 100644 src/utils/sdl2helper.cpp create mode 100644 src/utils/sdl2helper.h create mode 100644 src/utils/sdlhelper.cpp create mode 100644 src/utils/sdlhelper.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 783715a46..fc7bfa8c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -534,6 +534,10 @@ SET(SRCS utils/physfstools.h utils/process.cpp utils/process.h + utils/sdl2helper.cpp + utils/sdl2helper.h + utils/sdlhelper.cpp + utils/sdlhelper.h utils/stringutils.cpp utils/stringutils.h utils/stringvector.h diff --git a/src/Makefile.am b/src/Makefile.am index 10844410c..be3bea2ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -546,6 +546,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/physfstools.h \ utils/process.cpp \ utils/process.h \ + utils/sdl2helper.cpp \ + utils/sdl2helper.h \ + utils/sdlhelper.cpp \ + utils/sdlhelper.h \ utils/specialfolder.cpp \ utils/specialfolder.h \ utils/stringutils.cpp \ diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 15eb25af3..25131957f 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -49,6 +49,7 @@ #include "resources/sdlimagehelper.h" #include "utils/paths.h" +#include "utils/sdlhelper.h" #include "utils/stringutils.h" #include "test/testmain.h" @@ -278,7 +279,7 @@ void GraphicsManager::setVideoMode() int width = config.getValue("screenwidth", 0); int height = config.getValue("screenheight", 0); StringVect videoModes; - getAllVideoModes(videoModes); + SDL::getAllVideoModes(videoModes); if (!videoModes.empty()) { bool found(false); @@ -348,37 +349,6 @@ void GraphicsManager::setVideoMode() } } -bool GraphicsManager::getAllVideoModes(StringVect &modeList) -{ - /* Get available fullscreen/hardware modes */ - SDL_Rect **const modes = SDL_ListModes(nullptr, - SDL_FULLSCREEN | SDL_HWSURFACE); - - /* Check which modes are available */ - if (modes == static_cast(nullptr)) - { - logger->log1("No modes available"); - return false; - } - else if (modes == reinterpret_cast(-1)) - { - logger->log1("All resolutions available"); - return true; - } - else - { - for (int i = 0; modes[i]; ++ i) - { - const std::string modeString = - toString(static_cast(modes[i]->w)).append("x") - .append(toString(static_cast(modes[i]->h))); - logger->log("support mode: " + modeString); - modeList.push_back(modeString); - } - return true; - } -} - SDL_Window *GraphicsManager::createWindow(const int w, const int h, const int bpp, const int flags) { diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 14de7cb1a..4d030238e 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -48,6 +48,7 @@ #include "resources/image.h" #include "utils/gettext.h" +#include "utils/sdlhelper.h" #include "test/testmain.h" @@ -122,7 +123,7 @@ static bool modeSorter(const std::string &mode1, const std::string &mode2) ModeListModel::ModeListModel() : mVideoModes() { - graphicsManager.getAllVideoModes(mVideoModes); + SDL::getAllVideoModes(mVideoModes); #ifndef ANDROID addCustomMode("640x480"); addCustomMode("800x600"); diff --git a/src/utils/sdl2helper.cpp b/src/utils/sdl2helper.cpp new file mode 100644 index 000000000..7cf624a2c --- /dev/null +++ b/src/utils/sdl2helper.cpp @@ -0,0 +1,40 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013 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/stringutils.h" + +#include + +#include "debug.h" + +bool SDL::getAllVideoModes(StringVect &modeList) +{ + // +++ need use SDL_GetDisplayMode and SDL_GetNumDisplayModes + modeList.push_back("800x600"); + return true; +} + +#endif // USE_SDL2 diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h new file mode 100644 index 000000000..101c965b8 --- /dev/null +++ b/src/utils/sdl2helper.h @@ -0,0 +1,35 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013 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 . + */ + +#ifndef UTILS_SDL2HELPER_H +#define UTILS_SDL2HELPER_H + +#ifdef USE_SDL2 +#include "utils/stringvector.h" + +#include "localconsts.h" + +namespace SDL +{ + bool getAllVideoModes(StringVect &modeList); +} // namespace SDL + +#endif // USE_SDL2 +#endif // UTILS_SDL2HELPER_H diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp new file mode 100644 index 000000000..064989e93 --- /dev/null +++ b/src/utils/sdlhelper.cpp @@ -0,0 +1,64 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013 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 . + */ + +#ifndef USE_SDL2 + +#include "utils/sdlhelper.h" + +#include "logger.h" + +#include "utils/stringutils.h" + +#include + +#include "debug.h" + +bool SDL::getAllVideoModes(StringVect &modeList) +{ + /* Get available fullscreen/hardware modes */ + SDL_Rect **const modes = SDL_ListModes(nullptr, + SDL_FULLSCREEN | SDL_HWSURFACE); + + /* Check which modes are available */ + if (modes == static_cast(nullptr)) + { + logger->log1("No modes available"); + return false; + } + else if (modes == reinterpret_cast(-1)) + { + logger->log1("All resolutions available"); + return true; + } + else + { + for (int i = 0; modes[i]; ++ i) + { + const std::string modeString = + toString(static_cast(modes[i]->w)).append("x") + .append(toString(static_cast(modes[i]->h))); + logger->log("support mode: " + modeString); + modeList.push_back(modeString); + } + return true; + } +} + +#endif // USE_SDL2 diff --git a/src/utils/sdlhelper.h b/src/utils/sdlhelper.h new file mode 100644 index 000000000..f81cd449d --- /dev/null +++ b/src/utils/sdlhelper.h @@ -0,0 +1,38 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013 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 . + */ + +#ifndef UTILS_SDLHELPER_H +#define UTILS_SDLHELPER_H + +#ifdef USE_SDL2 +#include "utils/sdl2helper.h" + +#else +#include "utils/stringvector.h" + +#include "localconsts.h" + +namespace SDL +{ + bool getAllVideoModes(StringVect &modeList); +} // namespace SDL + +#endif // USE_SDL2 +#endif // UTILS_SDLHELPER_H -- cgit v1.2.3-60-g2f50