Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 306d8749e918fff0488e29fff4bea5f7c513f190..27526090cb329cd6d8311cfc2578666e9651513f 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -4,25 +4,22 @@
  *           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>
-#include <clocale>
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-//#include <fcntl.h>
 #include "lyx_gui.h"
 #include FORMS_H_LOCATION
 #include "support/filetools.h"
-#include "combox.h"
-#include "lyx.h"
-#include "form1.h"
+#include "support/os.h"
+#include "figure_form.h"
 #include "print_form.h"
 #include "tex-strings.h"
 #include "lyx_main.h"
@@ -30,6 +27,7 @@
 #include "version.h"
 #include "LyXView.h"
 #include "buffer.h"
+#include "BufferView.h"
 #include "lyxserver.h"
 #include "lyxrc.h"
 #include "gettext.h"
@@ -51,7 +49,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[] =
@@ -59,11 +56,15 @@ FL_CMD_OPT cmdopt[] =
        {"-geometry", "*.geometry", XrmoptionSepArg, "690x510"}
 };
 
-static int width  = 690;
-static int height = 510;
-static int xpos   = -1;
-static int ypos   = -1;
-static char geometry[40];
+namespace {
+
+int width  = 690;
+int height = 510;
+int xpos   = -1;
+int ypos   = -1;
+char geometry[40];
+
+} // namespace anon
 
 
 FL_resource res[] =
@@ -103,7 +104,7 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        fl_initialize(argc, argv, "LyX", cmdopt, num_res);
        // It appears that, in xforms >=0.89.5, fl_initialize()
        // calls setlocale() and ruins our LC_NUMERIC setting.
-       setlocale(LC_NUMERIC, "C");
+       locale_init();
        fl_get_app_resources(res, num_res);
 
        static const int geometryBitmask =
@@ -116,6 +117,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);
@@ -264,7 +266,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)
@@ -309,7 +311,7 @@ void LyXGUI::runTime()
 {
        if (!gui) return;
 
-       guiruntime.runTime();
+       GUIRunTime::runTime();
 }