Gaaah, I might have known. Split combined app cursor / app keypad

[u/mdw/putty] / windlg.c

diff --git a/windlg.c b/windlg.c
index 9abe85b..ea62301 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -219,7 +219,8 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_KPNORMAL,
     IDC_KPAPPLIC,
     IDC_KPNH,
-    IDC_NOAPPLIC,
+    IDC_NOAPPLICK,
+    IDC_NOAPPLICC,
     IDC_CURSTATIC,
     IDC_CURNORMAL,
     IDC_CURAPPLIC,
@@ -431,7 +432,8 @@ static void init_dlg_ctrls(HWND hwnd) {
                       cfg.funky_type == 2 ? IDC_FUNCXTERM :
                       cfg.funky_type == 3 ? IDC_FUNCVT400 :
                       IDC_FUNCTILDE );
-    CheckDlgButton (hwnd, IDC_NOAPPLIC, cfg.no_applic);
+    CheckDlgButton (hwnd, IDC_NOAPPLICC, cfg.no_applic_c);
+    CheckDlgButton (hwnd, IDC_NOAPPLICK, cfg.no_applic_k);
     CheckRadioButton (hwnd, IDC_CURNORMAL, IDC_CURAPPLIC,
                      cfg.app_cursor ? IDC_CURAPPLIC : IDC_CURNORMAL);
     CheckRadioButton (hwnd, IDC_KPNORMAL, IDC_KPNH,
@@ -712,7 +714,7 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
             treeview_insert(&tvfaff, 0, "Terminal");
        }
 
-       /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmiet */
+       /* The Keyboard panel. Accelerators used: [acgo] h?srvlxvnpmietu */
        {
            struct ctlpos cp;
            ctlposinit(&cp, hwnd, 80, 3, 13);
@@ -735,11 +737,14 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
             beginbox(&cp, "Application keypad settings:",
                      IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2);
             checkbox(&cp,
-                     "Application ke&ypad and cursor keys totally disabled",
-                     IDC_NOAPPLIC);
+                     "Application c&ursor keys totally disabled",
+                     IDC_NOAPPLICC);
            radioline(&cp, "Initial state of cursor keys:", IDC_CURSTATIC, 2,
                      "&Normal", IDC_CURNORMAL,
                      "A&pplication", IDC_CURAPPLIC, NULL);
+            checkbox(&cp,
+                     "Application ke&ypad keys totally disabled",
+                     IDC_NOAPPLICK);
            radioline(&cp, "Initial state of numeric keypad:", IDC_KPSTATIC, 3,
                      "Nor&mal", IDC_KPNORMAL,
                      "Appl&ication", IDC_KPAPPLIC,
@@ -1240,10 +1245,15 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                HIWORD(wParam) == BN_DOUBLECLICKED)
                cfg.app_cursor = IsDlgButtonChecked (hwnd, IDC_CURAPPLIC);
            break;
-         case IDC_NOAPPLIC:
+         case IDC_NOAPPLICC:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.no_applic_c = IsDlgButtonChecked (hwnd, IDC_NOAPPLICC);
+           break;
+         case IDC_NOAPPLICK:
            if (HIWORD(wParam) == BN_CLICKED ||
                HIWORD(wParam) == BN_DOUBLECLICKED)
-               cfg.no_applic = IsDlgButtonChecked (hwnd, IDC_NOAPPLIC);
+               cfg.no_applic_k = IsDlgButtonChecked (hwnd, IDC_NOAPPLICK);
            break;
          case IDC_ALTF4:
            if (HIWORD(wParam) == BN_CLICKED ||