mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-14 20:45:22 +02:00
[227571] RSE Terminal should honor Encoding set on the IHost
This commit is contained in:
parent
c5e996cc79
commit
9d7a158025
1 changed files with 11 additions and 10 deletions
|
@ -19,6 +19,8 @@
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
package org.eclipse.rse.internal.terminals.ui.views;
|
package org.eclipse.rse.internal.terminals.ui.views;
|
||||||
|
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
|
||||||
import org.eclipse.core.runtime.IAdaptable;
|
import org.eclipse.core.runtime.IAdaptable;
|
||||||
import org.eclipse.jface.action.IMenuListener;
|
import org.eclipse.jface.action.IMenuListener;
|
||||||
import org.eclipse.jface.action.IMenuManager;
|
import org.eclipse.jface.action.IMenuManager;
|
||||||
|
@ -191,13 +193,12 @@ public class TerminalViewTab extends Composite implements ITerminalListener{
|
||||||
ITerminalViewControl terminalControl = TerminalViewControlFactory
|
ITerminalViewControl terminalControl = TerminalViewControlFactory
|
||||||
.makeControl(this, c,
|
.makeControl(this, c,
|
||||||
new ITerminalConnector[] { connector });
|
new ITerminalConnector[] { connector });
|
||||||
// TODO https://bugs.eclipse.org/bugs/show_bug.cgi?id=204796
|
|
||||||
// Specify Encoding for Terminal
|
// Specify Encoding for Terminal
|
||||||
// try {
|
try {
|
||||||
// terminalControl.setEncoding(host.getDefaultEncoding(true));
|
terminalControl.setEncoding(host.getDefaultEncoding(true));
|
||||||
// } catch (UnsupportedEncodingException e) {
|
} catch (UnsupportedEncodingException e) {
|
||||||
// /* ignore and allow fallback to default encoding */
|
/* ignore and allow fallback to default encoding */
|
||||||
// }
|
}
|
||||||
terminalControl.setConnector(connector);
|
terminalControl.setConnector(connector);
|
||||||
terminalControl.connectTerminal();
|
terminalControl.connectTerminal();
|
||||||
if (initialWorkingDirCmd != null) {
|
if (initialWorkingDirCmd != null) {
|
||||||
|
@ -312,7 +313,7 @@ public class TerminalViewTab extends Composite implements ITerminalListener{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
titem.setImage(va.getImageDescriptor(root).createImage());
|
titem.setImage(va.getImageDescriptor(root).createImage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -325,18 +326,18 @@ public class TerminalViewTab extends Composite implements ITerminalListener{
|
||||||
Object data = item.getData();
|
Object data = item.getData();
|
||||||
if (data instanceof IHost){
|
if (data instanceof IHost){
|
||||||
IHost host = (IHost)data;
|
IHost host = (IHost)data;
|
||||||
final ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem(host);
|
final ITerminalServiceSubSystem terminalServiceSubSystem = TerminalServiceHelper.getTerminalSubSystem(host);
|
||||||
|
|
||||||
if (state == TerminalState.CONNECTED)
|
if (state == TerminalState.CONNECTED)
|
||||||
TerminalServiceHelper.updateTerminalShellForTerminalElement(item);
|
TerminalServiceHelper.updateTerminalShellForTerminalElement(item);
|
||||||
|
|
||||||
setTabImage(host, item);
|
setTabImage(host, item);
|
||||||
ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
|
ISystemRegistry registry = RSECorePlugin.getTheSystemRegistry();
|
||||||
registry.fireEvent(new SystemResourceChangeEvent(terminalServiceSubSystem,
|
registry.fireEvent(new SystemResourceChangeEvent(terminalServiceSubSystem,
|
||||||
ISystemResourceChangeEvents.EVENT_REFRESH, terminalServiceSubSystem));
|
ISystemResourceChangeEvents.EVENT_REFRESH, terminalServiceSubSystem));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue