From b2737d02f6d9ee9ff7c396a28d6f4e82090604ef Mon Sep 17 00:00:00 2001
From: zodiac <zodiac@0da03de8-d603-11dd-86c2-0f8696b7b6f9>
Date: Sat, 21 Mar 2009 06:05:59 +0000
Subject: [PATCH] More IE5.5 and IE6 tweaks. Those browsers are surprisingly
 finicky. Everything else is better at following the specs...

git-svn-id: https://shellinabox.googlecode.com/svn/trunk@83 0da03de8-d603-11dd-86c2-0f8696b7b6f9
---
 config.h               |  2 +-
 shellinabox/styles.css |  5 +++++
 shellinabox/vt100.js   | 19 ++++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/config.h b/config.h
index 166e566..a35426b 100644
--- a/config.h
+++ b/config.h
@@ -95,7 +95,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "81"
+#define VCS_REVISION "82"
 
 /* Version number of package */
 #define VERSION "2.4"
diff --git a/shellinabox/styles.css b/shellinabox/styles.css
index 0833fb2..1db9f19 100644
--- a/shellinabox/styles.css
+++ b/shellinabox/styles.css
@@ -13,6 +13,10 @@
   margin:           0px;
 }
 
+#vt100 pre pre {
+  overflow:         hidden;
+}
+
 #vt100 #scrollable {
   overflow-x:       hidden;
   overflow-y:       scroll;
@@ -55,6 +59,7 @@
   visibility:       hidden;
   width:            1px;
   height:           0px;
+  overflow:         hidden;
 }
 
 #vt100 .hidden {
diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index 60a9d9f..ac65293 100644
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -198,6 +198,7 @@ VT100.prototype.initializeElements = function(container) {
       !this.getChildById(this.container, 'scrollable')  ||
       !this.getChildById(this.container, 'console')     ||
       !this.getChildById(this.container, 'alt_console') ||
+      !this.getChildById(this.container, 'ieprobe')     ||
       !this.getChildById(this.container, 'padding')     ||
       !this.getChildById(this.container, 'cursor')      ||
       !this.getChildById(this.container, 'lineheight')  ||
@@ -235,10 +236,13 @@ VT100.prototype.initializeElements = function(container) {
                        '<div id="menu"></div>' +
                        '<div id="scrollable">' +
                          '<pre id="lineheight">&nbsp;</pre>' +
-                         '<pre id="console"></pre>' +
+                         '<pre id="console">' +
+                           '<pre></pre>' +
+                           '<div id="ieprobe"><span>&nbsp;</span></div>' +
+                         '</pre>' +
                          '<pre id="alt_console" style="display: none"></pre>' +
                          '<div id="padding"></div>' +
-                         '<pre id="cursor">X</pre>' +
+                         '<pre id="cursor">&nbsp;</pre>' +
                        '</div>' +
                        '<div class="hidden">' +
                          '<input type="textfield" id="input" />' +
@@ -274,6 +278,7 @@ VT100.prototype.initializeElements = function(container) {
   this.console                 =
                           [ this.getChildById(this.container, 'console'),
                             this.getChildById(this.container, 'alt_console') ];
+  var ieProbe                  = this.getChildById(this.container, 'ieprobe');
   this.cursor                  = this.getChildById(this.container, 'cursor');
   this.lineheight              = this.getChildById(this.container,
                                                                  'lineheight');
@@ -288,8 +293,12 @@ VT100.prototype.initializeElements = function(container) {
   // but it turns out that browsers sometimes invalidate these values
   // (e.g. while displaying a print preview screen).
   this.cursorWidth             = this.cursor.clientWidth;
-  this.cursorHeight            = this.lineheight.clientHeight ||
-                                 this.cursor.clientHeight;
+  this.cursorHeight            = this.lineheight.clientHeight;
+
+  // IE has a slightly different boxing model, that we need to compensate for
+  this.isIE                    = ieProbe.offsetTop > 1;
+  ieProbe                      = undefined;
+  this.console.innerHTML       = '';
 
   // Determine if the terminal window is positioned at the beginning of the
   // page, or if it is embedded somewhere else in the page. For full-screen
@@ -1018,7 +1027,7 @@ VT100.prototype.putString = function(x, y, text, style) {
     }
   }
   if (pixelX >= 0) {
-    this.cursor.style.left          = pixelX + 'px';
+    this.cursor.style.left          = (pixelX + (this.isIE ? 1 : 0))  + 'px';
   } else {
     this.cursor.style.left          = this.cursorX*this.cursorWidth +
                                       console.offsetLeft + 'px';