LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into improve-python-completion

Browse Source
This commit is contained in:
Lennart Kats 2015-12-24 08:26:22 +00:00
commit f40ae6bc95
4 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node_modules/ace/lib/ace/mouse/mouse_handler.js generated vendored
View File

@ -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"));

5
node_modules/vfs-local/localfs.js generated vendored
View File

@ -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(

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.827",
"version": "3.1.843",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",

35
plugins/c9.ide.terminal/aceterm/input.js
View File

@ -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"};
}
}