Make keyboard work better with other physical keyboard layouts

This commit is contained in:
Quantum 2017-04-19 17:12:55 -04:00
parent 0010e79c76
commit fffa318553
2 changed files with 126 additions and 59 deletions

View file

@ -25,20 +25,25 @@
#define GET_KEYSTATE_WPARAM(wParam) (LOWORD(wParam)) #define GET_KEYSTATE_WPARAM(wParam) (LOWORD(wParam))
#endif #endif
#define KEYBOARD_IMAGE 0xAA00 #define KEYBOARD_IMAGE 0xAA00
#define KEYBOARD_VOLUME 0xAA01 #define KEYBOARD_VOLUME 0xAA01
#define KEYBOARD_FORCE 0xAA02 #define KEYBOARD_FORCE 0xAA02
#define KEYBOARD_INSTRUMENT 0xAA03 #define KEYBOARD_INSTRUMENT 0xAA03
#define KEYBOARD_DEVICE 0xAA04 #define KEYBOARD_DEVICE 0xAA04
#define KEYBOARD_SEMITONE 0xAA05 #define KEYBOARD_SEMITONE 0xAA05
#define KEYBOARD_OCTAVE 0xAA06 #define KEYBOARD_OCTAVE 0xAA06
#define KEYBOARD_KEY 0xAA07 #define KEYBOARD_KEY 0xAA07
#define KEYBOARD_USE_BEEP 0xAAFF #define KEYBOARD_USE_BEEP 0xAAFF
#define KEYBOARD_SAVE 0xAB00 #define KEYBOARD_SAVE 0xAB00
#define KEYBOARD_SAVE_FILE 0xAB01 #define KEYBOARD_SAVE_FILE 0xAB01
#define KEYBOARD_BROWSE 0xAB02 #define KEYBOARD_BROWSE 0xAB02
#define KEYBOARD_REOPEN 0xAB03 #define KEYBOARD_REOPEN 0xAB03
#define KEYBOARD_CLOSE_FILE 0xAB04 #define KEYBOARD_CLOSE_FILE 0xAB04
#define KEYBOARD_ENTER_RADIO_BEGIN 0xAC00
#define KEYBOARD_BSPIPE_ABOVE_ENTER 0xAC00
#define KEYBOARD_BSPIPE_LEFT_ENTER 0xAC01
#define KEYBOARD_ENTER_RADIO_END 0xAC01
template<class T> template<class T>
T clamp(T v, T a, T b) { T clamp(T v, T a, T b) {
@ -66,6 +71,7 @@ protected:
int GetMIDINote(WPARAM wCode, bool &half, int &base); int GetMIDINote(WPARAM wCode, bool &half, int &base);
int ModifyNote(int note, bool &half); int ModifyNote(int note, bool &half);
void UpdateNoteDisplay();
virtual HICON GetIcon(); virtual HICON GetIcon();
int active[128]; int active[128];
@ -89,6 +95,7 @@ protected:
HWND m_keyLabel, m_keySelect; HWND m_keyLabel, m_keySelect;
bool adjusting; bool adjusting;
HWND m_beepCheck; HWND m_beepCheck;
HWND m_pipeLeftRadio, m_pipeAboveRadio;
HWND m_saveCheck, m_saveLabel, m_saveFile, m_saveBrowse, m_reopen, m_closeFile; HWND m_saveCheck, m_saveLabel, m_saveFile, m_saveBrowse, m_reopen, m_closeFile;
int m_instrument, m_volume, m_force, m_adjust; int m_instrument, m_volume, m_force, m_adjust;
HMIDIOUT m_midi; HMIDIOUT m_midi;
@ -96,6 +103,8 @@ protected:
HKL hklQWERTY; HKL hklQWERTY;
PianoControl *piano; PianoControl *piano;
LPWSTR m_keychars; LPWSTR m_keychars;
char m_keymap[256];
HKEY m_settings;
MIDI_FILE *m_midifile; MIDI_FILE *m_midifile;
DWORD lastTime; DWORD lastTime;
bool saving; bool saving;

View file

@ -16,6 +16,7 @@
#pragma comment(lib, "winmm.lib") #pragma comment(lib, "winmm.lib")
#pragma comment(lib, "comdlg32.lib") #pragma comment(lib, "comdlg32.lib")
#pragma comment(lib, "advapi32.lib")
#include <stdio.h> #include <stdio.h>
#define MessageIntBox(hwnd, i, title, opt) \ #define MessageIntBox(hwnd, i, title, opt) \
@ -130,6 +131,10 @@ int dnslen(LPWSTR dns)
return i - dns; return i - dns;
} }
inline void RegSetDWORD(HKEY hKey, LPTSTR name, DWORD value) {
RegSetValueEx(hKey, name, NULL, REG_DWORD, (LPBYTE) &value, sizeof value);
}
BOOL MainWindow::WinRegisterClass(WNDCLASS *pwc) BOOL MainWindow::WinRegisterClass(WNDCLASS *pwc)
{ {
pwc->style = CS_HREDRAW | CS_VREDRAW; pwc->style = CS_HREDRAW | CS_VREDRAW;
@ -209,6 +214,13 @@ LRESULT MainWindow::OnCreate()
WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP, WS_CHILD | WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,
0, 0, 0, 0, m_hwnd, (HMENU) KEYBOARD_KEY, GetInstance(), NULL); 0, 0, 0, 0, m_hwnd, (HMENU) KEYBOARD_KEY, GetInstance(), NULL);
m_pipeAboveRadio = CreateWindow(WC_BUTTON, L"|\\ key above Enter",
WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON | WS_TABSTOP,
0, 0, 0, 0, m_hwnd, (HMENU) KEYBOARD_BSPIPE_ABOVE_ENTER, GetInstance(), NULL);
m_pipeLeftRadio = CreateWindow(WC_BUTTON, L"|\\ key left of Enter",
WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON | WS_TABSTOP,
0, 0, 0, 0, m_hwnd, (HMENU) KEYBOARD_BSPIPE_LEFT_ENTER, GetInstance(), NULL);
m_saveCheck = CreateWindow(WC_BUTTON, L"&Save?", WS_CHILD | WS_VISIBLE | BS_CHECKBOX | WS_TABSTOP, m_saveCheck = CreateWindow(WC_BUTTON, L"&Save?", WS_CHILD | WS_VISIBLE | BS_CHECKBOX | WS_TABSTOP,
0, 0, 0, 0, m_hwnd, (HMENU) KEYBOARD_SAVE, GetInstance(), NULL); 0, 0, 0, 0, m_hwnd, (HMENU) KEYBOARD_SAVE, GetInstance(), NULL);
m_saveLabel = CreateWindow(WC_STATIC, L"File:", m_saveLabel = CreateWindow(WC_STATIC, L"File:",
@ -248,6 +260,22 @@ LRESULT MainWindow::OnCreate()
m_adjust = 0; m_adjust = 0;
saving = false; saving = false;
lastTime = (DWORD) -1; lastTime = (DWORD) -1;
memcpy(m_keymap, keymap, sizeof m_keymap);
if (RegCreateKeyEx(HKEY_CURRENT_USER, L"Software\\Quantum\\MusicKeyboard", 0, NULL,
0, KEY_ALL_ACCESS, NULL, &m_settings, NULL) != ERROR_SUCCESS)
m_settings = NULL;
DWORD bsLocation, dwSize = sizeof(DWORD);
if (!m_settings || RegQueryValueEx(m_settings, L"backslashLocation", NULL,
NULL, (LPBYTE) &bsLocation, &dwSize) != ERROR_SUCCESS)
bsLocation = 0;
CheckRadioButton(m_hwnd, KEYBOARD_ENTER_RADIO_BEGIN, KEYBOARD_ENTER_RADIO_END,
KEYBOARD_ENTER_RADIO_BEGIN + bsLocation);
if (bsLocation == 1) {
m_keymap[VK_RETURN] = 77;
m_keymap[VK_OEM_5] = 76;
}
#define SETFONT(hwnd) SendMessage(hwnd, WM_SETFONT, (WPARAM) hFont, (LPARAM) TRUE) #define SETFONT(hwnd) SendMessage(hwnd, WM_SETFONT, (WPARAM) hFont, (LPARAM) TRUE)
SETFONT(m_volumeLabel); SETFONT(m_volumeLabel);
@ -265,6 +293,8 @@ LRESULT MainWindow::OnCreate()
SETFONT(m_octaveLabel); SETFONT(m_octaveLabel);
SETFONT(m_keySelect); SETFONT(m_keySelect);
SETFONT(m_keyLabel); SETFONT(m_keyLabel);
SETFONT(m_pipeAboveRadio);
SETFONT(m_pipeLeftRadio);
SETFONT(m_beepCheck); SETFONT(m_beepCheck);
SETFONT(m_saveCheck); SETFONT(m_saveCheck);
SETFONT(m_saveLabel); SETFONT(m_saveLabel);
@ -325,7 +355,7 @@ LRESULT MainWindow::OnCreate()
} }
capsDown = useBeep = adjusting = false; capsDown = useBeep = adjusting = false;
m_keychars = NULL; m_keychars = NULL;
PostMessage(m_hwnd, WM_INPUTLANGCHANGE, 0, 0); UpdateNoteDisplay();
return 0; return 0;
} }
@ -334,6 +364,8 @@ LRESULT MainWindow::OnDestroy()
midiOutClose(m_midi); midiOutClose(m_midi);
if (m_midifile) if (m_midifile)
midiFileClose(m_midifile); midiFileClose(m_midifile);
if (m_settings)
RegCloseKey(m_settings);
return 0; return 0;
} }
@ -414,7 +446,7 @@ int MainWindow::ModifyNote(int note, bool &half) {
int MainWindow::GetMIDINote(WPARAM wCode, bool &half, int &base) int MainWindow::GetMIDINote(WPARAM wCode, bool &half, int &base)
{ {
base = keymap[wCode]; base = m_keymap[wCode];
return ModifyNote(base, half); return ModifyNote(base, half);
} }
@ -423,7 +455,7 @@ bool MainWindow::Play(WPARAM wParam, LPARAM lParam, bool down)
int base, note; int base, note;
bool half; bool half;
WORD wCode = GetQWERTYKeyCode((WORD) wParam); WORD wCode = GetQWERTYKeyCode((WORD) wParam);
if (wCode > 255 || !keymap[wCode] || (down && (lParam & 0x40000000))) if (wCode > 255 || !m_keymap[wCode] || (down && (lParam & 0x40000000)))
return false; return false;
note = GetMIDINote(wCode, half, base); note = GetMIDINote(wCode, half, base);
@ -602,6 +634,45 @@ void MainWindow::OnAdjust()
//if (!useBeep) MIDI_MESSAGE(m_midi, 0xB0, 122, 0); //if (!useBeep) MIDI_MESSAGE(m_midi, 0xB0, 122, 0);
} }
void MainWindow::UpdateNoteDisplay()
{
TCHAR buf[KL_NAMELENGTH];
GetKeyboardLayoutName(buf);
isQWERTY = lstrcmpi(buf, L"00000409") == 0;
if (!isQWERTY && !hklQWERTY)
hklQWERTY = LoadKeyboardLayout(L"00000409", KLF_NOTELLSHELL);
int size = dnslen(keychars) + 1, i;
LPWSTR s;
if (m_keychars)
delete [] m_keychars;
m_keychars = new WCHAR[size];
bool bsLeft = IsDlgButtonChecked(m_hwnd, KEYBOARD_BSPIPE_LEFT_ENTER);
for (i = 0; i < size; ++i) {
WORD scan = VkKeyScanEx(keychars[i], hklQWERTY), vk, ch;
if (bsLeft) switch (keychars[i]) {
case L'\\': m_keychars[i] = L'\x21b5'; continue;
case L'\x21b5': m_keychars[i] = L'\\'; continue;
}
if (LOBYTE(scan) == -1)
goto giveup;
vk = GetRealKeyCode(LOBYTE(scan));
if (!vk || vk == LOBYTE(scan))
goto giveup;
ch = (WCHAR) MapVirtualKey(vk, MAPVK_VK_TO_CHAR);
if (!ch)
goto giveup;
m_keychars[i] = ch;
continue;
giveup:
m_keychars[i] = keychars[i];
}
for (s = m_keychars, i = 0; i < 24 && lstrlen(s); s += lstrlen(s) + 1, ++i)
piano->SetKeyText(i, s);
}
LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
switch (uMsg) { switch (uMsg) {
@ -641,15 +712,17 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
GetClientRect(m_hwnd, &client); GetClientRect(m_hwnd, &client);
#define REPOS(hwnd, k) hdwp = DeferWindowPos(hdwp, hwnd, 0, k, SWP_NOACTIVATE|SWP_NOZORDER) #define REPOS(hwnd, k) hdwp = DeferWindowPos(hdwp, hwnd, 0, k, SWP_NOACTIVATE|SWP_NOZORDER)
hdwp = BeginDeferWindowPos(14); hdwp = BeginDeferWindowPos(14);
REPOS(piano->GetHWND(), LEFT(12, 12, client.right - 24, client.bottom - 232)); REPOS(piano->GetHWND(), LEFT(12, 12, client.right - 24, client.bottom - 262));
REPOS(m_instruLabel, BOTTOM(12, client.bottom - 187, 70, 25)); REPOS(m_instruLabel, BOTTOM(12, client.bottom - 217, 70, 25));
REPOS(m_instruSelect, BOTTOM(82, client.bottom - 187, client.right - 94, 25)); REPOS(m_instruSelect, BOTTOM(82, client.bottom - 217, client.right - 94, 25));
REPOS(m_forceLabel, BOTTOM(12, client.bottom - 157, 70, 25)); REPOS(m_forceLabel, BOTTOM(12, client.bottom - 187, 70, 25));
REPOS(m_forceBar, BOTTOM(82, client.bottom - 157, client.right - 94, 25)); REPOS(m_forceBar, BOTTOM(82, client.bottom - 187, client.right - 94, 25));
REPOS(m_volumeLabel, BOTTOM(12, client.bottom - 127, 70, 25)); REPOS(m_volumeLabel, BOTTOM(12, client.bottom - 157, 70, 25));
REPOS(m_volumeBar, BOTTOM(82, client.bottom - 127, client.right - 94, 25)); REPOS(m_volumeBar, BOTTOM(82, client.bottom - 157, client.right - 94, 25));
REPOS(m_deviceLabel, BOTTOM(12, client.bottom - 97, 70, 25)); REPOS(m_deviceLabel, BOTTOM(12, client.bottom - 127, 70, 25));
REPOS(m_deviceSelect, BOTTOM(82, client.bottom - 97, client.right - 94, 25)); REPOS(m_deviceSelect, BOTTOM(82, client.bottom - 127, client.right - 94, 25));
REPOS(m_pipeAboveRadio, BOTTOM(12, client.bottom - 97, 150, 25));
REPOS(m_pipeLeftRadio, BOTTOM(162, client.bottom - 97, 150, 25));
REPOS(m_adjustLabel, BOTTOM(12, client.bottom - 67, 70, 25)); REPOS(m_adjustLabel, BOTTOM(12, client.bottom - 67, 70, 25));
REPOS(m_semitoneSelect, BOTTOM(82, client.bottom - 67, 50, 20)); REPOS(m_semitoneSelect, BOTTOM(82, client.bottom - 67, 50, 20));
REPOS(m_semitoneUpDown, BOTTOM(132, client.bottom - 67, 18, 20)); REPOS(m_semitoneUpDown, BOTTOM(132, client.bottom - 67, 18, 20));
@ -737,6 +810,20 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
OnReOpenMIDI(); OnReOpenMIDI();
break; break;
} }
case KEYBOARD_BSPIPE_ABOVE_ENTER:
m_keymap[VK_RETURN] = 76;
m_keymap[VK_OEM_5] = 77;
RegSetDWORD(m_settings, L"backslashLocation", 0);
UpdateNoteDisplay();
SetFocus(m_hwnd);
break;
case KEYBOARD_BSPIPE_LEFT_ENTER:
m_keymap[VK_RETURN] = 77;
m_keymap[VK_OEM_5] = 76;
RegSetDWORD(m_settings, L"backslashLocation", 1);
UpdateNoteDisplay();
SetFocus(m_hwnd);
break;
case KEYBOARD_REOPEN: case KEYBOARD_REOPEN:
OnReOpenMIDI(); OnReOpenMIDI();
break; break;
@ -822,38 +909,9 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
SendMessage(m_forceBar, WM_MOUSEWHEEL, SendMessage(m_forceBar, WM_MOUSEWHEEL,
-GET_WHEEL_DELTA_WPARAM(wParam) * 2 << 16 | -GET_WHEEL_DELTA_WPARAM(wParam) * 2 << 16 |
GET_KEYSTATE_WPARAM(wParam), lParam); GET_KEYSTATE_WPARAM(wParam), lParam);
case WM_INPUTLANGCHANGE: { case WM_INPUTLANGCHANGE:
TCHAR buf[KL_NAMELENGTH]; UpdateNoteDisplay();
GetKeyboardLayoutName(buf); return 0;
isQWERTY = lstrcmpi(buf, L"00000409") == 0;
if (!isQWERTY && !hklQWERTY)
hklQWERTY = LoadKeyboardLayout(L"00000409", KLF_NOTELLSHELL);
int size = dnslen(keychars) + 1, i;
LPWSTR s;
if (m_keychars)
delete [] m_keychars;
m_keychars = new WCHAR[size];
for (i = 0; i < size; ++i) {
WORD scan = VkKeyScanEx(keychars[i], hklQWERTY), vk, ch;
if (LOBYTE(scan) == -1)
goto giveup;
vk = GetRealKeyCode(LOBYTE(scan));
if (!vk || vk == LOBYTE(scan))
goto giveup;
ch = (WCHAR) MapVirtualKey(vk, MAPVK_VK_TO_CHAR);
if (!ch)
goto giveup;
m_keychars[i] = ch;
continue;
giveup:
m_keychars[i] = keychars[i];
}
for (s = m_keychars, i = 0; i < 24 && lstrlen(s); s += lstrlen(s) + 1, ++i)
piano->SetKeyText(i, s);
}
case WM_CHAR: case WM_CHAR:
case WM_DEADCHAR: case WM_DEADCHAR:
case WM_SYSCHAR: case WM_SYSCHAR:
@ -883,7 +941,7 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
MainWindow *MainWindow::Create(LPCTSTR szTitle) MainWindow *MainWindow::Create(LPCTSTR szTitle)
{ {
MainWindow *self = new MainWindow(); MainWindow *self = new MainWindow();
RECT client = {0, 0, 622, 401}; RECT client = {0, 0, 622, 431};
AdjustWindowRect(&client, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, FALSE); AdjustWindowRect(&client, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, FALSE);
if (self && if (self &&
self->WinCreateWindow(0, self->WinCreateWindow(0,