joppe/picopal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better font rendering and start of z80 access

Browse Source
This commit is contained in:
Joppe Blondel
2026-08-30 11:59:05 +02:00
parent 793c816148
commit 073a538794
28 changed files with 2960 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
text_mode.c
View File

@@ -4,14 +4,39 @@
#include <string.h>
#include "pico/stdlib.h"
#include "font.xbm"
#include "font/ucs_6x13.xbm"
static void clear(video_framebuffer_t fb){
#if TEXT_INVERT_COLOURS
memset(fb, 0xff, sizeof(video_framebuffer_t));
#else
memset(fb, 0, sizeof(video_framebuffer_t));
#endif
}
#define CHAR_WIDTH font_width / 16
#define CHAR_HEIGHT font_height / 16
#define SOURCE_GLYPH_WIDTH (font_width / 16)
#define SOURCE_GLYPH_HEIGHT (font_height / 16)
#define GLYPH_CROP_LEFT (GLYPH_PADDING_X / 2)
#define GLYPH_CROP_RIGHT (GLYPH_PADDING_X - GLYPH_CROP_LEFT)
#define GLYPH_CROP_TOP (GLYPH_PADDING_Y / 2)
#define CHAR_WIDTH (SOURCE_GLYPH_WIDTH - GLYPH_PADDING_X)
#define CHAR_HEIGHT (SOURCE_GLYPH_HEIGHT - GLYPH_PADDING_Y)
#define TEXT_MODE_WIDTH \
(((CHARS_PER_LINE - 1) * (CHAR_WIDTH + 1) + CHAR_WIDTH) * CHAR_SCALE)
#define TEXT_MODE_HEIGHT \
(((CHAR_LINES - 1) * (CHAR_HEIGHT + 1) + CHAR_HEIGHT) * CHAR_SCALE)
_Static_assert(CHAR_SCALE > 0, "CHAR_SCALE must be at least 1");
_Static_assert(GLYPH_PADDING_X >= 0 && GLYPH_PADDING_X < SOURCE_GLYPH_WIDTH,
"GLYPH_PADDING_X must leave at least one glyph pixel");
_Static_assert(GLYPH_PADDING_Y >= 0 && GLYPH_PADDING_Y < SOURCE_GLYPH_HEIGHT,
"GLYPH_PADDING_Y must leave at least one glyph pixel");
_Static_assert(TEXT_MARGIN_LEFT >= 0 && TEXT_MARGIN_TOP >= 0,
"text margins cannot be negative");
_Static_assert(TEXT_MARGIN_LEFT + TEXT_MODE_WIDTH <= VIDEO_WIDTH,
"left margin, CHAR_SCALE, and CHARS_PER_LINE do not fit");
_Static_assert(TEXT_MARGIN_TOP + TEXT_MODE_HEIGHT <= VIDEO_HEIGHT,
"top margin, CHAR_SCALE, and CHAR_LINES do not fit");
static uint16_t glyph_rows[256][CHAR_HEIGHT];
static uint32_t glyph_rows_x2[256][CHAR_HEIGHT];
@@ -20,15 +45,15 @@ void init_font_cache() {
for (int ch = 0; ch < 256; ++ch) {
uint8_t row = ch / 16;
uint8_t column = ch % 16;
uint32_t font_x = column * CHAR_WIDTH;
uint32_t font_y = row * CHAR_HEIGHT;
uint32_t font_x = column * SOURCE_GLYPH_WIDTH;
uint32_t font_y = row * SOURCE_GLYPH_HEIGHT;
for (int j = 0; j < CHAR_HEIGHT; ++j) {
uint16_t packed = 0;
for (int i = 0; i < CHAR_WIDTH; ++i) {
for (int i = 0; i < SOURCE_GLYPH_WIDTH; ++i) {
uint32_t src_x = font_x + i;
uint32_t src_y = font_y + j;
uint32_t src_y = font_y + j + GLYPH_CROP_TOP;
uint32_t array_position;
if ((font_width % 8) != 0) {
@@ -42,10 +67,12 @@ void init_font_cache() {
uint8_t value = (font_bits[array_index] >> byte_position) & 1u;
if (!value) {
packed |= (uint16_t)(1u << (CHAR_WIDTH - 1 - i));
packed |= (uint16_t)(1u << (SOURCE_GLYPH_WIDTH - 1 - i));
}
}
packed = (uint16_t)((packed >> GLYPH_CROP_RIGHT) &
((1u << CHAR_WIDTH) - 1u));
glyph_rows[ch][j] = packed;
uint32_t packed_x2 = 0;
@@ -73,9 +100,17 @@ static inline void blit_row_bits(video_framebuffer_t fb, unsigned int x, unsigne
uint word = x >> 5;
uint shift = x & 31u;
uint64_t aligned = bits << (64u - width - shift);
#if TEXT_INVERT_COLOURS
fb[y][word] &= ~((uint32_t)(aligned >> 32));
#else
fb[y][word] |= (uint32_t)(aligned >> 32);
#endif
if (shift + width > 32u && word + 1u < WORDS_PER_LINE) {
#if TEXT_INVERT_COLOURS
fb[y][word + 1u] &= ~((uint32_t)aligned);
#else
fb[y][word + 1u] |= (uint32_t)aligned;
#endif
}
}
@@ -111,7 +146,11 @@ void draw_character(video_framebuffer_t fb, unsigned int x, unsigned int y, unsi
if (px < VIDEO_WIDTH && py < VIDEO_HEIGHT) {
uint word = px >> 5;
uint bit = 31u - (px & 31u);
#if TEXT_INVERT_COLOURS
fb[py][word] &= ~(1u << bit);
#else
fb[py][word] |= (1u << bit);
#endif
}
}
}
@@ -122,9 +161,13 @@ void draw_character(video_framebuffer_t fb, unsigned int x, unsigned int y, unsi
void draw_text_mode(video_framebuffer_t fb, text_mode_buffer_t buffer){
clear(fb);
for(int y=0; y<20; y++){
for(int x=0; x<32; x++){
draw_character(fb, START_X+x*(CHAR_WIDTH+1)*2, START_Y+y*(CHAR_HEIGHT+1)*2, 2, buffer[y][x]);
for(int y=0; y<CHAR_LINES; y++){
for(int x=0; x<CHARS_PER_LINE; x++){
draw_character(fb,
TEXT_MARGIN_LEFT + x * (CHAR_WIDTH + 1) * CHAR_SCALE,
TEXT_MARGIN_TOP + y * (CHAR_HEIGHT + 1) * CHAR_SCALE,
CHAR_SCALE,
buffer[y][x]);
}
}
video_set_framebuffer(fb);