mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 14:58:12 +00:00
Consolidation pass over the message/nearby UI, no functional change beyond one intentional display tweak: - Age tags: NearbyScreen::fmtAge, the nearby list's inline column, and QuickMsgScreen::fmtMsgAge each reimplemented the same s/m/h bucket ladder on top of geo::fmtAgeShort. All now delegate to it (fmtMsgAge removed). Visible effect: ages over 24h render as "Nd" instead of capped hours, matching the Locator target picker which already used fmtAgeShort. - Reply prefix: the "@[nick] " parse was duplicated in skipReplyPrefix() and FullscreenMsgView::render(). Extracted to one msgReplyBody() helper (body, plus optional addressee nick) — one place to handle its edge cases. - LiveTrack: the expiry predicate was duplicated in expire()/isActive(); extracted to a private expired() helper. - Removed a dead M_PI define (and unused <math.h>) in NearbyScreen.h, and a comment pointing at a CODE_REVIEW.md that doesn't exist. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
166 lines
6.5 KiB
C
166 lines
6.5 KiB
C
#pragma once
|
|
|
|
#include <helpers/ui/DisplayDriver.h>
|
|
#include <Arduino.h>
|
|
#include "icons.h"
|
|
|
|
static const int FS_CHARS_MAX = 80; // max bytes per wrapped line
|
|
|
|
// Shared, non-reentrant wrap scratch. The UI renders on a single thread, and the
|
|
// fullscreen message view and the history list are never laid out in the same
|
|
// frame (opening the fullscreen view early-returns before the list loop runs),
|
|
// so one static buffer serves both. This keeps ~1.5 KB of line buffers off the
|
|
// render-call stack at the cost of a fixed RAM allocation. Only used inside
|
|
// render()/wrap helpers — never across a yield, so the single instance is safe.
|
|
static char s_wrap_trans[512];
|
|
static char s_wrap_lines[12][FS_CHARS_MAX];
|
|
|
|
// Parse a leading "@[nick] " reply prefix. Returns the message body that
|
|
// follows it (and any leading whitespace); when nick/nick_n are supplied,
|
|
// fills nick with the addressee, or "" when there's no prefix. One parser for
|
|
// both the history list (body only — see QuickMsgScreen::skipReplyPrefix) and
|
|
// the fullscreen view (which also shows the "To:" nick).
|
|
static inline const char* msgReplyBody(const char* text, char* nick = nullptr, int nick_n = 0) {
|
|
if (nick && nick_n > 0) nick[0] = '\0';
|
|
const char* body = text;
|
|
if (text[0] == '@' && text[1] == '[') {
|
|
const char* close = strchr(text + 2, ']');
|
|
if (close && close[1] == ' ' && close[2]) {
|
|
if (nick && nick_n > 0) {
|
|
int len = (int)(close - text) - 2;
|
|
if (len > nick_n - 1) len = nick_n - 1;
|
|
memcpy(nick, text + 2, len);
|
|
nick[len] = '\0';
|
|
}
|
|
body = close + 2;
|
|
}
|
|
}
|
|
while (*body == '\n' || *body == '\r' || *body == ' ') body++;
|
|
return body;
|
|
}
|
|
|
|
struct FullscreenMsgView {
|
|
int scroll;
|
|
bool active;
|
|
int _max_scroll; // last value computed in render(); bounds KEY_DOWN
|
|
|
|
FullscreenMsgView() : scroll(0), active(false), _max_scroll(0) {}
|
|
|
|
enum Result { NONE, PREV, NEXT, CLOSE, REPLY };
|
|
|
|
void begin() { scroll = 0; active = true; }
|
|
|
|
// Pixel-accurate word-wrap: breaks at last space that fits within max_px,
|
|
// hard-breaks long words. Walks the string codepoint-by-codepoint, summing
|
|
// per-codepoint widths via DisplayDriver::getCodepointWidth — O(n) instead
|
|
// of O(n²) substring re-measurement. Works for both fixed- and
|
|
// variable-width fonts.
|
|
static int wrapLines(DisplayDriver& display, const char* text, int max_px,
|
|
char out[][FS_CHARS_MAX], int max_lines) {
|
|
int count = 0;
|
|
const uint8_t* seg = (const uint8_t*)text;
|
|
while (*seg && count < max_lines) {
|
|
const uint8_t* p = seg;
|
|
const uint8_t* last_sp = nullptr; // pointer to space byte (cut here, drop the space)
|
|
const uint8_t* last_fit = seg; // farthest point that still fits
|
|
int width = 0;
|
|
|
|
while (*p && (p - seg) < FS_CHARS_MAX - 1) {
|
|
const uint8_t* cp_start = p;
|
|
uint32_t cp = DisplayDriver::decodeCodepoint(p);
|
|
if ((p - seg) >= FS_CHARS_MAX) { p = cp_start; break; }
|
|
uint16_t cw = display.getCodepointWidth(cp);
|
|
if (width + cw > max_px && cp_start > seg) { p = cp_start; break; }
|
|
if (cp == ' ') last_sp = cp_start;
|
|
width += cw;
|
|
last_fit = p;
|
|
}
|
|
|
|
const uint8_t* end;
|
|
const uint8_t* next_seg;
|
|
if (!*p) {
|
|
end = p; next_seg = p;
|
|
} else if (last_sp && last_sp > seg) {
|
|
end = last_sp; next_seg = last_sp + 1;
|
|
} else {
|
|
end = last_fit; next_seg = last_fit;
|
|
}
|
|
|
|
int len = (int)(end - seg);
|
|
if (len <= 0) { seg = *seg ? seg + 1 : seg; continue; }
|
|
if (len > FS_CHARS_MAX - 1) len = FS_CHARS_MAX - 1;
|
|
memcpy(out[count], seg, len);
|
|
out[count][len] = '\0';
|
|
count++;
|
|
seg = next_seg;
|
|
}
|
|
return count;
|
|
}
|
|
|
|
int render(DisplayDriver& display, const char* sender, const char* text,
|
|
bool has_prev, bool has_next) {
|
|
display.setTextSize(1);
|
|
const int lineH = display.getLineHeight();
|
|
const int max_px = display.width() - 6;
|
|
|
|
// "@[nick] " reply prefix → "To:" header + body (shared parser).
|
|
char to_nick[32];
|
|
const char* body = msgReplyBody(text, to_nick, sizeof(to_nick));
|
|
|
|
const int cw = display.getCharWidth();
|
|
const int header_h = to_nick[0] ? (lineH * 2 + 4) : (lineH + 2);
|
|
const int startY = header_h + 2;
|
|
const int visible = (display.height() - startY - lineH) / lineH;
|
|
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
display.fillRect(0, 0, display.width(), header_h);
|
|
display.setColor(DisplayDriver::DARK);
|
|
display.drawTextEllipsized(2, 1, display.width() - 4, sender);
|
|
if (to_nick[0]) {
|
|
char trans_nick[32], to_label[36];
|
|
display.translateUTF8ToBlocks(trans_nick, to_nick, sizeof(trans_nick));
|
|
snprintf(to_label, sizeof(to_label), "To: %s", trans_nick);
|
|
display.drawTextEllipsized(2, lineH + 3, display.width() - 4, to_label);
|
|
}
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
|
|
display.translateUTF8ToBlocks(s_wrap_trans, body, sizeof(s_wrap_trans));
|
|
int lcount = wrapLines(display, s_wrap_trans, max_px, s_wrap_lines, 12);
|
|
// Reserve the right-edge column for the scroll indicator and re-wrap so text
|
|
// can't run under it. Reserve appears only once the list overflows, and a
|
|
// narrower second pass only ever yields more lines — so it stays overflowing.
|
|
int reserve = scrollIndicatorReserve(display, lcount, visible);
|
|
if (reserve > 0)
|
|
lcount = wrapLines(display, s_wrap_trans, max_px - reserve, s_wrap_lines, 12);
|
|
int max_scroll = lcount > visible ? lcount - visible : 0;
|
|
_max_scroll = max_scroll;
|
|
if (scroll > max_scroll) scroll = max_scroll;
|
|
|
|
for (int i = 0; i < visible && (scroll + i) < lcount; i++) {
|
|
display.setCursor(0, startY + i * lineH);
|
|
display.print(s_wrap_lines[scroll + i]);
|
|
}
|
|
drawScrollIndicator(display, startY, visible * lineH, lcount, visible, scroll);
|
|
const int nav_y = display.height() - lineH;
|
|
if (has_next) {
|
|
display.setCursor(0, nav_y);
|
|
display.print("<");
|
|
}
|
|
if (has_prev) {
|
|
display.setCursor(display.width() - cw, nav_y);
|
|
display.print(">");
|
|
}
|
|
return 2000;
|
|
}
|
|
|
|
Result handleInput(char c) {
|
|
if (c == KEY_UP) { if (scroll > 0) scroll--; return NONE; }
|
|
if (c == KEY_DOWN) { if (scroll < _max_scroll) scroll++; return NONE; }
|
|
if (c == KEY_LEFT) return NEXT;
|
|
if (c == KEY_RIGHT) return PREV;
|
|
if (c == KEY_CONTEXT_MENU) return REPLY;
|
|
if (c == KEY_ENTER || c == KEY_CANCEL) return CLOSE;
|
|
return NONE;
|
|
}
|
|
};
|