From 6056339ad8456248bf7ddb449a016b1ff711d56f Mon Sep 17 00:00:00 2001 From: "Rich O." Date: Sun, 8 Nov 2026 19:00:40 -0500 Subject: [PATCH] palm-client: the contact screen's login status is 'Logging in over the mesh...' (it ran off the edge) and its status line is cut rather than running off; Serial Ports' lines too. check_ui.py now measures literals passed to a screen's own one-line helpers, and fails on a new helper that draws its text until its width is listed --- palm-client/src/contact_form.c | 4 +-- palm-client/src/ports.c | 3 ++- palm-client/tools/check_ui.py | 46 +++++++++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/palm-client/src/contact_form.c b/palm-client/src/contact_form.c index e55ccb0..88392c4 100644 --- a/palm-client/src/contact_form.c +++ b/palm-client/src/contact_form.c @@ -189,7 +189,7 @@ static void Status(const Char *text) WinEraseRectangle(&r, 0); WinDrawLine(r.topLeft.x, r.topLeft.y, r.topLeft.x + r.extent.x - 1, r.topLeft.y); old = FntSetFont(vmSmallFont); - WinDrawChars(text, StrLen(text), r.topLeft.x + 2, r.topLeft.y + 1); + DrawCut(text, r.topLeft.x + 2, r.topLeft.y + 1, r.extent.x - 4); FntSetFont(old); } @@ -207,7 +207,7 @@ static Boolean Login(FormType *form) pw[0] = 0; if (FrmCustomResponseAlert(PasswordAlert, gContact.name, "", "", pw, sizeof(pw), NULL) != 0) return false; - Status("Logging in (waiting for an answer over the mesh)..."); + Status("Logging in over the mesh..."); err = SessionLogin(gContact.pubKey, pw, &admin); MemSet(pw, sizeof(pw), 0); RowListDraw(&gList); diff --git a/palm-client/src/ports.c b/palm-client/src/ports.c index 07f0e17..90ca937 100644 --- a/palm-client/src/ports.c +++ b/palm-client/src/ports.c @@ -4,6 +4,7 @@ */ #include #include "resources.h" +#include "ui/draw.h" #include "ports.h" #define LINE_H 11 @@ -12,7 +13,7 @@ static void DrawLine(UInt16 line, const Char *text) { - WinDrawChars(text, StrLen(text), 2, FIRST_Y + line * LINE_H); + DrawCut(text, 2, FIRST_Y + line * LINE_H, 156); } static void DrawPorts(void) diff --git a/palm-client/tools/check_ui.py b/palm-client/tools/check_ui.py index 086fbad..f9dc09a 100644 --- a/palm-client/tools/check_ui.py +++ b/palm-client/tools/check_ui.py @@ -11,7 +11,10 @@ resources (run by `make`, like check_sections.py): Cancel; "2 wk" "1 mo" "3 mo" "Cancel" fit) C text literal strings drawn with DrawCut(s, x, y, maxW) are no wider than maxW in the large UI font, so a sentence is never cut short - (use DrawWrap), and WinDrawChars("...", n, x, y) ends by x 160 + (use DrawWrap), and WinDrawChars("...", n, x, y) ends by x 160. + The same goes for literals passed to a screen's own one-line + helpers (WRAPPERS); a new helper that draws its text parameter + fails the check until it's listed there with its width Text measured at run time (StrPrintF results, names) can't be checked here. System-font widths come from PilRC itself: an AUTO button is its text + 12. @@ -27,6 +30,15 @@ import sys import tempfile SCREEN = 160 + +# A screen's own helpers that draw their text on one line: (file, function) -> room in px. +# None: never given a literal, and safe for other reasons (noted). +WRAPPERS = { + ('contact_form.c', 'Status'): 149, # the 153-wide gadget's bottom row, x + 2 + ('convo_form.c', 'TextWithMentions'): None, # draws lines text.c has already wrapped + ('ports.c', 'DrawLine'): None, # formatted lines, cut at the edge + ('preview_form.c', 'Row'): None, # sample rows, cut to their columns +} ALERT_X, ALERT_GAP, ALERT_PAD, ALERT_RIGHT = 4, 4, 12, 156 # FormObjectKind @@ -130,8 +142,40 @@ def c_literal(s): return bytes(out) +def drawing_helpers(path): + """Functions in a file that draw a Char * parameter with WinDrawChars or DrawCut.""" + text = open(path, encoding='latin-1').read() + found = [] + for m in re.finditer(r'(?m)^(?:static\s+)?\w+\s+(\w+)\(([^)]*)\)\s*\n\{(.*?)\n\}', text, re.S): + name, params, body = m.groups() + for p in re.findall(r'Char\s*\*\s*(\w+)', params): + if re.search(r'\b(WinDrawChars|DrawCut)\(\s*%s\b' % p, body): + found.append(name) + break + return found + + def check_c(paths, widths): problems = [] + for path in paths: + if path.endswith('ui/draw.c'): + continue + base = os.path.basename(path) + text = open(path, encoding='latin-1').read() + for name in drawing_helpers(path): + key = (base, name) + if key not in WRAPPERS: + problems.append('%s: %s() draws its text on one line: add it to WRAPPERS in ' + 'tools/check_ui.py with its width' % (path, name)) + continue + if WRAPPERS[key] is None: + continue + for m in re.finditer(r'\b%s\(\s*"((?:[^"\\]|\\.)*)"\s*\)' % name, text): + w = sum(widths[b] for b in c_literal(m.group(1))) + if w > WRAPPERS[key]: + no = text.count('\n', 0, m.start()) + 1 + problems.append('%s:%d: "%s" is %d px, %s() has room for %d' % ( + path, no, m.group(1), w, name, WRAPPERS[key])) cut = re.compile(r'DrawCut\(\s*"((?:[^"\\]|\\.)*)"\s*,\s*(\d+)\s*,[^,]+,\s*(\d+)\s*\)') chars = re.compile(r'WinDrawChars\(\s*"((?:[^"\\]|\\.)*)"\s*,[^,]+,\s*(\d+)\s*,') for path in paths: