diff --git a/Makefile b/Makefile index ba8b861..b92b9a7 100755 --- a/Makefile +++ b/Makefile @@ -41,14 +41,14 @@ charset%.bin: charset%.o charset.cfg .PHONY: update-font-images update-font-images: charset.bin charset2.bin charset3.bin charset4.bin mkfontimg.py - python mkfontimg.py -l charset.bin img/t1.png - python mkfontimg.py charset.bin img/g1.png - python mkfontimg.py -l charset2.bin img/t2.png - python mkfontimg.py charset2.bin img/g2.png - python mkfontimg.py -l charset3.bin img/t3.png - python mkfontimg.py charset3.bin img/g3.png - python mkfontimg.py -l charset4.bin img/t4.png - python mkfontimg.py charset4.bin img/g4.png + python3 mkfontimg.py -l charset.bin img/t1.png + python3 mkfontimg.py charset.bin img/g1.png + python3 mkfontimg.py -l charset2.bin img/t2.png + python3 mkfontimg.py charset2.bin img/g2.png + python3 mkfontimg.py -l charset3.bin img/t3.png + python3 mkfontimg.py charset3.bin img/g3.png + python3 mkfontimg.py -l charset4.bin img/t4.png + python3 mkfontimg.py charset4.bin img/g4.png .INTERMEDIATE: 80columns.bin 80columns.bin: 80columns.o charset.o 80columns.cfg diff --git a/img/c64.png b/img/c64.png index a1fa40a..8b2f6a0 100644 Binary files a/img/c64.png and b/img/c64.png differ diff --git a/img/g1.png b/img/g1.png index 2bedfd8..1d82a34 100644 Binary files a/img/g1.png and b/img/g1.png differ diff --git a/img/g2.png b/img/g2.png index 6ac4816..eb21ea3 100644 Binary files a/img/g2.png and b/img/g2.png differ diff --git a/img/g3.png b/img/g3.png index e16416d..f5f80d9 100644 Binary files a/img/g3.png and b/img/g3.png differ diff --git a/img/g4.png b/img/g4.png index 3cc54fb..08cd89a 100644 Binary files a/img/g4.png and b/img/g4.png differ diff --git a/img/t1.png b/img/t1.png index 9c53c82..88f3748 100644 Binary files a/img/t1.png and b/img/t1.png differ diff --git a/img/t2.png b/img/t2.png index bd82f0b..f737d9b 100644 Binary files a/img/t2.png and b/img/t2.png differ diff --git a/img/t3.png b/img/t3.png index e59667f..72cad50 100644 Binary files a/img/t3.png and b/img/t3.png differ diff --git a/img/t4.png b/img/t4.png index e9f1761..a008b4c 100644 Binary files a/img/t4.png and b/img/t4.png differ diff --git a/mkfontimg.py b/mkfontimg.py index 9c15da4..1d4b9f8 100644 --- a/mkfontimg.py +++ b/mkfontimg.py @@ -1,5 +1,6 @@ #!/usr/bin/python import sys +import struct import PIL.Image as Image text = """\ @@ -22,9 +23,12 @@ def toscreencode(ch): if '`' <= ch <= '~': return cc - 96 return cc -charset = map(ord, open(sys.argv[1]).read()) +charset = open(sys.argv[1], "rb").read() +FG = 0xFFDE7886 +BG = 0xFFAA3A48 + def putcat(img, r, c, code, lowercase): inverse = code & 128 code = code % 128 @@ -33,10 +37,19 @@ def putcat(img, r, c, code, lowercase): data = charset[idx+y+lowercase*1024] if not inverse: data = ~data for x in range(4): - img.putpixel((4*c+x,8*r+y), data & (1<<(3-x))) + if ~data & (1<<(3-x)): + img.putpixel((8+4*c+x,8+8*r+y), FG) -img = Image.frombytes('1', (188,64), '\xff' * 188*64) +BG_buf = struct.pack('