* 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>
+#include <fcntl.h>
#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 "support/lyxlib.h"
+#include "figure_form.h"
#include "print_form.h"
#include "tex-strings.h"
#include "lyx_main.h"
#include "version.h"
#include "LyXView.h"
#include "buffer.h"
+#include "BufferView.h"
#include "lyxserver.h"
#include "lyxrc.h"
#include "gettext.h"
#include "lyxlookup.h"
#endif
#include "bufferlist.h"
-#include "language.h"
#include "ColorHandler.h"
#include "frontends/Dialogs.h"
#include "frontends/GUIRunTime.h"
-#include "frontends/xforms/xform_helpers.h" // for XformColor
+#include "frontends/xforms/xforms_helpers.h" // for XformColor
using std::endl;
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[] =
{"-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[] =
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 =
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);
ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - height; //DefaultScreen(fl_get_display())) - height;
// Initialize the LyXColorHandler
- lyxColorHandler = new LyXColorHandler;
+ lyxColorHandler.reset(new LyXColorHandler);
}
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)
// should a mapping exist.
{
string filename = AddName(user_lyxdir, "preferences.xform");
- XformColor::read( filename );
+ XformsColor::read( filename );
}
// Show the main & title form
{
if (!gui) return;
- guiruntime.runTime();
+ GUIRunTime::runTime();
}