From fd5ce81731c05f153b63548b227541862ceb6e79 Mon Sep 17 00:00:00 2001 From: zodiac Date: Wed, 26 Aug 2009 06:49:38 +0000 Subject: [PATCH] Fixed the escape sequences for VT100 transparent printing support. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@180 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 16 ++++++++-------- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 16 ++++++++-------- shellinabox/vt100.jspp | 14 +++++++------- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/config.h b/config.h index 49e64be..b5761a6 100644 --- a/config.h +++ b/config.h @@ -138,7 +138,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "179" +#define VCS_REVISION "180" /* Version number of package */ #define VERSION "2.9" diff --git a/configure b/configure index b40a1ad..a6cafa7 100755 --- a/configure +++ b/configure @@ -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=179 +VCS_REVISION=180 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 7187226..eb496b0 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.9, markus@shellinabox.com) -VCS_REVISION=179 +VCS_REVISION=180 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 2841fcf..484afe7 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.9 (revision 179)" + + alert("VT100 Terminal Emulator " + "2.9 (revision 180)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; @@ -3039,13 +3039,7 @@ VT100.prototype.csii = function(number) { case 0: // Print Screen window.print(); break; - case 4: // Start printing - if (!this.printing && this.printWin && !this.printWin.closed) { - this.printWin.document.getElementById('print').innerHTML = ''; - } - this.printing = 100; - break; - case 5: // Stop printing + case 4: // Stop printing try { if (this.printing && this.printWin && !this.printWin.closed) { var print = this.printWin.document.getElementById('print'); @@ -3063,6 +3057,12 @@ VT100.prototype.csii = function(number) { } this.printing = false; break; + case 5: // Start printing + if (!this.printing && this.printWin && !this.printWin.closed) { + this.printWin.document.getElementById('print').innerHTML = ''; + } + this.printing = 100; + break; default: break; } diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 68b139b..8881b72 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.9 (revision 179)" + + alert("Shell In A Box version " + "2.9 (revision 180)" + "\nCopyright 2008-2009 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 2841fcf..484afe7 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1901,7 +1901,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.9 (revision 179)" + + alert("VT100 Terminal Emulator " + "2.9 (revision 180)" + "\nCopyright 2008-2009 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; @@ -3039,13 +3039,7 @@ VT100.prototype.csii = function(number) { case 0: // Print Screen window.print(); break; - case 4: // Start printing - if (!this.printing && this.printWin && !this.printWin.closed) { - this.printWin.document.getElementById('print').innerHTML = ''; - } - this.printing = 100; - break; - case 5: // Stop printing + case 4: // Stop printing try { if (this.printing && this.printWin && !this.printWin.closed) { var print = this.printWin.document.getElementById('print'); @@ -3063,6 +3057,12 @@ VT100.prototype.csii = function(number) { } this.printing = false; break; + case 5: // Start printing + if (!this.printing && this.printWin && !this.printWin.closed) { + this.printWin.document.getElementById('print').innerHTML = ''; + } + this.printing = 100; + break; default: break; } diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp index 5567aff..d206dc4 100644 --- a/shellinabox/vt100.jspp +++ b/shellinabox/vt100.jspp @@ -3039,13 +3039,7 @@ VT100.prototype.csii = function(number) { case 0: // Print Screen window.print(); break; - case 4: // Start printing - if (!this.printing && this.printWin && !this.printWin.closed) { - this.printWin.document.getElementById('print').innerHTML = ''; - } - this.printing = 100; - break; - case 5: // Stop printing + case 4: // Stop printing try { if (this.printing && this.printWin && !this.printWin.closed) { var print = this.printWin.document.getElementById('print'); @@ -3063,6 +3057,12 @@ VT100.prototype.csii = function(number) { } this.printing = false; break; + case 5: // Start printing + if (!this.printing && this.printWin && !this.printWin.closed) { + this.printWin.document.getElementById('print').innerHTML = ''; + } + this.printing = 100; + break; default: break; }