Changeset 614d60b in git

Timestamp:

28/01/14 01:36:19 (6 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

aac3336

Parents:

11c7eb6

Message:

lib/Makefile.am,lib/make-pixel-font,src/glbitmapfont.cc,
src/glbitmapfont.h: Embed the font data for the first 256 Unicode
codepoints into the compiled aven binary to reduce start up
overhead. Any additional codepoints are loaded from a data file
only if/when a character >= U+100 is actually needed (as before).

Files:

• ChangeLog (modified) (1 diff)
• lib/Makefile.am (modified) (2 diffs)
• lib/make-pixel-font (modified) (1 diff)
• src/glbitmapfont.cc (modified) (9 diffs)
• src/glbitmapfont.h (modified) (2 diffs)

ChangeLog

@@ +1 @@
+Tue Jan 28 01:34:15 GMT 2014  Olly Betts <olly@survex.com>
+
+        * lib/Makefile.am,lib/make-pixel-font,src/glbitmapfont.cc,
+          src/glbitmapfont.h: Embed the font data for the first 256 Unicode
+          codepoints into the compiled aven binary to reduce start up
+          overhead.  Any additional codepoints are loaded from a data file
+          only if/when a character >= U+100 is actually needed (as before).
+
 Tue Jan 28 00:08:18 GMT 2014  Olly Betts <olly@survex.com>
 

lib/Makefile.am

@@ -32 +32 @@
  INSTALL.OSX
 
-MAINTAINERCLEANFILES = $(msg_files) de_DE.po unifont.pixelfont
+MAINTAINERCLEANFILES = $(msg_files) de_DE.po unifont.pixelfont preload_font.h
 
-dist_pkgdata_DATA = print.ini bcra3.svx bcra5.svx $(msg_files) unifont.pixelfont
+dist_pkgdata_DATA = print.ini bcra3.svx bcra5.svx $(msg_files) unifont.pixelfont preload_font.h
 
 appsdir = $(datadir)/applications
@@ -46 +46 @@
 mime_DATA = survex.keys
 
-unifont.pixelfont: $(srcdir)/make-pixel-font
+unifont.pixelfont preload_font.h: $(srcdir)/make-pixel-font
         $(srcdir)/make-pixel-font
 

lib/make-pixel-font

@@ -18 +18 @@
     }
     $ch = hex($ch);
