diff --git a/src/ofxTextInputField.cpp b/src/ofxTextInputField.cpp
index 732e398..5ae5241 100755
--- a/src/ofxTextInputField.cpp
+++ b/src/ofxTextInputField.cpp
@@ -1,584 +1,629 @@
-//
-//  textInput.cpp
-//
-//  Created by Elliot Woods on 09/12/2011.
-//  Copyright 2011 Kimchi and Chips.
-//
-//  modified by James George 12/2/2011
-//  modified by Momo the Monster 7/10/2012
-//  swappable fonts added by James George 9/11/2012
-//
-//	MIT license
-//	http://www.opensource.org/licenses/mit-license.php
-//
-
-#include "ofxTextInputField.h"
-
-
-ofxTextInputField::ofxTextInputField() {
-    
-    shiftMap[44] = '<';
-    shiftMap[45] = '_';
-    shiftMap[46] = '>';
-    shiftMap[48] = ')';
-    shiftMap[49] = '!';
-    shiftMap[50] = '@';
-    shiftMap[51] = '#';
-    shiftMap[52] = '$';
-    shiftMap[53] = '%';
-    shiftMap[54] = '^';
-    shiftMap[55] = '&';
-    shiftMap[56] = '*';
-    shiftMap[57] = '(';
-    shiftMap[61] = '+';
-    shiftMap[63] = '/';
-    shiftMap[91] = '{';
-    shiftMap[92] = '|';
-    shiftMap[93] = '}';
-    shiftMap[96] = '~';
-    
-	text = "";
-	multiline = false;
-	autoTab = true;
-	cursorPosition = 0;
-	selectionBegin = 0;
-	selectionEnd = 0;
-	selecting = false;
-	
-	
-	fontRef = NULL;
-    isEnabled = false;
-	isEditing = false;
-    bounds = ofRectangle(0,0,100,22);
-	
-    drawCursor = false;
-	autoClear = false;
-	mouseDownInRect = false;
-
-	fontRef = new ofxTextInput::BitmapFontRenderer();
-    //isSetup = false;
-	
-	VERTICAL_PADDING = 3;
-	HORIZONTAL_PADDING = 3;
-	lastTimeCursorMoved = ofGetElapsedTimef();
-}
-
-ofxTextInputField::~ofxTextInputField(){
-	if(isEnabled){
-        disable();
-    }
-
-}
-
-void ofxTextInputField::setup(){
-	enable();
-}
-
-
-void ofxTextInputField::enable(){
-	if(!isEnabled){
-		ofAddListener(ofEvents().mousePressed, this, &ofxTextInputField::mousePressed);
-		ofAddListener(ofEvents().mouseDragged, this, &ofxTextInputField::mouseDragged);
-		ofAddListener(ofEvents().mouseReleased, this, &ofxTextInputField::mouseReleased);
-		isEnabled = true;
-	}
-}
-
-void ofxTextInputField::disable(){
-	if(isEditing){
-		endEditing();
-	}
-	if(isEnabled){
-        ofRemoveListener(ofEvents().mousePressed, this, &ofxTextInputField::mousePressed);
-		ofRemoveListener(ofEvents().mouseDragged, this, &ofxTextInputField::mouseDragged);
-		ofRemoveListener(ofEvents().mouseReleased, this, &ofxTextInputField::mouseReleased);
-		isEnabled = false;
-    }
-	
-}
-void ofxTextInputField::beginEditing() {
-    if(!isEditing){
-        ofAddListener(ofEvents().keyPressed, this, &ofxTextInputField::keyPressed);
-        ofAddListener(ofEvents().keyReleased, this, &ofxTextInputField::keyReleased);
-        ofSendMessage(TEXTFIELD_IS_ACTIVE);
-        isEditing = true;
-        drawCursor = true;
-		if(autoClear){
-			clear();
-		}
-		else{
-
-
-		}
-    }
-}
-
-void ofxTextInputField::endEditing() {
-    if(isEditing){
-        ofRemoveListener(ofEvents().keyPressed, this, &ofxTextInputField::keyPressed);
-        ofSendMessage(TEXTFIELD_IS_INACTIVE);
-        ofNotifyEvent(textChanged, text, this);
-        isEditing = false;
-        drawCursor = false;
-    }
-}
-
-void ofxTextInputField::setFont(OFX_TEXTFIELD_FONT_RENDERER& font){
-	if(fontRef->isBitmapFont()) {
-		delete fontRef;
-	}
-	fontRef = new ofxTextInput::TypedFontRenderer(&font);
-}
-
-bool ofxTextInputField::getIsEditing(){
-    return isEditing;
-}
-
-bool ofxTextInputField::getIsEnabled(){
-	return isEnabled;
-}
-
-void ofxTextInputField::draw() {
-    
-	ofPushMatrix();
-	ofTranslate(bounds.x, bounds.y);
-
-	
-	
-	
-
-
-	
-	if(selecting) {
-		
-
-		ofPushStyle();
-		// argh, splitting all the time.
-		vector<string> lines = ofSplitString(text, "\n");
-		int beginCursorX, beginCursorY;
-		int endCursorX, endCursorY;
-		getCursorCoords(selectionBegin, beginCursorX, beginCursorY);
-		getCursorCoords(selectionEnd, endCursorX, endCursorY);
-
-		float startX = fontRef->stringWidth(lines[beginCursorY].substr(0,beginCursorX));
-		float endX = fontRef->stringWidth(lines[endCursorY].substr(0, endCursorX));
-
-		ofSetHexColor(0x6988db);
-		ofFill();
-		
-		if(beginCursorY==endCursorY) {
-			// single line selection
-			ofRect(HORIZONTAL_PADDING + startX, VERTICAL_PADDING + fontRef->getLineHeight()*beginCursorY,
-				   endX - startX, fontRef->getLineHeight());
-		} else {
-			
-			// multiline selection.
-			// do first line to the end
-			ofRect(HORIZONTAL_PADDING + startX, VERTICAL_PADDING + fontRef->getLineHeight()*beginCursorY,
-				   fontRef->stringWidth(lines[beginCursorY]) - startX,
-				   fontRef->getLineHeight()
-			);
-			
-			// loop through entirely selected lines
-			for(int i = beginCursorY + 1; i < endCursorY; i++) {
-				ofRect(HORIZONTAL_PADDING, VERTICAL_PADDING + fontRef->getLineHeight()*i,
-					   fontRef->stringWidth(lines[i]),
-					   fontRef->getLineHeight()
-				);
-			}
-			// do last line up to endX
-			ofRect(HORIZONTAL_PADDING, VERTICAL_PADDING + fontRef->getLineHeight()*endCursorY,
-					endX, fontRef->getLineHeight()
-			);
-		}
-		ofPopStyle();
-		
-		
-		//draw cursor line
-    } else if(drawCursor) {
-        ofPushStyle();
-		// cursor should only blink when its been idle, and animation
-		// should be a clipped sine wave
-        float timeFrac = 0.5 * ofClamp(cos(6.0f * (ofGetElapsedTimef()-lastTimeCursorMoved))*4, -1, 1) + 0.5;
-        
-        ofColor col = ofGetStyle().color;
-		ofSetColor(col.r * timeFrac, col.g * timeFrac, col.b * timeFrac);
-		
-		
-		// argh, splitting all the time.
-		vector<string> lines = ofSplitString(text, "\n");
-		
-		
-		// calculate this every loop.
-		int cursorX, cursorY;
-        getCursorCoords(cursorPosition, cursorX, cursorY);
-	//	printf("Pos: %d    X: %d   Y: %d\n", cursorPosition, cursorX, cursorY);
-		int cursorPos = HORIZONTAL_PADDING + fontRef->stringWidth(lines[cursorY].substr(0,cursorX));
-        
-        
-		int cursorTop = VERTICAL_PADDING + fontRef->getLineHeight()*cursorY;
-		int cursorBottom = cursorTop + fontRef->getLineHeight();
-		
-		
-		
-		
-		ofSetLineWidth(1.0f);
-		//TODO: multiline with fontRef
-        ofLine(cursorPos, cursorTop,
-			   cursorPos, cursorBottom);
-        ofPopStyle();
-    }
-	
-	fontRef->drawString(text, HORIZONTAL_PADDING, fontRef->getLineHeight()+VERTICAL_PADDING);
-	
-	
-	
-	ofPopMatrix();
-}
-
-void ofxTextInputField::getCursorCoords(int pos, int &cursorX, int &cursorY) {
-	vector<string> lines = ofSplitString(text, "\n");
-	
-	
-	int c = 0;
-	
-	
-	for(int i = 0; i < lines.size(); i++) {
-		if(pos<=c+lines[i].size()) {
-			cursorY = i;
-			cursorX = pos - c;
-			return;
-		}
-		c += lines[i].size() + 1;
-	}
-
-}
-
-/*
-void ofxTextInputField::setCursorPositionFromXY() {
-	cursorPosition = cursorx;
-	vector<string> parts = ofSplitString(text, "\n");
-	for(int i = 0 ; i < cursory; i++) {
-		cursorPosition += parts[i].size() + i; // for carriage returns
-	}
-}
-
-*/
-int ofxTextInputField::getCursorPositionFromMouse(int x, int y) {
-	int cursorX = 0;
-	int cursorY = 0;
-	float pos = y - bounds.y - VERTICAL_PADDING;
-	pos /= fontRef->getLineHeight();
-	int line = pos;
-	cursorY = line;
-	
-	vector<string> lines = ofSplitString(text, "\n");
-	if(cursorY>=lines.size()-1) cursorY = lines.size()-1;
-	if(lines.size()>0) {
-		cursorX = fontRef->getPosition(lines[cursorY], x - HORIZONTAL_PADDING - bounds.x);
-	}
-	int c = 0;
-	for(int i = 0; i < cursorY; i++) {
-		c += lines[i].size() + 1;
-	}
-	c += cursorX;
-	return c;
-}
-
-
-void ofxTextInputField::mousePressed(ofMouseEventArgs& args){
-	mouseDownInRect = bounds.inside(args.x, args.y);
-	if(mouseDownInRect) {
-		cursorPosition = getCursorPositionFromMouse(args.x, args.y);
-		lastTimeCursorMoved = ofGetElapsedTimef();
-		selecting = false;
-	}
-}
-
-
-void ofxTextInputField::mouseDragged(ofMouseEventArgs& args) {
-	if(bounds.inside(args.x, args.y)) {
-		int pos = getCursorPositionFromMouse(args.x, args.y);
-		if(pos!=cursorPosition) {
-			selecting = true;
-			selectionBegin = MIN(pos, cursorPosition);
-			selectionEnd = MAX(pos, cursorPosition);
-			
-		} else {
-			selecting = false;
-		}
-	}
-}
-
-void ofxTextInputField::mouseReleased(ofMouseEventArgs& args){
-
-    if(bounds.inside(args.x, args.y)) {
-        if(!isEditing && mouseDownInRect){
-	        beginEditing();
-        }
-    }
-    else if(isEditing){
-		endEditing();
-	}
-}
-
-
-#ifdef OF_VERSION_MINOR
-#if OF_VERSION_MINOR>=8 || OF_VERSION_MAJOR>0
-#define USE_GLFW_CLIPBOARD
-
-#endif
-#endif
-
-
-#ifdef USE_GLFW_CLIPBOARD
-
-
-#if (_MSC_VER)
-#include <GLFW/glfw3.h>
-#else
-#include "GLFW/glfw3.h"
-#endif
-
-
-void ofxTextInputField::setClipboard(string clippy)
-{
-	glfwSetClipboardString( (GLFWwindow*) ofGetWindowPtr()->getCocoaWindow(), clippy.c_str());
-}
-
-string ofxTextInputField::getClipboard()
-{
-	const char *clip = glfwGetClipboardString((GLFWwindow*) ofGetWindowPtr()->getCocoaWindow());
-	if(clip!=NULL) {
-		return string(clip);
-	} else {
-		return "";
-	}
-
-}
-
-#endif
-
-void ofxTextInputField::keyPressed(ofKeyEventArgs& args) {
-	//ew: add charachter (non unicode sorry!)
-	//jg: made a step closer to this with swappable renderers and ofxFTGL -- but need unicode text input...
-	lastTimeCursorMoved = ofGetElapsedTimef();
-	int key = args.key;
-	
-	
-    if(key == OF_KEY_SHIFT) {
-        isShifted = true;
-    }
-    
-    if(key == 4352) {
-        isCommand = true;
-    }
-	
-    #ifdef USE_GLFW_CLIPBOARD
-    if(key == 'c' && isCommand ) {
-        setClipboard(text.substr(selectionBegin, selectionEnd - selectionBegin));
-        return;
-    }
-	
-    if(key == 'v' && isCommand ) {
-        text.insert(cursorPosition, getClipboard());
-        return;
-    }
-	#endif
-    
-	if ((key >=32 && key <=126) || key=='\t' || key==OF_KEY_RETURN) {
-		if(selecting) {
-			text.erase(text.begin() + selectionBegin,
-					   text.begin() + selectionEnd
-					   );
-			cursorPosition = selectionBegin;
-			selecting = false;
-		}
-	}
-			
-			
-	if (key == OF_KEY_RETURN) {
-		if(!multiline) {
-			endEditing();
-			return;
-		}
-		text.insert(text.begin()+cursorPosition, '\n');
-		cursorPosition++;
-		
-
-		if(autoTab) {
-			// how much whitespace is there on the previous line?
-			int xx, yy;
-			getCursorCoords(cursorPosition, xx, yy);
-			vector<string> lines = ofSplitString(text, "\n");
-			if(yy>0) {
-				
-				// collect all the whitespace on the previous line.
-				string previousWhitespace = "";
-				string previousLine = lines[yy-1];
-				int pos = 0;
-				for(int i = 0; i < previousLine.size(); i++) {
-					if(previousLine[i]==' ' || previousLine[i]=='\t') {
-						previousWhitespace += previousLine[i];
-					} else {
-						break;
-					}
-				}
-				// if we have a curly brace as the last char on the previous line
-				// increase the indentation
-				if(previousLine[previousLine.size()-1]=='{') {
-					if(previousWhitespace=="") {
-						previousWhitespace = "\t";
-					} else {
-						previousWhitespace += previousWhitespace[previousWhitespace.size()-1];
-					}
-				}
-				text = text.insert(cursorPosition, previousWhitespace);
-				cursorPosition += previousWhitespace.size();
-			}
-		}
-
-        return;
-	}
-	
-	if ((key >=32 && key <=126) || key=='\t') {
-        
-        if(isShifted) {
-            
-            char toInsert;
-            if( !(key > 96 && key < 123) && !(key > 65 && key < 90) && shiftMap.find(key) != shiftMap.end() ) {
-                toInsert = shiftMap[key];//toInsert = key - 32;
-            } else {
-                toInsert = key;
-            }
-            
-            text.insert(text.begin()+cursorPosition, toInsert);
-        } else {
-            text.insert(text.begin()+cursorPosition, key);
-        }
-		cursorPosition++;
-	}
-	
-	
-	if (key==OF_KEY_BACKSPACE) {
-		if(selecting) {
-			text.erase(text.begin() + selectionBegin,
-					   text.begin() + selectionEnd
-			);
-			cursorPosition = selectionBegin;
-			selecting = false;
-		} else {
-			if (cursorPosition>0) {
-				text.erase(text.begin()+cursorPosition-1);
-				--cursorPosition;
-			}
-		}
-	}
-	
-	if (key==OF_KEY_DEL) {
-		if(selecting) {
-			text.erase(text.begin() + selectionBegin,
-					   text.begin() + selectionEnd
-					   );
-			cursorPosition = selectionBegin;
-			selecting = false;
-		} else {
-			if (text.size() > cursorPosition) {
-				text.erase(text.begin()+cursorPosition);
-			}
-		}
-	}
-	
-	if (key==OF_KEY_LEFT){
-		if(selecting) {
-			cursorPosition = selectionBegin;
-			selecting = false;
-			
-		} else {
-			if (cursorPosition>0){
-				--cursorPosition;
-			}
-		}
-	}
-	
-	
-	
-	if (key==OF_KEY_RIGHT){
-		if(selecting) {
-			cursorPosition = selectionEnd;
-			selecting = false;
-		} else {
-			if (cursorPosition<text.size()){
-				++cursorPosition;
-			}
-		}
-	}
-	
-	
-	if (key==OF_KEY_UP){
-		if(selecting) {
-			cursorPosition = selectionBegin;
-			selecting = false;
-			
-		} else {
-			if (cursorPosition>0) {
-				int xx, yy;
-				getCursorCoords(cursorPosition, xx, yy);
-				if(yy>0) {
-					yy--;
-					vector<string> lines = ofSplitString(text, "\n");
-					xx = MIN(lines[yy].size()-1, xx);
-					cursorPosition = xx;
-					for(int i = 0; i < yy; i++) cursorPosition += lines[i].size()+1;
-					printf("Cursor position: %d\n", cursorPosition);
-				} else {
-					cursorPosition = 0;
-				}
-			}
-		}
-	}
-	
-	
-	
-	if (key==OF_KEY_DOWN){
-		if(selecting) {
-			cursorPosition = selectionEnd;
-			selecting = false;
-		} else {
-			int xx, yy;
-			getCursorCoords(cursorPosition, xx, yy);
-			vector<string> lines = ofSplitString(text, "\n");
-			yy++;
-			if(yy<lines.size()-1) {
-				
-				xx = MIN(lines[yy].size()-1, xx);
-				cursorPosition = xx;
-				for(int i = 0; i < yy; i++) cursorPosition += lines[i].size()+1;
-				printf("Cursor position: %d\n", cursorPosition);
-			} else {
-				cursorPosition = text.size()-1;
-			}
-		}
-	}
-	
-	
-	
-	
-}
-
-void ofxTextInputField::keyReleased(ofKeyEventArgs &a)
-{
-    
-    if(a.key == 4352) {
-        isCommand = false;
-    }
-
-    if(a.key == OF_KEY_SHIFT) {
-        isShifted = false;
-    }
-}
-
-void ofxTextInputField::clear() {
-	text.clear();
-	cursorPosition = 0;
-}
+//
+//  textInput.cpp
+//
+//	MIT license
+//	http://www.opensource.org/licenses/mit-license.php
+//
+
+#include "ofxTextInputField.h"
+
+//----------
+ofxTextInputField::ofxTextInputField() {
+    shiftMap[44] = '<';
+    shiftMap[45] = '_';
+    shiftMap[46] = '>';
+    shiftMap[48] = ')';
+    shiftMap[49] = '!';
+    shiftMap[50] = '@';
+    shiftMap[51] = '#';
+    shiftMap[52] = '$';
+    shiftMap[53] = '%';
+    shiftMap[54] = '^';
+    shiftMap[55] = '&';
+    shiftMap[56] = '*';
+    shiftMap[57] = '(';
+    shiftMap[61] = '+';
+    shiftMap[63] = '/';
+    shiftMap[91] = '{';
+    shiftMap[92] = '|';
+    shiftMap[93] = '}';
+    shiftMap[96] = '~';
+    
+	text = "";
+	multiline = false;
+	autoTab = true;
+	cursorPosition = 0;
+	selectionBegin = 0;
+	selectionEnd = 0;
+	selecting = false;
+	
+	fontRef = NULL;
+    this->enabled = false;
+	this->editing = false;
+	this->useListeners = false;
+	this->hasListeners = false;
+    bounds = ofRectangle(0,0,100,22);
+	
+    drawCursor = false;
+	autoClear = false;
+	mouseDownInRect = false;
+
+	fontRef = new ofxTextInput::BitmapFontRenderer();
+	
+	verticalPadding = 3;
+	horizontalPadding = 3;
+	lastTimeCursorMoved = ofGetElapsedTimef();
+}
+
+//----------
+ofxTextInputField::~ofxTextInputField(){
+	this->removeListeners();
+}
+
+//----------
+void ofxTextInputField::setup(bool enableListeners){
+	enable();
+	this->setUseListeners(enableListeners);
+}
+
+//----------
+void ofxTextInputField::setFont(OFX_TEXTFIELD_FONT_RENDERER & font){
+	if (fontRef->isBitmapFont()) {
+		delete fontRef;
+	}
+	fontRef = new ofxTextInput::TypedFontRenderer(&font);
+}
+
+//----------
+ofxTextInput::FontRenderer * ofxTextInputField::getFontRenderer() {
+	return this->fontRef;
+}
+
+//----------
+void ofxTextInputField::enable(){
+	if(!this->enabled){
+		this->enabled = true;
+	}
+}
+
+//----------
+void ofxTextInputField::disable(){
+	if(this->editing){
+		endEditing();
+	}
+	if(this->enabled){
+		this->enabled = false;
+    }
+	
+}
+
+//----------
+bool ofxTextInputField::isEnabled() const {
+	return this->enabled;
+}
+
+//----------
+void ofxTextInputField::beginEditing() {
+    if(!this->editing){
+        ofSendMessage(TEXTFIELD_IS_ACTIVE);
+        this->editing = true;
+        drawCursor = true;
+		if(autoClear) {
+			clear();
+		}
+    }
+}
+
+//----------
+void ofxTextInputField::endEditing() {
+    if(this->editing){
+        ofSendMessage(TEXTFIELD_IS_INACTIVE);
+        this->editing = false;
+        this->drawCursor = false;
+		this->shiftHeld = false;
+		this->commandHeld = false;
+    }
+}
+
+//----------
+bool ofxTextInputField::isEditing() const {
+    return this->editing;
+}
+
+//----------
+void ofxTextInputField::setUseListeners(bool useListeners) {
+	if (useListeners) {
+		this->addListeners();
+	} else {
+		this->removeListeners();
+	}
+}
+
+//----------
+bool ofxTextInputField::getUseListeners() const {
+	return this->useListeners;
+}
+
+//----------
+void ofxTextInputField::draw() {
+	ofPushMatrix();
+	ofTranslate(bounds.x, bounds.y);
+
+	if(selecting) {
+		ofPushStyle();
+		// argh, splitting all the time.
+		vector<string> lines = ofSplitString(text, "\n");
+		int beginCursorX, beginCursorY;
+		int endCursorX, endCursorY;
+		getCursorCoords(selectionBegin, beginCursorX, beginCursorY);
+		getCursorCoords(selectionEnd, endCursorX, endCursorY);
+
+		float startX = fontRef->stringWidth(lines[beginCursorY].substr(0,beginCursorX));
+		float endX = fontRef->stringWidth(lines[endCursorY].substr(0, endCursorX));
+
+		ofSetHexColor(0x6988db);
+		ofFill();
+		
+		if(beginCursorY==endCursorY) {
+			// single line selection
+			ofRect(horizontalPadding + startX, verticalPadding + fontRef->getLineHeight()*beginCursorY,
+				   endX - startX, fontRef->getLineHeight());
+		} else {
+			
+			// multiline selection.
+			// do first line to the end
+			ofRect(horizontalPadding + startX, verticalPadding + fontRef->getLineHeight()*beginCursorY,
+				   fontRef->stringWidth(lines[beginCursorY]) - startX,
+				   fontRef->getLineHeight()
+			);
+			
+			// loop through entirely selected lines
+			for(int i = beginCursorY + 1; i < endCursorY; i++) {
+				ofRect(horizontalPadding, verticalPadding + fontRef->getLineHeight()*i,
+					   fontRef->stringWidth(lines[i]),
+					   fontRef->getLineHeight()
+				);
+			}
+			// do last line up to endX
+			ofRect(horizontalPadding, verticalPadding + fontRef->getLineHeight()*endCursorY,
+					endX, fontRef->getLineHeight()
+			);
+		}
+		ofPopStyle();
+		
+		
+		//draw cursor line
+    } else if(drawCursor) {
+        ofPushStyle();
+		// cursor should only blink when its been idle, and animation
+		// should be a clipped sine wave
+        float timeFrac = 0.5 * ofClamp(cos(6.0f * (ofGetElapsedTimef()-lastTimeCursorMoved))*4, -1, 1) + 0.5;
+        
+        ofColor col = ofGetStyle().color;
+		ofSetColor(col.r * timeFrac, col.g * timeFrac, col.b * timeFrac);
+		
+		
+		// argh, splitting all the time.
+		vector<string> lines = ofSplitString(text, "\n");
+		
+		
+		// calculate this every loop.
+		int cursorX, cursorY;
+        getCursorCoords(cursorPosition, cursorX, cursorY);
+	//	printf("Pos: %d    X: %d   Y: %d\n", cursorPosition, cursorX, cursorY);
+		int cursorPos = horizontalPadding + fontRef->stringWidth(lines[cursorY].substr(0, cursorX));
+        
+		int cursorTop = verticalPadding + fontRef->getLineHeight()*cursorY;
+		int cursorBottom = cursorTop + fontRef->getLineHeight();
+		
+		ofSetLineWidth(1.0f);
+		//TODO: multiline with fontRef
+        ofLine(cursorPos, cursorTop,
+			   cursorPos, cursorBottom);
+        ofPopStyle();
+    }
+	
+	fontRef->drawString(text, horizontalPadding, fontRef->getLineHeight() + verticalPadding);
+	ofPopMatrix();
+}
+
+//----------
+void ofxTextInputField::clear(){
+	text.clear();
+	cursorPosition = 0;
+	this->notifyTextChange();
+}
+
+//----------
+void ofxTextInputField::keyPressed(ofKeyEventArgs& args) {
+	//ew: add charachter (non unicode sorry!)
+	//jg: made a step closer to this with swappable renderers and ofxFTGL -- but need unicode text input...
+
+	//if we're not focused, then ignore the keypress
+	if (!this->editing) {
+		return;
+	}
+
+	lastTimeCursorMoved = ofGetElapsedTimef();
+	int key = args.key;
+	
+    if(key == OF_KEY_SHIFT) {
+		this->shiftHeld = true;
+    }
+    
+    if(key == 4352) {
+		this->commandHeld = true;
+    }
+	
+#if defined(USE_GLFW_CLIPBOARD) && defined(TARGET_OSX)
+    if(key == 'c' && this->commandHeld) {
+        setClipboard(text.substr(selectionBegin, selectionEnd - selectionBegin));
+        return;
+    }
+	
+	if(key == 'v' && this->commandHeld) {
+        text.insert(cursorPosition, getClipboard());
+        return;
+    }
+	#endif
+    
+	if ((key >=32 && key <=126) || key=='\t' || key==OF_KEY_RETURN) {
+		if(selecting) {
+			text.erase(text.begin() + selectionBegin,
+					   text.begin() + selectionEnd
+					   );
+			cursorPosition = selectionBegin;
+			selecting = false;
+			this->notifyTextChange();
+		}
+	}
+			
+	if (key == OF_KEY_RETURN) {
+		if(!multiline) {
+			endEditing();
+			this->notifyHitReturn();
+			return;
+		}
+		text.insert(text.begin()+cursorPosition, '\n');
+		cursorPosition++;
+
+		if(autoTab) {
+			// how much whitespace is there on the previous line?
+			int xx, yy;
+			getCursorCoords(cursorPosition, xx, yy);
+			vector<string> lines = ofSplitString(text, "\n");
+			if(yy>0) {
+				// collect all the whitespace on the previous line.
+				string previousWhitespace = "";
+				string previousLine = lines[yy-1];
+				int pos = 0;
+				for(int i = 0; i < previousLine.size(); i++) {
+					if(previousLine[i]==' ' || previousLine[i]=='\t') {
+						previousWhitespace += previousLine[i];
+					} else {
+						break;
+					}
+				}
+				// if we have a curly brace as the last char on the previous line
+				// increase the indentation
+				if(previousLine[previousLine.size()-1]=='{') {
+					if(previousWhitespace=="") {
+						previousWhitespace = "\t";
+					} else {
+						previousWhitespace += previousWhitespace[previousWhitespace.size()-1];
+					}
+				}
+				text = text.insert(cursorPosition, previousWhitespace);
+				cursorPosition += previousWhitespace.size();
+			}
+		}
+		this->notifyTextChange();
+		return;
+	}
+	
+	if ((key >=32 && key <=126) || key=='\t') {
+        if(this->shiftHeld) {
+            
+            char toInsert;
+            if( !(key > 96 && key < 123) && !(key > 65 && key < 90) && shiftMap.find(key) != shiftMap.end() ) {
+                toInsert = shiftMap[key];//toInsert = key - 32;
+            } else {
+                toInsert = key;
+            }
+            
+            text.insert(text.begin()+cursorPosition, toInsert);
+        } else {
+            text.insert(text.begin()+cursorPosition, key);
+        }
+		cursorPosition++;
+		this->notifyTextChange();
+	}
+	
+	if (key==OF_KEY_BACKSPACE) {
+		if(selecting) {
+			text.erase(text.begin() + selectionBegin,
+					   text.begin() + selectionEnd
+			);
+			cursorPosition = selectionBegin;
+			selecting = false;
+			this->notifyTextChange();
+		}
+		else {
+			if (cursorPosition>0) {
+				text.erase(text.begin()+cursorPosition-1);
+				--cursorPosition;
+				this->notifyTextChange();
+			}
+		}
+	}
+	
+	if (key==OF_KEY_DEL) {
+		if(selecting) {
+			text.erase(text.begin() + selectionBegin,
+					   text.begin() + selectionEnd
+					   );
+			cursorPosition = selectionBegin;
+			selecting = false;
+			this->notifyTextChange();
+		}
+		else {
+			if (text.size() > cursorPosition) {
+				text.erase(text.begin()+cursorPosition);
+				this->notifyTextChange();
+			}
+		}
+	}
+	
+	if (key==OF_KEY_LEFT){
+		if(selecting) {
+			cursorPosition = selectionBegin;
+			selecting = false;
+			
+		} else {
+			if (cursorPosition>0){
+				--cursorPosition;
+			}
+		}
+	}
+	
+	if (key==OF_KEY_RIGHT){
+		if(selecting) {
+			cursorPosition = selectionEnd;
+			selecting = false;
+		} else {
+			if (cursorPosition<text.size()){
+				++cursorPosition;
+			}
+		}
+	}
+	
+	if (key==OF_KEY_UP){
+		if(selecting) {
+			cursorPosition = selectionBegin;
+			selecting = false;
+			
+		} else if (this->multiline) {
+			if (cursorPosition>0) {
+				int xx, yy;
+				getCursorCoords(cursorPosition, xx, yy);
+				if(yy>0) {
+					yy--;
+					vector<string> lines = ofSplitString(text, "\n");
+					xx = MIN(lines[yy].size()-1, xx);
+					cursorPosition = xx;
+					for(int i = 0; i < yy; i++) cursorPosition += lines[i].size()+1;
+					printf("Cursor position: %d\n", cursorPosition);
+				} else {
+					cursorPosition = 0;
+				}
+			}
+		}
+	}
+	
+	if (key==OF_KEY_DOWN){
+		if(selecting) {
+			cursorPosition = selectionEnd;
+			selecting = false;
+		} else if (this->multiline) {
+			int xx, yy;
+			getCursorCoords(cursorPosition, xx, yy);
+			vector<string> lines = ofSplitString(text, "\n");
+			yy++;
+			if(yy<lines.size()-1) {
+				
+				xx = MIN(lines[yy].size()-1, xx);
+				cursorPosition = xx;
+				for(int i = 0; i < yy; i++) cursorPosition += lines[i].size()+1;
+				printf("Cursor position: %d\n", cursorPosition);
+			} else {
+				cursorPosition = text.size()-1;
+			}
+		}
+	}
+}
+
+//----------
+void ofxTextInputField::keyReleased(ofKeyEventArgs &a){
+	//if we're not focused, then ignore the keypress
+	if (!this->editing) {
+		return;
+	}
+
+    if(a.key == 4352) {
+        this->commandHeld = false;
+    }
+
+    if(a.key == OF_KEY_SHIFT) {
+        this->shiftHeld = false;
+    }
+}
+
+//----------
+void ofxTextInputField::mousePressed(ofMouseEventArgs& args) {
+	if (!this->enabled) {
+		return;
+	}
+
+	mouseDownInRect = bounds.inside(args.x, args.y);
+	if (mouseDownInRect) {
+		cursorPosition = getCursorPositionFromMouse(args.x, args.y);
+		lastTimeCursorMoved = ofGetElapsedTimef();
+		selecting = false;
+	}
+}
+
+//----------
+void ofxTextInputField::mouseDragged(ofMouseEventArgs& args) {
+	if (!this->enabled) {
+		return;
+	}
+
+	if (bounds.inside(args.x, args.y)) {
+		int pos = getCursorPositionFromMouse(args.x, args.y);
+		if (pos != cursorPosition) {
+			selecting = true;
+			selectionBegin = MIN(pos, cursorPosition);
+			selectionEnd = MAX(pos, cursorPosition);
+		}
+		else {
+			selecting = false;
+		}
+	}
+}
+
+//----------
+void ofxTextInputField::mouseReleased(ofMouseEventArgs& args) {
+	if (!this->enabled) {
+		return;
+	}
+
+	if (bounds.inside(args.x, args.y)) {
+		if (!this->editing && mouseDownInRect) {
+			beginEditing();
+		}
+	}
+	else {
+		endEditing();
+	}
+}
+
+//----------
+float ofxTextInputField::getVerticalPadding() const {
+	return this->verticalPadding;
+}
+
+//----------
+float ofxTextInputField::getHorizontalPadding() const {
+	return this->horizontalPadding;
+}
+
+//----------
+void ofxTextInputField::setVerticalPadding(float vp){
+    verticalPadding = vp;
+}
+//----------
+void ofxTextInputField::setHorizontalPadding(float hp){
+    horizontalPadding = hp;
+}
+
+
+
+
+#ifdef USE_GLFW_CLIPBOARD
+
+#if (_MSC_VER)
+#include <GLFW/glfw3.h>
+#else
+#include "GLFW/glfw3.h"
+#endif
+
+//----------
+void ofxTextInputField::setClipboard(string clippy){
+	glfwSetClipboardString((GLFWwindow*)ofGetWindowPtr()->getCocoaWindow(), clippy.c_str());
+}
+
+//----------
+string ofxTextInputField::getClipboard(){
+	const char *clip = glfwGetClipboardString((GLFWwindow*)ofGetWindowPtr()->getCocoaWindow());
+	if (clip != NULL) {
+		return string(clip);
+	}
+	else {
+		return "";
+	}
+
+}
+
+#endif
+
+
+//----------
+void ofxTextInputField::notifyTextChange() {
+	ofNotifyEvent(this->onTextChange, this->text, this);
+}
+
+//----------
+void ofxTextInputField::notifyHitReturn() {
+	ofNotifyEvent(this->onHitReturn, this->text, this);
+}
+
+//----------
+void ofxTextInputField::getCursorCoords(int pos, int &cursorX, int &cursorY) {
+	vector<string> lines = ofSplitString(text, "\n");
+
+	int c = 0;
+	for (int i = 0; i < lines.size(); i++) {
+		if (pos <= c + lines[i].size()) {
+			cursorY = i;
+			cursorX = pos - c;
+			return;
+		}
+		c += lines[i].size() + 1;
+	}
+}
+
+//----------
+int ofxTextInputField::getCursorPositionFromMouse(int x, int y) {
+	int cursorX = 0;
+	int cursorY = 0;
+	float pos = y - bounds.y - verticalPadding;
+	pos /= fontRef->getLineHeight();
+	int line = pos;
+	cursorY = line;
+
+	vector<string> lines = ofSplitString(text, "\n");
+	if (cursorY >= lines.size() - 1) cursorY = lines.size() - 1;
+	if (lines.size()>0) {
+		cursorX = fontRef->getPosition(lines[cursorY], x - horizontalPadding - bounds.x);
+	}
+	int c = 0;
+	for (int i = 0; i < cursorY; i++) {
+		c += lines[i].size() + 1;
+	}
+	c += cursorX;
+	return c;
+}
+
+//----------
+void ofxTextInputField::addListeners() {
+	if (this->hasListeners) {
+		return;
+	}
+	ofAddListener(ofEvents().keyPressed, this, &ofxTextInputField::keyPressed);
+	ofAddListener(ofEvents().keyReleased, this, &ofxTextInputField::keyReleased);
+	ofAddListener(ofEvents().mousePressed, this, &ofxTextInputField::mousePressed);
+	ofAddListener(ofEvents().mouseDragged, this, &ofxTextInputField::mouseDragged);
+	ofAddListener(ofEvents().mouseReleased, this, &ofxTextInputField::mouseReleased);
+}
+
+//----------
+void ofxTextInputField::removeListeners() {
+	if (!this->hasListeners) {
+		return;
+	}
+	ofRemoveListener(ofEvents().keyPressed, this, &ofxTextInputField::keyPressed);
+	ofAddListener(ofEvents().keyReleased, this, &ofxTextInputField::keyReleased);
+	ofRemoveListener(ofEvents().mousePressed, this, &ofxTextInputField::mousePressed);
+	ofRemoveListener(ofEvents().mouseDragged, this, &ofxTextInputField::mouseDragged);
+	ofRemoveListener(ofEvents().mouseReleased, this, &ofxTextInputField::mouseReleased);
+}
diff --git a/src/ofxTextInputField.h b/src/ofxTextInputField.h
index e697542..5434803 100755
--- a/src/ofxTextInputField.h
+++ b/src/ofxTextInputField.h
@@ -1,111 +1,131 @@
-//
-//  textInput.h
-//  textInput
-//
-//  Created by Elliot Woods on 09/12/2011.
-//  Copyright 2011 Kimchi and Chips.
-//
-//  modified by James George 12/2/2011
-//  modified by Momo the Monster 7/10/2012
-//  swappable fonts added by James George 9/11/2012
-//
-//	MIT license
-//	http://www.opensource.org/licenses/mit-license.php
-//
-
-#pragma once
-
-#include "ofMain.h"
-
-//For lack of a type abstraction, this lets you #define a font renderer so
-//(like ofxFTGL or ofxFont)
-//to use ofxFTGL use somethinglike this:
-//#define OFX_TEXTFIELD_FONT_RENDERER ofxFTGLFont
-//#define OFX_TEXTFIELD_FONT_RENDERER "ofxFTGLFont.h"
-
-#ifndef OFX_TEXTFIELD_FONT_RENDERER
-#define OFX_TEXTFIELD_FONT_RENDERER ofTrueTypeFont
-#endif 
-
-#ifdef OFX_TEXTFIELD_FONT_INCLUDE
-#include OFX_TEXTFIELD_FONT_INCLUDE
-#endif
-
-#define TEXTFIELD_IS_ACTIVE "textfieldIsActive"
-#define TEXTFIELD_IS_INACTIVE "textfieldIsInactive"
-
-
-// TODO: wrapping
-#include "ofxTextInputFieldFontRenderer.h"
-
-class ofxTextInputField {
-  public:
-	ofxTextInputField();
-	virtual ~ofxTextInputField();
-	//swap in a font!
-	void setFont(OFX_TEXTFIELD_FONT_RENDERER& font);
-    
-    void setup();
-	
-	void enable();
-	void disable();
-    bool getIsEnabled();
-	
-	bool getIsEditing();
-	void beginEditing();
-	void endEditing();
-	
-    //can be set manually or otherwise is controlled by enable/disable
-    bool drawCursor;
-    
-    ofRectangle bounds;
-	
-    void draw();
-	void clear();
-	
-	string text;
-	int cursorPosition;
-	
-	int selectionBegin;
-	int selectionEnd;
-	bool selecting;
-	
-	ofEvent<string> textChanged;
-	void keyPressed(ofKeyEventArgs &a);
-    void keyReleased(ofKeyEventArgs &a);
-	
-	bool autoClear;
-	bool autoTab;
-	
-	bool multiline;
-    
-	#ifdef USE_GLFW_CLIPBOARD
-    void setClipboard(string clippy);
-    string getClipboard();
-	#endif
-	
-  protected:
-	float lastTimeCursorMoved;
-	int VERTICAL_PADDING;
-	int HORIZONTAL_PADDING;
-	ofxTextInput::FontRenderer* fontRef;
-	
-    bool 	isEnabled;
-	bool	isEditing;
-	bool	mouseDownInRect;
-	void    mousePressed(ofMouseEventArgs& args);
-    void    mouseDragged(ofMouseEventArgs& args);
-	void    mouseReleased(ofMouseEventArgs& args);
-	
-	
-	//int getLineForPosition(int pos);
-
-	//void setCursorPositionFromXY();
-	//void setCursorFromMouse(int x, int y);
-	//void setCursorXYFromPosition();
-	void getCursorCoords(int pos, int &cursorX, int &cursorY);
-	int getCursorPositionFromMouse(int x, int y);
-    
-    bool isShifted, isCommand;
-    map<int, char> shiftMap;
-};
+//
+//  textInput.h
+//  textInput
+//
+//  Created by Elliot Woods on 09/12/2011.
+//  modified by James George 12/2/2011
+//  modified by Momo the Monster 7/10/2012
+//  swappable fonts added by James George 9/11/2012
+//	refactoring and modifications by Elliot Woods on 30/11/2014
+//
+//	MIT license
+//	http://www.opensource.org/licenses/mit-license.php
+//
+
+// jg : TODO: text wrapping
+
+#pragma once
+
+#include "ofMain.h"
+
+//For lack of a type abstraction, this lets you #define a font renderer so
+//(like ofxFTGL or ofxFont)
+//to use ofxFTGL use somethinglike this:
+//#define OFX_TEXTFIELD_FONT_RENDERER ofxFTGLFont
+//#define OFX_TEXTFIELD_FONT_INCLUDE "ofxFTGLFont.h"
+
+#ifndef OFX_TEXTFIELD_FONT_RENDERER
+#define OFX_TEXTFIELD_FONT_RENDERER ofTrueTypeFont
+#endif 
+
+#ifdef OFX_TEXTFIELD_FONT_INCLUDE
+#include OFX_TEXTFIELD_FONT_INCLUDE
+#endif
+
+#define TEXTFIELD_IS_ACTIVE "textfieldIsActive"
+#define TEXTFIELD_IS_INACTIVE "textfieldIsInactive"
+
+#include "ofxTextInputFieldFontRenderer.h"
+
+class ofxTextInputField {
+  public:
+	ofxTextInputField();
+	virtual ~ofxTextInputField();
+
+	/// Always call this first
+    void setup(bool enableListeners = true);
+
+	/// Change the font used to draw the text
+	void setFont(OFX_TEXTFIELD_FONT_RENDERER & font);
+	ofxTextInput::FontRenderer * getFontRenderer();
+
+	void enable();
+	void disable();
+    bool isEnabled() const;
+	
+	/// Whether the text box is focused and capturing keys
+	void beginEditing();
+	void endEditing();
+	bool isEditing() const;
+
+	void setUseListeners(bool);
+	bool getUseListeners() const;
+
+	/// Draw inside this->bounds
+	void draw();
+
+	/// Clear text
+	void clear();
+
+    //can be set manually or otherwise is controlled by enable/disable
+    bool drawCursor;
+	
+	string text;
+
+	ofRectangle bounds;
+	int cursorPosition;
+	int selectionBegin;
+	int selectionEnd;
+	bool selecting;
+	
+	ofEvent<string> onTextChange;
+	ofEvent<string> onHitReturn;
+
+	void keyPressed(ofKeyEventArgs &a);
+    void keyReleased(ofKeyEventArgs &a);
+	void mousePressed(ofMouseEventArgs& args);
+	void mouseDragged(ofMouseEventArgs& args);
+	void mouseReleased(ofMouseEventArgs& args);
+
+	bool autoClear;
+	bool autoTab;
+	
+	bool multiline;
+    
+	float getVerticalPadding() const;
+	float getHorizontalPadding() const;
+    
+    void setVerticalPadding(float vp);
+    void setHorizontalPadding(float hp);
+    
+	#if defined(USE_GLFW_CLIPBOARD) && defined(TARGET_OSX)
+    void setClipboard(string clippy);
+    string getClipboard();
+	#endif
+	
+  protected:
+	float lastTimeCursorMoved;
+	
+	float verticalPadding;
+	float horizontalPadding;
+
+	ofxTextInput::FontRenderer* fontRef;
+	
+    bool enabled;
+	bool editing;
+	bool useListeners;
+
+	bool mouseDownInRect;
+	
+	void notifyTextChange();
+	void notifyHitReturn();
+	void getCursorCoords(int pos, int &cursorX, int &cursorY);
+	int getCursorPositionFromMouse(int x, int y);
+    
+	void addListeners();
+	void removeListeners();
+	bool hasListeners;
+
+    bool shiftHeld, commandHeld;
+    map<int, char> shiftMap;
+};
\ No newline at end of file