File putty-03-config.diff of Package putty

* Put 3DES off as insecure.
* Always use "linux" terminal type. This resolves some
  strange key combos.
* Set standard colors and use a more legilible font size.

---
 conf.h                   |   20 ++++++++++----------
 settings.c               |   29 +++++++++++++++++++++++------
 unix/platform.h          |    6 +-----
 windows/utils/defaults.c |    2 +-
 4 files changed, 35 insertions(+), 22 deletions(-)

Index: putty-0.82/conf.h
===================================================================
--- putty-0.82.orig/conf.h
+++ putty-0.82/conf.h
@@ -408,7 +408,7 @@ CONF_OPTION(ssh_nc_port, /* port to conn
 /* Telnet options */
 CONF_OPTION(termtype,
     VALUE_TYPE(STR),
-    DEFAULT_STR("xterm"),
+    DEFAULT_STR("linux"),
     SAVE_KEYWORD("TerminalType"),
 )
 CONF_OPTION(termspeed,
@@ -539,7 +539,7 @@ CONF_OPTION(rxvt_homeend,
 )
 CONF_OPTION(funky_type,
     VALUE_TYPE(INT),
-    DEFAULT_INT(FUNKY_TILDE),
+    DEFAULT_INT(FUNKY_LINUX),
     SAVE_KEYWORD("LinuxFunctionKeys"),
     STORAGE_ENUM(funky_type),
 )
@@ -561,7 +561,7 @@ CONF_OPTION(no_applic_k, /* totally disa
 )
 CONF_OPTION(no_mouse_rep, /* totally disable mouse reporting */
     VALUE_TYPE(BOOL),
-    DEFAULT_BOOL(false),
+    DEFAULT_BOOL(true),
     SAVE_KEYWORD("NoMouseReporting"),
 )
 CONF_OPTION(no_remote_resize, /* disable remote resizing */
@@ -633,7 +633,7 @@ CONF_OPTION(alt_f4, /* is it special? */
 )
 CONF_OPTION(alt_space, /* is it special? */
     VALUE_TYPE(BOOL),
-    DEFAULT_BOOL(false),
+    DEFAULT_BOOL(true),
     SAVE_KEYWORD("AltSpace"),
 )
 CONF_OPTION(alt_only, /* is it special? */
@@ -660,7 +660,7 @@ CONF_OPTION(alwaysontop,
 )
 CONF_OPTION(fullscreenonaltenter,
     VALUE_TYPE(BOOL),
-    DEFAULT_BOOL(false),
+    DEFAULT_BOOL(true),
     SAVE_KEYWORD("FullScreenOnAltEnter"),
 )
 CONF_OPTION(scroll_on_key,
@@ -680,7 +680,7 @@ CONF_OPTION(erase_to_scrollback,
 )
 CONF_OPTION(compose_key,
     VALUE_TYPE(BOOL),
-    DEFAULT_BOOL(false),
+    DEFAULT_BOOL(true),
     SAVE_KEYWORD("ComposeKey"),
 )
 CONF_OPTION(ctrlaltkeys,
@@ -724,7 +724,7 @@ CONF_OPTION(lfhascr,
 )
 CONF_OPTION(cursor_type,
     VALUE_TYPE(INT),
-    DEFAULT_INT(0),
+    DEFAULT_INT(1),
     SAVE_KEYWORD("CurType"),
     STORAGE_ENUM(cursor_type),
 )
@@ -809,7 +809,7 @@ CONF_OPTION(blinktext,
 )
 CONF_OPTION(win_name_always,
     VALUE_TYPE(BOOL),
-    DEFAULT_BOOL(true),
+    DEFAULT_BOOL(false),
     SAVE_KEYWORD("WinNameAlways"),
 )
 CONF_OPTION(width,
@@ -819,7 +819,7 @@ CONF_OPTION(width,
 )
 CONF_OPTION(height,
     VALUE_TYPE(INT),
-    DEFAULT_INT(24),
+    DEFAULT_INT(25),
     SAVE_KEYWORD("TermHeight"),
 )
 CONF_OPTION(font,
@@ -1071,7 +1071,7 @@ CONF_OPTION(vtmode,
 )
 CONF_OPTION(line_codepage,
     VALUE_TYPE(STR),
-    DEFAULT_STR(""),
+    DEFAULT_STR("UTF-8"),
     SAVE_KEYWORD("LineCodePage"),
 )
 CONF_OPTION(cjk_ambig_wide,
Index: putty-0.82/settings.c
===================================================================
--- putty-0.82.orig/settings.c
+++ putty-0.82/settings.c
@@ -18,8 +18,8 @@ static const struct keyvalwhere cipherna
     { "aes",        CIPHER_AES,             -1, -1 },
     { "chacha20",   CIPHER_CHACHA20,        CIPHER_AES, +1 },
     { "aesgcm",     CIPHER_AESGCM,          CIPHER_CHACHA20, +1 },
-    { "3des",       CIPHER_3DES,            -1, -1 },
     { "WARN",       CIPHER_WARN,            -1, -1 },
+    { "3des",       CIPHER_3DES,            -1, -1 },
     { "des",        CIPHER_DES,             -1, -1 },
     { "blowfish",   CIPHER_BLOWFISH,        -1, -1 },
     { "arcfour",    CIPHER_ARCFOUR,         -1, -1 },
@@ -982,11 +982,28 @@ void load_open_settings(settings_r *sess
 
     for (i = 0; i < 22; i++) {
         static const char *const defaults[] = {
-            "187,187,187", "255,255,255", "0,0,0", "85,85,85", "0,0,0",
-            "0,255,0", "0,0,0", "85,85,85", "187,0,0", "255,85,85",
-            "0,187,0", "85,255,85", "187,187,0", "255,255,85", "0,0,187",
-            "85,85,255", "187,0,187", "255,85,255", "0,187,187",
-            "85,255,255", "187,187,187", "255,255,255"
+            "170,170,170", /* default foreground */
+            "255,255,255", /* default bold foreground */
+            "0,0,0",       /* default background */
+            "85,85,85",    /* default bold background */
+            "0,0,0",       /* cursor text */
+            "192,192,224", /* cursor color */
+            "0,0,0",       /* black */
+            "85,85,85",    /* black bold */
+            "170,0,0",     /* red */
+            "255,0,0",     /* red bold */
+            "0,170,0",     /* green */
+            "0,255,0",     /* green bold */
+            "170,85,0",    /* brown */
+            "255,255,0",   /* yellow bold */
+            "0,0,170",     /* blue */
+            "0,0,255",     /* blue bold */
+            "170,0,170",   /* magenta */
+            "255,0,255",   /* magenta bold */
+            "0,170,170",   /* cyan */
+            "0,255,255",   /* cyan bold */
+            "170,170,170", /* white */
+            "255,255,255", /* white bold */
         };
         char buf[20], *buf2;
         int c0, c1, c2;
Index: putty-0.82/unix/platform.h
===================================================================
--- putty-0.82.orig/unix/platform.h
+++ putty-0.82/unix/platform.h
@@ -400,11 +400,7 @@ void fd_socket_set_psb_prefix(Socket *s,
 /*
  * Default font setting, which can vary depending on NOT_X_WINDOWS.
  */
-#ifdef NOT_X_WINDOWS
-#define DEFAULT_GTK_FONT "client:Monospace 12"
-#else
-#define DEFAULT_GTK_FONT "server:fixed"
-#endif
+#define DEFAULT_GTK_FONT "client:Monospace 16"
 
 /*
  * pty.c.
Index: putty-0.82/windows/utils/defaults.c
===================================================================
--- putty-0.82.orig/windows/utils/defaults.c
+++ putty-0.82/windows/utils/defaults.c
@@ -9,7 +9,7 @@
 FontSpec *platform_default_fontspec(const char *name)
 {
     if (!strcmp(name, "Font"))
-        return fontspec_new("Courier New", false, 10, ANSI_CHARSET);
+        return fontspec_new("Consolas", false, 16, ANSI_CHARSET);
     else
         return fontspec_new_default();
 }
openSUSE Build Service is sponsored by