Index: trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java
===================================================================
--- trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java	(revision 370)
+++ trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/JFCListener.java	(revision 371)
@@ -66,5 +66,6 @@
 			MouseEvent mouseEvent = (MouseEvent) event;
 			if (!isMouseMovement(event.getID())) {
-				builder.append("<event id=\"" + event.getID() + "\">" + StringTools.ENDLINE);
+				builder.append("<event id=\"" + event.getID() + "\">"
+						+ StringTools.ENDLINE);
 				builder.append(" <param name=\"X\" value=\""
 						+ mouseEvent.getX() + "\" />" + StringTools.ENDLINE);
@@ -72,7 +73,9 @@
 						+ mouseEvent.getY() + "\" />" + StringTools.ENDLINE);
 				builder.append(" <param name=\"Button\" value=\""
-						+ mouseEvent.getButton() + "\" />" + StringTools.ENDLINE);
+						+ mouseEvent.getButton() + "\" />"
+						+ StringTools.ENDLINE);
 				builder.append(" <param name=\"Modifiers\" value=\""
-						+ mouseEvent.getModifiers() + "\" />" + StringTools.ENDLINE);
+						+ mouseEvent.getModifiers() + "\" />"
+						+ StringTools.ENDLINE);
 				addSourceInfo(builder, event);
 				builder.append("</event>" + StringTools.ENDLINE);
@@ -81,10 +84,13 @@
 		if (event instanceof KeyEvent) {
 			KeyEvent keyEvent = (KeyEvent) event;
-			if (keyEvent.getID() == KeyEvent.KEY_TYPED) {
-				builder.append("<event id=\"" + event.getID() + "\">" + StringTools.ENDLINE);
+			if (keyEvent.getID() == KeyEvent.KEY_PRESSED
+					|| keyEvent.getID() == KeyEvent.KEY_RELEASED) {
+				builder.append("<event id=\"" + event.getID() + "\">"
+						+ StringTools.ENDLINE);
 				builder.append(" <param name=\"KeyCode\" value=\""
 						+ keyEvent.getKeyCode() + "\" />" + StringTools.ENDLINE);
 				builder.append(" <param name=\"Modifiers\" value=\""
-						+ keyEvent.getModifiers() + "\" />" + StringTools.ENDLINE);
+						+ keyEvent.getModifiers() + "\" />"
+						+ StringTools.ENDLINE);
 				addSourceInfo(builder, event);
 				builder.append("</event>" + StringTools.ENDLINE);
@@ -93,6 +99,7 @@
 		if (event instanceof FocusEvent) {
 			FocusEvent focusEvent = (FocusEvent) event;
-			if( focusEvent.getID() == FocusEvent.FOCUS_GAINED ) {
-				builder.append("<event id=\"" + event.getID() + "\">" + StringTools.ENDLINE);
+			if (focusEvent.getID() == FocusEvent.FOCUS_GAINED) {
+				builder.append("<event id=\"" + event.getID() + "\">"
+						+ StringTools.ENDLINE);
 				addSourceInfo(builder, event);
 				builder.append("</event>" + StringTools.ENDLINE);
Index: trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/Runner.java
===================================================================
--- trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/Runner.java	(revision 370)
+++ trunk/JFCMonitor/src/de/ugoe/cs/eventbench/jfcmonitor/Runner.java	(revision 371)
@@ -78,4 +78,6 @@
 				Toolkit.getDefaultToolkit().addAWTEventListener(listenerStdOut,
 						AWTEvent.MOUSE_EVENT_MASK);
+				Toolkit.getDefaultToolkit().addAWTEventListener(listenerStdOut,
+						FocusEvent.FOCUS_EVENT_MASK);
 			} catch (UnsupportedEncodingException e) {
 				System.err