Add an option to use wcwidth_cjk() instead of wcwidth(), as several people

[u/mdw/putty] / config.c

diff --git a/config.c b/config.c
index 9535397..73ed703 100644 (file)
--- a/config.c
+++ b/config.c
@@ -50,6 +50,33 @@ static void protocolbuttons_handler(union control *ctrl, void *dlg,
     }
 }
 
+static void loggingbuttons_handler(union control *ctrl, void *dlg,
+                                  void *data, int event)
+{
+    int button;
+    Config *cfg = (Config *)data;
+    /* This function works just like the standard radio-button handler,
+     * but it has to fall back to "no logging" in situations where the
+     * configured logging type isn't applicable.
+     */
+    if (event == EVENT_REFRESH) {
+        for (button = 0; button < ctrl->radio.nbuttons; button++)
+            if (cfg->logtype == ctrl->radio.buttondata[button].i)
+               break;
+    
+    /* We fell off the end, so we lack the configured logging type */
+    if (button == ctrl->radio.nbuttons) {
+        button=0;
+        cfg->logtype=LGTYP_NONE;
+    }
+    dlg_radiobutton_set(ctrl, dlg, button);
+    } else if (event == EVENT_VALCHANGE) {
+        button = dlg_radiobutton_get(ctrl, dlg);
+        assert(button >= 0 && button < ctrl->radio.nbuttons);
+        cfg->logtype = ctrl->radio.buttondata[button].i;
+    }
+}
+
 static void numeric_keypad_handler(union control *ctrl, void *dlg,
                                   void *data, int event)
 {
@@ -947,7 +974,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
            sshlogname = NULL;         /* this will disable the button */
        ctrl_radiobuttons(s, "Session logging:", NO_SHORTCUT, 1,
                          HELPCTX(logging_main),
-                         dlg_stdradiobutton_handler,
+                         loggingbuttons_handler,
                          I(offsetof(Config, logtype)),
                          "Logging turned off completely", 't', I(LGTYP_NONE),
                          "Log printable output only", 'p', I(LGTYP_ASCII),
@@ -1255,6 +1282,11 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                  'r', 100, HELPCTX(translation_codepage),
                  codepage_handler, P(NULL), P(NULL));
 
+    s = ctrl_getset(b, "Window/Translation", "tweaks", NULL);
+    ctrl_checkbox(s, "Treat CJK ambiguous characters as wide", 'w',
+                 HELPCTX(translation_cjk_ambig_wide),
+                 dlg_stdcheckbox_handler, I(offsetof(Config,cjk_ambig_wide)));
+
     str = dupprintf("Adjust how %s handles line drawing characters", appname);
     s = ctrl_getset(b, "Window/Translation", "linedraw", str);
     sfree(str);
@@ -1842,10 +1874,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
            ctrl_droplist(s, "Requires padding on SSH-2 RSA signatures", 'p', 20,
                          HELPCTX(ssh_bugs_rsapad2),
                          sshbug_handler, I(offsetof(Config,sshbug_rsapad2)));
-           ctrl_droplist(s, "Misuses the session ID in PK auth", 'n', 20,
+           ctrl_droplist(s, "Misuses the session ID in SSH-2 PK auth", 'n', 20,
                          HELPCTX(ssh_bugs_pksessid2),
                          sshbug_handler, I(offsetof(Config,sshbug_pksessid2)));
-           ctrl_droplist(s, "Handles key re-exchange badly", 'k', 20,
+           ctrl_droplist(s, "Handles SSH-2 key re-exchange badly", 'k', 20,
                          HELPCTX(ssh_bugs_rekey2),
                          sshbug_handler, I(offsetof(Config,sshbug_rekey2)));
        }