brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move event and scene to UI; Handle special keys

Browse source
This commit is contained in:
falkTX 2021-10-10 03:08:17 +01:00
parent 11c9e2f91b
commit 124643459f
4 changed files with 75 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/Cardinal/CardinalPlugin.cpp
View file

@ -162,9 +162,6 @@ public:
fContext->engine = new rack::engine::Engine; fContext->engine = new rack::engine::Engine;
fContext->history = new rack::history::State; fContext->history = new rack::history::State;
fContext->event = new rack::widget::EventState;
fContext->scene = new rack::app::Scene;
fContext->event->rootWidget = fContext->scene;
fContext->patch = new rack::patch::Manager; fContext->patch = new rack::patch::Manager;
fContext->patch->autosavePath = "/OBVIOUSLY-NOT-VALID-PATH/"; fContext->patch->autosavePath = "/OBVIOUSLY-NOT-VALID-PATH/";
fContext->engine->startFallbackThread(); fContext->engine->startFallbackThread();

72
plugins/Cardinal/CardinalUI.cpp
View file

@ -76,6 +76,10 @@ public:
{ {
const ScopedContext sc(this); const ScopedContext sc(this);
fContext->event = new rack::widget::EventState;
fContext->scene = new rack::app::Scene;
fContext->event->rootWidget = fContext->scene;
// Initialize context // Initialize context
d_stdout("UI context ptr %p", NanoVG::getContext()); d_stdout("UI context ptr %p", NanoVG::getContext());
rack::window::lastUI = this; rack::window::lastUI = this;
@ -217,9 +221,75 @@ protected:
{ {
const ScopedContext sc(this); const ScopedContext sc(this);
int key;
int mods = 0; int mods = 0;
int action = ev.press; int action = ev.press;
/* These are unsupported in pugl right now
#define GLFW_KEY_KP_0 320
#define GLFW_KEY_KP_1 321
#define GLFW_KEY_KP_2 322
#define GLFW_KEY_KP_3 323
#define GLFW_KEY_KP_4 324
#define GLFW_KEY_KP_5 325
#define GLFW_KEY_KP_6 326
#define GLFW_KEY_KP_7 327
#define GLFW_KEY_KP_8 328
#define GLFW_KEY_KP_9 329
#define GLFW_KEY_KP_DECIMAL 330
#define GLFW_KEY_KP_DIVIDE 331
#define GLFW_KEY_KP_MULTIPLY 332
#define GLFW_KEY_KP_SUBTRACT 333
#define GLFW_KEY_KP_ADD 334
#define GLFW_KEY_KP_ENTER 335
#define GLFW_KEY_KP_EQUAL 336
*/
switch (ev.key)
{
case '\r': key = GLFW_KEY_ENTER; break;
case '\t': key = GLFW_KEY_TAB; break;
case kKeyBackspace: key = GLFW_KEY_BACKSPACE; break;
case kKeyEscape: key = GLFW_KEY_ESCAPE; break;
case kKeyDelete: key = GLFW_KEY_DELETE; break;
case kKeyF1: key = GLFW_KEY_F1; break;
case kKeyF2: key = GLFW_KEY_F2; break;
case kKeyF3: key = GLFW_KEY_F3; break;
case kKeyF4: key = GLFW_KEY_F4; break;
case kKeyF5: key = GLFW_KEY_F5; break;
case kKeyF6: key = GLFW_KEY_F6; break;
case kKeyF7: key = GLFW_KEY_F7; break;
case kKeyF8: key = GLFW_KEY_F8; break;
case kKeyF9: key = GLFW_KEY_F9; break;
case kKeyF10: key = GLFW_KEY_F10; break;
case kKeyF11: key = GLFW_KEY_F11; break;
case kKeyF12: key = GLFW_KEY_F12; break;
case kKeyLeft: key = GLFW_KEY_LEFT; break;
case kKeyUp: key = GLFW_KEY_UP; break;
case kKeyRight: key = GLFW_KEY_RIGHT; break;
case kKeyDown: key = GLFW_KEY_DOWN; break;
case kKeyPageUp: key = GLFW_KEY_PAGE_UP; break;
case kKeyPageDown: key = GLFW_KEY_PAGE_DOWN; break;
case kKeyHome: key = GLFW_KEY_HOME; break;
case kKeyEnd: key = GLFW_KEY_END; break;
case kKeyInsert: key = GLFW_KEY_INSERT; break;
case kKeyShiftL: key = GLFW_KEY_LEFT_SHIFT; break;
case kKeyShiftR: key = GLFW_KEY_RIGHT_SHIFT; break;
case kKeyControlL: key = GLFW_KEY_LEFT_CONTROL; break;
case kKeyControlR: key = GLFW_KEY_RIGHT_CONTROL; break;
case kKeyAltL: key = GLFW_KEY_LEFT_ALT; break;
case kKeyAltR: key = GLFW_KEY_RIGHT_ALT; break;
case kKeySuperL: key = GLFW_KEY_LEFT_SUPER; break;
case kKeySuperR: key = GLFW_KEY_RIGHT_SUPER; break;
case kKeyMenu: key = GLFW_KEY_MENU; break;
case kKeyCapsLock: key = GLFW_KEY_CAPS_LOCK; break;
case kKeyScrollLock: key = GLFW_KEY_SCROLL_LOCK; break;
case kKeyNumLock: key = GLFW_KEY_NUM_LOCK; break;
case kKeyPrintScreen: key = GLFW_KEY_PRINT_SCREEN; break;
case kKeyPause: key = GLFW_KEY_PAUSE; break;
default: key = ev.key; break;
}
if (ev.mod & kModifierControl) if (ev.mod & kModifierControl)
mods |= GLFW_MOD_CONTROL; mods |= GLFW_MOD_CONTROL;
if (ev.mod & kModifierShift) if (ev.mod & kModifierShift)
@ -228,7 +298,7 @@ protected:
mods |= GLFW_MOD_ALT; mods |= GLFW_MOD_ALT;
// TODO special key conversion // TODO special key conversion
rack::window::keyCallback(fContext, ev.key, ev.keycode, action, mods); rack::window::keyCallback(fContext, key, ev.keycode, action, mods);
return true; return true;
} }

6
plugins/Cardinal/Makefile
View file

@ -99,9 +99,9 @@ SPACE +=
CMAKE = cmake CMAKE = cmake
# ifneq (,$(findstring -arch$(SPACE),$(CXXFLAGS))) ifneq (,$(findstring -arch$(SPACE),$(CXXFLAGS)))
# CMAKE += -DCMAKE_OSX_ARCHITECTURES=$(subst $(SPACE),;,$(subst -arch=,,$(filter -arch=%,$(subst -arch$(SPACE),-arch=,$(CXXFLAGS))))) CMAKE += -DCMAKE_OSX_ARCHITECTURES='$(subst $(SPACE),;,$(subst -arch=,,$(filter -arch=%,$(subst -arch$(SPACE),-arch=,$(CXXFLAGS)))))'
# endif endif
ifneq (,$(findstring -mmacosx-version-min=,$(CXXFLAGS))) ifneq (,$(findstring -mmacosx-version-min=,$(CXXFLAGS)))
CMAKE += -DCMAKE_OSX_DEPLOYMENT_TARGET=$(subst -mmacosx-version-min=,,$(filter -mmacosx-version-min=%,$(CXXFLAGS))) CMAKE += -DCMAKE_OSX_DEPLOYMENT_TARGET=$(subst -mmacosx-version-min=,,$(filter -mmacosx-version-min=%,$(CXXFLAGS)))
endif endif

2
plugins/Cardinal/neon-compat/pmmintrin.h
View file

@ -34,4 +34,4 @@ uint32_t _mm_getcsr()
return 0; return 0;
} }
#endif #endif