* ====================================================== */
#include <config.h>
-#include <cstdlib>
-#include <fcntl.h>
#ifdef __GNUG__
#pragma implementation
#include "lyx_gui.h"
#include FORMS_H_LOCATION
-#include "support/filetools.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 "debug.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 "ColorHandler.h"
-#include "frontends/Dialogs.h"
+
#include "frontends/GUIRunTime.h"
#include "frontends/xforms/xforms_helpers.h" // for XformColor
-using std::endl;
+#include "support/filetools.h"
+#include "support/os.h"
+#include "support/lyxlib.h"
-FD_form_sendto * fd_form_sendto;
-FD_form_figure * fd_form_figure;
+#include <cstdlib>
+#include <fcntl.h>
+
+using std::endl;
extern LyXServer * lyxserver;
extern bool finished; // flag, that we are quitting the program
static
int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
{
- // emergency save
- if (!bufferlist.empty())
- bufferlist.emergencyWriteAll();
+ // 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
fl_get_app_resources(res, num_res);
static const int geometryBitmask =
- XParseGeometry( geometry,
+ XParseGeometry(geometry,
&xpos,
&ypos,
reinterpret_cast<unsigned int *>(&width),
// 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.reset(new LyXColorHandler);
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
+ string boldfontname = lyxrc.popup_bold_font
+ "-*-*-*-?-*-*-*-*-"
- + lyxrc.font_norm_menu;
+ + lyxrc.popup_font_encoding;
// "?" means "scale that font"
- string fontname = lyxrc.popup_font_name
+ string fontname = lyxrc.popup_normal_font
+ "-*-*-*-?-*-*-*-*-"
- + lyxrc.font_norm_menu;
+ + 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());
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();
// From here down should be done by somebody else. (Lgb)
- //
- // Create forms
- //
-
- // 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");
- XformsColor::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;
}
lyxViews->show(main_placement, FL_FULLBORDER, "LyX");
-
- if (lyxrc.show_banner)
- lyxViews->getDialogs()->showSplash();
}
projects / lyx.git / blobdiff