Skip to content

fixes the letter K! #6

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

Open
kans wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixes the letter K! #6

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c2e46a
fixes https://github.com/Floobits/atom-term3/issues/1
kans Sep 28, 2015
71ac5b9
fix illegal invocation error for messing with native events
kans Oct 6, 2015
0d1fa67
Unbind data handlers. Fixes a bug where terminal resets could cause m…
ggreer Nov 13, 2015
4bd056e
Cherry pick 5d74aa1dc5a57303d48396b6ad3a6a6bdac5b842 from https://git…
jeremyramin Oct 6, 2015
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
24 changes: 16 additions & 8 deletions src/term.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ function Terminal(options) {
this.rows = options.rows || options.geometry[1];

if (options.handler) {
this.off('data', options.handler);
this.on('data', options.handler);
}

Expand Down Expand Up @@ -1081,7 +1082,14 @@ Terminal.prototype.bindMouse = function() {
// fix for odd bug
//if (self.vt200Mouse && !self.normalMouse) {
if (self.vt200Mouse) {
sendButton({ __proto__: ev, type: 'mouseup' });
var syntheticEvent = {};

for (var key in event) {
syntheticEvent[key] = event[key]
}

syntheticEvent.type = 'mouseup';
sendButton(syntheticEvent);
return cancel(ev);
}

Expand Down Expand Up @@ -1118,7 +1126,6 @@ Terminal.prototype.bindMouse = function() {
// the shell for example
on(el, wheelEvent, function(ev) {
if (self.mouseEvents) return;
if (self.applicationKeypad) return;
if (ev.type === 'DOMMouseScroll') {
self.scrollDisp(ev.detail < 0 ? -5 : 5);
} else {
Expand Down Expand Up @@ -2523,12 +2530,6 @@ Terminal.prototype.keyDown = function(ev) {
key = '\x1b[6~';
}
break;
// CTRL-K
case 75:
if ((!isMac && ev.ctrlKey) || (isMac && ev.metaKey)) {
this.clear();
return cancel(ev);
}
// F1
case 112:
key = '\x1bOP';
Expand Down Expand Up @@ -2577,6 +2578,13 @@ Terminal.prototype.keyDown = function(ev) {
case 123:
key = '\x1b[24~';
break;
// CTRL-K
case 75:
if ((!this.isMac && ev.ctrlKey) || (this.isMac && ev.metaKey)) {
this.clear();
return cancel(ev);
}
// Falls through so that the letter K is handled as expected
default:
// a-z and space
if (ev.ctrlKey) {
Expand Down