Move Glyph and BuiltinFont into fontio
It was confusing in displayio. Fixes #1662
This commit is contained in:
Scott Shawcroft
parent
8543695f9d
commit
5e2fec714c
|
|
@ -124,7 +124,7 @@ ifeq ($(CIRCUITPY_DIGITALIO),1)
|
|||
SRC_PATTERNS += digitalio/%
|
||||
endif
|
||||
ifeq ($(CIRCUITPY_DISPLAYIO),1)
|
||||
SRC_PATTERNS += displayio/% terminalio/%
|
||||
SRC_PATTERNS += displayio/% terminalio/% fontio/%
|
||||
endif
|
||||
ifeq ($(CIRCUITPY_FREQUENCYIO),1)
|
||||
SRC_PATTERNS += frequencyio/%
|
||||
|
|
@ -268,7 +268,7 @@ $(filter $(SRC_PATTERNS), \
|
|||
digitalio/Direction.c \
|
||||
digitalio/DriveMode.c \
|
||||
digitalio/Pull.c \
|
||||
displayio/Glyph.c \
|
||||
fontio/Glyph.c \
|
||||
microcontroller/RunMode.c \
|
||||
math/__init__.c \
|
||||
supervisor/__init__.c \
|
||||
|
|
@ -304,7 +304,6 @@ $(filter $(SRC_PATTERNS), \
|
|||
bitbangio/__init__.c \
|
||||
busio/OneWire.c \
|
||||
displayio/Bitmap.c \
|
||||
displayio/BuiltinFont.c \
|
||||
displayio/ColorConverter.c \
|
||||
displayio/Display.c \
|
||||
displayio/FourWire.c \
|
||||
|
|
@ -314,6 +313,8 @@ $(filter $(SRC_PATTERNS), \
|
|||
displayio/Shape.c \
|
||||
displayio/TileGrid.c \
|
||||
displayio/__init__.c \
|
||||
fontio/BuiltinFont.c \
|
||||
fontio/__init__.c \
|
||||
gamepad/GamePad.c \
|
||||
gamepad/__init__.c \
|
||||
os/__init__.c \
|
||||
|
|
|
|||
|
|
@ -271,12 +271,15 @@ extern const struct _mp_obj_module_t digitalio_module;
|
|||
|
||||
#if CIRCUITPY_DISPLAYIO
|
||||
extern const struct _mp_obj_module_t displayio_module;
|
||||
extern const struct _mp_obj_module_t fontio_module;
|
||||
extern const struct _mp_obj_module_t terminalio_module;
|
||||
#define DISPLAYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_displayio), (mp_obj_t)&displayio_module },
|
||||
#define FONTIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_fontio), (mp_obj_t)&fontio_module },
|
||||
#define TERMINALIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_terminalio), (mp_obj_t)&terminalio_module },
|
||||
#define CIRCUITPY_DISPLAY_LIMIT (3)
|
||||
#else
|
||||
#define DISPLAYIO_MODULE
|
||||
#define FONTIO_MODULE
|
||||
#define TERMINALIO_MODULE
|
||||
#define CIRCUITPY_DISPLAY_LIMIT (0)
|
||||
#endif
|
||||
|
|
@ -523,8 +526,9 @@ extern const struct _mp_obj_module_t pew_module;
|
|||
BOARD_MODULE \
|
||||
BUSIO_MODULE \
|
||||
DIGITALIO_MODULE \
|
||||
TERMINALIO_MODULE \
|
||||
DISPLAYIO_MODULE \
|
||||
FONTIO_MODULE \
|
||||
TERMINALIO_MODULE \
|
||||
ERRNO_MODULE \
|
||||
FREQUENCYIO_MODULE \
|
||||
GAMEPAD_MODULE \
|
||||
|
|
|
|||
|
|
@ -31,11 +31,9 @@
|
|||
|
||||
#include "shared-bindings/displayio/__init__.h"
|
||||
#include "shared-bindings/displayio/Bitmap.h"
|
||||
#include "shared-bindings/displayio/BuiltinFont.h"
|
||||
#include "shared-bindings/displayio/ColorConverter.h"
|
||||
#include "shared-bindings/displayio/Display.h"
|
||||
#include "shared-bindings/displayio/FourWire.h"
|
||||
#include "shared-bindings/displayio/Glyph.h"
|
||||
#include "shared-bindings/displayio/Group.h"
|
||||
#include "shared-bindings/displayio/OnDiskBitmap.h"
|
||||
#include "shared-bindings/displayio/Palette.h"
|
||||
|
|
@ -91,10 +89,8 @@ MP_DEFINE_CONST_FUN_OBJ_0(displayio_release_displays_obj, displayio_release_disp
|
|||
STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_displayio) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_Bitmap), MP_ROM_PTR(&displayio_bitmap_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_BuiltinFont), MP_ROM_PTR(&displayio_builtinfont_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_ColorConverter), MP_ROM_PTR(&displayio_colorconverter_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_Display), MP_ROM_PTR(&displayio_display_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_Glyph), MP_ROM_PTR(&displayio_glyph_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_Group), MP_ROM_PTR(&displayio_group_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_OnDiskBitmap), MP_ROM_PTR(&displayio_ondiskbitmap_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_Palette), MP_ROM_PTR(&displayio_palette_type) },
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "shared-bindings/displayio/BuiltinFont.h"
|
||||
#include "shared-bindings/fontio/BuiltinFont.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
#include "shared-bindings/util.h"
|
||||
#include "supervisor/shared/translate.h"
|
||||
|
||||
//| .. currentmodule:: displayio
|
||||
//| .. currentmodule:: fontio
|
||||
//|
|
||||
//| :class:`BuiltinFont` -- A font built into CircuitPython
|
||||
//| =========================================================================================
|
||||
|
|
@ -56,15 +56,15 @@
|
|||
//| `get_glyph` in most cases. This is useful for use with `displayio.TileGrid` and
|
||||
//| `terminalio.Terminal`.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_builtinfont_obj_get_bitmap(mp_obj_t self_in) {
|
||||
displayio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
return common_hal_displayio_builtinfont_get_bitmap(self);
|
||||
STATIC mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) {
|
||||
fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
return common_hal_fontio_builtinfont_get_bitmap(self);
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(displayio_builtinfont_get_bitmap_obj, displayio_builtinfont_obj_get_bitmap);
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bitmap_obj, fontio_builtinfont_obj_get_bitmap);
|
||||
|
||||
const mp_obj_property_t displayio_builtinfont_bitmap_obj = {
|
||||
const mp_obj_property_t fontio_builtinfont_bitmap_obj = {
|
||||
.base.type = &mp_type_property,
|
||||
.proxy = {(mp_obj_t)&displayio_builtinfont_get_bitmap_obj,
|
||||
.proxy = {(mp_obj_t)&fontio_builtinfont_get_bitmap_obj,
|
||||
(mp_obj_t)&mp_const_none_obj,
|
||||
(mp_obj_t)&mp_const_none_obj},
|
||||
};
|
||||
|
|
@ -73,38 +73,38 @@ const mp_obj_property_t displayio_builtinfont_bitmap_obj = {
|
|||
//|
|
||||
//| Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) {
|
||||
displayio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
STATIC mp_obj_t fontio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) {
|
||||
fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
|
||||
return common_hal_displayio_builtinfont_get_bounding_box(self);
|
||||
return common_hal_fontio_builtinfont_get_bounding_box(self);
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(displayio_builtinfont_get_bounding_box_obj, displayio_builtinfont_obj_get_bounding_box);
|
||||
MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bounding_box_obj, fontio_builtinfont_obj_get_bounding_box);
|
||||
|
||||
|
||||
//| .. method:: get_glyph(codepoint)
|
||||
//|
|
||||
//| Returns a `displayio.Glyph` for the given codepoint or None if no glyph is available.
|
||||
//| Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available.
|
||||
//|
|
||||
STATIC mp_obj_t displayio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) {
|
||||
displayio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) {
|
||||
fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
|
||||
|
||||
mp_int_t codepoint;
|
||||
if (!mp_obj_get_int_maybe(codepoint_obj, &codepoint)) {
|
||||
mp_raise_ValueError_varg(translate("%q should be an int"), MP_QSTR_codepoint);
|
||||
}
|
||||
return common_hal_displayio_builtinfont_get_glyph(self, codepoint);
|
||||
return common_hal_fontio_builtinfont_get_glyph(self, codepoint);
|
||||
}
|
||||
MP_DEFINE_CONST_FUN_OBJ_2(displayio_builtinfont_get_glyph_obj, displayio_builtinfont_obj_get_glyph);
|
||||
MP_DEFINE_CONST_FUN_OBJ_2(fontio_builtinfont_get_glyph_obj, fontio_builtinfont_obj_get_glyph);
|
||||
|
||||
STATIC const mp_rom_map_elem_t displayio_builtinfont_locals_dict_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_builtinfont_bitmap_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_bounding_box), MP_ROM_PTR(&displayio_builtinfont_get_bounding_box_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_glyph), MP_ROM_PTR(&displayio_builtinfont_get_glyph_obj) },
|
||||
STATIC const mp_rom_map_elem_t fontio_builtinfont_locals_dict_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&fontio_builtinfont_bitmap_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_bounding_box), MP_ROM_PTR(&fontio_builtinfont_get_bounding_box_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_get_glyph), MP_ROM_PTR(&fontio_builtinfont_get_glyph_obj) },
|
||||
};
|
||||
STATIC MP_DEFINE_CONST_DICT(displayio_builtinfont_locals_dict, displayio_builtinfont_locals_dict_table);
|
||||
STATIC MP_DEFINE_CONST_DICT(fontio_builtinfont_locals_dict, fontio_builtinfont_locals_dict_table);
|
||||
|
||||
const mp_obj_type_t displayio_builtinfont_type = {
|
||||
const mp_obj_type_t fontio_builtinfont_type = {
|
||||
{ &mp_type_type },
|
||||
.name = MP_QSTR_BuiltinFont,
|
||||
.locals_dict = (mp_obj_dict_t*)&displayio_builtinfont_locals_dict,
|
||||
.locals_dict = (mp_obj_dict_t*)&fontio_builtinfont_locals_dict,
|
||||
};
|
||||
|
|
@ -24,15 +24,15 @@
|
|||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_BUILTINFONT_H
|
||||
#define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_BUILTINFONT_H
|
||||
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO_BUILTINFONT_H
|
||||
#define MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO_BUILTINFONT_H
|
||||
|
||||
#include "shared-module/displayio/BuiltinFont.h"
|
||||
#include "shared-module/fontio/BuiltinFont.h"
|
||||
|
||||
extern const mp_obj_type_t displayio_builtinfont_type;
|
||||
extern const mp_obj_type_t fontio_builtinfont_type;
|
||||
|
||||
mp_obj_t common_hal_displayio_builtinfont_get_bitmap(const displayio_builtinfont_t *self);
|
||||
mp_obj_t common_hal_displayio_builtinfont_get_bounding_box(const displayio_builtinfont_t *self);
|
||||
mp_obj_t common_hal_displayio_builtinfont_get_glyph(const displayio_builtinfont_t *self, mp_uint_t codepoint);
|
||||
mp_obj_t common_hal_fontio_builtinfont_get_bitmap(const fontio_builtinfont_t *self);
|
||||
mp_obj_t common_hal_fontio_builtinfont_get_bounding_box(const fontio_builtinfont_t *self);
|
||||
mp_obj_t common_hal_fontio_builtinfont_get_glyph(const fontio_builtinfont_t *self, mp_uint_t codepoint);
|
||||
|
||||
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_BUILTINFONT_H
|
||||
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO_BUILTINFONT_H
|
||||
|
|
@ -24,11 +24,11 @@
|
|||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "shared-bindings/displayio/Glyph.h"
|
||||
#include "shared-bindings/fontio/Glyph.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
//| .. currentmodule:: displayio
|
||||
//| .. currentmodule:: fontio
|
||||
//|
|
||||
//| :class:`Glyph` -- Storage of glyph info
|
||||
//| ==========================================================================
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
//|
|
||||
//| Named tuple used to capture a single glyph and its attributes.
|
||||
//|
|
||||
//| :param displayio.Bitmap bitmap: the bitmap including the glyph
|
||||
//| :param fontio.Bitmap bitmap: the bitmap including the glyph
|
||||
//| :param int tile_index: the tile index within the bitmap
|
||||
//| :param int width: the width of the glyph's bitmap
|
||||
//| :param int height: the height of the glyph's bitmap
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
//| :param int shift_x: the x difference to the next glyph
|
||||
//| :param int shift_y: the y difference to the next glyph
|
||||
//|
|
||||
const mp_obj_namedtuple_type_t displayio_glyph_type = {
|
||||
const mp_obj_namedtuple_type_t fontio_glyph_type = {
|
||||
.base = {
|
||||
.base = {
|
||||
.type = &mp_type_type
|
||||
|
|
@ -24,11 +24,11 @@
|
|||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_GLYPH_H
|
||||
#define MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_GLYPH_H
|
||||
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO_GLYPH_H
|
||||
#define MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO_GLYPH_H
|
||||
|
||||
#include "py/objnamedtuple.h"
|
||||
|
||||
extern const mp_obj_namedtuple_type_t displayio_glyph_type;
|
||||
extern const mp_obj_namedtuple_type_t fontio_glyph_type;
|
||||
|
||||
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_GLYPH_H
|
||||
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO_GLYPH_H
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* This file is part of the MicroPython project, http://micropython.org/
|
||||
*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "py/obj.h"
|
||||
#include "py/runtime.h"
|
||||
|
||||
#include "shared-bindings/fontio/__init__.h"
|
||||
#include "shared-bindings/fontio/BuiltinFont.h"
|
||||
#include "shared-bindings/fontio/Glyph.h"
|
||||
|
||||
//| :mod:`fontio` --- Core font related data structures
|
||||
//| =========================================================================
|
||||
//|
|
||||
//| .. module:: fontio
|
||||
//| :synopsis: Core font related data structures
|
||||
//| :platform: SAMD21, SAMD51, nRF52
|
||||
//|
|
||||
//| The `fontio` module contains classes to store font related information.
|
||||
//|
|
||||
//| Libraries
|
||||
//|
|
||||
//| .. toctree::
|
||||
//| :maxdepth: 3
|
||||
//|
|
||||
//| BuiltinFont
|
||||
//| Glyph
|
||||
//|
|
||||
|
||||
STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fontio) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_BuiltinFont), MP_ROM_PTR(&fontio_builtinfont_type) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_Glyph), MP_ROM_PTR(&fontio_glyph_type) },
|
||||
};
|
||||
|
||||
STATIC MP_DEFINE_CONST_DICT(fontio_module_globals, fontio_module_globals_table);
|
||||
|
||||
const mp_obj_module_t fontio_module = {
|
||||
.base = { &mp_type_module },
|
||||
.globals = (mp_obj_dict_t*)&fontio_module_globals,
|
||||
};
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* This file is part of the MicroPython project, http://micropython.org/
|
||||
*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO___INIT___H
|
||||
#define MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO___INIT___H
|
||||
|
||||
|
||||
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_FONTIO___INIT___H
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#include "py/objstr.h"
|
||||
#include "py/runtime.h"
|
||||
#include "py/stream.h"
|
||||
#include "shared-bindings/displayio/BuiltinFont.h"
|
||||
#include "shared-bindings/fontio/BuiltinFont.h"
|
||||
#include "supervisor/shared/translate.h"
|
||||
|
||||
|
||||
|
|
@ -64,8 +64,8 @@ STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n
|
|||
}
|
||||
|
||||
mp_obj_t font = args[ARG_font].u_obj;
|
||||
if (!MP_OBJ_IS_TYPE(font, &displayio_builtinfont_type)) {
|
||||
mp_raise_TypeError_varg(translate("Expected a %q"), displayio_builtinfont_type.name);
|
||||
if (!MP_OBJ_IS_TYPE(font, &fontio_builtinfont_type)) {
|
||||
mp_raise_TypeError_varg(translate("Expected a %q"), fontio_builtinfont_type.name);
|
||||
}
|
||||
terminalio_terminal_obj_t *self = m_new_obj(terminalio_terminal_obj_t);
|
||||
self->base.type = &terminalio_terminal_type;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
extern const mp_obj_type_t terminalio_terminal_type;
|
||||
|
||||
extern void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self,
|
||||
displayio_tilegrid_t* tilegrid, const displayio_builtinfont_t* font);
|
||||
displayio_tilegrid_t* tilegrid, const fontio_builtinfont_t* font);
|
||||
|
||||
// Write characters. len is in characters NOT bytes!
|
||||
extern size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -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++;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@
|
|||
#ifndef MICROPY_INCLUDED_SUPERVISOR_SHARED_DISPLAY_H
|
||||
#define MICROPY_INCLUDED_SUPERVISOR_SHARED_DISPLAY_H
|
||||
|
||||
#include "shared-bindings/displayio/BuiltinFont.h"
|
||||
#include "shared-bindings/displayio/Bitmap.h"
|
||||
#include "shared-bindings/displayio/TileGrid.h"
|
||||
#include "shared-bindings/fontio/BuiltinFont.h"
|
||||
#include "shared-bindings/terminalio/Terminal.h"
|
||||
|
||||
// These are autogenerated resources.
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
// This is fixed so it doesn't need to be in RAM.
|
||||
extern const displayio_bitmap_t supervisor_terminal_font_bitmap;
|
||||
|
||||
extern const displayio_builtinfont_t supervisor_terminal_font;
|
||||
extern const fontio_builtinfont_t supervisor_terminal_font;
|
||||
|
||||
// These will change so they must live in RAM.
|
||||
extern displayio_tilegrid_t supervisor_terminal_text_grid;
|
||||
|
|
|
|||
|
|
@ -165,8 +165,8 @@ const displayio_bitmap_t supervisor_terminal_font_bitmap = {{
|
|||
|
||||
|
||||
c_file.write("""\
|
||||
const displayio_builtinfont_t supervisor_terminal_font = {{
|
||||
.base = {{.type = &displayio_builtinfont_type }},
|
||||
const fontio_builtinfont_t supervisor_terminal_font = {{
|
||||
.base = {{.type = &fontio_builtinfont_type }},
|
||||
.bitmap = &supervisor_terminal_font_bitmap,
|
||||
.width = {},
|
||||
.height = {},
|
||||
|
|
|
|||
Loading…
Reference in New Issue