فهرست منبع

Use an 8x16 Terminus font for the window manager and apps

Johannes Zellner 2 هفته پیش
والد
کامیت
1f4ed3853a
8فایلهای تغییر یافته به همراه1329 افزوده شده و 27 حذف شده
  1. 9 6
      Makefile
  2. 1288 0
      font_8x16.c
  3. 11 0
      font_8x16.h
  4. 6 6
      ucmd_edit.c
  5. 2 2
      ucmd_term.c
  6. 1 1
      ucmd_wm.c
  7. 7 7
      uwm_lib.c
  8. 5 5
      wm_abi.h

+ 9 - 6
Makefile

@@ -35,6 +35,9 @@ tty.o: tty.c tty.h process.h
 font_8x8.o: font_8x8.c font_8x8.h
 font_8x8.o: font_8x8.c font_8x8.h
 	$(CC) $(CFLAGS) -o $@ $<
 	$(CC) $(CFLAGS) -o $@ $<
 
 
+font_8x16.o: font_8x16.c font_8x16.h
+	$(CC) $(CFLAGS) -o $@ $<
+
 fbtext.o: fbtext.c fbtext.h font_8x8.h vga.h
 fbtext.o: fbtext.c fbtext.h font_8x8.h vga.h
 	$(CC) $(CFLAGS) -o $@ $<
 	$(CC) $(CFLAGS) -o $@ $<
 
 
@@ -369,10 +372,10 @@ ucmd_%.elf: ucmd_%.o ucmd.ld
 	$(OBJCOPY) --strip-all $@ $@
 	$(OBJCOPY) --strip-all $@ $@
 
 
 # edit draws text itself, so it links the kernel's 8x8 font into its ELF.
 # edit draws text itself, so it links the kernel's 8x8 font into its ELF.
-ucmd_edit.o: ucmd_edit.c ucmd_lib.h syscall.h font_8x8.h
+ucmd_edit.o: ucmd_edit.c ucmd_lib.h syscall.h font_8x16.h
 	$(CC) $(CFLAGS) -o $@ $<
 	$(CC) $(CFLAGS) -o $@ $<
 
 
-ucmd_edit.elf: ucmd_edit.o font_8x8.o ucmd.ld
+ucmd_edit.elf: ucmd_edit.o font_8x16.o ucmd.ld
 	$(LD) -T ucmd.ld -z max-page-size=0x100 -nostdlib -m elf_i386 -o $@ $(filter %.o,$^)
 	$(LD) -T ucmd.ld -z max-page-size=0x100 -nostdlib -m elf_i386 -o $@ $(filter %.o,$^)
 	$(OBJCOPY) --strip-all $@ $@
 	$(OBJCOPY) --strip-all $@ $@
 
 
@@ -380,17 +383,17 @@ ucmd_edit.elf: ucmd_edit.o font_8x8.o ucmd.ld
 ucmd_wm.o: ucmd_wm.c ucmd_lib.h syscall.h wm_abi.h uwm_lib.h version.h
 ucmd_wm.o: ucmd_wm.c ucmd_lib.h syscall.h wm_abi.h uwm_lib.h version.h
 	$(CC) $(CFLAGS) -o $@ $<
 	$(CC) $(CFLAGS) -o $@ $<
 
 
-uwm_lib.o: uwm_lib.c uwm_lib.h font_8x8.h
+uwm_lib.o: uwm_lib.c uwm_lib.h font_8x16.h
 	$(CC) $(CFLAGS) -o $@ $<
 	$(CC) $(CFLAGS) -o $@ $<
 
 
-ucmd_wm.elf: ucmd_wm.o uwm_lib.o font_8x8.o ucmd.ld
+ucmd_wm.elf: ucmd_wm.o uwm_lib.o font_8x16.o ucmd.ld
 	$(LD) -T ucmd.ld -z max-page-size=0x100 -nostdlib -m elf_i386 -o $@ $(filter %.o,$^)
 	$(LD) -T ucmd.ld -z max-page-size=0x100 -nostdlib -m elf_i386 -o $@ $(filter %.o,$^)
 	$(OBJCOPY) --strip-all $@ $@
 	$(OBJCOPY) --strip-all $@ $@
 
 
 ucmd_term.o: ucmd_term.c ucmd_lib.h syscall.h wm_abi.h uwm_lib.h io.h vfs.h
 ucmd_term.o: ucmd_term.c ucmd_lib.h syscall.h wm_abi.h uwm_lib.h io.h vfs.h
 	$(CC) $(CFLAGS) -o $@ $<
 	$(CC) $(CFLAGS) -o $@ $<
 
 
-ucmd_term.elf: ucmd_term.o uwm_lib.o font_8x8.o ucmd.ld
+ucmd_term.elf: ucmd_term.o uwm_lib.o font_8x16.o ucmd.ld
 	$(LD) -T ucmd.ld -z max-page-size=0x100 -nostdlib -m elf_i386 -o $@ $(filter %.o,$^)
 	$(LD) -T ucmd.ld -z max-page-size=0x100 -nostdlib -m elf_i386 -o $@ $(filter %.o,$^)
 	$(OBJCOPY) --strip-all $@ $@
 	$(OBJCOPY) --strip-all $@ $@
 
 
