From 174be32ec2eba6a4cfb19b3c271011a52d56a105 Mon Sep 17 00:00:00 2001
From: DiSlord <DiSlord@mail.ru>
Date: Wed, 22 Jul 2020 11:48:14 +0300
Subject: [PATCH] Allow blit8BitWidthBitmap draw bitmap width bigger then 8px
 Allow draw in cell any type bitmap

Remove code doubles
---
 ili9341.c |   3 +-
 plot.c    | 107 ++++++++++++++++++++----------------------------------
 2 files changed, 42 insertions(+), 68 deletions(-)

diff --git a/ili9341.c b/ili9341.c
index dd581ea..2f4c0dc 100644
--- a/ili9341.c
+++ b/ili9341.c
@@ -601,9 +601,10 @@ void blit8BitWidthBitmap(uint16_t x, uint16_t y, uint16_t width, uint16_t height
                          const uint8_t *bitmap)
 {
   uint16_t *buf = spi_buffer;
+  uint8_t bits = 0;
   for (uint16_t c = 0; c < height; c++) {
-    uint8_t bits = *bitmap++;
     for (uint16_t r = 0; r < width; r++) {
+      if ((r&7) == 0) bits = *bitmap++;
       *buf++ = (0x80 & bits) ? foreground_color : background_color;
       bits <<= 1;
     }
diff --git a/plot.c b/plot.c
index e7592ad..26fda7d 100644
--- a/plot.c
+++ b/plot.c
@@ -1704,29 +1704,50 @@ request_to_draw_cells_behind_numeric_input(void)
 }
 
 static int
-cell_drawchar(uint8_t ch, int x, int y)
-{
-  uint8_t bits;
-  int c, r, ch_size;
-  const uint8_t *char_buf = FONT_GET_DATA(ch);
-  ch_size = FONT_GET_WIDTH(ch);
-  //  if (y <= -FONT_GET_HEIGHT || y >= CELLHEIGHT || x <= -ch_size || x >= CELLWIDTH)
-  //    return ch_size;
-  if (x <= -ch_size)
-    return ch_size;
-  for (c = 0; c < FONT_GET_HEIGHT; c++) {
-    bits = *char_buf++;
-    if ((y + c) < 0 || (y + c) >= CELLHEIGHT)
-      continue;
-    for (r = 0; r < ch_size; r++) {
-      if ((x+r) >= 0 && (x+r) < CELLWIDTH && (0x80 & bits))
-        cell_buffer[(y+c)*CELLWIDTH + (x+r)] = foreground_color;
+cell_blit_char_bitmap(int x, int y, uint16_t w, uint16_t h, const uint8_t *char_buf)
+{
+  if (x <= -w)
+    return w;
+  uint8_t bits = 0;
+  int r;
+  for (; y < h+y; y++) {
+    for (r = 0; r < w; r++) {
+      if ((r&7)==0) bits = *char_buf++;
+      if (y >= 0 && x+r >= 0 && y < CELLHEIGHT && x+r < CELLWIDTH && (0x80 & bits))
+        cell_buffer[y*CELLWIDTH + x + r] = foreground_color;
       bits <<= 1;
     }
   }
-  return ch_size;
+  return w;
+}
+
+void
+cell_drawstring(char *str, int x, int y)
+{
+  if (y <= -FONT_GET_HEIGHT || y >= CELLHEIGHT)
+    return;
+  while (*str) {
+    if (x >= CELLWIDTH)
+      return;
+    uint8_t ch = *str++;
+    x += cell_blit_char_bitmap(x, y, FONT_GET_WIDTH(ch), FONT_GET_HEIGHT, FONT_GET_DATA(ch));
+  }
 }
 
+void
+cell_drawstring_7x13(char *str, int x, int y)
+{
+  if (y <= -bFONT_GET_HEIGHT || y >= CELLHEIGHT)
+    return;
+  while (*str) {
+    if (x >= CELLWIDTH)
+      return;
+    uint8_t ch = *str++;
+    x += cell_blit_char_bitmap(x, y, bFONT_GET_WIDTH(ch), bFONT_GET_HEIGHT, bFONT_GET_DATA(ch));
+  }
+}
+
+#if 0
 static int
 cell_drawchar_size(uint8_t ch, int x, int y, int size)
 {
@@ -1756,18 +1777,6 @@ cell_drawchar_size(uint8_t ch, int x, int y, int size)
   return ch_size*size;
 }
 
-void
-cell_drawstring(char *str, int x, int y)
-{
-  if (y <= -FONT_GET_HEIGHT || y >= CELLHEIGHT)
-    return;
-  while (*str) {
-    if (x >= CELLWIDTH)
-      return;
-    x += cell_drawchar(*str++, x, y);
-  }
-}
-
 void
 cell_drawstring_size(char *str, int x, int y, int size)
 {
@@ -1779,43 +1788,7 @@ cell_drawstring_size(char *str, int x, int y, int size)
     x += cell_drawchar_size(*str++, x, y, size);
   }
 }
-
-static int
-cell_draw_bchar(uint8_t ch, int x, int y)
-{
-  uint8_t bits;
-  int c, r, ch_size;
-  const uint8_t *char_buf = bFONT_GET_DATA(ch);
-  ch_size = bFONT_GET_WIDTH(ch);
-  //  if (y <= -FONT_GET_HEIGHT || y >= CELLHEIGHT || x <= -ch_size || x >= CELLWIDTH)
-  //    return ch_size;
-  if (x <= -ch_size)
-    return ch_size;
-  for (c = 0; c < bFONT_GET_HEIGHT; c++) {
-    bits = *char_buf++;
-    if ((y + c) < 0 || (y + c) >= CELLHEIGHT)
-      continue;
-    for (r = 0; r < ch_size; r++) {
-      if ((x+r) >= 0 && (x+r) < CELLWIDTH && (0x80 & bits))
-        cell_buffer[(y+c)*CELLWIDTH + (x+r)] = foreground_color;
-      bits <<= 1;
-    }
-  }
-  return ch_size;
-}
-
-
-void
-cell_drawstring_7x13(char *str, int x, int y)
-{
-  if (y <= -bFONT_GET_HEIGHT || y >= CELLHEIGHT)
-    return;
-  while (*str) {
-    if (x >= CELLWIDTH)
-      return;
-    x += cell_draw_bchar(*str++, x, y);
-  }
-}
+#endif
 
 #ifdef __VNA__
 static void