remove defaults stuff, let Qt handle no toolbar

[lyx.git] / src / frontends / xforms / xfont_loader.C

diff --git a/src/frontends/xforms/xfont_loader.C b/src/frontends/xforms/xfont_loader.C
index 1e4305ebe75c3b0abf588c894b5bb586586251dd..4cd0c45bd6e894e9238648ada211399f9e8d5b76 100644 (file)
--- a/src/frontends/xforms/xfont_loader.C
+++ b/src/frontends/xforms/xfont_loader.C
@@ -11,9 +11,6 @@
 #include <config.h>
 #include <cmath>       // fabs()
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "xfont_loader.h"
 #include "FontInfo.h"
@@ -22,6 +19,9 @@
 #include "lyxrc.h"     // lyxrc.font_*
 #include "BufferView.h"
 #include "frontends/LyXView.h"
+#include "frontends/lyx_gui.h"
+#include "support/systemcall.h"
+#include "support/filetools.h"
 
 #include FORMS_H_LOCATION
 
@@ -89,6 +89,73 @@ void xfont_loader::unload()
                        }
 }
 
+namespace {
+
+string const symbolPattern(LyXFont::FONT_FAMILY family)
+{
+       switch (family) {
+       case LyXFont::SYMBOL_FAMILY:
+               return "-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific";
+
+       case LyXFont::CMR_FAMILY:
+               return "-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::CMSY_FAMILY:
+               return "-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::CMM_FAMILY:
+               return "-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::CMEX_FAMILY:
+               return "-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::MSA_FAMILY:
+               return "-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::MSB_FAMILY:
+               return "-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::EUFRAK_FAMILY:
+               return "-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+       case LyXFont::WASY_FAMILY:
+               return "-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*";
+
+       default:
+               return string();
+       }
+}
+
+string const fontName(string const & family, string const & foundry)
+{
+       if (foundry.empty() || foundry == "Xft")
+               return "-*-"+family;
+       else
+               return "-"+foundry+"-"+family;
+}
+
+
+bool addFontPath()
+{
+       string const dir =  OnlyPath(LibFileSearch("xfonts", "fonts.dir"));
+       if (!dir.empty()) {
+               int n;
+               char ** p = XGetFontPath(fl_get_display(), &n);
+               if (std::find(p, p + n, dir) != p + n)
+                       return false;
+               lyxerr[Debug::FONT] << "Adding " << dir
+                                   << " to the font path." << endl;
+               string const command = "xset fp+ " + dir;
+               Systemcall s;
+               if (!s.startscript(Systemcall::Wait, command))
+                       return true;
+               lyxerr << "Unable to add " << dir << "to the font path."
+                      << endl;
+       }
+       return false;
+}
+
+} // namespace anon
 
 // Get font info
 /* Takes care of finding which font that can match the given request. Tries
@@ -102,55 +169,20 @@ void xfont_loader::getFontinfo(LyXFont::FONT_FAMILY family,
                return;
 
        // Special fonts
-       switch (family)
-       {
-               case LyXFont::SYMBOL_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-symbol-*-*-*-*-*-*-*-*-*-*-adobe-fontspecific");
-                       return;
-
-               case LyXFont::CMR_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-cmr10-medium-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::CMSY_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-cmsy10-*-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::CMM_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-cmmi10-medium-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::CMEX_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-cmex10-*-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::MSA_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-msam10-*-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::MSB_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-msbm10-*-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::EUFRAK_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-eufm10-medium-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               case LyXFont::WASY_FAMILY:
-                       fontinfo[family][series][shape] =
-                               new FontInfo("-*-wasy10-medium-*-*-*-*-*-*-*-*-*-*-*");
-                       return;
-
-               default:
-                       break;
+       string pat = symbolPattern(family);
+       if (!pat.empty()) {
+               static bool first_time = true;
+               fontinfo[family][series][shape] = new FontInfo(pat);
+               if (family != LyXFont::SYMBOL_FAMILY &&
+                   !fontinfo[family][series][shape]->exist() &&
+                   first_time) {
+                       first_time = false;
+                       if (addFontPath()) {
+                               delete fontinfo[family][series][shape];
+                               fontinfo[family][series][shape] = new FontInfo(pat);
+                       }
+               }
+               return;
        }
 
 
@@ -169,21 +201,27 @@ void xfont_loader::getFontinfo(LyXFont::FONT_FAMILY family,
                switch (family) {
                case LyXFont::ROMAN_FAMILY:
                        switch (cfam) {
-                       case 0: ffamily = lyxrc.roman_font_name; break;
+                       case 0: ffamily = fontName(lyxrc.roman_font_name,
+                                                  lyxrc.roman_font_foundry);
+                               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 = fontName(lyxrc.sans_font_name,
+                                                  lyxrc.sans_font_foundry);
+                               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 = fontName(lyxrc.typewriter_font_name,
+                                                  lyxrc.typewriter_font_foundry);
+                               break;
                        case 1: ffamily = "-*-courier";
                        default: cfam = 100;
                        }
@@ -267,7 +305,7 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
                                LyXFont::FONT_SHAPE shape,
                                LyXFont::FONT_SIZE size)
 {
-       if (!lyxrc.use_gui) {
+       if (!lyx_gui::use_gui) {
                if (!dummyXFontStructisGood) {
                        // no character specific info
                        dummyXFontStruct.per_char = 0;
@@ -282,6 +320,7 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
        }
 
        getFontinfo(family, series, shape);
+       // FIXME! CHECK! Should we use 72.0 or 72.27? (Lgb)
        int fsize = int((lyxrc.font_sizes[size] * lyxrc.dpi *
                          (lyxrc.zoom/100.0)) / 72.27 + 0.5);
 
@@ -328,11 +367,10 @@ XFontStruct * xfont_loader::doLoad(LyXFont::FONT_FAMILY family,
 
 bool xfont_loader::available(LyXFont const & f)
 {
-       if (!lyxrc.use_gui)
+       if (!lyx_gui::use_gui)
                return false;
 
        if (!fontinfo[f.family()][f.series()][f.realShape()])
                getFontinfo(f.family(), f.series(), f.realShape());
-       return fontinfo[f.family()][f.series()][f.realShape()]
-               ->getFontname(f.size()).size();
+       return fontinfo[f.family()][f.series()][f.realShape()]->exist();
 }