Right click to copy selection and paste on Windows

src/vs/workbench/parts/terminal/common/terminal.ts

@@ -44,6 +44,11 @@ export interface ITerminalConfiguration {
 				osx: string[],
 				windows: string[]
 			},
+			rightClickAction: {
+				linux: string,
+				osx: string,
+				windows: string
+			},
 			cursorBlinking: boolean,
 			fontFamily: string,
 			fontLigatures: boolean,
@@ -62,6 +67,7 @@ export interface ITerminalConfigHelper {
 	getFont(): ITerminalFont;
 	getFontLigaturesEnabled(): boolean;
 	getCursorBlink(): boolean;
+	getRightClickAction(): string;
 	getCommandsToSkipShell(): string[];
 	getScrollback(): number;
 	getCwd(): string;
@@ -146,11 +152,21 @@ export interface ITerminalInstance {
 	 */
 	dispose(): void;
 
+	/**
+	 * Check if anything is selected in terminal.
+	 */
+	hasSelection(): boolean;
+
 	/**
 	 * Copies the terminal selection to the clipboard.
 	 */
 	copySelection(): void;
 
+	/**
+	 * Clear current selection.
+	 */
+	clearSelection(): void;
+
 	/**
 	 * Focuses the terminal instance.
 	 *

src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts

@@ -46,6 +46,12 @@ configurationRegistry.registerConfiguration({
 			},
 			'default': []
 		},
+		'terminal.integrated.rightClickAction.linux': {
+			'description': nls.localize('terminal.integrated.shell.rightClickAction.linux', "Defines action on right mouse click on Linux terminal."),
+			'type': 'string',
+			enum: ['copyPaste', 'contextMenu'],
+			'default': 'contextMenu'
+		},
 		'terminal.integrated.shell.osx': {
 			'description': nls.localize('terminal.integrated.shell.osx', "The path of the shell that the terminal uses on OS X."),
 			'type': 'string',
@@ -59,6 +65,12 @@ configurationRegistry.registerConfiguration({
 			},
 			'default': []
 		},
+		'terminal.integrated.rightClickAction.osx': {
+			'description': nls.localize('terminal.integrated.shell.rightClickAction.osx', "Defines action on right mouse click on the OS X terminal."),
+			'type': 'string',
+			enum: ['copyPaste', 'contextMenu'],
+			'default': 'contextMenu'
+		},
 		'terminal.integrated.shell.windows': {
 			'description': nls.localize('terminal.integrated.shell.windows', "The path of the shell that the terminal uses on Windows. When using shells shipped with Windows (cmd, PowerShell or Bash on Ubuntu), prefer C:\\Windows\\sysnative over C:\\Windows\\System32 to use the 64-bit versions."),
 			'type': 'string',
@@ -72,6 +84,12 @@ configurationRegistry.registerConfiguration({
 			},
 			'default': []
 		},
+		'terminal.integrated.rightClickAction.windows': {
+			'description': nls.localize('terminal.integrated.shell.rightClickAction.windows', "Defines action on right mouse click on the Windows terminal."),
+			'type': 'string',
+			enum: ['copyPaste', 'contextMenu'],
+			'default': 'copyPaste'
+		},
 		'terminal.integrated.fontFamily': {
 			'description': nls.localize('terminal.integrated.fontFamily', "Controls the font family of the terminal, this defaults to editor.fontFamily's value."),
 			'type': 'string'

src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts

@@ -56,8 +56,7 @@ export class KillTerminalAction extends Action {
 }
 
 /**
- * Copies the terminal selection. Note that since the command palette takes focus from the terminal,
- * this can only be triggered via a keybinding.
+ * Copies the terminal selection.
  */
 export class CopyTerminalSelectionAction extends Action {
 

src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts

@@ -138,6 +138,22 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
 		return terminalConfig.cursorBlinking;
 	}
 
+	public getRightClickAction(): string {
+		let config = this._configurationService.getConfiguration<ITerminalConfiguration>();
+		const integrated = config && config.terminal && config.terminal.integrated;
+		let rightClickAction: string = '';
+
+		if (this._platform === Platform.Windows) {
+			rightClickAction = integrated.rightClickAction.windows;
+		} else if (this._platform === Platform.Mac) {
+			rightClickAction = integrated.rightClickAction.osx;
+		} else if (this._platform === Platform.Linux) {
+			rightClickAction = integrated.rightClickAction.linux;
+		}
+
+		return rightClickAction;
+	}
+
 	public getShell(): IShell {
 		let config = this._configurationService.getConfiguration<ITerminalConfiguration>();
 		let shell: IShell = {

src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts

@@ -195,6 +195,10 @@ export class TerminalInstance implements ITerminalInstance {
 		this.updateConfig();
 	}
 
+	public hasSelection(): boolean {
+		return !document.getSelection().isCollapsed;
+	}
+
 	public copySelection(): void {
 		if (document.activeElement.classList.contains('xterm')) {
 			document.execCommand('copy');
@@ -203,6 +207,10 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
+	public clearSelection(): void {
+		document.getSelection().empty();
+	}
+
 	public dispose(): void {
 		this._isExiting = true;
 

src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts

@@ -149,25 +149,35 @@ export class TerminalPanel extends Panel {
 				// occurs on the selection itself.
 				this._terminalService.getActiveInstance().focus();
 			} else if (event.which === 3) {
-				// Trigger the context menu on right click
-				let anchor: HTMLElement | { x: number, y: number } = this._parentDomElement;
-				if (event instanceof MouseEvent) {
-					const standardEvent = new StandardMouseEvent(event);
-					anchor = { x: standardEvent.posx, y: standardEvent.posy };
-				}
+				let rightClickAction: string = this._terminalService.configHelper.getRightClickAction();
+				if (rightClickAction === 'copyPaste') {
+					let terminal = this._terminalService.getActiveInstance();
+					if (terminal.hasSelection()) {
+						terminal.copySelection();
+						terminal.clearSelection();
+					} else {
+						terminal.paste();
+					}
+				} else if (rightClickAction === 'contextMenu') {
+					let anchor: HTMLElement | { x: number, y: number } = this._parentDomElement;
+					if (event instanceof MouseEvent) {
+						const standardEvent = new StandardMouseEvent(event);
+						anchor = { x: standardEvent.posx, y: standardEvent.posy };
+					}
 
-				this._contextMenuService.showContextMenu({
-					getAnchor: () => anchor,
-					getActions: () => TPromise.as(this._getContextMenuActions()),
-					getActionsContext: () => this._parentDomElement,
-					getKeyBinding: (action) => {
-						const opts = this._keybindingService.lookupKeybindings(action.id);
-						if (opts.length > 0) {
-							return opts[0]; // only take the first one
+					this._contextMenuService.showContextMenu({
+						getAnchor: () => anchor,
+						getActions: () => TPromise.as(this._getContextMenuActions()),
+						getActionsContext: () => this._parentDomElement,
+						getKeyBinding: (action) => {
+							const opts = this._keybindingService.lookupKeybindings(action.id);
+							if (opts.length > 0) {
+								return opts[0]; // only take the first one
+							}
+							return null;
 						}
-						return null;
-					}
-				});
+					});
+				}
 			}
 		}));
 		this._register(DOM.addDisposableListener(this._parentDomElement, 'click', (event) => {

src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts

@@ -165,6 +165,9 @@ suite('Workbench - TerminalConfigHelper', () => {
 					},
 					shellArgs: {
 						linux: []
+					},
+					rightClickAction: {
+						linux: 'contextMenu'
 					}
 				}
 			}
@@ -181,6 +184,9 @@ suite('Workbench - TerminalConfigHelper', () => {
 					},
 					shellArgs: {
 						osx: []
+					},
+					rightClickAction: {
+						osx: 'contextMenu'
 					}
 				}
 			}
@@ -197,6 +203,9 @@ suite('Workbench - TerminalConfigHelper', () => {
 					},
 					shellArgs: {
 						windows: []
+					},
+					rightClickAction: {
+						windows: 'copyPaste'
 					}
 				}
 			}