02f2474e3b
Migrate 5 mod Activity subclasses from old polling-based display task pattern to the upstream render() super-class pattern with freeRTOS notification: - EpubReaderBookmarkSelectionActivity - DictionaryWordSelectActivity - DictionarySuggestionsActivity - DictionaryDefinitionActivity - LookedUpWordsActivity Changes: remove own TaskHandle/SemaphoreHandle/updateRequired, use requestUpdate() + render(RenderLock&&) override, fix potential deadlocks around enterNewActivity() calls. Also fix stale conflict marker in EpubReaderMenuActivity.h. Co-authored-by: Cursor <cursoragent@cursor.com>
69 lines
2.1 KiB
C++
69 lines
2.1 KiB
C++
#pragma once
|
|
#include <EpdFontFamily.h>
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "../Activity.h"
|
|
|
|
class DictionaryDefinitionActivity final : public Activity {
|
|
public:
|
|
explicit DictionaryDefinitionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::string& headword, const std::string& definition, int readerFontId,
|
|
uint8_t orientation, const std::function<void()>& onBack,
|
|
const std::function<void()>& onDone = nullptr)
|
|
: Activity("DictionaryDefinition", renderer, mappedInput),
|
|
headword(headword),
|
|
definition(definition),
|
|
readerFontId(readerFontId),
|
|
orientation(orientation),
|
|
onBack(onBack),
|
|
onDone(onDone) {}
|
|
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(Activity::RenderLock&&) override;
|
|
|
|
private:
|
|
// A positioned text segment within a wrapped line (pre-calculated x offset and style).
|
|
struct Segment {
|
|
std::string text;
|
|
int16_t x;
|
|
EpdFontFamily::Style style;
|
|
};
|
|
|
|
// An intermediate token produced by the HTML parser before word-wrapping.
|
|
struct TextAtom {
|
|
std::string text;
|
|
EpdFontFamily::Style style;
|
|
bool isNewline;
|
|
int indent; // pixels to indent the new line (for nested lists)
|
|
};
|
|
|
|
// Tracks ordered/unordered list nesting during HTML parsing.
|
|
struct ListState {
|
|
int counter; // incremented per <li>, 0 = not yet used
|
|
bool isAlpha; // true for list-style-type: lower-alpha
|
|
};
|
|
|
|
std::string headword;
|
|
std::string definition;
|
|
int readerFontId;
|
|
uint8_t orientation;
|
|
const std::function<void()> onBack;
|
|
const std::function<void()> onDone;
|
|
|
|
std::vector<std::vector<Segment>> wrappedLines;
|
|
int currentPage = 0;
|
|
int linesPerPage = 0;
|
|
int totalPages = 0;
|
|
bool firstRender = true;
|
|
|
|
std::vector<TextAtom> parseHtml(const std::string& html);
|
|
static std::string decodeEntity(const std::string& entity);
|
|
static bool isRenderableCodepoint(uint32_t cp);
|
|
void wrapText();
|
|
};
|