Merge branch 'master' into 699_linux_middle_click

diff --git a/src/xterm.css b/src/xterm.css
index 37f661a75d9f033b2951eb5af015ac5ff228b675..6d6f48fadc9fed00907e37441a1260a261ac7bf0 100644 (file)
--- a/src/xterm.css
+++ b/src/xterm.css
@@ -192,11 +192,14 @@
     position: absolute;
     top: 0;
     left: 0;
+    z-index: 1;
+    opacity: 0.3;
+    pointer-events: none;
 }
 
 .terminal .xterm-selection div {
     position: absolute;
-    background-color: #555;
+    background-color: #fff;
 }
 
 /*

diff --git a/src/xterm.js b/src/xterm.js
index 478c6856e020c7bc03b98f1612160850666e0f38..cb060755e091a93865621866eecab44cc413026f 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -539,8 +539,9 @@ Terminal.prototype.initGlobal = function() {
 
   // Handle right click context menus
   if (term.browser.isFirefox) {
+    // Firefox doesn't appear to fire the contextmenu event on right click
     on(this.element, 'mousedown', event => {
-      if (ev.button == 2) {
+      if (event.button == 2) {
         rightClickHandler(event, this.textarea, this.selectionManager);
       }
     });
@@ -661,8 +662,7 @@ Terminal.prototype.open = function(parent, focus) {
   this.viewportScrollArea.classList.add('xterm-scroll-area');
   this.viewportElement.appendChild(this.viewportScrollArea);
 
-  // Create the selection container. This needs to be added before the
-  // rowContainer as the selection must be below the text.
+  // Create the selection container.
   this.selectionContainer = document.createElement('div');
   this.selectionContainer.classList.add('xterm-selection');
   this.element.appendChild(this.selectionContainer);