mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Bug 460303 - Initial output of a local terminal might get wrapped at column 80

Browse source 
Make sure the layout of the terminal control happens before the terminal
is connected to the remote.

Change-Id: Ic12c93fb6fd459652836a5568f79f168a68d585f
Signed-off-by: Anton Leherbauer <anton.leherbauer@windriver.com>
This commit is contained in:
Anton Leherbauer 2015-02-19 09:39:36 +01:00
parent cc90afa188
commit ab0be06cdb
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -403,9 +403,9 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
// we cannot connect because the connector was not initialized // we cannot connect because the connector was not initialized
return; return;
} }
getTerminalConnector().connect(this);
// clean the error message // clean the error message
setMsg(""); //$NON-NLS-1$ setMsg(""); //$NON-NLS-1$
getTerminalConnector().connect(this);
waitForConnect(); waitForConnect();
} }
@ -443,25 +443,21 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
} }
} }
// TODO
private void waitForConnect() { private void waitForConnect() {
Logger.log("entered."); //$NON-NLS-1$ Logger.log("entered."); //$NON-NLS-1$
// TODO
// Eliminate this code
while (getState()==TerminalState.CONNECTING) {
if (fDisplay.readAndDispatch())
continue;
fDisplay.sleep(); // TODO Eliminate the nested dispatch loop
} do {
if(getCtlText().isDisposed()) { if (!fDisplay.readAndDispatch())
fDisplay.sleep();
} while (getState()==TerminalState.CONNECTING);
if (getCtlText().isDisposed()) {
disconnectTerminal(); disconnectTerminal();
return; return;
} }
if (!getMsg().equals("")) //$NON-NLS-1$ if (getMsg().length() > 0) {
{
showErrorMessage(getMsg()); showErrorMessage(getMsg());
disconnectTerminal(); disconnectTerminal();
return; return;
} }