Dekels tabular/textinset patches

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 20c8b6ffc4741ac20031ff59592b65c9d84dfabb..ddff923cc32a444315ea5371ce0752dbb980bb91 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -35,11 +35,14 @@
 #include "lyxrc.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h"
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
+#endif
 #include "bufferlist.h"
 #include "language.h"
 #include "ColorHandler.h"
 #include "frontends/GUIRunTime.h"
+#include "frontends/xforms/xform_helpers.h" // for XformColor
 
 using std::endl;
 
@@ -56,6 +59,7 @@ extern LyXServer * lyxserver;
 extern bool finished;  // flag, that we are quitting the program
 extern BufferList bufferlist;
 extern GUIRunTime guiruntime;
+extern string user_lyxdir;
 
 FL_CMD_OPT cmdopt[] =
 {
@@ -129,14 +133,14 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        if (height < 400) height = 400;
        
        // If width is not set by geometry, check it against monitor width
-       if ( !(geometryBitmask & 4) ) {
+       if (!(geometryBitmask & 4)) {
                Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
                if (WidthOfScreen(scr) - 8 < width)
                        width = WidthOfScreen(scr) - 8;
        }
 
        // If height is not set by geometry, check it against monitor height
-       if ( !(geometryBitmask & 8) ) {
+       if (!(geometryBitmask & 8)) {
                Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
                if (HeightOfScreen(scr) - 24 < height)
                        height = HeightOfScreen(scr) - 24;
@@ -163,8 +167,9 @@ LyXGUI::~LyXGUI()
        delete lyxserver;
        lyxserver = 0;
        delete lyxViews;
-
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
        CloseLyXLookup();
+#endif
 }
 
 
@@ -185,35 +190,41 @@ void LyXGUI::init()
        if (lyxrc.font_norm_menu.empty())
                lyxrc.font_norm_menu = lyxrc.font_norm;
        // Set the font name for popups and menus
-        string menufontname = lyxrc.menu_font_name 
+        string boldfontname = lyxrc.menu_font_name 
                               + "-*-*-*-?-*-*-*-*-"  
                               + lyxrc.font_norm_menu;
                // "?" means "scale that font"
-        string popupfontname = lyxrc.popup_font_name 
+        string fontname = lyxrc.popup_font_name 
                               + "-*-*-*-?-*-*-*-*-"  
                               + lyxrc.font_norm_menu;
 
-       int bold = fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str());
-       int normal = fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str());
+       int bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
+       int normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
         if (bold < 0)
                 lyxerr << "Could not set menu font to "
-                      << menufontname << endl;
+                      << boldfontname << endl;
 
         if (normal < 0)
                 lyxerr << "Could not set popup font to "
-                      << popupfontname << endl;
+                      << fontname << endl;
 
        if (bold < 0 && normal < 0) {
                lyxerr << "Using 'helvetica' font for menus" << endl;
-               bold = fl_set_font_name(FL_BOLD_STYLE,
-                                       "-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1");
-               normal = fl_set_font_name(FL_NORMAL_STYLE,
-                                         "-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1");
+               boldfontname = "-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1";
+               fontname = "-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1";
+               bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
+               normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
+
                if (bold < 0 && normal < 0) {
                        lyxerr << "Could not find helvetica font. Using 'fixed'." << endl;
-                       normal = fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+                       fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+                       normal = bold = 0;
                }
        }
+       if (bold < 0)
+               fl_set_font_name(FL_BOLD_STYLE, fontname.c_str());
+       else if (normal < 0)
+               fl_set_font_name(FL_NORMAL_STYLE, boldfontname.c_str());
 
        // put here (after fl_initialize) to avoid segfault. Cannot be done
        // in setDefaults() (Matthias 140496)
@@ -312,6 +323,10 @@ void LyXGUI::create_forms()
        fl_addto_choice(fd_form_character->choice_color, 
                        _(" No change %l| No color | Black | White | Red | Green "
                        "| Blue | Cyan | Magenta | Yellow %l| Reset "));
+       // Appears to need initialising to avoid seg fault when dialog is
+       // launched. Over-written by combo_language2, below
+       fl_addto_choice(fd_form_character->choice_language,
+                       _(" English %l| German | French "));
        fl_set_form_minsize(fd_form_character->form_character,
                            fd_form_character->form_character->w,
                            fd_form_character->form_character->h);
@@ -327,7 +342,7 @@ void LyXGUI::create_forms()
        // build up the combox entries
        combo_language2->addline(_("No change"));
        combo_language2->addline(_("Reset"));
-       for(Languages::const_iterator cit = languages.begin();
+       for (Languages::const_iterator cit = languages.begin();
            cit != languages.end(); ++cit) {
 #ifdef DO_USE_DEFAULT_LANGUAGE
            if ((*cit).second.lang() != "default")
@@ -355,6 +370,13 @@ void LyXGUI::create_forms()
        fl_set_form_atclose(fd_latex_log->LaTeXLog,
                            CancelCloseBoxCB, 0);
 
+       // This is probably as good a time as any to map the xform colours,
+       // should a mapping exist.
+       {
+               string filename = AddName(user_lyxdir, "preferences.xform");
+               XformColor::read( filename );
+       }
+       
        // Show the main & title form
        int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;
        int title_placement = FL_PLACE_CENTER;