libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-07 11:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NANCY: Implement drawing Autotext marks

Browse Source 
Marks are the special symbols introduced in nancy8,
and are used in the task list to mark done/not done tasks
using a checkmark graphic.
This commit is contained in:
Kaloyan Chehlarski 2024-02-08 23:12:33 +01:00
parent 80d351969d
commit ff39bce6ea
3 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/nancy/action/autotext.cpp
View File

@ -97,13 +97,14 @@ void Autotext::execute() {
bool foundThisKey = false;
for (auto &entry : entriesForSurface) {
Common::String &stringID = entry.stringID;
Common::String markString = entry.mark ? Common::String::format("<%u>", entry.mark) : "";
if (_order == kListFIFO) {
// Add to end of string
stringToPush += autotext->texts[stringID];
stringToPush += (markString + autotext->texts[stringID]);
} else {
// Add to front of string
stringToPush = autotext->texts[stringID] + stringToPush;
stringToPush = markString + autotext->texts[stringID] + stringToPush;
}
if (!_textKey.empty() && stringID == _textKey) {

71
engines/nancy/misc/hypertext.cpp
View File

@ -29,10 +29,12 @@
namespace Nancy {
namespace Misc {
struct ColorFontChange {
bool isFont;
struct MetaInfo {
enum Type { kColor, kFont, kMark };
Type type;
uint numChars;
byte colorOrFontID;
byte index;
};
void HypertextParser::initSurfaces(uint width, uint height, const Graphics::PixelFormat &format, uint32 backgroundColor, uint32 highlightBackgroundColor) {
@ -75,7 +77,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
Common::String currentLine;
bool hasHotspot = false;
Rect hotspot;
Common::Queue<ColorFontChange> colorTextChanges;
Common::Queue<MetaInfo> metaInfo;
Common::Queue<uint16> newlineTokens;
newlineTokens.push(0);
int curFontID = fontID;
@ -148,7 +150,7 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
break;
}
colorTextChanges.push({false, numNonSpaceChars, (byte)(curToken[1] - 48)});
metaInfo.push({MetaInfo::kColor, numNonSpaceChars, (byte)(curToken[1] - '0')});
continue;
case 'f' :
// Font token
@ -157,7 +159,18 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
break;
}
colorTextChanges.push({true, numNonSpaceChars, (byte)(curToken[1] - 48)});
metaInfo.push({MetaInfo::kFont, numNonSpaceChars, (byte)(curToken[1] - '0')});
continue;
case '1':
case '2':
case '3':
case '4':
case '5':
if (curToken.size() != 1) {
break;
}
metaInfo.push({MetaInfo::kMark, numNonSpaceChars, (byte)(curToken[0] - '1')});
continue;
default:
break;
@ -258,20 +271,48 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
while (!line.empty()) {
Common::String subLine;
while (colorTextChanges.size() && totalCharsDrawn >= colorTextChanges.front().numChars) {
// We have a color/font change token at begginning of (what's left of) the current line
ColorFontChange change = colorTextChanges.pop();
if (change.isFont) {
curFontID = change.colorOrFontID;
while (metaInfo.size() && totalCharsDrawn >= metaInfo.front().numChars) {
// We have a color/font change token, or a mark at begginning of (what's left of) the current line
MetaInfo change = metaInfo.pop();
switch (change.type) {
case MetaInfo::kFont:
curFontID = change.index;
font = g_nancy->_graphicsManager->getFont(curFontID);
} else {
colorID = change.colorOrFontID;
break;
case MetaInfo::kColor:
colorID = change.index;
break;
case MetaInfo::kMark: {
auto *mark = GetEngineData(MARK);
assert(mark);
if (lineNumber == 0) {
// A mark on the first line pushes up all text
if (textBounds.top - _imageVerticalOffset > 3) {
_imageVerticalOffset -= 3;
} else {
_imageVerticalOffset = -textBounds.top;
}
}
Common::Rect markSrc = mark->_markSrcs[change.index];
Common::Rect markDest = markSrc;
markDest.moveTo(textBounds.left + horizontalOffset + (newLineStart ? 0 : leftOffsetNonNewline) + 1,
lineNumber == 0 ?
textBounds.top - ((font->getFontHeight() + 1) / 2) + _imageVerticalOffset + 4 :
textBounds.top + _numDrawnLines * font->getFontHeight() + _imageVerticalOffset - 4);
// For now we do not check if we need to go to new line; neither does the original
_fullSurface.blitFrom(g_nancy->_graphicsManager->_object0, markSrc, markDest);
horizontalOffset += markDest.width() + 2;
}
}
}
if (colorTextChanges.size() && totalCharsDrawn < colorTextChanges.front().numChars && colorTextChanges.front().numChars < (totalCharsDrawn + line.size())) {
if (metaInfo.size() && totalCharsDrawn < metaInfo.front().numChars && metaInfo.front().numChars < (totalCharsDrawn + line.size())) {
// There's a token inside the current line, so split off the part before it
subLine = line.substr(0, colorTextChanges.front().numChars - totalCharsDrawn);
subLine = line.substr(0, metaInfo.front().numChars - totalCharsDrawn);
line = line.substr(subLine.size());
}

2
engines/nancy/misc/hypertext.h
View File

@ -59,7 +59,7 @@ protected:
uint32 _backgroundColor;
uint32 _highlightBackgroundColor;
uint _defaultTextColor;
uint _imageVerticalOffset;
int _imageVerticalOffset;
Common::Array<Common::String> _textLines;
Common::Array<Common::Rect> _hotspots;