ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make makefont.pl auto-choose between ttf and bdf code 

Fix buglet for nibble-odd encoding
This commit is contained in:
Stefan `Sec` Zehl 2011-05-23 02:12:10 +02:00
parent 78e121337f
commit 8280dbfbb6
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/fdec.c
View File

@ -10,17 +10,18 @@
#define uint8_t unsigned char #define uint8_t unsigned char
#define uint16_t unsigned short #define uint16_t unsigned short
#include "ubuntu17.c" #include "fixed6x9.c"
const struct FONT_DEF * font = &Font_Ubuntu17pt; const struct FONT_DEF * font = &Font_Fixed6x9;
#define MAXCHR (24*3) #define MAXCHR (30*6)
static uint8_t buf[MAXCHR]; static uint8_t buf[MAXCHR];
int height; // Height of character in bytes
int decode(char c){ int decode(char c){
int off=0; // Offset into au8FontTable for bytestream int off=0; // Offset into au8FontTable for bytestream
int length; // Length of character bytestream int length; // Length of character bytestream
int height; // Height of character in bytes
int hoff; int hoff;
uint8_t * bufptr=buf; // Output buffer for decoded character uint8_t * bufptr=buf; // Output buffer for decoded character
@ -39,14 +40,16 @@ int decode(char c){
// Local function: Get next nibble. // Local function: Get next nibble.
int ctr=0; // offset for next nibble int ctr=0; // offset for next nibble
int hilo=0; // 0= high nibble next, 1=low nibble next
char gnn(){ // Get next nibble char gnn(){ // Get next nibble
static int byte; static int byte;
static int hilo=0; // 0= high nibble next, 1=low nibble next
int val; int val;
if(hilo==1){
ctr++;
};
hilo=1-hilo; hilo=1-hilo;
if(hilo==1){ if(hilo==1){
byte=font->au8FontTable[off+ctr]; byte=font->au8FontTable[off+ctr];
ctr++;
val=byte>>4; val=byte>>4;
}else{ }else{
val=byte&0x0f; val=byte&0x0f;
@ -98,9 +101,10 @@ int decode(char c){
while(ctr<length){ /* Iterate the whole input stream */ while(ctr<length){ /* Iterate the whole input stream */
printf("\nCtr: %d/%d [%2x] => ",ctr,hilo,font->au8FontTable[off+ctr]);
/* Get next encoded nibble and decode */ /* Get next encoded nibble and decode */
nyb=gnn(); nyb=gnn();
printf("\nCtr: %d, byte: %x, Process: %d\n",ctr, font->au8FontTable[off+ctr], nyb); printf("Process: %d\n", nyb);
if(nyb==15){ if(nyb==15){
repeat++; repeat++;
@ -122,7 +126,7 @@ int decode(char c){
/* Generate & output bits */ /* Generate & output bits */
printf("have %d bits. Got %d (%d)-bits...(r=%d)",pos, nyb, curbit,repeat); printf("have %d bits. Got %d (%d)-bits...(r=%d)\n",pos, nyb, curbit,repeat);
while(nyb-->0){ while(nyb-->0){
if(pos==0){ if(pos==0){
*bufptr=0; *bufptr=0;
@ -133,7 +137,7 @@ int decode(char c){
pos++; pos++;
if( hoff>0 && ((bufptr-buf)%height)==(height-1) && (pos==hoff)){ if( hoff>0 && ((bufptr-buf)%height)==(height-1) && (pos==hoff)){
// Incomplete last line. // Incomplete last line.
printf("Incomplete last byte output: %d:",(bufptr-buf)%height); printf("Incomplete byte (%d bits):",(bufptr-buf)%height);
pos=8; pos=8;
}; };
if(pos==8 ){ if(pos==8 ){
@ -142,7 +146,7 @@ int decode(char c){
if((bufptr-buf)%height==0){ // End of column? if((bufptr-buf)%height==0){ // End of column?
while(repeat>0){ while(repeat>0){
for(int y=0;y<height;y++){ for(int y=0;y<height;y++){
bufptr[0]=bufptr[-3]; bufptr[0]=bufptr[-height];
bufptr++; bufptr++;
}; };
printf("repeated last line\n"); printf("repeated last line\n");
@ -168,7 +172,7 @@ int main(void){
sz=decode('H'); sz=decode('H');
for(x=0;x<sz;x++){ for(x=0;x<sz;x++){
printf(" 0x%02x,",buf[x]); printf(" 0x%02x,",buf[x]);
if(x%3==2){ if(x%height==height-1){
printf("\n"); printf("\n");
}; };
}; };

20
tools/makefont.pl
View File

@ -53,6 +53,15 @@ HELP
exit(-1);} exit(-1);}
); );
my ($type);
if($font=~/\.ttf/){
$type="ttf";
}elsif($font=~/\.bdf/){
$type="bdf";
}else{
die "Can only do .ttf or .bdf fonts\n";
};
### ###
### Code starts here. ### Code starts here.
### ###
@ -66,8 +75,8 @@ our ($title,$fonts);
our ($heightb,$heightpx); our ($heightb,$heightpx);
@charlist=sort { $a <=> $b } @charlist; @charlist=sort { $a <=> $b } @charlist;
#init_ttf();
init_bdf(); $::{"init_$type"}();
die "No font name?" if !defined $title; die "No font name?" if !defined $title;
@ -110,8 +119,7 @@ for (0..$#charlist){
my $char=chr $charlist[$_]; my $char=chr $charlist[$_];
print "### Start $char\n" if($verbose); print "### Start $char\n" if($verbose);
# my @char=render_ttf($_); my @char=$::{"render_$type"}($_);
my @char=render_bdf($_);
print C " /* Char ",ord $char," is ",scalar@char,"px wide \@ $offset */\n"; print C " /* Char ",ord $char," is ",scalar@char,"px wide \@ $offset */\n";
@ -387,7 +395,7 @@ sub make_bytes{
my @out; my @out;
while(@enc){ while(@enc){
push @enc,0 if($#enc==2); push @enc,1 if($#enc==2);
push @out,16*(shift@enc)+(shift@enc); push @out,16*(shift@enc)+(shift@enc);
}; };
return @out; return @out;
@ -570,7 +578,7 @@ sub init_bdf{
sub render_bdf{ sub render_bdf{
my $ccode=$charlist[shift]; my $ccode=$charlist[shift];
my $tchar=$chars{$ccode}; my $tchar=$chars{$ccode};
print "Char: $ccode:\n",join("\n",@{$tchar}),"\nEND\n"; # print "Char: $ccode:\n",join("\n",@{$tchar}),"\nEND\n";
return @{$tchar}; return @{$tchar};
}; };