replaced ConsoleListener with new TerminalListener

jvcleave · Jan 9, 2015 · 2d71f91 · 2d71f91
1 parent 54a16d8
commit 2d71f91
Show file tree

Hide file tree

Showing 9 changed files with 123 additions and 21 deletions.
diff --git a/example-pixels/src/pixelsApp.cpp b/example-pixels/src/pixelsApp.cpp
@@ -69,7 +69,7 @@ void pixelsApp::keyPressed  (int key)
 	}
 }
 
-void pixelsApp::onCharacterReceived(SSHKeyListenerEventData& e)
+void pixelsApp::onCharacterReceived(KeyListenerEventData& e)
 {
 	keyPressed((int)e.character);
 }
diff --git a/example-pixels/src/pixelsApp.h b/example-pixels/src/pixelsApp.h
@@ -3,8 +3,8 @@
 #include "ofMain.h"
 #include "ofxOMXPlayer.h"
 
-#include "ConsoleListener.h"
-class pixelsApp : public ofBaseApp, public SSHKeyListener{
+#include "TerminalListener.h"
+class pixelsApp : public ofBaseApp, public KeyListener{
 
 public:
 
@@ -17,8 +17,8 @@ class pixelsApp : public ofBaseApp, public SSHKeyListener{
 	ofxOMXPlayer omxPlayer;
 	bool doSaveImage;
 
-	ConsoleListener consoleListener;
-	void onCharacterReceived(SSHKeyListenerEventData& e);
+	TerminalListener consoleListener;
+	void onCharacterReceived(KeyListenerEventData& e);
 
 	ofTexture pixelOutput;
 	bool doUpdatePixels;

diff --git a/example-playlist/src/playlistApp.cpp b/example-playlist/src/playlistApp.cpp
@@ -20,7 +20,7 @@ void playlistApp::onVideoEnd(ofxOMXPlayerListenerEventData& e)
 }
 
 
-void playlistApp::onCharacterReceived(SSHKeyListenerEventData& e)
+void playlistApp::onCharacterReceived(KeyListenerEventData& e)
 {
 	keyPressed((int)e.character);
 }

diff --git a/example-playlist/src/playlistApp.h b/example-playlist/src/playlistApp.h
@@ -2,10 +2,10 @@
 
 #include "ofMain.h"
 #include "ofxOMXPlayer.h"
-#include "ConsoleListener.h"
+#include "TerminalListener.h"
 
 
-class playlistApp : public ofBaseApp, public ofxOMXPlayerListener, public SSHKeyListener{
+class playlistApp : public ofBaseApp, public ofxOMXPlayerListener, public KeyListener{
 
 	public:
 
@@ -24,8 +24,8 @@ class playlistApp : public ofBaseApp, public ofxOMXPlayerListener, public SSHKey
 		vector<ofFile> files;
 		int videoCounter;
 
-		void onCharacterReceived(SSHKeyListenerEventData& e);
-		ConsoleListener consoleListener;
+		void onCharacterReceived(KeyListenerEventData& e);
+		TerminalListener consoleListener;
 		ofxOMXPlayerSettings settings;
 
 		void loadNextMovie();

diff --git a/example-restartMovie/src/testApp.cpp b/example-restartMovie/src/testApp.cpp
@@ -81,7 +81,7 @@ void testApp::keyPressed(int key)
 	}
 }
 
-void testApp::onCharacterReceived(SSHKeyListenerEventData& e)
+void testApp::onCharacterReceived(KeyListenerEventData& e)
 {
 	keyPressed((int)e.character);
 }
diff --git a/example-restartMovie/src/testApp.h b/example-restartMovie/src/testApp.h
@@ -2,9 +2,9 @@
 
 #include "ofMain.h"
 #include "ofxOMXPlayer.h"
-#include "ConsoleListener.h"
+#include "TerminalListener.h"
 
-class testApp : public ofBaseApp, public SSHKeyListener{
+class testApp : public ofBaseApp, public KeyListener{
 
 	public:
 
@@ -14,7 +14,7 @@ class testApp : public ofBaseApp, public SSHKeyListener{
 		void keyPressed(int key);	
 		ofxOMXPlayer omxPlayer;
 
-	void onCharacterReceived(SSHKeyListenerEventData& e);
-	ConsoleListener consoleListener;
+	void onCharacterReceived(KeyListenerEventData& e);
+	TerminalListener consoleListener;
 };
 
diff --git a/example-shader/src/shaderApp.cpp b/example-shader/src/shaderApp.cpp
@@ -1,9 +1,8 @@
 #include "shaderApp.h"
 
 
-void shaderApp::onCharacterReceived(SSHKeyListenerEventData& e)
+void shaderApp::onCharacterReceived(KeyListenerEventData& e)
 {
-	//ConsoleListener* thread = (ConsoleListener*) e.listener;
 	keyPressed((int)e.character);
 }
 

diff --git a/example-shader/src/shaderApp.h b/example-shader/src/shaderApp.h
@@ -3,9 +3,9 @@
 #include "ofMain.h"
 #include "ofxOMXPlayer.h"
 
-#include "ConsoleListener.h"
+#include "TerminalListener.h"
 
-class shaderApp : public ofBaseApp, public SSHKeyListener, public ofxOMXPlayerListener{
+class shaderApp : public ofBaseApp, public KeyListener, public ofxOMXPlayerListener{
 
 public:
 
@@ -25,8 +25,8 @@ class shaderApp : public ofBaseApp, public SSHKeyListener, public ofxOMXPlayerLi
 
 
 	//allows key commands via Shell
-	void onCharacterReceived(SSHKeyListenerEventData& e);
-	ConsoleListener consoleListener;
+	void onCharacterReceived(KeyListenerEventData& e);
+	TerminalListener consoleListener;
 
 	void onVideoEnd(ofxOMXPlayerListenerEventData& e);
 	void onVideoLoop(ofxOMXPlayerListenerEventData& e);

diff --git a/src/TerminalListener.h b/src/TerminalListener.h
@@ -0,0 +1,103 @@
+#pragma once
+
+#include "ofMain.h"
+#include <fcntl.h>
+
+class KeyListenerEventData
+{
+public:
+    KeyListenerEventData(char character, void* listener)
+    {
+        this->character = character;
+        this->listener = listener;
+    }
+    void* listener;
+
+    char character;
+};
+
+class KeyListener
+{
+public:
+    virtual void onCharacterReceived(KeyListenerEventData& e) = 0;
+};
+
+
+class TerminalListener : public Poco::Runnable
+{
+private:
+    struct termios orig_termios;
+public:
+    KeyListener* listener;
+    Poco::Thread thread;
+    TerminalListener()
+    {
+
+        listener = NULL;
+
+    }
+
+
+    void setup(KeyListener* listener_)
+    {
+        listener = listener_;
+        struct termios new_termios;
+
+        tcgetattr(STDIN_FILENO, &orig_termios);
+
+        new_termios = orig_termios;
+        new_termios.c_lflag &= ~(ICANON | ECHO | ECHOCTL | ECHONL);
+        new_termios.c_cflag |= HUPCL;
+        new_termios.c_cc[VMIN] = 0;
+
+        tcsetattr(STDIN_FILENO, TCSANOW, &new_termios);
+        thread.start(*this);
+    }
+
+    void run()
+    {
+
+        while (thread.isRunning())
+        {
+            if (listener != NULL)
+            {
+                int ch[8];
+                int chnum = 0;
+
+                while ((ch[chnum] = getchar()) != EOF)
+                {
+                    chnum++;
+                }
+
+                if (chnum > 1)
+                {
+                    ch[0] = ch[chnum - 1];
+                }else
+                {
+                    (ch[chnum - 2] << 8);
+                }
+
+                if (chnum > 0)
+                {
+                    //ofLog(OF_LOG_VERBOSE, "TerminalListener: character %c", ch[0]);
+                    KeyListenerEventData eventData(ch[0], (void *)this);
+                    listener->onCharacterReceived(eventData);
+                }
+            }
+        }
+    }
+
+    void close()
+    {
+        tcsetattr(STDIN_FILENO, TCSANOW, &orig_termios);
+        thread.tryJoin(50);
+        listener = NULL;
+    }
+
+    ~TerminalListener()
+    {
+        close();
+        //ofLogVerbose(__func__) << " END";
+    }
+
+};