Fix fuer #209

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 6afd11fb58e8497b445388e826320895b803d008..50ebac4742f04aa117abf3ecc2a87a34e46ce975 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -9,8 +9,6 @@
  * ====================================================== */
 
 #include <config.h>
-#include <cstdlib>
-#include <fcntl.h>
 
 #ifdef __GNUG__
 #pragma implementation
@@ -18,9 +16,6 @@
 
 #include "lyx_gui.h"
 #include FORMS_H_LOCATION
-#include "support/filetools.h"
-#include "support/os.h"
-#include "support/lyxlib.h"
 #include "figure_form.h"
 #include "print_form.h"
 #include "tex-strings.h"
@@ -39,10 +34,17 @@
 #endif
 #include "bufferlist.h"
 #include "ColorHandler.h"
-#include "frontends/Dialogs.h"
+
 #include "frontends/GUIRunTime.h"
 #include "frontends/xforms/xforms_helpers.h" // for XformColor
 
+#include "support/filetools.h"
+#include "support/os.h"
+#include "support/lyxlib.h"
+
+#include <cstdlib>
+#include <fcntl.h>
+
 using std::endl;
 
 FD_form_sendto * fd_form_sendto;
@@ -75,12 +77,13 @@ FL_resource res[] =
 };
 
 
-extern "C"
+extern "C" {
+       
+static
 int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
 {
-       // emergency save
-       if (!bufferlist.empty())
-               bufferlist.emergencyWriteAll();
+       // emergency cleanup
+       LyX::emergencyCleanup();
 
        // Get the reason for the crash.
        char etxt[513];
@@ -90,6 +93,8 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
        lyx::abort();
        return 0; // Solaris CC wants us to return something
 }
+       
+}
 
 
 LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
@@ -134,25 +139,27 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        
        // If width is not set by geometry, check it against monitor width
        if (!(geometryBitmask & 4)) {
-               Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
+               Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
                if (WidthOfScreen(scr) - 8 < width)
                        width = WidthOfScreen(scr) - 8;
        }
 
        // If height is not set by geometry, check it against monitor height
        if (!(geometryBitmask & 8)) {
-               Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
+               Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
                if (HeightOfScreen(scr) - 24 < height)
                        height = HeightOfScreen(scr) - 24;
        }
 
        // Recalculate xpos if it's negative
        if (geometryBitmask & 16)
-               xpos += WidthOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - width; //DefaultScreen(fl_get_display())) - width;
+               xpos += WidthOfScreen(ScreenOfDisplay(fl_get_display(),
+                                                     fl_screen)) - width;
 
        // Recalculate ypos if it's negative
        if (geometryBitmask & 32)
-               ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - height; //DefaultScreen(fl_get_display())) - height;
+               ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(),
+                                                      fl_screen)) - height;
 
        // Initialize the LyXColorHandler
        lyxColorHandler.reset(new LyXColorHandler);
@@ -187,16 +194,16 @@ void LyXGUI::init()
 
        create_forms();
 
-       if (lyxrc.font_norm_menu.empty())
-               lyxrc.font_norm_menu = lyxrc.font_norm;
+       if (lyxrc.popup_font_encoding.empty())
+               lyxrc.popup_font_encoding = lyxrc.font_norm;
        // Set the font name for popups and menus
-        string boldfontname = lyxrc.menu_font_name 
+        string boldfontname = lyxrc.popup_bold_font
                               + "-*-*-*-?-*-*-*-*-"  
-                              + lyxrc.font_norm_menu;
+                              + lyxrc.popup_font_encoding;
                // "?" means "scale that font"
-        string fontname = lyxrc.popup_font_name 
+        string fontname = lyxrc.popup_normal_font 
                               + "-*-*-*-?-*-*-*-*-"  
-                              + lyxrc.font_norm_menu;
+                              + lyxrc.popup_font_encoding;
 
        int bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
        int normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
@@ -234,6 +241,11 @@ void LyXGUI::init()
        fl_setpup_fontsize(FL_NORMAL_SIZE);
        fl_setpup_color(FL_MCOL, FL_BLACK);
        fl_set_goodies_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#if FL_REVISION < 89 
+       fl_set_oneliner_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#else
+       fl_set_tooltip_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#endif
 
         // all lyxrc settings has to be done here as lyxrc has not yet
         // been read when the GUI is created (Jug)
@@ -289,10 +301,8 @@ void LyXGUI::create_forms()
 
        // 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");
-               XformsColor::read( filename );
-       }
+       string const filename = AddName(user_lyxdir, "preferences.xform");
+       XformsColor::read( filename );
        
        // Show the main & title form
        int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;
@@ -303,9 +313,6 @@ void LyXGUI::create_forms()
        }
 
        lyxViews->show(main_placement, FL_FULLBORDER, "LyX");
-
-       if (lyxrc.show_banner)
-               lyxViews->getDialogs()->showSplash();
 }