From 7f59f4a7a6dc68a35f00ac77b9e4a451c17a6046 Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Thu, 19 Aug 2010 19:09:33 +0000 Subject: [PATCH] Thanks to lotr44's excellent analysis of the problem, we now have a fix for the problem with typing "!" on French keyboards. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@213 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- ChangeLog | 5 +++++ config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 6 +++--- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 6 +++--- shellinabox/vt100.jspp | 4 ++-- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d476f0..9869f8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-08-19 Markus Gutschke + + * Thanks to lotr44's excellent analysis of the problem, we now have + a fix for the problem with typing "!" on French keyboards. + 2010-08-06 Markus Gutschke * Allow users to disable the blinking cursor from the context menu. diff --git a/config.h b/config.h index 950cb99..f23dabb 100644 --- a/config.h +++ b/config.h @@ -153,7 +153,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "212" +#define VCS_REVISION "213" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index c1fa825..80c4f6f 100755 --- a/configure +++ b/configure @@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=212 +VCS_REVISION=213 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 9c74568..e20c2d2 100644 --- a/configure.ac +++ b/configure.ac @@ -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.10, markus@shellinabox.com) -VCS_REVISION=212 +VCS_REVISION=213 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/vt100.js b/demo/vt100.js index 2aeb9f8..9cc223e 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1962,7 +1962,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 212)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 213)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; @@ -2450,7 +2450,7 @@ VT100.prototype.keyDown = function(event) { event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || event.keyCode >= 186 && event.keyCode <= 192 || - event.keyCode >= 219 && event.keyCode <= 222 || + event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; try { if (navigator.appName == 'Konqueror') { @@ -2589,7 +2589,7 @@ VT100.prototype.keyUp = function(event) { event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || event.keyCode >= 186 && event.keyCode <= 192 || - event.keyCode >= 219 && event.keyCode <= 222 || + event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; var fake = [ ]; fake.ctrlKey = event.ctrlKey; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 8e27d6f..f256f3f 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 212)" + + alert("Shell In A Box version " + "2.10 (revision 213)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 2aeb9f8..9cc223e 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1962,7 +1962,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 212)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 213)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; @@ -2450,7 +2450,7 @@ VT100.prototype.keyDown = function(event) { event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || event.keyCode >= 186 && event.keyCode <= 192 || - event.keyCode >= 219 && event.keyCode <= 222 || + event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; try { if (navigator.appName == 'Konqueror') { @@ -2589,7 +2589,7 @@ VT100.prototype.keyUp = function(event) { event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || event.keyCode >= 186 && event.keyCode <= 192 || - event.keyCode >= 219 && event.keyCode <= 222 || + event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; var fake = [ ]; fake.ctrlKey = event.ctrlKey; diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp index 51c8fe9..3fe2a9f 100644 --- a/shellinabox/vt100.jspp +++ b/shellinabox/vt100.jspp @@ -2450,7 +2450,7 @@ VT100.prototype.keyDown = function(event) { event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || event.keyCode >= 186 && event.keyCode <= 192 || - event.keyCode >= 219 && event.keyCode <= 222 || + event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; try { if (navigator.appName == 'Konqueror') { @@ -2589,7 +2589,7 @@ VT100.prototype.keyUp = function(event) { event.keyCode == 106 || event.keyCode == 107 || event.keyCode >= 109 && event.keyCode <= 111 || event.keyCode >= 186 && event.keyCode <= 192 || - event.keyCode >= 219 && event.keyCode <= 222 || + event.keyCode >= 219 && event.keyCode <= 223 || event.keyCode == 252; var fake = [ ]; fake.ctrlKey = event.ctrlKey;