Allow changing of font sizes in the user CSS.

diff --git a/ChangeLog b/ChangeLog
index 1a2a30543614ac04509bbc344b26676b8438525e..d7ea95971712d7f5eb1fcbd4485cb96db963fc34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
        * Fix some scaling related issues. This fix is thanks to some
        excellent detective work by Jan <siev...@zedat.fu-berlin.de>.
 
+       * Allow changing of font sizes in the user CSS.
+
 2010-08-19  Markus Gutschke  <markus@shellinabox.com>
 
        * Thanks to lotr44's excellent analysis of the problem, we now have

diff --git a/config.h b/config.h
index 43cf6d9022c9bd968174937fc4e7d9b8a7d6c2d7..c9fe702945e0ab5ef3a37adb5306c3a6e128ed39 100644 (file)
--- 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 "218"
+#define VCS_REVISION "219"
 
 /* Version number of package */
 #define VERSION "2.10"

diff --git a/configure b/configure
index ba1bfc637d58abe5524ac3e47fdfc4fa9d9fb9e6..be80a0b1abeafab07aef8bc3c41513b9df10f3a5 100755 (executable)
--- 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=218
+VCS_REVISION=219
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/configure.ac b/configure.ac
index 05786e57e199a3fe3df48afe7b6122017304827e..740224b7da17164693112c2991ce03e028571c5d 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.10, markus@shellinabox.com)
-VCS_REVISION=218
+VCS_REVISION=219
 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 6e2dd28502d66c86a13a6d4d78f699454e93bbc0..a12b493010cc4ce3745a874b3ba6317fe77b57d3 100644 (file)
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -434,6 +434,18 @@ VT100.prototype.initializeUserCSSStyles = function() {
                   }
                   entry                  = entry.nextSibling;
                 }
+
+                // If the font size changed, adjust cursor and line dimensions
+                this.cursor.style.cssText= '';
+                this.cursorWidth         = this.cursor.clientWidth;
+                this.cursorHeight        = this.lineheight.clientHeight;
+                for (i = 0; i < this.console.length; ++i) {
+                  for (var line = this.console[i].firstChild; line;
+                       line = line.nextSibling) {
+                    line.style.height    = this.cursorHeight + 'px';
+                  }
+                }
+                vt100.resizer();
               };
             }(this, j, beginOfGroup, i - beginOfGroup);
         }
@@ -1962,7 +1974,7 @@ VT100.prototype.toggleCursorBlinking = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 218)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 219)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 07a053608606a874f305bf3e0f7e19b59f64b467..7d46858501b6b6ac384554e9d379b72faaf1d72e 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.10 (revision 218)" +
+  alert("Shell In A Box version " + "2.10 (revision 219)" +
         "\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 6e2dd28502d66c86a13a6d4d78f699454e93bbc0..a12b493010cc4ce3745a874b3ba6317fe77b57d3 100644 (file)
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -434,6 +434,18 @@ VT100.prototype.initializeUserCSSStyles = function() {
                   }
                   entry                  = entry.nextSibling;
                 }
+
+                // If the font size changed, adjust cursor and line dimensions
+                this.cursor.style.cssText= '';
+                this.cursorWidth         = this.cursor.clientWidth;
+                this.cursorHeight        = this.lineheight.clientHeight;
+                for (i = 0; i < this.console.length; ++i) {
+                  for (var line = this.console[i].firstChild; line;
+                       line = line.nextSibling) {
+                    line.style.height    = this.cursorHeight + 'px';
+                  }
+                }
+                vt100.resizer();
               };
             }(this, j, beginOfGroup, i - beginOfGroup);
         }
@@ -1962,7 +1974,7 @@ VT100.prototype.toggleCursorBlinking = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.10 (revision 218)" +
+  alert("VT100 Terminal Emulator " + "2.10 (revision 219)" +
         "\nCopyright 2008-2010 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };

diff --git a/shellinabox/vt100.jspp b/shellinabox/vt100.jspp
index 3fe2a9f8f43ffebeafbc2551e2aa439ae9f62421..d5c289828b831ef5d2dd1e6c30df32c59c07f92c 100644 (file)
--- a/shellinabox/vt100.jspp
+++ b/shellinabox/vt100.jspp
@@ -434,6 +434,18 @@ VT100.prototype.initializeUserCSSStyles = function() {
                   }
                   entry                  = entry.nextSibling;
                 }
+
+                // If the font size changed, adjust cursor and line dimensions
+                this.cursor.style.cssText= '';
+                this.cursorWidth         = this.cursor.clientWidth;
+                this.cursorHeight        = this.lineheight.clientHeight;
+                for (i = 0; i < this.console.length; ++i) {
+                  for (var line = this.console[i].firstChild; line;
+                       line = line.nextSibling) {
+                    line.style.height    = this.cursorHeight + 'px';
+                  }
+                }
+                vt100.resizer();
               };
             }(this, j, beginOfGroup, i - beginOfGroup);
         }