1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00

Rename term->bidi and term->arabicshaping.

Those two flags had the opposite sense to what you might expect: each
one is the value of the Conf entry corresponding to the checkbox that
_disables_ the corresponding terminal feature. So term->bidi is true
if and only if bidi is _off_.

I think that confusion of naming probably contributed to the control-
flow error fixed in the previous commit, just by increasing cognitive
load until I couldn't remember which flags were set where any more! So
now I've renamed the two fields of Terminal, and the corresponding
Conf keywords, to be called "no_bidi" and "no_arabicshaping", in line
with other 'disable this feature' flags, so that it's clear what the
sense should be.
This commit is contained in:
Simon Tatham
2019-03-26 21:13:19 +00:00
parent 117c7857d2
commit 209dd65ead
5 changed files with 19 additions and 19 deletions

View File

@ -679,8 +679,8 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
write_setting_b(sesskey, "AutoWrapMode", conf_get_bool(conf, CONF_wrap_mode));
write_setting_b(sesskey, "LFImpliesCR", conf_get_bool(conf, CONF_lfhascr));
write_setting_b(sesskey, "CRImpliesLF", conf_get_bool(conf, CONF_crhaslf));
write_setting_b(sesskey, "DisableArabicShaping", conf_get_bool(conf, CONF_arabicshaping));
write_setting_b(sesskey, "DisableBidi", conf_get_bool(conf, CONF_bidi));
write_setting_b(sesskey, "DisableArabicShaping", conf_get_bool(conf, CONF_no_arabicshaping));
write_setting_b(sesskey, "DisableBidi", conf_get_bool(conf, CONF_no_bidi));
write_setting_b(sesskey, "WinNameAlways", conf_get_bool(conf, CONF_win_name_always));
write_setting_s(sesskey, "WinTitle", conf_get_str(conf, CONF_wintitle));
write_setting_i(sesskey, "TermWidth", conf_get_int(conf, CONF_width));
@ -1106,8 +1106,8 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
gppb(sesskey, "AutoWrapMode", true, conf, CONF_wrap_mode);
gppb(sesskey, "LFImpliesCR", false, conf, CONF_lfhascr);
gppb(sesskey, "CRImpliesLF", false, conf, CONF_crhaslf);
gppb(sesskey, "DisableArabicShaping", false, conf, CONF_arabicshaping);
gppb(sesskey, "DisableBidi", false, conf, CONF_bidi);
gppb(sesskey, "DisableArabicShaping", false, conf, CONF_no_arabicshaping);
gppb(sesskey, "DisableBidi", false, conf, CONF_no_bidi);
gppb(sesskey, "WinNameAlways", true, conf, CONF_win_name_always);
gpps(sesskey, "WinTitle", "", conf, CONF_wintitle);
gppi(sesskey, "TermWidth", 80, conf, CONF_width);