commit 89b565de2a2a83df64c41ada30dd92dc99b25a06
Author: John Scipione <jscipione@gmail.com>
Date:   Wed Dec 14 18:15:59 2016 -0800

    WIP on beos font support

diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp
index 71aa053..7b90847 100644
--- a/src/servers/app/DesktopSettings.cpp
+++ b/src/servers/app/DesktopSettings.cpp
@@ -507,6 +507,51 @@ DesktopSettingsPrivate::DefaultFixedFont() const
 
 
 void
+DesktopSettingsPrivate::SetFallbackPlainFont(const ServerFont &font)
+{
+	fFallbackPlainFont = font;
+	Save(kFontSettings);
+}
+
+
+const ServerFont&
+DesktopSettingsPrivate::FallbackPlainFont() const
+{
+	return fFallbackPlainFont;
+}
+
+
+void
+DesktopSettingsPrivate::SetFallbackBoldFont(const ServerFont &font)
+{
+	fFallbackBoldFont = font;
+	Save(kFontSettings);
+}
+
+
+const ServerFont&
+DesktopSettingsPrivate::FallbackBoldFont() const
+{
+	return fFallbackBoldFont;
+}
+
+
+void
+DesktopSettingsPrivate::SetFallbackFixedFont(const ServerFont &font)
+{
+	fFallbackFixedFont = font;
+	Save(kFontSettings);
+}
+
+
+const ServerFont&
+DesktopSettingsPrivate::FallbackFixedFont() const
+{
+	return fFallbackFixedFont;
+}
+
+
+void
 DesktopSettingsPrivate::SetScrollBarInfo(const scroll_bar_info& info)
 {
 	fScrollBarInfo = info;
@@ -834,6 +879,27 @@ DesktopSettings::GetDefaultFixedFont(ServerFont &font) const
 
 
 void
+DesktopSettings::GetFallbackPlainFont(ServerFont &font) const
+{
+	font = fSettings->FallbackPlainFont();
+}
+
+
+void
+DesktopSettings::GetFallbackBoldFont(ServerFont &font) const
+{
+	font = fSettings->FallbackBoldFont();
+}
+
+
+void
+DesktopSettings::GetFallbackFixedFont(ServerFont &font) const
+{
+	font = fSettings->FallbackFixedFont();
+}
+
+
+void
 DesktopSettings::GetScrollBarInfo(scroll_bar_info& info) const
 {
 	info = fSettings->ScrollBarInfo();
diff --git a/src/servers/app/DesktopSettings.h b/src/servers/app/DesktopSettings.h
index 48677fb..c6f8ad3 100644
--- a/src/servers/app/DesktopSettings.h
+++ b/src/servers/app/DesktopSettings.h
@@ -45,6 +45,10 @@ public:
 			void				GetDefaultBoldFont(ServerFont& font) const;
 			void				GetDefaultFixedFont(ServerFont& font) const;
 
+			void				GetFallbackPlainFont(ServerFont& font) const;
+			void				GetFallbackBoldFont(ServerFont& font) const;
+			void				GetFallbackFixedFont(ServerFont& font) const;
+
 			void				GetScrollBarInfo(scroll_bar_info& info) const;
 			void				GetMenuInfo(menu_info& info) const;
 
diff --git a/src/servers/app/DesktopSettingsPrivate.h b/src/servers/app/DesktopSettingsPrivate.h
index 9983e3a..c5d2b71 100644
--- a/src/servers/app/DesktopSettingsPrivate.h
+++ b/src/servers/app/DesktopSettingsPrivate.h
@@ -38,6 +38,15 @@ public:
 			void				SetDefaultFixedFont(const ServerFont& font);
 			const ServerFont&	DefaultFixedFont() const;
 
+			void				SetFallbackPlainFont(const ServerFont& font);
+			const ServerFont&	FallbackPlainFont() const;
+
+			void				SetFallbackBoldFont(const ServerFont& font);
+			const ServerFont&	FallbackBoldFont() const;
+
+			void				SetFallbackFixedFont(const ServerFont& font);
+			const ServerFont&	FallbackFixedFont() const;
+
 			void				SetScrollBarInfo(const scroll_bar_info &info);
 			const scroll_bar_info& ScrollBarInfo() const;
 
@@ -103,6 +112,10 @@ private:
 			ServerFont			fBoldFont;
 			ServerFont			fFixedFont;
 
+			ServerFont			fFallbackPlainFont;
+			ServerFont			fFallbackBoldFont;
+			ServerFont			fFallbackFixedFont;
+
 			scroll_bar_info		fScrollBarInfo;
 			menu_info			fMenuInfo;
 			mode_mouse			fMouseMode;
diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp
index d3258e5..d84facb 100644
--- a/src/servers/app/ServerApp.cpp
+++ b/src/servers/app/ServerApp.cpp
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <syslog.h>
 
+#include <image.h>
+
 #include <AppDefs.h>
 #include <Autolock.h>
 #include <Debug.h>
@@ -138,9 +140,32 @@ ServerApp::ServerApp(Desktop* desktop, port_id clientReplyPort,
 	// record the current system wide fonts..
 	desktop->LockSingleWindow();
 	DesktopSettings settings(desktop);
-	settings.GetDefaultPlainFont(fPlainFont);
-	settings.GetDefaultBoldFont(fBoldFont);
-	settings.GetDefaultFixedFont(fFixedFont);
+
+	bool isBeOSApp = false;
+
+	// get image of executable
+	image_info info;
+	uint32 cookie = 0;
+	if (get_next_image_info(fClientTeam, (int32*)&cookie, &info)
+			== B_OK) {
+		if (info.type == B_APP_IMAGE
+			&& get_image_symbol(info.id, "__gHaikuStartupCode",
+				B_SYMBOL_TYPE_DATA, NULL) != B_OK) {
+			// we were linked on/for BeOS
+			isBeOSApp = true;
+		}
+	}
+
+	if (isBeOSApp) {
+		settings.GetFallbackPlainFont(fPlainFont);
+		settings.GetFallbackBoldFont(fBoldFont);
+		settings.GetFallbackFixedFont(fFixedFont);
+	} else {
+		settings.GetDefaultPlainFont(fPlainFont);
+		settings.GetDefaultBoldFont(fBoldFont);
+		settings.GetDefaultFixedFont(fFixedFont);
+	}
+
 	desktop->UnlockSingleWindow();
 
 	STRACE(("ServerApp %s:\n", Signature()));
@@ -1628,9 +1653,30 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver& link)
 			// into our own copies at this point.
 			DesktopSettings settings(fDesktop);
 
-			settings.GetDefaultPlainFont(fPlainFont);
-			settings.GetDefaultBoldFont(fBoldFont);
-			settings.GetDefaultFixedFont(fFixedFont);
+			bool isBeOSApp = false;
+
+			// get image of executable
+			image_info info;
+			uint32 cookie = 0;
+			if (get_next_image_info(fClientTeam, (int32*)&cookie, &info)
+					== B_OK) {
+				if (info.type == B_APP_IMAGE
+					&& get_image_symbol(info.id, "__gHaikuStartupCode",
+						B_SYMBOL_TYPE_DATA, NULL) != B_OK) {
+					// we were linked on/for BeOS
+					isBeOSApp = true;
+				}
+			}
+
+			if (isBeOSApp) {
+				settings.GetFallbackPlainFont(fPlainFont);
+				settings.GetFallbackBoldFont(fBoldFont);
+				settings.GetFallbackFixedFont(fFixedFont);
+			} else {
+				settings.GetDefaultPlainFont(fPlainFont);
+				settings.GetDefaultBoldFont(fBoldFont);
+				settings.GetDefaultFixedFont(fFixedFont);
+			}
 
 			fLink.StartMessage(B_OK);
 
diff --git a/src/servers/app/ServerConfig.h b/src/servers/app/ServerConfig.h
index 6416516..1b61258 100644
--- a/src/servers/app/ServerConfig.h
+++ b/src/servers/app/ServerConfig.h
@@ -28,18 +28,32 @@
 // These definitions provide the server something to use for default
 // system fonts.
 #define DEFAULT_PLAIN_FONT_FAMILY "Noto Sans"
-#define FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT"
 #define DEFAULT_PLAIN_FONT_STYLE "Book"
 #define DEFAULT_PLAIN_FONT_SIZE 12.0f
+
+//#define FALLBACK_PLAIN_FONT_FAMILY "Swis721 BT"
+#define FALLBACK_PLAIN_FONT_FAMILY "DejaVu Serif"
+#define FALLBACK_PLAIN_FONT_STYLE "Book"
+#define FALLBACK_PLAIN_FONT_SIZE 10.0f
+
 #define DEFAULT_BOLD_FONT_FAMILY "Noto Sans"
-#define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT"
 #define DEFAULT_BOLD_FONT_STYLE "Bold"
 #define DEFAULT_BOLD_FONT_SIZE 12.0f
+
+//#define FALLBACK_BOLD_FONT_FAMILY "Swis721 BT"
+#define FALLBACK_BOLD_FONT_FAMILY "DejaVu Serif"
+#define FALLBACK_BOLD_FONT_STYLE "Bold"
+#define FALLBACK_BOLD_FONT_SIZE 10.0f
+
 #define DEFAULT_FIXED_FONT_FAMILY "Noto Mono"
-#define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT"
 #define DEFAULT_FIXED_FONT_STYLE "Regular"
 #define DEFAULT_FIXED_FONT_SIZE 12.0f
 
+//#define FALLBACK_FIXED_FONT_FAMILY "Courier10 BT"
+#define FALLBACK_FIXED_FONT_FAMILY "DejaVu Sans Mono"
+#define FALLBACK_FIXED_FONT_STYLE "Regular"
+#define FALLBACK_FIXED_FONT_SIZE 10.0f
+
 // This is the port capacity for all monitoring objects - ServerApps
 // and ServerWindows
 #define DEFAULT_MONITOR_PORT_SIZE 50
diff --git a/src/servers/app/font/FontManager.cpp b/src/servers/app/font/FontManager.cpp
index bfbc5bb..efeaa65 100644
--- a/src/servers/app/font/FontManager.cpp
+++ b/src/servers/app/font/FontManager.cpp
@@ -111,6 +111,10 @@ FontManager::FontManager()
 	fDefaultBoldFont(NULL),
 	fDefaultFixedFont(NULL),
 
+	fFallbackPlainFont(NULL),
+	fFallbackBoldFont(NULL),
+	fFallbackFixedFont(NULL),
+
 	fScanned(false),
 	fNextID(0)
 {
@@ -138,6 +142,10 @@ FontManager::~FontManager()
 	delete fDefaultBoldFont;
 	delete fDefaultFixedFont;
 
+	delete fFallbackPlainFont;
+	delete fFallbackBoldFont;
+	delete fFallbackFixedFont;
+
 	// free families before we're done with FreeType
 
 	for (int32 i = fFamilies.CountItems(); i-- > 0;) {
@@ -478,14 +486,13 @@ FontManager::_GetDefaultStyle(const char *familyName, const char *styleName,
 status_t
 FontManager::_SetDefaultFonts()
 {
+	FontStyle* style;
+
 	// plain font
-	FontStyle* style = _GetDefaultStyle(DEFAULT_PLAIN_FONT_FAMILY,
+	style = _GetDefaultStyle(DEFAULT_PLAIN_FONT_FAMILY,
 		DEFAULT_PLAIN_FONT_STYLE, FALLBACK_PLAIN_FONT_FAMILY,
 		DEFAULT_PLAIN_FONT_STYLE,
 		B_REGULAR_FACE);
-	if (style == NULL)
-		return B_ERROR;
-
 	fDefaultPlainFont = new (std::nothrow) ServerFont(*style,
 		DEFAULT_PLAIN_FONT_SIZE);
 	if (fDefaultPlainFont == NULL)
@@ -494,16 +501,15 @@ FontManager::_SetDefaultFonts()
 	// bold font
 	style = _GetDefaultStyle(DEFAULT_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE,
 		FALLBACK_BOLD_FONT_FAMILY, DEFAULT_BOLD_FONT_STYLE, B_BOLD_FACE);
-
 	fDefaultBoldFont = new (std::nothrow) ServerFont(*style,
 		DEFAULT_BOLD_FONT_SIZE);
 	if (fDefaultBoldFont == NULL)
 		return B_NO_MEMORY;
 
 	// fixed font
-	style = _GetDefaultStyle(DEFAULT_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE,
-		FALLBACK_FIXED_FONT_FAMILY, DEFAULT_FIXED_FONT_STYLE, B_REGULAR_FACE);
-
+	style = _GetDefaultStyle(DEFAULT_FIXED_FONT_FAMILY,
+		DEFAULT_FIXED_FONT_STYLE, FALLBACK_FIXED_FONT_FAMILY,
+		DEFAULT_FIXED_FONT_STYLE, B_REGULAR_FACE);
 	fDefaultFixedFont = new (std::nothrow) ServerFont(*style,
 		DEFAULT_FIXED_FONT_SIZE);
 	if (fDefaultFixedFont == NULL)
@@ -511,6 +517,29 @@ FontManager::_SetDefaultFonts()
 
 	fDefaultFixedFont->SetSpacing(B_FIXED_SPACING);
 
+	// fallback plain font
+	style = GetStyle(FALLBACK_PLAIN_FONT_FAMILY, FALLBACK_PLAIN_FONT_STYLE);
+	fFallbackPlainFont = new (std::nothrow) ServerFont(*style,
+		FALLBACK_PLAIN_FONT_SIZE);
+	if (fFallbackPlainFont == NULL)
+		return B_NO_MEMORY;
+
+	// fallback bold font
+	style = GetStyle(FALLBACK_BOLD_FONT_FAMILY, FALLBACK_BOLD_FONT_STYLE);
+	fFallbackBoldFont = new (std::nothrow) ServerFont(*style,
+		FALLBACK_BOLD_FONT_SIZE);
+	if (fFallbackBoldFont == NULL)
+		return B_NO_MEMORY;
+
+	// fallback fixed font
+	style = GetStyle(FALLBACK_FIXED_FONT_FAMILY, FALLBACK_FIXED_FONT_STYLE);
+	fFallbackFixedFont = new (std::nothrow) ServerFont(*style,
+		FALLBACK_FIXED_FONT_SIZE);
+	if (fFallbackFixedFont == NULL)
+		return B_NO_MEMORY;
+
+	fFallbackFixedFont->SetSpacing(B_FIXED_SPACING);
+
 	return B_OK;
 }
 
diff --git a/src/servers/app/font/FontManager.h b/src/servers/app/font/FontManager.h
index 74fdc38..a402ebc 100644
--- a/src/servers/app/font/FontManager.h
+++ b/src/servers/app/font/FontManager.h
@@ -70,6 +70,10 @@ public:
 			const ServerFont*	DefaultBoldFont() const;
 			const ServerFont*	DefaultFixedFont() const;
 
+			const ServerFont*	FallbackPlainFont() const;
+			const ServerFont*	FallbackBoldFont() const;
+			const ServerFont*	FallbackFixedFont() const;
+
 			void				AttachUser(uid_t userID);
 			void				DetachUser(uid_t userID);
 
@@ -128,6 +132,10 @@ private:
 			ServerFont*			fDefaultBoldFont;
 			ServerFont*			fDefaultFixedFont;
 
+			ServerFont*			fFallbackPlainFont;
+			ServerFont*			fFallbackBoldFont;
+			ServerFont*			fFallbackFixedFont;
+
 			bool				fScanned;
 			int32				fNextID;
 };