X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_gui.C;h=aff0e0fe87819ed5beedd4473f3ab724f611dbba;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=e498bc056dac020b8c3e2641b5c26c2f61ec0fd0;hpb=1d7d3cc4afa2205c801ccc2aa71c7ac59359dc5f;p=lyx.git

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index e498bc056d..aff0e0fe87 100644
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -1,234 +1,187 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include <cstdlib>
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <fcntl.h>
-#include FORMS_H_LOCATION
 #include "lyx_gui.h"
-#include "combox.h"
-#include "lyx.h"
-#include "form1.h"
-#include "layout_forms.h"
-#include "print_form.h"
+#include FORMS_H_LOCATION
 #include "tex-strings.h"
 #include "lyx_main.h"
-#include "latexoptions.h"
 #include "debug.h"
 #include "version.h"
 #include "LyXView.h"
 #include "buffer.h"
+#include "BufferView.h"
 #include "lyxserver.h"
-#include "lyxdraw.h"
 #include "lyxrc.h"
 #include "gettext.h"
-#include "lyx_gui_misc.h"
-#include "lyx_cb.h"
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 #include "lyxlookup.h"
+#endif
 #include "bufferlist.h"
+#include "ColorHandler.h"
 
-#ifdef TWO_COLOR_ICONS
-#include "banner_bw.xbm"
-#else
-#include "banner.xpm"
-#endif
+#include "frontends/GUIRunTime.h"
+#include "frontends/xforms/xforms_helpers.h" // for XformColor
 
-FD_form_title *fd_form_title;
-FD_form_paragraph *fd_form_paragraph;
-FD_form_paragraph_extra *fd_form_paragraph_extra;
-FD_form_search *fd_form_search;
-FD_form_character *fd_form_character;
-FD_form_document *fd_form_document;
-FD_form_paper *fd_form_paper;
-FD_form_table_options *fd_form_table_options;
-FD_form_table_extra *fd_form_table_extra;
-FD_form_quotes *fd_form_quotes;
-FD_form_preamble *fd_form_preamble;
-FD_form_table *fd_form_table;
-FD_form_print *fd_form_print;
-FD_form_sendto *fd_form_sendto;
-FD_form_figure *fd_form_figure;
-FD_form_screen *fd_form_screen;
-FD_form_toc *fd_form_toc;
-FD_form_ref *fd_form_ref;
-FD_LaTeXOptions *fd_latex_options; // from latexoptions.h
-FD_LaTeXLog *fd_latex_log; // from latexoptions.h
-Combox *combo_language;
-
-extern LyXServer *lyxserver;
+#include "support/filetools.h"
+#include "support/os.h"
+#include "support/lyxlib.h"
+
+#include <cstdlib>
+#include <fcntl.h>
+
+using std::endl;
+
+extern LyXServer * lyxserver;
 extern bool finished;	// flag, that we are quitting the program
 extern BufferList bufferlist;
+extern string user_lyxdir;
 
 FL_CMD_OPT cmdopt[] =
 {
-	{"-width", "*.width", XrmoptionSepArg, "690"},
-	{"-height", "*.height", XrmoptionSepArg, "510"},
-	{"-xpos", "*.xpos", XrmoptionSepArg, "-1"},
-	{"-ypos", "*.ypos", XrmoptionSepArg, "-1"},
-	{"-Reverse", "*.Reverse", XrmoptionNoArg, "1"},
-	{"-Mono", "*.Mono", XrmoptionNoArg, "1"},
-	{"-FastSelection", "*.FastSelection", XrmoptionNoArg, "1"},
-	{"-MathColor", "*.MathColor", XrmoptionSepArg, "blue"},
-	{"-MathFrameColor", "*.MathFrameColor", XrmoptionSepArg, "magenta"},
-	{"-FootColor", "*.FootColor", XrmoptionSepArg, "red"}, 
-	{"-NewLineColor", "*.NewLineColor", XrmoptionSepArg, "red"},
-	{"-LabelColor", "*.LabelColor", XrmoptionSepArg, "palegreen"},
-	{"-FillColor", "*.FillColor", XrmoptionSepArg, "magenta"},
-	{"-OnOffLineColor", "*.OnOffLineColor", XrmoptionSepArg, "magenta"},
-	{"-LatexColor", "*.LatexColor", XrmoptionSepArg, "red"},
-	{"-NoteColor", "*.NoteColor", XrmoptionSepArg, "yellow"},
-	{"-NoteFrameColor", "*.NoteFrameColor", XrmoptionSepArg, "black"},
-	{"-LightedColor", "*.LightedColor", XrmoptionSepArg, "gray80"},
-	{"-BackgroundColor", "*.BackgroundColor", XrmoptionSepArg, "linen"},
-	{"-SelectionColor", "*.SelectionColor", XrmoptionSepArg, "lightblue"}
+	{"-geometry", "*.geometry", XrmoptionSepArg, "690x510"}
 };
 
