X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontLoader.C;h=fafb7110b96fd9801d0f8f95e2637301417bb5ae;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=3901695e2ce780c171c0f050f1a6c33fee8d90b3;hpb=3660343dc7da7cb40b93448949dca02a579505d5;p=lyx.git diff --git a/src/FontLoader.C b/src/FontLoader.C index 3901695e2c..fafb7110b9 100644 --- a/src/FontLoader.C +++ b/src/FontLoader.C @@ -1,17 +1,16 @@ // -*- C++ -*- /* This file is part of - * ====================================================== + * ====================================================== * * 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,9 +21,18 @@ #include "FontInfo.h" #include "debug.h" #include "lyxrc.h" // lyxrc.font_* -extern LyXRC * lyxrc; +#include "BufferView.h" +#include "LyXView.h" #include "minibuffer.h" -extern MiniBuffer *minibuffer; + +using std::endl; + +extern BufferView * current_view; + + +// The global fontloader +FontLoader fontloader; + // Initialize font loader FontLoader::FontLoader() @@ -50,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; } } @@ -64,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; } } @@ -101,32 +109,32 @@ 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(); fontinfo[family][series][shape] = fi; - for (int cfam=0; cfam < 2; cfam++) { + for (int cfam = 0; cfam < 2; ++cfam) { // Determine family name 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; } @@ -134,7 +142,7 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family, default: ; } - for (int cser=0; cser < 4; cser++) { + for (int cser = 0; cser < 4; ++cser) { // Determine series name switch (series) { case LyXFont::MEDIUM_SERIES: @@ -157,7 +165,7 @@ void FontLoader::getFontinfo(LyXFont::FONT_FAMILY family, default: ; } - for (int csha=0; csha < 2; csha++) { + for (int csha = 0; csha < 2; ++csha) { // Determine shape name switch (shape) { case LyXFont::UP_SHAPE: @@ -195,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) { - getFontinfo(family,series,shape); - int fsize = int( (lyxrc->font_sizes[size] * lyxrc->dpi * - (lyxrc->zoom/100.0) ) / 72.27 + 0.5 ); + 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 ); string font = fontinfo[family][series][shape]->getFontname(fsize); @@ -213,37 +240,37 @@ XFontStruct * FontLoader::doLoad(LyXFont::FONT_FAMILY family, font = "fixed"; } - minibuffer->Store(); - minibuffer->Set(_("Loading font into X-Server...")); - - XFontStruct * fs = XLoadQueryFont(fl_display, font.c_str()); + XFontStruct * fs = 0; + current_view->owner()->getMiniBuffer()->Store(); + current_view->owner()->getMiniBuffer()->Set(_("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; } - minibuffer->Reset(); + + current_view->owner()->getMiniBuffer()->Reset(); fontstruct[family][series][shape][size] = fs; return fs;