Graphics: Fix wrapString when attempting to wrap text containing an image that's too large for the wrappable area (fix #2481)

Author: gfwilliams

ChangeLog

@@ -20,6 +20,7 @@
             Bangle.js: 6x15 font tweaks for ISO8859-1
             Bangle.js2: Fix 'UNFINISHED STRING' error if non-UTF8 char within UTF8 start char range is at end of string
             Bangle.js2: Add Bangle.setOptions({lcdDoubleRefresh:true}) to pulse EXTCOMIN for LCD twice, avoiding contrast 'toggle' effect when viewing LCD off axis
+            Graphics: Fix wrapString when attempting to wrap text containing an image that's too large for the wrappable area (fix #2481)
 
      2v21 : nRF52: free up 800b more flash by removing vector table padding
             Throw Exception when a Promise tries to resolve with another Promise (#2450)

libs/graphics/jswrap_graphics.c

@@ -2400,7 +2400,7 @@ JsVar *jswrap_graphics_wrapString(JsVar *parent, JsVar *str, int maxWidth) {
    This is all a bit of a mess but it appears to work as intended now. */
   JsvStringIterator it;
   jsvStringIteratorNewUTF8(&it, str, 0);
-  while (jsvStringIteratorHasChar(&it) || endOfText) {
+  while ((jsvStringIteratorHasChar(&it) || endOfText) && !jspIsInterrupted()) {
     int ch = jsvStringIteratorGetUTF8CharAndNext(&it);
     bool canBreakOnCh = endOfText || ch=='\n' || ch==' ';
     if (canBreakOnCh || canSplitAfter) { // is breakable - newline,space,dash, image before
@@ -2429,6 +2429,15 @@ JsVar *jswrap_graphics_wrapString(JsVar *parent, JsVar *str, int maxWidth) {
           jsvStringIteratorNew(&wordIt, str, wordStartIdx); // not UTF8 as wordStartIdx isn't UTF8 indexed
           while (jsvStringIteratorGetIndex(&wordIt) < currentPos) {
             int wordCh = jsvStringIteratorGetUTF8CharAndNext(&wordIt);
+#ifndef SAVE_ON_FLASH
+            if (wordCh==0) { // it's an image, can't split it
+              jsvAppendStringVar(currentLine, str, (size_t)wordStartIdx, (size_t)(currentPos-(wordStartIdx+1)));
+              lineWidth += wordWidth;
+              wordWidth = 0;
+              wordStartIdx = currentPos-1;
+              break;
+            }
+#endif
             int w = _jswrap_graphics_getCharWidth(&info, wordCh);
             if (width+w < maxWidth || !width) { // add while it fits OR it's the first character
               // !width stops us locking up if char width>split width
@@ -2469,7 +2478,7 @@ JsVar *jswrap_graphics_wrapString(JsVar *parent, JsVar *str, int maxWidth) {
       wordWidth = 0;
       wordStartIdx = currentPos;
       wasNewLine = ch=='\n';
-      canSplitAfter = false;
+      canSplitAfter = ch==0; // can split after if there is an image next
       if (endOfText) break;
       if (ch!=0) continue; // allow us to handle images next
     }
@@ -2500,7 +2509,7 @@ JsVar *jswrap_graphics_wrapString(JsVar *parent, JsVar *str, int maxWidth) {
     jsvArrayPush(lines, currentLine);
   }
   jsvUnLock2(str,currentLine);
-   _jswrap_graphics_freeFontInfo(&info);
+  _jswrap_graphics_freeFontInfo(&info);
   return lines;
 }
 

tests/test_graphics_wrapString.js

@@ -107,6 +107,15 @@ g.clear().setFont("4x6");
 lines = g.wrapString("\0\x08\x08\1\1\2\3\4\5\6\7\8\0\x08\x08\1\1\2\3\4\5\6\7\8\0\x08\x08\1\1\2\3\4\5\6\7\8\0\x08\x08\1\1\2\3\4\5\6\7\8",12)
 SHOULD_BE(lines, ["\0\x08\x08\1\1\2\3\4\5\6\7\8","\0\x08\x08\1\1\2\3\4\5\6\7\8","\0\x08\x08\1\1\2\3\4\5\6\7\8","\0\x08\x08\1\1\2\3\4\5\6\7\8"]);
 
+// 16*16px but wrapped to something smaller than the image width https://github.com/espruino/Espruino/issues/2481
+g.clear().setFont("4x6");
+let image = atob("ABAQAX/+gAGf+a/1t+273b29vn2+fb29u9237a/1n/mAAX/+");
+lines = g.wrapString(image+"ABC",8);
+SHOULD_BE(lines, ["\0\x10\x10\1\x7F\xFE\x80\1\x9F\xF9\xAF\xF5\xB7\xED\xBB\xDD\xBD\xBD\xBE}\xBE}\xBD\xBD\xBB\xDD\xB7\xED\xAF\xF5\x9F\xF9\x80\1\x7F\xFE","ABC"]);
+lines = g.wrapString("Test"+image,30);
+// This one is not ideal - we should really have wrapped Test+image after 'test' but we treat it as one word at the moment
+SHOULD_BE(lines, ["Test\0\x10\x10\1\x7F\xFE\x80\1\x9F\xF9\xAF\xF5\xB7\xED\xBB\xDD\xBD\xBD\xBE}\xBE}\xBD\xBD\xBB\xDD\xB7\xED\xAF\xF5\x9F\xF9\x80\1\x7F\xFE"]); 
+
 // UTF8 chars - no wrapping expected
 g.clear().setFont("4x6");
 lines = g.wrapString("F\u00F6n K\u00FCr B\u00E4r", 200);