gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testime: use a replacement character for characters not in the font

Browse Source
This commit is contained in:
Sam Lantinga
2024-06-26 20:23:58 -07:00
parent a67e6b80de
commit 938c974cca
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/testime.c
View File

@@ -52,6 +52,7 @@ static TTF_Font *font;
#else #else
#define UNIFONT_MAX_CODEPOINT 0x1ffff #define UNIFONT_MAX_CODEPOINT 0x1ffff
#define UNIFONT_NUM_GLYPHS 0x20000 #define UNIFONT_NUM_GLYPHS 0x20000
#define UNIFONT_REPLACEMENT 0xFFFD
/* Using 512x512 textures that are supported everywhere. */ /* Using 512x512 textures that are supported everywhere. */
#define UNIFONT_TEXTURE_WIDTH 512 #define UNIFONT_TEXTURE_WIDTH 512
#define UNIFONT_GLYPHS_IN_ROW (UNIFONT_TEXTURE_WIDTH / 16) #define UNIFONT_GLYPHS_IN_ROW (UNIFONT_TEXTURE_WIDTH / 16)
@@ -228,8 +229,7 @@ static int unifont_init(const char *fontname)
return 0; return 0;
} }
static void static void unifont_make_rgba(const Uint8 *src, Uint8 *dst, Uint8 width)
unifont_make_rgba(const Uint8 *src, Uint8 *dst, Uint8 width)
{ {
int i, j; int i, j;
Uint8 *row = dst; Uint8 *row = dst;
@@ -313,12 +313,16 @@ static int unifont_load_texture(Uint32 textureID)
static Sint32 unifont_draw_glyph(Uint32 codepoint, int rendererID, SDL_FRect *dst) static Sint32 unifont_draw_glyph(Uint32 codepoint, int rendererID, SDL_FRect *dst)
{ {
SDL_Texture *texture; SDL_Texture *texture;
const Uint32 textureID = codepoint / UNIFONT_GLYPHS_IN_TEXTURE; Uint32 textureID;
SDL_FRect srcrect; SDL_FRect srcrect;
srcrect.w = srcrect.h = 16.0f; srcrect.w = srcrect.h = 16.0f;
if (codepoint > UNIFONT_MAX_CODEPOINT) {
return 0; if (codepoint > UNIFONT_MAX_CODEPOINT ||
unifontGlyph[codepoint].width == 0) {
codepoint = UNIFONT_REPLACEMENT;
} }
textureID = codepoint / UNIFONT_GLYPHS_IN_TEXTURE;
if (!unifontTextureLoaded[textureID]) { if (!unifontTextureLoaded[textureID]) {
if (unifont_load_texture(textureID) < 0) { if (unifont_load_texture(textureID) < 0) {
return 0; return 0;