quick bitmap font format, borrowing new default font from X

attribs.txt

@@ -0,0 +1,4 @@
+fs-skel/fonts/fixed-10.pbf:
+  "-misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1"
+  From the X Window System's "misc fixed" set.
+  Public Domain.

doc/pbf.txt

@@ -0,0 +1,18 @@
+Portland Bitmap Font format
+
+This format is intended as a quickly readable font format.
+
+Header:
+  byte: character width
+  byte: character height
+  byte: horizontal padding
+  byte: vertical padding
+  dword: offset into file of default character bitmap
+
+For each character (255 of them, 0x01 to 0xff):
+  dword: offset into bitmap data area of character bitmap,
+           or 0xffffffff if the default should be used.
+
+Bitmap data area:
+  bitmaps are from left to right, then from top to bottom.
+  the least significant bit of a byte is the "first" one.

fs-skel/attribs.txt

@@ -1,3 +0,0 @@
-fonts/berry.bdf:
-Modified by me from cherry, by camille, which is under BSD Zero.
-Cherry is available at <https://github.com/turquoise-hexagon/cherry>.

makefile

@@ -31,9 +31,9 @@ out/fs/bin/%: obj/%.elf
 	mkdir -p $(shell dirname $@)
 	objcopy -S $< $@
 
-out/fs/man/%.man: src/man/%.pre
-	mkdir -p $(shell dirname $@)
-	python3 tools/man-gen.py $< $@
+#out/fs/man/%.man: src/man/%.pre
+#	mkdir -p $(shell dirname $@)
+#	python3 tools/man-gen.py $< $@
 
 out/fs: out/fs/bin/init     out/fs/bin/highway out/fs/bin/meminfo \
         out/fs/bin/terminal out/fs/bin/hello   out/fs/bin/mkpopup
@@ -89,7 +89,8 @@ obj/knob.so: obj/knob/file.o  obj/knob/format.o obj/knob/rand.o \
 obj/libterm.so: obj/libterm/terminal.o obj/libterm/termtask.o obj/libterm/readline.o
 	ld ${partlink} $^ -o $@
 
-obj/libfont.so: obj/libfont/bdf.o obj/libfont/fonts.o obj/libfont/filist.o
+obj/libfont.so: obj/libfont/bdf.o obj/libfont/pbf.o obj/libfont/fonts.o \
+                obj/libfont/filist.o
 	ld ${partlink} $^ -o $@
 
 obj/popups.so: obj/popups/info.o obj/popups/popup.o

src/kernel/idt.c

@@ -256,9 +256,10 @@ void exception_halt(uint32_t eax, uint32_t ebx, uint32_t ecx,
   __builtin_unreachable();
 }
 
