mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Bug 561319: Remove flickering in terminal when changing selection

Browse source 
This is done by buffering the drawing of the line of the terminal.

Change-Id: I593a3b99080d779046ea37497d93a25584c472c1
This commit is contained in:
Jonah Graham 2020-03-28 16:43:39 -04:00
parent 073035b54b
commit 28268ad589
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
terminal/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true
Bundle-Version: 4.6.0.qualifier Bundle-Version: 4.6.100.qualifier
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Bundle-Localization: plugin Bundle-Localization: plugin

52
terminal/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/textcanvas/TextLineRenderer.java
View file

@ -20,6 +20,7 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly; import org.eclipse.tm.terminal.model.ITerminalTextDataReadOnly;
@ -49,44 +50,53 @@ public class TextLineRenderer implements ILinelRenderer {
@Override @Override
public void drawLine(ITextCanvasModel model, GC gc, int line, int x, int y, int colFirst, int colLast) { public void drawLine(ITextCanvasModel model, GC gc, int line, int x, int y, int colFirst, int colLast) {
int width = getCellWidth() * (colLast - colFirst);
int height = getCellHeight();
if (width <= 0 || height <= 0) {
return;
}
Image buffer = new Image(gc.getDevice(), width, height);
GC doubleBufferGC = new GC(buffer);
if (line < 0 || line >= getTerminalText().getHeight() || colFirst >= getTerminalText().getWidth() if (line < 0 || line >= getTerminalText().getHeight() || colFirst >= getTerminalText().getWidth()
|| colFirst - colLast == 0) { || colFirst - colLast == 0) {
fillBackground(gc, x, y, getCellWidth() * (colLast - colFirst), getCellHeight()); fillBackground(doubleBufferGC, 0, 0, width, height);
} else { } else {
colLast = Math.min(colLast, getTerminalText().getWidth()); colLast = Math.min(colLast, getTerminalText().getWidth());
LineSegment[] segments = getTerminalText().getLineSegments(line, colFirst, colLast - colFirst); LineSegment[] segments = getTerminalText().getLineSegments(line, colFirst, colLast - colFirst);
for (int i = 0; i < segments.length; i++) { for (int i = 0; i < segments.length; i++) {
LineSegment segment = segments[i]; LineSegment segment = segments[i];
Style style = segment.getStyle(); Style style = segment.getStyle();
setupGC(gc, style); setupGC(doubleBufferGC, style);
String text = segment.getText(); String text = segment.getText();
drawText(gc, x, y, colFirst, segment.getColumn(), text); drawText(doubleBufferGC, 0, 0, colFirst, segment.getColumn(), text);
drawCursor(model, gc, line, x, y, colFirst); drawCursor(model, doubleBufferGC, line, 0, 0, colFirst);
} }
if (fModel.hasLineSelection(line)) { if (fModel.hasLineSelection(line)) {
gc.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT)); doubleBufferGC.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION_TEXT));
gc.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION)); doubleBufferGC.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION));
Point start = model.getSelectionStart(); Point start = model.getSelectionStart();
Point end = model.getSelectionEnd(); Point end = model.getSelectionEnd();
char[] chars = model.getTerminalText().getChars(line); char[] chars = model.getTerminalText().getChars(line);
if (chars == null) if (chars != null) {
return; int offset = 0;
int offset = 0; if (start.y == line)
if (start.y == line) offset = start.x;
offset = start.x; offset = Math.max(offset, colFirst);
offset = Math.max(offset, colFirst); int len;
int len; if (end.y == line)
if (end.y == line) len = end.x - offset + 1;
len = end.x - offset + 1; else
else len = chars.length - offset + 1;
len = chars.length - offset + 1; len = Math.min(len, chars.length - offset);
len = Math.min(len, chars.length - offset); if (len > 0) {
if (len > 0) { String text = new String(chars, offset, len);
String text = new String(chars, offset, len); drawText(doubleBufferGC, 0, 0, colFirst, offset, text);
drawText(gc, x, y, colFirst, offset, text); }
} }
} }
} }
gc.drawImage(buffer, x, y);
doubleBufferGC.dispose();
} }
private void fillBackground(GC gc, int x, int y, int width, int height) { private void fillBackground(GC gc, int x, int y, int width, int height) {