pool/putty
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
da7e21c1f0
putty/putty-03-config.diff

162 lines
7.7 KiB
Diff
Raw Blame History

* 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.
---
settings.c | 51 ++++++++++++++++++++++++++++++++++-----------------
unix/unix.h | 6 +-----
windows/windefs.c | 2 +-
3 files changed, 36 insertions(+), 23 deletions(-)
Index: putty-0.68/settings.c
===================================================================
--- putty-0.68.orig/settings.c
+++ putty-0.68/settings.c
@@ -13,8 +13,8 @@ static const struct keyvalwhere cipherna
{ "aes", CIPHER_AES, -1, -1 },
{ "chacha20", CIPHER_CHACHA20, CIPHER_AES, +1 },
{ "blowfish", CIPHER_BLOWFISH, -1, -1 },
- { "3des", CIPHER_3DES, -1, -1 },
{ "WARN", CIPHER_WARN, -1, -1 },
+ { "3des", CIPHER_3DES, -1, -1 },
{ "arcfour", CIPHER_ARCFOUR, -1, -1 },
{ "des", CIPHER_DES, -1, -1 }
};
@@ -746,7 +746,7 @@ void load_open_settings(void *sesskey, C
}
gppi(sesskey, "TCPNoDelay", 1, conf, CONF_tcp_nodelay);
gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives);
- gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype);
+ gpps(sesskey, "TerminalType", "linux", conf, CONF_termtype);
gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed);
if (!gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) {
/* This hardcodes a big set of defaults in any new saved
@@ -870,10 +870,10 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "PassiveTelnet", 0, conf, CONF_passive_telnet);
gppi(sesskey, "BackspaceIsDelete", 1, conf, CONF_bksp_is_delete);
gppi(sesskey, "RXVTHomeEnd", 0, conf, CONF_rxvt_homeend);
- gppi(sesskey, "LinuxFunctionKeys", 0, conf, CONF_funky_type);
+ gppi(sesskey, "LinuxFunctionKeys", 1, conf, CONF_funky_type);
gppi(sesskey, "NoApplicationKeys", 0, conf, CONF_no_applic_k);
gppi(sesskey, "NoApplicationCursors", 0, conf, CONF_no_applic_c);
- gppi(sesskey, "NoMouseReporting", 0, conf, CONF_no_mouse_rep);
+ gppi(sesskey, "NoMouseReporting", 1, conf, CONF_no_mouse_rep);
gppi(sesskey, "NoRemoteResize", 0, conf, CONF_no_remote_resize);
gppi(sesskey, "NoAltScreen", 0, conf, CONF_no_alt_screen);
gppi(sesskey, "NoRemoteWinTitle", 0, conf, CONF_no_remote_wintitle);
@@ -894,9 +894,9 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "ApplicationKeypad", 0, conf, CONF_app_keypad);
gppi(sesskey, "NetHackKeypad", 0, conf, CONF_nethack_keypad);
gppi(sesskey, "AltF4", 1, conf, CONF_alt_f4);
- gppi(sesskey, "AltSpace", 0, conf, CONF_alt_space);
+ gppi(sesskey, "AltSpace", 1, conf, CONF_alt_space);
gppi(sesskey, "AltOnly", 0, conf, CONF_alt_only);
- gppi(sesskey, "ComposeKey", 0, conf, CONF_compose_key);
+ gppi(sesskey, "ComposeKey", 1, conf, CONF_compose_key);
gppi(sesskey, "CtrlAltKeys", 1, conf, CONF_ctrlaltkeys);
#ifdef OSX_META_KEY_CONFIG
gppi(sesskey, "OSXOptionMeta", 1, conf, CONF_osx_option_meta);
@@ -908,12 +908,12 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit);
gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback);
gppi(sesskey, "AlwaysOnTop", 0, conf, CONF_alwaysontop);
- gppi(sesskey, "FullScreenOnAltEnter", 0, conf, CONF_fullscreenonaltenter);
+ gppi(sesskey, "FullScreenOnAltEnter", 1, conf, CONF_fullscreenonaltenter);
gppi(sesskey, "HideMousePtr", 0, conf, CONF_hide_mouseptr);
gppi(sesskey, "SunkenEdge", 0, conf, CONF_sunken_edge);
gppi(sesskey, "WindowBorder", 1, conf, CONF_window_border);
- gppi(sesskey, "CurType", 0, conf, CONF_cursor_type);
- gppi(sesskey, "BlinkCur", 0, conf, CONF_blink_cur);
+ gppi(sesskey, "CurType", 1, conf, CONF_cursor_type);
+ gppi(sesskey, "BlinkCur", 1, conf, CONF_blink_cur);
/* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */
gppi(sesskey, "Beep", 1, conf, CONF_beep);
gppi(sesskey, "BeepInd", 0, conf, CONF_beep_ind);
@@ -947,10 +947,10 @@ void load_open_settings(void *sesskey, C
gppi(sesskey, "CRImpliesLF", 0, conf, CONF_crhaslf);
gppi(sesskey, "DisableArabicShaping", 0, conf, CONF_arabicshaping);
gppi(sesskey, "DisableBidi", 0, conf, CONF_bidi);
- gppi(sesskey, "WinNameAlways", 1, conf, CONF_win_name_always);
+ gppi(sesskey, "WinNameAlways", 0, conf, CONF_win_name_always);
gpps(sesskey, "WinTitle", "", conf, CONF_wintitle);
gppi(sesskey, "TermWidth", 80, conf, CONF_width);
- gppi(sesskey, "TermHeight", 24, conf, CONF_height);
+ gppi(sesskey, "TermHeight", 25, conf, CONF_height);
gppfont(sesskey, "Font", conf, CONF_font);
gppi(sesskey, "FontQuality", FQ_DEFAULT, conf, CONF_font_quality);
gppi(sesskey, "FontVTMode", VT_UNICODE, conf, CONF_vtmode);
@@ -962,11 +962,28 @@ void load_open_settings(void *sesskey, C
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;
@@ -1014,7 +1031,7 @@ void load_open_settings(void *sesskey, C
* The empty default for LineCodePage will be converted later
* into a plausible default for the locale.
*/
- gpps(sesskey, "LineCodePage", "", conf, CONF_line_codepage);
+ gpps(sesskey, "LineCodePage", "UTF-8", conf, CONF_line_codepage);
gppi(sesskey, "CJKAmbigWide", 0, conf, CONF_cjk_ambig_wide);
gppi(sesskey, "UTF8Override", 1, conf, CONF_utf8_override);
gpps(sesskey, "Printer", "", conf, CONF_printer);
Index: putty-0.68/unix/unix.h
===================================================================
--- putty-0.68.orig/unix/unix.h
+++ putty-0.68/unix/unix.h
@@ -249,10 +249,6 @@ int so_peercred(int fd, int *pid, int *u
/*
* 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 14"
#endif
Index: putty-0.68/windows/windefs.c
===================================================================
--- putty-0.68.orig/windows/windefs.c
+++ putty-0.68/windows/windefs.c
@@ -9,7 +9,7 @@
FontSpec *platform_default_fontspec(const char *name)
{
if (!strcmp(name, "Font"))
- return fontspec_new("Courier New", 0, 10, ANSI_CHARSET);
+ return fontspec_new("Ludica Console", 0, 14, ANSI_CHARSET);
else
return fontspec_new("", 0, 0, 0);
}
Reference in New Issue View Git Blame Copy Permalink