Revoke change made the other day to make menus appear as bold.

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 9ed81a8323ba6d1386455d4fad249a0bc2b7db80..9bb2bf2b82eb95cb7495defce2e53ea5370e9902 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -4,21 +4,18 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include <cstdlib>
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-//#include <fcntl.h>
 #include "lyx_gui.h"
 #include FORMS_H_LOCATION
-#include "support/filetools.h"
 #include "figure_form.h"
 #include "print_form.h"
 #include "tex-strings.h"
@@ -27,6 +24,7 @@
 #include "version.h"
 #include "LyXView.h"
 #include "buffer.h"
+#include "BufferView.h"
 #include "lyxserver.h"
 #include "lyxrc.h"
 #include "gettext.h"
@@ -36,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;
@@ -48,7 +53,6 @@ FD_form_figure * fd_form_figure;
 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[] =
@@ -73,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];
@@ -88,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)
@@ -117,6 +124,7 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        Display * display = fl_get_display();
        if (!display) {
                lyxerr << "LyX: unable to access X display, exiting" << endl;
+               os::warn("Unable to access X display, exiting");
                exit(1);
        }
        fcntl(ConnectionNumber(display), F_SETFD, FD_CLOEXEC);
@@ -131,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);
@@ -184,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());
@@ -265,7 +275,7 @@ void LyXGUI::init()
 void LyXGUI::create_forms()
 {
        lyxerr[Debug::INIT] << "Initializing LyXView..." << endl;
-       lyxViews = new LyXView(width, height);
+       lyxViews = GUIRunTime::createMainView(width, height);
        lyxerr[Debug::INIT] << "Initializing LyXView...done" << endl;
 
        // From here down should be done by somebody else. (Lgb)
@@ -286,10 +296,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;
@@ -300,9 +308,6 @@ void LyXGUI::create_forms()
        }
 
        lyxViews->show(main_placement, FL_FULLBORDER, "LyX");
-
-       if (lyxrc.show_banner)
-               lyxViews->getDialogs()->showSplash();
 }
 
 
@@ -310,7 +315,7 @@ void LyXGUI::runTime()
 {
        if (!gui) return;
 
-       guiruntime.runTime();
+       GUIRunTime::runTime();
 }