mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 09:55:29 +02:00
Code Issues Wiki Activity

Bug 335021 - Middle mouse button copy/paste does not work with the terminal

Browse source
This commit is contained in:
Martin Oberhuber 2011-01-25 17:03:04 +00:00
parent 0fb0a595c5
commit bf1edb852a
2 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewConnection.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
* Copyright (c) 2008, 2011 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -9,13 +9,14 @@
* Michael Scharf (Wind River) - initial API and implementation
* Michael Scharf (Wind River) - [240097] Allow paste with the middle mouse button
* Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
* Anton Leherbauer (Wind River) - [335021] Middle mouse button copy/paste does not work with the terminal
*******************************************************************************/
/**
*
*/
package org.eclipse.tm.internal.terminal.view;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.tm.internal.terminal.control.CommandInputFieldWithHistory;
@ -46,11 +47,20 @@ class TerminalViewConnection implements ITerminalViewConnection {
public TerminalViewConnection(ITerminalViewControl ctl) {
fCtlTerminal = ctl;
fCtlTerminal.getControl().addMouseListener(new MouseAdapter(){
public void mouseUp(MouseEvent e) {
public void mouseDown(MouseEvent e) {
// paste when the middle button is clicked
if(e.button==2) // middle button
fCtlTerminal.paste();
}});
if (e.button == 2) { // middle button
int clipboardType = DND.SELECTION_CLIPBOARD;
Clipboard clipboard = fCtlTerminal.getClipboard();
if (clipboard.getAvailableTypes(clipboardType).length == 0)
// use normal clipboard if selection clipboard is not available
clipboardType = DND.CLIPBOARD;
String text = (String) clipboard.getContents(TextTransfer.getInstance(), clipboardType);
if (text != null && text.length() > 0)
fCtlTerminal.pasteString(text);
}
}
});
}
/* (non-Javadoc)

34
org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2003, 2008 Wind River Systems, Inc. and others.
* Copyright (c) 2003, 2011 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -25,6 +25,7 @@
* Michael Scharf (Wind River) - [237398] Terminal get Invalid Thread Access when the title is set
* Martin Oberhuber (Wind River) - [240745] Pressing Ctrl+F1 in the Terminal should bring up context help
* Michael Scharf (Wind River) - [240098] The cursor should not blink when the terminal is disconnected
* Anton Leherbauer (Wind River) - [335021] Middle mouse button copy/paste does not work with the terminal
*******************************************************************************/
package org.eclipse.tm.internal.terminal.emulator;
@ -42,12 +43,16 @@ import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@ -173,16 +178,20 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
* @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#copy()
*/
public void copy() {
getCtlText().copy();
copy(DND.CLIPBOARD);
}
private void copy(int clipboardType) {
Object[] data = new Object[] { getSelection() };
Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
fClipboard.setContents(data, types, clipboardType);
}
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#paste()
*/
public void paste() {
TextTransfer textTransfer = TextTransfer.getInstance();
String strText = (String) fClipboard.getContents(textTransfer);
pasteString(strText);
paste(DND.CLIPBOARD);
// TODO paste in another thread.... to avoid blocking
// new Thread() {
// public void run() {
@ -194,6 +203,12 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
// }.start();
}
private void paste(int clipboardType) {
TextTransfer textTransfer = TextTransfer.getInstance();
String strText = (String) fClipboard.getContents(textTransfer, clipboardType);
pasteString(strText);
}
/**
* @param strText the text to paste
*/
@ -584,7 +599,14 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
fTerminalText.setDimensions(lines, columns);
}
});
fCtlText.addMouseListener(new MouseAdapter() {
public void mouseUp(MouseEvent e) {
// update selection used by middle mouse button paste
if (e.button == 1 && getSelection().length() > 0) {
copy(DND.SELECTION_CLIPBOARD);
}
}
});
fDisplay = getCtlText().getDisplay();
fClipboard = new Clipboard(fDisplay);