diff --git a/src/ChangeLog b/src/ChangeLog index e1bbdc43b8..e5511685ec 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-12-16 Angus Leeming + + * lyxrc.[Ch]: + * lyx_main.C (init): remove override_x_deadkeys stuff. + 2002-12-12 John Levon * lyxfunc.C: use LyXKeySym->isText() as last-ditch diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index d5ad2c6b14..9d0208e01e 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-12-16 Angus Leeming + + * FormPreferences.C: + * forms/form_preferences.fd: remove override_x_deadkeys stuff. + 2002-12-13 Angus Leeming * FormBase.C: diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index 72edd91272..4e50c2d4c4 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -1489,8 +1489,6 @@ void FormPreferences::Interface::apply(LyXRC & rc) const fl_get_input(dialog_->input_popup_font_encoding); rc.bind_file = fl_get_input(dialog_->input_bind_file); rc.ui_file = fl_get_input(dialog_->input_ui_file); - rc.override_x_deadkeys = - fl_get_button(dialog_->check_override_x_dead_keys); } @@ -1512,7 +1510,6 @@ void FormPreferences::Interface::build() setPrehandler(dialog_->button_bind_file_browse); setPrehandler(dialog_->input_ui_file); setPrehandler(dialog_->button_ui_file_browse); - setPrehandler(dialog_->check_override_x_dead_keys); } @@ -1529,8 +1526,6 @@ FormPreferences::Interface::feedback(FL_OBJECT const * const ob) const return LyXRC::getDescription(LyXRC::RC_BINDFILE); if (ob == dialog_->input_ui_file) return LyXRC::getDescription(LyXRC::RC_UIFILE); - if (ob == dialog_->check_override_x_dead_keys) - return LyXRC::getDescription(LyXRC::RC_OVERRIDE_X_DEADKEYS); return string(); } @@ -1565,8 +1560,6 @@ void FormPreferences::Interface::update(LyXRC const & rc) rc.bind_file.c_str()); fl_set_input(dialog_->input_ui_file, rc.ui_file.c_str()); - fl_set_button(dialog_->check_override_x_dead_keys, - rc.override_x_deadkeys); } diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd index 0abc80553c..eb2c170bda 100644 --- a/src/frontends/xforms/forms/form_preferences.fd +++ b/src/frontends/xforms/forms/form_preferences.fd @@ -596,7 +596,7 @@ argument: Name: form_preferences_interface Width: 450 Height: 350 -Number of Objects: 12 +Number of Objects: 10 -------------------- class: FL_BOX @@ -691,7 +691,7 @@ argument: 0 -------------------- class: FL_LABELFRAME type: ENGRAVED_FRAME -box: 15 150 425 85 +box: 15 165 425 85 boxtype: FL_NO_BOX colors: FL_BLACK FL_COL1 alignment: FL_ALIGN_TOP_LEFT @@ -709,7 +709,7 @@ argument: -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 160 160 170 30 +box: 160 175 170 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -727,7 +727,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 335 160 100 30 +box: 335 175 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -745,7 +745,7 @@ argument: 0 -------------------- class: FL_INPUT type: NORMAL_INPUT -box: 160 195 170 30 +box: 160 210 170 30 boxtype: FL_DOWN_BOX colors: FL_COL1 FL_MCOL alignment: FL_ALIGN_LEFT @@ -763,7 +763,7 @@ argument: 0 -------------------- class: FL_BUTTON type: NORMAL_BUTTON -box: 335 195 100 30 +box: 335 210 100 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 alignment: FL_ALIGN_CENTER @@ -778,43 +778,6 @@ name: button_bind_file_browse callback: C_FormBaseInputCB argument: 0 --------------------- -class: FL_LABELFRAME -type: ENGRAVED_FRAME -box: 15 255 425 45 -boxtype: FL_NO_BOX -colors: FL_BLACK FL_COL1 -alignment: FL_ALIGN_TOP_LEFT -style: FL_NORMAL_STYLE -size: FL_DEFAULT_SIZE -lcol: FL_BLACK -label: Dead Keys -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: -callback: -argument: - --------------------- -class: FL_CHECKBUTTON -type: PUSH_BUTTON -box: 95 265 30 30 -boxtype: FL_NO_BOX -colors: FL_COL1 FL_YELLOW -alignment: FL_ALIGN_CENTER -style: FL_NORMAL_STYLE -size: FL_NORMAL_SIZE -lcol: FL_BLACK -label: Override X Window dead-keys|#O -shortcut: -resize: FL_RESIZE_ALL -gravity: FL_NoGravity FL_NoGravity -name: check_override_x_dead_keys -callback: C_FormBaseInputCB -argument: 0 - value: 1 - =============== FORM =============== Name: form_preferences_colors Width: 450 diff --git a/src/lyx_main.C b/src/lyx_main.C index b20b2aee64..5cdbdc8d5f 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -463,11 +463,6 @@ void LyX::init(bool gui) // Read menus readUIFile(lyxrc.ui_file); - // Bind the X dead keys to the corresponding LyX functions if - // necessary. - if (lyxrc.override_x_deadkeys) - deadKeyBindings(toplevel_keymap.get()); - if (lyxerr.debugging(Debug::LYXRC)) { lyxrc.print(); } diff --git a/src/lyxrc.C b/src/lyxrc.C index 19ebfb0c53..1053cdbcf7 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -89,7 +89,6 @@ keyword_item lyxrcTags[] = { { "\\make_backup", LyXRC::RC_MAKE_BACKUP }, { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE }, { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES }, - { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS }, { "\\personal_dictionary", LyXRC::RC_PERS_DICT }, { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT }, { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING }, @@ -219,7 +218,6 @@ void LyXRC::setDefaults() { font_norm = "iso8859-1"; font_norm_type = ISO_8859_1; popup_font_encoding.erase(); - override_x_deadkeys = true; autosave = 300; auto_region_delete = true; auto_reset_options = false; @@ -846,12 +844,6 @@ int LyXRC::read(string const & filename) } 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()); @@ -1734,11 +1726,6 @@ void LyXRC::output(ostream & os) const << "# 2nd MISC SUPPORT SECTION ##########################\n" << "#\n\n"; - case RC_OVERRIDE_X_DEADKEYS: - if (override_x_deadkeys != system_lyxrc.override_x_deadkeys) { - os << "\\override_x_deadkeys " - << tostr(override_x_deadkeys) << '\n'; - } case RC_AUTO_NUMBER: if (auto_number != system_lyxrc.auto_number) { os << "\\auto_number " << tostr(auto_number) << '\n'; @@ -1987,11 +1974,6 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("De-select if you don't want the class options to be reset to defaults after class change."); break; - case RC_OVERRIDE_X_DEADKEYS: - str = _("Select if LyX is to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard."); - break; - - case RC_SERVERPIPE: str = _("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users."); break; diff --git a/src/lyxrc.h b/src/lyxrc.h index f7bb3ff6e1..cf497b8af2 100644 --- a/src/lyxrc.h +++ b/src/lyxrc.h @@ -72,7 +72,6 @@ enum LyXRCTags { RC_AUTOREGIONDELETE, RC_AUTORESET_OPTIONS, RC_BIND, - RC_OVERRIDE_X_DEADKEYS, RC_SERVERPIPE, RC_INPUT, RC_BINDFILE, @@ -234,8 +233,6 @@ enum LyXRCTags { bool use_scalable_fonts; /// DPI of monitor float dpi; - /// Whether lyx should handle deadkeys by itself - bool override_x_deadkeys; /// string fontenc; ///