Merge branch 'master' into add-osc-4

src/common/Platform.ts

@@ -23,17 +23,8 @@ export const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent);
 // Find the users platform. We use this to interpret the meta key
 // and ISO third level shifts.
 // http://stackoverflow.com/q/19877924/577598
-export const isMac = contains(['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'], platform);
+export const isMac = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'].includes(platform);
 export const isIpad = platform === 'iPad';
 export const isIphone = platform === 'iPhone';
-export const isWindows = contains(['Windows', 'Win16', 'Win32', 'WinCE'], platform);
+export const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].includes(platform);
 export const isLinux = platform.indexOf('Linux') >= 0;
-
-/**
- * Return if the given array contains the given element
- * @param arr The array to search for the given element.
- * @param el The element to look for into the array
- */
-function contains(arr: any[], el: any): boolean {
-  return arr.indexOf(el) >= 0;
-}

src/common/services/OptionsService.ts

@@ -50,7 +50,7 @@ export const DEFAULT_OPTIONS: ITerminalOptions = Object.freeze({
   windowOptions: {},
   windowsMode: false,
   wordSeparator: ' ()[]{}\',"`',
-
+  altClickMovesCursor: true,
   convertEol: false,
   termName: 'xterm',
   cancelEvents: false

src/common/services/Services.ts

@@ -184,6 +184,7 @@ export type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'off';
 export type RendererType = 'dom' | 'canvas';
 
 export interface IPartialTerminalOptions {
+  altClickMovesCursor?: boolean;
   allowTransparency?: boolean;
   bellSound?: string;
   bellStyle?: 'none' | 'sound' /* | 'visual' | 'both' */;
@@ -220,6 +221,7 @@ export interface IPartialTerminalOptions {
 export interface ITerminalOptions {
   allowProposedApi: boolean;
   allowTransparency: boolean;
+  altClickMovesCursor: boolean;
   bellSound: string;
   bellStyle: 'none' | 'sound' /* | 'visual' | 'both' */;
   cols: number;