Move Glyph and BuiltinFont into fontio

It was confusing in displayio.

Fixes #1662

5 files changed, 46 insertions, 20 deletions

diff --git a/shared-module/displayio/BuiltinFont.c b/shared-module/fontio/BuiltinFont.c
index ee69b423c..58820d524 100644
--- a/shared-module/displayio/BuiltinFont.c
+++ b/shared-module/fontio/BuiltinFont.c
@@ -24,25 +24,25 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/displayio/BuiltinFont.h"
+#include "shared-bindings/fontio/BuiltinFont.h"
 
 
-#include "shared-bindings/displayio/Glyph.h"
+#include "shared-bindings/fontio/Glyph.h"
 
 #include "py/objnamedtuple.h"
 
-mp_obj_t common_hal_displayio_builtinfont_get_bitmap(const displayio_builtinfont_t *self) {
+mp_obj_t common_hal_fontio_builtinfont_get_bitmap(const fontio_builtinfont_t *self) {
     return MP_OBJ_FROM_PTR(self->bitmap);
 }
 
-mp_obj_t common_hal_displayio_builtinfont_get_bounding_box(const displayio_builtinfont_t *self) {
+mp_obj_t common_hal_fontio_builtinfont_get_bounding_box(const fontio_builtinfont_t *self) {
     mp_obj_t *items = m_new(mp_obj_t, 2);
     items[0] = MP_OBJ_NEW_SMALL_INT(self->width);
     items[1] = MP_OBJ_NEW_SMALL_INT(self->height);
     return mp_obj_new_tuple(2, items);
 }
 
-uint8_t displayio_builtinfont_get_glyph_index(const displayio_builtinfont_t *self, mp_uint_t codepoint) {
+uint8_t fontio_builtinfont_get_glyph_index(const fontio_builtinfont_t *self, mp_uint_t codepoint) {
     if (codepoint >= 0x20 && codepoint <= 0x7e) {
         return codepoint - 0x20;
     }
@@ -60,8 +60,8 @@ uint8_t displayio_builtinfont_get_glyph_index(const displayio_builtinfont_t *sel
     return 0xff;
 }
 
-mp_obj_t common_hal_displayio_builtinfont_get_glyph(const displayio_builtinfont_t *self, mp_uint_t codepoint) {
-    uint8_t glyph_index = displayio_builtinfont_get_glyph_index(self, codepoint);
+mp_obj_t common_hal_fontio_builtinfont_get_glyph(const fontio_builtinfont_t *self, mp_uint_t codepoint) {
+    uint8_t glyph_index = fontio_builtinfont_get_glyph_index(self, codepoint);
     if (glyph_index == 0xff) {
         return mp_const_none;
     }
@@ -75,5 +75,5 @@ mp_obj_t common_hal_displayio_builtinfont_get_glyph(const displayio_builtinfont_
         MP_OBJ_NEW_SMALL_INT(self->width),
         MP_OBJ_NEW_SMALL_INT(0)
     };
-    return namedtuple_make_new((const mp_obj_type_t*) &displayio_glyph_type, 8, field_values, NULL);
+    return namedtuple_make_new((const mp_obj_type_t*) &fontio_glyph_type, 8, field_values, NULL);
 }
diff --git a/shared-module/displayio/BuiltinFont.h b/shared-module/fontio/BuiltinFont.h
index ac69ef9da..30b4ade8c 100644
--- a/shared-module/displayio/BuiltinFont.h
+++ b/shared-module/fontio/BuiltinFont.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_BUILTINFONT_H
-#define MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_BUILTINFONT_H
+#ifndef MICROPY_INCLUDED_SHARED_MODULE_FONTIO_BUILTINFONT_H
+#define MICROPY_INCLUDED_SHARED_MODULE_FONTIO_BUILTINFONT_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -40,8 +40,8 @@ typedef struct {
     uint8_t height;
     const byte* unicode_characters;
     uint16_t unicode_characters_len;
-} displayio_builtinfont_t;
+} fontio_builtinfont_t;
 
-uint8_t displayio_builtinfont_get_glyph_index(const displayio_builtinfont_t *self, mp_uint_t codepoint);
+uint8_t fontio_builtinfont_get_glyph_index(const fontio_builtinfont_t *self, mp_uint_t codepoint);
 
-#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_BUILTINFONT_H
+#endif // MICROPY_INCLUDED_SHARED_MODULE_FONTIO_BUILTINFONT_H
diff --git a/shared-module/fontio/__init__.c b/shared-module/fontio/__init__.c
new file mode 100644
index 000000000..674343c53
--- /dev/null
+++ b/shared-module/fontio/__init__.c
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Scott Shawcroft
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Nothing now.
diff --git a/shared-module/terminalio/Terminal.c b/shared-module/terminalio/Terminal.c
index 07c13d639..7adf9d032 100644
--- a/shared-module/terminalio/Terminal.c
+++ b/shared-module/terminalio/Terminal.c
@@ -26,11 +26,10 @@
 
 #include "shared-module/terminalio/Terminal.h"
 
-#include "shared-module/displayio/__init__.h"
-#include "shared-module/displayio/BuiltinFont.h"
+#include "shared-module/fontio/BuiltinFont.h"
 #include "shared-bindings/displayio/TileGrid.h"
 
-void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self, displayio_tilegrid_t* tilegrid, const displayio_builtinfont_t* font) {
+void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self, displayio_tilegrid_t* tilegrid, const fontio_builtinfont_t* font) {
     self->cursor_x = 0;
     self->cursor_y = 0;
     self->font = font;
@@ -47,7 +46,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
         // Always handle ASCII.
         if (c < 128) {
             if (c >= 0x20 && c <= 0x7e) {
-                uint8_t tile_index = displayio_builtinfont_get_glyph_index(self->font, c);
+                uint8_t tile_index = fontio_builtinfont_get_glyph_index(self->font, c);
                 common_hal_displayio_tilegrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index);
                 self->cursor_x++;
             } else if (c == '\r') {
@@ -92,7 +91,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                 }
             }
         } else {
-            uint8_t tile_index = displayio_builtinfont_get_glyph_index(self->font, c);
+            uint8_t tile_index = fontio_builtinfont_get_glyph_index(self->font, c);
             if (tile_index != 0xff) {
                 common_hal_displayio_tilegrid_set_tile(self->tilegrid, self->cursor_x, self->cursor_y, tile_index);
                 self->cursor_x++;
diff --git a/shared-module/terminalio/Terminal.h b/shared-module/terminalio/Terminal.h
index 145b42f3f..c31392cc4 100644
--- a/shared-module/terminalio/Terminal.h
+++ b/shared-module/terminalio/Terminal.h
@@ -31,12 +31,12 @@
 #include <stdbool.h>
 
 #include "py/obj.h"
-#include "shared-module/displayio/BuiltinFont.h"
+#include "shared-module/fontio/BuiltinFont.h"
 #include "shared-module/displayio/TileGrid.h"
 
 typedef struct  {
     mp_obj_base_t base;
-    const displayio_builtinfont_t* font;
+    const fontio_builtinfont_t* font;
     uint16_t cursor_x;
     uint16_t cursor_y;
     displayio_tilegrid_t* tilegrid;