-static int width;
-static int height;
-static int xpos;
-static int ypos;
-int	   reverse_video;
-int	   mono_video;
-int	   fast_selection;
-bool	   cursor_follows_scrollbar;
-char	   math_color[32];
-char	   math_frame_color[32];
-char	   foot_color[32];
-char       new_line_color[32];
-char	   label_color[32];
-char	   fill_color[32];
-char	   on_off_line_color[32];
-char	   latex_color[32];
-char	   note_color[32];
-char       note_frame_color[32];
-char	   lighted_color[32];
-string    background_color;
-char	   b_c[32];
-char	   selection_color[32];
+namespace {
+
+int width  = 690;
+int height = 510;
+int xpos   = -1;
+int ypos   = -1;
+char geometry[40];
+
+} // namespace anon
 
 
 FL_resource res[] =
 {
-	{"width", "widthClass", FL_INT, &width, "690"},
-	{"height", "heightClass", FL_INT, &height, "510"},
-	{"xpos", "xposClass", FL_INT, &xpos, "-1"},
-	{"ypos", "yposClass", FL_INT, &ypos, "-1"},
-	{"Reverse", "reverseClass", FL_INT, &reverse_video, "0"},
-	{"Mono", "monoClass", FL_INT, &mono_video, "0"},
-	{"FastSelection", "selectionClass", FL_INT, &fast_selection, "0"},
-	{"MathColor", "colorClass", FL_STRING, math_color, "blue", 31},
-	{"MathFrameColor", "colorClass", FL_STRING, math_frame_color, "magenta", 31},
-	{"FootColor", "colorClass", FL_STRING, foot_color, "red", 31},
-	{"NewLineColor", "colorClass", FL_STRING, new_line_color, "red", 31},
-	{"LabelColor", "colorClass", FL_STRING, label_color, "palegreen", 31},
-	{"FillColor", "colorClass", FL_STRING, fill_color, "magenta", 31},
-	{"OnOffLineColor", "colorClass", FL_STRING, on_off_line_color, "magenta", 31},
-	{"LatexColor", "colorClass", FL_STRING, latex_color, "red", 31},
-	{"NoteColor", "colorClass", FL_STRING, note_color, "yellow", 31},
-	{"NoteFrameColor", "colorClass", FL_STRING, note_frame_color, "black", 31},
-	{"LightedColor", "colorClass", FL_STRING, lighted_color, "gray80", 31},
-	{"BackgroundColor", "colorClass", FL_STRING, b_c, "linen", 31},
-	{"SelectionColor", "colorClass", FL_STRING, selection_color, "lightblue", 31}
+	{"geometry", "geometryClass", FL_STRING, geometry, "", 40}
 };
 
 
-extern "C" int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
+extern "C" {
+
+static
+int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
 {
-//#warning Please see if you can trigger this!
-	// emergency save
-	if (!bufferlist.empty())
-		bufferlist.emergencyWriteAll();
+	if (xeev->error_code == BadWindow) {
+		// We don't abort on BadWindow
+		return 0;
+	}
+
+	// emergency cleanup
+	LyX::emergencyCleanup();
 
 	// Get the reason for the crash.
 	char etxt[513];
 	XGetErrorText(display, xeev->error_code, etxt, 512);
-	lyxerr << etxt << endl;
+	lyxerr << etxt << " id: " << xeev->resourceid << endl;
 	// By doing an abort we get a nice backtrace. (hopefully)
-	abort();
+	lyx::abort();
 	return 0; // Solaris CC wants us to return something
 }
 
+}
+
 
