X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontLoader.C;h=9b480e6a3ff22e2cb1eb8b0d8dc39dcd73436133;hb=4590c8cfab02a3bc56813cfb1f2e80bd1119af9e;hp=befabfb29071151a47f56b3af9919ac77834f337;hpb=d8b96c598c7cc488518c5b63907899400a789d56;p=lyx.git diff --git a/src/FontLoader.C b/src/FontLoader.C index befabfb290..9b480e6a3f 100644 --- a/src/FontLoader.C +++ b/src/FontLoader.C @@ -4,14 +4,13 @@ * * LyX, The Document Processor * - * Copyright (C) 1997 Asger Alstrup + * Copyright 1997 Asger Alstrup * and the LyX Team. * * ====================================================== */ #include #include // fabs() -#include // atoi() #ifdef __GNUG__ #pragma implementation "FontLoader.h" @@ -22,24 +21,32 @@ #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() { reset(); } + // Destroy font loader FontLoader::~FontLoader() { unload(); } + // Update fonts after zoom, dpi, font names, or norm change // For now, we just ditch all fonts we have. Later, we should // reuse the ones that are already loaded. @@ -48,40 +55,43 @@ void FontLoader::update() unload(); } + // Reset font loader 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; } } } + // Unload all fonts 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; } } } } + // Get font info /* Takes care of finding which font that can match the given request. Tries different alternatives. */ @@ -103,7 +113,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 +124,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 +207,38 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family, } } + +// A dummy fontstruct used when there is no gui. +namespace { + +XFontStruct dummyXFontStruct; +bool dummyXFontStructisGood = false; + +} // namespace anon + /// 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,37 +248,37 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, font = "fixed"; } - current_view->owner()->getMiniBuffer()->Store(); - current_view->owner()->getMiniBuffer()->Set(_("Loading font into X-Server...")); + XFontStruct * fs = 0; - XFontStruct * fs = XLoadQueryFont(fl_display, font.c_str()); + current_view->owner()->messagePush(_("Loading font into X-Server...")); + 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"); - } - } else { - if (lyxerr.debugging(Debug::FONT)) { - // Tell user the font matching - LyXFont f; - f.setFamily(family); - f.setSeries(series); - f.setShape(shape); - f.setSize(size); - // The rest of the attributes are not interesting - f.setEmph(LyXFont::INHERIT); - f.setUnderbar(LyXFont::INHERIT); - f.setNoun(LyXFont::INHERIT); - f.setLatex(LyXFont::INHERIT); - f.setColor(LyXFont::INHERIT_COLOR); - lyxerr << "Font '" << f.stateText() - << "' matched by\n" << font << endl; + fs = XLoadQueryFont(fl_get_display(), "fixed"); } + } else if (lyxerr.debugging(Debug::FONT)) { + // Tell user the font matching + LyXFont f; + f.setFamily(family); + f.setSeries(series); + f.setShape(shape); + f.setSize(size); + // The rest of the attributes are not interesting + f.setEmph(LyXFont::INHERIT); + f.setUnderbar(LyXFont::INHERIT); + f.setNoun(LyXFont::INHERIT); + f.setLatex(LyXFont::INHERIT); + f.setColor(LColor::inherit); + lyxerr << "Font '" << f.stateText(0) + << "' matched by\n" << font << endl; } - current_view->owner()->getMiniBuffer()->Reset(); + + current_view->owner()->messagePop(); fontstruct[family][series][shape][size] = fs; return fs;