Attachment 230775 Details for Bug 404341 – backport patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] backport patch

patch.txt (text/plain), 2.81 KB, created by David McKnight

on 2013-05-10 09:31:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2013-05-10 09:31:10 EDT

Size: 2.81 KB

patch

obsolete

>diff --git a/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
>index c693708..8aa395d 100644
>--- a/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
>+++ b/terminal/plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100Emulator.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.
>+ * Copyright (c) 2003, 2013 Wind River Systems, Inc. and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -18,6 +18,8 @@
>  * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
>  * Martin Oberhuber (Wind River) - [334969] Fix multi-command SGR sequence
>  * Kris De Volder (VMWare) - [392107] Switched interpretation for ESC[0K and ESC[1K sequences
>+ * Martin Oberhuber (Wind River) - [401386] Regression: No header on top due to incorrect ESC[K interpretation
>+ * Martin Oberhuber (Wind River) - [401480] Handle ESC[39;49m and ESC[G
>  *******************************************************************************/
> package org.eclipse.tm.internal.terminal.emulator;
> 
>@@ -606,12 +608,7 @@
> 	 * specified by the ANSI parameter (default is column 1).
> 	 */
> 	private void processAnsiCommand_G() {
>-		int targetColumn = 1;
>-
>-		if (ansiParameters[0].length() > 0)
>-			targetColumn = getAnsiParameter(0) - 1;
>-
>-		moveCursor(relativeCursorLine(), targetColumn);
>+		moveCursor(relativeCursorLine(), getAnsiParameter(0) - 1);
> 	}
> 
> 	/**
>@@ -661,7 +658,10 @@
> 	 * moving the cursor.
> 	 */
> 	private void processAnsiCommand_K() {
>-		int ansiParameter = getAnsiParameter(0);
>+		//Bug 401386: missing parameter must be interpreted as 0, and not 1 like most other defaults.
>+		int ansiParameter = 0;
>+		if (ansiParameters[0].length() > 0)
>+			ansiParameter = getAnsiParameter(0);
> 
> 		switch (ansiParameter) {
> 		case 0:
>@@ -797,6 +797,10 @@
> 				style = style.setForground("WHITE_FOREGROUND"); //$NON-NLS-1$
> 				break;
> 
>+			case 39: //Foreground: Default
>+				style = style.setForground(text.getDefaultStyle().getForground());
>+				break;
>+
> 			case 40:
> 				style = style.setBackground("BLACK"); //$NON-NLS-1$
> 				break;
>@@ -829,6 +833,10 @@
> 				style = style.setBackground("WHITE"); //$NON-NLS-1$
> 				break;
> 
>+			case 49: //Background: Default
>+				style = style.setBackground(text.getDefaultStyle().getBackground());
>+				break;
>+
> 			default:
> 				Logger
> 						.log("Unsupported graphics rendition parameter: " + ansiParameter); //$NON-NLS-1$

Actions: View | Diff

Attachments on bug 404341: 230775