// not in lyxrc?? (Matthias)
// Because nobody put them there. (Asger)
-extern string background_color;
-extern char selection_color[];
extern bool cursor_follows_scrollbar;
extern LyXAction lyxaction;
extern kb_keymap * toplevel_keymap;
RC_SCREEN_FONT_POPUP,
RC_SCREEN_FONT_ENCODING,
RC_SCREEN_FONT_ENCODING_MENU,
+ RC_SET_COLOR,
RC_AUTOSAVE,
RC_DOCUMENTPATH,
RC_TEMPLATEPATH,
RC_LASTFILES,
RC_AUTOREGIONDELETE,
RC_BIND,
+ RC_OVERRIDE_X_DEADKEYS,
RC_SERVERPIPE,
RC_INPUT,
RC_BINDFILE,
RC_KBMAP,
RC_KBMAP_PRIMARY,
RC_KBMAP_SECONDARY,
- RC_SELECTION_COLOR,
- RC_BACKGROUND_COLOR,
RC_FAX_COMMAND,
RC_PHONEBOOK,
RC_FAXPROGRAM,
RC_BACKUPDIR_PATH,
RC_RTL_SUPPORT,
RC_AUTO_NUMBER,
+ RC_MARK_FOREIGN_LANGUAGE,
RC_LANGUAGE_PACKAGE,
RC_LANGUAGE_AUTO_BEGIN,
RC_LANGUAGE_AUTO_END,
{ "\\auto_number", RC_AUTO_NUMBER },
{ "\\auto_region_delete", RC_AUTOREGIONDELETE },
{ "\\autosave", RC_AUTOSAVE },
- { "\\background_color", RC_BACKGROUND_COLOR },
{ "\\backupdir_path", RC_BACKUPDIR_PATH },
{ "\\begin_toolbar", RC_BEGINTOOLBAR },
{ "\\bind", RC_BIND },
{ "\\literate_error_filter", RC_LITERATE_ERROR_FILTER },
{ "\\literate_extension", RC_LITERATE_EXTENSION },
{ "\\make_backup", RC_MAKE_BACKUP },
+ { "\\mark_foreign_language", RC_MARK_FOREIGN_LANGUAGE },
{ "\\num_lastfiles", RC_NUMLASTFILES },
+ { "\\override_x_deadkeys", RC_OVERRIDE_X_DEADKEYS },
{ "\\pdf_mode", RC_PDF_MODE },
{ "\\pdf_to_ps_command", RC_PDF_TO_PS_COMMAND },
{ "\\pdflatex_command", RC_PDFLATEX_COMMAND },
{ "\\screen_font_sizes", RC_SCREEN_FONT_SIZES },
{ "\\screen_font_typewriter", RC_SCREEN_FONT_TYPEWRITER },
{ "\\screen_zoom", RC_SCREEN_ZOOM },
- { "\\selection_color", RC_SELECTION_COLOR },
{ "\\serverpipe", RC_SERVERPIPE },
+ { "\\set_color", RC_SET_COLOR },
{ "\\show_banner", RC_SHOW_BANNER },
{ "\\spell_command", RC_SPELL_COMMAND },
{ "\\tempdir_path", RC_TEMPDIRPATH },
popup_font_name = "-*-helvetica-medium-r";
font_norm = "iso8859-1";
font_norm_menu = "";
+ override_x_deadkeys = true;
autosave = 300;
auto_region_delete = true;
- ascii_linelen = 75;
+ ascii_linelen = 65;
num_lastfiles = 4;
check_lastfiles = true;
make_backup = true;
hasBindFile = false;
rtl_support = false;
auto_number = true;
+ mark_foreign_language = true;
language_package = "\\usepackage{babel}";
language_auto_begin = true;
language_auto_end = true;
docbook_to_dvi_command="none";
docbook_to_html_command="none";
docbook_to_pdf_command="none";
-
- //
- defaultKeyBindings();
}
break;
case RC_BINDFILE: // RVDK_PATCH_5
if (lexrc.next()) {
- ReadBindFile(lexrc.GetString());
+ string tmp(lexrc.GetString());
+ if (bind_file.empty()) {
+ // we only need the name of the first
+ // bind file since that (usually)
+ // includes several others.
+ bind_file = tmp;
+ }
+ ReadBindFile(tmp);
}
break;
break;
case RC_KBMAP_PRIMARY:
- if (lexrc.next())
- primary_kbmap = lexrc.GetString();
+ if (lexrc.next())
+ if (!LibFileSearch("kbd", lexrc.GetString(),
+ "kmap").empty())
+ primary_kbmap = lexrc.GetString();
+ else
+ lexrc.printError("LyX: Keymap `$$Token' not found");
break;
case RC_KBMAP_SECONDARY:
- if (lexrc.next())
- secondary_kbmap = lexrc.GetString();
+ if (lexrc.next())
+ if (!LibFileSearch("kbd", lexrc.GetString(),
+ "kmap").empty())
+ secondary_kbmap = lexrc.GetString();
+ else
+ lexrc.printError("LyX: Keymap `$$Token' not found");
break;
case RC_FONT_ENCODING:
font_norm_menu = lexrc.GetString();
break;
+ case RC_SET_COLOR:
+ {
+ string lyx_name, x11_name;
+
+ if (lexrc.lex() == LyXLex::LEX_DATA) {
+ lyx_name = lexrc.GetString();
+ } else {
+ lexrc.printError("Bad color tag: `$$Token'");
+ break;
+ }
+
+ if (lexrc.lex() == LyXLex::LEX_DATA) {
+ x11_name = lexrc.GetString();
+ } else {
+ lexrc.printError("Bad color name: `$$Token'");
+ break;
+ }
+
+ if (!lcolor.setColor(lyx_name, x11_name))
+ lyxerr << "Bad lyxrc set_color for "
+ << lyx_name << endl;
+
+ break;
+ }
case RC_AUTOREGIONDELETE:
// Auto region delete defaults to true
if (lexrc.next())
// we should not do an explicit binding before
// loading a bind file. So, in this case, load
// the default bind file.
- if (!hasBindFile)
+ if (!hasBindFile) {
ReadBindFile();
-
+ bind_file = bindFile;
+ }
// !!!chb, dynamic key binding...
int action, res = 0;
string seq, cmd;
}
break;
}
+ case RC_OVERRIDE_X_DEADKEYS:
+ if (lexrc.next())
+ override_x_deadkeys = lexrc.GetBool();
+ break;
+
case RC_SERVERPIPE:
if (lexrc.next())
lyxpipes = ExpandPath(lexrc.GetString());
cursor_follows_scrollbar = lexrc.GetBool();
break;
- case RC_BACKGROUND_COLOR:
- if (lexrc.next())
- background_color = lexrc.GetString();
- break;
- case RC_SELECTION_COLOR:
- if (lexrc.next())
- strncpy(selection_color,
- lexrc.GetString().c_str(), 31);
- break;
case RC_FAX_COMMAND:
if (lexrc.next())
fax_command = lexrc.GetString();
if (lexrc.next())
auto_number = lexrc.GetBool();
break;
+ case RC_MARK_FOREIGN_LANGUAGE:
+ if (lexrc.next())
+ mark_foreign_language = lexrc.GetBool();
+ break;
case RC_SHOW_BANNER:
if (lexrc.next())
show_banner = lexrc.GetBool();
if ( lexrc.next())
docbook_to_pdf_command = lexrc.GetString();
break;
+
case RC_LAST: break; // this is just a dummy
}
}
// bind files are not done here.
case RC_BEGINTOOLBAR:
// Toolbar is not written here (yet).
+ //case RC_SET_COLOR:
+ // color bindings not written to preference file.
+ // And we want to be warned about that. (Lgb)
case RC_FONT_ENCODING:
os << "\\font_encoding \"" << fontenc << "\"\n";
case RC_PRINTER:
os << " " << font_sizes[LyXFont::SIZE_HUGE];
os << " " << font_sizes[LyXFont::SIZE_HUGER];
os << "\n";
+ case RC_OVERRIDE_X_DEADKEYS:
+ os << "\\override_x_deadkeys "
+ << override_x_deadkeys << "\n";
case RC_AUTOREGIONDELETE:
os << "\\auto_region_delete " << tostr(auto_region_delete)
<< "\n";
case RC_CURSOR_FOLLOWS_SCROLLBAR:
os << "\\cursor_follows_scrollbar "
<< tostr(cursor_follows_scrollbar) << "\n";
- case RC_BACKGROUND_COLOR:
- os << "\\background_color \"" << background_color << "\"\n";
- case RC_SELECTION_COLOR:
- os << "\\selection_color \"" << selection_color << "\"\n";
case RC_FAX_COMMAND:
os << "\\fax_command \"" << fax_command << "\"\n";
case RC_FAXPROGRAM:
case RC_RTL_SUPPORT:
os << "\\rtl " << tostr(rtl_support) << "\n";
case RC_AUTO_NUMBER:
- os << "\\auto_number" << tostr(auto_number) << "\n";
+ os << "\\auto_number " << tostr(auto_number) << "\n";
+ case RC_MARK_FOREIGN_LANGUAGE:
+ os << "\\mark_foreign_language " <<
+ tostr(mark_foreign_language) << "\n";
case RC_LANGUAGE_AUTO_BEGIN:
os << "\\language_auto_begin "
<< tostr(language_auto_begin) << "\n";
case RC_MAKE_BACKUP:
os << "\\make_backup " << tostr(make_backup) << "\n";
case RC_BACKUPDIR_PATH:
- os << "\\backupdir_path" << backupdir_path << "\n";
+ os << "\\backupdir_path \"" << backupdir_path << "\"\n";
case RC_DATE_INSERT_FORMAT:
os << "\\date_insert_format \"" << date_insert_format
<< "\"\n";
}
-/// define the default key bindings for LyX.
-void LyXRC::defaultKeyBindings()
-{
- bindings["Right"] = LFUN_RIGHT;
- bindings["Left"] = LFUN_LEFT;
- bindings["Up"] = LFUN_UP;
- bindings["Down"] = LFUN_DOWN;
-
- bindings["Tab"] = LFUN_TAB;
-
- bindings["Home"] = LFUN_HOME;
- bindings["End"] = LFUN_END;
- bindings["Prior"] = LFUN_PRIOR;
- bindings["Next"] = LFUN_NEXT;
-
- bindings["Return"] = LFUN_BREAKPARAGRAPH;
- bindings["~C-~S-~M-nobreakspace"] = LFUN_PROTECTEDSPACE;
-
- bindings["Delete"] = LFUN_DELETE;
- bindings["BackSpace"] = LFUN_BACKSPACE;
- // bindKeyings for transparent handling of deadkeys
- // The keysyms are gotten from XFree86 X11R6
- bindings["~C-~S-~M-dead_acute"] = LFUN_ACUTE;
- bindings["~C-~S-~M-dead_breve"] = LFUN_BREVE;
- bindings["~C-~S-~M-dead_caron"] = LFUN_CARON;
- bindings["~C-~S-~M-dead_cedilla"] = LFUN_CEDILLA;
- bindings["~C-~S-~M-dead_abovering"] = LFUN_CIRCLE;
- bindings["~C-~S-~M-dead_circumflex"] = LFUN_CIRCUMFLEX;
- bindings["~C-~S-~M-dead_abovedot"] = LFUN_DOT;
- bindings["~C-~S-~M-dead_grave"] = LFUN_GRAVE;
- bindings["~C-~S-~M-dead_doubleacute"] = LFUN_HUNG_UMLAUT;
- bindings["~C-~S-~M-dead_macron"] = LFUN_MACRON;
- // nothing with this name
- // bindings["~C-~S-~M-dead_special_caron"] = LFUN_SPECIAL_CARON;
- bindings["~C-~S-~M-dead_tilde"] = LFUN_TILDE;
- bindings["~C-~S-~M-dead_diaeresis"] = LFUN_UMLAUT;
- // nothing with this name either...
- //bindings["~C-~S-~M-dead_underbar"] = LFUN_UNDERBAR;
- bindings["~C-~S-~M-dead_belowdot"] = LFUN_UNDERDOT;
- bindings["~C-~S-~M-dead_tie"] = LFUN_TIE;
- bindings["~C-~S-~M-dead_ogonek"] = LFUN_OGONEK;
-
- // bindings to utilize the use of the numeric keypad
- // e.g. Num Lock set
- bindings["KP_0"] = LFUN_SELFINSERT;
- bindings["KP_Decimal"] = LFUN_SELFINSERT;
- bindings["KP_Enter"] = LFUN_SELFINSERT;
- bindings["KP_1"] = LFUN_SELFINSERT;
- bindings["KP_2"] = LFUN_SELFINSERT;
- bindings["KP_3"] = LFUN_SELFINSERT;
- bindings["KP_4"] = LFUN_SELFINSERT;
- bindings["KP_5"] = LFUN_SELFINSERT;
- bindings["KP_6"] = LFUN_SELFINSERT;
- bindings["KP_Add"] = LFUN_SELFINSERT;
- bindings["KP_7"] = LFUN_SELFINSERT;
- bindings["KP_8"] = LFUN_SELFINSERT;
- bindings["KP_9"] = LFUN_SELFINSERT;
- bindings["KP_Divide"] = LFUN_SELFINSERT;
- bindings["KP_Multiply"] = LFUN_SELFINSERT;
- bindings["KP_Subtract"] = LFUN_SELFINSERT;
-
- /* Most self-insert keys are handled in the 'default:' section of
- * WorkAreaKeyPress - so we don't have to define them all.
- * However keys explicit decleared as self-insert are
- * handled seperatly (LFUN_SELFINSERT.) Lgb. */
-
- bindings["C-Tab"] = LFUN_TABINSERT; // ale970515
-}
-
// The global instance
LyXRC lyxrc;
projects / lyx.git / blobdiff