Merge remote-tracking branch 'ups/master' into pr/1148

typings/xterm.d.ts

@@ -8,12 +8,17 @@
  */
 
 declare module 'xterm' {
+  /**
+   * A string representing text font weight.
+   */
+  export type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
+
   /**
    * An object containing start up options for the terminal.
    */
   export interface ITerminalOptions {
     /**
-     * Whether background should support non-opaque color. It must be set before 
+     * Whether background should support non-opaque color. It must be set before
      * executing open() method and can't be changed later without excuting it again.
      * Warning: Enabling this option can reduce performances somewhat.
      */
@@ -63,6 +68,16 @@ declare module 'xterm' {
      */
     fontFamily?: string;
 
+    /**
+     * The font weight used to render non-bold text.
+     */
+    fontWeight?: FontWeight;
+
+    /**
+     * The font weight used to render bold text.
+     */
+    fontWeightBold?: FontWeight;
+
     /**
      * The spacing in whole pixels between characters..
      */
@@ -73,6 +88,11 @@ declare module 'xterm' {
      */
     lineHeight?: number;
 
+    /**
+     * Whether to treat option as the meta key.
+     */
+    macOptionIsMeta?: boolean;
+
     /**
      * The number of rows in the terminal.
      */
@@ -415,7 +435,7 @@ declare module 'xterm' {
      * Retrieves an option's value from the terminal.
      * @param key The option key.
      */
-    getOption(key: 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell' | 'allowTransparency'): boolean;
+    getOption(key: 'allowTransparency' | 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell'): boolean;
     /**
      * Retrieves an option's value from the terminal.
      * @param key The option key.
@@ -448,7 +468,7 @@ declare module 'xterm' {
     * @param key The option key.
     * @param value The option value.
     */
-    setOption(key: 'fontWeight' | 'fontWeightBold', value: null | 'normal' | 'bold' | 'bolder' | 'lighter' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'): void;
+    setOption(key: 'fontWeight' | 'fontWeightBold', value: null | 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'): void;
     /**
      * Sets an option on the terminal.
      * @param key The option key.