mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-25 01:02:24 +00:00
Robert de Bath has a better alternative to revs 1.47/48 [r582,r583];
back out those changes and commit the simpler version [originally from svn r625] [r582 ==147fca411c
] [r583 ==22f91a3604
]
This commit is contained in:
parent
1dc5147efb
commit
0fb760b16d
13
window.c
13
window.c
@ -42,7 +42,6 @@
|
||||
|
||||
#define WM_IGNORE_SIZE (WM_XUSER + 1)
|
||||
#define WM_IGNORE_CLIP (WM_XUSER + 2)
|
||||
#define WM_IGNORE_KEYMENU (WM_XUSER + 3)
|
||||
|
||||
static LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
|
||||
static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam, unsigned char *output);
|
||||
@ -955,7 +954,6 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
|
||||
HDC hdc;
|
||||
static int ignore_size = FALSE;
|
||||
static int ignore_clip = FALSE;
|
||||
static int ignore_keymenu = TRUE;
|
||||
static int just_reconfigged = FALSE;
|
||||
static int resizing = FALSE;
|
||||
|
||||
@ -981,10 +979,6 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
|
||||
return 0;
|
||||
case WM_SYSCOMMAND:
|
||||
switch (wParam & ~0xF) { /* low 4 bits reserved to Windows */
|
||||
case SC_KEYMENU:
|
||||
if (ignore_keymenu)
|
||||
return 0; /* don't put up system menu on Alt */
|
||||
break;
|
||||
case IDM_SHOWLOG:
|
||||
showeventlog(hwnd);
|
||||
break;
|
||||
@ -1214,9 +1208,6 @@ static LRESULT CALLBACK WndProc (HWND hwnd, UINT message,
|
||||
case WM_IGNORE_CLIP:
|
||||
ignore_clip = wParam; /* don't panic on DESTROYCLIPBOARD */
|
||||
break;
|
||||
case WM_IGNORE_KEYMENU:
|
||||
ignore_keymenu = wParam; /* do or don't ignore SC_KEYMENU */
|
||||
break;
|
||||
case WM_DESTROYCLIPBOARD:
|
||||
if (!ignore_clip)
|
||||
term_deselect();
|
||||
@ -1832,9 +1823,7 @@ static WPARAM compose_key = 0;
|
||||
}
|
||||
if (left_alt && wParam == VK_SPACE && cfg.alt_space) {
|
||||
|
||||
SendMessage (hwnd, WM_IGNORE_KEYMENU, FALSE, 0);
|
||||
SendMessage (hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0);
|
||||
SendMessage (hwnd, WM_IGNORE_KEYMENU, TRUE, 0);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -2077,13 +2066,11 @@ static WPARAM compose_key = 0;
|
||||
}
|
||||
|
||||
/* This stops ALT press-release doing a 'COMMAND MENU' function */
|
||||
#if 0
|
||||
if (message == WM_SYSKEYUP && wParam == VK_MENU)
|
||||
{
|
||||
keystate[VK_MENU] = 0;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user