updated GDISP and GWIN demos

1 files changed, 162 insertions, 0 deletions

diff --git a/demos/modules/gdisp/fonts/font_Apple12.h b/demos/modules/gdisp/fonts/font_Apple12.h
new file mode 100644
index 00000000..38e124d7
--- /dev/null
+++ b/demos/modules/gdisp/fonts/font_Apple12.h
@@ -0,0 +1,162 @@
+
+
+/* Start of automatically generated font definition for phpoXxi1Y. */
+
+#ifndef MF_RLEFONT_INTERNALS
+#define MF_RLEFONT_INTERNALS
+#endif
+#include "mf_rlefont.h"
+
+#ifndef MF_RLEFONT_VERSION_4_SUPPORTED
+#error The font file is not compatible with this version of mcufont.
+#endif
+
+static const uint8_t mf_rlefont_phpoXxi1Y_dictionary_data[193] = {
+    0x04, 0x81, 0x04, 0x01, 0x81, 0x04, 0x0d, 0x81, 0x05, 0x80, 0x03, 0x80, 0x0b, 0x80, 0x09, 0x81, 
+    0x08, 0x83, 0x06, 0x01, 0x80, 0x08, 0x02, 0x81, 0x02, 0x81, 0x06, 0x84, 0x04, 0x80, 0x0a, 0x81, 
+    0x02, 0x0f, 0x80, 0x85, 0x02, 0x04, 0x81, 0x04, 0x81, 0x81, 0x06, 0x31, 0x81, 0x08, 0x08, 0x82, 
+    0x06, 0x33, 0x83, 0x06, 0x81, 0x03, 0x1b, 0x02, 0x80, 0x02, 0x04, 0x81, 0x03, 0x81, 0x0a, 0x0c, 
+    0x80, 0x0b, 0x80, 0x0b, 0x06, 0x81, 0x0a, 0x81, 0x04, 0x08, 0x80, 0x80, 0x01, 0x01, 0x81, 0x13, 
+    0x01, 0x80, 0x33, 0x82, 0x02, 0x06, 0x81, 0x1c, 0x2c, 0x1a, 0xd3, 0x64, 0x8c, 0x26, 0x26, 0x21, 
+    0x18, 0x27, 0x18, 0xda, 0x19, 0x2f, 0x1b, 0x2a, 0x00, 0xa0, 0x2a, 0x34, 0x2c, 0x3c, 0xf4, 0x34, 
+    0xd4, 0xa3, 0x64, 0x31, 0x64, 0x20, 0x1e, 0x34, 0x34, 0x39, 0x65, 0xca, 0x64, 0x2f, 0x64, 0x1a, 
+    0x25, 0x21, 0x18, 0x34, 0x3c, 0x25, 0x30, 0x26, 0x26, 0x18, 0x1c, 0x3c, 0x25, 0x26, 0x26, 0x74, 
+    0x00, 0xa0, 0xe4, 0x34, 0x2f, 0xc6, 0x35, 0x32, 0xd2, 0xca, 0x70, 0x34, 0xc7, 0x8a, 0x24, 0x3b, 
+    0xa8, 0x35, 0x1f, 0x21, 0x25, 0x1b, 0x23, 0x35, 0x23, 0x32, 0x34, 0x1b, 0xe3, 0x65, 0x35, 0x23, 
+    0x24, 0x3d, 0x85, 0x1a, 0x18, 0x24, 0x3b, 0x26, 0x2f, 0x8c, 0x1f, 0x93, 0x26, 0x26, 0x26, 0x18, 
+    0xc7, 
+};
+
+static const uint16_t mf_rlefont_phpoXxi1Y_dictionary_offsets[76] = {
+    0x0000, 0x0003, 0x0006, 0x0008, 0x000a, 0x000c, 0x0011, 0x0013, 
+    0x0016, 0x0018, 0x001b, 0x001d, 0x0021, 0x0023, 0x0025, 0x0029, 
+    0x002b, 0x002d, 0x002e, 0x0031, 0x0033, 0x0036, 0x0037, 0x0039, 
+    0x003a, 0x003c, 0x003e, 0x003f, 0x0044, 0x0049, 0x004b, 0x004d, 
+    0x004f, 0x0050, 0x0052, 0x0053, 0x0055, 0x0056, 0x0057, 0x0059, 
+    0x005c, 0x005f, 0x0061, 0x0063, 0x0065, 0x0067, 0x006b, 0x006e, 
+    0x0070, 0x0073, 0x0075, 0x0077, 0x0079, 0x007b, 0x007d, 0x007f, 
+    0x0086, 0x008a, 0x008d, 0x008f, 0x0090, 0x0092, 0x0095, 0x0098, 
+    0x0099, 0x009b, 0x00a0, 0x00a4, 0x00a9, 0x00ac, 0x00ae, 0x00b0, 
+    0x00b5, 0x00b8, 0x00bc, 0x00c1, 
+};
+
+static const uint8_t mf_rlefont_phpoXxi1Y_glyph_data_0[954] = {
+    0x0c, 0x00, 0x10, 0x0c, 0x32, 0x4b, 0x4b, 0x2d, 0x31, 0x10, 0x0d, 0x2f, 0x1a, 0x4d, 0x4d, 0x4d, 
+    0x4d, 0x37, 0x10, 0x0c, 0x00, 0x1a, 0x4d, 0x4d, 0x19, 0x80, 0x8b, 0x70, 0x44, 0xd1, 0x1b, 0x83, 
+    0x64, 0x4d, 0x4d, 0x4d, 0x37, 0x10, 0x0c, 0x5c, 0x22, 0x9f, 0x3c, 0x9e, 0x29, 0x93, 0x4e, 0x4d, 
+    0x85, 0x82, 0x47, 0x10, 0x0e, 0xe4, 0x45, 0xc5, 0x74, 0x35, 0x1d, 0x86, 0x2c, 0x54, 0x2a, 0xbc, 
+    0x10, 0x0c, 0x24, 0x2f, 0x4e, 0x4d, 0x4d, 0xea, 0x38, 0x1f, 0xba, 0x4c, 0x32, 0xa7, 0x38, 0x72, 
+    0x10, 0x0c, 0x32, 0x4b, 0x2c, 0x10, 0x0e, 0xe4, 0x24, 0x85, 0x24, 0x47, 0x46, 0x8c, 0x32, 0x1a, 
+    0x10, 0x0d, 0x32, 0x2c, 0x38, 0xe8, 0x3c, 0x4b, 0x2c, 0xe4, 0x1f, 0x1a, 0x10, 0x0c, 0x3c, 0x55, 
+    0xba, 0x8a, 0x7c, 0x47, 0xc4, 0x93, 0x4e, 0x44, 0x71, 0x44, 0x23, 0x10, 0x0c, 0x38, 0x47, 0xc4, 
+    0x4d, 0x5b, 0x10, 0x0c, 0x38, 0x38, 0x3a, 0x56, 0x1f, 0x1a, 0x10, 0x0c, 0x38, 0x3a, 0x1c, 0x83, 
+    0x10, 0x0c, 0x2d, 0x3a, 0x3a, 0x4e, 0x10, 0x0c, 0x2d, 0x18, 0x1b, 0x1d, 0x56, 0x23, 0x10, 0x0c, 
+    0x60, 0x18, 0xc7, 0x8a, 0x8b, 0xaa, 0x58, 0x4c, 0xb5, 0x52, 0x61, 0x10, 0x0c, 0x5c, 0x87, 0x4b, 
+    0x46, 0xe3, 0x10, 0x0c, 0x60, 0x55, 0xc4, 0x2a, 0x88, 0x46, 0x39, 0x83, 0x10, 0x0c, 0x1a, 0x25, 
+    0x5e, 0x44, 0x3c, 0x54, 0x2a, 0x59, 0x10, 0x0c, 0x5c, 0xf7, 0x2a, 0xc2, 0x4e, 0x4d, 0x5b, 0x10, 
+    0x0c, 0x1a, 0x25, 0x41, 0x3c, 0x25, 0x55, 0x52, 0x18, 0xc0, 0x10, 0x0c, 0xe4, 0xa3, 0x3c, 0xa3, 
+    0x1b, 0x1d, 0x2f, 0x25, 0x62, 0x7c, 0x10, 0x0c, 0x00, 0x1a, 0x22, 0x44, 0x1d, 0x2f, 0x1d, 0x41, 
+    0x34, 0x10, 0x0c, 0x60, 0x52, 0x61, 0x26, 0x52, 0x61, 0x10, 0x0c, 0x24, 0x3b, 0x50, 0x4a, 0x25, 
+    0x5e, 0x44, 0x3c, 0x32, 0x80, 0x10, 0x0c, 0x3a, 0xca, 0x38, 0x1a, 0x10, 0x0c, 0x3a, 0xe8, 0x29, 
+    0x88, 0x38, 0x56, 0x1f, 0x1a, 0x10, 0x0c, 0x00, 0x1b, 0x1d, 0x39, 0x1d, 0x1c, 0x33, 0x19, 0x35, 
+    0x10, 0x0c, 0x28, 0x25, 0x38, 0x44, 0x83, 0x10, 0x0c, 0x24, 0x36, 0x32, 0x56, 0x41, 0x4e, 0x47, 
+    0x1b, 0x1d, 0x10, 0x0c, 0x5f, 0x1b, 0x38, 0x90, 0x5e, 0x38, 0x1a, 0x10, 0x0c, 0x60, 0xf4, 0x8a, 
+    0x58, 0x58, 0x58, 0x3b, 0x70, 0x85, 0x7a, 0x2c, 0x38, 0x4a, 0x10, 0x0c, 0xe4, 0x32, 0x90, 0x38, 
+    0x8d, 0x50, 0x0f, 0x83, 0x62, 0x10, 0x0c, 0x3f, 0x26, 0x52, 0x51, 0x50, 0x3d, 0x51, 0x10, 0x0c, 
+    0x5f, 0x42, 0x4b, 0x27, 0x32, 0xc0, 0x10, 0x0c, 0x3f, 0x52, 0x52, 0x62, 0x85, 0x82, 0x10, 0x0c, 
+    0x4f, 0x18, 0x46, 0x39, 0x83, 0x10, 0x0c, 0x4f, 0x18, 0x4b, 0x10, 0x0c, 0x24, 0xe3, 0x18, 0x4b, 
+    0x3c, 0x67, 0xa5, 0x75, 0x26, 0xc4, 0x82, 0x10, 0x0c, 0x1a, 0x62, 0x4c, 0xc3, 0x62, 0x4c, 0x10, 
+    0x0d, 0x24, 0x93, 0x34, 0x4b, 0x46, 0xe3, 0x10, 0x0c, 0x32, 0x47, 0x4b, 0x59, 0x10, 0x0c, 0x1a, 
+    0x26, 0x3e, 0x36, 0x64, 0x19, 0x54, 0x2a, 0x9c, 0x27, 0xaa, 0x4e, 0x3e, 0xf5, 0x26, 0x10, 0x0c, 
+    0xe4, 0x47, 0x4b, 0x46, 0xca, 0x35, 0x83, 0x10, 0x0b, 0x1a, 0x49, 0x49, 0xf9, 0x87, 0x43, 0x43, 
+    0x43, 0x37, 0x49, 0x49, 0x49, 0x49, 0x31, 0x10, 0x0b, 0x1a, 0x49, 0x49, 0x49, 0x36, 0x19, 0x43, 
+    0x43, 0x00, 0x77, 0x64, 0x49, 0x49, 0x49, 0x31, 0x10, 0x0c, 0x60, 0x62, 0x4c, 0x52, 0x61, 0x10, 
+    0x0c, 0x3f, 0x26, 0x52, 0x51, 0x18, 0x4b, 0x10, 0x0c, 0x60, 0x62, 0xba, 0x19, 0x97, 0x2c, 0xc5, 
+    0x8c, 0x1f, 0xbb, 0x10, 0x0c, 0x3f, 0x50, 0x3d, 0x48, 0x4d, 0x4d, 0x40, 0x10, 0x0c, 0x60, 0xd4, 
+    0x23, 0xf4, 0x38, 0x1e, 0x59, 0x10, 0x0c, 0x1a, 0x5b, 0x5e, 0x5e, 0x5e, 0x10, 0x0c, 0x1a, 0x62, 
+    0x37, 0x52, 0x52, 0x61, 0x10, 0x0c, 0x1a, 0x62, 0x37, 0x50, 0x5a, 0x10, 0x0b, 0x1a, 0x49, 0x49, 
+    0x49, 0x49, 0x2f, 0x19, 0x43, 0x43, 0x43, 0x72, 0x85, 0xa7, 0x85, 0x67, 0x10, 0x0c, 0x00, 0x29, 
+    0x50, 0x5a, 0x00, 0xa8, 0x44, 0x40, 0x26, 0x10, 0x0c, 0x00, 0x29, 0x50, 0xa8, 0x38, 0x41, 0x4b, 
+    0x10, 0x0c, 0x1a, 0x25, 0x5e, 0x44, 0x32, 0x23, 0x44, 0x47, 0x2c, 0x44, 0x83, 0x10, 0x0c, 0x1a, 
+    0x25, 0xa0, 0x45, 0x54, 0x45, 0x54, 0x35, 0x83, 0x10, 0x0c, 0x38, 0x2c, 0x29, 0xc5, 0x35, 0x3c, 
+    0x2c, 0x35, 0x33, 0x37, 0x10, 0x0c, 0x32, 0x74, 0x1e, 0x54, 0x45, 0x54, 0x45, 0x31, 0x85, 0x83, 
+    0x10, 0x0d, 0x3a, 0x21, 0xcc, 0x86, 0x32, 0x26, 0x10, 0x0d, 0xf4, 0x3a, 0x3a, 0x2b, 0x83, 0x10, 
+    0x0c, 0x24, 0x36, 0x32, 0x86, 0x5e, 0x10, 0x0c, 0x2b, 0xf4, 0x47, 0x4a, 0x5d, 0x18, 0x4a, 0x10, 
+    0x0c, 0x1a, 0x55, 0x48, 0x40, 0x50, 0xc3, 0x10, 0x0c, 0x2b, 0x87, 0x86, 0x4b, 0x2c, 0x29, 0x82, 
+    0x10, 0x0c, 0x3c, 0x1a, 0x55, 0xc3, 0x1b, 0x52, 0x50, 0x27, 0xc3, 0x10, 0x0c, 0x2b, 0x44, 0x3e, 
+    0x4c, 0x5d, 0x55, 0xc4, 0x82, 0x10, 0x0c, 0x29, 0x2a, 0x31, 0x8b, 0x90, 0x8a, 0x41, 0xc4, 0x5b, 
+    0x00, 0x4e, 0x10, 0x0c, 0x2b, 0x29, 0x50, 0xe7, 0x48, 0xd3, 0x47, 0xc0, 0x10, 0x0c, 0x1a, 0x55, 
+    0x48, 0x40, 0x62, 0x10, 0x0d, 0x32, 0x2c, 0x2d, 0x54, 0x47, 0x4b, 0xf4, 0x80, 0x10, 0x0c, 0xc4, 
+    0x32, 0x8c, 0x2d, 0x74, 0x32, 0x56, 0x56, 0x1f, 0x3e, 0x0f, 0x38, 0xf2, 0x10, 0x0c, 0x1a, 0x55, 
+    0x26, 0xd4, 0x95, 0x64, 0x21, 0x1e, 0xb0, 0x35, 0x9d, 0x64, 0x8c, 0x26, 0x10, 0x0d, 0x24, 0x42, 
+    0x4b, 0x4b, 0xf4, 0x80, 0x10, 0x0c, 0x28, 0x36, 0x92, 0x90, 0x92, 0x70, 0x58, 0x58, 0x58, 0x4c, 
+    0xba, 0x26, 0x10, 0x0c, 0x28, 0xd3, 0x64, 0x40, 0x62, 0x10, 0x0c, 0x2b, 0x44, 0x40, 0x50, 0xc0, 
+    0x10, 0x0c, 0x28, 0xd3, 0x64, 0x40, 0x50, 0xc3, 0x46, 0x0c, 0x3a, 0xc3, 0x1b, 0x52, 0x50, 0x27, 
+    0xc3, 0x55, 0x30, 0x10, 0x0c, 0x28, 0xe2, 0x65, 0x32, 0x8b, 0x4b, 0x2c, 0x10, 0x0c, 0x3a, 0xe3, 
+    0x85, 0x23, 0x32, 0x1e, 0x1b, 0x32, 0x21, 0x51, 0x10, 0x0c, 0x32, 0x46, 0x5b, 0x8a, 0x90, 0x8a, 
+    0x74, 0x10, 0x0c, 0x28, 0x62, 0x3d, 0x65, 0x54, 0x2a, 0xbb, 0x10, 0x0c, 0x28, 0x62, 0x19, 0x5a, 
+    0x10, 0x0b, 0x28, 0x49, 0x49, 0x2f, 0x19, 0x43, 0x43, 0x43, 0x43, 0x00, 0x7b, 0x10, 0x0c, 0x28, 
+    0x18, 0xa6, 0x35, 0x88, 0x2c, 0xe4, 0x98, 0x3c, 0xa8, 0x44, 0x8c, 0x26, 0x10, 0x0c, 0x28, 0x26, 
+    0x50, 0x42, 0x4a, 0xd4, 0x85, 0x32, 0x7c, 0x10, 0x0c, 0x28, 0x25, 0x44, 0x1d, 0xe7, 0x5e, 0x44, 
+    0x83, 0x10, 0x0c, 0xf4, 0x1a, 0x8b, 0x54, 0x45, 0x00, 0x8b, 0x45, 0x30, 0x29, 0x80, 0x10, 0x0c, 
+    0x32, 0x4b, 0x4b, 0x4b, 0x2c, 0x10, 0x0c, 0x1a, 0x3b, 0x45, 0xf4, 0x8b, 0x2a, 0xd2, 0x2a, 0x54, 
+    0x35, 0x85, 0x80, 0x10, 0x0c, 0x24, 0x3d, 0x8a, 0x7a, 0x10, 
+};
+
+static const uint16_t mf_rlefont_phpoXxi1Y_glyph_offsets_0[95] = {
+    0x0000, 0x0003, 0x000a, 0x0013, 0x0026, 0x0034, 0x0041, 0x0051, 
+    0x0056, 0x0061, 0x006d, 0x007c, 0x0083, 0x008b, 0x0091, 0x0097, 
+    0x009f, 0x00ac, 0x00b3, 0x00bd, 0x00c7, 0x00d0, 0x00db, 0x00e7, 
+    0x00f2, 0x00fa, 0x0106, 0x010c, 0x0116, 0x0121, 0x0128, 0x0133, 
+    0x013c, 0x014b, 0x0156, 0x015f, 0x0167, 0x016f, 0x0176, 0x017b, 
+    0x0188, 0x0190, 0x0198, 0x019e, 0x01af, 0x01b8, 0x01c8, 0x01d9, 
+    0x01e0, 0x01e8, 0x01f4, 0x01fd, 0x0206, 0x020d, 0x0215, 0x021c, 
+    0x022d, 0x0238, 0x0241, 0x024e, 0x0259, 0x0265, 0x0271, 0x0279, 
+    0x0280, 0x0287, 0x0290, 0x0298, 0x02a1, 0x02ac, 0x02b6, 0x02c3, 
+    0x02cd, 0x02d4, 0x02de, 0x02ed, 0x02fd, 0x0305, 0x0313, 0x031a, 
+    0x0321, 0x0329, 0x0334, 0x033d, 0x0349, 0x0352, 0x035b, 0x0361, 
+    0x036e, 0x037d, 0x0388, 0x0392, 0x039f, 0x03a6, 0x03b4, 
+};
+
+static const struct mf_rlefont_char_range_s mf_rlefont_phpoXxi1Y_char_ranges[] = {
+    {32, 95, mf_rlefont_phpoXxi1Y_glyph_offsets_0, mf_rlefont_phpoXxi1Y_glyph_data_0},
+};
+
+const struct mf_rlefont_s mf_rlefont_phpoXxi1Y = {
+    {
+    "Apple ][ Regular 12",
+    "phpoXxi1Y",
+    12, /* width */
+    15, /* height */
+    11, /* min x advance */
+    14, /* max x advance */
+    0, /* baseline x */
+    12, /* baseline y */
+    14, /* line height */
+    2, /* flags */
+    63, /* fallback character */
+    &mf_rlefont_character_width,
+    &mf_rlefont_render_character,
+    },
+    4, /* version */
+    mf_rlefont_phpoXxi1Y_dictionary_data,
+    mf_rlefont_phpoXxi1Y_dictionary_offsets,
+    38, /* rle dict count */
+    75, /* total dict count */
+    1, /* char range count */
+    mf_rlefont_phpoXxi1Y_char_ranges,
+};
+
+#ifdef MF_INCLUDED_FONTS
+/* List entry for searching fonts by name. */
+static const struct mf_font_list_s mf_rlefont_phpoXxi1Y_listentry = {
+    MF_INCLUDED_FONTS,
+    (struct mf_font_s*)&mf_rlefont_phpoXxi1Y
+};
+#undef MF_INCLUDED_FONTS
+#define MF_INCLUDED_FONTS (&mf_rlefont_phpoXxi1Y_listentry)
+#endif
+
+
+/* End of automatically generated font definition for phpoXxi1Y. */
+