From a3eae284bfdb06ea5501230705f19e75e6a0173d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 May 2014 18:43:03 +0300 Subject: Move textchunksmall into separate file. --- src/CMakeLists.txt | 2 + src/Makefile.am | 2 + src/gui/fonts/font.cpp | 111 +++++++++++---------------------------- src/gui/fonts/font.h | 47 ++++++----------- src/gui/fonts/textchunksmall.cpp | 75 ++++++++++++++++++++++++++ src/gui/fonts/textchunksmall.h | 46 ++++++++++++++++ 6 files changed, 173 insertions(+), 110 deletions(-) create mode 100644 src/gui/fonts/textchunksmall.cpp create mode 100644 src/gui/fonts/textchunksmall.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 404604a65..3742b845f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -427,6 +427,8 @@ SET(SRCS gui/setupactiondata.h gui/fonts/font.cpp gui/fonts/font.h + gui/fonts/textchunksmall.cpp + gui/fonts/textchunksmall.h gui/windows/shopwindow.cpp gui/windows/shopwindow.h gui/windows/shortcutwindow.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 4fa1097d4..bd172ca87 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -524,6 +524,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/setupactiondata.h \ gui/fonts/font.cpp \ gui/fonts/font.h \ + gui/fonts/textchunksmall.cpp \ + gui/fonts/textchunksmall.h \ gui/windows/shopwindow.cpp \ gui/windows/shopwindow.h \ gui/windows/shortcutwindow.cpp \ diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index d8abc1dcf..a8f636862 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -99,56 +99,7 @@ char *strBuf = nullptr; int sdlTextChunkCnt = 0; #endif -SDLTextChunkSmall::SDLTextChunkSmall(const std::string &text0, - const Color &color0, - const Color &color1) : - text(text0), - color(color0), - color2(color1) -{ -} - -SDLTextChunkSmall::SDLTextChunkSmall(const SDLTextChunkSmall &old) : - text(old.text), - color(old.color), - color2(old.color2) -{ -} - -bool SDLTextChunkSmall::operator==(const SDLTextChunkSmall &chunk) const -{ - return (chunk.text == text && chunk.color == color - && chunk.color2 == color2); -} - -bool SDLTextChunkSmall::operator<(const SDLTextChunkSmall &chunk) const -{ - if (chunk.text != text) - return chunk.text > text; - - const Color &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 &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; -} - -SDLTextChunk::SDLTextChunk(const std::string &text0, const Color &color0, +TextChunk::TextChunk(const std::string &text0, const Color &color0, const Color &color1) : img(nullptr), text(text0), @@ -162,7 +113,7 @@ SDLTextChunk::SDLTextChunk(const std::string &text0, const Color &color0, #endif } -SDLTextChunk::~SDLTextChunk() +TextChunk::~TextChunk() { delete2(img); #ifdef UNITTESTS @@ -170,15 +121,15 @@ SDLTextChunk::~SDLTextChunk() #endif } -bool SDLTextChunk::operator==(const SDLTextChunk &chunk) const +bool TextChunk::operator==(const TextChunk &chunk) const { return (chunk.text == text && chunk.color == color && chunk.color2 == color2); } -void SDLTextChunk::generate(TTF_Font *const font, const float alpha) +void TextChunk::generate(TTF_Font *const font, const float alpha) { - BLOCK_START("SDLTextChunk::generate") + BLOCK_START("TextChunk::generate") SDL_Color sdlCol; sdlCol.b = static_cast(color.b); sdlCol.r = static_cast(color.r); @@ -197,7 +148,7 @@ void SDLTextChunk::generate(TTF_Font *const font, const float alpha) if (!surface) { img = nullptr; - BLOCK_END("SDLTextChunk::generate") + BLOCK_END("TextChunk::generate") return; } @@ -214,7 +165,7 @@ void SDLTextChunk::generate(TTF_Font *const font, const float alpha) { img = nullptr; MSDL_FreeSurface(surface); - BLOCK_END("SDLTextChunk::generate") + BLOCK_END("TextChunk::generate") return; } sdlCol2.b = static_cast(color2.b); @@ -231,7 +182,7 @@ void SDLTextChunk::generate(TTF_Font *const font, const float alpha) { img = nullptr; MSDL_FreeSurface(surface); - BLOCK_END("SDLTextChunk::generate") + BLOCK_END("TextChunk::generate") return; } SDL_Rect rect = @@ -265,7 +216,7 @@ void SDLTextChunk::generate(TTF_Font *const font, const float alpha) surface, width, height, alpha); MSDL_FreeSurface(surface); - BLOCK_END("SDLTextChunk::generate") + BLOCK_END("TextChunk::generate") } @@ -278,9 +229,9 @@ TextChunkList::TextChunkList() : { } -void TextChunkList::insertFirst(SDLTextChunk *const item) +void TextChunkList::insertFirst(TextChunk *const item) { - SDLTextChunk *const oldFirst = start; + TextChunk *const oldFirst = start; if (start) start->prev = item; item->prev = nullptr; @@ -290,24 +241,24 @@ void TextChunkList::insertFirst(SDLTextChunk *const item) end = item; start = item; size ++; - search[SDLTextChunkSmall(item->text, item->color, item->color2)] = item; + search[TextChunkSmall(item->text, item->color, item->color2)] = item; searchWidth[item->text] = item; } -void TextChunkList::moveToFirst(SDLTextChunk *const item) +void TextChunkList::moveToFirst(TextChunk *const item) { if (item == start) return; - SDLTextChunk *oldPrev = item->prev; + TextChunk *oldPrev = item->prev; if (oldPrev) oldPrev->next = item->next; - SDLTextChunk *oldNext = item->next; + TextChunk *oldNext = item->next; if (oldNext) oldNext->prev = item->prev; else end = oldPrev; - SDLTextChunk *const oldFirst = start; + TextChunk *const oldFirst = start; if (start) start->prev = item; item->prev = nullptr; @@ -317,7 +268,7 @@ void TextChunkList::moveToFirst(SDLTextChunk *const item) void TextChunkList::removeBack() { - SDLTextChunk *oldEnd = end; + TextChunk *oldEnd = end; if (oldEnd) { end = oldEnd->prev; @@ -325,7 +276,7 @@ void TextChunkList::removeBack() end->next = nullptr; else start = nullptr; - search.erase(SDLTextChunkSmall(oldEnd->text, + search.erase(TextChunkSmall(oldEnd->text, oldEnd->color, oldEnd->color2)); searchWidth.erase(oldEnd->text); delete oldEnd; @@ -335,13 +286,13 @@ void TextChunkList::removeBack() void TextChunkList::removeBack(int n) { - SDLTextChunk *item = end; + TextChunk *item = end; while (n && item) { n --; - SDLTextChunk *oldEnd = item; + TextChunk *oldEnd = item; item = item->prev; - search.erase(SDLTextChunkSmall(oldEnd->text, + search.erase(TextChunkSmall(oldEnd->text, oldEnd->color, oldEnd->color2)); searchWidth.erase(oldEnd->text); delete oldEnd; @@ -363,10 +314,10 @@ void TextChunkList::clear() { search.clear(); searchWidth.clear(); - SDLTextChunk *item = start; + TextChunk *item = start; while (item) { - SDLTextChunk *item2 = item->next; + TextChunk *item2 = item->next; delete item; item = item2; } @@ -511,12 +462,12 @@ void Font::drawString(Graphics *const graphics, const unsigned char chr = text[0]; TextChunkList *const cache = &mCache[chr]; - std::map &search = cache->search; - std::map::iterator i - = search.find(SDLTextChunkSmall(text, col, col2)); + std::map &search = cache->search; + std::map::iterator i + = search.find(TextChunkSmall(text, col, col2)); if (i != search.end()) { - SDLTextChunk *const chunk2 = (*i).second; + TextChunk *const chunk2 = (*i).second; cache->moveToFirst(chunk2); Image *const image = chunk2->img; if (image) @@ -537,7 +488,7 @@ void Font::drawString(Graphics *const graphics, #ifdef DEBUG_FONT_COUNTERS mCreateCounter ++; #endif - SDLTextChunk *chunk2 = new SDLTextChunk(text, col, col2); + TextChunk *chunk2 = new TextChunk(text, col, col2); chunk2->generate(mFont, alpha); cache->insertFirst(chunk2); @@ -572,11 +523,11 @@ int Font::getWidth(const std::string &text) const const unsigned char chr = text[0]; TextChunkList *const cache = &mCache[chr]; - std::map &search = cache->searchWidth; - std::map::iterator i = search.find(text); + std::map &search = cache->searchWidth; + std::map::iterator i = search.find(text); if (i != search.end()) { - SDLTextChunk *const chunk = (*i).second; + TextChunk *const chunk = (*i).second; cache->moveToFirst(chunk); const Image *const image = chunk->img; if (image) diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h index f6a64a2d8..551800bdb 100644 --- a/src/gui/fonts/font.h +++ b/src/gui/fonts/font.h @@ -69,6 +69,8 @@ #include "gui/color.h" +#include "gui/fonts/textchunksmall.h" + #include #include @@ -82,33 +84,18 @@ class Image; const unsigned int CACHES_NUMBER = 256; -class SDLTextChunkSmall -{ - public: - SDLTextChunkSmall(const std::string &text0, const Color &color0, - const Color &color1); - - SDLTextChunkSmall(const SDLTextChunkSmall &old); - - bool operator==(const SDLTextChunkSmall &chunk) const; - bool operator<(const SDLTextChunkSmall &chunk) const; - - std::string text; - Color color; - Color color2; -}; - -class SDLTextChunk final +class TextChunk final { public: - SDLTextChunk(const std::string &text0, const Color &color0, - const Color &color1); + TextChunk(const std::string &text0, + const Color &color0, + const Color &color1); - A_DELETE_COPY(SDLTextChunk) + A_DELETE_COPY(TextChunk) - ~SDLTextChunk(); + ~TextChunk(); - bool operator==(const SDLTextChunk &chunk) const; + bool operator==(const TextChunk &chunk) const; void generate(TTF_Font *const font, const float alpha); @@ -116,8 +103,8 @@ class SDLTextChunk final std::string text; Color color; Color color2; - SDLTextChunk *prev; - SDLTextChunk *next; + TextChunk *prev; + TextChunk *next; }; @@ -128,9 +115,9 @@ class TextChunkList final A_DELETE_COPY(TextChunkList) - void insertFirst(SDLTextChunk *const item); + void insertFirst(TextChunk *const item); - void moveToFirst(SDLTextChunk *const item); + void moveToFirst(TextChunk *const item); void removeBack(); @@ -138,11 +125,11 @@ class TextChunkList final void clear(); - SDLTextChunk *start; - SDLTextChunk *end; + TextChunk *start; + TextChunk *end; uint32_t size; - std::map search; - std::map searchWidth; + std::map search; + std::map searchWidth; }; /** diff --git a/src/gui/fonts/textchunksmall.cpp b/src/gui/fonts/textchunksmall.cpp new file mode 100644 index 000000000..84c1aa378 --- /dev/null +++ b/src/gui/fonts/textchunksmall.cpp @@ -0,0 +1,75 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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 . + */ + +#include "gui/fonts/textchunksmall.h" + +#include "gui/fonts/font.h" + +#include "localconsts.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) +{ +} + +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 &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 &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 new file mode 100644 index 000000000..0b3741b4c --- /dev/null +++ b/src/gui/fonts/textchunksmall.h @@ -0,0 +1,46 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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 GUI_FONTS_TEXTCHUNKSMALL_H +#define GUI_FONTS_TEXTCHUNKSMALL_H + +#include "gui/color.h" + +#include + +#include "localconsts.h" + +class TextChunkSmall +{ + public: + TextChunkSmall(const std::string &text0, + const Color &color0, + const Color &color1); + + TextChunkSmall(const TextChunkSmall &old); + + bool operator==(const TextChunkSmall &chunk) const; + bool operator<(const TextChunkSmall &chunk) const; + + std::string text; + Color color; + Color color2; +}; +#endif // GUI_FONTS_TEXTCHUNKSMALL_H -- cgit v1.2.3-60-g2f50