Skip to content

Commit

Permalink
[Painter] Use mono spaced font for keylogger
Browse files Browse the repository at this point in the history
  • Loading branch information
@drashna
drashna committed Aug 2, 2024
1 parent c1f7dc3 commit 115ffc1
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 7 deletions.
2 changes: 1 addition & 1 deletion users/drashna/display/display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void keyboard_post_init_display_driver(void);

#ifdef KEYLOGGER_ENABLE
# ifndef QP_KEYLOGGER_LENGTH
# define QP_KEYLOGGER_LENGTH 29
# define QP_KEYLOGGER_LENGTH 20
# endif
extern char qp_keylog_str[QP_KEYLOGGER_LENGTH];
extern bool keylogger_has_changed;
Expand Down
67 changes: 67 additions & 0 deletions users/drashna/display/painter/fonts.qff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,70 @@ const uint8_t font_thintel15[966] = {
0x94, 0x52, 0x72, 0x28, 0x19, 0x00, 0x70, 0x24, 0x71, 0x00, 0x00, 0x4C, 0x08, 0x11, 0x84, 0x10, 0x0C, 0x00, 0x55,
0x55, 0x01, 0x83, 0x10, 0x82, 0x08, 0x21, 0x03, 0x00, 0x00, 0x00, 0xB0, 0x1A, 0x00, 0x00, 0x00,
};

