#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/GUIRunTime.h"
+#include "frontends/xforms/xform_helpers.h" // for XformColor
using std::endl;
extern bool finished; // flag, that we are quitting the program
extern BufferList bufferlist;
extern GUIRunTime guiruntime;
+extern string user_lyxdir;
FL_CMD_OPT cmdopt[] =
{
static int xpos = -1;
static int ypos = -1;
static char geometry[40];
-bool cursor_follows_scrollbar;
FL_resource res[] =
extern "C"
int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
{
-//#warning Please see if you can trigger this!
// emergency save
if (!bufferlist.empty())
bufferlist.emergencyWriteAll();
if (height < 400) height = 400;
// If width is not set by geometry, check it against monitor width
- if ( !(geometryBitmask & 4) ) {
- Screen * scr = DefaultScreenOfDisplay(fl_get_display());
+ if (!(geometryBitmask & 4)) {
+ Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
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 = DefaultScreenOfDisplay(fl_get_display());
+ if (!(geometryBitmask & 8)) {
+ Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen); //DefaultScreen(fl_get_display());
if (HeightOfScreen(scr) - 24 < height)
height = HeightOfScreen(scr) - 24;
}
// Recalculate xpos if it's negative
if (geometryBitmask & 16)
- xpos += WidthOfScreen(DefaultScreenOfDisplay(fl_get_display())) - width;
+ xpos += WidthOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - width; //DefaultScreen(fl_get_display())) - width;
// Recalculate ypos if it's negative
if (geometryBitmask & 32)
- ypos += HeightOfScreen(DefaultScreenOfDisplay(fl_get_display())) - height;
+ ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - height; //DefaultScreen(fl_get_display())) - height;
// Initialize the LyXColorHandler
lyxColorHandler = new LyXColorHandler;
delete lyxserver;
lyxserver = 0;
delete lyxViews;
-
+#if FL_REVISION < 89 || (FL_REVISION == 89 && FL_FIXLEVEL < 5)
CloseLyXLookup();
+#endif
}
if (lyxrc.font_norm_menu.empty())
lyxrc.font_norm_menu = lyxrc.font_norm;
// Set the font name for popups and menus
- string menufontname = lyxrc.menu_font_name
+ string boldfontname = lyxrc.menu_font_name
+ "-*-*-*-?-*-*-*-*-"
+ lyxrc.font_norm_menu;
// "?" means "scale that font"
- string popupfontname = lyxrc.popup_font_name
+ string fontname = lyxrc.popup_font_name
+ "-*-*-*-?-*-*-*-*-"
+ lyxrc.font_norm_menu;
- int bold = fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str());
- int normal = fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str());
+ 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 "
- << menufontname << endl;
+ << boldfontname << endl;
if (normal < 0)
lyxerr << "Could not set popup font to "
- << popupfontname << endl;
+ << fontname << endl;
if (bold < 0 && normal < 0) {
lyxerr << "Using 'helvetica' font for menus" << endl;
- bold = fl_set_font_name(FL_BOLD_STYLE,
- "-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1");
- normal = fl_set_font_name(FL_NORMAL_STYLE,
- "-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1");
+ 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;
- normal = fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+ 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
// in setDefaults() (Matthias 140496)
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...done" << endl;
// build up the combox entries
- combo_language2->addto(_("No change"));
- combo_language2->addto(_("Reset"));
- for(Languages::const_iterator cit = languages.begin();
+ 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().c_str());
+ combo_language2->addto((*cit).second.lang());
}
- combo_language2->select_text(_("No change"));
// the preamble form
fd_form_preamble = create_form_form_preamble();
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 );
+ }
+
// Show the main & title form
int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;
int title_placement = FL_PLACE_CENTER;
projects / lyx.git / blobdiff