0
@@ -17,6 +17,7 @@
0
 #define SHOES_IMAGE_DOWNLOAD  42
0
 #define SHOES_MAX_MESSAGE     100
0
 
0
+VALUE shoes_font_list();
0
 VALUE shoes_load_font(const char *);
0
 void shoes_native_init();
0
 void shoes_native_cleanup(shoes_world_t *world);

0
@@ -20,15 +20,10 @@
0
 
0
 #define SHOES_GTK_INVISIBLE_CHAR (gunichar)0x2022
0
 
0
-VALUE
0
-shoes_load_font(const char *filename)
0
+static VALUE
0
+shoes_make_font_list(FcFontSet *fonts)
0
 {
0
-  int i = 0;
0
   VALUE ary = rb_ary_new();
0
-  FcConfig *fc = FcConfigGetCurrent();
0
-  FcFontSet *fonts = FcFontSetCreate();
0
-  if (!FcFileScan(fonts, NULL, NULL, NULL, filename, FcTrue))
0
-    return Qnil;
0
   for (i = 0; i < fonts->nfont; i++)
0
   {
0
     FcValue val;
0
@@ -36,11 +31,35 @@ shoes_load_font(const char *filename)
0
     if (FcPatternGet(p, FC_FAMILY, 0, &val) == FcResultMatch)
0
       rb_ary_push(ary, rb_str_new2(val.u.s));
0
   }
0
+  return ary;
0
+}
0
+
0
+VALUE
0
+shoes_font_list()
0
+{
0
+  FcConfig *fc = FcConfigGetCurrent();
0
+  FcFontSet *fonts = FcConfigGetFonts(fc, FcSetSystem);
0
+  return shoes_make_font_list(fonts);
0
+}
0
+
0
+VALUE
0
+shoes_load_font(const char *filename)
0
+{
0
+  int i = 0;
0
+  FcConfig *fc = FcConfigGetCurrent();
0
+  FcFontSet *fonts = FcFontSetCreate();
0
+  if (!FcFileScan(fonts, NULL, NULL, NULL, filename, FcTrue))
0
+    return Qnil;
0
+
0
+  VALUE ary = shoes_make_font_list(fonts);
0
   FcFontSetDestroy(fonts);
0
 
0
   if (!FcConfigAppFontAddFile(fc, filename))
0
     return Qnil;
0
 
0
+  // refresh the FONTS list
0
+  rb_funcall(rb_const_get(cShoes, rb_intern("FONTS")), rb_intern("replace"), 1,
0
+    shoes_font_list());
0
   return rb_funcall(ary, rb_intern("uniq"), 0);
0
 }
0
 
0
@@ -48,6 +67,7 @@ void shoes_native_init()
0
 {
0
   curl_global_init(CURL_GLOBAL_ALL);
0
   gtk_init(NULL, NULL);
0
+  rb_const_set(cShoes, rb_intern("FONTS"), shoes_font_list());
0
 }
0
 
0
 void shoes_native_cleanup(shoes_world_t *world)

0
@@ -48,6 +48,7 @@ shoes_win32_center(HWND hwnd)
0
     (GetSystemMetrics(SM_CYSCREEN) - rc.bottom)/2,
0
      0, 0, SWP_NOZORDER|SWP_NOSIZE );
0
 }
0
+
0
 int
0
 shoes_win32_cmdvector(const char *cmdline, char ***argv)
0
 {
0
@@ -57,9 +58,35 @@ shoes_win32_cmdvector(const char *cmdline, char ***argv)
0
 VALUE
0
 shoes_load_font(const char *filename)
0
 {
0
+  VALUE allfonts, newfonts, oldfonts;
0
   int fonts = AddFontResourceEx(filename, FR_PRIVATE, 0);
0
   if (!fonts) return Qnil;
0
-  return rb_ary_new();
0
+  allfonts = shoes_font_list();
0
+  oldfonts = rb_const_get(cShoes, rb_intern("FONTS"));
0
+  newfonts = rb_funcall(allfonts, rb_intern("-"), 1, oldfonts);
0
+  rb_funcall(oldfonts, rb_intern("replace"), 1, allfonts);
0
+  return newfonts;
0
+}
0
+
0
+int CALLBACK
0
+shoes_font_list_iter(const LOGFONTA *font, const TEXTMETRICA *pfont, DWORD type, LPARAM l)
0
+{
0
+  VALUE ary = (VALUE)l;
0
+  rb_ary_push(l, rb_str_new2(font->lfFaceName));
0
+  return 1;
0
+}
0
+
0
+VALUE
0
+shoes_font_list()
0
+{
0
+  LOGFONT font;
0
+  VALUE ary = rb_ary_new();
0
+  HDC dc = GetDC(shoes_world->os.hidden);
0
+  SHOE_MEMZERO(&font, LOGFONT, 1);
0
+  font.lfCharSet = DEFAULT_CHARSET;
0
+  EnumFontFamiliesEx(dc, &font, shoes_font_list_iter, (LPARAM)ary, 0);
0
+  ReleaseDC(shoes_world->os.hidden, dc);
0
+  return rb_funcall(ary, rb_intern("sort"), 0);
0
 }
0
 
0
 void shoes_native_init()
0
@@ -71,6 +98,7 @@ void shoes_native_init()
0
   shoes_classex_init();
0
   shoes_world->os.hidden = CreateWindow(SHOES_HIDDENCLS, SHOES_HIDDENCLS, WS_OVERLAPPEDWINDOW,
0
     CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, shoes_world->os.instance, NULL);
0
+  rb_const_set(cShoes, rb_intern("FONTS"), shoes_font_list());
0
 }
0
 
0
 void shoes_native_cleanup(shoes_world_t *world)