mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-18 21:55:45 +02:00
Code Issues Wiki Activity

[168197] Fix Terminal for CDC-1.1/Foundation-1.1

Browse source
This commit is contained in:
Martin Oberhuber 2008-04-11 17:37:14 +00:00
parent c99db80573
commit 400e0612fa
7 changed files with 65 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
terminal/org.eclipse.tm.terminal/.classpath
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="src/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

6
terminal/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,8 +1,12 @@
#Fri Mar 28 14:14:24 CET 2008 #Fri Apr 11 02:37:35 CEST 2008
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

3
terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
View file

@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui org.eclipse.ui
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
J2SE-1.4
Bundle-ClassPath: . Bundle-ClassPath: .
Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclipse.tm.terminal.test", Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclipse.tm.terminal.test",
org.eclipse.tm.internal.terminal.control;x-friends:="org.eclipse.tm.terminal.view", org.eclipse.tm.internal.terminal.control;x-friends:="org.eclipse.tm.terminal.view",

55
terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/CommandInputFieldWithHistory.java
View file

@ -1,18 +1,18 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2008 Wind River Systems, Inc. and others. * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Michael Scharf (Wind River) - initial implementation * Michael Scharf (Wind River) - initial implementation
* Michael Scharf (Wing River) - [211659] Add field assist to terminal input field * Michael Scharf (Wing River) - [211659] Add field assist to terminal input field
* Michael Scharf (Wing River) - [196447] The optional terminal input line should be resizeable * Michael Scharf (Wing River) - [196447] The optional terminal input line should be resizeable
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.control; package org.eclipse.tm.internal.terminal.control;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -42,10 +42,10 @@ import org.eclipse.ui.fieldassist.ContentAssistCommandAdapter;
* <li> * <li>
* <ul>Navigate with ARROW_UP,ARROW_DOWN,PAGE_UP,PAGE_DOWN * <ul>Navigate with ARROW_UP,ARROW_DOWN,PAGE_UP,PAGE_DOWN
* <ul>ESC to cancel history editing * <ul>ESC to cancel history editing
* <ul>History can be edited (by moving up and edit) but changes are * <ul>History can be edited (by moving up and edit) but changes are
* not persistent (like in bash). * not persistent (like in bash).
* <ul>If the same command is entered multiple times in a row, * <ul>If the same command is entered multiple times in a row,
* only one entry is kept in the history. * only one entry is kept in the history.
* </li> * </li>
* *
*/ */
@ -69,10 +69,10 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
} }
return (IContentProposal[]) result.toArray(new IContentProposal[result.size()]); return (IContentProposal[]) result.toArray(new IContentProposal[result.size()]);
} }
} }
private static class Proposal implements IContentProposal { private static class Proposal implements IContentProposal {
private final String fContent; private final String fContent;
private final String fLabel; private final String fLabel;
Proposal(String content, String label) { Proposal(String content, String label) {
@ -82,15 +82,15 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
public String getContent() { public String getContent() {
return fContent; return fContent;
} }
public String getLabel() { public String getLabel() {
return fLabel; return fLabel;
} }
public String getDescription() { public String getDescription() {
return null; return null;
} }
public int getCursorPosition() { public int getCursorPosition() {
return fContent.length(); return fContent.length();
} }
@ -118,7 +118,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
fMaxSize=maxHistorySize; fMaxSize=maxHistorySize;
} }
/** /**
* Add a line to the history. * Add a line to the history.
* @param line The line to be added to the history. * @param line The line to be added to the history.
*/ */
protected void pushLine(String line) { protected void pushLine(String line) {
@ -143,7 +143,20 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
fHistory.clear(); fHistory.clear();
if(history==null) if(history==null)
return; return;
fHistory.addAll(Arrays.asList(history.split("\n"))); //$NON-NLS-1$ // add history entries separated by '\n'
// fHistory.addAll(Arrays.asList(history.split("\n"))); //$NON-NLS-1$
//<J2ME CDC-1.1 Foundation-1.1 variant>
int i = 0;
int j = history.indexOf('\n');
while (j > i) {
fHistory.add(history.substring(i, j));
do {
j++;
} while (j < history.length() && history.charAt(j) == '\n');
i = j;
j = history.indexOf('\n', i);
}
//</J2ME CDC-1.1 Foundation-1.1 variant>
} }
/** /**
* @return the current content of the history buffer and new line separated list * @return the current content of the history buffer and new line separated list
@ -218,7 +231,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
GridData gdata = (GridData) fInputField.getLayoutData(); GridData gdata = (GridData) fInputField.getLayoutData();
Rectangle sashRect = fSash.getBounds (); Rectangle sashRect = fSash.getBounds ();
Rectangle containerRect = parent.getClientArea (); Rectangle containerRect = parent.getClientArea ();
int h=fInputField.getLineHeight(); int h=fInputField.getLineHeight();
// make sure the input filed hight is a multiple of the line height // make sure the input filed hight is a multiple of the line height
gdata.heightHint = Math.max(((containerRect.height-e.y-sashRect.height)/h)*h,h); gdata.heightHint = Math.max(((containerRect.height-e.y-sashRect.height)/h)*h,h);
@ -248,7 +261,7 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
new ContentAssistCommandAdapter( new ContentAssistCommandAdapter(
fInputField, fInputField,
new TextContentAdapter(), new TextContentAdapter(),
new FieldAssist(), new FieldAssist(),
null, null,
null, null,
installDecoration); installDecoration);
@ -295,6 +308,6 @@ public class CommandInputFieldWithHistory implements ICommandInputField {
fSash=null; fSash=null;
fInputField.dispose(); fInputField.dispose();
fInputField=null; fInputField=null;
} }
} }

6
terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
View file

@ -14,6 +14,7 @@
* Michael Scharf (Wind River) - split into core, view and connector plugins * Michael Scharf (Wind River) - split into core, view and connector plugins
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Michael Scharf (Wind River) - [209746] There are cases where some colors not displayed correctly * Michael Scharf (Wind River) - [209746] There are cases where some colors not displayed correctly
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.emulator; package org.eclipse.tm.internal.terminal.emulator;
@ -23,7 +24,6 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Reader; import java.io.Reader;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.events.ControlListener;
@ -839,10 +839,8 @@ public class VT100Emulator implements ControlListener {
String positionReport = "\u001b[" + (relativeCursorLine() + 1) + ";" + //$NON-NLS-1$ //$NON-NLS-2$ String positionReport = "\u001b[" + (relativeCursorLine() + 1) + ";" + //$NON-NLS-1$ //$NON-NLS-2$
(getCursorColumn() + 1) + "R"; //$NON-NLS-1$ (getCursorColumn() + 1) + "R"; //$NON-NLS-1$
OutputStreamWriter streamWriter = new OutputStreamWriter(terminal
.getOutputStream(), Charset.forName("ISO-8859-1")); //$NON-NLS-1$
try { try {
OutputStreamWriter streamWriter = new OutputStreamWriter(terminal.getOutputStream(), "ISO-8859-1"); //$NON-NLS-1$
streamWriter.write(positionReport, 0, positionReport.length()); streamWriter.write(positionReport, 0, positionReport.length());
streamWriter.flush(); streamWriter.flush();
} catch (IOException ex) { } catch (IOException ex) {

12
terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextData.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* Michael Scharf (Wind River) - initial API and implementation * Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.model; package org.eclipse.tm.internal.terminal.model;
@ -54,7 +55,16 @@ public class TerminalTextData implements ITerminalTextData {
buff.append(term.getChar(line, column)); buff.append(term.getChar(line, column));
} }
} }
return buff.toString().replaceAll("\000+", ""); //$NON-NLS-1$//$NON-NLS-2$ // get rid of the empty space at the end of the lines
//return buff.toString().replaceAll("\000+", ""); //$NON-NLS-1$//$NON-NLS-2$
//<J2ME CDC-1.1 Foundation-1.1 variant>
int i = buff.length() - 1;
while (i >= 0 && buff.charAt(i) == '\000') {
i--;
}
buff.setLength(i + 1);
return buff.toString();
//</J2ME CDC-1.1 Foundation-1.1 variant>
} }
/** /**

12
terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Wind River Systems, Inc. and others. * Copyright (c) 2007, 2008 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* Michael Scharf (Wind River) - initial API and implementation * Michael Scharf (Wind River) - initial API and implementation
* Martin Oberhuber (Wind River) - [168197] Fix Terminal for CDC-1.1/Foundation-1.1
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.textcanvas; package org.eclipse.tm.internal.terminal.textcanvas;
@ -293,7 +294,14 @@ abstract public class AbstractTextCanvasModel implements ITextCanvasModel {
if(line==fSelectionStartLine) if(line==fSelectionStartLine)
text=text.substring(Math.min(fSelectionStartCoumn,text.length())); text=text.substring(Math.min(fSelectionStartCoumn,text.length()));
// get rid of the empty space at the end of the lines // get rid of the empty space at the end of the lines
text=text.replaceAll("\000+$",""); //$NON-NLS-1$//$NON-NLS-2$ // text=text.replaceAll("\000+$",""); //$NON-NLS-1$//$NON-NLS-2$
// <J2ME-CDC-1.1 version>
int i = text.length() - 1;
while (i >= 0 && text.charAt(i) == '\000') {
i--;
}
text = text.substring(0, i + 1);
// </J2ME-CDC-1.1 version>
// null means space // null means space
text=text.replace('\000', ' '); text=text.replace('\000', ' ');
} else { } else {