@@ -627,4 +630,4 @@ net-dev: kernel.bin netkexec_send
 	./netkexec_send $(BOARD_IP) $(NETKEXEC_PORT) 0x$$entry kernel.bin
 	./netkexec_send $(BOARD_IP) $(NETKEXEC_PORT) 0x$$entry kernel.bin
 
 
 clean:
 clean:
-	rm -f boot.o vesa_stage.o entry.o kernel.o timer.o switch.o sched.o process.o mm.o kmalloc.o paging.o elf.o tss.o syscall.o sys_wm.o syscall_stub.o screen.o io.o tty.o rtc.o terminal.o wm.o hello.o reboot.o poweroff.o fat.o run.o disk.o serial.o serial_ring_buf.o serial_loop.o serial_recv.o bin_recv.o vga.o blit.o cpu.o vga_copy.o gfxbench.o gpu.o ati.o cirrus.o nvidia.o nv50.o radeon.o mtrr.o font_8x8.o fbtext.o gfx.o sys_gfx.o display.o mouse.o uhci.o ohci.o usb.o usbhid.o lsusb.o panic.o blkdev.o ata.o ahci.o fatdetect.o fatformat.o format.o vfs.o sys_fs.o sys_info.o idle.o kexec.o kexec_tramp.o dbg.o lspci.o peek.o ne2000.o r8168.o netdev.o net.o netkexec.o netlog.o dhcp.o dns.o tcp.o mbr.o boot.elf kernel.elf mbr.elf boot.bin mbr.bin kernel.bin boot.bin.tmp boot.bin.patched image.bin floppy.img usb.img final.bin root.img prog.o prog.elf prog.bin space.o space.elf space.bin hello.elf hello_embed.o prog_embed.o space_embed.o cmds.pack cmds_pack.o ramfs.o payload.o mkpack uwm_lib.o *.boot.tmp $(addsuffix .o,$(UCMDS)) $(addsuffix .elf,$(UCMDS)) $(TLSLIB_OBJS) tls_test bootstrap.o bootstrap.elf bootstrap.bin send_serial kexec_send netkexec_send netmonitor
+	rm -f boot.o vesa_stage.o entry.o kernel.o timer.o switch.o sched.o process.o mm.o kmalloc.o paging.o elf.o tss.o syscall.o sys_wm.o syscall_stub.o screen.o io.o tty.o rtc.o terminal.o wm.o hello.o reboot.o poweroff.o fat.o run.o disk.o serial.o serial_ring_buf.o serial_loop.o serial_recv.o bin_recv.o vga.o blit.o cpu.o vga_copy.o gfxbench.o gpu.o ati.o cirrus.o nvidia.o nv50.o radeon.o mtrr.o font_8x8.o font_8x16.o fbtext.o gfx.o sys_gfx.o display.o mouse.o uhci.o ohci.o usb.o usbhid.o lsusb.o panic.o blkdev.o ata.o ahci.o fatdetect.o fatformat.o format.o vfs.o sys_fs.o sys_info.o idle.o kexec.o kexec_tramp.o dbg.o lspci.o peek.o ne2000.o r8168.o netdev.o net.o netkexec.o netlog.o dhcp.o dns.o tcp.o mbr.o boot.elf kernel.elf mbr.elf boot.bin mbr.bin kernel.bin boot.bin.tmp boot.bin.patched image.bin floppy.img usb.img final.bin root.img prog.o prog.elf prog.bin space.o space.elf space.bin hello.elf hello_embed.o prog_embed.o space_embed.o cmds.pack cmds_pack.o ramfs.o payload.o mkpack uwm_lib.o *.boot.tmp $(addsuffix .o,$(UCMDS)) $(addsuffix .elf,$(UCMDS)) $(TLSLIB_OBJS) tls_test bootstrap.o bootstrap.elf bootstrap.bin send_serial kexec_send netkexec_send netmonitor

+ 1288 - 0
font_8x16.c