-LyXGUI::LyXGUI(LyX *owner, int *argc, char *argv[], bool GUI)
-	:_owner(owner)
+LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
+	: _owner(owner), lyxViews(0)
 {
 	gui = GUI;
 	if (!gui)
 		return;
 
+	//
 	setDefaults();
-	
+
 	static const int num_res = sizeof(res)/sizeof(FL_resource);
 	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.
+	locale_init();
 	fl_get_app_resources(res, num_res);
+
+	static const int geometryBitmask =
+		XParseGeometry(geometry,
+				&xpos,
+				&ypos,
+				reinterpret_cast<unsigned int *>(&width),
+				reinterpret_cast<unsigned int *>(&height));
+
 	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);
 	// X Error handler install goes here
 	XSetErrorHandler(LyX_XErrHandler);
-	
-	background_color = b_c;
-	
-	// Make sure default screen is not larger than monitor
-	if (width == 690 && height == 510) {
-		Screen * scr = (DefaultScreenOfDisplay(fl_get_display()));
-		if (HeightOfScreen(scr)-24<height)
-			height = HeightOfScreen(scr)-24;
-		if (WidthOfScreen(scr)-8<width)
-			width = WidthOfScreen(scr)-8;
+
+	// A width less than 590 pops up an awkward main window
+	// The minimal values of width/height (590/400) are defined in
+	// src/lyx.C
+	if (width < 590) width = 590;
+	if (height < 400) height = 400;
+
+	// If width is not set by geometry, check it against monitor width
+	if (!(geometryBitmask & 4)) {
+		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);
+		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;
+
+	// Recalculate ypos if it's negative
+	if (geometryBitmask & 32)
+		ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(),
+						       fl_screen)) - height;
+
+	// Initialize the LyXColorHandler
+	lyxColorHandler.reset(new LyXColorHandler);
 }
 
 
 // A destructor is always necessary  (asierra-970604)
