-// -*- C++ -*-
/* This file is part of
* ======================================================
*
#pragma implementation "FontLoader.h"
#endif
-#include "gettext.h"
#include "FontLoader.h"
#include "FontInfo.h"
+#include "gettext.h"
#include "debug.h"
#include "lyxrc.h" // lyxrc.font_*
#include "BufferView.h"
#include "LyXView.h"
-#include "minibuffer.h"
+#include "frontends/GUIRunTime.h"
using std::endl;
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.
unload();
}
+
// Reset font loader
void FontLoader::reset()
{
}
}
+
// Unload all fonts
void FontLoader::unload()
{
}
for (int i4 = 0; i4 < 10; ++i4) {
if (fontstruct[i1][i2][i3][i4]) {
- XFreeFont(fl_get_display(), fontstruct[i1][i2][i3][i4]);
+ XFreeFont(GUIRunTime::x11Display(), 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. */
}
-// A dummy fontstruct used when there is no gui.
-static XFontStruct dummyXFontStruct;
-static bool dummyXFontStructisGood = false;
+// 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,
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());
+ current_view->owner()->messagePush(_("Loading font into X-Server..."));
+
+ fs = XLoadQueryFont(GUIRunTime::x11Display(), 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_get_display(), "fixed");
+ fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
}
} else if (lyxerr.debugging(Debug::FONT)) {
// Tell user the font matching
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;