Make "${url}" include the URL parameters.

Cleanup the transparent printing HTML a little bit.

diff --git a/config.h b/config.h
index 1458ee40ca116410b334eb175b94b303b7371d82..7f0db3bbe1d9a02d928e2030c0741663618d8a20 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 "176"
+#define VCS_REVISION "178"
 
 /* Version number of package */
 #define VERSION "2.9"

diff --git a/configure b/configure
index 7b658cfa13695e511cf28b9fcb1968da411a540e..71163f695ad18dee0a8c8a1416c6aec39c239fb1 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=176
+VCS_REVISION=178
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index b58e8420a2f1024646ca2554f244e872b61ae595..0e5c78f9390ec973e9b026a498ae002bd744f386 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=176
+VCS_REVISION=178
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])

diff --git a/debian/rules b/debian/rules
index a082552e3bf1e04c9007089fe68569e1d8d4f0fe..c724ed9ca00724abe4210f3de10986b958fbc4e2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ binary-arch: build install
        dh_installchangelogs ChangeLog
        dh_installdocs --exclude COPYING --exclude INSTALL --exclude ChangeLog
        dh_installexamples
-       dh_install
+       dh_install --sourcedir=debian/tmp
 #      dh_installmenu
 #      dh_installdebconf
 #      dh_installlogrotate

diff --git a/demo/print-styles.css b/demo/print-styles.css
index ffb97af244b231a157715d48ddff2a51e98d2d9a..187dc3f82f2642023de24e4f314a9f259c4ee9cc 100644 (file)
--- a/demo/print-styles.css
+++ b/demo/print-styles.css
@@ -1,9 +1,11 @@
 /* Set styles used when opening the printer window */
 #print {
-  margin: 4ex 0px 0px 0px;
+  margin: 0.5ex 0px 0px 0px;
 }
 
-#options {
+#options, #spacer {
+  font-family:      sans;
+  font-size:        smaller;
   position:         fixed;
   top:              0px;
   left:             0px;
@@ -16,6 +18,11 @@
   border-bottom:    1px solid black;
 }
 
+#spacer {
+  position:   static;
+  visibility: hidden;
+}
+
 @media print {
   body {
     margin: 0px;

diff --git a/demo/vt100.js b/demo/vt100.js
index b745502630ff6fb1b9dcf46491cd19fd2a9f9c62..54aef0dae192d6c200147d4f306f30c670b2e890 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 176)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 178)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };
@@ -2853,6 +2853,7 @@ VT100.prototype.openPrinterWindow = function() {
           (this.autoprint ? ' checked' : '') + '>' +
           'Automatically, print page(s) when job is ready' +
         '</input></div>\n' +
+        '<div id="spacer"><input type="checkbox">&nbsp;</input></div>' +
         '<pre id="print"></pre>\n';
       var autoprint = this.printWin.document.getElementById('autoprint');
       this.addListener(autoprint, 'click',

diff --git a/shellinabox/print-styles.css b/shellinabox/print-styles.css
index ffb97af244b231a157715d48ddff2a51e98d2d9a..187dc3f82f2642023de24e4f314a9f259c4ee9cc 100644 (file)
--- a/shellinabox/print-styles.css
+++ b/shellinabox/print-styles.css
@@ -1,9 +1,11 @@
 /* Set styles used when opening the printer window */
 #print {
-  margin: 4ex 0px 0px 0px;
+  margin: 0.5ex 0px 0px 0px;
 }
 
-#options {
+#options, #spacer {
+  font-family:      sans;
+  font-size:        smaller;
   position:         fixed;
   top:              0px;
   left:             0px;
@@ -16,6 +18,11 @@
   border-bottom:    1px solid black;
 }
 
