X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_gui.C;h=aff0e0fe87819ed5beedd4473f3ab724f611dbba;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=3ea7067556bd5bfb16588436998408e32cb01c99;hpb=09383c6e55612a7268efc7222cbe266b13fe2b43;p=lyx.git diff --git a/src/lyx_gui.C b/src/lyx_gui.C index 3ea7067556..aff0e0fe87 100644 --- a/src/lyx_gui.C +++ b/src/lyx_gui.C @@ -1,62 +1,52 @@ /* This file is part of * ====================================================== - * + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include -#include #ifdef __GNUG__ #pragma implementation #endif -#include #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 "print_form.h" #include "tex-strings.h" #include "lyx_main.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 "lyx_gui_misc.h" #if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5) #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; +#include "support/filetools.h" +#include "support/os.h" +#include "support/lyxlib.h" + +#include +#include -FD_form_character * fd_form_character; -FD_form_sendto * fd_form_sendto; -FD_form_figure * fd_form_figure; -Combox * combo_language; -Combox * combo_language2; +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[] = @@ -64,11 +54,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[] = @@ -77,22 +71,30 @@ FL_resource res[] = }; -extern "C" +extern "C" { + +static int LyX_XErrHandler(Display * display, XErrorEvent * xeev) { - // 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) lyx::abort(); return 0; // Solaris CC wants us to return something } +} + LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI) : _owner(owner), lyxViews(0) @@ -101,18 +103,18 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool 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. - setlocale(LC_NUMERIC, "C"); - fl_get_app_resources(res, num_res); + locale_init(); + fl_get_app_resources(res, num_res); static const int geometryBitmask = - XParseGeometry( geometry, + XParseGeometry(geometry, &xpos, &ypos, reinterpret_cast(&width), @@ -121,6 +123,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); @@ -129,42 +132,44 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI) // 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; + // 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); //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 = new 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 + // Lyxserver was created in this class so should be destroyed + // here. asierra-970604 delete lyxserver; lyxserver = 0; delete lyxViews; @@ -188,25 +193,25 @@ 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 - + "-*-*-*-?-*-*-*-*-" - + lyxrc.font_norm_menu; + string boldfontname = lyxrc.popup_bold_font + + "-*-*-*-?-*-*-*-*-" + + lyxrc.popup_font_encoding; // "?" means "scale that font" - string fontname = lyxrc.popup_font_name - + "-*-*-*-?-*-*-*-*-" - + lyxrc.font_norm_menu; + 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 " + if (bold < 0) + lyxerr << "Could not set menu font to " << boldfontname << endl; - if (normal < 0) - lyxerr << "Could not set popup font to " + if (normal < 0) + lyxerr << "Could not set popup font to " << fontname << endl; if (bold < 0 && normal < 0) { @@ -227,32 +232,22 @@ void LyXGUI::init() 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 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(); @@ -260,8 +255,7 @@ 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... + // this should be moved ... lyxserver = new LyXServer(lyxViews->getLyXFunc(), lyxrc.lyxpipes); } @@ -269,79 +263,16 @@ 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) - // - // Create forms - // - - // 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 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); - // 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 ); - } - + 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; // Did we get a valid position? @@ -351,9 +282,6 @@ void LyXGUI::create_forms() } lyxViews->show(main_placement, FL_FULLBORDER, "LyX"); - - if (lyxrc.show_banner) - lyxViews->getDialogs()->showSplash(); } @@ -361,7 +289,7 @@ void LyXGUI::runTime() { if (!gui) return; - guiruntime.runTime(); + GUIRunTime::runTime(); }