@@ -0,0 +1,1288 @@
+/* 8x16 bitmap font, 256 glyphs.  Glyphs derived from Terminus 8x16
+   (SIL Open Font License 1.1); the low 8-bit range is used by the
+   terminal and window-manager canvas renderers. */
+
+#include "font_8x16.h"
+
+const unsigned char font_8x16[FONT_8X16_CHARS * FONT_8X16_ROWS] = {
+	/* 0 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 1 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 2 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 3 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 4 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 5 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 6 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 7 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 8 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 9 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 10 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 11 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 12 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 13 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 14 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 15 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 16 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 17 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 18 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 19 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 20 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 21 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 22 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 23 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 24 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 25 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 26 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 27 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 28 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 29 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 30 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 31 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 32 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 33 */
+	0x00,0x00,0x10,0x10,
+	0x10,0x10,0x10,0x10,
+	0x10,0x00,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 34 */
+	0x00,0x24,0x24,0x24,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 35 */
+	0x00,0x00,0x24,0x24,
+	0x24,0x7E,0x24,0x24,
+	0x7E,0x24,0x24,0x24,
+	0x00,0x00,0x00,0x00,
+	/* 36 */
+	0x00,0x10,0x10,0x7C,
+	0x92,0x90,0x90,0x7C,
+	0x12,0x12,0x92,0x7C,
+	0x10,0x10,0x00,0x00,
+	/* 37 */
+	0x00,0x00,0x64,0x94,
+	0x68,0x08,0x10,0x10,
+	0x20,0x2C,0x52,0x4C,
+	0x00,0x00,0x00,0x00,
+	/* 38 */
+	0x00,0x00,0x18,0x24,
+	0x24,0x18,0x30,0x4A,
+	0x44,0x44,0x44,0x3A,
+	0x00,0x00,0x00,0x00,
+	/* 39 */
+	0x00,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 40 */
+	0x00,0x00,0x08,0x10,
+	0x20,0x20,0x20,0x20,
+	0x20,0x20,0x10,0x08,
+	0x00,0x00,0x00,0x00,
+	/* 41 */
+	0x00,0x00,0x20,0x10,
+	0x08,0x08,0x08,0x08,
+	0x08,0x08,0x10,0x20,
+	0x00,0x00,0x00,0x00,
+	/* 42 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x24,0x18,0x7E,
+	0x18,0x24,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 43 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x10,0x10,0x7C,
+	0x10,0x10,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 44 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x10,0x10,
+	0x20,0x00,0x00,0x00,
+	/* 45 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x7E,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 46 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 47 */
+	0x00,0x00,0x04,0x04,
+	0x08,0x08,0x10,0x10,
+	0x20,0x20,0x40,0x40,
+	0x00,0x00,0x00,0x00,
+	/* 48 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x46,0x4A,0x52,
+	0x62,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 49 */
+	0x00,0x00,0x08,0x18,
+	0x28,0x08,0x08,0x08,
+	0x08,0x08,0x08,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 50 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x02,0x04,0x08,
+	0x10,0x20,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 51 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x02,0x1C,0x02,
+	0x02,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 52 */
+	0x00,0x00,0x02,0x06,
+	0x0A,0x12,0x22,0x42,
+	0x7E,0x02,0x02,0x02,
+	0x00,0x00,0x00,0x00,
+	/* 53 */
+	0x00,0x00,0x7E,0x40,
+	0x40,0x40,0x7C,0x02,
+	0x02,0x02,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 54 */
+	0x00,0x00,0x1C,0x20,
+	0x40,0x40,0x7C,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 55 */
+	0x00,0x00,0x7E,0x02,
+	0x02,0x04,0x04,0x08,
+	0x08,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 56 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x42,0x3C,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 57 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x02,0x02,0x04,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 58 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x10,0x10,0x00,
+	0x00,0x00,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 59 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x10,0x10,0x00,
+	0x00,0x00,0x10,0x10,
+	0x20,0x00,0x00,0x00,
+	/* 60 */
+	0x00,0x00,0x00,0x04,
+	0x08,0x10,0x20,0x40,
+	0x20,0x10,0x08,0x04,
+	0x00,0x00,0x00,0x00,
+	/* 61 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x7E,0x00,0x00,
+	0x7E,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 62 */
+	0x00,0x00,0x00,0x40,
+	0x20,0x10,0x08,0x04,
+	0x08,0x10,0x20,0x40,
+	0x00,0x00,0x00,0x00,
+	/* 63 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x42,0x04,0x08,
+	0x08,0x00,0x08,0x08,
+	0x00,0x00,0x00,0x00,
+	/* 64 */
+	0x00,0x00,0x7C,0x82,
+	0x9E,0xA2,0xA2,0xA2,
+	0xA6,0x9A,0x80,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 65 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x42,0x42,0x7E,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 66 */
+	0x00,0x00,0x7C,0x42,
+	0x42,0x42,0x7C,0x42,
+	0x42,0x42,0x42,0x7C,
+	0x00,0x00,0x00,0x00,
+	/* 67 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x40,0x40,0x40,
+	0x40,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 68 */
+	0x00,0x00,0x78,0x44,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x44,0x78,
+	0x00,0x00,0x00,0x00,
+	/* 69 */
+	0x00,0x00,0x7E,0x40,
+	0x40,0x40,0x78,0x40,
+	0x40,0x40,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 70 */
+	0x00,0x00,0x7E,0x40,
+	0x40,0x40,0x78,0x40,
+	0x40,0x40,0x40,0x40,
+	0x00,0x00,0x00,0x00,
+	/* 71 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x40,0x40,0x4E,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 72 */
+	0x00,0x00,0x42,0x42,
+	0x42,0x42,0x7E,0x42,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 73 */
+	0x00,0x00,0x38,0x10,
+	0x10,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 74 */
+	0x00,0x00,0x0E,0x04,
+	0x04,0x04,0x04,0x04,
+	0x04,0x44,0x44,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 75 */
+	0x00,0x00,0x42,0x44,
+	0x48,0x50,0x60,0x60,
+	0x50,0x48,0x44,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 76 */
+	0x00,0x00,0x40,0x40,
+	0x40,0x40,0x40,0x40,
+	0x40,0x40,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 77 */
+	0x00,0x00,0x82,0xC6,
+	0xAA,0x92,0x82,0x82,
+	0x82,0x82,0x82,0x82,
+	0x00,0x00,0x00,0x00,
+	/* 78 */
+	0x00,0x00,0x42,0x42,
+	0x42,0x62,0x52,0x4A,
+	0x46,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 79 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 80 */
+	0x00,0x00,0x7C,0x42,
+	0x42,0x42,0x42,0x7C,
+	0x40,0x40,0x40,0x40,
+	0x00,0x00,0x00,0x00,
+	/* 81 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x4A,0x3C,
+	0x02,0x00,0x00,0x00,
+	/* 82 */
+	0x00,0x00,0x7C,0x42,
+	0x42,0x42,0x42,0x7C,
+	0x50,0x48,0x44,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 83 */
+	0x00,0x00,0x3C,0x42,
+	0x40,0x40,0x3C,0x02,
+	0x02,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 84 */
+	0x00,0x00,0xFE,0x10,
+	0x10,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 85 */
+	0x00,0x00,0x42,0x42,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 86 */
+	0x00,0x00,0x42,0x42,
+	0x42,0x42,0x42,0x24,
+	0x24,0x24,0x18,0x18,
+	0x00,0x00,0x00,0x00,
+	/* 87 */
+	0x00,0x00,0x82,0x82,
+	0x82,0x82,0x82,0x82,
+	0x92,0xAA,0xC6,0x82,
+	0x00,0x00,0x00,0x00,
+	/* 88 */
+	0x00,0x00,0x42,0x42,
+	0x24,0x24,0x18,0x18,
+	0x24,0x24,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 89 */
+	0x00,0x00,0x82,0x82,
+	0x44,0x44,0x28,0x10,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 90 */
+	0x00,0x00,0x7E,0x02,
+	0x02,0x04,0x08,0x10,
+	0x20,0x40,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 91 */
+	0x00,0x00,0x38,0x20,
+	0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 92 */
+	0x00,0x00,0x40,0x40,
+	0x20,0x20,0x10,0x10,
+	0x08,0x08,0x04,0x04,
+	0x00,0x00,0x00,0x00,
+	/* 93 */
+	0x00,0x00,0x38,0x08,
+	0x08,0x08,0x08,0x08,
+	0x08,0x08,0x08,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 94 */
+	0x00,0x10,0x28,0x44,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 95 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x7E,0x00,0x00,
+	/* 96 */
+	0x10,0x08,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 97 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3C,0x02,0x3E,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 98 */
+	0x00,0x00,0x40,0x40,
+	0x40,0x7C,0x42,0x42,
+	0x42,0x42,0x42,0x7C,
+	0x00,0x00,0x00,0x00,
+	/* 99 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3C,0x42,0x40,
+	0x40,0x40,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 100 */
+	0x00,0x00,0x02,0x02,
+	0x02,0x3E,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 101 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3C,0x42,0x42,
+	0x7E,0x40,0x40,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 102 */
+	0x00,0x00,0x0E,0x10,
+	0x10,0x7C,0x10,0x10,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 103 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3E,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x02,0x02,0x3C,0x00,
+	/* 104 */
+	0x00,0x00,0x40,0x40,
+	0x40,0x7C,0x42,0x42,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 105 */
+	0x00,0x00,0x10,0x10,
+	0x00,0x30,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 106 */
+	0x00,0x00,0x04,0x04,
+	0x00,0x0C,0x04,0x04,
+	0x04,0x04,0x04,0x04,
+	0x44,0x44,0x38,0x00,
+	/* 107 */
+	0x00,0x00,0x40,0x40,
+	0x40,0x42,0x44,0x48,
+	0x70,0x48,0x44,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 108 */
+	0x00,0x00,0x30,0x10,
+	0x10,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 109 */
+	0x00,0x00,0x00,0x00,
+	0x00,0xFC,0x92,0x92,
+	0x92,0x92,0x92,0x92,
+	0x00,0x00,0x00,0x00,
+	/* 110 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x7C,0x42,0x42,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 111 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3C,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 112 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x7C,0x42,0x42,
+	0x42,0x42,0x42,0x7C,
+	0x40,0x40,0x40,0x00,
+	/* 113 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3E,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x02,0x02,0x02,0x00,
+	/* 114 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x5E,0x60,0x40,
+	0x40,0x40,0x40,0x40,
+	0x00,0x00,0x00,0x00,
+	/* 115 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3E,0x40,0x40,
+	0x3C,0x02,0x02,0x7C,
+	0x00,0x00,0x00,0x00,
+	/* 116 */
+	0x00,0x00,0x10,0x10,
+	0x10,0x7C,0x10,0x10,
+	0x10,0x10,0x10,0x0E,
+	0x00,0x00,0x00,0x00,
+	/* 117 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 118 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x42,0x42,0x42,
+	0x24,0x24,0x18,0x18,
+	0x00,0x00,0x00,0x00,
+	/* 119 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x82,0x82,0x92,
+	0x92,0x92,0x92,0x7C,
+	0x00,0x00,0x00,0x00,
+	/* 120 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x42,0x42,0x24,
+	0x18,0x24,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 121 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x02,0x02,0x3C,0x00,
+	/* 122 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x7E,0x04,0x08,
+	0x10,0x20,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 123 */
+	0x00,0x00,0x0C,0x10,
+	0x10,0x10,0x20,0x10,
+	0x10,0x10,0x10,0x0C,
+	0x00,0x00,0x00,0x00,
+	/* 124 */
+	0x00,0x00,0x10,0x10,
+	0x10,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 125 */
+	0x00,0x00,0x30,0x08,
+	0x08,0x08,0x04,0x08,
+	0x08,0x08,0x08,0x30,
+	0x00,0x00,0x00,0x00,
+	/* 126 */
+	0x00,0x62,0x92,0x8C,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 127 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 128 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 129 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 130 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 131 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 132 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 133 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 134 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 135 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 136 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 137 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 138 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 139 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 140 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 141 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 142 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 143 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 144 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 145 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 146 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 147 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 148 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 149 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 150 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 151 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 152 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 153 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 154 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 155 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 156 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 157 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 158 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 159 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 160 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 161 */
+	0x00,0x00,0x10,0x10,
+	0x00,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 162 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 163 */
+	0x00,0x00,0x18,0x24,
+	0x20,0x20,0x78,0x20,
+	0x20,0x20,0x22,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 164 */
+	0x00,0x00,0x00,0x00,
+	0x44,0x38,0x44,0x44,
+	0x44,0x38,0x44,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 165 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 166 */
+	0x00,0x00,0x10,0x10,
+	0x10,0x10,0x00,0x00,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 167 */
+	0x00,0x38,0x44,0x40,
+	0x30,0x48,0x44,0x44,
+	0x24,0x18,0x04,0x44,
+	0x38,0x00,0x00,0x00,
+	/* 168 */
+	0x24,0x24,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 169 */
+	0x00,0x00,0x00,0x7E,
+	0x81,0x99,0xA5,0xA1,
+	0xA5,0x99,0x81,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 170 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 171 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x12,0x24,0x48,
+	0x90,0x48,0x24,0x12,
+	0x00,0x00,0x00,0x00,
+	/* 172 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x7E,0x02,0x02,
+	0x02,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 173 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x7E,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 174 */
+	0x00,0x00,0x00,0x7E,
+	0x81,0xB9,0xA5,0xB9,
+	0xA9,0xA5,0x81,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 175 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 176 */
+	0x00,0x18,0x24,0x24,
+	0x18,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 177 */
+	0x00,0x00,0x00,0x00,
+	0x10,0x10,0x7C,0x10,
+	0x10,0x00,0x00,0x7C,
+	0x00,0x00,0x00,0x00,
+	/* 178 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 179 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 180 */
+	0x08,0x10,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 181 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x42,0x42,0x42,
+	0x42,0x42,0x46,0x7A,
+	0x40,0x40,0x40,0x00,
+	/* 182 */
+	0x00,0x00,0x7E,0x92,
+	0x92,0x92,0x92,0x72,
+	0x12,0x12,0x12,0x12,
+	0x00,0x00,0x00,0x00,
+	/* 183 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x10,
+	0x10,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 184 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x10,0x10,0x20,0x00,
+	/* 185 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 186 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 187 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x90,0x48,0x24,
+	0x12,0x24,0x48,0x90,
+	0x00,0x00,0x00,0x00,
+	/* 188 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 189 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 190 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 191 */
+	0x00,0x00,0x10,0x10,
+	0x00,0x10,0x10,0x20,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 192 */
+	0x10,0x08,0x00,0x3C,
+	0x42,0x42,0x42,0x7E,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 193 */
+	0x08,0x10,0x00,0x3C,
+	0x42,0x42,0x42,0x7E,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 194 */
+	0x18,0x24,0x00,0x3C,
+	0x42,0x42,0x42,0x7E,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 195 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 196 */
+	0x24,0x24,0x00,0x3C,
+	0x42,0x42,0x42,0x7E,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 197 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 198 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 199 */
+	0x00,0x00,0x3C,0x42,
+	0x42,0x40,0x40,0x40,
+	0x40,0x42,0x42,0x3C,
+	0x10,0x10,0x20,0x00,
+	/* 200 */
+	0x10,0x08,0x00,0x7E,
+	0x40,0x40,0x40,0x78,
+	0x40,0x40,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 201 */
+	0x08,0x10,0x00,0x7E,
+	0x40,0x40,0x40,0x78,
+	0x40,0x40,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 202 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 203 */
+	0x24,0x24,0x00,0x7E,
+	0x40,0x40,0x40,0x78,
+	0x40,0x40,0x40,0x7E,
+	0x00,0x00,0x00,0x00,
+	/* 204 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 205 */
+	0x08,0x10,0x00,0x38,
+	0x10,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 206 */
+	0x30,0x48,0x00,0x38,
+	0x10,0x10,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 207 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 208 */
+	0x00,0x00,0x78,0x44,
+	0x42,0x42,0xF2,0x42,
+	0x42,0x42,0x44,0x78,
+	0x00,0x00,0x00,0x00,
+	/* 209 */
+	0x32,0x4C,0x00,0x42,
+	0x42,0x62,0x52,0x4A,
+	0x46,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 210 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 211 */
+	0x08,0x10,0x00,0x3C,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 212 */
+	0x18,0x24,0x00,0x3C,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 213 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 214 */
+	0x24,0x24,0x00,0x3C,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 215 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x42,0x24,0x18,
+	0x24,0x42,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 216 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 217 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 218 */
+	0x08,0x10,0x42,0x42,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 219 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 220 */
+	0x24,0x24,0x00,0x42,
+	0x42,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 221 */
+	0x08,0x10,0x82,0x82,
+	0x44,0x44,0x28,0x10,
+	0x10,0x10,0x10,0x10,
+	0x00,0x00,0x00,0x00,
+	/* 222 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 223 */
+	0x00,0x00,0x38,0x44,
+	0x44,0x48,0x7C,0x42,
+	0x42,0x42,0x62,0x5C,
+	0x00,0x00,0x00,0x00,
+	/* 224 */
+	0x00,0x00,0x10,0x08,
+	0x00,0x3C,0x02,0x3E,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 225 */
+	0x00,0x00,0x08,0x10,
+	0x00,0x3C,0x02,0x3E,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 226 */
+	0x00,0x00,0x18,0x24,
+	0x00,0x3C,0x02,0x3E,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 227 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 228 */
+	0x00,0x00,0x24,0x24,
+	0x00,0x3C,0x02,0x3E,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 229 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 230 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 231 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x3C,0x42,0x40,
+	0x40,0x40,0x42,0x3C,
+	0x10,0x10,0x20,0x00,
+	/* 232 */
+	0x00,0x00,0x10,0x08,
+	0x00,0x3C,0x42,0x42,
+	0x7E,0x40,0x40,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 233 */
+	0x00,0x00,0x08,0x10,
+	0x00,0x3C,0x42,0x42,
+	0x7E,0x40,0x40,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 234 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 235 */
+	0x00,0x00,0x24,0x24,
+	0x00,0x3C,0x42,0x42,
+	0x7E,0x40,0x40,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 236 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 237 */
+	0x00,0x00,0x08,0x10,
+	0x00,0x30,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 238 */
+	0x00,0x00,0x30,0x48,
+	0x00,0x30,0x10,0x10,
+	0x10,0x10,0x10,0x38,
+	0x00,0x00,0x00,0x00,
+	/* 239 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 240 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 241 */
+	0x00,0x00,0x32,0x4C,
+	0x00,0x7C,0x42,0x42,
+	0x42,0x42,0x42,0x42,
+	0x00,0x00,0x00,0x00,
+	/* 242 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 243 */
+	0x00,0x00,0x08,0x10,
+	0x00,0x3C,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 244 */
+	0x00,0x00,0x18,0x24,
+	0x00,0x3C,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 245 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 246 */
+	0x00,0x00,0x24,0x24,
+	0x00,0x3C,0x42,0x42,
+	0x42,0x42,0x42,0x3C,
+	0x00,0x00,0x00,0x00,
+	/* 247 */
+	0x00,0x00,0x00,0x00,
+	0x10,0x10,0x00,0x7C,
+	0x00,0x10,0x10,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 248 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 249 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 250 */
+	0x00,0x00,0x08,0x10,
+	0x00,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 251 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 252 */
+	0x00,0x00,0x24,0x24,
+	0x00,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x00,0x00,0x00,0x00,
+	/* 253 */
+	0x00,0x00,0x08,0x10,
+	0x00,0x42,0x42,0x42,
+	0x42,0x42,0x42,0x3E,
+	0x02,0x02,0x3C,0x00,
+	/* 254 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	/* 255 */
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,
+};

