#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;
FD_form_title * fd_form_title;
-FD_form_paragraph * fd_form_paragraph;
-FD_form_paragraph_extra * fd_form_paragraph_extra;
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_sendto * fd_form_sendto;
FD_form_figure * fd_form_figure;
FD_LaTeXLog * fd_latex_log; // from log_form.h
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[] =
{
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();
LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
- : _owner(owner), lyxViews(0)
+ : _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);
fl_get_app_resources(res, num_res);
- static const int geometryBitmask = XParseGeometry( geometry,
- &xpos,
- &ypos,
- (unsigned int *) &width,
- (unsigned int *) &height
- );
+ 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) {
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;
- lyxViews = 0;
-
+#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();
}
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_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);
- lyxerr[Debug::INIT] << "Initializing form_paragraph...done" << endl;
// the character form
fd_form_character = create_form_form_character();
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);
fl_end_form();
lyxerr[Debug::INIT] << "Initializing form_character...done" << endl;
-#ifdef USE_OLD_DOCUMENT_LAYOUT
- // 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,-2, 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);
- ob = fd_form_document->choice_language;
- combo_language->add(ob->x, ob->y, ob->w, ob->h, 250);
- combo_language->shortcut("#G", 1);
- fl_end_form();
-
- // "default" is not part of the languages array any more.
- combo_language->addto("default");
- combo_language2->addto(_("No change"));
- combo_language2->addto(_("Reset"));
- for(Languages::const_iterator cit = languages.begin();
+ // 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) {
- combo_language->addto((*cit).second.lang().c_str());
- combo_language2->addto((*cit).second.lang().c_str());
- }
- combo_language2->select_text(_("No change"));
-
- // not really necessary, but we can do it anyway.
- fl_addto_choice(fd_form_document->choice_fontsize, "default|10|11|12");
- int n;
- 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|auto|latin1|latin2|latin5"
- "|koi8-r|koi8-u|cp866|cp1251|iso88595");
-
- 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);
- lyxerr[Debug::INIT] << "Initializing form_document...done" << endl;
-
- // 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);
- lyxerr[Debug::INIT] << "Initializing form_paper...done" << endl;
-#endif
-
-#ifndef NEW_TABULAR
- // 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);
- lyxerr[Debug::INIT] << "Initializing form_table_extra...done" << endl;
-#endif
-
-#ifdef USE_OLD_DOCUMENT_LAYOUT
- // 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« "));
+#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);
-#ifndef NEW_TABULAR
- // 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);
- lyxerr[Debug::INIT] << "Initializing form_table...done" << endl;
-#endif
-
// the sendto form
fd_form_sendto = create_form_form_sendto();
fl_set_form_atclose(fd_form_sendto->form_sendto, CancelCloseBoxCB, 0);
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;
{
if (!gui) return;
- GUIRunTime grt;
- grt.runTime();
+ guiruntime.runTime();
}
projects / lyx.git / blobdiff