Bangle.js2: g.flip(2) will now flip the screen *and* the entire area of the overlay

Author: gfwilliams

ChangeLog

@@ -16,6 +16,7 @@
             Bangle.js2: Remove buzz when going back in a menu using the button (not the widget)
             Bangle.js2: Ensure overlays don't use the current Graphics colors
             Bangle.js2: Much faster rendering of overlays
+            Bangle.js2: g.flip(2) will now flip the screen *and* the entire area of the overlay
 
      2v28 : Add `E.internal` as a way to access the 'hidden root' containing Espruino internal variables that previously needed `global["\xff"]`
             Bangle.js: Fix back handler not removed when using E.setUI with a back button but without widgets (#2636)

libs/banglejs/jswrap_bangle.c

@@ -1118,8 +1118,13 @@ void graphicsInternalFlip() {
 }
 
 /// Flip buffer contents with the screen.
-void lcd_flip(JsVar *parent, bool all) {
+void lcd_flip(JsVar *parent, int all) {
 #ifdef LCD_WIDTH
+#ifdef LCD_CONTROLLER_LPM013M126
+  if (all==2) {
+    lcdMemLCD_setOverlayModified(&graphicsInternal);
+  } else
+#endif
   if (all) {
     graphicsInternal.data.modMinX = 0;
     graphicsInternal.data.modMinY = 0;
@@ -3991,7 +3996,7 @@ NO_INLINE void jswrap_banglejs_init() {
   graphicsInternal.graphicsVar = graphics;
 
   // Create 'flip' fn
-  JsVar *fn = jsvNewNativeFunction((void (*)(void))lcd_flip, JSWAT_VOID|JSWAT_THIS_ARG|(JSWAT_BOOL << (JSWAT_BITS*1)));
+  JsVar *fn = jsvNewNativeFunction((void (*)(void))lcd_flip, JSWAT_VOID|JSWAT_THIS_ARG|(JSWAT_INT32 << (JSWAT_BITS*1)));
   jsvObjectSetChildAndUnLock(graphics,"flip",fn);
 
   if (!firstRun) {

libs/graphics/lcd_memlcd.c

@@ -346,7 +346,7 @@ void lcdMemLCD_flip(JsGraphics *gfx) {
       memcpy(buf, &lcdBuffer[LCD_STRIDE*y], LCD_STRIDE);
       // overwrite areas with overlay image
       if (y>=ovY && y<ovY+overlayImg.height) {
-        _jswrap_drawImageSimpleRow(gfx, lcdOverlayX, bufferLine, &overlayImg, &it, lcdMemLCD_setPixel, &bits, &colData);
+        _jswrap_drawImageSimpleRow(gfx, lcdOverlayX, bufferLine, &overlayImg, &it, setPixel, &bits, &colData);
       }
       // send the line
 #ifdef EMULATED
@@ -442,6 +442,24 @@ void lcdMemLCD_setOverlay(JsVar *imgVar, int x, int y) {
   }
 }
 
+// Sets the modified x/y to the overlay dimensions
+void lcdMemLCD_setOverlayModified(JsGraphics *gfx) {
+  if (lcdOverlayImage) {
+    GfxDrawImageInfo overlayImg;
+    if (_jswrap_graphics_parseImage(gfx, lcdOverlayImage, 0, &overlayImg)) {
+      int x = lcdOverlayX<0?0:lcdOverlayX;
+      int y = lcdOverlayY<0?0:lcdOverlayY;
+      int x2 = lcdOverlayX + overlayImg.width-1;
+      if (x2>LCD_WIDTH-1) x2=LCD_WIDTH-1;
+      int y2 = lcdOverlayY + overlayImg.height-1;
+      if (y2>LCD_HEIGHT-1) y2=LCD_HEIGHT-1;
+      graphicsSetModified(gfx, x,y,x2,y2);
+       _jswrap_graphics_freeImageInfo(&overlayImg);
+    }
+  }
+}
+
+
 void lcdMemLCD_setCallbacks(JsGraphics *gfx) {
   gfx->setPixel = lcdMemLCD_setPixel;
   gfx->fillRect = lcdMemLCD_fillRect;

libs/graphics/lcd_memlcd.h

@@ -25,5 +25,7 @@ void lcdMemLCD_extcominToggle();
 void lcdMemLCD_extcominBacklight(bool isOn);
 // Enable overlay mode (to overlay an image on top of the LCD contents)
 void lcdMemLCD_setOverlay(JsVar *imgVar, int x, int y);
+// Sets the modified x/y to the overlay dimensions
+void lcdMemLCD_setOverlayModified(JsGraphics *gfx);
 // return a pointer to the LCD's memory buffer
 unsigned char *lcdMemLCD_getRowPtr(int row);