From 1aaf25d5cc24b00064f24d2f4639b7be1da2ad0e Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 16 May 2011 00:15:39 +0200
Subject: [PATCH] Add support for characters starting with a set pixel.

---
 lcd/decoder.c     |  5 +++++
 tools/fdec.c      |  8 ++++++++
 tools/makefont.pl | 12 +++++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/lcd/decoder.c b/lcd/decoder.c
index 871771e..012c97e 100644
--- a/lcd/decoder.c
+++ b/lcd/decoder.c
@@ -50,6 +50,11 @@ uint8_t * pk_decode(const uint8_t * data,int * len){
 	int pos=0;    // Decoder internal: current bit position (0..7)
 	int nyb;      // Decoder internal: current nibble / value
 
+	if(data[ctr]>>4 == 14){ // Char starts with 1-bits. 
+		gnn();
+		curbit=1;
+	};
+
 	while(ctr<length){ /* Iterate the whole input stream */
 
 		/* Get next encoded nibble and decode */
diff --git a/tools/fdec.c b/tools/fdec.c
index 7d7f93f..b092ece 100644
--- a/tools/fdec.c
+++ b/tools/fdec.c
@@ -89,6 +89,13 @@ int decode(char c){
 	int curbit=0; // Decoder internal: current bit (1 or 0)
 	int pos=0;	  // Decoder internal: current bit position (0..7)
 	int nyb;      // Decoder internal: current nibble / value
+
+	if(font->au8FontTable[off+0]>>4 == 14){
+		// HACK: char starts with 1-bits, 
+		gnn();
+		curbit=1;
+	};
+
 	while(ctr<length){ /* Iterate the whole input stream */
 
 		/* Get next encoded nibble and decode */
@@ -168,3 +175,4 @@ int main(void){
 
 	exit(0);
 }
+
diff --git a/tools/makefont.pl b/tools/makefont.pl
index 5a5c271..1c959ae 100755
--- a/tools/makefont.pl
+++ b/tools/makefont.pl
@@ -307,9 +307,6 @@ sub pk_rle {
 
 	my $line=join("",@$char);;
 
-	my $fpx=substr($line,0,1);
-	warn "first pixel ==1 - Encoder will do stupid things..." if $fpx ==1 ;
-
 	my @out;
 	while($line=~/./){
 		$line=~s/^(0*)(\[\d+\])?(1*)(\[\d+\])?//;
@@ -362,8 +359,12 @@ sub pk_encode {
 				my $n=$1-1; # this deviates from PK spec, i think.
 				push @enc,14,pk_encode_long($1-1);
 			};
-		}elsif($_ == 0){
-			warn "Encoder asked to encode a zero?"; # Shouldn't happen.
+		}elsif($_ == 0){ # Encoding a 0 will only happen at the start of
+                         # character if "first pixel" is 1 instead of 0.
+                         # HACK:  We transmit this fact to the decoder
+                         #        by encoding a "14"-nibble which would be
+                         #        illegal at this point anyway.
+			push @enc,14;
 		}elsif($_ <= $dyn){ # Short length
 			push @enc,$_;
 		}elsif($_ <= 16*(13-$dyn)+$dyn){ # Medium length
@@ -417,3 +418,4 @@ sub do_pk {
 
 	return make_bytes(@enc);
 };
+