Rethink the whole line discipline architecture. Instead of having

[u/mdw/putty] / settings.c

diff --git a/settings.c b/settings.c
index ada2b74..b8a7f79 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -68,6 +68,7 @@ void save_settings (char *section, int do_host, Config *cfg) {
        write_setting_s (sesskey, "Environment", buf);
     }
     write_setting_s (sesskey, "UserName", cfg->username);
+    write_setting_s (sesskey, "LocalUserName", cfg->localusername);
     write_setting_i (sesskey, "NoPTY", cfg->nopty);
     write_setting_i (sesskey, "Compression", cfg->compression);
     write_setting_i (sesskey, "AgentFwd", cfg->agentfwd);
@@ -92,8 +93,10 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "AltSpace", cfg->alt_space);
     write_setting_i (sesskey, "AltOnly", cfg->alt_only);
     write_setting_i (sesskey, "ComposeKey", cfg->compose_key);
-    write_setting_i (sesskey, "LdiscTerm", cfg->ldisc_term);
+    write_setting_i (sesskey, "LocalEcho", cfg->localecho);
+    write_setting_i (sesskey, "LocalEdit", cfg->localedit);
     write_setting_i (sesskey, "AlwaysOnTop", cfg->alwaysontop);
+    write_setting_i (sesskey, "HideMousePtr", cfg->hide_mouseptr);
     write_setting_i (sesskey, "CurType", cfg->cursor_type);
     write_setting_i (sesskey, "BlinkCur", cfg->blink_cur);
     write_setting_i (sesskey, "Beep", cfg->beep);
@@ -141,6 +144,8 @@ void save_settings (char *section, int do_host, Config *cfg) {
     write_setting_i (sesskey, "LockSize", cfg->locksize);
     write_setting_i (sesskey, "BCE", cfg->bce);
     write_setting_i (sesskey, "BlinkText", cfg->blinktext);
+    write_setting_i (sesskey, "X11Forward", cfg->x11_forward);
+    write_setting_s (sesskey, "X11Display", cfg->x11_display);
 
     close_settings_w(sesskey);
 }
@@ -199,6 +204,7 @@ void load_settings (char *section, int do_host, Config *cfg) {
        *q = '\0';
     }
     gpps (sesskey, "UserName", "", cfg->username, sizeof(cfg->username));
+    gpps (sesskey, "LocalUserName", "", cfg->localusername, sizeof(cfg->localusername));
     gppi (sesskey, "NoPTY", 0, &cfg->nopty);
     gppi (sesskey, "Compression", 0, &cfg->compression);
     gppi (sesskey, "AgentFwd", 0, &cfg->agentfwd);
@@ -232,8 +238,10 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "AltSpace", 0, &cfg->alt_space);
     gppi (sesskey, "AltOnly", 0, &cfg->alt_only);
     gppi (sesskey, "ComposeKey", 0, &cfg->compose_key);
-    gppi (sesskey, "LdiscTerm", 0, &cfg->ldisc_term);
+    gppi (sesskey, "LocalEcho", LD_BACKEND, &cfg->localecho);
+    gppi (sesskey, "LocalEdit", LD_BACKEND, &cfg->localedit);
     gppi (sesskey, "AlwaysOnTop", 0, &cfg->alwaysontop);
+    gppi (sesskey, "HideMousePtr", 0, &cfg->hide_mouseptr);
     gppi (sesskey, "CurType", 0, &cfg->cursor_type);
     gppi (sesskey, "BlinkCur", 0, &cfg->blink_cur);
     gppi (sesskey, "Beep", 1, &cfg->beep);
@@ -304,6 +312,9 @@ void load_settings (char *section, int do_host, Config *cfg) {
     gppi (sesskey, "LockSize", 0, &cfg->locksize);
     gppi (sesskey, "BCE", 0, &cfg->bce);
     gppi (sesskey, "BlinkText", 0, &cfg->blinktext);
+    gppi (sesskey, "X11Forward", 0, &cfg->x11_forward);
+    gpps (sesskey, "X11Display", "localhost:0", cfg->x11_display,
+          sizeof(cfg->x11_display));
 
     close_settings_r(sesskey);
 }