From efed250aa7a4c543d97b021464440ae8ab63b205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Sat, 27 Aug 2011 21:13:15 +0200 Subject: [PATCH] Rename CMarkup to C4Markup --- CMakeLists.txt | 10 +++---- Makefile.am | 4 +-- src/C4Prototypes.h | 2 +- src/game/object/C4InfoCore.cpp | 2 +- src/gui/C4Menu.cpp | 2 +- src/lib/C4InputValidation.cpp | 4 +-- src/lib/C4Log.cpp | 2 +- src/lib/{StdMarkup.cpp => C4Markup.cpp} | 22 +++++++-------- src/lib/{StdMarkup.h => C4Markup.h} | 36 ++++++++++++------------- src/platform/StdD3D.cpp | 2 +- src/platform/StdDDraw2.cpp | 8 +++--- src/platform/StdDDraw2.h | 2 +- src/platform/StdFont.cpp | 10 +++---- src/platform/StdFont.h | 6 ++--- 14 files changed, 55 insertions(+), 57 deletions(-) rename src/lib/{StdMarkup.cpp => C4Markup.cpp} (85%) rename src/lib/{StdMarkup.h => C4Markup.h} (70%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b905768b..f36f151bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -408,8 +408,8 @@ set(OC_CLONK_SOURCES src/lib/StdColors.h src/lib/StdCompiler.cpp src/lib/StdCompiler.h - src/lib/StdMarkup.cpp - src/lib/StdMarkup.h + src/lib/C4Markup.cpp + src/lib/C4Markup.h src/lib/StdMesh.cpp src/lib/StdMesh.h src/lib/StdMeshLoader.h @@ -886,7 +886,7 @@ add_executable(c4group src/c4group/C4Update.cpp src/lib/Standard.cpp src/c4group/CStdFile.cpp - src/lib/StdMarkup.cpp + src/lib/C4Markup.cpp src/lib/StdBuf.cpp src/lib/StdCompiler.cpp src/platform/StdFile.cpp @@ -920,8 +920,8 @@ add_executable(c4script src/lib/StdBuf.h src/lib/StdCompiler.cpp src/lib/StdCompiler.h - src/lib/StdMarkup.cpp - src/lib/StdMarkup.h + src/lib/C4Markup.cpp + src/lib/C4Markup.h src/lib/StdResStr2.cpp src/lib/StdResStr2.h src/platform/GetTime.cpp diff --git a/Makefile.am b/Makefile.am index fb5c9ddd1..0e3c608f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,8 +126,8 @@ src/lib/StdBuf.cpp \ src/lib/StdBuf.h \ src/lib/StdCompiler.cpp \ src/lib/StdCompiler.h \ -src/lib/StdMarkup.cpp \ -src/lib/StdMarkup.h \ +src/lib/C4Markup.cpp \ +src/lib/C4Markup.h \ src/lib/StdResStr2.cpp \ src/lib/StdResStr2.h \ src/network/C4NetIO.cpp \ diff --git a/src/C4Prototypes.h b/src/C4Prototypes.h index c7ced0201..7d6879cea 100644 --- a/src/C4Prototypes.h +++ b/src/C4Prototypes.h @@ -124,7 +124,7 @@ class C4ValueNumbers; class C4Viewport; class C4ViewportList; class C4ViewportWindow; -class CMarkup; +class C4Markup; class CStdFont; class CStdStream; class CStdVectorFont; diff --git a/src/game/object/C4InfoCore.cpp b/src/game/object/C4InfoCore.cpp index be6c830a8..ddb5cc329 100644 --- a/src/game/object/C4InfoCore.cpp +++ b/src/game/object/C4InfoCore.cpp @@ -95,7 +95,7 @@ bool C4PlayerInfoCore::Load(C4Group &hGroup) PrefColorDw &= 0xffffff; PrefColor2Dw &= 0xffffff; // Validate name - CMarkup::StripMarkup(PrefName); + C4Markup::StripMarkup(PrefName); // Success return true; } diff --git a/src/gui/C4Menu.cpp b/src/gui/C4Menu.cpp index 53a2e565f..17d691e9c 100644 --- a/src/gui/C4Menu.cpp +++ b/src/gui/C4Menu.cpp @@ -88,7 +88,7 @@ void C4MenuItem::DoTextProgress(int32_t &riByVal) if (IsSelectable || !*Caption) { TextDisplayProgress=-1; return; } // normal text: move forward in unbroken message, ignoring markup StdStrBuf sText(Caption); - CMarkup MarkupChecker(false); + C4Markup MarkupChecker(false); const char *szPos = sText.getPtr(Min(TextDisplayProgress, sText.getLength())); while (riByVal && *szPos) { diff --git a/src/lib/C4InputValidation.cpp b/src/lib/C4InputValidation.cpp index 72d443cd6..2ece3f2f7 100644 --- a/src/lib/C4InputValidation.cpp +++ b/src/lib/C4InputValidation.cpp @@ -22,7 +22,7 @@ #include "C4Include.h" #include #include -#include "StdMarkup.h" +#include "C4Markup.h" #include @@ -94,7 +94,7 @@ namespace C4InVal case VAL_NameNoEmpty: case VAL_NameAllowEmpty: // no markup - if (CMarkup::StripMarkup(&rsString)) { fValid = false; } + if (C4Markup::StripMarkup(&rsString)) { fValid = false; } // trim spaces if (rsString.TrimSpaces()) fValid = false; // min length diff --git a/src/lib/C4Log.cpp b/src/lib/C4Log.cpp index 6bcb62ebe..7668d773d 100644 --- a/src/lib/C4Log.cpp +++ b/src/lib/C4Log.cpp @@ -113,7 +113,7 @@ bool LogSilent(const char *szMessage, bool fConsole) char *pDest = TimeMessage.getMData() + 11; // copy rest of message, skip tags - CMarkup Markup(false); + C4Markup Markup(false); while (*pSrc) { Markup.SkipTags(&pSrc); diff --git a/src/lib/StdMarkup.cpp b/src/lib/C4Markup.cpp similarity index 85% rename from src/lib/StdMarkup.cpp rename to src/lib/C4Markup.cpp index 4d2053f88..147992553 100644 --- a/src/lib/StdMarkup.cpp +++ b/src/lib/C4Markup.cpp @@ -18,24 +18,24 @@ // markup tags for fonts #include "C4Include.h" -#include +#include #include -void CMarkupTagItalic::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr) +void C4MarkupTagItalic::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr) { // do sheering rBltTrf.mat[1]-=0.3f; } -void CMarkupTagColor::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr) +void C4MarkupTagColor::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr) { // set color if (fDoClr) dwClr = this->dwClr; } -bool CMarkup::Read(const char **ppText, bool fSkip) +bool C4Markup::Read(const char **ppText, bool fSkip) { - char Tag[50]; CMarkupTag *pNewTag=0; int iTagLen,iParLen; + char Tag[50]; C4MarkupTag *pNewTag=0; int iTagLen,iParLen; // get tag if (!SCopyEnclosed(*ppText, '<', '>', Tag, 49)) return false; iTagLen=SLen(Tag); @@ -66,7 +66,7 @@ bool CMarkup::Read(const char **ppText, bool fSkip) // no parameters if (szPars) return false; // create italic tag - if (!fSkip) pNewTag=new CMarkupTagItalic(); + if (!fSkip) pNewTag=new C4MarkupTagItalic(); } // colored else if (SEqual(Tag, "c")) @@ -89,7 +89,7 @@ bool CMarkup::Read(const char **ppText, bool fSkip) // adjust alpha if not given if (iParLen<=6) dwClr|=0xff000000; // create color tag - pNewTag=new CMarkupTagColor(dwClr); + pNewTag=new C4MarkupTagColor(dwClr); } } // unknown tag @@ -104,7 +104,7 @@ bool CMarkup::Read(const char **ppText, bool fSkip) -bool CMarkup::SkipTags(const char **ppText) +bool C4Markup::SkipTags(const char **ppText) { // read tags as long as found while (**ppText=='<') if (!Read(ppText, true)) break; @@ -112,10 +112,10 @@ bool CMarkup::SkipTags(const char **ppText) return !**ppText; } -bool CMarkup::StripMarkup(char *szText) +bool C4Markup::StripMarkup(char *szText) { // skip any tags and inline-images - CMarkup mkup(false); + C4Markup mkup(false); const char *szRead = szText, *szPos2; do { @@ -137,7 +137,7 @@ bool CMarkup::StripMarkup(char *szText) return szText != szRead; } -bool CMarkup::StripMarkup(StdStrBuf *sText) +bool C4Markup::StripMarkup(StdStrBuf *sText) { // strip any markup codes from given text buffer char *buf = sText->GrabPointer(); diff --git a/src/lib/StdMarkup.h b/src/lib/C4Markup.h similarity index 70% rename from src/lib/StdMarkup.h rename to src/lib/C4Markup.h index 90972f8e3..d7bdb5a3d 100644 --- a/src/lib/StdMarkup.h +++ b/src/lib/C4Markup.h @@ -20,63 +20,61 @@ #ifndef INC_STDMARKUP #define INC_STDMARKUP -struct FONT2DVERTEX; - // one markup tag -class CMarkupTag +class C4MarkupTag { public: - CMarkupTag *pPrev, *pNext; + C4MarkupTag *pPrev, *pNext; - CMarkupTag(): pPrev(0), pNext(0) { }; // ctor - virtual ~CMarkupTag() { }; // dtor + C4MarkupTag(): pPrev(0), pNext(0) { }; // ctor + virtual ~C4MarkupTag() { }; // dtor virtual void Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr)=0; // assign markup virtual const char *TagName()=0; // get character string for this tag }; // markup tag for italic text -class CMarkupTagItalic : public CMarkupTag +class C4MarkupTagItalic : public C4MarkupTag { public: - CMarkupTagItalic() : CMarkupTag() { } // ctor + C4MarkupTagItalic() : C4MarkupTag() { } // ctor virtual void Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr); // assign markup virtual const char *TagName() { return "i"; } }; // markup tag for colored text -class CMarkupTagColor : public CMarkupTag +class C4MarkupTagColor : public C4MarkupTag { private: DWORD dwClr; // color public: - CMarkupTagColor(DWORD dwClr) : CMarkupTag(), dwClr(dwClr) { } // ctor + C4MarkupTagColor(DWORD dwClr) : C4MarkupTag(), dwClr(dwClr) { } // ctor virtual void Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr); // assign markup virtual const char *TagName() { return "c"; } }; // markup rendering functionality for text -class CMarkup +class C4Markup { private: - CMarkupTag *pTags, *pLast; // tag list; single linked + C4MarkupTag *pTags, *pLast; // tag list; single linked bool fDoClr; // set if color changes should be made (not in text shadow!) - void Push(CMarkupTag *pTag) + void Push(C4MarkupTag *pTag) { if ((pTag->pPrev=pLast)) pLast->pNext=pTag; else pTags=pTag; pLast=pTag; } - CMarkupTag *Pop() - { CMarkupTag *pL=pLast; if (!pL) return 0; if ((pLast=pL->pPrev)) pLast->pNext=0; else pTags=0; return pL; } + C4MarkupTag *Pop() + { C4MarkupTag *pL=pLast; if (!pL) return 0; if ((pLast=pL->pPrev)) pLast->pNext=0; else pTags=0; return pL; } public: - CMarkup(bool fDoClr) { pTags=pLast=0; this->fDoClr=fDoClr; }; // ctor - ~CMarkup() // dtor - { CMarkupTag *pTag=pTags,*pNext; while (pTag) { pNext=pTag->pNext; delete pTag; pTag=pNext; } } + C4Markup(bool fDoClr) { pTags=pLast=0; this->fDoClr=fDoClr; }; // ctor + ~C4Markup() // dtor + { C4MarkupTag *pTag=pTags,*pNext; while (pTag) { pNext=pTag->pNext; delete pTag; pTag=pNext; } } bool Read(const char **ppText, bool fSkip=false); // get markup from text bool SkipTags(const char **ppText); // extract markup from text; return whether end is reached void Apply(C4BltTransform &rBltTrf, DWORD &dwClr) // assign markup to vertices - { for (CMarkupTag *pTag=pTags; pTag; pTag=pTag->pNext) pTag->Apply(rBltTrf, fDoClr, dwClr); } + { for (C4MarkupTag *pTag=pTags; pTag; pTag=pTag->pNext) pTag->Apply(rBltTrf, fDoClr, dwClr); } bool Clean() { return !pTags; } // empty? static bool StripMarkup(char *szText); // strip any markup codes from given text buffer diff --git a/src/platform/StdD3D.cpp b/src/platform/StdD3D.cpp index 6e4a300ff..ca98122ae 100644 --- a/src/platform/StdD3D.cpp +++ b/src/platform/StdD3D.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/src/platform/StdDDraw2.cpp b/src/platform/StdDDraw2.cpp index bd8998eca..e1cab6bc8 100644 --- a/src/platform/StdDDraw2.cpp +++ b/src/platform/StdDDraw2.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "C4Rect.h" #include @@ -987,7 +987,7 @@ bool CStdDDraw::BlitSurfaceTile2(SURFACE sfcSurface, SURFACE sfcTarget, int iToX bool CStdDDraw::TextOut(const char *szText, CStdFont &rFont, float fZoom, SURFACE sfcDest, float iTx, float iTy, DWORD dwFCol, BYTE byForm, bool fDoMarkup) { - CMarkup Markup(true); + C4Markup Markup(true); static char szLinebuf[2500+1]; for (int cnt=0; SCopySegmentEx(szText,cnt,szLinebuf,fDoMarkup ? '|' : '\n','\n',2500); cnt++,iTy+=int(fZoom*rFont.iLineHgt)) if (!StringOut(szLinebuf,sfcDest,iTx,iTy,dwFCol,byForm,fDoMarkup,Markup,&rFont,fZoom)) return false; @@ -997,12 +997,12 @@ bool CStdDDraw::TextOut(const char *szText, CStdFont &rFont, float fZoom, SURFAC bool CStdDDraw::StringOut(const char *szText, CStdFont &rFont, float fZoom, SURFACE sfcDest, float iTx, float iTy, DWORD dwFCol, BYTE byForm, bool fDoMarkup) { // init markup - CMarkup Markup(true); + C4Markup Markup(true); // output string return StringOut(szText, sfcDest, iTx, iTy, dwFCol, byForm, fDoMarkup, Markup, &rFont, fZoom); } -bool CStdDDraw::StringOut(const char *szText, SURFACE sfcDest, float iTx, float iTy, DWORD dwFCol, BYTE byForm, bool fDoMarkup, CMarkup &Markup, CStdFont *pFont, float fZoom) +bool CStdDDraw::StringOut(const char *szText, SURFACE sfcDest, float iTx, float iTy, DWORD dwFCol, BYTE byForm, bool fDoMarkup, C4Markup &Markup, CStdFont *pFont, float fZoom) { // clip if (ClipAll) return true; diff --git a/src/platform/StdDDraw2.h b/src/platform/StdDDraw2.h index b30815284..2a1e7da8b 100644 --- a/src/platform/StdDDraw2.h +++ b/src/platform/StdDDraw2.h @@ -327,7 +327,7 @@ public: int GetByteCnt() { return byByteCnt; } // return bytes per pixel protected: - bool StringOut(const char *szText, SURFACE sfcDest, float iTx, float iTy, DWORD dwFCol, BYTE byForm, bool fDoMarkup, CMarkup &Markup, CStdFont *pFont, float fZoom); + bool StringOut(const char *szText, SURFACE sfcDest, float iTx, float iTy, DWORD dwFCol, BYTE byForm, bool fDoMarkup, C4Markup &Markup, CStdFont *pFont, float fZoom); virtual void PerformPix(SURFACE sfcDest, float tx, float ty, DWORD dwCol) = 0; // without ClrModMap virtual void PerformLine(SURFACE sfcTarget, float x1, float y1, float x2, float y2, DWORD dwClr) = 0; bool CreatePrimaryClipper(unsigned int iXRes, unsigned int iYRes); diff --git a/src/platform/StdFont.cpp b/src/platform/StdFont.cpp index 6c9484eb8..2f184cf87 100644 --- a/src/platform/StdFont.cpp +++ b/src/platform/StdFont.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -410,7 +410,7 @@ bool CStdFont::GetTextExtent(const char *szText, int32_t &rsx, int32_t &rsy, boo // keep track of each row's size int iRowWdt=0,iWdt=0,iHgt=iLineHgt; // ignore any markup - CMarkup MarkupChecker(false); + C4Markup MarkupChecker(false); // go through all text while (*szText) { @@ -490,7 +490,7 @@ int CStdFont::BreakMessage(const char *szMsg, int iWdt, char *szOut, int iMaxOut iHgt=iLineHgt; // total height of output text bool fIsFirstLineChar = true; // ignore any markup - CMarkup MarkupChecker(false); + C4Markup MarkupChecker(false); // go through all text while (*(szLastPos = szPos)) { @@ -646,7 +646,7 @@ int CStdFont::BreakMessage(const char *szMsg, int iWdt, StdStrBuf *pOut, bool fC iHgt=iLineHgt; // total height of output text bool fIsFirstLineChar = true; // ignore any markup - CMarkup MarkupChecker(false); + C4Markup MarkupChecker(false); // go through all text while (*(szLastPos = szPos)) { @@ -819,7 +819,7 @@ int CStdFont::GetMessageBreak(const char *szMsg, const char **ppNewPos, int iBre /* Text drawing */ -void CStdFont::DrawText(SURFACE sfcDest, float iX, float iY, DWORD dwColor, const char *szText, DWORD dwFlags, CMarkup &Markup, float fZoom) +void CStdFont::DrawText(SURFACE sfcDest, float iX, float iY, DWORD dwColor, const char *szText, DWORD dwFlags, C4Markup &Markup, float fZoom) { assert(IsValidUtf8(szText)); C4BltTransform bt, *pbt=NULL; diff --git a/src/platform/StdFont.h b/src/platform/StdFont.h index b48fc504c..a1c764416 100644 --- a/src/platform/StdFont.h +++ b/src/platform/StdFont.h @@ -21,7 +21,7 @@ #ifndef INC_STDFONT #define INC_STDFONT -#include +#include #include #include #include @@ -42,7 +42,7 @@ #define FW_BOLD 700 #endif -class CMarkup; +class C4Markup; class CStdVectorFont; class CStdFont @@ -108,7 +108,7 @@ protected: public: int iLineHgt; // height of one line of font (in pixels) // draw ine line of text - void DrawText(SURFACE sfcDest, float iX, float iY, DWORD dwColor, const char *szText, DWORD dwFlags, CMarkup &Markup, float fZoom); + void DrawText(SURFACE sfcDest, float iX, float iY, DWORD dwColor, const char *szText, DWORD dwFlags, C4Markup &Markup, float fZoom); // get text size bool GetTextExtent(const char *szText, int32_t &rsx, int32_t &rsy, bool fCheckMarkup = true);