mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

fix tracing options

Browse source
This commit is contained in:
Uwe Stieber 2015-05-08 17:21:40 +02:00
parent 2067a4940c
commit 9580bf3b1b
9 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.tm.terminal.connector.local/.options
View file

@ -1 +1 @@
org.eclipse.tcf.te.ui.terminals.local/debugmode = 0
org.eclipse.tm.terminal.connector.local/debugmode = 0

2
plugins/org.eclipse.tm.terminal.connector.process/.options
View file

@ -1 +1 @@
org.eclipse.tcf.te.ui.terminals.process/debugmode = 0
org.eclipse.tm.terminal.connector.process/debugmode = 0

4
plugins/org.eclipse.tm.terminal.connector.serial/.options
View file

@ -1,2 +1,2 @@
org.eclipse.tcf.te.ui.terminals.serial/debugmode = 0
org.eclipse.tcf.te.ui.terminals.serial/trace/serialLinePanel = false
org.eclipse.tm.terminal.connector.serial/debugmode = 0
org.eclipse.tm.terminal.connector.serial/trace/serialLinePanel = false

2
plugins/org.eclipse.tm.terminal.connector.ssh/.options
View file

@ -1 +1 @@
org.eclipse.tcf.te.ui.terminals.ssh/debugmode = 0
org.eclipse.tm.terminal.connector.ssh/debugmode = 0

2
plugins/org.eclipse.tm.terminal.connector.telnet/.options
View file

@ -1 +1 @@
org.eclipse.tcf.te.ui.terminals.telnet/debugmode = 0
org.eclipse.tm.terminal.connector.telnet/debugmode = 0

6
plugins/org.eclipse.tm.terminal.control/.options
View file

@ -1,3 +1,3 @@
org.eclipse.tm.terminal/debug/log = false
org.eclipse.tm.terminal/debug/log/char = false
org.eclipse.tm.terminal/debug/log/VT100Backend = false
org.eclipse.tm.terminal.control/debug/log = false
org.eclipse.tm.terminal.control/debug/log/char = false
org.eclipse.tm.terminal.control/debug/log/VT100Backend = false

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

@ -695,8 +695,9 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
}
/* (non-Javadoc)
* @see org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl#onFontChanged()
* @see org.eclipse.tm.internal.terminal.control.ITerminalViewControl#setFont(org.eclipse.swt.graphics.Font)
*/
@Deprecated
public void setFont(Font font) {
getCtlText().setFont(font);
if(fCommandInputField!=null) {
@ -838,6 +839,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
super();
}
@SuppressWarnings("cast")
public void focusGained(FocusEvent event) {
// Disable all keyboard accelerators (e.g., Control-B) so the Terminal view
// can see every keystroke. Without this, Emacs, vi, and Bash are unusable
@ -845,28 +847,25 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
if (getState() == TerminalState.CONNECTED)
captureKeyEvents(true);
IContextService contextService = (IContextService) PlatformUI
.getWorkbench().getAdapter(IContextService.class);
editContextActivation = contextService
.activateContext("org.eclipse.tm.terminal.EditContext"); //$NON-NLS-1$
IContextService contextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class);
editContextActivation = contextService.activateContext("org.eclipse.tm.terminal.EditContext"); //$NON-NLS-1$
}
@SuppressWarnings("cast")
public void focusLost(FocusEvent event) {
// Enable all keybindings.
captureKeyEvents(false);
// Restore the command context to its previous value.
IContextService contextService = (IContextService) PlatformUI
.getWorkbench().getAdapter(IContextService.class);
IContextService contextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class);
contextService.deactivateContext(editContextActivation);
}
@SuppressWarnings("cast")
protected void captureKeyEvents(boolean capture) {
IBindingService bindingService = (IBindingService) PlatformUI
.getWorkbench().getAdapter(IBindingService.class);
IContextService contextService = (IContextService) PlatformUI
.getWorkbench().getAdapter(IContextService.class);
IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
IContextService contextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class);
boolean enableKeyFilter = !capture;
if (bindingService.isKeyFilterEnabled() != enableKeyFilter)
@ -879,8 +878,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
// override menu-activation accelerators with no-op commands in our
// plugin.xml file, which enables the Terminal view to see absolutely _all_
// key-presses.
terminalContextActivation = contextService
.activateContext("org.eclipse.tm.terminal.TerminalContext"); //$NON-NLS-1$
terminalContextActivation = contextService.activateContext("org.eclipse.tm.terminal.TerminalContext"); //$NON-NLS-1$
} else if (!capture && terminalContextActivation != null) {
contextService.deactivateContext(terminalContextActivation);
@ -1189,16 +1187,15 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
/*
* Process given event as Eclipse key binding.
*/
@SuppressWarnings("cast")
private void processKeyBinding(KeyEvent event, int accelerator) {
IBindingService bindingService = (IBindingService) PlatformUI
.getWorkbench().getAdapter(IBindingService.class);
IBindingService bindingService = (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
KeyStroke keyStroke = SWTKeySupport.convertAcceleratorToKeyStroke(accelerator);
Binding binding = bindingService.getPerfectMatch(KeySequence.getInstance(keyStroke));
if (binding != null) {
ParameterizedCommand cmd = binding.getParameterizedCommand();
if (cmd != null) {
IHandlerService handlerService = (IHandlerService) PlatformUI
.getWorkbench().getAdapter(IHandlerService.class);
IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
Event cmdEvent = new Event();
cmdEvent.type = SWT.KeyDown;
cmdEvent.display = event.display;

6
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
View file

@ -42,9 +42,9 @@ import org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin;
* </p>
*/
public final class Logger {
public static final String TRACE_DEBUG_LOG = "org.eclipse.tm.terminal/debug/log"; //$NON-NLS-1$
public static final String TRACE_DEBUG_LOG_CHAR = "org.eclipse.tm.terminal/debug/log/char"; //$NON-NLS-1$
public static final String TRACE_DEBUG_LOG_VT100BACKEND = "org.eclipse.tm.terminal/debug/log/VT100Backend"; //$NON-NLS-1$
public static final String TRACE_DEBUG_LOG = "org.eclipse.tm.terminal.control/debug/log"; //$NON-NLS-1$
public static final String TRACE_DEBUG_LOG_CHAR = "org.eclipse.tm.terminal.control/debug/log/char"; //$NON-NLS-1$
public static final String TRACE_DEBUG_LOG_VT100BACKEND = "org.eclipse.tm.terminal.control/debug/log/VT100Backend"; //$NON-NLS-1$
private static PrintStream logStream;

6
plugins/org.eclipse.tm.terminal.view.ui/.options
View file

@ -1,3 +1,3 @@
org.eclipse.tcf.te.ui.terminals/debugmode = 0
org.eclipse.tcf.te.ui.terminals/trace/outputStreamMonitor = false
org.eclipse.tcf.te.ui.terminals/trace/launchTerminalCommandHandler = false
org.eclipse.tm.terminal.view.ui/debugmode = 0
org.eclipse.tm.terminal.view.ui/trace/outputStreamMonitor = false
org.eclipse.tm.terminal.view.ui/trace/launchTerminalCommandHandler = false