-LyXGUI::~LyXGUI() {
-        // Lyxserver was created in this class so should be destroyed
-        // here.  asierra-970604
-        if (lyxserver) {
-		delete lyxserver;
-		lyxserver = 0;
-	}
-
+LyXGUI::~LyXGUI()
+{
+	// Lyxserver was created in this class so should be destroyed
+	// here.  asierra-970604
+	delete lyxserver;
+	lyxserver = 0;
+	delete lyxViews;
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
 	CloseLyXLookup();
-
+#endif
 }
 
 
 void LyXGUI::setDefaults()
 {
-	FL_IOPT cntl;
-	cntl.buttonFontSize = FL_NORMAL_SIZE;
-	cntl.browserFontSize = FL_NORMAL_SIZE;
-	cntl.labelFontSize = FL_NORMAL_SIZE;
-	cntl.choiceFontSize = FL_NORMAL_SIZE;
-	cntl.inputFontSize = FL_NORMAL_SIZE;
-	cntl.menuFontSize  = FL_NORMAL_SIZE;
-	cntl.borderWidth = -1;
-	cntl.vclass = FL_DefaultVisual;
-	fl_set_defaults(FL_PDVisual
-			| FL_PDButtonFontSize
-			| FL_PDBrowserFontSize
-			| FL_PDLabelFontSize
-			| FL_PDChoiceFontSize
-			| FL_PDInputFontSize
-			| FL_PDMenuFontSize
-			| FL_PDBorderWidth, &cntl);
+	GUIRunTime::setDefaults();
 }
 
 
@@ -239,72 +192,62 @@ void LyXGUI::init()
 		return;
 
 	create_forms();
-	
+
+	if (lyxrc.popup_font_encoding.empty())
+		lyxrc.popup_font_encoding = lyxrc.font_norm;
 	// Set the font name for popups and menus
-        string menufontname = lyxrc->menu_font_name 
-		               + "-*-*-*-?-*-*-*-*-"  
-		               + lyxrc->font_norm; 
+	string boldfontname = lyxrc.popup_bold_font
+			       + "-*-*-*-?-*-*-*-*-"
+			       + lyxrc.popup_font_encoding;
 		// "?" means "scale that font"
-        string popupfontname = lyxrc->popup_font_name 
-		               + "-*-*-*-?-*-*-*-*-"  
-		               + lyxrc->font_norm; 
-#if FL_REVISION > 85
-        if (fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str()) < 0)
-#else
-        int nfonts;
-        char ** list = XListFonts(fl_display, menufontname.c_str(), 
-				  1, &nfonts);
-        XFreeFontNames(list);
-        if (nfonts > 0)
-                fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str());
-        else
-#endif
-                lyxerr << "Could not set menu font to "
-		       << menufontname << endl;
-
-#if FL_REVISION > 85
-        if (fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str()) < 0)
-#else
-        list = XListFonts(fl_display, popupfontname.c_str(), 
-			  1, &nfonts);
-        XFreeFontNames(list);
-        if (nfonts > 0)
-                fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str());
-        else
-#endif
-                lyxerr << "Could not set popup font to "
-		       << popupfontname << endl;
+	string fontname = lyxrc.popup_normal_font
+			       + "-*-*-*-?-*-*-*-*-"
+			       + 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());
+	if (bold < 0)
+		lyxerr << "Could not set menu font to "
+		       << boldfontname << endl;
+
+	if (normal < 0)
+		lyxerr << "Could not set popup font to "
+		       << fontname << endl;
+
+	if (bold < 0 && normal < 0) {
+		lyxerr << "Using 'helvetica' font for menus" << endl;
+		boldfontname = "-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1";
+		fontname = "-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1";
+		bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
+		normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
+
+		if (bold < 0 && normal < 0) {
+			lyxerr << "Could not find helvetica font. Using 'fixed'." << endl;
+			fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+			normal = bold = 0;
+		}
+	}
+	if (bold < 0)
+		fl_set_font_name(FL_BOLD_STYLE, fontname.c_str());
+	else if (normal < 0)
+		fl_set_font_name(FL_NORMAL_STYLE, boldfontname.c_str());
 
- 	// put here (after fl_initialize) to avoid segfault. Cannot be done
+	// put here (after fl_initialize) to avoid segfault. Cannot be done
 	// in setDefaults() (Matthias 140496)
-	// Moved from ::LyXGUI to ::init to allow popup font customization 
+	// Moved from ::LyXGUI to ::init to allow popup font customization
 	// (petr 120997).
- 	fl_setpup_fontstyle(FL_NORMAL_STYLE);
- 	fl_setpup_fontsize(FL_NORMAL_SIZE);
- 	fl_setpup_color(FL_MCOL, FL_BLACK);
+	fl_setpup_fontstyle(FL_NORMAL_STYLE);
+	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)
-
-	// the print form
-	fl_set_input(fd_form_print->input_printer, 
-		     lyxrc->printer.c_str());	
-        
-	// the sendto form
-        if (!lyxrc->custom_export_command.empty())
-                fl_set_input(fd_form_sendto->input_cmd,
-                             lyxrc->custom_export_command.c_str());
-	if (lyxrc->custom_export_format == "lyx")
-		fl_set_button(fd_form_sendto->radio_ftype_lyx, 1);
-	else if (lyxrc->custom_export_format == "tex")
-		fl_set_button(fd_form_sendto->radio_ftype_latex, 1);
-	else if (lyxrc->custom_export_format == "dvi")
-		fl_set_button(fd_form_sendto->radio_ftype_dvi, 1);
-	else if (lyxrc->custom_export_format == "ps")
-		fl_set_button(fd_form_sendto->radio_ftype_ps, 1);
-        else if (lyxrc->custom_export_format == "ascii")
-                fl_set_button(fd_form_sendto->radio_ftype_ascii, 1);
+	// all lyxrc settings has to be done here as lyxrc has not yet
+	// been read when the GUI is created (Jug)
 
 	// Update parameters.
 	lyxViews->redraw();
@@ -312,334 +255,51 @@ void LyXGUI::init()
 	// Initialize the views.
 	lyxViews->init();
 