+#define MAX_STACK_EXPAND_PAGES 256
 //returns true if stack was expanded
 bool pf_check_stack(uint32_t cr2) {
-  if (cr2 >= active_task->stack_bottom - 0x1000) {
+  if (cr2 >= active_task->stack_bottom - 0x1000 * MAX_STACK_EXPAND_PAGES) {
     switch_to_kernel_cr3();
     pd_user_allocate(active_task->page_directory, active_task->stack_bottom -= 4096, 1, true);
     switch_to_task_cr3();

src/user/libfont/bdf.c

@@ -17,16 +17,10 @@ static inline uint8_t hex_to_n(char ch) {
 }
 
 //very minimal implementation
-bool try_load_bdf(const char *path, struct font_info *into) {
-  struct file *f = open_file(path);
-  if (!f)
-    PANIC("Can't open font file sent by get_font.");
-
+bool try_load_bdf(struct file *f, struct font_info *into) {
   read_line_from_file(f, line_buf, LINE_BUF_SIZE - 1);
-  if (!strequ(line_buf, "STARTFONT 2.1")) {
-    close_file(f);
+  if (!strequ(line_buf, "STARTFONT 2.1"))
     return false;
-  }
 
   for (uint16_t i = 0; i < 256; ++i)
     into->bitmaps[i] = 0;
@@ -71,9 +65,6 @@ bool try_load_bdf(const char *path, struct font_info *into) {
     }
   }
 
-  close_file(f);
-  f = 0;
-
   if ((into->char_height  == -1) ||
       (into->char_width   == -1) ||
       (into->space_height == -1) ||
@@ -90,8 +81,6 @@ bool try_load_bdf(const char *path, struct font_info *into) {
   return true;
 
 bad_format:
-  if (f)
-    close_file(f);
   for (uint16_t i = 0; i < 256; ++i)
     if (into->bitmaps[i])
       free_block(into->bitmaps[i]);

src/user/libfont/bdf.h

@@ -1,8 +1,11 @@
 #ifndef LIBFONT_BDF_H
 #define LIBFONT_BDF_H
 
+#include <libfont/fonts.h>
+#include <knob/file.h>
+
 #include <stdbool.h>
 
-bool try_load_bdf(const char *path, struct font_info *into);
+bool try_load_bdf(struct file *f, struct font_info *into);
 
 #endif

src/user/libfont/fonts.c

@@ -6,14 +6,18 @@
 
 #include "filist.h"
 #include "bdf.h"
+#include "pbf.h"
 
 #define FONT_PATH "fonts/"
 #define FONT_PATH_L 6
 
 struct font_loader_t {
   const char *ext;
-  bool (*func)(const char *, struct font_info *);
+  bool (*func)(struct file *f, struct font_info *);
 } font_loaders[] = {
+  { .ext = ".pbf",
+    .func = try_load_pbf
+  },
   { .ext = ".bdf",
     .func = try_load_bdf
   },
@@ -36,20 +40,17 @@ struct font_info *get_font(const char *name) {
     blockcpy(buf + FONT_PATH_L, name, name_len);
     strcpy(buf + FONT_PATH_L + name_len, i->ext);
     struct file *f = open_file(buf);
-    if (!f) {
-      free_block(buf);
+    free_block(buf);
+    if (!f)
       continue;
-    }
-    syslogf("[libfont] Loading %s%s...", name, i->ext);
-    if (i->func(buf, font)) {
+  //syslogf("[libfont] Loading %s%s...", name, i->ext);
+    if (i->func(f, font)) {
       close_file(f);
-      free_block(buf);
-      syslogf("[libfont] Loaded %s%s.", name, i->ext);
+    //syslogf("[libfont] Loaded %s%s.", name, i->ext);
       return font;
     }
     close_file(f);
-    free_block(buf);
-    syslogf("[libfont] Failed to load %s%s.", name, i->ext);
+  //syslogf("[libfont] Failed to load %s%s.", name, i->ext);
   }
   del_last();
   return 0;

src/user/libfont/pbf.c

@@ -0,0 +1,43 @@
+#include <libfont/fonts.h>
+
+#include <knob/panic.h>
+#include <knob/file.h>
+#include <knob/heap.h>
+
+#include <stdbool.h>
+
+bool try_load_pbf(struct file *f, struct font_info *into) {
+  uint8_t head[4];
+  if (read_from_file(f, 4, head) != 4)
+    return false;
+
+  into->space_width  = head[0] + head[2];
+  into->space_height = head[1] + head[3];
+  into->char_width   = head[0];
+  into->char_height  = head[1];
+
+  const uint16_t bm_size  =  head[0] * head[1];
+  const uint16_t bm_bytes = (bm_size - 1) / 8 + 1;
+
+  uint32_t bm_offsets[256];
+  if (read_from_file(f, 4 * 256, bm_offsets) != 4 * 256)
+    return false;
+
+  uint8_t bm_buf[256 * 256 / 8];
+
+  for (uint16_t i = 0; i < 256; ++i)
+    if (bm_offsets[i] == 0xffffffff)
+      into->bitmaps[i] = 0;
+    else {
+      bool *bp = get_block(bm_size);
+      if (!bp)
+        PANIC("couldn't allocate memory in pbf loader (todo: fail gracefully)");
+      seek_file_to(f, 4 + 4 * 256 + bm_offsets[i]);
+      read_from_file(f, bm_bytes, bm_buf);
+      for (uint16_t j = 0; j < bm_size; ++j)
+        bp[j] = (bm_buf[j / 8] >> (j % 8)) & 1;
+      into->bitmaps[i] = bp;
+    }
+
+  return true;
+}

src/user/libfont/pbf.h

@@ -0,0 +1,11 @@
+#ifndef LIBFONT_PBF_H
+#define LIBFONT_PBF_H
+
+#include <libfont/fonts.h>
+#include <knob/file.h>
+
+#include <stdbool.h>
+
+bool try_load_pbf(struct file *f, struct font_info *into);
+
+#endif

src/user/popups/info.c

@@ -9,7 +9,7 @@
 #include <stdarg.h>
 
 #define PADDING 6
-#define FONT "berry"
+#define FONT "fixed-10"
 
 static const struct font_info *info_font = 0;
 

src/user/terminal/main.c

@@ -10,7 +10,7 @@
 #include <pland/syscall.h>
 #include <pland/pcrt.h>
 
-#define FONT_HARDCODE "berry"
+#define FONT_HARDCODE "fixed-10"
 
 _window_handle_t window;
 uint8_t *pixbuf;

tools/pbf-gen.rb

@@ -0,0 +1,66 @@
+#args: .hex file, .pbf file, hex pitch, char width, char height, hz padding, vt padding
+#converts the .hex output of gbdfed into a pbf file
+#6x9x0x0
+
+bitmaps = {}
+
+File.readlines(ARGV[0]).map do |l|
+  bitmaps[l[0..3].to_i 16] = (l[5..-2].to_i(16) + 2**80).to_s(2)[1..-1]
+end
+
+data_area_entries = {}
+
+bitmaps.each do |cp, bm|
+  lines = bm.scan /.{#{ARGV[2].to_i}}/
+  this_entry = []
+  this_byte = 0
+  byte_mask = 1
+  for y in 0..(ARGV[4].to_i() - 1) do
+    for x in 0..(ARGV[3].to_i() - 1) do
+      if lines[y][x] == '1'
+        this_byte |= byte_mask
+      end
+      byte_mask *= 2
+      if byte_mask == 256
+        byte_mask = 1
+        this_entry << this_byte
+        this_byte = 0
+      end
+    end
+  end
+  if byte_mask != 1
+    this_entry << this_byte
+  end
+  data_area_entries[cp] = this_entry
+end
+
+data_area = []
+
+def put_u32(f, n)
+  f.putc (n % 256)
+  f.putc ((n / 256) % 256)
+  f.putc ((n / 65536) % 256)
+  f.putc ((n / 16777216) % 256)
+end
+
+File.open(ARGV[1], 'wb') do |f|
+  f.putc ARGV[3].to_i
+  f.putc ARGV[4].to_i
+  f.putc ARGV[5].to_i
+  f.putc ARGV[6].to_i
+
+  for cp in 0..255 do
+    if data_area_entries.key? cp
+      put_u32(f, data_area.length)
+      for b in data_area_entries[cp] do
+        data_area << b
+      end
+    else
+      put_u32(f, 0)
+    end
+  end
+
+  for b in data_area do
+    f.putc b
+  end
+end