simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix handling of control and capslock keys.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@182 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2009-11-18 22:58:06 +00:00
parent fe5a28f992
commit cd126f40f9
8 changed files with 338 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2009-11-18 Markus Gutschke <markus@shellinabox.com>
* Fixed some compiler warnings when using more recent versions of
gcc and glibc.
* Tweak the handling of CTRL keys, so that some of the more unusual
combinations work. For historic reasons, there is an expectation that
CTRL-3..CTRL-8 return specific control characters. Also fixed the
handling of CTRL-\ which could cause problems with some browsers.
* Rely on the browser for capitalization. This should fix Capslock
behavior. Hopefully, it won't break any other keyboard features or
layouts.
2009-08-20 Markus Gutschke <markus@shellinabox.com>
* Added transparent printing support. The development of this

2
config.h
View file

@ -138,7 +138,7 @@
#define STDC_HEADERS 1
/* Most recent revision number in the version control system */
#define VCS_REVISION "181"
#define VCS_REVISION "182"
/* Version number of package */
#define VERSION "2.9"

2
configure vendored
View file

@ -2319,7 +2319,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=181
VCS_REVISION=182
cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
VCS_REVISION=181
VCS_REVISION=182
AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system])

92
demo/vt100.js
View file

@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() {
};
VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.9 (revision 181)" +
alert("VT100 Terminal Emulator " + "2.9 (revision 182)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com");
};
@ -2055,7 +2055,36 @@ VT100.prototype.keysPressed = function(ch) {
}
};
VT100.prototype.applyModifiers = function(ch, event) {
if (ch) {
if (event.ctrlKey) {
if (ch >= 32 && ch <= 127) {
// For historic reasons, some control characters are treated specially
switch (ch) {
case /* 3 */ 51: ch = 27; break;
case /* 4 */ 52: ch = 28; break;
case /* 5 */ 53: ch = 29; break;
case /* 6 */ 54: ch = 30; break;
case /* 7 */ 55: ch = 31; break;
case /* 8 */ 56: ch = 127; break;
case /* ? */ 63: ch = 127; break;
default: ch &= 31; break;
}
}
}
return String.fromCharCode(ch);
} else {
return undefined;
}
};
VT100.prototype.handleKey = function(event) {
// this.vt100('H: c=' + event.charCode + ', k=' + event.keyCode +
// (event.shiftKey || event.ctrlKey || event.altKey ||
// event.metaKey ? ', ' +
// (event.shiftKey ? 'S' : '') + (event.ctrlKey ? 'C' : '') +
// (event.altKey ? 'A' : '') + (event.metaKey ? 'M' : '') : '') +
// '\r\n');
var ch, key;
if (typeof event.charCode != 'undefined') {
// non-IE keypress events have a translated charCode value. Also, our
@ -2073,29 +2102,12 @@ VT100.prototype.handleKey = function(event) {
// Apply modifier keys (ctrl and shift)
if (ch) {
key = undefined;
if (event.ctrlKey) {
if (ch >= 32 && ch <= 127) {
ch &= 0x1F;
}
} else {
if (event.shiftKey) {
if (ch >= 97 && ch <= 122) {
ch -= 32;
}
} else {
if (ch >= 65 && ch <= 90) {
ch += 32;
}
}
}
} else {
ch = undefined;
}
ch = this.applyModifiers(ch, event);
// By this point, "ch" is either defined and contains the character code, or
// it is undefined and "key" defines the code of a function key
if (ch != undefined) {
ch = String.fromCharCode(ch);
this.scrollable.scrollTop = this.numScrollbackLines *
this.cursorHeight + 1;
} else {
@ -2151,21 +2163,21 @@ VT100.prototype.handleKey = function(event) {
case 91: /* Left Window */ return;
case 92: /* Right Window */ return;
case 93: /* Select */ return;
case 96: /* 0 */ ch = '0'; break;
case 97: /* 1 */ ch = '1'; break;
case 98: /* 2 */ ch = '2'; break;
case 99: /* 3 */ ch = '3'; break;
case 100: /* 4 */ ch = '4'; break;
case 101: /* 5 */ ch = '5'; break;
case 102: /* 6 */ ch = '6'; break;
case 103: /* 7 */ ch = '7'; break;
case 104: /* 8 */ ch = '8'; break;
case 105: /* 9 */ ch = '9'; break;
case 106: /* * */ ch = '*'; break;
case 107: /* + */ ch = '+'; break;
case 109: /* - */ ch = '-'; break;
case 110: /* . */ ch = '.'; break;
case 111: /* / */ ch = '/'; break;
case 96: /* 0 */ ch = this.applyModifiers(48, event); break;
case 97: /* 1 */ ch = this.applyModifiers(49, event); break;
case 98: /* 2 */ ch = this.applyModifiers(50, event); break;
case 99: /* 3 */ ch = this.applyModifiers(51, event); break;
case 100: /* 4 */ ch = this.applyModifiers(52, event); break;
case 101: /* 5 */ ch = this.applyModifiers(53, event); break;
case 102: /* 6 */ ch = this.applyModifiers(54, event); break;
case 103: /* 7 */ ch = this.applyModifiers(55, event); break;
case 104: /* 8 */ ch = this.applyModifiers(56, event); break;
case 105: /* 9 */ ch = this.applyModifiers(58, event); break;
case 106: /* * */ ch = this.applyModifiers(42, event); break;
case 107: /* + */ ch = this.applyModifiers(43, event); break;
case 109: /* - */ ch = this.applyModifiers(45, event); break;
case 110: /* . */ ch = this.applyModifiers(46, event); break;
case 111: /* / */ ch = this.applyModifiers(47, event); break;
case 112: /* F1 */ ch = '\u001BOP'; break;
case 113: /* F2 */ ch = '\u001BOQ'; break;
case 114: /* F3 */ ch = '\u001BOR'; break;
@ -2180,6 +2192,17 @@ VT100.prototype.handleKey = function(event) {
case 123: /* F12 */ ch = '\u001B[24~'; break;
case 144: /* Num Lock */ return;
case 145: /* Scroll Lock */ return;
case 186: /* ; */ ch = this.applyModifiers(59, event); break;
case 187: /* = */ ch = this.applyModifiers(61, event); break;
case 188: /* , */ ch = this.applyModifiers(44, event); break;
case 189: /* - */ ch = this.applyModifiers(45, event); break;
case 190: /* . */ ch = this.applyModifiers(46, event); break;
case 191: /* / */ ch = this.applyModifiers(47, event); break;
case 192: /* ` */ ch = this.applyModifiers(96, event); break;
case 219: /* [ */ ch = this.applyModifiers(91, event); break;
case 220: /* \ */ ch = this.applyModifiers(92, event); break;
case 221: /* ] */ ch = this.applyModifiers(93, event); break;
case 222: /* ' */ ch = this.applyModifiers(39, event); break;
default: return;
}
this.scrollable.scrollTop = this.numScrollbackLines *
@ -2486,6 +2509,7 @@ VT100.prototype.keyUp = function(event) {
// for non-alphanumerical keys. Patch things up for now, but in the
// future we will catch these keys earlier (in the keydown handler).
if (this.lastNormalKeyDownEvent) {
// this.vt100('ENABLING EARLY CATCHING OF MODIFIER KEYS\r\n');
this.catchModifiersEarly = true;
var asciiKey =
event.keyCode == 32 ||

2
shellinabox/shell_in_a_box.js
View file

@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
};
ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + "2.9 (revision 181)" +
alert("Shell In A Box version " + "2.9 (revision 182)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

92
shellinabox/vt100.js
View file

@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() {
};
VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.9 (revision 181)" +
alert("VT100 Terminal Emulator " + "2.9 (revision 182)" +
"\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com");
};
@ -2055,7 +2055,36 @@ VT100.prototype.keysPressed = function(ch) {
}
};
VT100.prototype.applyModifiers = function(ch, event) {
if (ch) {
if (event.ctrlKey) {
if (ch >= 32 && ch <= 127) {
// For historic reasons, some control characters are treated specially
switch (ch) {
case /* 3 */ 51: ch = 27; break;
case /* 4 */ 52: ch = 28; break;
case /* 5 */ 53: ch = 29; break;
case /* 6 */ 54: ch = 30; break;
case /* 7 */ 55: ch = 31; break;
case /* 8 */ 56: ch = 127; break;
case /* ? */ 63: ch = 127; break;
default: ch &= 31; break;
}
}
}
return String.fromCharCode(ch);
} else {
return undefined;
}
};
VT100.prototype.handleKey = function(event) {
// this.vt100('H: c=' + event.charCode + ', k=' + event.keyCode +
// (event.shiftKey || event.ctrlKey || event.altKey ||
// event.metaKey ? ', ' +
// (event.shiftKey ? 'S' : '') + (event.ctrlKey ? 'C' : '') +
// (event.altKey ? 'A' : '') + (event.metaKey ? 'M' : '') : '') +
// '\r\n');
var ch, key;
if (typeof event.charCode != 'undefined') {
// non-IE keypress events have a translated charCode value. Also, our
@ -2073,29 +2102,12 @@ VT100.prototype.handleKey = function(event) {
// Apply modifier keys (ctrl and shift)
if (ch) {
key = undefined;
if (event.ctrlKey) {
if (ch >= 32 && ch <= 127) {
ch &= 0x1F;
}
} else {
if (event.shiftKey) {
if (ch >= 97 && ch <= 122) {
ch -= 32;
}
} else {
if (ch >= 65 && ch <= 90) {
ch += 32;
}
}
}
} else {
ch = undefined;
}
ch = this.applyModifiers(ch, event);
// By this point, "ch" is either defined and contains the character code, or
// it is undefined and "key" defines the code of a function key
if (ch != undefined) {
ch = String.fromCharCode(ch);
this.scrollable.scrollTop = this.numScrollbackLines *
this.cursorHeight + 1;
} else {
@ -2151,21 +2163,21 @@ VT100.prototype.handleKey = function(event) {
case 91: /* Left Window */ return;
case 92: /* Right Window */ return;
case 93: /* Select */ return;
case 96: /* 0 */ ch = '0'; break;
case 97: /* 1 */ ch = '1'; break;
case 98: /* 2 */ ch = '2'; break;
case 99: /* 3 */ ch = '3'; break;
case 100: /* 4 */ ch = '4'; break;
case 101: /* 5 */ ch = '5'; break;
case 102: /* 6 */ ch = '6'; break;
case 103: /* 7 */ ch = '7'; break;
case 104: /* 8 */ ch = '8'; break;
case 105: /* 9 */ ch = '9'; break;
case 106: /* * */ ch = '*'; break;
case 107: /* + */ ch = '+'; break;
case 109: /* - */ ch = '-'; break;
case 110: /* . */ ch = '.'; break;
case 111: /* / */ ch = '/'; break;
case 96: /* 0 */ ch = this.applyModifiers(48, event); break;
case 97: /* 1 */ ch = this.applyModifiers(49, event); break;
case 98: /* 2 */ ch = this.applyModifiers(50, event); break;
case 99: /* 3 */ ch = this.applyModifiers(51, event); break;
case 100: /* 4 */ ch = this.applyModifiers(52, event); break;
case 101: /* 5 */ ch = this.applyModifiers(53, event); break;
case 102: /* 6 */ ch = this.applyModifiers(54, event); break;
case 103: /* 7 */ ch = this.applyModifiers(55, event); break;
case 104: /* 8 */ ch = this.applyModifiers(56, event); break;
case 105: /* 9 */ ch = this.applyModifiers(58, event); break;
case 106: /* * */ ch = this.applyModifiers(42, event); break;
case 107: /* + */ ch = this.applyModifiers(43, event); break;
case 109: /* - */ ch = this.applyModifiers(45, event); break;
case 110: /* . */ ch = this.applyModifiers(46, event); break;
case 111: /* / */ ch = this.applyModifiers(47, event); break;
case 112: /* F1 */ ch = '\u001BOP'; break;
case 113: /* F2 */ ch = '\u001BOQ'; break;
case 114: /* F3 */ ch = '\u001BOR'; break;
@ -2180,6 +2192,17 @@ VT100.prototype.handleKey = function(event) {
case 123: /* F12 */ ch = '\u001B[24~'; break;
case 144: /* Num Lock */ return;
case 145: /* Scroll Lock */ return;
case 186: /* ; */ ch = this.applyModifiers(59, event); break;
case 187: /* = */ ch = this.applyModifiers(61, event); break;
case 188: /* , */ ch = this.applyModifiers(44, event); break;
case 189: /* - */ ch = this.applyModifiers(45, event); break;
case 190: /* . */ ch = this.applyModifiers(46, event); break;
case 191: /* / */ ch = this.applyModifiers(47, event); break;
case 192: /* ` */ ch = this.applyModifiers(96, event); break;
case 219: /* [ */ ch = this.applyModifiers(91, event); break;
case 220: /* \ */ ch = this.applyModifiers(92, event); break;
case 221: /* ] */ ch = this.applyModifiers(93, event); break;
case 222: /* ' */ ch = this.applyModifiers(39, event); break;
default: return;
}
this.scrollable.scrollTop = this.numScrollbackLines *
@ -2486,6 +2509,7 @@ VT100.prototype.keyUp = function(event) {
// for non-alphanumerical keys. Patch things up for now, but in the
// future we will catch these keys earlier (in the keydown handler).
if (this.lastNormalKeyDownEvent) {
// this.vt100('ENABLING EARLY CATCHING OF MODIFIER KEYS\r\n');
this.catchModifiersEarly = true;
var asciiKey =
event.keyCode == 32 ||

90
shellinabox/vt100.jspp
View file

@ -2055,7 +2055,36 @@ VT100.prototype.keysPressed = function(ch) {
}
};
VT100.prototype.applyModifiers = function(ch, event) {
if (ch) {
if (event.ctrlKey) {
if (ch >= 32 && ch <= 127) {
// For historic reasons, some control characters are treated specially
switch (ch) {
case /* 3 */ 51: ch = 27; break;
case /* 4 */ 52: ch = 28; break;
case /* 5 */ 53: ch = 29; break;
case /* 6 */ 54: ch = 30; break;
case /* 7 */ 55: ch = 31; break;
case /* 8 */ 56: ch = 127; break;
case /* ? */ 63: ch = 127; break;
default: ch &= 31; break;
}
}
}
return String.fromCharCode(ch);
} else {
return undefined;
}
};
VT100.prototype.handleKey = function(event) {
// this.vt100('H: c=' + event.charCode + ', k=' + event.keyCode +
// (event.shiftKey || event.ctrlKey || event.altKey ||
// event.metaKey ? ', ' +
// (event.shiftKey ? 'S' : '') + (event.ctrlKey ? 'C' : '') +
// (event.altKey ? 'A' : '') + (event.metaKey ? 'M' : '') : '') +
// '\r\n');
var ch, key;
if (typeof event.charCode != 'undefined') {
// non-IE keypress events have a translated charCode value. Also, our
@ -2073,29 +2102,12 @@ VT100.prototype.handleKey = function(event) {
// Apply modifier keys (ctrl and shift)
if (ch) {
key = undefined;
if (event.ctrlKey) {
if (ch >= 32 && ch <= 127) {
ch &= 0x1F;
}
} else {
if (event.shiftKey) {
if (ch >= 97 && ch <= 122) {
ch -= 32;
}
} else {
if (ch >= 65 && ch <= 90) {
ch += 32;
}
}
}
} else {
ch = undefined;
}
ch = this.applyModifiers(ch, event);
// By this point, "ch" is either defined and contains the character code, or
// it is undefined and "key" defines the code of a function key
if (ch != undefined) {
ch = String.fromCharCode(ch);
this.scrollable.scrollTop = this.numScrollbackLines *
this.cursorHeight + 1;
} else {
@ -2151,21 +2163,21 @@ VT100.prototype.handleKey = function(event) {
case 91: /* Left Window */ return;
case 92: /* Right Window */ return;
case 93: /* Select */ return;
case 96: /* 0 */ ch = '0'; break;
case 97: /* 1 */ ch = '1'; break;
case 98: /* 2 */ ch = '2'; break;
case 99: /* 3 */ ch = '3'; break;
case 100: /* 4 */ ch = '4'; break;
case 101: /* 5 */ ch = '5'; break;
case 102: /* 6 */ ch = '6'; break;
case 103: /* 7 */ ch = '7'; break;
case 104: /* 8 */ ch = '8'; break;
case 105: /* 9 */ ch = '9'; break;
case 106: /* * */ ch = '*'; break;
case 107: /* + */ ch = '+'; break;
case 109: /* - */ ch = '-'; break;
case 110: /* . */ ch = '.'; break;
case 111: /* / */ ch = '/'; break;
case 96: /* 0 */ ch = this.applyModifiers(48, event); break;
case 97: /* 1 */ ch = this.applyModifiers(49, event); break;
case 98: /* 2 */ ch = this.applyModifiers(50, event); break;
case 99: /* 3 */ ch = this.applyModifiers(51, event); break;
case 100: /* 4 */ ch = this.applyModifiers(52, event); break;
case 101: /* 5 */ ch = this.applyModifiers(53, event); break;
case 102: /* 6 */ ch = this.applyModifiers(54, event); break;
case 103: /* 7 */ ch = this.applyModifiers(55, event); break;
case 104: /* 8 */ ch = this.applyModifiers(56, event); break;
case 105: /* 9 */ ch = this.applyModifiers(58, event); break;
case 106: /* * */ ch = this.applyModifiers(42, event); break;
case 107: /* + */ ch = this.applyModifiers(43, event); break;
case 109: /* - */ ch = this.applyModifiers(45, event); break;
case 110: /* . */ ch = this.applyModifiers(46, event); break;
case 111: /* / */ ch = this.applyModifiers(47, event); break;
case 112: /* F1 */ ch = '\u001BOP'; break;
case 113: /* F2 */ ch = '\u001BOQ'; break;
case 114: /* F3 */ ch = '\u001BOR'; break;
@ -2180,6 +2192,17 @@ VT100.prototype.handleKey = function(event) {
case 123: /* F12 */ ch = '\u001B[24~'; break;
case 144: /* Num Lock */ return;
case 145: /* Scroll Lock */ return;
case 186: /* ; */ ch = this.applyModifiers(59, event); break;
case 187: /* = */ ch = this.applyModifiers(61, event); break;
case 188: /* , */ ch = this.applyModifiers(44, event); break;
case 189: /* - */ ch = this.applyModifiers(45, event); break;
case 190: /* . */ ch = this.applyModifiers(46, event); break;
case 191: /* / */ ch = this.applyModifiers(47, event); break;
case 192: /* ` */ ch = this.applyModifiers(96, event); break;
case 219: /* [ */ ch = this.applyModifiers(91, event); break;
case 220: /* \ */ ch = this.applyModifiers(92, event); break;
case 221: /* ] */ ch = this.applyModifiers(93, event); break;
case 222: /* ' */ ch = this.applyModifiers(39, event); break;
default: return;
}
this.scrollable.scrollTop = this.numScrollbackLines *
@ -2486,6 +2509,7 @@ VT100.prototype.keyUp = function(event) {
// for non-alphanumerical keys. Patch things up for now, but in the
// future we will catch these keys earlier (in the keydown handler).
if (this.lastNormalKeyDownEvent) {
// this.vt100('ENABLING EARLY CATCHING OF MODIFIER KEYS\r\n');
this.catchModifiersEarly = true;
var asciiKey =
event.keyCode == 32 ||