From 4ceb87f0141685bf2e2f36f65e70c136a2068439 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Thu, 11 Feb 2016 16:56:11 +0100 Subject: [PATCH] Add `TerminalListener` to `Application` --- src/Application/Application.cpp | 9 +++++++++ src/Application/Application.h | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Application/Application.cpp b/src/Application/Application.cpp index 65496b2..4754b35 100644 --- a/src/Application/Application.cpp +++ b/src/Application/Application.cpp @@ -24,6 +24,8 @@ void Application::setup(){ ofLogWarning("Application::setup()") << "Failed to load default settings" << endl; } } + + consoleListener.setup(this); } ApplicationBaseState * Application::getState(){ @@ -124,6 +126,13 @@ bool Application::isShiftKeyDown(){ return _shiftKeyDown; } +void Application::onCharacterReceived(KeyListenerEventData & e){ + ofKeyEventArgs args; + args.key = (int)e.character; + cout << "TermListener: " << e.character << endl; + onKeyPressed(args); +}; + bool Application::loadXmlSettings(string fileName){ if(!ofFile::doesFileExist(fileName)){ ofLogError("Application::loadXmlSettings()") << fileName << " does not exist"; diff --git a/src/Application/Application.h b/src/Application/Application.h index 6bbb065..48c8fb6 100644 --- a/src/Application/Application.h +++ b/src/Application/Application.h @@ -19,6 +19,7 @@ #include "GuiMode.h" #include "Gui.h" +#include "TerminalListener.h" #define PIMAPPER_DEF_SURFACES_XML_FILE "defaultSurfaces.xml" #define PIMAPPER_USER_SURFACES_XML_FILE "surfaces.xml" @@ -28,7 +29,7 @@ namespace piMapper { class ApplicationBaseState; -class Application { +class Application : public KeyListener { public: Application(); @@ -56,6 +57,9 @@ class Application { SurfaceManager * getSurfaceManager(){ return &_surfaceManager; }; CmdManager * getCmdManager(){ return &_cmdManager; }; + void onCharacterReceived(KeyListenerEventData & e); + TerminalListener consoleListener; + protected: void setState(ApplicationBaseState * st);