snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2025-12-18 15:17:42 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add poor displayWindow implementation and use it for Indexing message

Browse Source
This commit is contained in:
Dave Allie 2025-12-17 00:08:22 +11:00
parent ec1d3d8d0a
commit b286d40caa
No known key found for this signature in database
GPG Key ID: F2FDDB3AD8D0276F
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/GfxRenderer/GfxRenderer.cpp
View File

@ -132,13 +132,19 @@ void GfxRenderer::displayBuffer(const EInkDisplay::RefreshMode refreshMode) cons
einkDisplay.displayBuffer(refreshMode); einkDisplay.displayBuffer(refreshMode);
} }
// TODO: Support partial window update void GfxRenderer::displayWindow(const int x, const int y, const int width, const int height) const {
// void GfxRenderer::flushArea(const int x, const int y, const int width, const int height) const { // Rotate coordinates from portrait (480x800) to landscape (800x480)
// const int rotatedX = y; // Rotation: 90 degrees clockwise
// const int rotatedY = EInkDisplay::DISPLAY_HEIGHT - 1 - x; // Portrait coordinates: (x, y) with dimensions (width, height)
// // Landscape coordinates: (rotatedX, rotatedY) with dimensions (rotatedWidth, rotatedHeight)
// einkDisplay.displayBuffer(EInkDisplay::FAST_REFRESH, rotatedX, rotatedY, height, width);
// } const int rotatedX = y;
const int rotatedY = EInkDisplay::DISPLAY_HEIGHT - 1 - x - width + 1;
const int rotatedWidth = height;
const int rotatedHeight = width;
einkDisplay.displayWindow(rotatedX, rotatedY, rotatedWidth, rotatedHeight);
}
// Note: Internal driver treats screen in command orientation, this library treats in portrait orientation // Note: Internal driver treats screen in command orientation, this library treats in portrait orientation
int GfxRenderer::getScreenWidth() { return EInkDisplay::DISPLAY_HEIGHT; } int GfxRenderer::getScreenWidth() { return EInkDisplay::DISPLAY_HEIGHT; }

2
lib/GfxRenderer/GfxRenderer.h
View File

@ -28,6 +28,8 @@ class GfxRenderer {
static int getScreenWidth(); static int getScreenWidth();
static int getScreenHeight(); static int getScreenHeight();
void displayBuffer(EInkDisplay::RefreshMode refreshMode = EInkDisplay::FAST_REFRESH) const; void displayBuffer(EInkDisplay::RefreshMode refreshMode = EInkDisplay::FAST_REFRESH) const;
// EXPERIMENTAL: Windowed update - display only a rectangular region (portrait coordinates)
void displayWindow(int x, int y, int width, int height) const;
void invertScreen() const; void invertScreen() const;
void clearScreen(uint8_t color = 0xFF) const; void clearScreen(uint8_t color = 0xFF) const;

2
open-x4-sdk

@ -1 +1 @@
Subproject commit fba62200e2eb49590bb499d9d940bb0fe715d9d9 Subproject commit 98a5aa1f8969ccd317c9b45bf0fa84b6c82e167f

20
src/screens/EpubReaderScreen.cpp
View File

@ -31,7 +31,6 @@ void EpubReaderScreen::onEnter() {
epub->setupCacheDir(); epub->setupCacheDir();
// TODO: Move this to a state object
if (SD.exists((epub->getCachePath() + "/progress.bin").c_str())) { if (SD.exists((epub->getCachePath() + "/progress.bin").c_str())) {
File f = SD.open((epub->getCachePath() + "/progress.bin").c_str()); File f = SD.open((epub->getCachePath() + "/progress.bin").c_str());
uint8_t data[4]; uint8_t data[4];
@ -210,19 +209,20 @@ void EpubReaderScreen::renderScreen() {
Serial.printf("[%lu] [ERS] Cache not found, building...\n", millis()); Serial.printf("[%lu] [ERS] Cache not found, building...\n", millis());
{ {
const int textWidth = renderer.getTextWidth(READER_FONT_ID, "Indexing...");
constexpr int margin = 20;
const int x = (GfxRenderer::getScreenWidth() - textWidth - margin * 2) / 2;
constexpr int y = 50;
const int w = textWidth + margin * 2;
const int h = renderer.getLineHeight(READER_FONT_ID) + margin * 2;
renderer.grayscaleRevert(); renderer.grayscaleRevert();
// TODO: This looks like garbage again, need to implement windowed updates const int textWidth = renderer.getTextWidth(READER_FONT_ID, "Indexing...");
renderer.fillRect(x, y, w, h, 0); constexpr int margin = 20;
// Round all coordinates to 8 pixel boundaries
const int x = ((GfxRenderer::getScreenWidth() - textWidth - margin * 2) / 2 + 7) / 8 * 8;
constexpr int y = 56;
const int w = (textWidth + margin * 2 + 7) / 8 * 8;
const int h = (renderer.getLineHeight(READER_FONT_ID) + margin * 2 + 7) / 8 * 8;
renderer.fillRect(x, y, w, h, false);
renderer.drawText(READER_FONT_ID, x + margin, y + margin, "Indexing..."); renderer.drawText(READER_FONT_ID, x + margin, y + margin, "Indexing...");
renderer.drawRect(x + 5, y + 5, w - 10, h - 10); renderer.drawRect(x + 5, y + 5, w - 10, h - 10);
renderer.displayBuffer(); // EXPERIMENTAL: Still suffers from ghosting
renderer.displayWindow(x, y, w, h);
pagesUntilFullRefresh = 0; pagesUntilFullRefresh = 0;
} }