vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More work on Win32 keys

Browse Source
This commit is contained in:
Daniel Collin 2013-01-08 13:30:54 +01:00
parent 0948742922
commit 072d74c9c6
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ogl_editor/src/Menu.c
View File

@ -61,8 +61,8 @@ MenuDescriptor g_viewMenu[] =
{ _T(""), EDITOR_MENU_SEPARATOR, 0, 0, 0 },
{ _T("Jump 8 rows up"), EDITOR_MENU_ROWS_UP, EMGUI_KEY_ARROW_UP, EMGUI_KEY_ALT, EMGUI_KEY_ALT },
{ _T("Jump 8 rows down"), EDITOR_MENU_ROWS_DOWN, EMGUI_KEY_ARROW_DOWN, EMGUI_KEY_ALT, EMGUI_KEY_ALT },
{ _T("Jump to previous bookmark"), EDITOR_MENU_PREV_BOOKMARK, EMGUI_KEY_ARROW_UP, EMGUI_KEY_COMMAND, EMGUI_KEY_ALT | EMGUI_KEY_WIN },
{ _T("Jump to next bookmark"), EDITOR_MENU_NEXT_BOOKMARK, EMGUI_KEY_ARROW_DOWN, EMGUI_KEY_COMMAND, EMGUI_KEY_ALT | EMGUI_KEY_WIN },
{ _T("Jump to previous bookmark"), EDITOR_MENU_PREV_BOOKMARK, EMGUI_KEY_ARROW_UP, EMGUI_KEY_COMMAND, EMGUI_KEY_ALT | EMGUI_KEY_CTRL },
{ _T("Jump to next bookmark"), EDITOR_MENU_NEXT_BOOKMARK, EMGUI_KEY_ARROW_DOWN, EMGUI_KEY_COMMAND, EMGUI_KEY_ALT | EMGUI_KEY_CTRL },
{ _T("Jump to first track"), EDITOR_MENU_FIRST_TRACK, EMGUI_KEY_ARROW_LEFT, EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },
{ _T("Jump to last track"), EDITOR_MENU_LAST_TRACK, EMGUI_KEY_ARROW_RIGHT, EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },
{ _T("Jump to previous key"), EDITOR_MENU_PREV_KEY, EMGUI_KEY_ARROW_UP, EMGUI_KEY_CTRL, EMGUI_KEY_CTRL },

14
ogl_editor/src/windows/RocketWindow.c
View File

@ -172,16 +172,16 @@ static void formatName(wchar_t* outName, int keyMod, int key, const wchar_t* nam
wchar_t keyName[64] = L"";
if ((keyMod & EMGUI_KEY_WIN))
wcscat(modName, L"Win - ");
wcscat(modName, L"Win-");
if ((keyMod & EMGUI_KEY_CTRL))
wcscat(modName, L"Ctrl - ");
wcscat(modName, L"Ctrl-");
if ((keyMod & EMGUI_KEY_ALT))
wcscat(modName, L"Alt - ");
wcscat(modName, L"Alt-");
if ((keyMod & EMGUI_KEY_SHIFT))
wcscat(modName, L"Shift - ");
wcscat(modName, L"Shift-");
if (key < 127)
{
@ -225,13 +225,15 @@ static void addAccelarator(const MenuDescriptor* desc)
if (key < 127)
{
accel->key = (char)(key);
if (virt != 0)
{
accel->key = (char)(key & ~0x20);
virt |= 1;
}
else
{
accel->key = (char)(key);
}
}
else
{