+ 11 - 0
font_8x16.h

@@ -0,0 +1,11 @@
+/* 8x16 bitmap font: 256 chars, 16 bytes each (one byte per row, MSB left).
+   Userland window/terminal fonts; the kernel console keeps font_8x8. */
+#ifndef FONT_8X16_H
+#define FONT_8X16_H
+
+#define FONT_8X16_CHARS  256
+#define FONT_8X16_ROWS   16
+
+extern const unsigned char font_8x16[FONT_8X16_CHARS * FONT_8X16_ROWS];
+
+#endif

+ 6 - 6
ucmd_edit.c

@@ -6,11 +6,11 @@
  * changes).  Ctrl+C still reaches the terminal and kills the command.
  * changes).  Ctrl+C still reaches the terminal and kills the command.
  *
  *
  * A gfx session is the only key-input path available to a ring-3 command, so
  * A gfx session is the only key-input path available to a ring-3 command, so
- * the editor repaints the window canvas itself.  The kernel's 8x8 font is
+ * the editor repaints the window canvas itself.  The 8x16 userland font is
  * linked into this ELF by the Makefile (see ucmd_edit.elf). */
  * linked into this ELF by the Makefile (see ucmd_edit.elf). */
 
 
 #include "ucmd_lib.h"
 #include "ucmd_lib.h"
-#include "font_8x8.h"
+#include "font_8x16.h"
 
 
 #define EDIT_MAX       16384
 #define EDIT_MAX       16384
 #define EDIT_READ_MAX  (EDIT_MAX + 1)   /* one extra byte detects "too large" */
 #define EDIT_READ_MAX  (EDIT_MAX + 1)   /* one extra byte detects "too large" */
@@ -21,7 +21,7 @@
 #define EDIT_BUF_SIZE  (EDIT_READ_MAX + 512)
 #define EDIT_BUF_SIZE  (EDIT_READ_MAX + 512)
 #define TAB_WIDTH      4
 #define TAB_WIDTH      4
 #define CELL_W         8
 #define CELL_W         8
-#define CELL_H         10
+#define CELL_H         16
 #define PATH_MAX       128
 #define PATH_MAX       128
 #define BASE_MAX       64
 #define BASE_MAX       64
 #define STATUS_MAX     96
 #define STATUS_MAX     96
@@ -115,12 +115,12 @@ static void fill_rect(unsigned int x, unsigned int y, unsigned int w,
 static void draw_glyph_at(unsigned int x, unsigned int y, unsigned char c,
 static void draw_glyph_at(unsigned int x, unsigned int y, unsigned char c,
 			  unsigned short fg)
 			  unsigned short fg)
 {
 {
-	const unsigned char *g = &font_8x8[(unsigned int)c * FONT_8X8_ROWS];
+	const unsigned char *g = &font_8x16[(unsigned int)c * FONT_8X16_ROWS];
 	unsigned int row, col;
 	unsigned int row, col;
 
 
 	if (x >= fb_w)
 	if (x >= fb_w)
 		return;
 		return;
-	for (row = 0; row < FONT_8X8_ROWS; row++) {
+	for (row = 0; row < FONT_8X16_ROWS; row++) {
 		unsigned int py = y + row;
 		unsigned int py = y + row;
 		unsigned short *p;
 		unsigned short *p;
 		unsigned char bits;
 		unsigned char bits;
@@ -587,7 +587,7 @@ void _start(const char *arg)
 	}
 	}
 	new_file = (r == 1);
 	new_file = (r == 1);
 
 
-	if (u_win_create(512, 320, "edit", &info) != 0) {
+	if (u_win_create(512, 512, "edit", &info) != 0) {
 		u_puts("edit: no graphics window\n");
 		u_puts("edit: no graphics window\n");
 		u_exit(1);
 		u_exit(1);
 	}
 	}

+ 2 - 2
ucmd_term.c

@@ -203,7 +203,7 @@ static void render(void)
 	usurf_fill(&surf, 0, 0, wi.width, wi.height, 0x000000u);
 	usurf_fill(&surf, 0, 0, wi.width, wi.height, 0x000000u);
 	usurf_cells(&surf, cells, COLS, ROWS, 0, 0, 0, 0, wi.width, wi.height);
 	usurf_cells(&surf, cells, COLS, ROWS, 0, 0, 0, 0, wi.width, wi.height);
 	if (cursor_on && cx < COLS && cy < ROWS)
 	if (cursor_on && cx < COLS && cy < ROWS)
-		usurf_fill(&surf, (int)cx * 8, (int)cy * 10, 2, 10, 0xFFFFFFu);
+		usurf_fill(&surf, (int)cx * 8, (int)cy * 16, 2, 16, 0xFFFFFFu);
 	u_win_present();
 	u_win_present();
 	dirty = 0;
 	dirty = 0;
 }
 }
@@ -738,7 +738,7 @@ void _start(const char *arg)
 	tty = u_tty_create();
 	tty = u_tty_create();
 	if (tty <= 0)
 	if (tty <= 0)
 		u_exit(1);
 		u_exit(1);
-	if (u_win_create(512, 320, "term", &wi) != 0)
+	if (u_win_create(512, 512, "term", &wi) != 0)
 		u_exit(1);
 		u_exit(1);
 	usurf_init(&surf, wi.fb, wi.width, wi.height, wi.width * 2, 16);
 	usurf_init(&surf, wi.fb, wi.width, wi.height, wi.width * 2, 16);
 	term_clear();
 	term_clear();

+ 1 - 1
ucmd_wm.c

@@ -80,7 +80,7 @@ static void draw_bar(void)
 		r = (r1 * (256 - f) + r2 * f) / 256;
 		r = (r1 * (256 - f) + r2 * f) / 256;
 		g = (g1 * (256 - f) + g2 * f) / 256;
 		g = (g1 * (256 - f) + g2 * f) / 256;
 		b = (b1 * (256 - f) + b2 * f) / 256;
 		b = (b1 * (256 - f) + b2 * f) / 256;
-		for (y = 18; y < 20; y++)
+		for (y = WM_BAR_H - 5; y < WM_BAR_H - 3; y++)
 			usurf_fill(&screen, (int)x, (int)y, 1, 1, rgb16(r, g, b));
 			usurf_fill(&screen, (int)x, (int)y, 1, 1, rgb16(r, g, b));
 	}
 	}
 
 

