* 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 "layout_forms.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 "log_form.h"
#include "debug.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/GUIRunTime.h"
-#include "frontends/xforms/xform_helpers.h" // for XformColor
+#include "frontends/xforms/xforms_helpers.h" // for XformColor
using std::endl;
-FD_form_title * fd_form_title;
-FD_form_character * fd_form_character;
-FD_form_preamble * fd_form_preamble;
FD_form_sendto * fd_form_sendto;
FD_form_figure * fd_form_figure;
-FD_LaTeXLog * fd_latex_log; // from log_form.h
-Combox * combo_language;
-Combox * combo_language2;
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[] =
};
-extern "C"
+extern "C" {
+
+static
int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
{
// emergency save
lyx::abort();
return 0; // Solaris CC wants us to return something
}
+
+}
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 =
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)
// Create forms
//
- // the title form
- string banner_file = LibFileSearch("images", "banner", "xpm");
- if (lyxrc.show_banner && !banner_file.empty()) {
- fd_form_title = create_form_form_title();
- fl_set_form_dblbuffer(fd_form_title->form_title, 1); // use dbl buffer
- fl_set_form_atclose(fd_form_title->form_title, CancelCloseBoxCB, 0);
- fl_addto_form(fd_form_title->form_title);
- FL_OBJECT *obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 0, 0, 425, 290, "");
- fl_set_pixmapbutton_file(obj, banner_file.c_str());
-
- fl_set_pixmapbutton_focus_outline(obj, 3);
- fl_set_button_shortcut(obj, "^M ^[", 1);
- fl_set_object_boxtype(obj, FL_NO_BOX);
- fl_set_object_callback(obj, TimerCB, 0);
-
- obj = fl_add_text(FL_NORMAL_TEXT, 248, 265, 170, 16, LYX_VERSION);
- fl_set_object_lsize(obj, FL_NORMAL_SIZE);
- fl_mapcolor(FL_FREE_COL2, 0x05, 0x2e, 0x4c);
- fl_mapcolor(FL_FREE_COL3, 0xe1, 0xd2, 0x9b);
- fl_set_object_color(obj, FL_FREE_COL2, FL_FREE_COL2);
- fl_set_object_lcol(obj, FL_FREE_COL3);
- fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
- fl_set_object_lstyle(obj, FL_BOLD_STYLE);
- fl_end_form();
- }
-
- // the character form
- fd_form_character = create_form_form_character();
- fl_set_form_atclose(fd_form_character->form_character,
- CancelCloseBoxCB, 0);
- fl_addto_choice(fd_form_character->choice_family,
- _(" No change %l| Roman | Sans Serif | Typewriter %l| Reset "));
- fl_addto_choice(fd_form_character->choice_series,
- _(" No change %l| Medium | Bold %l| Reset "));
- fl_addto_choice(fd_form_character->choice_shape,
- _(" No change %l| Upright | Italic | Slanted | Small Caps "
- "%l| Reset "));
- fl_addto_choice(fd_form_character->choice_size,
- _(" No change %l| Tiny | Smallest | Smaller | Small "
- "| Normal | Large | Larger | Largest | Huge | Huger "
- "%l| Increase | Decrease | Reset "));
- fl_addto_choice(fd_form_character->choice_bar,
- _(" No change %l| Emph | Underbar | Noun | LaTeX mode %l| Reset "));
- 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);
- lyxerr[Debug::INIT] << "Initializing form_character::combox..." << endl;
- fl_addto_form(fd_form_character->form_character);
- combo_language2 = new Combox(FL_COMBOX_DROPLIST);
- FL_OBJECT * ob = fd_form_character->choice_language;
- combo_language2->add(ob->x, ob->y, ob->w, ob->h, 250);
- combo_language2->shortcut("#L", 1);
- fl_end_form();
- lyxerr[Debug::INIT] << "Initializing form_character...done" << endl;
-
- // build up the combox entries
- combo_language2->addline(_("No change"));
- combo_language2->addline(_("Reset"));
- for (Languages::const_iterator cit = languages.begin();
- cit != languages.end(); ++cit) {
-#ifdef DO_USE_DEFAULT_LANGUAGE
- if ((*cit).second.lang() != "default")
-#endif
- combo_language2->addto((*cit).second.lang());
- }
-
- // the preamble form
- fd_form_preamble = create_form_form_preamble();
- fl_set_form_atclose(fd_form_preamble->form_preamble,
- CancelCloseBoxCB, 0);
-
// the sendto form
fd_form_sendto = create_form_form_sendto();
fl_set_form_atclose(fd_form_sendto->form_sendto, CancelCloseBoxCB, 0);
CancelCloseBoxCB, 0);
fl_set_button(fd_form_figure->radio_postscript, 1);
- // the latex log form
- fd_latex_log = create_form_LaTeXLog();
- 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 );
+ XformsColor::read( filename );
}
// Show the main & title form
int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;
- int title_placement = FL_PLACE_CENTER;
// Did we get a valid position?
if (xpos >= 0 && ypos >= 0) {
lyxViews->setPosition(xpos, ypos);
- if (lyxrc.show_banner) {
- // show the title form in the middle of the main form
- fl_set_form_position(fd_form_title->form_title,
- abs(xpos + (width/2) - (370 / 2)),
- abs(ypos + (height/2) - (290 / 2)));
- title_placement = FL_PLACE_GEOMETRY;
- // The use of abs() above is a trick to ensure
- // valid positions
- }
- main_placement = FL_PLACE_POSITION;
+ main_placement = FL_PLACE_POSITION;
}
+
lyxViews->show(main_placement, FL_FULLBORDER, "LyX");
- if (lyxrc.show_banner) {
- fl_show_form(fd_form_title->form_title,
- title_placement, FL_NOBORDER,
- _("LyX Banner"));
- fl_redraw_form(fd_form_title->form_title);
- fl_raise_form(fd_form_title->form_title);
-
- // Show the title form at most 7 secs (lowered from 10 secs)
- fl_set_timer(fd_form_title->timer_title, 7);
- }
}
{
if (!gui) return;
- guiruntime.runTime();
+ GUIRunTime::runTime();
}
projects / lyx.git / blobdiff