From daffdc356a13374094e112746ab990f416a6b753 Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Fri, 3 Sep 2010 17:24:57 +0000 Subject: [PATCH] Fix some scaling related issues. This fix is thanks to some excellent detective work by Jan . git-svn-id: https://shellinabox.googlecode.com/svn/trunk@218 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- ChangeLog | 5 +++++ config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/styles.css | 2 +- demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/styles.css | 2 +- shellinabox/vt100.js | 2 +- 9 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9869f8d..1a2a305 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-09-03 Markus Gutschke + + * Fix some scaling related issues. This fix is thanks to some + excellent detective work by Jan . + 2010-08-19 Markus Gutschke * Thanks to lotr44's excellent analysis of the problem, we now have diff --git a/config.h b/config.h index c58ce4d..43cf6d9 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 "217" +#define VCS_REVISION "218" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index 892ad31..ba1bfc6 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=217 +VCS_REVISION=218 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 861b093..05786e5 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=217 +VCS_REVISION=218 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/styles.css b/demo/styles.css index b1b5b6f..7f7f683 100644 --- a/demo/styles.css +++ b/demo/styles.css @@ -44,7 +44,7 @@ padding: 1px; } -#vt100 #console, #vt100 #alt_console, #vt100 #cursor, #vt100 #lineheight { +#vt100 #console, #vt100 #alt_console, #vt100 #cursor, #vt100 #lineheight, #vt100 .hidden pre { font-family: "DejaVu Sans Mono", "Everson Mono", FreeMono, "Andale Mono", "Lucida Console", monospace; } diff --git a/demo/vt100.js b/demo/vt100.js index 329e393..6e2dd28 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 217)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 218)" + "\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 86b0d4d..07a0536 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 217)" + + alert("Shell In A Box version " + "2.10 (revision 218)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/styles.css b/shellinabox/styles.css index a6aa53a..79ad9b2 100644 --- a/shellinabox/styles.css +++ b/shellinabox/styles.css @@ -44,7 +44,7 @@ padding: 1px; } -#vt100 #console, #vt100 #alt_console, #vt100 #cursor, #vt100 #lineheight { +#vt100 #console, #vt100 #alt_console, #vt100 #cursor, #vt100 #lineheight, #vt100 .hidden pre { font-family: "DejaVu Sans Mono", "Everson Mono", FreeMono, "Andale Mono", "Lucida Console", monospace; } diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 329e393..6e2dd28 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 217)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 218)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };