Fixed the escape sequences for VT100 transparent printing support.

diff --git a/config.h b/config.h
index 49e64bea86abd2d50490762e8fa96a9ed304e170..b5761a6c03b33e6ada2656fe3d5baa9089b48f22 100644 (file)
--- 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 b40a1ad975094f0ec84b81c190f2f948cbf36e37..a6cafa7d72b001424a785c9317e60126290062ac 100755 (executable)
--- 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 71872265c69a5eba8d6b09eeaf1ed2218d7b1372..eb496b0f3e6924528c4d1ce6ce297488a5c0a177 100644 (file)
--- 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 2841fcf444cbd6813738f195a44998c2559d7135..484afe7c8b6bdf910e8a6c821fdcaeded6824a06 100644 (file)
--- 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 68b139b34f6fafb51c219cce729145d9eefe2117..8881b72a0b36047b87a2b5f418f7adb9df28fd70 100644 (file)
--- 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 2841fcf444cbd6813738f195a44998c2559d7135..484afe7c8b6bdf910e8a6c821fdcaeded6824a06 100644 (file)
--- 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 5567affd13e14a9a137d8c1edd10c8fc92b76f31..d206dc489ba6a018e57f20a68d7cd3c09362f370 100644 (file)
--- 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;
   }