Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow holding key on mac to send multiple keys to terminal #1849

Merged
merged 10 commits into from
Dec 27, 2018
Merged

Allow holding key on mac to send multiple keys to terminal #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1104bcb
Allow holding key on mac to send multiple keys to terminal
epicfaace Dec 20, 2018
ec10601
Add tests
epicfaace Dec 20, 2018
b820f23
Add additional test
epicfaace Dec 20, 2018
0782fbb
Fix check
epicfaace Dec 20, 2018
64dd9d4
Change keyCode cutoff
epicfaace Dec 20, 2018
2896f56
Merge branch 'master' into feature/hold-key
Tyriar Dec 20, 2018
a4b4d08
Don't include num lock and scroll lock
epicfaace Dec 21, 2018
548d8cd
Merge branch 'feature/hold-key' of https://github.com/epicfaace/xterm…
epicfaace Dec 21, 2018
0d9487c
Merge branch 'master' into feature/hold-key
epicfaace Dec 27, 2018
9bcfb4d
Tidy up wrapping style
Tyriar Dec 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/core/input/Keyboard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,5 +281,16 @@ describe('Keyboard', () => {
assert.equal(testEvaluateKeyboardEvent({ keyCode: 0, key: 'UIKeyInputDownArrow' }).key, '\x1b[B');
assert.equal(testEvaluateKeyboardEvent({ keyCode: 0, key: 'UIKeyInputDownArrow' }, { applicationCursorMode: true }).key, '\x1bOB');
});

it('should handle lowercase letters', () => {
assert.equal(testEvaluateKeyboardEvent({ keyCode: 65, key: 'a' }).key, 'a');
assert.equal(testEvaluateKeyboardEvent({ keyCode: 189, key: '-' }).key, '-');
});

it('should handle uppercase letters', () => {
assert.equal(testEvaluateKeyboardEvent({ shiftKey: true, keyCode: 65, key: 'A' }).key, 'A');
assert.equal(testEvaluateKeyboardEvent({ shiftKey: true, keyCode: 49, key: '!' }).key, '!');
});

});
});
4 changes: 4 additions & 0 deletions src/core/input/Keyboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,10 @@ export function evaluateKeyboardEvent(
if (ev.keyCode === 65) { // cmd + a
result.type = KeyboardResultType.SELECT_ALL;
}
} else if (ev.key && !ev.ctrlKey && !ev.altKey && !ev.metaKey &&
ev.keyCode >= 48 && ev.keyCode !== 144 && ev.keyCode !== 145) {
// Include only keys that that result in a character; don't include num lock and scroll lock
result.key = ev.key;
}
break;
}
Expand Down