Maybe gif-lib wasn't too bright an idea...
This commit is contained in:
parent
9ef5c135e8
commit
d27f9ecf7e
199 changed files with 481 additions and 2434004 deletions
123
host/main.c
123
host/main.c
|
|
@ -1,4 +1,5 @@
|
|||
|
||||
#include "main.h"
|
||||
#include "font.h"
|
||||
#include "color.h"
|
||||
#include <stdint.h>
|
||||
|
|
@ -11,17 +12,17 @@
|
|||
#include <sys/timeb.h>
|
||||
#include <unistd.h>
|
||||
|
||||
// CAUTION: REQUIRES INPUT TO BE \0-TERMINATED
|
||||
// ...also, it does a hardcodes setlocale of LC_CTYPE to en_US.utf8 for... reasons.
|
||||
int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size){
|
||||
/* CAUTION: REQUIRES INPUT TO BE \0-TERMINATED
|
||||
* ...also, it does a hardcodes setlocale of LC_CTYPE to en_US.utf8 for... reasons. */
|
||||
color_t * framebuffer_render_text(char *s, glyph_t **glyph_table, unsigned int glyph_table_size){
|
||||
unsigned int len = strlen(s);
|
||||
|
||||
uint8_t *gbuf = NULL;
|
||||
color_t *gbuf = NULL;
|
||||
unsigned int gbufwidth = 0;
|
||||
unsigned int gbufheight = 0;
|
||||
char *p = s;
|
||||
|
||||
// Calculate screen width of string prior to allocating memory for the frame buffer
|
||||
/* Calculate screen width of string prior to allocating memory for the frame buffer */
|
||||
wchar_t c;
|
||||
mbstate_t ps = {0};
|
||||
memset(&ps, 0, sizeof(mbstate_t));
|
||||
|
|
@ -32,7 +33,7 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
for(;;){
|
||||
while(*p == '\033'){
|
||||
p++;
|
||||
// Jump over escape sequences
|
||||
/* Jump over escape sequences */
|
||||
for(;;p++){
|
||||
if(!(*p == ';' || *p == '[' || ('0' <= *p && *p <= '9'))){
|
||||
p++;
|
||||
|
|
@ -42,12 +43,12 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
memset(&ps, 0, sizeof(mbstate_t));
|
||||
}
|
||||
|
||||
size_t inc = mbrtowc(&c, p, MB_CUR_MAX, &ps); // MB_CUR_MAX is safe since p is \0-terminated
|
||||
size_t inc = mbrtowc(&c, p, MB_CUR_MAX, &ps); /* MB_CUR_MAX is safe since p is \0-terminated */
|
||||
if(inc == -1 || inc == -2){
|
||||
fprintf(stderr, "Error rendering string: No valid UTF-8 input.\n");
|
||||
goto error;
|
||||
}
|
||||
if(inc == 0) // Reached end of string
|
||||
if(inc == 0) /* Reached end of string */
|
||||
break;
|
||||
p += inc;
|
||||
|
||||
|
|
@ -67,17 +68,16 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
|
||||
gbufwidth += g->width;
|
||||
}
|
||||
// For easier rendering on the terminal, round up to multiples of two
|
||||
/* For easier rendering on the terminal, round up to multiples of two */
|
||||
gbufheight += gbufheight&1;
|
||||
|
||||
// gbuf uses 3 bytes per color for r, g and b
|
||||
unsigned int gbufsize = gbufwidth*3*gbufheight;
|
||||
gbuf = malloc(gbufsize);
|
||||
unsigned int gbufsize = gbufwidth*gbufheight;
|
||||
gbuf = malloc(gbufsize, sizeof(color_t));
|
||||
if(gbuf == 0){
|
||||
fprintf(stderr, "Cannot malloc() %d bytes.\n", gbufsize);
|
||||
fprintf(stderr, "Cannot malloc() %d bytes.\n", gbufsize*sizeof(color_t));
|
||||
goto error;
|
||||
}
|
||||
memset(gbuf, 0, gbufsize);
|
||||
memset(gbuf, 0, gbufsize*sizeof(color_t));
|
||||
|
||||
unsigned int x = 0;
|
||||
p = s;
|
||||
|
|
@ -86,21 +86,21 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
color_t fg;
|
||||
color_t bg;
|
||||
unsigned int blink:4;
|
||||
unsigned int bold:1; // TODO
|
||||
unsigned int bold:1; /* TODO */
|
||||
unsigned int underline:1;
|
||||
unsigned int strikethrough:1;
|
||||
unsigned int fraktur:1; // TODO See: Flat10 Fraktur font
|
||||
unsigned int fraktur:1; /* TODO See: Flat10 Fraktur font */
|
||||
unsigned int invert:1;
|
||||
} style = {
|
||||
colortable[DEFAULT_FG_COLOR], colortable[DEFAULT_BG_COLOR], 0, 0, 0, 0, 0, 0
|
||||
};
|
||||
// Render glyphs (now with escape sequence rendering!)
|
||||
/* Render glyphs (now with escape sequence rendering!) */
|
||||
for(;;){
|
||||
// NOTE: This nested escape sequence parsing does not contain any unicode-awareness whatsoever
|
||||
if(*p == '\033'){ // Escape sequence YAY
|
||||
/* NOTE: This nested escape sequence parsing does not contain any unicode-awareness whatsoever */
|
||||
if(*p == '\033'){ /* Escape sequence YAY */
|
||||
char *sequence_start = ++p;
|
||||
if(*p == '['){ // This was a CSI!
|
||||
// Disassemble the list of numbers, only accept SGR sequences (those ending with 'm')
|
||||
if(*p == '['){ /* This was a CSI! */
|
||||
/* Disassemble the list of numbers, only accept SGR sequences (those ending with 'm') */
|
||||
long elems[MAX_CSI_ELEMENTS];
|
||||
int nelems;
|
||||
for(nelems = 0; nelems<MAX_CSI_ELEMENTS; nelems++){
|
||||
|
|
@ -119,17 +119,17 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
goto error;
|
||||
}
|
||||
}
|
||||
p++; // gobble up trailing 'm' of "\033[23;42m"
|
||||
p++; /* gobble up trailing 'm' of "\033[23;42m" */
|
||||
nelems++;
|
||||
// By now we know it's a SGR since we error'ed out on anything else
|
||||
/* By now we know it's a SGR since we error'ed out on anything else */
|
||||
if(nelems < 1){
|
||||
fprintf(stderr, "Unsupported escape sequence: \"\\e%s\"\n", sequence_start);
|
||||
goto error;
|
||||
}
|
||||
// Parse the sequence numbers
|
||||
/* Parse the sequence numbers */
|
||||
for(int i=0; i<nelems; i++){
|
||||
switch(elems[i]){
|
||||
case 0: // reset style
|
||||
case 0: /* reset style */
|
||||
style.fg = colortable[DEFAULT_FG_COLOR];
|
||||
style.bg = colortable[DEFAULT_BG_COLOR];
|
||||
style.bold = 0;
|
||||
|
|
@ -139,43 +139,43 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
style.fraktur = 0;
|
||||
style.invert = 0;
|
||||
break;
|
||||
case 1: // bold
|
||||
case 1: /* bold */
|
||||
style.bold = 1;
|
||||
break;
|
||||
case 4: // underline
|
||||
case 4: /* underline */
|
||||
style.underline = 1;
|
||||
break;
|
||||
case 5: // slow blink
|
||||
case 5: /* slow blink */
|
||||
style.blink = 1;
|
||||
break;
|
||||
case 6: // rapid blink
|
||||
case 6: /* rapid blink */
|
||||
style.blink = 8;
|
||||
break;
|
||||
case 7: // color invert on
|
||||
case 7: /* color invert on */
|
||||
style.invert = 1;
|
||||
break;
|
||||
case 9: // strike-through
|
||||
case 9: /* strike-through */
|
||||
style.strikethrough = 1;
|
||||
break;
|
||||
case 20:// Fraktur
|
||||
case 20:/* Fraktur */
|
||||
style.fraktur = 1;
|
||||
break;
|
||||
case 22:// Bold off
|
||||
case 22:/* Bold off */
|
||||
style.bold = 0;
|
||||
break;
|
||||
case 24:// Underline off
|
||||
case 24:/* Underline off */
|
||||
style.underline = 0;
|
||||
break;
|
||||
case 25:// Blink off
|
||||
case 25:/* Blink off */
|
||||
style.blink = 0;
|
||||
break;
|
||||
case 27:// color invert off
|
||||
case 27:/* color invert off */
|
||||
style.invert = 0;
|
||||
break;
|
||||
case 29:// strike-through off
|
||||
case 29:/* strike-through off */
|
||||
style.strikethrough = 0;
|
||||
break;
|
||||
case 30: // Set foreground color, "dim" colors
|
||||
case 30: /* Set foreground color, "dim" colors */
|
||||
case 31:
|
||||
case 32:
|
||||
case 33:
|
||||
|
|
@ -185,7 +185,7 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
case 37:
|
||||
style.fg = colortable[elems[i]-30];
|
||||
break;
|
||||
case 38: // Set xterm-256 foreground color
|
||||
case 38: /* Set xterm-256 foreground color */
|
||||
i++;
|
||||
if(nelems-i < 2 || elems[i] != 5){
|
||||
fprintf(stderr, "Invalid ANSI escape code: \"\\e%s\"\n", sequence_start);
|
||||
|
|
@ -193,10 +193,10 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
}
|
||||
style.fg = colortable[elems[++i]];
|
||||
break;
|
||||
case 39: // Reset foreground color to default
|
||||
case 39: /* Reset foreground color to default */
|
||||
style.bg = colortable[DEFAULT_FG_COLOR];
|
||||
break;
|
||||
case 40: // Set background color, "dim" colors
|
||||
case 40: /* Set background color, "dim" colors */
|
||||
case 41:
|
||||
case 42:
|
||||
case 43:
|
||||
|
|
@ -206,7 +206,7 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
case 47:
|
||||
style.bg = colortable[elems[i]-40];
|
||||
break;
|
||||
case 48: // Set xterm-256 background color
|
||||
case 48: /* Set xterm-256 background color */
|
||||
i++;
|
||||
if(nelems-i < 2 || elems[i] != 5){
|
||||
fprintf(stderr, "Invalid ANSI escape code: \"\\e%s\"\n", sequence_start);
|
||||
|
|
@ -214,10 +214,10 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
}
|
||||
style.bg = colortable[elems[++i]];
|
||||
break;
|
||||
case 49: // Reset background color to default
|
||||
case 49: /* Reset background color to default */
|
||||
style.bg = colortable[DEFAULT_BG_COLOR];
|
||||
break;
|
||||
case 90: // Set foreground color, "bright" colors
|
||||
case 90: /* Set foreground color, "bright" colors */
|
||||
case 91:
|
||||
case 92:
|
||||
case 93:
|
||||
|
|
@ -227,7 +227,7 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
case 97:
|
||||
style.fg = colortable[elems[i]-90+8];
|
||||
break;
|
||||
case 100: // Set background color, "bright" colors
|
||||
case 100: /* Set background color, "bright" colors */
|
||||
case 101:
|
||||
case 102:
|
||||
case 103:
|
||||
|
|
@ -252,12 +252,12 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
}
|
||||
|
||||
size_t inc = mbrtowc(&c, p, (s+len+1)-p, NULL);
|
||||
// If p contained
|
||||
if(inc == 0) // Reached end of string
|
||||
/* If p contained */
|
||||
if(inc == 0) /* Reached end of string */
|
||||
break;
|
||||
p += inc;
|
||||
|
||||
// Render glyph into frame buffer
|
||||
/* Render glyph into frame buffer */
|
||||
struct timeb time = {0};
|
||||
ftime(&time);
|
||||
unsigned long int t = time.time*1000 + time.millitm;
|
||||
|
|
@ -270,27 +270,33 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
render_glyph(g, gbuf, gbufwidth, x, 0, fg, bg);
|
||||
if(style.strikethrough || style.underline){
|
||||
int sty = gbufheight/2;
|
||||
// g->y usually is a negative index of the glyph's baseline measured from the glyph's bottom
|
||||
/* g->y usually is a negative index of the glyph's baseline measured from the glyph's bottom */
|
||||
int uly = gbufheight + g->y;
|
||||
for(int i=0; i<g->width; i++){
|
||||
if(style.strikethrough)
|
||||
*((color_t *)(gbuf + (sty*gbufwidth + x + i)*3)) = fg;
|
||||
gbuf[sty*gbufwidth + x + i] = fg;
|
||||
if(style.underline)
|
||||
*((color_t *)(gbuf + (uly*gbufwidth + x + i)*3)) = fg;
|
||||
gbuf[uly*gbufwidth + x + i] = fg;
|
||||
}
|
||||
}
|
||||
x += g->width;
|
||||
}
|
||||
return gbuf;
|
||||
error:
|
||||
free(gbuf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Render framebuffer to terminal, two pixels per character using Unicode box drawing stuff
|
||||
void console_render_buffer(uint8_t *gbuf, unsigned int gbufwidth, unsigned int gbufheight){
|
||||
/* Render framebuffer to terminal, two pixels per character using Unicode box drawing stuff */
|
||||
color_t lastfg = {0, 0, 0}, lastbg = {0, 0, 0};
|
||||
printf("\e[38;5;0;48;5;0m");
|
||||
for(unsigned int y=0; y < gbufheight; y+=2){
|
||||
for(unsigned int x=0; x < gbufwidth; x++){
|
||||
// Da magicks: ▀█▄
|
||||
color_t ct = *((color_t *)(gbuf + (y*gbufwidth + x)*3)); // Top pixel
|
||||
color_t cb = *((color_t *)(gbuf + ((y+1)*gbufwidth + x)*3)); // Bottom pixel
|
||||
// The following, rather convoluted logic tries to "save" escape sequences when rendering.
|
||||
/* Da magicks: ▀█▄ */
|
||||
color_t ct = *((color_t *)(gbuf + (y*gbufwidth + x)*sizeof(color_t))); /* Top pixel */
|
||||
color_t cb = *((color_t *)(gbuf + ((y+1)*gbufwidth + x)*sizeof(color_t))); /* Bottom pixel */
|
||||
/* The following, rather convoluted logic tries to "save" escape sequences when rendering. */
|
||||
if(!memcmp(&ct, &lastfg, sizeof(color_t))){
|
||||
if(!memcmp(&cb, &lastbg, sizeof(color_t))){
|
||||
printf("▀");
|
||||
|
|
@ -309,7 +315,7 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
printf("\033[38;5;%dm▄", xterm_color_index(cb));
|
||||
lastfg = cb;
|
||||
}
|
||||
}else{ // No matches for the upper pixel
|
||||
}else{ /* No matches for the upper pixel */
|
||||
if(!memcmp(&cb, &lastfg, sizeof(color_t))){
|
||||
printf("\033[48;5;%dm▄", xterm_color_index(ct));
|
||||
lastbg = ct;
|
||||
|
|
@ -326,9 +332,6 @@ int console_render(char *s, glyph_t **glyph_table, unsigned int glyph_table_size
|
|||
printf("\n");
|
||||
}
|
||||
return 0;
|
||||
error:
|
||||
free(gbuf);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue