Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve extended key handling code readability.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jamie Gadd
2006-01-23 10:01:46 +00:00
parent 71521e3757
commit 5004c3adef
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/window.cpp
View File

@@ -5167,6 +5167,13 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font)
// the_font.ReleaseResource(); // the_font.ReleaseResource();
} }
// use the "extended" bit (24) of lParam to distinguish extended keys
// from normal keys as the same key is sent
static inline int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended)
{
return lParam & (1 << 24) ? keyExtended : keyNormal;
}
// Returns 0 if was a normal ASCII value, not a special key. This indicates that // Returns 0 if was a normal ASCII value, not a special key. This indicates that
// the key should be ignored by WM_KEYDOWN and processed by WM_CHAR instead. // the key should be ignored by WM_KEYDOWN and processed by WM_CHAR instead.
int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam) int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam)
@@ -5251,41 +5258,40 @@ int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam)
case VK_APPS: id = WXK_WINDOWS_MENU; break; case VK_APPS: id = WXK_WINDOWS_MENU; break;
#endif // VK_APPS defined #endif // VK_APPS defined
// use the "extended" bit (24) of lParam to distinguish extended keys // handle extended keys
// from normal keys as the same key is sent
case VK_PRIOR: case VK_PRIOR:
id = lParam & (1 << 24) ? WXK_PRIOR : WXK_NUMPAD_PRIOR; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_PRIOR, WXK_PRIOR);
break; break;
case VK_NEXT: case VK_NEXT:
id = lParam & (1 << 24) ? WXK_NEXT : WXK_NUMPAD_NEXT; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_NEXT, WXK_NEXT);
break; break;
case VK_END: case VK_END:
id = lParam & (1 << 24) ? WXK_END : WXK_NUMPAD_END; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_END, WXK_END);
break; break;
case VK_HOME: case VK_HOME:
id = lParam & (1 << 24) ? WXK_HOME : WXK_NUMPAD_HOME; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_HOME, WXK_HOME);
break; break;
case VK_LEFT: case VK_LEFT:
id = lParam & (1 << 24) ? WXK_LEFT : WXK_NUMPAD_LEFT; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_LEFT, WXK_LEFT);
break; break;
case VK_UP: case VK_UP:
id = lParam & (1 << 24) ? WXK_UP : WXK_NUMPAD_UP; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_UP, WXK_UP);
break; break;
case VK_RIGHT: case VK_RIGHT:
id = lParam & (1 << 24) ? WXK_RIGHT : WXK_NUMPAD_RIGHT; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_RIGHT, WXK_RIGHT);
break; break;
case VK_DOWN: case VK_DOWN:
id = lParam & (1 << 24) ? WXK_DOWN : WXK_NUMPAD_DOWN; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_DOWN, WXK_DOWN);
break; break;
case VK_INSERT: case VK_INSERT:
id = lParam & (1 << 24) ? WXK_INSERT : WXK_NUMPAD_INSERT; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_INSERT, WXK_INSERT);
break; break;
case VK_DELETE: case VK_DELETE:
id = lParam & (1 << 24) ? WXK_DELETE : WXK_NUMPAD_DELETE; id = ChooseNormalOrExtended(lParam, WXK_NUMPAD_DELETE, WXK_DELETE);
break; break;
// this order is correct as the numpad enter is the extended key // this order is correct as the numpad enter is the extended key
case VK_RETURN: case VK_RETURN:
id = lParam & (1 << 24) ? WXK_NUMPAD_ENTER : WXK_RETURN; id = ChooseNormalOrExtended(lParam, WXK_RETURN, WXK_NUMPAD_ENTER);
break; break;
default: default: