projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix to link_font() from RDB. I must get him to comment some of this :-)
[u/mdw/putty]
/
windlg.c
diff --git
a/windlg.c
b/windlg.c
index
46b02b5
..
f15e385
100644
(file)
--- a/
windlg.c
+++ b/
windlg.c
@@
-470,6
+470,7
@@
enum { IDCX_ABOUT =
IDC_MBSTATIC,
IDC_MBWINDOWS,
IDC_MBXTERM,
IDC_MBSTATIC,
IDC_MBWINDOWS,
IDC_MBXTERM,
+ IDC_MOUSEOVERRIDE,
IDC_CCSTATIC,
IDC_CCLIST,
IDC_CCSET,
IDC_CCSTATIC,
IDC_CCLIST,
IDC_CCSET,
@@
-749,6
+750,7
@@
static void init_dlg_ctrls(HWND hwnd, int keepsess)
CheckRadioButton(hwnd, IDC_MBWINDOWS, IDC_MBXTERM,
cfg.mouse_is_xterm ? IDC_MBXTERM : IDC_MBWINDOWS);
CheckRadioButton(hwnd, IDC_MBWINDOWS, IDC_MBXTERM,
cfg.mouse_is_xterm ? IDC_MBXTERM : IDC_MBWINDOWS);
+ CheckDlgButton(hwnd, IDC_MOUSEOVERRIDE, cfg.mouse_override);
CheckDlgButton(hwnd, IDC_RAWCNP, cfg.rawcnp);
{
static int tabs[4] = { 25, 61, 96, 128 };
CheckDlgButton(hwnd, IDC_RAWCNP, cfg.rawcnp);
{
static int tabs[4] = { 25, 61, 96, 128 };
@@
-1090,6
+1092,11
@@
static void create_controls(HWND hwnd, int dlgtype, int panel)
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling character set translation",
IDC_TITLE_TRANSLATION);
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling character set translation",
IDC_TITLE_TRANSLATION);
+ beginbox(&cp, "Character set translation on received data",
+ IDC_BOX_TRANSLATION2);
+ combobox(&cp, "Received data assumed to be in which character set:",
+ IDC_CODEPAGESTATIC, IDC_CODEPAGE);
+ endbox(&cp);
beginbox(&cp, "Adjust how PuTTY displays line drawing characters",
IDC_BOX_TRANSLATION1);
radiobig(&cp,
beginbox(&cp, "Adjust how PuTTY displays line drawing characters",
IDC_BOX_TRANSLATION1);
radiobig(&cp,
@@
-1100,15
+1107,10
@@
static void create_controls(HWND hwnd, int dlgtype, int panel)
"&Poor man's line drawing (" "+" ", " "-" " and " "|" ")",
IDC_VTPOORMAN, "&Unicode mode", IDC_VTUNICODE, NULL);
endbox(&cp);
"&Poor man's line drawing (" "+" ", " "-" " and " "|" ")",
IDC_VTPOORMAN, "&Unicode mode", IDC_VTUNICODE, NULL);
endbox(&cp);
- beginbox(&cp, "Character set translation on received data",
- IDC_BOX_TRANSLATION2);
- combobox(&cp, "Received data assumed to be in which character set:",
- IDC_CODEPAGESTATIC, IDC_CODEPAGE);
- endbox(&cp);
}
if (panel == selectionpanelstart) {
}
if (panel == selectionpanelstart) {
- /* The Selection panel. Accelerators used: [acgo] d wx hst */
+ /* The Selection panel. Accelerators used: [acgo] d wx
p
hst */
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling copy and paste",
struct ctlpos cp;
ctlposinit(&cp, hwnd, 80, 3, 13);
bartitle(&cp, "Options controlling copy and paste",
@@
-1125,6
+1127,9
@@
static void create_controls(HWND hwnd, int dlgtype, int panel)
"&Windows (Right pastes, Middle extends)", IDC_MBWINDOWS,
"&xterm (Right extends, Middle pastes)", IDC_MBXTERM,
NULL);
"&Windows (Right pastes, Middle extends)", IDC_MBWINDOWS,
"&xterm (Right extends, Middle pastes)", IDC_MBXTERM,
NULL);
+ checkbox(&cp,
+ "Shift overrides a&pplication's use of mouse",
+ IDC_MOUSEOVERRIDE);
endbox(&cp);
beginbox(&cp, "Control the select-one-word-at-a-time mode",
IDC_BOX_SELECTION3);
endbox(&cp);
beginbox(&cp, "Control the select-one-word-at-a-time mode",
IDC_BOX_SELECTION3);
@@
-1479,6
+1484,9
@@
static int GenericMainDlgProc(HWND hwnd, UINT msg,
TVITEM item;
int j;
char buffer[64];
TVITEM item;
int j;
char buffer[64];
+
+ SendMessage (hwnd, WM_SETREDRAW, FALSE, 0);
+
item.hItem = i;
item.pszText = buffer;
item.cchTextMax = sizeof(buffer);
item.hItem = i;
item.pszText = buffer;
item.cchTextMax = sizeof(buffer);
@@
-1523,6
+1531,9
@@
static int GenericMainDlgProc(HWND hwnd, UINT msg,
create_controls(hwnd, dlgtype, translationpanelstart);
init_dlg_ctrls(hwnd, FALSE);
create_controls(hwnd, dlgtype, translationpanelstart);
init_dlg_ctrls(hwnd, FALSE);
+
+ SendMessage (hwnd, WM_SETREDRAW, TRUE, 0);
+ InvalidateRect (hwnd, NULL, TRUE);
SetFocus(((LPNMHDR) lParam)->hwndFrom); /* ensure focus stays */
return 0;
SetFocus(((LPNMHDR) lParam)->hwndFrom); /* ensure focus stays */
return 0;
@@
-2334,10
+2345,14
@@
static int GenericMainDlgProc(HWND hwnd, UINT msg,
break;
case IDC_RAWCNP:
cfg.rawcnp = IsDlgButtonChecked(hwnd, IDC_RAWCNP);
break;
case IDC_RAWCNP:
cfg.rawcnp = IsDlgButtonChecked(hwnd, IDC_RAWCNP);
+ break;
case IDC_MBWINDOWS:
case IDC_MBXTERM:
cfg.mouse_is_xterm = IsDlgButtonChecked(hwnd, IDC_MBXTERM);
break;
case IDC_MBWINDOWS:
case IDC_MBXTERM:
cfg.mouse_is_xterm = IsDlgButtonChecked(hwnd, IDC_MBXTERM);
break;
+ case IDC_MOUSEOVERRIDE:
+ cfg.mouse_override = IsDlgButtonChecked(hwnd, IDC_MOUSEOVERRIDE);
+ break;
case IDC_CCSET:
{
BOOL ok;
case IDC_CCSET:
{
BOOL ok;