+#spacer {
+  position:   static;
+  visibility: hidden;
+}
+
 @media print {
   body {
     margin: 0px;

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 8e810bfed30b1be4e3563b31937e622c59044470..af87ad8dd8a57c08771c40bfb7294492af97b291 100644 (file)
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -91,8 +91,10 @@ function extend(subClass, baseClass) {
 
 function ShellInABox(url, container) {
   if (url == undefined) {
+    this.rooturl    = document.location.href;
     this.url        = document.location.href.replace(/[?#].*/, '');
   } else {
+    this.rooturl    = url;
     this.url        = url;
   }
   if (document.location.hash != '') {
@@ -168,7 +170,8 @@ ShellInABox.prototype.sendRequest = function(request) {
   var content                = 'width=' + this.terminalWidth +
                                '&height=' + this.terminalHeight +
                                (this.session ? '&session=' +
-                                encodeURIComponent(this.session) : '');
+                                encodeURIComponent(this.session) : '&rooturl='+
+                                encodeURIComponent(this.rooturl));
   request.setRequestHeader('Content-Length', content.length);
 
   request.onreadystatechange = function(shellInABox) {
@@ -355,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.9 (revision 176)" +
+  alert("Shell In A Box version " + "2.9 (revision 178)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

diff --git a/shellinabox/shell_in_a_box.jspp b/shellinabox/shell_in_a_box.jspp
index 11b91d506664e992a234ec0848e1ca2e2399dae6..f86288012ab106bba94c91fd8e1830bbde12a5d2 100644 (file)
--- a/shellinabox/shell_in_a_box.jspp
+++ b/shellinabox/shell_in_a_box.jspp
@@ -91,8 +91,10 @@ function extend(subClass, baseClass) {
 
 function ShellInABox(url, container) {
   if (url == undefined) {
+    this.rooturl    = document.location.href;
     this.url        = document.location.href.replace(/[?#].*/, '');
   } else {
+    this.rooturl    = url;
     this.url        = url;
   }
   if (document.location.hash != '') {
@@ -168,7 +170,8 @@ ShellInABox.prototype.sendRequest = function(request) {
   var content                = 'width=' + this.terminalWidth +
                                '&height=' + this.terminalHeight +
                                (this.session ? '&session=' +
-                                encodeURIComponent(this.session) : '');
+                                encodeURIComponent(this.session) : '&rooturl='+
+                                encodeURIComponent(this.rooturl));
   request.setRequestHeader('Content-Length', content.length);
 
   request.onreadystatechange = function(shellInABox) {

diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c
index 054d7413e99ed2920a733ab0fb8e63bae4cf8ce4..dcf05ff7fb00d1606c4be016ed057a1f4c0103cf 100644 (file)
--- a/shellinabox/shellinaboxd.c
+++ b/shellinabox/shellinaboxd.c
@@ -778,6 +778,7 @@ static void usage(void) {
           "  ${lines}   - number of rows\n"
           "  ${peer}    - name of remote peer\n"
           "  ${uid}     - user id\n"
+          "  ${url}     - the URL that serves the terminal session\n"
           "  ${user}    - user name\n"
           "\n"
           "One or more --user-css arguments define optional user-selectable "

diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index b745502630ff6fb1b9dcf46491cd19fd2a9f9c62..54aef0dae192d6c200147d4f306f30c670b2e890 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 176)" +
+  alert("VT100 Terminal Emulator " + "2.9 (revision 178)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };
@@ -2853,6 +2853,7 @@ VT100.prototype.openPrinterWindow = function() {
           (this.autoprint ? ' checked' : '') + '>' +
           'Automatically, print page(s) when job is ready' +
         '</input></div>\n' +
+        '<div id="spacer"><input type="checkbox">&nbsp;</input></div>' +
         '<pre id="print"></pre>\n';
       var autoprint = this.printWin.document.getElementById('autoprint');
       this.addListener(autoprint, 'click',

diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp
index 3170b1e0cfd54a6520ffb1a4c3a71d4404b0d6c7..5567affd13e14a9a137d8c1edd10c8fc92b76f31 100644 (file)
--- a/shellinabox/vt100.jspp
+++ b/shellinabox/vt100.jspp
@@ -2853,6 +2853,7 @@ VT100.prototype.openPrinterWindow = function() {
           (this.autoprint ? ' checked' : '') + '>' +
           'Automatically, print page(s) when job is ready' +
         '</input></div>\n' +
+        '<div id="spacer"><input type="checkbox">&nbsp;</input></div>' +
         '<pre id="print"></pre>\n';
       var autoprint = this.printWin.document.getElementById('autoprint');
       this.addListener(autoprint, 'click',