eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 19:29:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support for non-US keyboard layout

Browse Source 
Hack to translate key press index to matched letter as key. Should work on most Latin keyboard layout, but not tested otherwise...
This commit is contained in:
Bruno Herbelin
2022-12-11 14:10:19 +01:00
parent 8e6aaf29e0
commit 5f68f51693
3 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ControlManager.cpp
View File

@@ -1100,16 +1100,17 @@ void Control::keyboardCalback(GLFWwindow* window, int key, int, int action, int
{ {
if (UserInterface::manager().keyboardAvailable() && !mods ) if (UserInterface::manager().keyboardAvailable() && !mods )
{ {
int _key = layoutKey(key);
Control::manager().input_access_.lock(); Control::manager().input_access_.lock();
if (key >= GLFW_KEY_A && key <= GLFW_KEY_Z) { if (_key >= GLFW_KEY_A && _key <= GLFW_KEY_Z) {
Control::manager().input_active[INPUT_KEYBOARD_FIRST + key - GLFW_KEY_A] = action > GLFW_RELEASE; Control::manager().input_active[INPUT_KEYBOARD_FIRST + _key - GLFW_KEY_A] = action > GLFW_RELEASE;
Control::manager().input_values[INPUT_KEYBOARD_FIRST + key - GLFW_KEY_A] = action > GLFW_RELEASE ? 1.f : 0.f; Control::manager().input_values[INPUT_KEYBOARD_FIRST + _key - GLFW_KEY_A] = action > GLFW_RELEASE ? 1.f : 0.f;
} }
else if (key >= GLFW_KEY_KP_0 && key <= GLFW_KEY_KP_EQUAL) { else if (_key >= GLFW_KEY_KP_0 && _key <= GLFW_KEY_KP_EQUAL) {
Control::manager().input_active[INPUT_NUMPAD_FIRST + key - GLFW_KEY_KP_0] = action > GLFW_RELEASE; Control::manager().input_active[INPUT_NUMPAD_FIRST + _key - GLFW_KEY_KP_0] = action > GLFW_RELEASE;
Control::manager().input_values[INPUT_NUMPAD_FIRST + key - GLFW_KEY_KP_0] = action > GLFW_RELEASE ? 1.f : 0.f; Control::manager().input_values[INPUT_NUMPAD_FIRST + _key - GLFW_KEY_KP_0] = action > GLFW_RELEASE ? 1.f : 0.f;
} }
else if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS ) else if (_key == GLFW_KEY_ESCAPE && action == GLFW_PRESS )
{ {
static GLFWwindow *output = Rendering::manager().outputWindow().window(); static GLFWwindow *output = Rendering::manager().outputWindow().window();
if (window==output) if (window==output)
@@ -1173,3 +1174,38 @@ std::string Control::inputLabel(uint id)
return label; return label;
} }
//
// hack to convert GLFW key-press correction depending on keyboard layout
//
int Control::layoutKey(int key)
{
static int _keyMap[GLFW_KEY_LAST];
static bool _initialized = false;
if (!_initialized) {
// default 1 to 1 correspondance for all GLFW keys
for(int i=0; i < GLFW_KEY_LAST; ++i)
_keyMap[i] = i;
// conversion of alphabetical keys from keyboard layout
for(int l=GLFW_KEY_SEMICOLON; l < GLFW_KEY_LEFT_BRACKET; ++l) {
const char* key_name = glfwGetKeyName(l, 0);
if (key_name) {
int letter = (int)key_name[0];
// Convert to upper-case
if (letter >= 97 && letter <= 122)
letter -= 32;
_keyMap[l] = letter;
}
}
_initialized = true;
}
// fprintf(stderr, "%d pressed; converted to %d\n", key, _keyMap[key]);
return _keyMap[key];
}

1
src/ControlManager.h
View File

@@ -120,6 +120,7 @@ public:
float inputValue (uint id); float inputValue (uint id);
float inputDelay (uint id); float inputDelay (uint id);
static std::string inputLabel(uint id); static std::string inputLabel(uint id);
static int layoutKey(int key);
protected: protected:

50
src/UserInterfaceManager.cpp
View File

@@ -172,6 +172,14 @@ bool UserInterface::Init()
ImGui_ImplGlfw_InitForOpenGL(Rendering::manager().mainWindow().window(), true); ImGui_ImplGlfw_InitForOpenGL(Rendering::manager().mainWindow().window(), true);
ImGui_ImplOpenGL3_Init(Rendering::manager().glsl_version.c_str()); ImGui_ImplOpenGL3_Init(Rendering::manager().glsl_version.c_str());
// hack to change keys according to keyboard layout
io.KeyMap[ImGuiKey_A] = Control::layoutKey(GLFW_KEY_A);
io.KeyMap[ImGuiKey_C] = Control::layoutKey(GLFW_KEY_C);
io.KeyMap[ImGuiKey_V] = Control::layoutKey(GLFW_KEY_V);
io.KeyMap[ImGuiKey_X] = Control::layoutKey(GLFW_KEY_X);
io.KeyMap[ImGuiKey_Y] = Control::layoutKey(GLFW_KEY_Y);
io.KeyMap[ImGuiKey_Z] = Control::layoutKey(GLFW_KEY_Z);
// Setup Dear ImGui style // Setup Dear ImGui style
ImGuiToolkit::SetAccentColor(static_cast<ImGuiToolkit::accent_color>(Settings::application.accent_color)); ImGuiToolkit::SetAccentColor(static_cast<ImGuiToolkit::accent_color>(Settings::application.accent_color));
@@ -255,12 +263,12 @@ void UserInterface::handleKeyboard()
// Application "CTRL +"" Shortcuts // Application "CTRL +"" Shortcuts
if ( ctrl_modifier_active ) { if ( ctrl_modifier_active ) {
if (ImGui::IsKeyPressed( GLFW_KEY_Q, false )) { if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_Q), false )) {
// try quit // try quit
if ( TryClose() ) if ( TryClose() )
Rendering::manager().close(); Rendering::manager().close();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_O, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_O), false )) {
// SHIFT + CTRL + O : reopen current session // SHIFT + CTRL + O : reopen current session
if (shift_modifier_active && !Mixer::manager().session()->filename().empty()) if (shift_modifier_active && !Mixer::manager().session()->filename().empty())
Mixer::manager().load( Mixer::manager().session()->filename() ); Mixer::manager().load( Mixer::manager().session()->filename() );
@@ -268,7 +276,7 @@ void UserInterface::handleKeyboard()
else else
selectOpenFilename(); selectOpenFilename();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_S, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_S), false )) {
// SHIFT + CTRL + S : save as // SHIFT + CTRL + S : save as
if (shift_modifier_active) if (shift_modifier_active)
selectSaveFilename(); selectSaveFilename();
@@ -276,7 +284,7 @@ void UserInterface::handleKeyboard()
else else
saveOrSaveAs(); saveOrSaveAs();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_W, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_W), false )) {
// New Session // New Session
Mixer::manager().close(); Mixer::manager().close();
} }
@@ -284,35 +292,35 @@ void UserInterface::handleKeyboard()
// restart media player // restart media player
sourcecontrol.Replay(); sourcecontrol.Replay();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_L, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_L), false )) {
// Logs // Logs
Settings::application.widget.logs = !Settings::application.widget.logs; Settings::application.widget.logs = !Settings::application.widget.logs;
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_T, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_T), false )) {
// Timers // Timers
timercontrol.setVisible(!Settings::application.widget.timer); timercontrol.setVisible(!Settings::application.widget.timer);
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_G, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_G), false )) {
// Developer toolbox // Developer toolbox
Settings::application.widget.toolbox = !Settings::application.widget.toolbox; Settings::application.widget.toolbox = !Settings::application.widget.toolbox;
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_H, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_H), false )) {
// Helper // Helper
Settings::application.widget.help = !Settings::application.widget.help; Settings::application.widget.help = !Settings::application.widget.help;
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_E, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_E), false )) {
// Shader Editor // Shader Editor
shadercontrol.setVisible(!Settings::application.widget.shader_editor); shadercontrol.setVisible(!Settings::application.widget.shader_editor);
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_D, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_D), false )) {
// Display output // Display output
outputcontrol.setVisible(!Settings::application.widget.preview); outputcontrol.setVisible(!Settings::application.widget.preview);
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_P, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_P), false )) {
// Media player // Media player
sourcecontrol.setVisible(!Settings::application.widget.media_player); sourcecontrol.setVisible(!Settings::application.widget.media_player);
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_A, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_A), false )) {
if (shift_modifier_active) if (shift_modifier_active)
{ {
// clear selection // clear selection
@@ -323,46 +331,46 @@ void UserInterface::handleKeyboard()
// select all // select all
Mixer::manager().view()->selectAll(); Mixer::manager().view()->selectAll();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_R, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_R), false )) {
// toggle recording stop / start (or save and continue if + ALT modifier) // toggle recording stop / start (or save and continue if + ALT modifier)
outputcontrol.ToggleRecord(alt_modifier_active); outputcontrol.ToggleRecord(alt_modifier_active);
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_Z )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_Z), false )) {
if (shift_modifier_active) if (shift_modifier_active)
Action::manager().redo(); Action::manager().redo();
else else
Action::manager().undo(); Action::manager().undo();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_C, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_C), false )) {
std::string clipboard = Mixer::selection().clipboard(); std::string clipboard = Mixer::selection().clipboard();
if (!clipboard.empty()) if (!clipboard.empty())
ImGui::SetClipboardText(clipboard.c_str()); ImGui::SetClipboardText(clipboard.c_str());
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_X, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_X), false )) {
std::string clipboard = Mixer::selection().clipboard(); std::string clipboard = Mixer::selection().clipboard();
if (!clipboard.empty()) { if (!clipboard.empty()) {
ImGui::SetClipboardText(clipboard.c_str()); ImGui::SetClipboardText(clipboard.c_str());
Mixer::manager().deleteSelection(); Mixer::manager().deleteSelection();
} }
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_V, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_V), false )) {
auto clipboard = ImGui::GetClipboardText(); auto clipboard = ImGui::GetClipboardText();
if (clipboard != nullptr && strlen(clipboard) > 0) if (clipboard != nullptr && strlen(clipboard) > 0)
Mixer::manager().paste(clipboard); Mixer::manager().paste(clipboard);
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_F, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_F), false )) {
if (shift_modifier_active) if (shift_modifier_active)
Rendering::manager().mainWindow().toggleFullscreen(); Rendering::manager().mainWindow().toggleFullscreen();
else else
Rendering::manager().outputWindow().toggleFullscreen(); Rendering::manager().outputWindow().toggleFullscreen();
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_M, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_M), false )) {
Settings::application.widget.stats = !Settings::application.widget.stats; Settings::application.widget.stats = !Settings::application.widget.stats;
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_I, false )) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_I), false )) {
Settings::application.widget.inputs = !Settings::application.widget.inputs; Settings::application.widget.inputs = !Settings::application.widget.inputs;
} }
else if (ImGui::IsKeyPressed( GLFW_KEY_N, false ) && shift_modifier_active) { else if (ImGui::IsKeyPressed( Control::layoutKey(GLFW_KEY_N), false ) && shift_modifier_active) {
Mixer::manager().session()->addNote(); Mixer::manager().session()->addNote();
} }