VCVRack
/
Rack
mirror of https://github.com/VCVRack/Rack.git
1
0
Fork 0
Code Issues 0 Releases 43 Wiki Activity
Browse Source

Use key instead of keyName for checking key commands.

tags/v2.6.0
Andrew Belt 7 months ago
parent
0ab12e7103
commit
eea16efc29
3 changed files with 34 additions and 34 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +8
    -8
      src/app/ModuleWidget.cpp
  2. +21
    -21
      src/app/Scene.cpp
  3. +5
    -5
      src/ui/TextField.cpp

+ 8
- 8
src/app/ModuleWidget.cpp View File

@@ -315,36 +315,36 @@ void ModuleWidget::onHover(const HoverEvent& e) {


void ModuleWidget::onHoverKey(const HoverKeyEvent& e) { void ModuleWidget::onHoverKey(const HoverKeyEvent& e) {
if (e.action == GLFW_PRESS || e.action == GLFW_REPEAT) { if (e.action == GLFW_PRESS || e.action == GLFW_REPEAT) {
if (e.keyName == "c" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_C && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
copyClipboard(); copyClipboard();
e.consume(this); e.consume(this);
} }
if (e.keyName == "v" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_V && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (pasteClipboardAction()) { if (pasteClipboardAction()) {
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "d" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_D && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
cloneAction(false); cloneAction(false);
e.consume(this); e.consume(this);
} }
if (e.keyName == "d" && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (e.key == GLFW_KEY_D && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
cloneAction(true); cloneAction(true);
e.consume(this); e.consume(this);
} }
if (e.keyName == "i" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_I && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
resetAction(); resetAction();
e.consume(this); e.consume(this);
} }
if (e.keyName == "r" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_R && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
randomizeAction(); randomizeAction();
e.consume(this); e.consume(this);
} }
if (e.keyName == "u" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_U && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
disconnectAction(); disconnectAction();
e.consume(this); e.consume(this);
} }
if (e.keyName == "e" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_E && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
bypassAction(!module->isBypassed()); bypassAction(!module->isBypassed());
e.consume(this); e.consume(this);
} }


+ 21
- 21
src/app/Scene.cpp View File

@@ -171,39 +171,39 @@ void Scene::onHoverKey(const HoverKeyEvent& e) {
// Key commands that override children // Key commands that override children
if (e.action == GLFW_PRESS || e.action == GLFW_REPEAT) { if (e.action == GLFW_PRESS || e.action == GLFW_REPEAT) {
// DEBUG("key '%d '%c' scancode %d '%c' keyName '%s'", e.key, e.key, e.scancode, e.scancode, e.keyName.c_str()); // DEBUG("key '%d '%c' scancode %d '%c' keyName '%s'", e.key, e.key, e.scancode, e.scancode, e.keyName.c_str());
if (e.keyName == "n" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_N && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
APP->patch->loadTemplateDialog(); APP->patch->loadTemplateDialog();
e.consume(this); e.consume(this);
} }
if (e.keyName == "q" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_Q && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
APP->window->close(); APP->window->close();
e.consume(this); e.consume(this);
} }
if (e.keyName == "o" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_O && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
APP->patch->loadDialog(); APP->patch->loadDialog();
e.consume(this); e.consume(this);
} }
if (e.keyName == "o" && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (e.key == GLFW_KEY_O && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
APP->patch->revertDialog(); APP->patch->revertDialog();
e.consume(this); e.consume(this);
} }
if (e.keyName == "s" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_S && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
APP->patch->saveDialog(); APP->patch->saveDialog();
e.consume(this); e.consume(this);
} }
if (e.keyName == "s" && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (e.key == GLFW_KEY_S && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
APP->patch->saveAsDialog(); APP->patch->saveAsDialog();
e.consume(this); e.consume(this);
} }
if (e.keyName == "z" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_Z && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
APP->history->undo(); APP->history->undo();
e.consume(this); e.consume(this);
} }
if (e.keyName == "z" && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (e.key == GLFW_KEY_Z && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
APP->history->redo(); APP->history->redo();
e.consume(this); e.consume(this);
} }
if (e.keyName == "-" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if ((e.key == GLFW_KEY_MINUS || e.key == GLFW_KEY_KP_SUBTRACT) && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
float zoom = std::log2(APP->scene->rackScroll->getZoom()); float zoom = std::log2(APP->scene->rackScroll->getZoom());
zoom *= 2; zoom *= 2;
zoom = std::ceil(zoom - 0.01f) - 1; zoom = std::ceil(zoom - 0.01f) - 1;
@@ -212,7 +212,7 @@ void Scene::onHoverKey(const HoverKeyEvent& e) {
e.consume(this); e.consume(this);
} }
// Numpad has a "+" key, but the main keyboard section hides it under "=" // Numpad has a "+" key, but the main keyboard section hides it under "="
if ((e.keyName == "=" || e.keyName == "+") && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if ((e.key == GLFW_KEY_EQUAL || e.key == GLFW_KEY_KP_ADD) && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
float zoom = std::log2(APP->scene->rackScroll->getZoom()); float zoom = std::log2(APP->scene->rackScroll->getZoom());
zoom *= 2; zoom *= 2;
zoom = std::floor(zoom + 0.01f) + 1; zoom = std::floor(zoom + 0.01f) + 1;
@@ -220,7 +220,7 @@ void Scene::onHoverKey(const HoverKeyEvent& e) {
APP->scene->rackScroll->setZoom(std::pow(2.f, zoom)); APP->scene->rackScroll->setZoom(std::pow(2.f, zoom));
e.consume(this); e.consume(this);
} }
if ((e.keyName == "0") && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if ((e.key == GLFW_KEY_0 || e.key == GLFW_KEY_KP_0) && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
APP->scene->rackScroll->setZoom(1.f); APP->scene->rackScroll->setZoom(1.f);
e.consume(this); e.consume(this);
} }
@@ -244,51 +244,51 @@ void Scene::onHoverKey(const HoverKeyEvent& e) {
} }


// Module selections // Module selections
if (e.keyName == "a" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_A && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
rack->selectAll(); rack->selectAll();
e.consume(this); e.consume(this);
} }
if (e.keyName == "a" && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (e.key == GLFW_KEY_A && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
rack->deselectAll(); rack->deselectAll();
e.consume(this); e.consume(this);
} }
if (e.keyName == "c" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_C && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->copyClipboardSelection(); rack->copyClipboardSelection();
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "i" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_I && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->resetSelectionAction(); rack->resetSelectionAction();
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "r" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_R && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->randomizeSelectionAction(); rack->randomizeSelectionAction();
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "u" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_U && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->disconnectSelectionAction(); rack->disconnectSelectionAction();
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "e" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_E && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->bypassSelectionAction(!rack->isSelectionBypassed()); rack->bypassSelectionAction(!rack->isSelectionBypassed());
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "d" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_D && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->cloneSelectionAction(false); rack->cloneSelectionAction(false);
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "d" && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (e.key == GLFW_KEY_D && (e.mods & RACK_MOD_MASK) == (RACK_MOD_CTRL | GLFW_MOD_SHIFT)) {
if (rack->hasSelection()) { if (rack->hasSelection()) {
rack->cloneSelectionAction(true); rack->cloneSelectionAction(true);
e.consume(this); e.consume(this);
@@ -337,7 +337,7 @@ void Scene::onHoverKey(const HoverKeyEvent& e) {
e.consume(this); e.consume(this);
} }
} }
if (e.keyName == "v" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_V && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
rack->pasteClipboardAction(); rack->pasteClipboardAction();
e.consume(this); e.consume(this);
} }


