mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Bug 460655 - [terminal] Reparenting a terminal widget leaks resources

Browse source 
When moving a terminal widget under a new SWT parent we have to take
special care not to leak resources.

Change-Id: I9b397b77c8473df55e6330e2c43d04cb668772ee
Signed-off-by: Anton Leherbauer <anton.leherbauer@windriver.com>
This commit is contained in:
Anton Leherbauer 2015-02-24 11:31:08 +01:00
parent ca5915af42
commit 08f710c414
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -633,16 +633,33 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
*/ */
public void setupTerminal(Composite parent) { public void setupTerminal(Composite parent) {
Assert.isNotNull(parent); Assert.isNotNull(parent);
fState=TerminalState.CLOSED; boolean wasDisposed = true;
TerminalState oldState = fState;
fState = TerminalState.CLOSED;
if (fClipboard != null && !fClipboard.isDisposed()) {
// terminal was not disposed (DnD)
wasDisposed = false;
fClipboard.dispose();
fPollingTextCanvasModel.stopPolling();
}
if (fWndParent != null && !fWndParent.isDisposed()) {
// terminal widget gets a new parent (DnD)
fWndParent.dispose();
}
setupControls(parent); setupControls(parent);
setCommandInputField(fCommandInputField);
setupListeners(); setupListeners();
if (fUseCommonPrefs) { if (fUseCommonPrefs && wasDisposed) {
updatePreferences(); updatePreferences();
onTerminalFontChanged(); onTerminalFontChanged();
TerminalPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPreferenceListener); TerminalPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(fPreferenceListener);
JFaceResources.getFontRegistry().addListener(fFontListener); JFaceResources.getFontRegistry().addListener(fFontListener);
} }
setupHelp(fWndParent, TerminalPlugin.HELP_VIEW); setupHelp(fWndParent, TerminalPlugin.HELP_VIEW);
if (!wasDisposed) {
fState = oldState;
}
} }
/* /*
@ -699,13 +716,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
return fWndParent; return fWndParent;
} }
protected void setupControls(Composite parent) { protected void setupControls(Composite parent) {
// The Terminal view now aims to be an ANSI-conforming terminal emulator, so it
// can't have a horizontal scroll bar (but a vertical one is ok). Also, do
// _not_ make the TextViewer read-only, because that prevents it from seeing a
// TAB character when the user presses TAB (instead, the TAB causes focus to
// switch to another Workbench control). We prevent local keyboard input from
// modifying the text in method TerminalVerifyKeyListener.verifyKey().
fWndParent=new Composite(parent,SWT.NONE); fWndParent=new Composite(parent,SWT.NONE);
GridLayout layout=new GridLayout(); GridLayout layout=new GridLayout();
layout.marginWidth=0; layout.marginHeight=0; layout.verticalSpacing=0; layout.marginWidth=0; layout.marginHeight=0; layout.verticalSpacing=0;
@ -734,8 +744,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
fDisplay = getCtlText().getDisplay(); fDisplay = getCtlText().getDisplay();
fClipboard = new Clipboard(fDisplay); fClipboard = new Clipboard(fDisplay);
// fViewer.setDocument(new TerminalDocument());
// setFont(JFaceResources.getTextFont());
} }
protected void setupListeners() { protected void setupListeners() {