From a12f51fe33405c1e30a027f52264e9d86d99c796 Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 21 Dec 2015 22:44:26 +0000 Subject: [PATCH 01/18] fix ctrl-arrow in terminal vim --- node_modules/vfs-local/localfs.js | 5 ++-- plugins/c9.ide.terminal/aceterm/input.js | 35 ++++++++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js index 4033eff5..b3494d57 100644 --- a/node_modules/vfs-local/localfs.js +++ b/node_modules/vfs-local/localfs.js @@ -1837,13 +1837,14 @@ module.exports = function setup(fsOptions) { ";", "set", "-q", "set-titles", "on", ";", "set", "-q", "quiet", "on", ";", "set", "-q", "-g", "prefix", "C-b", - ";", "set", "-q", "-g", "terminal-overrides", "'xterm:colors=256'" + ";", "set", "-q", "-g", "default-terminal", "xterm-256color", + ";", "setw", "-q", "-g", "xterm-keys", "on" ); // disable buffering of tmux output // old versions of tmux skip parts of output without this flag if (parseFloat(TMUXNAME.substr("cloud9".length)) < 2.1) - args.push(";", "setw", "c0-change-trigger", "0"); + args.push(";", "setw", "-q", "c0-change-trigger", "0"); if (options.output) { args.push( diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js index 07060d55..cee51cdc 100644 --- a/plugins/c9.ide.terminal/aceterm/input.js +++ b/plugins/c9.ide.terminal/aceterm/input.js @@ -3,6 +3,15 @@ define(function(require, exports, module) { module.exports = function initInput(ace) { var HashHandler = require("ace/keyboard/hash_handler").HashHandler; var KEY_MODS = require("ace/lib/keys").KEY_MODS; + var TERM_MODS = { + "shift-" : 2, + "alt-" : 3, + "alt-shift-" : 4, + "ctrl-" : 5, + "ctrl-shift-" : 6, + "ctrl-alt-" : 7, + "ctrl-alt-shift-" : 8, + }; var specialKeys = new HashHandler(); // http://www.math.utah.edu/docs/info/features_7.html specialKeys.bindKeys({ @@ -19,9 +28,7 @@ define(function(require, exports, module) { "Return" : '\r', "Escape" : '\x1b', "Left" : '\x1b[D', - "Ctrl-Left" : '\x1b[5D', "Right" : '\x1b[C', - "Ctrl-Right" : '\x1b[5C', "Up" : '\x1b[A', "Down" : '\x1b[B', "Delete" : '\x1b[3~', @@ -50,25 +57,25 @@ define(function(require, exports, module) { name: "\u001bb" // "alt-b" }, { bindKey: {win: "Ctrl-right", mac: "Option-right"}, - name: "\u001bf" //"alt-b" + name: "\u001bf" // "alt-b" }, { bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"}, - name: "\u001bd" //"alt-d" + name: "\u001bd" // "alt-d" }, { bindKey: {win: "Ctrl-Backspace", mac: "Option-Backspace"}, - name: "\x1b\x7f" //"alt-backspace" + name: "\x1b\x7f" // "alt-backspace" }, { bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"}, - name: "\u001bd" //"alt-d" + name: "\u001bd" // "alt-d" }, { - bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"}, - name: "\u0017" //"ctrl-w" + bindKey: {win: "Alt-Backspace|Shift-Backspace", mac: "Ctrl-Backspace|Shift-Backspace"}, + name: "\u0015" // "ctrl-u" }, { - bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"}, - name: "\u0017" //"ctrl-w" + bindKey: {win: "Alt-Delete|Shift-Delete", mac: "Ctrl-Delete|Shift-Delete"}, + name: "\u000b" // "ctrl-k" }, { bindKey: {win: "Ctrl-z", mac: "Cmd-z"}, - name: "\u0018\u0015" //"ctrl-x ctrl-u" + name: "\u0018\u0015" // "ctrl-x ctrl-u" }]; specialKeys.addCommands(aliases); @@ -130,7 +137,11 @@ define(function(require, exports, module) { } if (term.applicationKeypad) { if (applicationKeys[keyString]) { - this.send(applicationKeys[keyString]); + var mod = TERM_MODS[KEY_MODS[hashId]]; + var str = applicationKeys[keyString]; + if (mod) + str = "\u001b[1;" + mod + str.slice(-1); + this.send(str); return {command: "null"}; } } From 907e2a8ad9be4ab7de0c162388195876a19ca506 Mon Sep 17 00:00:00 2001 From: nightwing Date: Wed, 23 Dec 2015 01:27:47 +0400 Subject: [PATCH 02/18] fix scrollbar regression --- node_modules/ace/lib/ace/mouse/mouse_handler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node_modules/ace/lib/ace/mouse/mouse_handler.js b/node_modules/ace/lib/ace/mouse/mouse_handler.js index 680855f6..1e9e3fc4 100644 --- a/node_modules/ace/lib/ace/mouse/mouse_handler.js +++ b/node_modules/ace/lib/ace/mouse/mouse_handler.js @@ -62,8 +62,8 @@ var MouseHandler = function(editor) { event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove")); event.addMultiMouseDownListener([ mouseTarget, - editor.renderer.scrollBarV && editor.renderer.scrollBarV.element, - editor.renderer.scrollBarH && editor.renderer.scrollBarH.element, + editor.renderer.scrollBarV && editor.renderer.scrollBarV.inner, + editor.renderer.scrollBarH && editor.renderer.scrollBarH.inner, editor.textInput && editor.textInput.getElement() ].filter(Boolean), [400, 300, 250], this, "onMouseEvent"); event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel")); From 830ab6fe73d232d1a789151911d6ad7946f97ce3 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 07:55:24 +0100 Subject: [PATCH 03/18] c9-auto-bump 3.1.828 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33f79cec..e04b610a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.827", + "version": "3.1.828", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 43aecda83b1f3c860ae3baa8596a7b23cc03583f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 08:13:39 +0100 Subject: [PATCH 04/18] c9-auto-bump 3.1.829 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e04b610a..d70e5407 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.828", + "version": "3.1.829", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From d43a0f62ea37aff93c973f0d374f4f84b348d23b Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 12:11:18 +0100 Subject: [PATCH 05/18] c9-auto-bump 3.1.830 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d70e5407..f6f949b0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.829", + "version": "3.1.830", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 550a74f65b81aa7c3eee11c5a62e6059ed31eb43 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 12:42:22 +0100 Subject: [PATCH 06/18] c9-auto-bump 3.1.831 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f6f949b0..d8c694fb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.830", + "version": "3.1.831", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From b65a9f7d7ae52a6adbdaaa84e58687f442da7f67 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 12:46:29 +0100 Subject: [PATCH 07/18] c9-auto-bump 3.1.832 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8c694fb..c61b8d14 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.831", + "version": "3.1.832", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 725ff0a80918448f7b3e8929fd29369295b25915 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 14:37:13 +0100 Subject: [PATCH 08/18] c9-auto-bump 3.1.833 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c61b8d14..0d95e58f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.832", + "version": "3.1.833", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 92d69624d6d1fe5fb32ae0f746e2f5da4ebb7786 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 14:42:28 +0100 Subject: [PATCH 09/18] c9-auto-bump 3.1.834 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d95e58f..5a9ce587 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.833", + "version": "3.1.834", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From c93ec054f93eecd6e3c65f2cf580945adf229000 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 14:43:28 +0100 Subject: [PATCH 10/18] c9-auto-bump 3.1.835 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a9ce587..ae0ec9de 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.834", + "version": "3.1.835", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 1fbb1f879c4b78fd0be31234bb7e96950221393f Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 15:41:39 +0100 Subject: [PATCH 11/18] c9-auto-bump 3.1.836 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae0ec9de..735ff4cd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.835", + "version": "3.1.836", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3643632f64cf32a6ea707c21f463ed40cca46541 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 15:44:27 +0100 Subject: [PATCH 12/18] c9-auto-bump 3.1.837 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 735ff4cd..415dfcb6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.836", + "version": "3.1.837", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a47e44547e51422bd5a4571a81ee60deb4c50b67 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 16:35:26 +0100 Subject: [PATCH 13/18] c9-auto-bump 3.1.838 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 415dfcb6..0a7fb83e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.837", + "version": "3.1.838", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 105acfaa2cb260817c634c07670a6658c2a56138 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 16:54:59 +0100 Subject: [PATCH 14/18] c9-auto-bump 3.1.839 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a7fb83e..aff99ded 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.838", + "version": "3.1.839", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 14209d5c0529788d9331494205d5359e5de70ae7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 17:23:24 +0100 Subject: [PATCH 15/18] c9-auto-bump 3.1.840 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aff99ded..1fcfdfa1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.839", + "version": "3.1.840", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 2b839ccd48412a6aa38ccf621a4326b5e14260b8 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 17:44:35 +0100 Subject: [PATCH 16/18] c9-auto-bump 3.1.841 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fcfdfa1..06684cce 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.840", + "version": "3.1.841", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From a73d291ae00c1a5d57b3cacb1b0637ce1546698c Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 18:08:36 +0100 Subject: [PATCH 17/18] c9-auto-bump 3.1.842 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 06684cce..074f0439 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.841", + "version": "3.1.842", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", From 3ba350dcb1f627e633ebe2c7929602d68e30a8c7 Mon Sep 17 00:00:00 2001 From: c9bot Date: Wed, 23 Dec 2015 23:40:09 +0100 Subject: [PATCH 18/18] c9-auto-bump 3.1.843 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 074f0439..e32ada48 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.842", + "version": "3.1.843", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9",