+ 7 - 7
uwm_lib.c

@@ -2,9 +2,9 @@
  * fbtext/gfx byte order so the mapped shadow matches the kernel console. */
  * fbtext/gfx byte order so the mapped shadow matches the kernel console. */
 
 
 #include "uwm_lib.h"
 #include "uwm_lib.h"
-#include "font_8x8.h"
+#include "font_8x16.h"
 
 
-#define FONT_H 8
+#define FONT_H 16
 
 
 static const unsigned char pal_r[16] = {
 static const unsigned char pal_r[16] = {
 	0, 0, 0, 0, 170, 170, 170, 170, 85, 85, 85, 85, 255, 255, 255, 255
 	0, 0, 0, 0, 170, 170, 170, 170, 85, 85, 85, 85, 255, 255, 255, 255
@@ -142,7 +142,7 @@ void usurf_glyph(struct usurf *s, int x, int y, unsigned char c,
 		 unsigned int height,
 		 unsigned int height,
 		 int cx, int cy, unsigned int cw, unsigned int ch)
 		 int cx, int cy, unsigned int cw, unsigned int ch)
 {
 {
-	const unsigned char *glyph = &font_8x8[(unsigned int)c * FONT_8X8_ROWS];
+	const unsigned char *glyph = &font_8x16[(unsigned int)c * FONT_8X16_ROWS];
 	unsigned int fr = (fg >> 16) & 0xFF, fgn = (fg >> 8) & 0xFF, fb = fg & 0xFF;
 	unsigned int fr = (fg >> 16) & 0xFF, fgn = (fg >> 8) & 0xFF, fb = fg & 0xFF;
 	unsigned int br = (bg >> 16) & 0xFF, bgn = (bg >> 8) & 0xFF, bb = bg & 0xFF;
 	unsigned int br = (bg >> 16) & 0xFF, bgn = (bg >> 8) & 0xFF, bb = bg & 0xFF;
 	unsigned int py, px;
 	unsigned int py, px;
@@ -189,8 +189,8 @@ void usurf_cells(struct usurf *s, const unsigned short *cells,
 {
 {
 	int col0 = (cx - x0) / 8;
 	int col0 = (cx - x0) / 8;
 	int col1 = (cx + (int)cw - x0 + 7) / 8;
 	int col1 = (cx + (int)cw - x0 + 7) / 8;
-	int row0 = (cy - y0) / 10;
-	int row1 = (cy + (int)ch - y0 + 9) / 10;
+	int row0 = (cy - y0) / 16;
+	int row1 = (cy + (int)ch - y0 + 15) / 16;
 	int row, col;
 	int row, col;
 
 
 	if (col0 < 0) col0 = 0;
 	if (col0 < 0) col0 = 0;
@@ -213,8 +213,8 @@ void usurf_cells(struct usurf *s, const unsigned short *cells,
 				((unsigned int)pal_g[(attr >> 4) & 15] << 8) |
 				((unsigned int)pal_g[(attr >> 4) & 15] << 8) |
 				pal_b[(attr >> 4) & 15];
 				pal_b[(attr >> 4) & 15];
 
 
-			usurf_glyph(s, x0 + col * 8, y0 + row * 10, c,
-				    fg, bg, 0, 10, cx, cy, cw, ch);
+			usurf_glyph(s, x0 + col * 8, y0 + row * 16, c,
+				    fg, bg, 0, 16, cx, cy, cw, ch);
 		}
 		}
 	}
 	}
 }
 }

+ 5 - 5
wm_abi.h

@@ -7,13 +7,13 @@
 #define WM_MAX_WINDOWS 4
 #define WM_MAX_WINDOWS 4
 
 
 /* Shared chrome layout (the WM draws it, the kernel only stores geometry). */
 /* Shared chrome layout (the WM draws it, the kernel only stores geometry). */
-#define WM_BAR_H   25
+#define WM_BAR_H   30
 #define WM_BTN_X   132
 #define WM_BTN_X   132
-#define WM_BTN_Y   3
+#define WM_BTN_Y   5
 #define WM_BTN_W   56
 #define WM_BTN_W   56
-#define WM_BTN_H   14
-#define WM_TITLE_H 16
-#define WM_CLOSE_W 14
+#define WM_BTN_H   20
+#define WM_TITLE_H 22
+#define WM_CLOSE_W 16
 
 
 /* Fixed user virtual addresses for the WM's mappings.  The shadow is one
 /* Fixed user virtual addresses for the WM's mappings.  The shadow is one
  * mapping; each window gets a private content slot (large enough for the
  * mapping; each window gets a private content slot (large enough for the