From ff49d252ae1a6b34e51aee449630f08d6ea2ef27 Mon Sep 17 00:00:00 2001
From: Dave Allie <dave@daveallie.com>
Date: Wed, 28 Jan 2026 02:43:04 +1100
Subject: [PATCH] fix: Render keyboard entry over multiple lines (#567)

## Summary

* Render keyboard entry over multiple lines
  * Grows display areas based on input text
  * Shown on OPDS entry, but applies everywhere

## Additional Context

* Fixes
https://github.com/crosspoint-reader/crosspoint-reader/issues/554

| One line | Multi-line |
| --- | --- |
|
![IMG_5925](https://github.com/user-attachments/assets/28be00a8-7b90-4bf6-9ebf-4d4ad6642bc9)
|
![IMG_5926](https://github.com/user-attachments/assets/1c69a96f-d868-49a1-866c-546ca7b784ab)
|

---

### AI Usage

While CrossPoint doesn't have restrictions on AI tools in contributing,
please be transparent about their usage as it
helps set the right context for reviewers.

Did you use AI tools to help write this code? No
---
 src/activities/util/KeyboardEntryActivity.cpp | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp
index 8c36ac33..3a6befac 100644
--- a/src/activities/util/KeyboardEntryActivity.cpp
+++ b/src/activities/util/KeyboardEntryActivity.cpp
@@ -256,8 +256,9 @@ void KeyboardEntryActivity::render() const {
   renderer.drawCenteredText(UI_10_FONT_ID, startY, title.c_str());
 
   // Draw input field
-  const int inputY = startY + 22;
-  renderer.drawText(UI_10_FONT_ID, 10, inputY, "[");
+  const int inputStartY = startY + 22;
+  int inputEndY = startY + 22;
+  renderer.drawText(UI_10_FONT_ID, 10, inputStartY, "[");
 
   std::string displayText;
   if (isPassword) {
@@ -269,19 +270,29 @@ void KeyboardEntryActivity::render() const {
   // Show cursor at end
   displayText += "_";
 
-  // Truncate if too long for display - use actual character width from font
-  int approxCharWidth = renderer.getSpaceWidth(UI_10_FONT_ID);
-  if (approxCharWidth < 1) approxCharWidth = 8;  // Fallback to approximate width
-  const int maxDisplayLen = (pageWidth - 40) / approxCharWidth;
-  if (displayText.length() > static_cast<size_t>(maxDisplayLen)) {
-    displayText = "..." + displayText.substr(displayText.length() - maxDisplayLen + 3);
-  }
+  // Render input text across multiple lines
+  int lineStartIdx = 0;
+  int lineEndIdx = displayText.length();
+  while (true) {
+    std::string lineText = displayText.substr(lineStartIdx, lineEndIdx - lineStartIdx);
+    const int textWidth = renderer.getTextWidth(UI_10_FONT_ID, lineText.c_str());
+    if (textWidth <= pageWidth - 40) {
+      renderer.drawText(UI_10_FONT_ID, 20, inputEndY, lineText.c_str());
+      if (lineEndIdx == displayText.length()) {
+        break;
+      }
 
-  renderer.drawText(UI_10_FONT_ID, 20, inputY, displayText.c_str());
-  renderer.drawText(UI_10_FONT_ID, pageWidth - 15, inputY, "]");
+      inputEndY += renderer.getLineHeight(UI_10_FONT_ID);
+      lineStartIdx = lineEndIdx;
+      lineEndIdx = displayText.length();
+    } else {
+      lineEndIdx -= 1;
+    }
+  }
+  renderer.drawText(UI_10_FONT_ID, pageWidth - 15, inputEndY, "]");
 
   // Draw keyboard - use compact spacing to fit 5 rows on screen
-  const int keyboardStartY = inputY + 25;
+  const int keyboardStartY = inputEndY + 25;
   constexpr int keyWidth = 18;
   constexpr int keyHeight = 18;
   constexpr int keySpacing = 3;