+ 5
- 5
src/ui/TextField.cpp View File

@@ -206,22 +206,22 @@ void TextField::onSelectKey(const SelectKeyEvent& e) {
e.consume(this); e.consume(this);
} }
// Ctrl+V // Ctrl+V
if (e.keyName == "v" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_V && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
pasteClipboard(); pasteClipboard();
e.consume(this); e.consume(this);
} }
// Ctrl+X // Ctrl+X
if (e.keyName == "x" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_X && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
cutClipboard(); cutClipboard();
e.consume(this); e.consume(this);
} }
// Ctrl+C // Ctrl+C
if (e.keyName == "c" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_C && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
copyClipboard(); copyClipboard();
e.consume(this); e.consume(this);
} }
// Ctrl+A // Ctrl+A
if (e.keyName == "a" && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
if (e.key == GLFW_KEY_A && (e.mods & RACK_MOD_MASK) == RACK_MOD_CTRL) {
selectAll(); selectAll();
e.consume(this); e.consume(this);
} }
@@ -249,7 +249,7 @@ void TextField::onSelectKey(const SelectKeyEvent& e) {
e.consume(this); e.consume(this);
} }
// Consume all printable keys unless Ctrl is held // Consume all printable keys unless Ctrl is held
if ((e.mods & RACK_MOD_CTRL) == 0 && e.keyName != "") {
if ((GLFW_KEY_SPACE <= e.key && e.key <= GLFW_KEY_GRAVE_ACCENT) && (e.mods & RACK_MOD_CTRL) == 0) {
e.consume(this); e.consume(this);
} }




Write Preview
Loading…
Cancel
Save