mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Bug 460303 - Initial output of a local terminal might get wrapped at column 80
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:
parent
cc90afa188
commit
ab0be06cdb
1 changed files with 9 additions and 13 deletions
|
@ -403,9 +403,9 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
|
|||
// we cannot connect because the connector was not initialized
|
||||
return;
|
||||
}
|
||||
getTerminalConnector().connect(this);
|
||||
// clean the error message
|
||||
setMsg(""); //$NON-NLS-1$
|
||||
getTerminalConnector().connect(this);
|
||||
waitForConnect();
|
||||
}
|
||||
|
||||
|
@ -443,25 +443,21 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
|
|||
}
|
||||
}
|
||||
|
||||
// TODO
|
||||
private void waitForConnect() {
|
||||
Logger.log("entered."); //$NON-NLS-1$
|
||||
// TODO
|
||||
// Eliminate this code
|
||||
while (getState()==TerminalState.CONNECTING) {
|
||||
if (fDisplay.readAndDispatch())
|
||||
continue;
|
||||
|
||||
fDisplay.sleep();
|
||||
}
|
||||
if(getCtlText().isDisposed()) {
|
||||
// TODO Eliminate the nested dispatch loop
|
||||
do {
|
||||
if (!fDisplay.readAndDispatch())
|
||||
fDisplay.sleep();
|
||||
} while (getState()==TerminalState.CONNECTING);
|
||||
|
||||
if (getCtlText().isDisposed()) {
|
||||
disconnectTerminal();
|
||||
return;
|
||||
}
|
||||
if (!getMsg().equals("")) //$NON-NLS-1$
|
||||
{
|
||||
if (getMsg().length() > 0) {
|
||||
showErrorMessage(getMsg());
|
||||
|
||||
disconnectTerminal();
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue