Merge branch 'master' of https://github.com/klamonte/jexer

[fanfix.git] / src / jexer / event / TKeypressEvent.java

diff --git a/src/jexer/event/TKeypressEvent.java b/src/jexer/event/TKeypressEvent.java
index 03c4f71e5ed510b93711887b676c89c337e764d0..e49e43ebb16cea29875751a3c86919e04827be2e 100644 (file)
--- a/src/jexer/event/TKeypressEvent.java
+++ b/src/jexer/event/TKeypressEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
  * License: LGPLv3 or later
@@ -87,7 +87,7 @@ public final class TKeypressEvent extends TInputEvent {
     public TKeypressEvent(final TKeypress key,
         final boolean alt, final boolean ctrl, final boolean shift) {
 
-        this.key = new TKeypress(key.getIsKey(), key.getFnKey(), key.getCh(),
+        this.key = new TKeypress(key.isFnKey(), key.getKeyCode(), key.getChar(),
             alt, ctrl, shift);
     }
 
@@ -115,6 +115,21 @@ public final class TKeypressEvent extends TInputEvent {
         return (key.equals(that));
     }
 
+    /**
+     * Hashcode uses all fields in equals().
+     *
+     * @return the hash
+     */
+    @Override
+    public int hashCode() {
+        int A = 13;
+        int B = 23;
+        int hash = A;
+        hash = (B * hash) + getTime().hashCode();
+        hash = (B * hash) + key.hashCode();
+        return hash;
+    }
+
     /**
      * Make human-readable description of this TKeypressEvent.
      *