Merge branch 'master' into reverse_wraparound

src/common/services/BufferService.ts

@@ -6,6 +6,7 @@
 import { IBufferService, IOptionsService } from 'common/services/Services';
 import { BufferSet } from 'common/buffer/BufferSet';
 import { IBufferSet, IBuffer } from 'common/buffer/Types';
+import { EventEmitter, IEvent } from 'common/EventEmitter';
 
 export const MINIMUM_COLS = 2; // Less than 2 can mess with wide chars
 export const MINIMUM_ROWS = 1;
@@ -16,6 +17,11 @@ export class BufferService implements IBufferService {
   public cols: number;
   public rows: number;
   public buffers: IBufferSet;
+  /** Whether the user is scrolling (locks the scroll position) */
+  public isUserScrolling: boolean = false;
+
+  private _onResize = new EventEmitter<{ cols: number, rows: number }>();
+  public get onResize(): IEvent<{ cols: number, rows: number }> { return this._onResize.event; }
 
   public get buffer(): IBuffer { return this.buffers.active; }
 
@@ -30,9 +36,13 @@ export class BufferService implements IBufferService {
   public resize(cols: number, rows: number): void {
     this.cols = cols;
     this.rows = rows;
+    this.buffers.resize(cols, rows);
+    this.buffers.setupTabStops(this.cols);
+    this._onResize.fire({ cols, rows });
   }
 
   public reset(): void {
     this.buffers = new BufferSet(this._optionsService, this);
+    this.isUserScrolling = false;
   }
 }

src/common/services/CharsetService.ts

@@ -10,22 +10,23 @@ export class CharsetService implements ICharsetService {
   public serviceBrand: any;
 
   public charset: ICharset | undefined;
-  public charsets: ICharset[] = [];
   public glevel: number = 0;
 
+  private _charsets: (ICharset | undefined)[] = [];
+
   public reset(): void {
     this.charset = undefined;
-    this.charsets = [];
+    this._charsets = [];
     this.glevel = 0;
   }
 
   public setgLevel(g: number): void {
     this.glevel = g;
-    this.charset = this.charsets[g];
+    this.charset = this._charsets[g];
   }
 
-  public setgCharset(g: number, charset: ICharset): void {
-    this.charsets[g] = charset;
+  public setgCharset(g: number, charset: ICharset | undefined): void {
+    this._charsets[g] = charset;
     if (this.glevel === g) {
       this.charset = charset;
     }

src/common/services/CoreMouseService.ts

@@ -192,6 +192,10 @@ export class CoreMouseService implements ICoreMouseService {
     return this._activeProtocol;
   }
 
+  public get areMouseEventsActive(): boolean {
+    return this._protocols[this._activeProtocol].events !== 0;
+  }
+
   public set activeProtocol(name: string) {
     if (!this._protocols[name]) {
       throw new Error(`unknown protocol "${name}"`);

src/common/services/CoreService.ts

@@ -5,14 +5,20 @@
 
 import { ICoreService, ILogService, IOptionsService, IBufferService } from 'common/services/Services';
 import { EventEmitter, IEvent } from 'common/EventEmitter';
-import { IDecPrivateModes } from 'common/Types';
+import { IDecPrivateModes, IModes } from 'common/Types';
 import { clone } from 'common/Clone';
 
+const DEFAULT_MODES: IModes = Object.freeze({
+  insertMode: false
+});
+
 const DEFAULT_DEC_PRIVATE_MODES: IDecPrivateModes = Object.freeze({
   applicationCursorKeys: false,
   applicationKeypad: false,
+  bracketedPasteMode: false,
   origin: false,
   reverseWraparound: false,
+  sendFocus: false,
   wraparound: true // defaults: xterm - true, vt100 - false
 });
 
@@ -21,6 +27,7 @@ export class CoreService implements ICoreService {
 
   public isCursorInitialized: boolean = false;
   public isCursorHidden: boolean = false;
+  public modes: IModes;
   public decPrivateModes: IDecPrivateModes;
 
   private _onData = new EventEmitter<string>();
@@ -37,10 +44,12 @@ export class CoreService implements ICoreService {
     @ILogService private readonly _logService: ILogService,
     @IOptionsService private readonly _optionsService: IOptionsService
   ) {
+    this.modes = clone(DEFAULT_MODES);
     this.decPrivateModes = clone(DEFAULT_DEC_PRIVATE_MODES);
   }
 
   public reset(): void {
+    this.modes = clone(DEFAULT_MODES);
     this.decPrivateModes = clone(DEFAULT_DEC_PRIVATE_MODES);
   }
 

src/common/services/Services.ts

@@ -5,19 +5,20 @@
 
 import { IEvent } from 'common/EventEmitter';
 import { IBuffer, IBufferSet } from 'common/buffer/Types';
-import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEncoding, ICoreMouseProtocol, CoreMouseEventType, ICharset, IWindowOptions } from 'common/Types';
+import { IDecPrivateModes, ICoreMouseEvent, CoreMouseEncoding, ICoreMouseProtocol, CoreMouseEventType, ICharset, IWindowOptions, IModes } from 'common/Types';
 import { createDecorator } from 'common/services/ServiceRegistry';
 
 export const IBufferService = createDecorator<IBufferService>('BufferService');
 export interface IBufferService {
-  serviceBrand: any;
+  serviceBrand: undefined;
 
   readonly cols: number;
   readonly rows: number;
   readonly buffer: IBuffer;
   readonly buffers: IBufferSet;
+  isUserScrolling: boolean;
 
-  // TODO: Move resize event here
+  onResize: IEvent<{ cols: number, rows: number }>;
 
   resize(cols: number, rows: number): void;
   reset(): void;
@@ -27,6 +28,7 @@ export const ICoreMouseService = createDecorator<ICoreMouseService>('CoreMouseSe
 export interface ICoreMouseService {
   activeProtocol: string;
   activeEncoding: string;
+  areMouseEventsActive: boolean;
   addProtocol(name: string, protocol: ICoreMouseProtocol): void;
   addEncoding(name: string, encoding: CoreMouseEncoding): void;
   reset(): void;
@@ -51,12 +53,12 @@ export interface ICoreMouseService {
   /**
    * Human readable version of mouse events.
    */
-  explainEvents(events: CoreMouseEventType): {[event: string]: boolean};
+  explainEvents(events: CoreMouseEventType): { [event: string]: boolean };
 }
 
 export const ICoreService = createDecorator<ICoreService>('CoreService');
 export interface ICoreService {
-  serviceBrand: any;
+  serviceBrand: undefined;
 
   /**
    * Initially the cursor will not be visible until the first time the terminal
@@ -65,6 +67,7 @@ export interface ICoreService {
   isCursorInitialized: boolean;
   isCursorHidden: boolean;
 
+  readonly modes: IModes;
   readonly decPrivateModes: IDecPrivateModes;
 
   readonly onData: IEvent<string>;
@@ -92,11 +95,10 @@ export interface ICoreService {
 
 export const ICharsetService = createDecorator<ICharsetService>('CharsetService');
 export interface ICharsetService {
-  serviceBrand: any;
+  serviceBrand: undefined;
 
   charset: ICharset | undefined;
   readonly glevel: number;
-  readonly charsets: ReadonlyArray<ICharset>;
 
   reset(): void;
 
@@ -111,12 +113,12 @@ export interface ICharsetService {
    * @param g
    * @param charset
    */
-  setgCharset(g: number, charset: ICharset): void;
+  setgCharset(g: number, charset: ICharset | undefined): void;
 }
 
 export const IDirtyRowService = createDecorator<IDirtyRowService>('DirtyRowService');
 export interface IDirtyRowService {
-  serviceBrand: any;
+  serviceBrand: undefined;
 
   readonly start: number;
   readonly end: number;
@@ -132,61 +134,32 @@ export interface IServiceIdentifier<T> {
   type: T;
 }
 
-export interface IConstructorSignature0<T> {
-  new(...services: { serviceBrand: any }[]): T;
-}
+export interface IBrandedService {
+  serviceBrand: undefined;
+};
 
-export interface IConstructorSignature1<A1, T> {
-  new(first: A1, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature2<A1, A2, T> {
-  new(first: A1, second: A2, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature3<A1, A2, A3, T> {
-  new(first: A1, second: A2, third: A3, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature4<A1, A2, A3, A4, T> {
-  new(first: A1, second: A2, third: A3, fourth: A4, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature5<A1, A2, A3, A4, A5, T> {
-  new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature6<A1, A2, A3, A4, A5, A6, T> {
-  new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature7<A1, A2, A3, A4, A5, A6, A7, T> {
-  new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, ...services: { serviceBrand: any }[]): T;
-}
-
-export interface IConstructorSignature8<A1, A2, A3, A4, A5, A6, A7, A8, T> {
-  new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, eigth: A8, ...services: { serviceBrand: any }[]): T;
-}
+type GetLeadingNonServiceArgs<Args> =
+  Args extends [...IBrandedService[]] ? []
+    : Args extends [infer A1, ...IBrandedService[]] ? [A1]
+      : Args extends [infer A1, infer A2, ...IBrandedService[]] ? [A1, A2]
+        : Args extends [infer A1, infer A2, infer A3, ...IBrandedService[]] ? [A1, A2, A3]
+          : Args extends [infer A1, infer A2, infer A3, infer A4, ...IBrandedService[]] ? [A1, A2, A3, A4]
+            : Args extends [infer A1, infer A2, infer A3, infer A4, infer A5, ...IBrandedService[]] ? [A1, A2, A3, A4, A5]
+              : Args extends [infer A1, infer A2, infer A3, infer A4, infer A5, infer A6, ...IBrandedService[]] ? [A1, A2, A3, A4, A5, A6]
+                : Args extends [infer A1, infer A2, infer A3, infer A4, infer A5, infer A6, infer A7, ...IBrandedService[]] ? [A1, A2, A3, A4, A5, A6, A7]
+                  : Args extends [infer A1, infer A2, infer A3, infer A4, infer A5, infer A6, infer A7, infer A8, ...IBrandedService[]] ? [A1, A2, A3, A4, A5, A6, A7, A8]
+                    : never;
 
 export const IInstantiationService = createDecorator<IInstantiationService>('InstantiationService');
 export interface IInstantiationService {
   setService<T>(id: IServiceIdentifier<T>, instance: T): void;
   getService<T>(id: IServiceIdentifier<T>): T | undefined;
-
-  createInstance<T>(ctor: IConstructorSignature0<T>): T;
-  createInstance<A1, T>(ctor: IConstructorSignature1<A1, T>, first: A1): T;
-  createInstance<A1, A2, T>(ctor: IConstructorSignature2<A1, A2, T>, first: A1, second: A2): T;
-  createInstance<A1, A2, A3, T>(ctor: IConstructorSignature3<A1, A2, A3, T>, first: A1, second: A2, third: A3): T;
-  createInstance<A1, A2, A3, A4, T>(ctor: IConstructorSignature4<A1, A2, A3, A4, T>, first: A1, second: A2, third: A3, fourth: A4): T;
-  createInstance<A1, A2, A3, A4, A5, T>(ctor: IConstructorSignature5<A1, A2, A3, A4, A5, T>, first: A1, second: A2, third: A3, fourth: A4, fifth: A5): T;
-  createInstance<A1, A2, A3, A4, A5, A6, T>(ctor: IConstructorSignature6<A1, A2, A3, A4, A5, A6, T>, first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6): T;
-  createInstance<A1, A2, A3, A4, A5, A6, A7, T>(ctor: IConstructorSignature7<A1, A2, A3, A4, A5, A6, A7, T>, first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7): T;
-  createInstance<A1, A2, A3, A4, A5, A6, A7, A8, T>(ctor: IConstructorSignature8<A1, A2, A3, A4, A5, A6, A7, A8, T>, first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, eigth: A8): T;
+  createInstance<Ctor extends new (...args: any[]) => any, R extends InstanceType<Ctor>>(t: Ctor, ...args: GetLeadingNonServiceArgs<ConstructorParameters<Ctor>>): R;
 }
 
 export const ILogService = createDecorator<ILogService>('LogService');
 export interface ILogService {
-  serviceBrand: any;
+  serviceBrand: undefined;
 
   debug(message: any, ...optionalParams: any[]): void;
   info(message: any, ...optionalParams: any[]): void;
@@ -196,7 +169,7 @@ export interface ILogService {
 
 export const IOptionsService = createDecorator<IOptionsService>('OptionsService');
 export interface IOptionsService {
-  serviceBrand: any;
+  serviceBrand: undefined;
 
   readonly options: ITerminalOptions;
 
@@ -311,7 +284,7 @@ export interface ITheme {
 
 export const IUnicodeService = createDecorator<IUnicodeService>('UnicodeService');
 export interface IUnicodeService {
-  serviceBrand: any;
+  serviceBrand: undefined;
   /** Register an Unicode version provider. */
   register(provider: IUnicodeVersionProvider): void;
   /** Registered Unicode versions. */