Diambiguate ^H from backspace

[fanfix.git] / src / jexer / backend / SwingTerminal.java

diff --git a/src/jexer/backend/SwingTerminal.java b/src/jexer/backend/SwingTerminal.java
index b20d448a3db2cbf534dabd3960144b40d3642469..a98063867e75479c2b18d91e2872fb2fdadec4a5 100644 (file)
--- a/src/jexer/backend/SwingTerminal.java
+++ b/src/jexer/backend/SwingTerminal.java
@@ -1489,8 +1489,7 @@ public final class SwingTerminal extends LogicalScreen
                     alt, ctrl, shift);
                 break;
             case KeyEvent.VK_BACK_SPACE:
-                // Special case: return it as kbBackspace (Ctrl-H)
-                keypress = new TKeypress(false, 0, 'H', false, true, false);
+                keypress = kbBackspace;
                 break;
             default:
                 // Unsupported, ignore
@@ -1501,7 +1500,15 @@ public final class SwingTerminal extends LogicalScreen
         if (keypress == null) {
             switch (ch) {
             case 0x08:
-                keypress = kbBackspace;
+                // Disambiguate ^H from Backspace.
+                if (KeyEvent.getKeyText(key.getKeyCode()).equals("H")) {
+                    // This is ^H.
+                    keypress = kbBackspace;
+                } else {
+                    // We are emulating Xterm here, where the backspace key
+                    // on the keyboard returns ^?.
+                    keypress = kbBackspaceDel;
+                }
                 break;
             case 0x0A:
                 keypress = kbEnter;