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

Allow users to disable blinking cursor from context menu.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@212 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2010-08-06 22:15:35 +00:00
parent 21cfbec230
commit bdc877c53e
8 changed files with 85 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-08-06 Markus Gutschke <markus@shellinabox.com>
* Allow users to disable the blinking cursor from the context menu.
2010-07-08 Markus Gutschke <markus@shellinabox.com> 2010-07-08 Markus Gutschke <markus@shellinabox.com>
* Added support for systems that have utmpx.h, but don't implement * Added support for systems that have utmpx.h, but don't implement

2
config.h
View file

@ -153,7 +153,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "210" #define VCS_REVISION "212"
/* Version number of package */ /* Version number of package */
#define VERSION "2.10" #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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=210 VCS_REVISION=212
cat >>confdefs.h <<_ACEOF 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 dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.10, markus@shellinabox.com) AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
VCS_REVISION=210 VCS_REVISION=212
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

37
demo/vt100.js
View file

@ -281,11 +281,12 @@ VT100.prototype.getUserSettings = function() {
// Compute hash signature to identify the entries in the userCSS menu. // Compute hash signature to identify the entries in the userCSS menu.
// If the menu is unchanged from last time, default values can be // If the menu is unchanged from last time, default values can be
// looked up in a cookie associated with this page. // looked up in a cookie associated with this page.
this.signature = 1; this.signature = 2;
this.utfPreferred = true; this.utfPreferred = true;
this.visualBell = typeof suppressAllAudio != 'undefined' && this.visualBell = typeof suppressAllAudio != 'undefined' &&
suppressAllAudio; suppressAllAudio;
this.autoprint = true; this.autoprint = true;
this.blinkingCursor = true;
if (this.visualBell) { if (this.visualBell) {
this.signature = Math.floor(16807*this.signature + 1) % this.signature = Math.floor(16807*this.signature + 1) %
((1 << 31) - 1); ((1 << 31) - 1);
@ -315,6 +316,7 @@ VT100.prototype.getUserSettings = function() {
this.utfPreferred = settings.charAt(0) != '0'; this.utfPreferred = settings.charAt(0) != '0';
this.visualBell = settings.charAt(1) != '0'; this.visualBell = settings.charAt(1) != '0';
this.autoprint = settings.charAt(2) != '0'; this.autoprint = settings.charAt(2) != '0';
this.blinkingCursor = settings.charAt(3) != '0';
if (typeof userCSSList != 'undefined') { if (typeof userCSSList != 'undefined') {
for (var i = 0; i < userCSSList.length; ++i) { for (var i = 0; i < userCSSList.length; ++i) {
userCSSList[i][2] = settings.charAt(i + 3) != '0'; userCSSList[i][2] = settings.charAt(i + 3) != '0';
@ -327,9 +329,10 @@ VT100.prototype.getUserSettings = function() {
VT100.prototype.storeUserSettings = function() { VT100.prototype.storeUserSettings = function() {
var settings = 'shellInABox=' + this.signature + ':' + var settings = 'shellInABox=' + this.signature + ':' +
(this.utfEnabled ? '1' : '0') + (this.utfEnabled ? '1' : '0') +
(this.visualBell ? '1' : '0') + (this.visualBell ? '1' : '0') +
(this.autoprint ? '1' : '0'); (this.autoprint ? '1' : '0') +
(this.blinkingCursor ? '1' : '0');
if (typeof userCSSList != 'undefined') { if (typeof userCSSList != 'undefined') {
for (var i = 0; i < userCSSList.length; ++i) { for (var i = 0; i < userCSSList.length; ++i) {
settings += userCSSList[i][2] ? '1' : '0'; settings += userCSSList[i][2] ? '1' : '0';
@ -1954,8 +1957,12 @@ VT100.prototype.toggleBell = function() {
this.visualBell = !this.visualBell; this.visualBell = !this.visualBell;
}; };
VT100.prototype.toggleCursorBlinking = function() {
this.blinkingCursor = !this.blinkingCursor;
};
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 210)" + alert("VT100 Terminal Emulator " + "2.10 (revision 212)" +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };
@ -1985,9 +1992,12 @@ VT100.prototype.showContextMenu = function(x, y) {
'<li id="beginconfig">' + '<li id="beginconfig">' +
(this.utfEnabled ? '<img src="enabled.gif" />' : '') + (this.utfEnabled ? '<img src="enabled.gif" />' : '') +
'Unicode</li>' + 'Unicode</li>' +
'<li id="endconfig">' + '<li>' +
(this.visualBell ? '<img src="enabled.gif" />' : '') + (this.visualBell ? '<img src="enabled.gif" />' : '') +
'Visual Bell</li>'+ 'Visual Bell</li>'+
'<li id="endconfig">' +
(this.blinkingCursor ? '<img src="enabled.gif" />' : '') +
'Blinking Cursor</li>'+
(this.usercss.firstChild ? (this.usercss.firstChild ?
'<hr id="beginusercss" />' + '<hr id="beginusercss" />' +
this.usercss.innerHTML + this.usercss.innerHTML +
@ -2015,7 +2025,8 @@ VT100.prototype.showContextMenu = function(x, y) {
// Actions for default items // Actions for default items
var actions = [ this.copyLast, p, this.reset, var actions = [ this.copyLast, p, this.reset,
this.toggleUTF, this.toggleBell ]; this.toggleUTF, this.toggleBell,
this.toggleCursorBlinking ];
// Actions for user CSS styles (if any) // Actions for user CSS styles (if any)
for (var i = 0; i < this.usercssActions.length; ++i) { for (var i = 0; i < this.usercssActions.length; ++i) {
@ -2615,7 +2626,7 @@ VT100.prototype.keyUp = function(event) {
VT100.prototype.animateCursor = function(inactive) { VT100.prototype.animateCursor = function(inactive) {
if (!this.cursorInterval) { if (!this.cursorInterval) {
this.cursorInterval = setInterval( this.cursorInterval = setInterval(
function(vt100) { function(vt100) {
return function() { return function() {
vt100.animateCursor(); vt100.animateCursor();
@ -2628,10 +2639,14 @@ VT100.prototype.animateCursor = function(inactive) {
} }
if (inactive != undefined || this.cursor.className != 'inactive') { if (inactive != undefined || this.cursor.className != 'inactive') {
if (inactive) { if (inactive) {
this.cursor.className = 'inactive'; this.cursor.className = 'inactive';
} else { } else {
this.cursor.className = this.cursor.className == 'bright' if (this.blinkingCursor) {
? 'dim' : 'bright'; this.cursor.className = this.cursor.className == 'bright'
? 'dim' : 'bright';
} else {
this.cursor.className = 'bright';
}
} }
} }
}; };

2
shellinabox/shell_in_a_box.js
View file

@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + "2.10 (revision 210)" + alert("Shell In A Box version " + "2.10 (revision 212)" +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

37
shellinabox/vt100.js
View file

@ -281,11 +281,12 @@ VT100.prototype.getUserSettings = function() {
// Compute hash signature to identify the entries in the userCSS menu. // Compute hash signature to identify the entries in the userCSS menu.
// If the menu is unchanged from last time, default values can be // If the menu is unchanged from last time, default values can be
// looked up in a cookie associated with this page. // looked up in a cookie associated with this page.
this.signature = 1; this.signature = 2;
this.utfPreferred = true; this.utfPreferred = true;
this.visualBell = typeof suppressAllAudio != 'undefined' && this.visualBell = typeof suppressAllAudio != 'undefined' &&
suppressAllAudio; suppressAllAudio;
this.autoprint = true; this.autoprint = true;
this.blinkingCursor = true;
if (this.visualBell) { if (this.visualBell) {
this.signature = Math.floor(16807*this.signature + 1) % this.signature = Math.floor(16807*this.signature + 1) %
((1 << 31) - 1); ((1 << 31) - 1);
@ -315,6 +316,7 @@ VT100.prototype.getUserSettings = function() {
this.utfPreferred = settings.charAt(0) != '0'; this.utfPreferred = settings.charAt(0) != '0';
this.visualBell = settings.charAt(1) != '0'; this.visualBell = settings.charAt(1) != '0';
this.autoprint = settings.charAt(2) != '0'; this.autoprint = settings.charAt(2) != '0';
this.blinkingCursor = settings.charAt(3) != '0';
if (typeof userCSSList != 'undefined') { if (typeof userCSSList != 'undefined') {
for (var i = 0; i < userCSSList.length; ++i) { for (var i = 0; i < userCSSList.length; ++i) {
userCSSList[i][2] = settings.charAt(i + 3) != '0'; userCSSList[i][2] = settings.charAt(i + 3) != '0';
@ -327,9 +329,10 @@ VT100.prototype.getUserSettings = function() {
VT100.prototype.storeUserSettings = function() { VT100.prototype.storeUserSettings = function() {
var settings = 'shellInABox=' + this.signature + ':' + var settings = 'shellInABox=' + this.signature + ':' +
(this.utfEnabled ? '1' : '0') + (this.utfEnabled ? '1' : '0') +
(this.visualBell ? '1' : '0') + (this.visualBell ? '1' : '0') +
(this.autoprint ? '1' : '0'); (this.autoprint ? '1' : '0') +
(this.blinkingCursor ? '1' : '0');
if (typeof userCSSList != 'undefined') { if (typeof userCSSList != 'undefined') {
for (var i = 0; i < userCSSList.length; ++i) { for (var i = 0; i < userCSSList.length; ++i) {
settings += userCSSList[i][2] ? '1' : '0'; settings += userCSSList[i][2] ? '1' : '0';
@ -1954,8 +1957,12 @@ VT100.prototype.toggleBell = function() {
this.visualBell = !this.visualBell; this.visualBell = !this.visualBell;
}; };
VT100.prototype.toggleCursorBlinking = function() {
this.blinkingCursor = !this.blinkingCursor;
};
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 210)" + alert("VT100 Terminal Emulator " + "2.10 (revision 212)" +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };
@ -1985,9 +1992,12 @@ VT100.prototype.showContextMenu = function(x, y) {
'<li id="beginconfig">' + '<li id="beginconfig">' +
(this.utfEnabled ? '<img src="enabled.gif" />' : '') + (this.utfEnabled ? '<img src="enabled.gif" />' : '') +
'Unicode</li>' + 'Unicode</li>' +
'<li id="endconfig">' + '<li>' +
(this.visualBell ? '<img src="enabled.gif" />' : '') + (this.visualBell ? '<img src="enabled.gif" />' : '') +
'Visual Bell</li>'+ 'Visual Bell</li>'+
'<li id="endconfig">' +
(this.blinkingCursor ? '<img src="enabled.gif" />' : '') +
'Blinking Cursor</li>'+
(this.usercss.firstChild ? (this.usercss.firstChild ?
'<hr id="beginusercss" />' + '<hr id="beginusercss" />' +
this.usercss.innerHTML + this.usercss.innerHTML +
@ -2015,7 +2025,8 @@ VT100.prototype.showContextMenu = function(x, y) {
// Actions for default items // Actions for default items
var actions = [ this.copyLast, p, this.reset, var actions = [ this.copyLast, p, this.reset,
this.toggleUTF, this.toggleBell ]; this.toggleUTF, this.toggleBell,
this.toggleCursorBlinking ];
// Actions for user CSS styles (if any) // Actions for user CSS styles (if any)
for (var i = 0; i < this.usercssActions.length; ++i) { for (var i = 0; i < this.usercssActions.length; ++i) {
@ -2615,7 +2626,7 @@ VT100.prototype.keyUp = function(event) {
VT100.prototype.animateCursor = function(inactive) { VT100.prototype.animateCursor = function(inactive) {
if (!this.cursorInterval) { if (!this.cursorInterval) {
this.cursorInterval = setInterval( this.cursorInterval = setInterval(
function(vt100) { function(vt100) {
return function() { return function() {
vt100.animateCursor(); vt100.animateCursor();
@ -2628,10 +2639,14 @@ VT100.prototype.animateCursor = function(inactive) {
} }
if (inactive != undefined || this.cursor.className != 'inactive') { if (inactive != undefined || this.cursor.className != 'inactive') {
if (inactive) { if (inactive) {
this.cursor.className = 'inactive'; this.cursor.className = 'inactive';
} else { } else {
this.cursor.className = this.cursor.className == 'bright' if (this.blinkingCursor) {
? 'dim' : 'bright'; this.cursor.className = this.cursor.className == 'bright'
? 'dim' : 'bright';
} else {
this.cursor.className = 'bright';
}
} }
} }
}; };

35
shellinabox/vt100.jspp
View file

@ -281,11 +281,12 @@ VT100.prototype.getUserSettings = function() {
// Compute hash signature to identify the entries in the userCSS menu. // Compute hash signature to identify the entries in the userCSS menu.
// If the menu is unchanged from last time, default values can be // If the menu is unchanged from last time, default values can be
// looked up in a cookie associated with this page. // looked up in a cookie associated with this page.
this.signature = 1; this.signature = 2;
this.utfPreferred = true; this.utfPreferred = true;
this.visualBell = typeof suppressAllAudio != 'undefined' && this.visualBell = typeof suppressAllAudio != 'undefined' &&
suppressAllAudio; suppressAllAudio;
this.autoprint = true; this.autoprint = true;
this.blinkingCursor = true;
if (this.visualBell) { if (this.visualBell) {
this.signature = Math.floor(16807*this.signature + 1) % this.signature = Math.floor(16807*this.signature + 1) %
((1 << 31) - 1); ((1 << 31) - 1);
@ -315,6 +316,7 @@ VT100.prototype.getUserSettings = function() {
this.utfPreferred = settings.charAt(0) != '0'; this.utfPreferred = settings.charAt(0) != '0';
this.visualBell = settings.charAt(1) != '0'; this.visualBell = settings.charAt(1) != '0';
this.autoprint = settings.charAt(2) != '0'; this.autoprint = settings.charAt(2) != '0';
this.blinkingCursor = settings.charAt(3) != '0';
if (typeof userCSSList != 'undefined') { if (typeof userCSSList != 'undefined') {
for (var i = 0; i < userCSSList.length; ++i) { for (var i = 0; i < userCSSList.length; ++i) {
userCSSList[i][2] = settings.charAt(i + 3) != '0'; userCSSList[i][2] = settings.charAt(i + 3) != '0';
@ -327,9 +329,10 @@ VT100.prototype.getUserSettings = function() {
VT100.prototype.storeUserSettings = function() { VT100.prototype.storeUserSettings = function() {
var settings = 'shellInABox=' + this.signature + ':' + var settings = 'shellInABox=' + this.signature + ':' +
(this.utfEnabled ? '1' : '0') + (this.utfEnabled ? '1' : '0') +
(this.visualBell ? '1' : '0') + (this.visualBell ? '1' : '0') +
(this.autoprint ? '1' : '0'); (this.autoprint ? '1' : '0') +
(this.blinkingCursor ? '1' : '0');
if (typeof userCSSList != 'undefined') { if (typeof userCSSList != 'undefined') {
for (var i = 0; i < userCSSList.length; ++i) { for (var i = 0; i < userCSSList.length; ++i) {
settings += userCSSList[i][2] ? '1' : '0'; settings += userCSSList[i][2] ? '1' : '0';
@ -1954,6 +1957,10 @@ VT100.prototype.toggleBell = function() {
this.visualBell = !this.visualBell; this.visualBell = !this.visualBell;
}; };
VT100.prototype.toggleCursorBlinking = function() {
this.blinkingCursor = !this.blinkingCursor;
};
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + VERSION + alert("VT100 Terminal Emulator " + VERSION +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
@ -1985,9 +1992,12 @@ VT100.prototype.showContextMenu = function(x, y) {
'<li id="beginconfig">' + '<li id="beginconfig">' +
(this.utfEnabled ? '<img src="enabled.gif" />' : '') + (this.utfEnabled ? '<img src="enabled.gif" />' : '') +
'Unicode</li>' + 'Unicode</li>' +
'<li id="endconfig">' + '<li>' +
(this.visualBell ? '<img src="enabled.gif" />' : '') + (this.visualBell ? '<img src="enabled.gif" />' : '') +
'Visual Bell</li>'+ 'Visual Bell</li>'+
'<li id="endconfig">' +
(this.blinkingCursor ? '<img src="enabled.gif" />' : '') +
'Blinking Cursor</li>'+
(this.usercss.firstChild ? (this.usercss.firstChild ?
'<hr id="beginusercss" />' + '<hr id="beginusercss" />' +
this.usercss.innerHTML + this.usercss.innerHTML +
@ -2015,7 +2025,8 @@ VT100.prototype.showContextMenu = function(x, y) {
// Actions for default items // Actions for default items
var actions = [ this.copyLast, p, this.reset, var actions = [ this.copyLast, p, this.reset,
this.toggleUTF, this.toggleBell ]; this.toggleUTF, this.toggleBell,
this.toggleCursorBlinking ];
// Actions for user CSS styles (if any) // Actions for user CSS styles (if any)
for (var i = 0; i < this.usercssActions.length; ++i) { for (var i = 0; i < this.usercssActions.length; ++i) {
@ -2615,7 +2626,7 @@ VT100.prototype.keyUp = function(event) {
VT100.prototype.animateCursor = function(inactive) { VT100.prototype.animateCursor = function(inactive) {
if (!this.cursorInterval) { if (!this.cursorInterval) {
this.cursorInterval = setInterval( this.cursorInterval = setInterval(
function(vt100) { function(vt100) {
return function() { return function() {
vt100.animateCursor(); vt100.animateCursor();
@ -2628,10 +2639,14 @@ VT100.prototype.animateCursor = function(inactive) {
} }
if (inactive != undefined || this.cursor.className != 'inactive') { if (inactive != undefined || this.cursor.className != 'inactive') {
if (inactive) { if (inactive) {
this.cursor.className = 'inactive'; this.cursor.className = 'inactive';
} else { } else {
this.cursor.className = this.cursor.className == 'bright' if (this.blinkingCursor) {
? 'dim' : 'bright'; this.cursor.className = this.cursor.className == 'bright'
? 'dim' : 'bright';
} else {
this.cursor.className = 'bright';
}
} }
} }
}; };