diff --git a/0.76b_My_PuTTY/putty.h b/0.76b_My_PuTTY/putty.h index c8e7d96..03ae5fa 100644 --- a/0.76b_My_PuTTY/putty.h +++ b/0.76b_My_PuTTY/putty.h @@ -1842,6 +1842,7 @@ NORETURN void cleanup_exit(int); X(BOOL, NONE, no_focus_rep) /* totally disable mouse reporting */ \ X(INT, NONE, scrolllines) /* Options for Scroll Lines per Wheel */ \ X(BOOL, NONE, ssh_tunnel_print_in_title) /* print dynamic port number in window title */ \ + X(BOOL, NONE, osc52_warn_before_cliboard_sync) /* Warn before clipboard sync */ \ /* #endif */ \ /* #ifdef MOD_PROXY */ \ X(STR, NONE, proxyselection) /* Options for proxy selection */ \ diff --git a/0.76b_My_PuTTY/settings.c b/0.76b_My_PuTTY/settings.c index e76e498..ae89f83 100644 --- a/0.76b_My_PuTTY/settings.c +++ b/0.76b_My_PuTTY/settings.c @@ -949,6 +949,7 @@ void save_open_settings(settings_w *sesskey, Conf *conf) write_setting_b(sesskey, "NoFocusReporting", conf_get_bool(conf, CONF_no_focus_rep)); write_setting_i(sesskey, "LinesAtAScroll", conf_get_int(conf, CONF_scrolllines)); write_setting_b(sesskey, "SSHTunnelInTitle", conf_get_bool(conf, CONF_ssh_tunnel_print_in_title)); + write_setting_b(sesskey, "OSC52WarnBeforeClipboardSync", conf_get_bool(conf, CONF_osc52_warn_before_cliboard_sync)); #endif #ifdef MOD_PORTKNOCKING write_setting_s(sesskey, "PortKnocking", conf_get_str(conf, CONF_portknockingoptions) ); @@ -1640,6 +1641,7 @@ void load_open_settings(settings_r *sesskey, Conf *conf) gppb(sesskey, "NoFocusReporting", true, conf, CONF_no_focus_rep); gppi(sesskey, "LinesAtAScroll", -1, conf, CONF_scrolllines); gppb(sesskey, "SSHTunnelInTitle", false, conf, CONF_ssh_tunnel_print_in_title); + gppb(sesskey, "OSC52WarnBeforeClipboardSync", false, conf, CONF_osc52_warn_before_cliboard_sync); #endif #ifdef MOD_PORTKNOCKING gpps(sesskey, "PortKnocking", "", conf, CONF_portknockingoptions ); diff --git a/0.76b_My_PuTTY/terminal/terminal.c b/0.76b_My_PuTTY/terminal/terminal.c index 11291c9..72ffa76 100644 --- a/0.76b_My_PuTTY/terminal/terminal.c +++ b/0.76b_My_PuTTY/terminal/terminal.c @@ -3861,7 +3861,7 @@ static void do_osc(Terminal *term) char *env_check = getenv("OSC52ALLOWED"); int status = IDOK; // Default to IDOK - if (!env_check || strlen(env_check) == 0) { + if( conf_get_bool(term->conf, CONF_osc52_warn_before_cliboard_sync) && (!env_check || strlen(env_check) == 0)) { status = MessageBox(NULL, "Allow OSC52 clipboard sync?", "PyTTY", MB_OKCANCEL); } diff --git a/0.76b_My_PuTTY/version.h b/0.76b_My_PuTTY/version.h index bb2482d..cdb73fc 100644 --- a/0.76b_My_PuTTY/version.h +++ b/0.76b_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.76 #define TEXTVER "Release 0.76" #define SSHVER "-Release-0.76" -#define BINARY_VERSION 0,76,1,12 +#define BINARY_VERSION 0,76,1,13 #define SOURCE_COMMIT "unavailable" diff --git a/0.76b_My_PuTTY/windows/config.c b/0.76b_My_PuTTY/windows/config.c index 1df3312..4d6a5b7 100644 --- a/0.76b_My_PuTTY/windows/config.c +++ b/0.76b_My_PuTTY/windows/config.c @@ -502,6 +502,10 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, bool has_help, HELPCTX(no_help), conf_checkbox_handler, I(CONF_ctrl_tab_switch)); + ctrl_checkbox(s, "Warn before OSC52 clipboard sync", NO_SHORTCUT, + HELPCTX(no_help), + conf_checkbox_handler, I(CONF_osc52_warn_before_cliboard_sync)); + } #endif ctrl_checkbox(s, "Full screen on Alt-Enter", 'f', diff --git a/0.76b_My_PuTTY/windows/version_minor.txt b/0.76b_My_PuTTY/windows/version_minor.txt index 48082f7..b1bd38b 100644 --- a/0.76b_My_PuTTY/windows/version_minor.txt +++ b/0.76b_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -12 +13 diff --git a/docs/pages/KeyConfirmation.md b/docs/pages/KeyConfirmation.md index 5abe352..8b28071 100644 --- a/docs/pages/KeyConfirmation.md +++ b/docs/pages/KeyConfirmation.md @@ -13,3 +13,5 @@ Then load this key into you **Kageant**. When the session that needs to use this key starts, and connects to **Kageant** a pop-up shows up and ask for usage confirmation: ![](../img/ex_kageant.jpg) + +>Thanks to [Patrick Cernko](https://people.mpi-klsb.mpg.de/~pcernko/pageant.html) for this patch. diff --git a/docs/version.txt b/docs/version.txt index 266307d..d559710 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -0.76.1.12 \ No newline at end of file +0.76.1.13 \ No newline at end of file diff --git a/kitty_settings.c b/kitty_settings.c index f7560cf..ace7a7b 100644 --- a/kitty_settings.c +++ b/kitty_settings.c @@ -448,6 +448,7 @@ void save_open_settings_forced(char *filename, Conf *conf) { write_setting_b_forced(sesskey, "NoFocusReporting", conf_get_bool(conf, CONF_no_focus_rep)); write_setting_i_forced(sesskey, "LinesAtAScroll", conf_get_int(conf, CONF_scrolllines)); write_setting_b_forced(sesskey, "SSHTunnelInTitle", conf_get_bool(conf, CONF_ssh_tunnel_print_in_title)); + write_setting_b_forced(sesskey, "OSC52WarnBeforeClipboardSync", conf_get_bool(conf, CONF_osc52_warn_before_cliboard_sync)); #endif #ifdef MOD_PORTKNOCKING write_setting_s_forced(sesskey, "PortKnocking", conf_get_str(conf, CONF_portknockingoptions) ); @@ -1102,6 +1103,7 @@ void load_open_settings_forced(char *filename, Conf *conf) { gppb_forced(sesskey, "NoFocusReporting", true, conf, CONF_no_focus_rep); gppi_forced(sesskey, "LinesAtAScroll", 5, conf, CONF_scrolllines); gppb_forced(sesskey, "SSHTunnelInTitle", false, conf, CONF_ssh_tunnel_print_in_title); + gppb_forced(sesskey, "OSC52WarnBeforeClipboardSync", false, conf, CONF_osc52_warn_before_cliboard_sync); #endif #ifdef MOD_PORTKNOCKING gpps_forced(sesskey, "PortKnocking", "", conf, CONF_portknockingoptions );