Changeset 1701

Timestamp:

09/01/14 15:12:45 (10 years ago)

Author:

dmay

Message:

rudimentary keyboard support: typing works but no key modifiers possible yet

Location:

trunk

Files:

• autoquest-misc/src/main/java/de/ugoe/cs/autoquest/keyboardmaps/VirtualKey.java (modified) (1 diff)
• autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java (modified) (5 diffs)

trunk/autoquest-misc/src/main/java/de/ugoe/cs/autoquest/keyboardmaps/VirtualKey.java

@@ -289 +289 @@
     /**
      * <p>
+     * Returns the keyCode of the virtual key.
+     * </p>
+     * 
+     * @return the keyCode.
+     */
+    public int getVirtualKeyCode() {
+        return virtualKeyCode;
+    }
+
+    /**
+     * <p>
      * Returns whether the key is a combination key (e.g., shift, alt) or not.
      * </p>

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java

@@ -91 +91 @@
     private JFCGUIElement currentFocus;
     private StructureNode structure;
+    private StructureNode lastKeySequenceEvent;
+    private StructureNode lastKeyTypedEvent;
     private StructureNode lastMouseClickEvent;
     private StructureNode lastFocusChangeEvent;
@@ -180 +182 @@
 
                 if (event.getType() instanceof MouseButtonDown) {
+                    lastKeySequenceEvent = null;
+
                     lastMouseClickEvent = new StructureNode("MouseClick");
                     writeMouseClickEvent(writer, event, 501);
                 }
                 else if (event.getType() instanceof MouseButtonUp) {
+                    lastKeySequenceEvent = null;
+
                     writeMouseClickEvent(writer, event, 502);
                 }
                 else if (event.getType() instanceof MouseClick) {
+                    lastKeySequenceEvent = null;
+
                     writeMouseClickEvent(writer, event, 500);
                     // FIXME: don't always write an item action
@@ -207 +215 @@
                 }
                 else if (event.getType() instanceof KeyboardFocusChange) {
+                    lastKeySequenceEvent = null;
+
                     writeFocusChangeEvent(writer, event);
                 }
                 else if (event.getType() instanceof KeyPressed) {
-                    // writeKeyEvent(writer, event, 401);
+                    if (lastKeySequenceEvent == null) {
+                        lastKeySequenceEvent = structure.add("KeySequence");
+                    }
+                    lastKeyTypedEvent = lastKeySequenceEvent.add("KeyTyped");
+                    writeKeyEvent(writer, event, 401);
                 }
                 else if (event.getType() instanceof KeyReleased) {
-                    // writeKeyEvent(writer, event, 402);
+                    writeKeyEvent(writer, event, 402);
                 }
             }
@@ -445 +459 @@
         writeLine(writer,
             "<KeyInfo "
-            + "keyCode=\"" + getKeyCode(info.getKey()) + "\" "
-            + "keyChar=\"" + getKeyChar(info.getKey()) + "\" "
+            + "keyCode=\"" + info.getKey().getVirtualKeyCode() + "\" "
+            + "keyChar=\"" + getKeyChar(info.getKey().getVirtualKeyCode()) + "\" "
             + "modifiers=\"0\" />"
         );
@@ -452 +466 @@
         writeLine(writer, "</KeyEvent>");
         
-        // TODO: keyevent structure part
+        lastKeyTypedEvent.addRecordable();
     }
     
-    private String getKeyChar (VirtualKey key) {
-        // TODO
-        return "";
-    }
-    
-    private int getKeyCode (VirtualKey key) {
-        // TODO
-        return -1;
+    private String getKeyChar (int keyCode) {
+        if (keyCode >= 32 && keyCode < 127) {
+            return String.valueOf((char)keyCode);
+        }
+        else {
+            return "_NO_LEGAL_XML_CHAR";
+        }
     }
 }