Merge branch 'master' of https://github.com/xtermjs/xterm.js into linkParser

src/browser/Clipboard.ts

@@ -82,12 +82,12 @@ export function moveTextAreaUnderMouseCursor(ev: MouseEvent, textarea: HTMLTextA
   // Reset the terminal textarea's styling
   // Timeout needs to be long enough for click event to be handled.
   setTimeout(() => {
-    textarea.style.position = null;
-    textarea.style.width = null;
-    textarea.style.height = null;
-    textarea.style.left = null;
-    textarea.style.top = null;
-    textarea.style.zIndex = null;
+    textarea.style.position = '';
+    textarea.style.width = '';
+    textarea.style.height = '';
+    textarea.style.left = '';
+    textarea.style.top = '';
+    textarea.style.zIndex = '';
   }, 200);
 }
 

src/browser/Linkifier.ts

@@ -308,7 +308,7 @@ export class Linkifier implements ILinkifier {
         if (matcher.hoverTooltipCallback) {
           // Note that IViewportRange use 1-based coordinates to align with escape sequences such
           // as CUP which use 1,1 as the default for row/col
-          matcher.hoverTooltipCallback(e, uri, { start: { row: y1 + 1, col: x1 + 1 }, end: { row: y2 + 1, col: x2 } });
+          matcher.hoverTooltipCallback(e, uri, { start: { x: x1, y: y1 }, end: { x: x2, y: y2 } });
         }
       },
       () => {

src/browser/MouseZoneManager.ts

@@ -175,11 +175,9 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
     // Find the active zone, prevent event propagation if found to prevent other
     // components from handling the mouse event.
     const zone = this._findZoneEventAt(e);
-    if (zone) {
-      if (zone.willLinkActivate(e)) {
-        e.preventDefault();
-        e.stopImmediatePropagation();
-      }
+    if (zone?.willLinkActivate(e)) {
+      e.preventDefault();
+      e.stopImmediatePropagation();
     }
   }
 

src/browser/Types.d.ts

@@ -45,13 +45,13 @@ export interface IViewport extends IDisposable {
 }
 
 export interface IViewportRange {
-  start: IViewportCellPosition;
-  end: IViewportCellPosition;
+  start: IViewportRangePosition;
+  end: IViewportRangePosition;
 }
 
-export interface IViewportCellPosition {
-  col: number;
-  row: number;
+export interface IViewportRangePosition {
+  x: number;
+  y: number;
 }
 
 export type LinkMatcherHandler = (event: MouseEvent, uri: string) => void;

src/browser/Viewport.ts

@@ -237,7 +237,7 @@ export class Viewport extends Disposable implements IViewport {
     if ((modifier === 'alt' && ev.altKey) ||
         (modifier === 'ctrl' && ev.ctrlKey) ||
         (modifier === 'shift' && ev.shiftKey)) {
-      return amount * this._optionsService.options.fastScrollSensitivity;
+      return amount * this._optionsService.options.fastScrollSensitivity * this._optionsService.options.scrollSensitivity;
     }
 
     return amount * this._optionsService.options.scrollSensitivity;

src/browser/renderer/BaseRenderLayer.ts

@@ -60,9 +60,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
 
   public dispose(): void {
     this._container.removeChild(this._canvas);
-    if (this._charAtlas) {
-      this._charAtlas.dispose();
-    }
+    this._charAtlas?.dispose();
   }
 
   private _initCanvas(): void {

src/browser/services/SelectionService.ts

@@ -688,9 +688,7 @@ export class SelectionService implements ISelectionService {
     // reverseIndex) and delete in a splice is only ever used when the same
     // number of elements was just added. Given this is could actually be
     // beneficial to leave the selection as is for these cases.
-    if (this._trimListener) {
-      this._trimListener.dispose();
-    }
+    this._trimListener.dispose();
     this._trimListener = e.activeBuffer.lines.onTrim(amount => this._onTrim(amount));
   }