Add support to load fonts w/Unicode filenames

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Aseprite
-# Copyright (C) 2001-2016  David Capello
+# Copyright (C) 2001-2017  David Capello
 
 ######################################################################
 # Compiler-specific flags
@@ -97,6 +97,7 @@ add_subdirectory(gfx)
 add_subdirectory(net)
 add_subdirectory(render)
 add_subdirectory(docio)
+add_subdirectory(ft)
 add_subdirectory(she)
 add_subdirectory(ui)
 

src/ft/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Aseprite FreeType Wrapper
+# Copyright (C) 2017 David Capello
+
+add_library(ft-lib
+  lib.cpp
+  stream.cpp)
+
+target_link_libraries(ft-lib
+  laf-base
+  ${FREETYPE_LIBRARIES})

src/ft/lib.cpp

@@ -0,0 +1,45 @@
+// Aseprite FreeType Wrapper
+// Copyright (c) 2016-2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#include "ft/lib.h"
+
+#include "base/log.h"
+#include "ft/stream.h"
+
+#include <iostream>
+
+namespace ft {
+
+Lib::Lib()
+  : m_ft(nullptr)
+{
+  FT_Init_FreeType(&m_ft);
+}
+
+Lib::~Lib()
+{
+  if (m_ft)
+    FT_Done_FreeType(m_ft);
+}
+
+FT_Face Lib::open(const std::string& filename)
+{
+  FT_Stream stream = ft::open_stream(m_ft, filename);
+  FT_Open_Args args;
+  memset(&args, 0, sizeof(args));
+  args.flags = FT_OPEN_STREAM;
+  args.stream = stream;
+
+  LOG(VERBOSE) << "FT: Loading font '" << filename << "'\n";
+
+  FT_Face face = nullptr;
+  FT_Error err = FT_Open_Face(m_ft, &args, 0, &face);
+  if (!err)
+    FT_Select_Charmap(face, FT_ENCODING_UNICODE);
+  return face;
+}
+
+} // namespace ft

src/ft/lib.h

@@ -1,5 +1,5 @@
 // Aseprite FreeType Wrapper
-// Copyright (c) 2016 David Capello
+// Copyright (c) 2016-2017 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -17,31 +17,12 @@ namespace ft {
 
   class Lib {
   public:
-    Lib() : m_ft(nullptr) {
-      FT_Init_FreeType(&m_ft);
-    }
+    Lib();
+    ~Lib();
 
-    ~Lib() {
-      if (m_ft)
-        FT_Done_FreeType(m_ft);
-    }
+    operator FT_Library() { return m_ft; }
 
-    operator FT_Library() {
-      return m_ft;
-    }
-
-    FT_Face open(const std::string& filename) {
-      FT_Open_Args args;
-      memset(&args, 0, sizeof(args));
-      args.flags = FT_OPEN_PATHNAME;
-      args.pathname = (FT_String*)filename.c_str();
-
-      FT_Face face = nullptr;
-      FT_Error err = FT_Open_Face(m_ft, &args, 0, &face);
-      if (!err)
-        FT_Select_Charmap(face, FT_ENCODING_UNICODE);
-      return face;
-    }
+    FT_Face open(const std::string& filename);
 
   private:
     FT_Library m_ft;

src/ft/stream.cpp

@@ -0,0 +1,91 @@
+// Aseprite FreeType Wrapper
+// Copyright (c) 2016-2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#define FT2_BUILD_LIBRARY 1
+
+#include "ft/stream.h"
+
+#include "base/file_handle.h"
+
+#include FT_CONFIG_CONFIG_H
+#include FT_INTERNAL_INTERNAL_H
+#include FT_INTERNAL_STREAM_H
+#include FT_INTERNAL_MEMORY_H
+
+#define STREAM_FILE(stream) ((FILE*)stream->descriptor.pointer)
+
+namespace ft {
+
+static void ft_stream_close(FT_Stream stream)
+{
+  fclose(STREAM_FILE(stream));
+
+  stream->descriptor.pointer = nullptr;
+  stream->size = 0;
+  stream->base = nullptr;
+}
+
+static unsigned long ft_stream_io(FT_Stream stream,
+                                  unsigned long offset,
+                                  unsigned char* buffer,
+                                  unsigned long count)
+{
+  if (!count && offset > stream->size)
+    return 1;
+
+  FILE* file = STREAM_FILE(stream);
+  if (stream->pos != offset)
+    fseek(file, (long)offset, SEEK_SET);
+
+  return (unsigned long)fread(buffer, 1, count, file);
+}
+
+FT_Stream open_stream(FT_Library lib,
+                      const std::string& utf8Filename)
+{
+  FT_Error error;
+  FT_Memory memory = lib->memory;
+
+  FT_Stream stream = nullptr;
+  if (FT_NEW(stream))
+    return nullptr;
+
+  stream->memory = lib->memory;
+  stream->descriptor.pointer = nullptr;
+  stream->pathname.pointer = nullptr;
+  stream->base = nullptr;
+  stream->pos = 0;
+  stream->read = nullptr;
+  stream->close = nullptr;
+
+  TRACE("FT: Loading font %s... ", utf8Filename.c_str());
+
+  FILE* file = base::open_file_raw(utf8Filename, "rb");
+  if (!file) {
+    FT_FREE(stream);
+    TRACE("FAIL\n");
+    return nullptr;
+  }
+
+  fseek(file, 0, SEEK_END);
+  stream->size = (unsigned long)ftell(file);
+  if (!stream->size) {
+    fclose(file);
+    FT_FREE(stream);
+    TRACE("FAIL\n");
+    return nullptr;
+  }
+  fseek(file, 0, SEEK_SET);
+
+  stream->descriptor.pointer = file;
+  stream->read = ft_stream_io;
+  stream->close = ft_stream_close;
+
+  TRACE("OK\n");
+  return stream;
+}
+
+} // namespace ft

src/ft/stream.h

@@ -0,0 +1,22 @@
+// Aseprite FreeType Wrapper
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef FT_STREAM_H_INCLUDED
+#define FT_STREAM_H_INCLUDED
+#pragma once
+
+#include "ft/freetype_headers.h"
+
+#include <string>
+
+namespace ft {
+
+FT_Stream open_stream(FT_Library lib,
+                      const std::string& utf8Filename);
+
+} // namespace ft
+
+#endif

src/she/CMakeLists.txt

@@ -240,6 +240,7 @@ endif()
 add_library(she ${SHE_SOURCES})
 
 target_link_libraries(she
+  ft-lib
   gfx-lib
   laf-base
   ${FREETYPE_LIBRARIES})