Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2014-04-30 07:48:55 -0400
committerAnton Leherbauer2014-04-30 07:48:55 -0400
commitc522fda5a8d0ffce3481e1e3e83ea9d3c0b7ccda (patch)
tree2dc368c11014042dfa485eec612d06b599ec01c5
parent3d81a4ed3563d0d14b160b07a0775678123c52ff (diff)
downloadorg.eclipse.tcf-c522fda5a8d0ffce3481e1e3e83ea9d3c0b7ccda.tar.gz
org.eclipse.tcf-c522fda5a8d0ffce3481e1e3e83ea9d3c0b7ccda.tar.xz
org.eclipse.tcf-c522fda5a8d0ffce3481e1e3e83ea9d3c0b7ccda.zip
Target Explorer: Bug 433838 - [terminal] Wrapped lines create extra line feed
Change-Id: I2e41e98e5ca36345e37457f2a2414652e4b06266 Signed-off-by: Anton Leherbauer <anton.leherbauer@windriver.com>
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF
index ac1416926..39da9d361 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0",
org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.terminals;bundle-version="1.3.0",
org.eclipse.tcf.te.ui.swt;bundle-version="1.3.0",
- org.eclipse.tm.terminal;bundle-version="3.2.100",
+ org.eclipse.tm.terminal;bundle-version="3.2.300",
org.eclipse.ui;bundle-version="3.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java
index 96416df9a..f1729531e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/src/org/eclipse/tcf/te/ui/terminals/process/ProcessConnector.java
@@ -20,6 +20,7 @@ import org.eclipse.cdt.utils.pty.PTY;
import org.eclipse.cdt.utils.spawner.ProcessFactory;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.custom.CTabItem;
@@ -180,6 +181,11 @@ public class ProcessConnector extends AbstractStreamsConnector {
setStdoutListeners(settings.getStdOutListeners());
setStderrListeners(settings.getStdErrListeners());
+ // Enable VT100 line wrapping in case of 'winpty',
+ // because it assumes this terminal capability
+ if (pty != null && Platform.OS_WIN32.equals(Platform.getOS()))
+ control.setVT100LineWrapping(true);
+
// connect the streams
connectStreams(control, process.getOutputStream(), process.getInputStream(), (pty == null ? process.getErrorStream() : null), settings.isLocalEcho(), lineSeparator);

Back to the top