const uint32_t font_unifont_ex_mono_12_length = 1186;
const uint8_t font_unifont_ex_mono_12[1186] = {
0x00, 0xFF, 0x14, 0x00, 0x00, 0x51, 0x46, 0x46, 0x01, 0xA2, 0x04, 0x00, 0x00, 0x5D, 0xFB, 0xFF, 0xFF, 0x0B, 0x01,
0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0xFE, 0x1D, 0x01, 0x00, 0x06, 0x00, 0x00, 0x46, 0x02, 0x00, 0x86, 0x04,
0x00, 0xC7, 0x06, 0x00, 0x46, 0x09, 0x00, 0x87, 0x0B, 0x00, 0x07, 0x0E, 0x00, 0x86, 0x10, 0x00, 0xC6, 0x12, 0x00,
0x06, 0x15, 0x00, 0x47, 0x17, 0x00, 0xC7, 0x19, 0x00, 0x46, 0x1C, 0x00, 0x86, 0x1E, 0x00, 0xC6, 0x20, 0x00, 0x06,
0x23, 0x00, 0x46, 0x25, 0x00, 0x86, 0x27, 0x00, 0xC6, 0x29, 0x00, 0x06, 0x2C, 0x00, 0x46, 0x2E, 0x00, 0x86, 0x30,
0x00, 0xC6, 0x32, 0x00, 0x06, 0x35, 0x00, 0x46, 0x37, 0x00, 0x86, 0x39, 0x00, 0xC6, 0x3B, 0x00, 0x06, 0x3E, 0x00,
0x46, 0x40, 0x00, 0x86, 0x42, 0x00, 0xC6, 0x44, 0x00, 0x06, 0x47, 0x00, 0x46, 0x49, 0x00, 0x86, 0x4B, 0x00, 0xC6,
0x4D, 0x00, 0x06, 0x50, 0x00, 0x46, 0x52, 0x00, 0x86, 0x54, 0x00, 0xC6, 0x56, 0x00, 0x06, 0x59, 0x00, 0x46, 0x5B,
0x00, 0x86, 0x5D, 0x00, 0xC7, 0x5F, 0x00, 0x46, 0x62, 0x00, 0x86, 0x64, 0x00, 0xC6, 0x66, 0x00, 0x06, 0x69, 0x00,
0x46, 0x6B, 0x00, 0x86, 0x6D, 0x00, 0xC7, 0x6F, 0x00, 0x46, 0x72, 0x00, 0x86, 0x74, 0x00, 0xC7, 0x76, 0x00, 0x46,
0x79, 0x00, 0x87, 0x7B, 0x00, 0x06, 0x7E, 0x00, 0x46, 0x80, 0x00, 0x87, 0x82, 0x00, 0x06, 0x85, 0x00, 0x46, 0x87,
0x00, 0x86, 0x89, 0x00, 0xC6, 0x8B, 0x00, 0x06, 0x8E, 0x00, 0x46, 0x90, 0x00, 0x86, 0x92, 0x00, 0xC6, 0x94, 0x00,
0x06, 0x97, 0x00, 0x46, 0x99, 0x00, 0x86, 0x9B, 0x00, 0xC6, 0x9D, 0x00, 0x06, 0xA0, 0x00, 0x46, 0xA2, 0x00, 0x86,
0xA4, 0x00, 0xC6, 0xA6, 0x00, 0x06, 0xA9, 0x00, 0x46, 0xAB, 0x00, 0x86, 0xAD, 0x00, 0xC6, 0xAF, 0x00, 0x06, 0xB2,
0x00, 0x46, 0xB4, 0x00, 0x86, 0xB6, 0x00, 0xC6, 0xB8, 0x00, 0x06, 0xBB, 0x00, 0x46, 0xBD, 0x00, 0x86, 0xBF, 0x00,
0xC6, 0xC1, 0x00, 0x06, 0xC4, 0x00, 0x46, 0xC6, 0x00, 0x86, 0xC8, 0x00, 0xC6, 0xCA, 0x00, 0x06, 0xCD, 0x00, 0x46,
0xCF, 0x00, 0x86, 0xD1, 0x00, 0xC6, 0xD3, 0x00, 0x07, 0xD6, 0x00, 0x04, 0xFB, 0x62, 0x03, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x08, 0x02, 0x00, 0x00, 0x02, 0x00, 0x80, 0x24, 0x49, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xE2, 0x61, 0x30, 0x3C, 0x0A, 0x05, 0x00, 0x00, 0x80, 0x70, 0x2A,
0x83, 0x61, 0x3E, 0x02, 0x00, 0x00, 0x00, 0x49, 0x05, 0xA1, 0x20, 0x28, 0x2C, 0x09, 0x00, 0x00, 0x00, 0x86, 0x04,
0xC0, 0xB0, 0x64, 0x32, 0x16, 0x00, 0x00, 0x82, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x11, 0x04,
0x41, 0x10, 0x04, 0x02, 0x01, 0x00, 0x60, 0x00, 0x08, 0x82, 0x20, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x20, 0x52,
0x71, 0x54, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF0, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x0C, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x42, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x50, 0xA2, 0xAE, 0x9A,
0x14, 0x02, 0x00, 0x00, 0x80, 0x30, 0x0A, 0x82, 0x20, 0x88, 0x0F, 0x00, 0x00, 0xC0, 0x89, 0x20, 0x86, 0x10, 0x82,
0x0F, 0x00, 0x00, 0xC0, 0x89, 0x20, 0x06, 0x82, 0x22, 0x07, 0x00, 0x00, 0x00, 0x61, 0x94, 0x25, 0xF9, 0x10, 0x04,
0x00, 0x00, 0xE0, 0x0B, 0x82, 0x07, 0x82, 0x22, 0x07, 0x00, 0x00, 0x80, 0x11, 0x82, 0x2F, 0x8A, 0x02, 0x07, 0x00,
0x00, 0xE0, 0x83, 0x20, 0x04, 0x21, 0x08, 0x02, 0x00, 0x00, 0xC0, 0x89, 0x22, 0x27, 0x8A, 0x22, 0x07, 0x00, 0x00,
0xC0, 0x01, 0x22, 0x0F, 0x82, 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x0C, 0x00, 0x00, 0x0C, 0x42, 0x00, 0x00, 0x00, 0x40, 0x10, 0x23, 0x10, 0x18, 0x04, 0x00, 0x00, 0x00, 0x00,
0x80, 0x07, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 0x03, 0x21, 0x86, 0x00, 0x00, 0x00, 0xC0, 0x89, 0x20,
0x84, 0x00, 0x00, 0x02, 0x00, 0x00, 0xC0, 0x81, 0xAA, 0x6D, 0x9A, 0x3A, 0x0F, 0x00, 0x00, 0x80, 0x50, 0x00, 0xE0,
0x8B, 0xA2, 0x08, 0x00, 0x00, 0xE0, 0x89, 0xA2, 0x27, 0x8A, 0xA2, 0x07, 0x00, 0x00, 0xC0, 0x89, 0x82, 0x20, 0x08,
0x22, 0x07, 0x00, 0x00, 0xE0, 0x48, 0xA2, 0x28, 0x8A, 0x92, 0x03, 0x00, 0x00, 0xE0, 0x0B, 0x82, 0x27, 0x08, 0x82,
0x0F, 0x00, 0x00, 0xE0, 0x0B, 0x82, 0x27, 0x08, 0x82, 0x00, 0x00, 0x00, 0xC0, 0x89, 0x82, 0xA0, 0x8B, 0x32, 0x0B,
0x00, 0x00, 0x20, 0x8A, 0xA2, 0x2F, 0x8A, 0xA2, 0x08, 0x00, 0x00, 0xE0, 0x23, 0x08, 0x82, 0x20, 0x88, 0x0F, 0x00,
0x00, 0x00, 0x1E, 0x02, 0x81, 0x40, 0x20, 0x12, 0x06, 0x00, 0x00, 0x20, 0x4A, 0x8A, 0x62, 0x28, 0x9A, 0x08, 0x00,
0x00, 0x20, 0x08, 0x82, 0x20, 0x08, 0x82, 0x0F, 0x00, 0x00, 0x20, 0x8A, 0xB6, 0xA9, 0x8A, 0xA2, 0x08, 0x00, 0x00,
0x20, 0x9A, 0xA6, 0xA9, 0xAA, 0xB2, 0x08, 0x00, 0x00, 0xC0, 0x89, 0xA2, 0x28, 0x8A, 0x22, 0x07, 0x00, 0x00, 0xE0,
0x89, 0xA2, 0x27, 0x08, 0x82, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x12, 0x89, 0x44, 0x3E, 0x0E, 0x18, 0x00, 0xE0,
0x89, 0xA2, 0xA7, 0x48, 0x92, 0x08, 0x00, 0x00, 0xC0, 0x89, 0x02, 0x83, 0x81, 0x22, 0x07, 0x00, 0x00, 0x80, 0x0F,
0x81, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, 0x20, 0x8A, 0xA2, 0x28, 0x8A, 0x22, 0x07, 0x00, 0x00, 0x80, 0x48,
0x04, 0x20, 0x91, 0x28, 0x00, 0x04, 0x00, 0x00, 0x20, 0x8A, 0xA2, 0xA8, 0xDA, 0xA2, 0x08, 0x00, 0x00, 0x20, 0x02,
0x14, 0x80, 0x50, 0x80, 0x08, 0x00, 0x00, 0x80, 0x08, 0x40, 0x82, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, 0xE0, 0x83,
0x20, 0x86, 0x10, 0x82, 0x0F, 0x00, 0x00, 0x80, 0x23, 0x08, 0x82, 0x20, 0x08, 0x82, 0x03, 0x00, 0x20, 0x00, 0x00,
0x81, 0x00, 0x10, 0x08, 0x00, 0x00, 0x70, 0x10, 0x04, 0x41, 0x10, 0x04, 0x71, 0x00, 0x9E, 0x04, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x03, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xC8, 0x8B, 0x32, 0x0B, 0x00, 0x00, 0x20, 0x08, 0x9A, 0x29, 0x8A, 0xA6,
0x06, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x28, 0x08, 0x22, 0x07, 0x00, 0x00, 0x00, 0x82, 0xAC, 0x2C, 0x8A, 0x32, 0x0B,
0x00, 0x00, 0x00, 0x70, 0xA2, 0x2F, 0x88, 0x1C, 0x00, 0x00, 0x00, 0xC0, 0x11, 0xC4, 0x47, 0x10, 0x04, 0x01, 0x00,
0x00, 0xE0, 0x4B, 0x0C, 0xC1, 0x89, 0x1C, 0x00, 0x00, 0x00, 0x20, 0x08, 0x9A, 0x60, 0x8A, 0xA2, 0x08, 0x00, 0x00,
0x80, 0x00, 0x0C, 0x82, 0x20, 0x88, 0x0F, 0x00, 0x00, 0x00, 0x01, 0x18, 0x04, 0x41, 0x90, 0x46, 0x00, 0x00, 0x20,
0x08, 0x92, 0x62, 0x28, 0x9A, 0x08, 0x00, 0x00, 0xC0, 0x20, 0x08, 0x82, 0x20, 0x88, 0x0F, 0x00, 0x00, 0x00, 0x00,
0x96, 0xA1, 0xAA, 0xAA, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x60, 0x8A, 0xA2, 0x08, 0x00, 0x00, 0x00, 0x00, 0x9C,
0x28, 0x8A, 0x22, 0x07, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x28, 0x8A, 0xA6, 0x26, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x28,
0x8A, 0x32, 0x0B, 0x02, 0x00, 0x00, 0x00, 0x9A, 0x29, 0x08, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xC8, 0x60,
0x22, 0x07, 0x00, 0x00, 0x40, 0x10, 0xC4, 0x47, 0x10, 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x28, 0xCA, 0x20,
0x0B, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x48, 0x51, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0x08, 0x05,
0x00, 0x00, 0x00, 0x00, 0x22, 0x85, 0x00, 0x94, 0x08, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x28, 0xDA, 0x28, 0xC8, 0x03,
0x00, 0x00, 0x00, 0x3E, 0x8C, 0x10, 0x86, 0x0F, 0x00, 0x00, 0xC0, 0x11, 0x08, 0x61, 0x20, 0x04, 0x81, 0x01, 0x00,
0x82, 0x20, 0x08, 0x82, 0x20, 0x08, 0x82, 0x00, 0x00, 0xE0, 0x00, 0x04, 0x82, 0x11, 0x04, 0x62, 0x00, 0x00, 0x97,
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
2 changes: 2 additions & 0 deletions users/drashna/display/painter/fonts.qff.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ extern const uint32_t font_ubuntu_mono_12_font_length;
extern const uint8_t font_ubuntu_mono_12_font[2650];
extern const uint32_t font_thintel15_length;
extern const uint8_t font_thintel15[966];
extern const uint32_t font_unifont_ex_mono_12_length;
extern const uint8_t font_unifont_ex_mono_12[1186];
13 changes: 7 additions & 6 deletions users/drashna/display/painter/ili9341_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <ctype.h>

painter_device_t ili9341_display;
painter_font_handle_t font;
painter_font_handle_t font, font_mono;

static painter_image_handle_t frame;
static painter_image_handle_t lock_caps_on;
Expand Down Expand Up @@ -462,13 +462,13 @@ void draw_ui_user(void) {
#endif // AUTOCORRECT_ENABLE

#ifdef KEYLOGGER_ENABLE // keep at very end
ypos = height - (font->line_height + 2);
ypos = height - (font_mono->line_height + 2);
if (keylogger_has_changed) {
static int max_klog_xpos = 0;
xpos = 25;
xpos = 27;
snprintf(buf, sizeof(buf), "Keylogger: %s", qp_keylog_str);

xpos += qp_drawtext_recolor(ili9341_display, xpos, ypos, font, buf, 0, 255, 0, 0, 0, 255);
xpos += qp_drawtext_recolor(ili9341_display, xpos, ypos, font_mono, buf, 0, 255, 0, 0, 0, 255);

if (max_klog_xpos < xpos) {
max_klog_xpos = xpos;
Expand All @@ -486,8 +486,9 @@ void housekeeping_task_quantum_painter(void) {
}

void keyboard_post_init_quantum_painter(void) {
font = qp_load_font_mem(font_thintel15);
frame = qp_load_image_mem(gfx_frame);
font = qp_load_font_mem(font_thintel15);
font_mono = qp_load_font_mem(font_unifont_ex_mono_12);
frame = qp_load_image_mem(gfx_frame);

// ters1 = qp_load_image_mem(gfx_ters1);
lock_caps_on = qp_load_image_mem(gfx_lock_caps_ON);
Expand Down

0 comments on commit 115ffc1

Please sign in to comment.