mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 23:08:11 +00:00
- Unify on the shared keyboard: WaypointsView drives UITask::keyboard()
instead of its own instance; openKb() clears {loc}/{time} for literal
fields (labels, coordinates). Reclaims the duplicate widget from the heap.
- Icon glyphs on the special row: caps ⇧, space ⎵ (two halves), delete ⌫,
OK ✓ (reuses ICON_CHECK); {} and the page toggle stay text.
- Second character page (symbols), toggled by a "#@"/"abc" key. Tidy the
letters page: drop the duplicate grid space, add the comma, group
punctuation as . , ! ?
- Harden the preview buffers (KB_PREVIEW_CAP) against very wide displays.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
251 lines
8.8 KiB
C
251 lines
8.8 KiB
C
#pragma once
|
|
|
|
#include <helpers/ui/DisplayDriver.h>
|
|
#include <Arduino.h>
|
|
#include "PopupMenu.h"
|
|
#include "icons.h" // mini-icons for the special-key row (⇧ ⌫ ⎵ ✓)
|
|
|
|
// Layout constants shared by all keyboard users.
|
|
// Two pages: letters (page 0) and symbols (page 1), toggled by the "#@"/"abc"
|
|
// special key. Space lives only on the ⎵ special key now, so the freed grid
|
|
// slot on page 0 holds the comma; punctuation is grouped as . , ! ?
|
|
static const int KB_PAGES = 2;
|
|
static const char KB_CHARS[KB_PAGES][4][10] = {
|
|
{ // page 0 — letters + digits
|
|
{'a','b','c','d','e','f','g','h','i','j'},
|
|
{'k','l','m','n','o','p','q','r','s','t'},
|
|
{'u','v','w','x','y','z','.',',','!','?'},
|
|
{'1','2','3','4','5','6','7','8','9','0'},
|
|
},
|
|
{ // page 1 — symbols + digits (ASCII only — one byte per key)
|
|
{'@','#','&','*','(',')','-','_','+','='},
|
|
{'/','\\',':',';','\'','"','<','>','[',']'},
|
|
{'{','}','|','~','^','$','%','`',',','.'},
|
|
{'1','2','3','4','5','6','7','8','9','0'},
|
|
},
|
|
};
|
|
static const int KB_ROWS_CHAR = 4;
|
|
static const int KB_COLS_CHAR = 10;
|
|
static const int KB_SPECIAL = 6; // ⇧ ⎵ ⌫ {} #@/abc ✓
|
|
// Buffer cap for typed text, in bytes. Matches MeshCore's MAX_TEXT_LEN
|
|
// (10*CIPHER_BLOCK_SIZE = 160) so a full-length message can be composed; each
|
|
// field passes its own smaller max to begin() where its store is smaller.
|
|
static const int KB_MAX_LEN = 160;
|
|
|
|
// Longest preview line we render per row. Caps the per-line stack buffers so a
|
|
// very wide display (small font → many chars per line) can't overrun them.
|
|
static const int KB_PREVIEW_CAP = 46;
|
|
|
|
static const int KB_PH_MAX = 12; // max placeholders in list
|
|
static const int KB_PH_LEN = 9; // max placeholder string length incl. null
|
|
static const int KB_PH_VISIBLE = 3; // items shown at once in overlay
|
|
|
|
struct KeyboardWidget {
|
|
char buf[KB_MAX_LEN + 1];
|
|
int len;
|
|
int max_len;
|
|
int row, col;
|
|
int page; // 0 = letters, 1 = symbols
|
|
bool caps;
|
|
char _ph_buf[KB_PH_MAX][KB_PH_LEN];
|
|
int _ph_count;
|
|
PopupMenu _ph_menu;
|
|
|
|
enum Result { NONE, DONE, CANCELLED };
|
|
|
|
void begin(const char* initial = "", int max = KB_MAX_LEN) {
|
|
max_len = (max > KB_MAX_LEN) ? KB_MAX_LEN : max;
|
|
strncpy(buf, initial, max_len);
|
|
buf[max_len] = '\0';
|
|
len = strlen(buf);
|
|
row = col = 0;
|
|
page = 0;
|
|
caps = false;
|
|
_ph_menu.active = false;
|
|
// default placeholders — always available
|
|
_ph_count = 0;
|
|
addPlaceholder("{loc}");
|
|
addPlaceholder("{time}");
|
|
}
|
|
|
|
void clearPlaceholders() { _ph_count = 0; }
|
|
|
|
void addPlaceholder(const char* ph) {
|
|
if (_ph_count < KB_PH_MAX) {
|
|
strncpy(_ph_buf[_ph_count], ph, KB_PH_LEN - 1);
|
|
_ph_buf[_ph_count][KB_PH_LEN - 1] = '\0';
|
|
_ph_count++;
|
|
}
|
|
}
|
|
|
|
int render(DisplayDriver& display) {
|
|
display.setTextSize(1);
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
|
|
const int lh = display.getLineHeight();
|
|
const int cw = display.getCharWidth();
|
|
const int cell_w = display.width() / KB_COLS_CHAR;
|
|
// compact: don't stretch cells beyond lh; freed vertical space goes to preview lines
|
|
const int kb_h = (KB_ROWS_CHAR + 1) * lh;
|
|
const int preview_h = display.height() - kb_h - 1;
|
|
const int prev_lines = (preview_h / lh) > 1 ? (preview_h / lh) : 1;
|
|
const int sep_y = prev_lines * lh;
|
|
const int chars_y = sep_y + 1;
|
|
const int cell_h = (display.height() - chars_y) / (KB_ROWS_CHAR + 1);
|
|
const int spec_y = chars_y + KB_ROWS_CHAR * cell_h;
|
|
const int spec_w = display.width() / KB_SPECIAL;
|
|
|
|
// multi-line text preview: cursor always on last preview line
|
|
int cpl = display.width() / cw; // chars per preview line
|
|
if (cpl < 1) cpl = 1;
|
|
if (cpl > KB_PREVIEW_CAP) cpl = KB_PREVIEW_CAP; // never overrun linebuf below
|
|
int cursor_line = len / cpl;
|
|
int first_line = (cursor_line >= prev_lines) ? (cursor_line - prev_lines + 1) : 0;
|
|
int start = first_line * cpl;
|
|
for (int pl = 0; pl < prev_lines; pl++) {
|
|
int ps = start + pl * cpl;
|
|
int pe = ps + cpl;
|
|
bool cursor_here = (ps <= len && (len < pe || pl == prev_lines - 1));
|
|
char linebuf[KB_PREVIEW_CAP + 2]; // cpl chars + cursor '_' + NUL
|
|
if (cursor_here) {
|
|
int nc = len - ps; if (nc < 0) nc = 0; if (nc > cpl - 1) nc = cpl - 1;
|
|
snprintf(linebuf, sizeof(linebuf), "%.*s_", nc, buf + ps);
|
|
} else if (len > ps) {
|
|
int nc = (len < pe) ? (len - ps) : cpl;
|
|
snprintf(linebuf, sizeof(linebuf), "%.*s", nc, buf + ps);
|
|
} else {
|
|
linebuf[0] = '\0';
|
|
}
|
|
char linebuf_t[KB_PREVIEW_CAP + 2];
|
|
display.translateUTF8ToBlocks(linebuf_t, linebuf, sizeof(linebuf_t));
|
|
display.setCursor(0, pl * lh);
|
|
display.print(linebuf_t);
|
|
}
|
|
display.fillRect(0, sep_y, display.width(), 1);
|
|
|
|
// character grid
|
|
for (int r = 0; r < KB_ROWS_CHAR; r++) {
|
|
int y = chars_y + r * cell_h;
|
|
for (int c = 0; c < KB_COLS_CHAR; c++) {
|
|
bool sel = (row == r && col == c);
|
|
char ch = KB_CHARS[page][r][c];
|
|
if (caps && ch >= 'a' && ch <= 'z') ch = ch - 'a' + 'A';
|
|
char ch_buf[2] = { ch == ' ' ? '_' : ch, '\0' };
|
|
int cx = c * cell_w;
|
|
display.drawSelectionRow(cx, y - 1, cell_w - 1, cell_h, sel);
|
|
display.setCursor(cx + (cell_w - cw) / 2, y);
|
|
display.print(ch_buf);
|
|
}
|
|
}
|
|
|
|
// special row: caps ⇧ · space ⎵ · delete ⌫ · placeholders {} (text) · OK ✓
|
|
const int s = miniIconScale(display);
|
|
const int icy = spec_y + (cell_h - lh) / 2; // centre icons within the cell
|
|
for (int i = 0; i < KB_SPECIAL; i++) {
|
|
bool sel = (row == KB_ROWS_CHAR && col == i);
|
|
bool active = (i == 0 && caps);
|
|
int sx = i * spec_w;
|
|
display.drawSelectionRow(sx, spec_y - 1, spec_w - 1, cell_h, sel || active);
|
|
if (i == 3 || i == 4) { // text keys: {} picker, page toggle
|
|
const char* lbl = (i == 3) ? "{}" : (page == 0 ? "#@" : "abc");
|
|
int tw = display.getTextWidth(lbl);
|
|
display.setCursor(sx + (spec_w - tw) / 2, spec_y);
|
|
display.print(lbl);
|
|
} else if (i == 1) { // space ⎵ — two halves side by side
|
|
int icw = (ICON_SPACE_L.w + ICON_SPACE_R.w) * s;
|
|
int ix = sx + (spec_w - icw) / 2;
|
|
miniIconDraw(display, ix, icy, ICON_SPACE_L);
|
|
miniIconDraw(display, ix + ICON_SPACE_L.w * s, icy, ICON_SPACE_R);
|
|
} else {
|
|
const MiniIcon& ic = (i == 0) ? ICON_SHIFT
|
|
: (i == 2) ? ICON_BACKSPACE
|
|
: ICON_CHECK; // i == 5 → OK
|
|
int ix = sx + (spec_w - ic.w * s) / 2;
|
|
miniIconDraw(display, ix, icy, ic);
|
|
}
|
|
display.setColor(DisplayDriver::LIGHT);
|
|
}
|
|
|
|
// placeholder picker overlay (drawn on top of keyboard)
|
|
if (_ph_menu.active) _ph_menu.render(display);
|
|
|
|
return 50;
|
|
}
|
|
|
|
Result handleInput(char c) {
|
|
// placeholder overlay consumes all input
|
|
if (_ph_menu.active) {
|
|
auto res = _ph_menu.handleInput(c);
|
|
if (res == PopupMenu::SELECTED) {
|
|
int idx = _ph_menu.selectedIndex();
|
|
const char* ph = _ph_buf[idx];
|
|
int ph_len = strlen(ph);
|
|
if (len + ph_len <= max_len) {
|
|
memcpy(buf + len, ph, ph_len);
|
|
len += ph_len;
|
|
buf[len] = '\0';
|
|
}
|
|
}
|
|
return NONE;
|
|
}
|
|
|
|
if (c == KEY_CANCEL || c == KEY_CONTEXT_MENU) return CANCELLED;
|
|
|
|
if (c == KEY_UP) {
|
|
if (row > 0) {
|
|
row--;
|
|
if (row == KB_ROWS_CHAR - 1) // leaving special row upward
|
|
col = col * KB_COLS_CHAR / KB_SPECIAL;
|
|
}
|
|
return NONE;
|
|
}
|
|
if (c == KEY_DOWN) {
|
|
if (row < KB_ROWS_CHAR) {
|
|
row++;
|
|
if (row == KB_ROWS_CHAR) // entering special row
|
|
col = col * KB_SPECIAL / KB_COLS_CHAR;
|
|
}
|
|
return NONE;
|
|
}
|
|
if (c == KEY_LEFT) {
|
|
if (col > 0) col--;
|
|
return NONE;
|
|
}
|
|
if (c == KEY_RIGHT) {
|
|
int max_col = (row == KB_ROWS_CHAR) ? KB_SPECIAL - 1 : KB_COLS_CHAR - 1;
|
|
if (col < max_col) col++;
|
|
return NONE;
|
|
}
|
|
if (c == KEY_ENTER) {
|
|
if (row < KB_ROWS_CHAR) {
|
|
if (len < max_len) {
|
|
char ch = KB_CHARS[page][row][col];
|
|
if (caps && ch >= 'a' && ch <= 'z') ch = ch - 'a' + 'A';
|
|
buf[len++] = ch;
|
|
buf[len] = '\0';
|
|
}
|
|
} else {
|
|
switch (col) {
|
|
case 0: caps = !caps; break;
|
|
case 1:
|
|
if (len < max_len) { buf[len++] = ' '; buf[len] = '\0'; }
|
|
break;
|
|
case 2:
|
|
if (len > 0) buf[--len] = '\0';
|
|
break;
|
|
case 3:
|
|
_ph_menu.begin("Placeholder:", KB_PH_VISIBLE);
|
|
for (int i = 0; i < _ph_count; i++) _ph_menu.addItem(_ph_buf[i]);
|
|
break;
|
|
case 4:
|
|
page ^= 1; // toggle letters ⇄ symbols
|
|
break;
|
|
case 5:
|
|
return DONE;
|
|
}
|
|
}
|
|
}
|
|
return NONE;
|
|
}
|
|
};
|