more changes, read the Changelog

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index f34e0cdb6436164f0794b9089363092bcc8a7128..2b81b0d0c3ce94933737d1fffa88de4493a961ad 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -41,8 +41,6 @@ using std::endl;
 // 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;
@@ -87,6 +85,7 @@ enum LyXRCTags {
        RC_SCREEN_FONT_POPUP,
        RC_SCREEN_FONT_ENCODING,
        RC_SCREEN_FONT_ENCODING_MENU,
+       RC_SET_COLOR,
        RC_AUTOSAVE,
        RC_DOCUMENTPATH,
        RC_TEMPLATEPATH,
@@ -102,8 +101,6 @@ enum LyXRCTags {
        RC_KBMAP,
        RC_KBMAP_PRIMARY,
        RC_KBMAP_SECONDARY,
-       RC_SELECTION_COLOR,
-       RC_BACKGROUND_COLOR,
        RC_FAX_COMMAND,
        RC_PHONEBOOK,
        RC_FAXPROGRAM,
@@ -170,7 +167,6 @@ keyword_item lyxrcTags[] = {
        { "\\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 },
@@ -254,8 +250,8 @@ keyword_item lyxrcTags[] = {
        { "\\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 },
@@ -351,7 +347,7 @@ void LyXRC::setDefaults() {
        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;
@@ -449,7 +445,14 @@ int LyXRC::read(string const & filename)
                        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;
                        
@@ -475,13 +478,21 @@ int LyXRC::read(string const & filename)
                        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:
@@ -836,6 +847,30 @@ int LyXRC::read(string const & filename)
                                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())
@@ -847,9 +882,10 @@ int LyXRC::read(string const & filename)
                        // 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;
@@ -903,15 +939,6 @@ int LyXRC::read(string const & filename)
                                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();
@@ -1050,6 +1077,7 @@ int LyXRC::read(string const & filename)
                        if ( lexrc.next())
                                docbook_to_pdf_command = lexrc.GetString();
                        break;
+
                case RC_LAST: break; // this is just a dummy
                }
        }
@@ -1108,6 +1136,9 @@ void LyXRC::output(ostream & os) const
                // 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:
@@ -1303,10 +1334,6 @@ void LyXRC::output(ostream & os) const
        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:
@@ -1343,7 +1370,7 @@ void LyXRC::output(ostream & os) const
        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";
@@ -1364,7 +1391,7 @@ void LyXRC::output(ostream & os) const
        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";