X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontLoader.C;h=fafb7110b96fd9801d0f8f95e2637301417bb5ae;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=a6446a6439849600667fe29c19a4abf47051d95c;hpb=a0cf758d5a79140045c2a90e2ff5878e0b391bcc;p=lyx.git

diff --git a/src/FontLoader.C b/src/FontLoader.C
index a6446a6439..fafb7110b9 100644
--- a/src/FontLoader.C
+++ b/src/FontLoader.C
@@ -11,7 +11,6 @@
 
 #include <config.h>
 #include <cmath>	// fabs()
-#include <cstdlib>	// atoi()
 
 #ifdef __GNUG__
 #pragma implementation "FontLoader.h"
@@ -22,12 +21,19 @@
 #include "FontInfo.h"
 #include "debug.h"
 #include "lyxrc.h"	// lyxrc.font_*
-extern LyXRC * lyxrc;
 #include "BufferView.h"
 #include "LyXView.h"
 #include "minibuffer.h"
+
+using std::endl;
+
 extern BufferView * current_view;
 
+
+// The global fontloader
+FontLoader fontloader;
+
+
 // Initialize font loader
 FontLoader::FontLoader()
 {
@@ -52,11 +58,11 @@ void FontLoader::update()
 void FontLoader::reset()
 {
 	// Clear font infos, font structs and font metrics
-	for (int i1 = 0; i1<4; i1++)
-		for (int i2 = 0; i2<2; i2++)
-			for (int i3 = 0; i3<4; i3++) {
+	for (int i1 = 0; i1 < 4; ++i1)
+		for (int i2 = 0; i2 < 2; ++i2)
+			for (int i3 = 0; i3 < 4; ++i3) {
 				fontinfo[i1][i2][i3] = 0;
-				for (int i4 = 0; i4<10; i4++) {
+				for (int i4 = 0; i4<10; ++i4) {
 					fontstruct[i1][i2][i3][i4] = 0;
 				}
 			}
@@ -66,16 +72,16 @@ void FontLoader::reset()
 void FontLoader::unload() 
 {
 	// Unload all fonts
-	for (int i1 = 0; i1<4; i1++)
-		for (int i2 = 0; i2<2; i2++)
-			for (int i3 = 0; i3<4; i3++) {
+	for (int i1 = 0; i1 < 4; ++i1)
+		for (int i2 = 0; i2 < 2; ++i2)
+			for (int i3 = 0; i3 < 4; ++i3) {
 				if (fontinfo[i1][i2][i3]) {
 					delete fontinfo[i1][i2][i3];
 					fontinfo[i1][i2][i3] = 0;
 				}
-				for (int i4 = 0; i4<10; i4++) {
+				for (int i4 = 0; i4 < 10; ++i4) {
 					if (fontstruct[i1][i2][i3][i4]) {
-						XFreeFont(fl_display, fontstruct[i1][i2][i3][i4]);
+						XFreeFont(fl_get_display(), fontstruct[i1][i2][i3][i4]);
 						fontstruct[i1][i2][i3][i4] = 0;
 					}
 				}
@@ -103,7 +109,7 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
 	string ffamily;
 	string fseries;
 	string fshape;
-	string norm = lyxrc->font_norm;
+	string norm = lyxrc.font_norm;
 	string fontname;
 
 	FontInfo * fi = new FontInfo();
@@ -114,21 +120,21 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
 		switch (family) {
 		case LyXFont::ROMAN_FAMILY:
 			switch (cfam) {
-			case 0: ffamily = lyxrc->roman_font_name; break;
+			case 0: ffamily = lyxrc.roman_font_name; break;
 			case 1: ffamily = "-*-times";
 			default: cfam = 100;
 			}
 			break;
 		case LyXFont::SANS_FAMILY:
 			switch (cfam) {
-			case 0: ffamily = lyxrc->sans_font_name; break;
+			case 0: ffamily = lyxrc.sans_font_name; break;
 			case 1: ffamily = "-*-helvetica";
 			default: cfam = 100;
 			}
 			break;
 		case LyXFont::TYPEWRITER_FAMILY:
 			switch (cfam) {
-			case 0: ffamily = lyxrc->typewriter_font_name; break;
+			case 0: ffamily = lyxrc.typewriter_font_name; break;
 			case 1: ffamily = "-*-courier";
 			default: cfam = 100;
 			}
@@ -197,15 +203,34 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family,
 	}
 }
 
+
+// A dummy fontstruct used when there is no gui. 
+static XFontStruct dummyXFontStruct;
+static bool dummyXFontStructisGood = false;
+
 /// Do load font
 XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, 
 				LyXFont::FONT_SERIES series, 
 				LyXFont::FONT_SHAPE shape, 
 				LyXFont::FONT_SIZE size)
 {
+	if (!lyxrc.use_gui) {
+		if (!dummyXFontStructisGood) {
+			// no character specific info
+			dummyXFontStruct.per_char = 0; 
+			// unit ascent on character displays
+			dummyXFontStruct.ascent = 1; 
+			// no descent on character displays
+			dummyXFontStruct.descent = 0; 
+			dummyXFontStructisGood = true;
+		}
+
+		return &dummyXFontStruct;
+	}
+
 	getFontinfo(family, series, shape);
-	int fsize = int( (lyxrc->font_sizes[size] * lyxrc->dpi * 
-			  (lyxrc->zoom/100.0) ) / 72.27 + 0.5 );
+	int fsize = int( (lyxrc.font_sizes[size] * lyxrc.dpi * 
+			  (lyxrc.zoom/100.0) ) / 72.27 + 0.5 );
 
 	string font = fontinfo[family][series][shape]->getFontname(fsize);
 
@@ -215,17 +240,18 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
 		font = "fixed";
 	}
 
+	XFontStruct * fs = 0;
+
 	current_view->owner()->getMiniBuffer()->Store();
 	current_view->owner()->getMiniBuffer()->Set(_("Loading font into X-Server..."));
-
-	XFontStruct * fs = XLoadQueryFont(fl_display, font.c_str());
-
+	fs = XLoadQueryFont(fl_get_display(), font.c_str());
+	
 	if (fs == 0) {
 		if (font == "fixed") {
 			lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
 		} else {
 			lyxerr << "Could not get font. Using 'fixed'." << endl;
-			fs = XLoadQueryFont(fl_display, "fixed");
+			fs = XLoadQueryFont(fl_get_display(), "fixed");
 		}
 	} else if (lyxerr.debugging(Debug::FONT)) {
 		// Tell user the font matching
@@ -240,7 +266,7 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family,
 		f.setNoun(LyXFont::INHERIT);
 		f.setLatex(LyXFont::INHERIT);
 		f.setColor(LColor::inherit);
-		lyxerr << "Font '" << f.stateText() 
+		lyxerr << "Font '" << f.stateText(0) 
 		       << "' matched by\n" << font << endl;
 	}