diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-10-10 22:14:45 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-10-10 22:15:57 +0300 |
commit | aa3f63fd497558a02feb3ddbc44f31eac091f39b (patch) | |
tree | 0e28b9b1f0501dd8be9e1a38db4ec1777fa3fbfa /src/gui/fonts | |
parent | 7c10a6b61e9d06a4ae9cc9f942dfacb6fcfd9d3d (diff) | |
download | ManaVerse-aa3f63fd497558a02feb3ddbc44f31eac091f39b.tar.gz ManaVerse-aa3f63fd497558a02feb3ddbc44f31eac091f39b.tar.bz2 ManaVerse-aa3f63fd497558a02feb3ddbc44f31eac091f39b.tar.xz ManaVerse-aa3f63fd497558a02feb3ddbc44f31eac091f39b.zip |
Remove most unused files.
Diffstat (limited to 'src/gui/fonts')
-rw-r--r-- | src/gui/fonts/font.cpp | 499 | ||||
-rw-r--r-- | src/gui/fonts/font.h | 158 | ||||
-rw-r--r-- | src/gui/fonts/textchunk.cpp | 203 | ||||
-rw-r--r-- | src/gui/fonts/textchunk.h | 75 | ||||
-rw-r--r-- | src/gui/fonts/textchunklist.cpp | 153 | ||||
-rw-r--r-- | src/gui/fonts/textchunklist.h | 60 | ||||
-rw-r--r-- | src/gui/fonts/textchunksmall.cpp | 83 | ||||
-rw-r--r-- | src/gui/fonts/textchunksmall.h | 49 |
8 files changed, 0 insertions, 1280 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp deleted file mode 100644 index 2ac2bcb4a..000000000 --- a/src/gui/fonts/font.cpp +++ /dev/null @@ -1,499 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2009 Aethyra Development Team - * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "gui/fonts/font.h" - -#include "fs/files.h" -#include "fs/paths.h" - -#include "fs/virtfs/tools.h" -#ifdef USE_SDL2 -#include "fs/virtfs/rwops.h" -#endif // USE_SDL2 - -#include "gui/fonts/textchunk.h" - -#include "render/graphics.h" - -#include "resources/imagehelper.h" - -#include "resources/image/image.h" - -#include "utils/checkutils.h" -#include "utils/delete2.h" -#include "utils/sdlcheckutils.h" -#include "utils/stringutils.h" -#include "utils/timer.h" - -#include "debug.h" - -const unsigned int CACHE_SIZE = 256; -const unsigned int CACHE_SIZE_SMALL1 = 2; -const unsigned int CACHE_SIZE_SMALL2 = 50; -const unsigned int CACHE_SIZE_SMALL3 = 170; -const unsigned int CLEAN_TIME = 7; - -bool Font::mSoftMode(false); - -extern char *strBuf; - -static int fontCounter; - -Font::Font(std::string filename, - int size, - const int style) : - mFont(nullptr), - mCreateCounter(0), - mDeleteCounter(0), - mCleanTime(cur_time + CLEAN_TIME) -{ - if (fontCounter == 0) - { - mSoftMode = imageHelper->useOpenGL() == RENDER_SOFTWARE; - if (TTF_Init() == -1) - { - logger->error("Unable to initialize SDL_ttf: " + - std::string(SDL_GetError())); - } - } - - if (size < 4) - { - reportAlways("Error: requested load font %s with size %d", - filename.c_str(), - size); - size = 4; - } - - if (fontCounter == 0) - { - strBuf = new char[65535]; - memset(strBuf, 0, 65535); - } - - ++fontCounter; - - fixDirSeparators(filename); - logger->log("Attempt to load font: %s", - filename.c_str()); - mFont = openFont(filename.c_str(), size); - - if (mFont == nullptr) - { - logger->log("Error normal loading font " + filename); - - filename = "fonts/dejavusans.ttf"; - mFont = openFont(fixDirSeparators(filename).c_str(), size); - if (mFont == nullptr) - { -#ifdef UNITTESTS - reportAlways("Font load failed %s", - filename.c_str()); -#endif // UNITTESTS - logger->error("Font::Font: " + - std::string(SDL_GetError())); - } - else - { - logger->log("Loaded fallback font %s, %d", - filename.c_str(), - size); - } - } - else - { - logger->log("Loaded font %s, %d", - filename.c_str(), - size); - } - - TTF_SetFontStyle(mFont, style); -} - -Font::~Font() -{ - TTF_CloseFont(mFont); - mFont = nullptr; - --fontCounter; - clear(); - - if (fontCounter == 0) - { - TTF_Quit(); - delete []strBuf; - } -} - -TTF_Font *Font::openFont(const char *const name, - const int size) -{ -#ifdef USE_SDL2 - SDL_RWops *const rw = VirtFs::rwopsOpenRead(name); - if (rw) - { - logger->log("Loading virtfs font file: %s", - name); - return TTF_OpenFontIndexRW(rw, 1, size, 0); - } -#endif - const std::string path = VirtFs::getPath(name); - if (Files::existsLocal(path) == false) - { -#ifndef UNITTESTS - // +++ in future need trigger assert in unit tests here too - reportAlways("Font::openFont font not exists: %s", - path.c_str()); -#endif // UNITTESTS - return nullptr; - } - logger->log("Loading physical font file: %s", - path.c_str()); - return TTF_OpenFontIndex(path.c_str(), - size, 0); -} - -void Font::loadFont(std::string filename, - const int size, - const int style) -{ - if (fontCounter == 0 && TTF_Init() == -1) - { - logger->log("Unable to initialize SDL_ttf: " + - std::string(SDL_GetError())); - return; - } - - fixDirSeparators(filename); - TTF_Font *const font = openFont(filename.c_str(), size); - - if (font == nullptr) - { - logger->log("Font::Font: " + - std::string(SDL_GetError())); - return; - } - - if (mFont != nullptr) - TTF_CloseFont(mFont); - - mFont = font; - TTF_SetFontStyle(mFont, style); - clear(); -} - -void Font::clear() -{ - for (size_t f = 0; f < CACHES_NUMBER; f ++) - mCache[f].clear(); -} - -void Font::drawString(Graphics *const graphics, - Color col, - const Color &col2, - const std::string &text, - const int x, const int y) -{ - BLOCK_START("Font::drawString") - if (text.empty()) - { - BLOCK_END("Font::drawString") - return; - } - -// Color col = graphics->getColor(); -// const Color &col2 = graphics->getColor2(); - const float alpha = static_cast<float>(col.a) / 255.0F; - - /* The alpha value is ignored at string generation so avoid caching the - * same text with different alpha values. - */ - col.a = 255; - - const unsigned char chr = text[0]; - TextChunkList *const cache = &mCache[chr]; - - std::map<TextChunkSmall, TextChunk*> &search = cache->search; - std::map<TextChunkSmall, TextChunk*>::iterator i - = search.find(TextChunkSmall(text, col, col2)); - if (i != search.end()) - { - TextChunk *const chunk2 = (*i).second; - cache->moveToFirst(chunk2); - Image *const image = chunk2->img; - if (image != nullptr) - { - image->setAlpha(alpha); - graphics->drawImage(image, x, y); - } - } - else - { - if (cache->size >= CACHE_SIZE) - { -#ifdef DEBUG_FONT_COUNTERS - mDeleteCounter ++; -#endif // DEBUG_FONT_COUNTERS - - cache->removeBack(); - } -#ifdef DEBUG_FONT_COUNTERS - mCreateCounter ++; -#endif // DEBUG_FONT_COUNTERS - - TextChunk *chunk2 = new TextChunk(text, col, col2, this); - - chunk2->generate(mFont, alpha); - cache->insertFirst(chunk2); - - const Image *const image = chunk2->img; - if (image != nullptr) - graphics->drawImage(image, x, y); - } - BLOCK_END("Font::drawString") -} - -void Font::slowLogic(const int rnd) -{ - BLOCK_START("Font::slowLogic") - if (mCleanTime == 0) - { - mCleanTime = cur_time + CLEAN_TIME + rnd; - } - else if (mCleanTime < cur_time) - { - doClean(); - mCleanTime = cur_time + CLEAN_TIME + rnd; - } - BLOCK_END("Font::slowLogic") -} - -int Font::getWidth(const std::string &text) const -{ - if (text.empty()) - return 0; - - const unsigned char chr = text[0]; - TextChunkList *const cache = &mCache[chr]; - - std::map<std::string, TextChunk*> &search = cache->searchWidth; - std::map<std::string, TextChunk*>::iterator i = search.find(text); - if (i != search.end()) - { - TextChunk *const chunk = (*i).second; - cache->moveToFirst(chunk); - const Image *const image = chunk->img; - if (image != nullptr) - return image->getWidth(); - return 0; - } - - // if string was not drawed - int w, h; - getSafeUtf8String(text, strBuf); - TTF_SizeUTF8(mFont, strBuf, &w, &h); - return w; -} - -int Font::getHeight() const -{ - return TTF_FontHeight(mFont); -} - -void Font::doClean() -{ - for (unsigned int f = 0; f < CACHES_NUMBER; f ++) - { - TextChunkList *const cache = &mCache[f]; - const size_t size = CAST_SIZE(cache->size); -#ifdef DEBUG_FONT_COUNTERS - logger->log("ptr: %u, size: %ld", f, size); -#endif // DEBUG_FONT_COUNTERS - - if (size > CACHE_SIZE_SMALL3) - { -#ifdef DEBUG_FONT_COUNTERS - mDeleteCounter += 100; -#endif // DEBUG_FONT_COUNTERS - - cache->removeBack(100); -#ifdef DEBUG_FONT_COUNTERS - logger->log("delete3"); -#endif // DEBUG_FONT_COUNTERS - } - else if (size > CACHE_SIZE_SMALL2) - { -#ifdef DEBUG_FONT_COUNTERS - mDeleteCounter += 20; -#endif // DEBUG_FONT_COUNTERS - - cache->removeBack(20); -#ifdef DEBUG_FONT_COUNTERS - logger->log("delete2"); -#endif // DEBUG_FONT_COUNTERS - } - else if (size > CACHE_SIZE_SMALL1) - { -#ifdef DEBUG_FONT_COUNTERS - mDeleteCounter ++; -#endif // DEBUG_FONT_COUNTERS - - cache->removeBack(); -#ifdef DEBUG_FONT_COUNTERS - logger->log("delete1"); -#endif // DEBUG_FONT_COUNTERS - } - } -} - -int Font::getStringIndexAt(const std::string& text, const int x) const -{ - const size_t sz = text.size(); - for (size_t i = 0; i < sz; ++i) - { - if (getWidth(text.substr(0, i)) > x) - return CAST_S32(i); - } - - return CAST_S32(sz); -} - -const TextChunkList *Font::getCache() const noexcept2 -{ - return mCache; -} - -void Font::generate(TextChunk &chunk) -{ - const std::string &text = chunk.text; - if (text.empty()) - return; - - const unsigned char chr = text[0]; - TextChunkList *const cache = &mCache[chr]; - Color &col = chunk.color; - Color &col2 = chunk.color2; - const int oldAlpha = col.a; - col.a = 255; - - TextChunkSmall key(text, col, col2); - std::map<TextChunkSmall, TextChunk*> &search = cache->search; - std::map<TextChunkSmall, TextChunk*>::iterator i = search.find(key); - if (i != search.end()) - { - TextChunk *const chunk2 = (*i).second; - cache->moveToFirst(chunk2); -// search.erase(key); - cache->remove(chunk2); - chunk.img = chunk2->img; - chunk2->img = nullptr; - delete chunk2; -// logger->log("cached image: " + chunk.text); - } - else - { - if (cache->size >= CACHE_SIZE) - { -#ifdef DEBUG_FONT_COUNTERS - mDeleteCounter ++; -#endif // DEBUG_FONT_COUNTERS - - cache->removeBack(); - } -#ifdef DEBUG_FONT_COUNTERS - mCreateCounter ++; -#endif // DEBUG_FONT_COUNTERS - - const float alpha = static_cast<float>(chunk.color.a) / 255.0F; - chunk.generate(mFont, alpha); -// logger->log("generate image: " + chunk.text); - } - col.a = oldAlpha; -} - -void Font::insertChunk(TextChunk *const chunk) -{ - if ((chunk == nullptr) || chunk->text.empty() || (chunk->img == nullptr)) - return; -// logger->log("insert chunk: text=%s, color: %d,%d,%d", -// chunk->text.c_str(), chunk->color.r, chunk->color.g, chunk->color.b); - const unsigned char chr = chunk->text[0]; - TextChunkList *const cache = &mCache[chr]; - - std::map<TextChunkSmall, TextChunk*> &search = cache->search; - std::map<TextChunkSmall, TextChunk*>::iterator i - = search.find(TextChunkSmall(chunk->text, - chunk->color, chunk->color2)); - if (i != search.end()) - { - delete2(chunk->img); - return; - } - - TextChunk *const chunk2 = new TextChunk(chunk->text, - chunk->color, chunk->color2, chunk->textFont); - chunk2->img = chunk->img; - cache->insertFirst(chunk2); -} diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h deleted file mode 100644 index 4f3670374..000000000 --- a/src/gui/fonts/font.h +++ /dev/null @@ -1,158 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2017 The ManaPlus Developers - * Copyright (C) 2009 Aethyra Development Team - * - * 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 <http://www.gnu.org/licenses/>. - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef GUI_FONTS_FONT_H -#define GUI_FONTS_FONT_H - -#include "gui/fonts/textchunklist.h" - -PRAGMA48(GCC diagnostic push) -PRAGMA48(GCC diagnostic ignored "-Wshadow") -#include <SDL_ttf.h> -PRAGMA48(GCC diagnostic pop) - -#include "localconsts.h" - -class Graphics; - -const unsigned int CACHES_NUMBER = 256; - -/** - * A wrapper around SDL_ttf for allowing the use of TrueType fonts. - * - * <b>NOTE:</b> This class initializes SDL_ttf as necessary. - */ -class Font final -{ - public: - Font(std::string filename, - int size, - const int style); - - A_DELETE_COPY(Font) - - ~Font(); - - void loadFont(std::string filename, - const int size, - const int style) restrict2; - - int getWidth(const std::string &text) const restrict2 A_WARN_UNUSED; - - int getHeight() const restrict2 A_WARN_UNUSED; - - const TextChunkList *getCache() const restrict2 noexcept2 - A_CONST A_WARN_UNUSED; - - /** - * @see Font::drawString - */ - void drawString(Graphics *restrict const graphics, - Color col, - const Color &restrict col2, - const std::string &restrict text, - const int x, - const int y) restrict2 A_NONNULL(2); - - void clear() restrict2; - - void doClean() restrict2; - - void slowLogic(const int rnd) restrict2; - - unsigned int getCreateCounter() const restrict2 noexcept2 A_WARN_UNUSED - { return mCreateCounter; } - - unsigned int getDeleteCounter() const restrict2 noexcept2 A_WARN_UNUSED - { return mDeleteCounter; } - - int getStringIndexAt(const std::string &restrict text, - const int x) const restrict2 A_WARN_UNUSED; - - void generate(TextChunk &restrict chunk) restrict2; - - void insertChunk(TextChunk *const chunk) restrict2; - - static bool mSoftMode; - - private: - static TTF_Font *openFont(const char *restrict const name, - const int size); - - TTF_Font *restrict mFont; - unsigned int mCreateCounter; - unsigned int mDeleteCounter; - - // Word surfaces cache - time_t mCleanTime; - mutable TextChunkList mCache[CACHES_NUMBER]; -}; - -#ifdef UNITTESTS -extern int textChunkCnt; -#endif // UNITTESTS - -#endif // GUI_FONTS_FONT_H diff --git a/src/gui/fonts/textchunk.cpp b/src/gui/fonts/textchunk.cpp deleted file mode 100644 index 22dcd18dc..000000000 --- a/src/gui/fonts/textchunk.cpp +++ /dev/null @@ -1,203 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2009 Aethyra Development Team - * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. - */ - -#include "gui/fonts/textchunk.h" - -#include "sdlshared.h" - -#include "gui/fonts/font.h" - -#include "resources/surfaceimagehelper.h" - -#include "resources/image/image.h" - -#include "utils/delete2.h" -#include "utils/sdlcheckutils.h" -#include "utils/stringutils.h" - -#include "debug.h" - -namespace -{ - const int OUTLINE_SIZE = 1; -} // namespace - -char *restrict strBuf = nullptr; - -#ifdef UNITTESTS -int textChunkCnt = 0; -#endif // UNITTESTS - -TextChunk::TextChunk() : - img(nullptr), - textFont(nullptr), - text(), - color(), - color2(), - prev(nullptr), - next(nullptr) -{ -#ifdef UNITTESTS - textChunkCnt ++; -#endif // UNITTESTS -} - -TextChunk::TextChunk(const std::string &restrict text0, - const Color &restrict color0, - const Color &restrict color1, - Font *restrict const font) : - img(nullptr), - textFont(font), - text(text0), - color(color0), - color2(color1), - prev(nullptr), - next(nullptr) -{ -#ifdef UNITTESTS - textChunkCnt ++; -#endif // UNITTESTS -} - -TextChunk::~TextChunk() -{ - delete2(img); -#ifdef UNITTESTS - textChunkCnt --; -#endif // UNITTESTS -} - -bool TextChunk::operator==(const TextChunk &restrict chunk) const -{ - return chunk.text == text && chunk.color == color - && chunk.color2 == color2; -} - -void TextChunk::generate(TTF_Font *restrict const font, - const float alpha) -{ - BLOCK_START("TextChunk::generate") - SDL_Color sdlCol; - sdlCol.b = CAST_U8(color.b); - sdlCol.r = CAST_U8(color.r); - sdlCol.g = CAST_U8(color.g); -#ifdef USE_SDL2 - sdlCol.a = 255; -#else // USE_SDL2 - - sdlCol.unused = 0; -#endif // USE_SDL2 - - getSafeUtf8String(text, strBuf); - - SDL_Surface *surface = MTTF_RenderUTF8_Blended( - font, strBuf, sdlCol); - - if (surface == nullptr) - { - img = nullptr; - BLOCK_END("TextChunk::generate") - return; - } - - const int width = surface->w; - const int height = surface->h; - - if (color.r != color2.r || color.g != color2.g - || color.b != color2.b) - { // outlining - SDL_Color sdlCol2; - SDL_Surface *const background = imageHelper->create32BitSurface( - width, height); - if (background == nullptr) - { - img = nullptr; - MSDL_FreeSurface(surface); - BLOCK_END("TextChunk::generate") - return; - } - sdlCol2.b = CAST_U8(color2.b); - sdlCol2.r = CAST_U8(color2.r); - sdlCol2.g = CAST_U8(color2.g); -#ifdef USE_SDL2 - sdlCol2.a = 255; -#else // USE_SDL2 - - sdlCol2.unused = 0; -#endif // USE_SDL2 - - SDL_Surface *const surface2 = MTTF_RenderUTF8_Blended( - font, strBuf, sdlCol2); - if (surface2 == nullptr) - { - img = nullptr; - MSDL_FreeSurface(surface); - BLOCK_END("TextChunk::generate") - return; - } - SDL_Rect rect = - { - OUTLINE_SIZE, - 0, - static_cast<Uint16>(surface->w), - static_cast<Uint16>(surface->h) - }; - SurfaceImageHelper::combineSurface(surface2, nullptr, - background, &rect); - rect.x = -OUTLINE_SIZE; - SurfaceImageHelper::combineSurface(surface2, nullptr, - background, &rect); - rect.x = 0; - rect.y = -OUTLINE_SIZE; - SurfaceImageHelper::combineSurface(surface2, nullptr, - background, &rect); - rect.y = OUTLINE_SIZE; - SurfaceImageHelper::combineSurface(surface2, nullptr, - background, &rect); - rect.x = 0; - rect.y = 0; - SurfaceImageHelper::combineSurface(surface, nullptr, - background, &rect); - MSDL_FreeSurface(surface); - MSDL_FreeSurface(surface2); - surface = background; - } - img = imageHelper->createTextSurface( - surface, width, height, alpha); - MSDL_FreeSurface(surface); - - BLOCK_END("TextChunk::generate") -} - -void TextChunk::deleteImage() -{ - if (textFont != nullptr) - { - textFont->insertChunk(this); - img = nullptr; - } - else - { - delete2(img); - } -} diff --git a/src/gui/fonts/textchunk.h b/src/gui/fonts/textchunk.h deleted file mode 100644 index bbd50fdff..000000000 --- a/src/gui/fonts/textchunk.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2017 The ManaPlus Developers - * Copyright (C) 2009 Aethyra Development Team - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#ifndef GUI_FONTS_TEXTCHUNK_H -#define GUI_FONTS_TEXTCHUNK_H - -#include "gui/color.h" - -#include <string> - -PRAGMA48(GCC diagnostic push) -PRAGMA48(GCC diagnostic ignored "-Wshadow") -#include <SDL_ttf.h> -PRAGMA48(GCC diagnostic pop) - -#include "localconsts.h" - -class Font; -class Image; - -class TextChunk final -{ - public: - TextChunk(); - - TextChunk(const std::string &restrict text0, - const Color &restrict color0, - const Color &restrict color1, - Font *restrict const font); - - A_DELETE_COPY(TextChunk) - - ~TextChunk(); - - bool operator==(const TextChunk &restrict chunk) const restrict2; - - void generate(TTF_Font *restrict const font, - const float alpha) restrict2; - - void deleteImage() restrict2; - - Image *restrict img; - Font *restrict textFont; - std::string text; - Color color; - Color color2; - TextChunk *restrict prev; - TextChunk *restrict next; -}; - -#ifdef UNITTESTS -extern int textChunkCnt; -#endif // UNITTESTS - -#endif // GUI_FONTS_TEXTCHUNK_H diff --git a/src/gui/fonts/textchunklist.cpp b/src/gui/fonts/textchunklist.cpp deleted file mode 100644 index 4ce39406b..000000000 --- a/src/gui/fonts/textchunklist.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. - */ - -#include "gui/fonts/textchunklist.h" - -#include "gui/fonts/textchunk.h" - -#include "debug.h" - -TextChunkList::TextChunkList() : - start(nullptr), - end(nullptr), - size(0), - search(), - searchWidth() -{ -} - -void TextChunkList::insertFirst(TextChunk *restrict const item) -{ - TextChunk *restrict const oldFirst = start; - if (start != nullptr) - start->prev = item; - item->prev = nullptr; - if (oldFirst != nullptr) - item->next = oldFirst; - else - end = item; - start = item; - size ++; - search[TextChunkSmall(item->text, item->color, item->color2)] = item; - searchWidth[item->text] = item; -} - -void TextChunkList::moveToFirst(TextChunk *restrict const item) -{ - if (item == start) - return; - - TextChunk *restrict const oldPrev = item->prev; - if (oldPrev != nullptr) - oldPrev->next = item->next; - TextChunk *restrict const oldNext = item->next; - if (oldNext != nullptr) - oldNext->prev = item->prev; - else - end = oldPrev; - TextChunk *restrict const oldFirst = start; - if (start != nullptr) - start->prev = item; - item->prev = nullptr; - item->next = oldFirst; - start = item; -} - -void TextChunkList::remove(const TextChunk *restrict const item) -{ - if (item == nullptr) - return; - - TextChunk *restrict const oldPrev = item->prev; - TextChunk *restrict const oldNext = item->next; - if (oldPrev != nullptr) - oldPrev->next = item->next; - else - start = oldNext; - if (oldNext != nullptr) - oldNext->prev = item->prev; - else - end = oldPrev; - - search.erase(TextChunkSmall(item->text, - item->color, item->color2)); - searchWidth.erase(item->text); - size --; -} - -void TextChunkList::removeBack() -{ - TextChunk *restrict oldEnd = end; - if (oldEnd != nullptr) - { - end = oldEnd->prev; - if (end != nullptr) - end->next = nullptr; - else - start = nullptr; - search.erase(TextChunkSmall(oldEnd->text, - oldEnd->color, oldEnd->color2)); - searchWidth.erase(oldEnd->text); - delete oldEnd; - size --; - } -} - -void TextChunkList::removeBack(int n) -{ - TextChunk *restrict item = end; - while ((n != 0) && (item != nullptr)) - { - n --; - TextChunk *oldEnd = item; - item = item->prev; - search.erase(TextChunkSmall(oldEnd->text, - oldEnd->color, oldEnd->color2)); - searchWidth.erase(oldEnd->text); - delete oldEnd; - size --; - } - if (item != nullptr) - { - item->next = nullptr; - end = item; - } - else - { - start = nullptr; - end = nullptr; - } -} - -void TextChunkList::clear() -{ - search.clear(); - searchWidth.clear(); - TextChunk *restrict item = start; - while (item != nullptr) - { - TextChunk *restrict const item2 = item->next; - delete item; - item = item2; - } - start = nullptr; - end = nullptr; - size = 0; -} diff --git a/src/gui/fonts/textchunklist.h b/src/gui/fonts/textchunklist.h deleted file mode 100644 index fff198445..000000000 --- a/src/gui/fonts/textchunklist.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. - */ - -#ifndef GUI_FONTS_TEXTCHUNKLIST_H -#define GUI_FONTS_TEXTCHUNKLIST_H - -#include "gui/fonts/textchunksmall.h" - -#include <map> - -#include "localconsts.h" - -class TextChunk; - -class TextChunkList final -{ - public: - TextChunkList(); - - A_DELETE_COPY(TextChunkList) - - void insertFirst(TextChunk *restrict const item) - restrict2 A_NONNULL(2); - - void moveToFirst(TextChunk *restrict const item) - restrict2 A_NONNULL(2); - - void remove(const TextChunk *restrict const item) restrict2; - - void removeBack() restrict2; - - void removeBack(int n) restrict2; - - void clear() restrict2; - - TextChunk *restrict start; - TextChunk *restrict end; - uint32_t size; - std::map<TextChunkSmall, TextChunk*> search; - std::map<std::string, TextChunk*> searchWidth; -}; - -#endif // GUI_FONTS_TEXTCHUNKLIST_H diff --git a/src/gui/fonts/textchunksmall.cpp b/src/gui/fonts/textchunksmall.cpp deleted file mode 100644 index 73e8ad386..000000000 --- a/src/gui/fonts/textchunksmall.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. - */ - -#include "gui/fonts/textchunksmall.h" - -#include "gui/fonts/font.h" - -#include "debug.h" - -TextChunkSmall::TextChunkSmall(const std::string &text0, - const Color &color0, - const Color &color1) : - text(text0), - color(color0), - color2(color1) -{ -} - -TextChunkSmall::TextChunkSmall(const TextChunkSmall &old) : - text(old.text), - color(old.color), - color2(old.color2) -{ -} - -TextChunkSmall &TextChunkSmall::operator=(const TextChunkSmall &chunk) -{ - text = chunk.text; - color = chunk.color; - color2 = chunk.color2; - return *this; -} - -bool TextChunkSmall::operator==(const TextChunkSmall &chunk) const -{ - return chunk.text == text && - chunk.color == color && - chunk.color2 == color2; -} - -bool TextChunkSmall::operator<(const TextChunkSmall &chunk) const -{ - if (chunk.text != text) - return chunk.text > text; - - const Color &restrict c = chunk.color; - if (c.r != color.r) - return c.r > color.r; - if (c.g != color.g) - return c.g > color.g; - if (c.b != color.b) - return c.b > color.b; - - const Color &restrict c2 = chunk.color2; - if (c2.r != color2.r) - return c2.r > color2.r; - if (c2.g != color2.g) - return c2.g > color2.g; - if (c2.b != color2.b) - return c2.b > color2.b; - - if (c.a != color.a && Font::mSoftMode) - return c.a > color.a; - - return false; -} diff --git a/src/gui/fonts/textchunksmall.h b/src/gui/fonts/textchunksmall.h deleted file mode 100644 index 0896c3591..000000000 --- a/src/gui/fonts/textchunksmall.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-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 <http://www.gnu.org/licenses/>. - */ - -#ifndef GUI_FONTS_TEXTCHUNKSMALL_H -#define GUI_FONTS_TEXTCHUNKSMALL_H - -#include "gui/color.h" - -#include <string> - -#include "localconsts.h" - -class TextChunkSmall final -{ - public: - A_DEFAULT_COPY(TextChunkSmall) - - TextChunkSmall(const std::string &restrict text0, - const Color &restrict color0, - const Color &restrict color1); - - TextChunkSmall(const TextChunkSmall &restrict old); - - bool operator==(const TextChunkSmall &restrict chunk) const restrict2; - bool operator<(const TextChunkSmall &restrict chunk) const restrict2; - TextChunkSmall &operator=(const TextChunkSmall &restrict chunk) - restrict2; - std::string text; - Color color; - Color color2; -}; -#endif // GUI_FONTS_TEXTCHUNKSMALL_H |