-#    print "$ch:\n";
+    if ($ch == 256) {
+        close O;
+        open O, '<', 'unifont.pixelfont' or die $!;
+        open P, '>', 'preload_font.h' or die $!;
+        print P "static const unsigned char fontdata_preloaded[] = {";
+        my $c = 0;
+        while (<O>) {
+            for (split //, $_) {
+                if ($c++ % 8 == 0) {
+                    print P "\n   ";
+                }
+                printf P "% 4d,", ord $_;
+            }
+        }
+        print P "\n};\n";
+        close P;
+        close O;
+        open O, '>', 'unifont.pixelfont' or die $!;
+    }
 
     while (++$last_ch < $ch) {

src/glbitmapfont.cc

@@ -30 +30 @@
 #include "useful.h"
 #include "wx.h"
+
+#include "../lib/preload_font.h"
 
 #define CHECK_GL_ERROR(M, F) do { \
@@ -42 +44 @@
 
 bool
-BitmapFont::load(const wxString & font_file)
-{
-    if (fh) fclose(fh);
-#ifdef __WXMSW__
-    fh = _wfopen(font_file.fn_str(), L"rb");
-#else
-    fh = fopen(font_file.mb_str(), "rb");
-#endif
-
-    if (!fh) {
-        return false;
-    }
+BitmapFont::load(const wxString & font_file_)
+{
+    font_file = font_file_;
 
     if (!gllist_base) {
@@ -59 +52 @@
     }
 
-    unsigned char buf[32];
-
+    const unsigned char * p = fontdata_preloaded;
+    const unsigned char * end = p + sizeof(fontdata_preloaded);
     for (int ch = 0; ch < BITMAPFONT_MAX_CHAR; ++ch) {
         glNewList(gllist_base + ch, GL_COMPILE);
         CHECK_GL_ERROR("BitmapFont::load", "glNewList");
-        int b = GETC(fh);
-        if (b == EOF) {
-            fclose(fh);
+        if (p == end) {
             return false;
         }
-        unsigned int byte_width = b;
+        unsigned int byte_width = *p++;
 
         char_width[ch] = (byte_width & 0x0f) + 2;
@@ -77 +68 @@
         int n = 0;
         if (byte_width) {
-            b = GETC(fh);
-            if (b == EOF) {
-                fclose(fh);
+            if (p == end) {
                 return false;
             }
-            unsigned int start_and_n = b;
+            unsigned int start_and_n = *p++;
             start = start_and_n >> 4;
             n = (start_and_n & 15) + 1;
-            if (fread(buf, n * byte_width, 1, fh) != 1) {
-                fclose(fh);
+
+            if (end - p < n * byte_width) {
                 return false;
             }
@@ -93 +82 @@
         // Even if there's nothing to display, we want to advance the
         // raster position.
-        glBitmap(8 * byte_width, n, 0, -start, char_width[ch], 0, buf);
+        glBitmap(8 * byte_width, n, 0, -start, char_width[ch], 0, p);
         CHECK_GL_ERROR("BitmapFont::load", "glBitmap");
         glEndList();
         CHECK_GL_ERROR("BitmapFont::load", "glEndList");
+
+        p += n * byte_width;
     }
 
@@ -118 +109 @@
 BitmapFont::init_extra_chars() const
 {
-    long here = ftell(fh);
-    if (here == -1 || fseek(fh, 0, SEEK_END) < 0)
-        return;
-    long data_len = ftell(fh);
-    if (data_len == -1)
-        return;
-    data_len -= here;
+#ifdef __WXMSW__
+    FILE * fh = _wfopen(font_file.fn_str(), L"rb");
+#else
+    FILE * fh = fopen(font_file.mb_str(), "rb");
+#endif
+
+    long data_len = 0;
+    if (fh && fseek(fh, 0, SEEK_END) >= 0) {
+        data_len = ftell(fh);
+        if (data_len == -1)
+            data_len = 0;
+    }
     unsigned char * data = new unsigned char [data_len];
-    if (fseek(fh, here, SEEK_SET) < 0 ||
-        fread(data, data_len, 1, fh) != 1) {
-        delete data;
-        return;
-    }
+    if (data_len && (fseek(fh, 0, SEEK_SET) < 0 ||
+               fread(data, data_len, 1, fh) != 1)) {
+        data_len = 0;
+        // FIXME: do something better.  wxGetApp().ReportError(m);
+        // We have this message available: Error in format of font file “%s”
+        // fprintf(stderr, "Couldn't load extended font.\n");
+    }
+    if (fh)
+        fclose(fh);
+
     extra_chars = new unsigned char * [0x10000 - BITMAPFONT_MAX_CHAR];
-
     for (int i = 0; i < 0x10000 - BITMAPFONT_MAX_CHAR; ++i) {
         if (data_len <= 0) {
@@ -149 +149 @@
         }
     }
-    fclose(fh);
-    fh = NULL;
 }
 
@@ -162 +160 @@
         init_extra_chars();
 
-    unsigned int byte_width = 0;
     int width = 8;
 
     const unsigned char * p = extra_chars[ch - BITMAPFONT_MAX_CHAR];
     if (p) {
-        byte_width = *p++;
+        unsigned int byte_width = *p;
         width = (byte_width & 0x0f) + 2;
     }
@@ -204 +201 @@
     // raster position.
     glBitmap(8 * byte_width, n, 0, -start, width, 0, p);
+    CHECK_GL_ERROR("BitmapFont::write_glyph", "glBitmap");
 }
 

src/glbitmapfont.h

@@ -49 +49 @@
     mutable unsigned char ** extra_chars;
 
-    mutable FILE * fh;
-
     unsigned char char_width[BITMAPFONT_MAX_CHAR];
 
@@ -59 +57 @@
     void write_glyph(wxChar ch) const;
 
+    wxString font_file;
+
   public:
 
-    BitmapFont() : gllist_base(0), extra_chars(0), fh(0) { }
+    BitmapFont() : gllist_base(0), extra_chars(0) { }
 
     ~BitmapFont() {
         if (gllist_base)
             glDeleteLists(gllist_base, BITMAPFONT_MAX_CHAR);
-        if (fh)
-            fclose(fh);
     }