From f36c28fab7040a8b4254e85f04acd86479bdd77a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 9 Sep 2010 15:42:31 +0000 Subject: [PATCH] Find the font directories on Haiku. This was left off a previous patch somehow. --- src/fonts.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/fonts.c b/src/fonts.c index e1e155088..89ea0e9d7 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -950,6 +950,16 @@ static void loadfonts(SDL_Surface * screen, const char *const dir) loadfonts(screen, "/boot/home/config/font/ttffonts"); loadfonts(screen, "/usr/share/fonts"); loadfonts(screen, "/usr/X11R6/lib/X11/fonts"); +#elif defined(__HAIKU__) + dev_t volume = dev_for_path("/boot"); + char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH]; + status_t result; + result = find_directory(B_SYSTEM_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); + result = find_directory(B_COMMON_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); + result = find_directory(B_USER_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer)); + loadfonts(screen, buffer); #elif defined(__APPLE__) loadfonts(screen, "/System/Library/Fonts"); loadfonts(screen, "/Library/Fonts");