walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Merge pull request #646 from adamharrison/expand-renderer-for-emojis 

Expand glyphsets to accomodate emojis.
This commit is contained in:
Adam 2021-11-02 12:41:40 -04:00 committed by GitHub
parent faea2a7f91 90714c48e1
commit dd9fc72fbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer.c
View File

@ -11,6 +11,7 @@
#include "renwindow.h" #include "renwindow.h"
#define MAX_GLYPHSET 256 #define MAX_GLYPHSET 256
#define MAX_LOADABLE_GLYPHSETS 1024
#define SUBPIXEL_BITMAPS_CACHED 3 #define SUBPIXEL_BITMAPS_CACHED 3
static RenWindow window_renderer = {0}; static RenWindow window_renderer = {0};
@ -34,12 +35,12 @@ typedef struct {
typedef struct { typedef struct {
SDL_Surface* surface; SDL_Surface* surface;
GlyphMetric metrics[256]; GlyphMetric metrics[MAX_GLYPHSET];
} GlyphSet; } GlyphSet;
typedef struct RenFont { typedef struct RenFont {
FT_Face face; FT_Face face;
GlyphSet* sets[SUBPIXEL_BITMAPS_CACHED][MAX_GLYPHSET]; GlyphSet* sets[SUBPIXEL_BITMAPS_CACHED][MAX_LOADABLE_GLYPHSETS];
float size, space_advance, tab_advance; float size, space_advance, tab_advance;
short max_height; short max_height;
bool subpixel; bool subpixel;
@ -110,7 +111,7 @@ static void font_load_glyphset(RenFont* font, int idx) {
for (int j = 0, pen_x = 0; j < bitmaps_cached; ++j) { for (int j = 0, pen_x = 0; j < bitmaps_cached; ++j) {
GlyphSet* set = check_alloc(calloc(1, sizeof(GlyphSet))); GlyphSet* set = check_alloc(calloc(1, sizeof(GlyphSet)));
font->sets[j][idx] = set; font->sets[j][idx] = set;
for (int i = 0; i < 256; ++i) { for (int i = 0; i < MAX_GLYPHSET; ++i) {
int glyph_index = FT_Get_Char_Index(font->face, i + idx * MAX_GLYPHSET); int glyph_index = FT_Get_Char_Index(font->face, i + idx * MAX_GLYPHSET);
if (!glyph_index || FT_Load_Glyph(font->face, glyph_index, load_option | FT_LOAD_BITMAP_METRICS_ONLY) || font_set_style(&font->face->glyph->outline, j * (64 / SUBPIXEL_BITMAPS_CACHED), font->style) || FT_Render_Glyph(font->face->glyph, render_option)) if (!glyph_index || FT_Load_Glyph(font->face, glyph_index, load_option | FT_LOAD_BITMAP_METRICS_ONLY) || font_set_style(&font->face->glyph->outline, j * (64 / SUBPIXEL_BITMAPS_CACHED), font->style) || FT_Render_Glyph(font->face->glyph, render_option))
continue; continue;
@ -124,7 +125,7 @@ static void font_load_glyphset(RenFont* font, int idx) {
continue; continue;
set->surface = check_alloc(SDL_CreateRGBSurface(0, pen_x, font->max_height, font->subpixel ? 24 : 8, 0, 0, 0, 0)); set->surface = check_alloc(SDL_CreateRGBSurface(0, pen_x, font->max_height, font->subpixel ? 24 : 8, 0, 0, 0, 0));
unsigned char* pixels = set->surface->pixels; unsigned char* pixels = set->surface->pixels;
for (int i = 0; i < 256; ++i) { for (int i = 0; i < MAX_GLYPHSET; ++i) {
int glyph_index = FT_Get_Char_Index(font->face, i + idx * MAX_GLYPHSET); int glyph_index = FT_Get_Char_Index(font->face, i + idx * MAX_GLYPHSET);
if (!glyph_index || FT_Load_Glyph(font->face, glyph_index, load_option)) if (!glyph_index || FT_Load_Glyph(font->face, glyph_index, load_option))
continue; continue;
@ -142,7 +143,7 @@ static void font_load_glyphset(RenFont* font, int idx) {
} }
static GlyphSet* font_get_glyphset(RenFont* font, unsigned int codepoint, int subpixel_idx) { static GlyphSet* font_get_glyphset(RenFont* font, unsigned int codepoint, int subpixel_idx) {
int idx = (codepoint >> 8) % MAX_GLYPHSET; int idx = (codepoint >> 8) % MAX_LOADABLE_GLYPHSETS;
if (!font->sets[font->subpixel ? subpixel_idx : 0][idx]) if (!font->sets[font->subpixel ? subpixel_idx : 0][idx])
font_load_glyphset(font, idx); font_load_glyphset(font, idx);
return font->sets[font->subpixel ? subpixel_idx : 0][idx]; return font->sets[font->subpixel ? subpixel_idx : 0][idx];