simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow changing of font sizes in the user CSS.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@219 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2010-09-03 18:00:25 +00:00
parent daffdc356a
commit c87777d04f
8 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -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

2
config.h
View file

@ -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"

2
configure vendored
View file

@ -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

2
configure.ac
View file

@ -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])

14
demo/vt100.js
View file

@ -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");
};

2
shellinabox/shell_in_a_box.js
View file

@ -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 ?

14
shellinabox/vt100.js
View file

@ -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");
};

12
shellinabox/vt100.jspp
View file

@ -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);
}