TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-17 12:12:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix Alt key handling

Browse Source
This commit is contained in:
cxgeorge 2002-05-21 21:33:29 +00:00
parent 2466d2dfae
commit e4a2016a21
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/wdxdisplay/wdxGraphicsWindow.cxx
View File

@ -492,18 +492,22 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
}
break;
case WM_SYSKEYDOWN:
// want to use defwindproc on Alt syskey so Alt-F4 works, etc
// but do want to bypass defwindproc F10 behavior (it activates
// the main menu, but we have none)
case WM_SYSKEYDOWN: {
// Alt and F10 are sent as WM_SYSKEYDOWN instead of WM_KEYDOWN
// want to use defwindproc on Alt syskey so std windows cmd Alt-F4 works, etc
POINT point;
GetCursorPos(&point);
ScreenToClient(hwnd, &point);
handle_keypress(lookup_key(wparam), point.x, point.y);
if (wparam == VK_F10) {
//bypass default windproc F10 behavior (it activates the main menu, but we have none)
return 0;
}
break;
}
break;
case WM_KEYDOWN: {
POINT point;
GetCursorPos(&point);
ScreenToClient(hwnd, &point);
handle_keypress(lookup_key(wparam), point.x, point.y);
@ -2684,8 +2688,9 @@ lookup_key(WPARAM wparam) const {
case VK_MENU:
case VK_LMENU:
case VK_RMENU:
case VK_RMENU: {
return KeyboardButton::alt();
}
default:
int key = MapVirtualKey(wparam, 2);

15
panda/src/wdxdisplay8/wdxGraphicsWindow8.cxx
View File

@ -492,14 +492,19 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
}
break;
case WM_SYSKEYDOWN:
// want to use defwindproc on Alt syskey so Alt-F4 works, etc
// but do want to bypass defwindproc F10 behavior (it activates
// the main menu, but we have none)
case WM_SYSKEYDOWN: {
// Alt and F10 are sent as WM_SYSKEYDOWN instead of WM_KEYDOWN
// want to use defwindproc on Alt syskey so std windows cmd Alt-F4 works, etc
POINT point;
GetCursorPos(&point);
ScreenToClient(hwnd, &point);
handle_keypress(lookup_key(wparam), point.x, point.y);
if (wparam == VK_F10) {
//bypass default windproc F10 behavior (it activates the main menu, but we have none)
return 0;
}
break;
}
break;
case WM_KEYDOWN: {
POINT point;

21
panda/src/wgldisplay/wglGraphicsWindow.cxx
View File

@ -1799,14 +1799,19 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
}
break;
case WM_SYSKEYDOWN:
// want to use defwindproc on Alt syskey so Alt-F4 works, etc
// but do want to bypass defwindproc F10 behavior (it activates
// the main menu, but we have none)
if (wparam == VK_F10) {
return 0;
}
break;
case WM_SYSKEYDOWN: {
// Alt and F10 are sent as WM_SYSKEYDOWN instead of WM_KEYDOWN
// want to use defwindproc on Alt syskey so std windows cmd Alt-F4 works, etc
POINT point;
GetCursorPos(&point);
ScreenToClient(hwnd, &point);
handle_keypress(lookup_key(wparam), point.x, point.y);
if (wparam == VK_F10) {
//bypass default windproc F10 behavior (it activates the main menu, but we have none)
return 0;
}
}
break;
case WM_KEYDOWN: {
POINT point;