-	// in 0.12 the initialisation of the LyXServer must be done here
-	// 0.13 it should be moved again...
-	lyxserver = new LyXServer(lyxViews->getLyXFunc(), lyxrc->lyxpipes);
-
-	// This is to make sure we get the selection color
-	getGC(gc_selection);
-	// This is to make sure we set the background_pixels
-	getGC(gc_clear);
+	// this should be moved ...
+	lyxserver = new LyXServer(lyxViews->getLyXFunc(), lyxrc.lyxpipes);
 }
 
 
 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
-	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);
-#ifdef TWO_COLOR_ICONS
-	FL_OBJECT *obj = fl_add_bitmapbutton(FL_NORMAL_BUTTON, 0, 0, 425, 290, "");
-	  fl_set_bitmapbutton_data(obj, banner_bw_width,
-				   banner_bw_height, banner_bw_bits);
-	  fl_set_object_color(obj, FL_WHITE, FL_BLACK);
-#else
-	FL_OBJECT *obj = fl_add_pixmapbutton(FL_NORMAL_BUTTON, 0, 0, 425, 290, "");
-	  fl_set_pixmapbutton_data(obj, (char**)banner);
-#if FL_REVISION > 85
-	  fl_set_pixmapbutton_focus_outline(obj, 3);
-#endif
-#endif
-	  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);
-#ifdef TWO_COLOR_ICONS
-	  fl_set_object_color(obj, FL_WHITE, FL_WHITE);
-	  fl_set_object_lcol(obj, FL_BLACK);
-#else
-//	  fl_set_object_color(obj, FL_WHITE, FL_WHITE);
-//	  fl_set_object_lcol(obj, FL_BLACK);
-          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);
-#endif
-	  fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-	  fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-	fl_end_form();
-
-	// the paragraph form
-	fd_form_paragraph = create_form_form_paragraph();
-	fl_set_form_atclose(fd_form_paragraph->form_paragraph,
-			    CancelCloseBoxCB, 0);
-	fl_addto_choice(fd_form_paragraph->choice_space_above,
-			_(" None | Defskip | Smallskip "
-			"| Medskip | Bigskip | VFill | Length "));
-	fl_addto_choice(fd_form_paragraph->choice_space_below,
-			_(" None | Defskip | Smallskip "
-			"| Medskip | Bigskip | VFill | Length ")); 
-	fl_set_input_return(fd_form_paragraph->input_space_above,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paragraph->input_space_below,
-			    FL_RETURN_ALWAYS);
-
-        // the paragraph extra form
-	fd_form_paragraph_extra = create_form_form_paragraph_extra();
-	fl_set_form_atclose(fd_form_paragraph_extra->form_paragraph_extra,
-			    CancelCloseBoxCB, 0);
-	fl_set_input_return(fd_form_paragraph_extra->input_pextra_width,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paragraph_extra->input_pextra_widthp,
-			    FL_RETURN_ALWAYS);
-
-	// the search form
-	fd_form_search = create_form_form_search();
-	fl_set_form_atclose(fd_form_search->form_search,
-			    CancelCloseBoxCB, 0);
-
-	// 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 "));
-	fl_set_form_minsize(fd_form_character->form_character,
-			    fd_form_character->form_character->w,
-			    fd_form_character->form_character->h);
-
-	// the document form
-	fd_form_document = create_form_form_document();
-	fl_set_form_atclose(fd_form_document->form_document,
-			    CancelCloseBoxCB, 0);
-	fl_addto_choice(fd_form_document->choice_spacing,
-			_(" Single | OneHalf | Double | Other "));
-
-	fl_set_counter_bounds(fd_form_document->slider_secnumdepth,-1, 5);
-	fl_set_counter_bounds(fd_form_document->slider_tocdepth,-1, 5);
-	fl_set_counter_step(fd_form_document->slider_secnumdepth, 1, 1);
-	fl_set_counter_step(fd_form_document->slider_tocdepth, 1, 1);
-	fl_set_counter_precision(fd_form_document->slider_secnumdepth, 0);
-	fl_set_counter_precision(fd_form_document->slider_tocdepth, 0);
-	fl_addto_form(fd_form_document->form_document);
-	combo_language = new Combox(FL_COMBOX_DROPLIST);
-	FL_OBJECT *ob = fd_form_document->choice_language;
-	combo_language->add(ob->x, ob->y, ob->w, ob->h, 200);
-	combo_language->shortcut("#G", 1);
-	fl_end_form();
-	int n; // declared here because DEC cxx does not like multiple
-	       // declarations of variables in for() loops (JMarc)
-        for (n = 0; tex_babel[n][0]; n++) {
-	    combo_language->addto(tex_babel[n]);
-	}
-
-	// not really necessary, but we can do it anyway.
-	fl_addto_choice(fd_form_document->choice_fontsize, "default|10|11|12");
-	
-        for (n = 0; tex_fonts[n][0]; n++) {
-	    fl_addto_choice(fd_form_document->choice_fonts, tex_fonts[n]);
-	}
-
-	fl_addto_choice(fd_form_document->choice_inputenc,
-			"default|latin1|latin2|latin5"
-			"|koi8-r|koi8-u|cp866|cp1251");
-
-        for (n = 0; tex_graphics[n][0]; n++) {
-	    fl_addto_choice(fd_form_document->choice_postscript_driver,
-					tex_graphics[n]);
-	}
-	// not really necessary, but we can do it anyway.
-	fl_addto_choice(fd_form_document->choice_pagestyle,
-			"default|empty|plain|headings|fancy");
-	fl_addto_choice(fd_form_document->choice_default_skip,
-			_(" Smallskip | Medskip | Bigskip | Length "));
-	fl_set_input_return(fd_form_document->input_default_skip,
-			    FL_RETURN_ALWAYS);
-	fl_set_form_minsize(fd_form_document->form_document,
-			    fd_form_document->form_document->w,
-			    fd_form_document->form_document->h);
-
-        // the paper form
-	fd_form_paper = create_form_form_paper();
-	fl_set_form_atclose(fd_form_paper->form_paper,
-			    CancelCloseBoxCB, 0);
-	fl_addto_choice(fd_form_paper->choice_papersize2,
-			_(" Default | Custom | USletter | USlegal "
-                        "| USexecutive | A3 | A4 | A5 | B3 | B4 | B5 "));
-	fl_addto_choice(fd_form_paper->choice_paperpackage,
-			_(" None "
-			"| A4 small Margins (only portrait) "
-			"| A4 very small Margins (only portrait) "
-			"| A4 very wide margins (only portrait) "));
-	fl_set_input_return(fd_form_paper->input_custom_width,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_custom_height,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_top_margin,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_bottom_margin,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_left_margin,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_right_margin,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_head_height,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_head_sep,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_paper->input_foot_skip,
-			    FL_RETURN_ALWAYS);
-
-        // the table_options form
-	fd_form_table_options = create_form_form_table_options();
-	fl_set_form_atclose(fd_form_table_options->form_table_options,
-			    CancelCloseBoxCB, 0);
-	fl_set_input_return(fd_form_table_options->input_column_width,
-			    FL_RETURN_ALWAYS);
-
-        // the table_extra form
-	fd_form_table_extra = create_form_form_table_extra();
-	fl_set_form_atclose(fd_form_table_extra->form_table_extra,
-			    CancelCloseBoxCB, 0);
-	fl_set_input_return(fd_form_table_extra->input_special_alignment,
-			    FL_RETURN_ALWAYS);
-	fl_set_input_return(fd_form_table_extra->input_special_multialign,
-			    FL_RETURN_ALWAYS);
-
-	// the quotes form
-	fd_form_quotes = create_form_form_quotes();
-	fl_set_form_atclose(fd_form_quotes->form_quotes,
-			    CancelCloseBoxCB, 0);
-	// Is it wrong of me to use « » instead of << >> ? (Lgb)
-	// Maybe if people use a font other than latin1... (JMarc)
-	fl_addto_choice(fd_form_quotes->choice_quotes_language,
-			_(" ``text'' | ''text'' | ,,text`` | ,,text'' | «text» | »text« "));
-
-	// the preamble form
-	fd_form_preamble = create_form_form_preamble();
-	fl_set_form_atclose(fd_form_preamble->form_preamble,
-			    CancelCloseBoxCB, 0);
-
-	// the table form
-	fd_form_table = create_form_form_table();
-	fl_set_form_atclose(fd_form_table->form_table, CancelCloseBoxCB, 0);
-	fl_set_slider_bounds(fd_form_table->slider_rows, 1, 50);
-	fl_set_slider_bounds(fd_form_table->slider_columns, 1, 50);
-	fl_set_slider_value(fd_form_table->slider_rows, 5);
-	fl_set_slider_value(fd_form_table->slider_columns, 5);
-	fl_set_slider_precision(fd_form_table->slider_rows, 0);
-	fl_set_slider_precision(fd_form_table->slider_columns, 0);
-
-	// the print form
-	fd_form_print = create_form_form_print();
-	fl_set_form_atclose(fd_form_print->form_print, CancelCloseBoxCB, 0);
-       	fl_set_button(fd_form_print->radio_printer, 1);
-	fl_set_button(fd_form_print->radio_file, 0);
-	fl_set_button(fd_form_print->radio_order_normal, 1);
-	fl_set_button(fd_form_print->radio_order_reverse, 0);
-	fl_set_button(fd_form_print->radio_all_pages, 1);
-	fl_set_button(fd_form_print->radio_odd_pages, 0);
-	fl_set_button(fd_form_print->radio_even_pages, 0);
-
-	// the sendto form
-	fd_form_sendto = create_form_form_sendto();
-	fl_set_form_atclose(fd_form_sendto->form_sendto, CancelCloseBoxCB, 0);
-
-	// the figure form
-	fd_form_figure = create_form_form_figure();
-	fl_set_form_atclose(fd_form_figure->form_figure,
-			    CancelCloseBoxCB, 0);
-	fl_set_button(fd_form_figure->radio_postscript, 1);
-
-	// the screen form
-	fd_form_screen = create_form_form_screen();
-	fl_set_form_atclose(fd_form_screen->form_screen,
-			    CancelCloseBoxCB, 0);
-
-	// the toc form
-	fd_form_toc = create_form_form_toc();
-	fl_set_form_atclose(fd_form_toc->form_toc, CancelCloseBoxCB, 0);
-
-	// the ref form
-	fd_form_ref = create_form_form_ref();
-	fl_set_form_atclose(fd_form_ref->form_ref, CancelCloseBoxCB, 0);
-	fl_set_form_minsize(fd_form_ref->form_ref, fd_form_ref->form_ref->w,
-			    fd_form_ref->form_ref->h);
-
-	// the latex options form
-	fd_latex_options = create_form_LaTeXOptions();
-	fl_set_form_atclose(fd_latex_options->LaTeXOptions,
-			    CancelCloseBoxCB, 0);
-
-	// 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 const filename = AddName(user_lyxdir, "preferences.xform");
+	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) {
+	if (xpos >= 0 && ypos >= 0) {
 		lyxViews->setPosition(xpos, ypos);
-		// 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)));
-		// The use of abs() above is a trick to ensure valid positions
 		main_placement = FL_PLACE_POSITION;
-		title_placement = FL_PLACE_GEOMETRY;
 	}
+
 	lyxViews->show(main_placement, FL_FULLBORDER, "LyX");
-	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);
 }
 
 
 void LyXGUI::runTime()
-	/* This will usually be toolkit (GUI) specific. This is
-	 * also usually the XEvent dispatcher of the GUI. */
 {
-	if (!gui)
-		return;
-
-	// XForms specific
-	XEvent ev;
+	if (!gui) return;
 
-	while (!finished) {
-		if (fl_check_forms() == FL_EVENT) {
-			lyxerr << "LyX: This shouldn't happen..." << endl;
-			fl_XNextEvent(&ev);
-		}
-	}
+	GUIRunTime::runTime();
 }
 
 
-void LyXGUI::regBuf(Buffer *b)
+void LyXGUI::regBuf(Buffer * b)
 {
 	lyxViews->view()->buffer(b);
 }
+
+
+LyXView * LyXGUI::getLyXView() const
+{
+	return lyxViews;
+}