* ====================================================== */
#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"
#endif
#include "bufferlist.h"
#include "ColorHandler.h"
+
#include "frontends/GUIRunTime.h"
#include "frontends/xforms/xforms_helpers.h" // for XformColor
+#include "support/filetools.h"
+#include "support/os.h"
+#include "support/lyxlib.h"
+
+#include <cstdlib>
+#include <fcntl.h>
+
using std::endl;
FD_form_sendto * fd_form_sendto;
// 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());
// 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;