Fix control ID bug causing rogue Appearance title bars in other panels

[sgt/putty] / windlg.c

diff --git a/windlg.c b/windlg.c
index c085e6a..9abe85b 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -219,6 +219,7 @@ enum { IDCX_ABOUT = IDC_ABOUT, IDCX_TVSTATIC, IDCX_TREEVIEW, controlstartvalue,
     IDC_KPNORMAL,
     IDC_KPAPPLIC,
     IDC_KPNH,
+    IDC_NOAPPLIC,
     IDC_CURSTATIC,
     IDC_CURNORMAL,
     IDC_CURAPPLIC,
@@ -430,6 +431,7 @@ 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);
     CheckRadioButton (hwnd, IDC_CURNORMAL, IDC_CURAPPLIC,
                      cfg.app_cursor ? IDC_CURAPPLIC : IDC_CURNORMAL);
     CheckRadioButton (hwnd, IDC_KPNORMAL, IDC_KPNH,
@@ -730,8 +732,11 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                      "&Xterm R6", IDC_FUNCXTERM,
                       "&VT400", IDC_FUNCVT400, NULL);
             endbox(&cp);
-            beginbox(&cp, "Change the initial state of:",
+            beginbox(&cp, "Application keypad settings:",
                      IDC_BOX_KEYBOARD2, IDC_BOXT_KEYBOARD2);
+            checkbox(&cp,
+                     "Application ke&ypad and cursor keys totally disabled",
+                     IDC_NOAPPLIC);
            radioline(&cp, "Initial state of cursor keys:", IDC_CURSTATIC, 2,
                      "&Normal", IDC_CURNORMAL,
                      "A&pplication", IDC_CURAPPLIC, NULL);
@@ -787,7 +792,7 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
            struct ctlpos cp;
            ctlposinit(&cp, hwnd, 80, 3, 13);
             bartitle(&cp, "Options controlling PuTTY's appearance",
-                     IDC_TITLE_WINDOW);
+                     IDC_TITLE_APPEARANCE);
             beginbox(&cp, "Adjust the use of the cursor",
                      IDC_BOX_APPEARANCE1, IDC_BOXT_APPEARANCE1);
            checkbox(&cp, "Cursor &blinks", IDC_BLINKCUR);
@@ -1235,6 +1240,11 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                HIWORD(wParam) == BN_DOUBLECLICKED)
                cfg.app_cursor = IsDlgButtonChecked (hwnd, IDC_CURAPPLIC);
            break;
+         case IDC_NOAPPLIC:
+           if (HIWORD(wParam) == BN_CLICKED ||
+               HIWORD(wParam) == BN_DOUBLECLICKED)
+               cfg.no_applic = IsDlgButtonChecked (hwnd, IDC_NOAPPLIC);
+           break;
          case IDC_ALTF4:
            if (HIWORD(wParam) == BN_CLICKED ||
                HIWORD(wParam) == BN_DOUBLECLICKED)
@@ -1601,7 +1611,6 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
                                            0, 0);
                if (!cfg.bold_colour)
                    i = (i < 3 ? i*2 : i == 3 ? 5 : i*2-2);
-debug(("ooh\n"));
                SetDlgItemInt (hwnd, IDC_RVALUE, cfg.colours[i][0], FALSE);
                SetDlgItemInt (hwnd, IDC_GVALUE, cfg.colours[i][1], FALSE);
                SetDlgItemInt (hwnd, IDC_BVALUE, cfg.colours[i][2], FALSE);