mirror
/
z80-tools
kopia lustrzana https://github.com/maccasoft/z80-tools
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Optimized screen updates

master
Marco Maccaferri 2019-01-07 18:12:16 +01:00
rodzic 5e9ea1a60e
commit 1790c260c6
4 zmienionych plików z 31 dodań i 47 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
src/com/maccasoft/tools/CodeRuler.java
Wyświetl plik

@ -140,12 +140,12 @@ public class CodeRuler {
}
if (lineNumber == currentLine) {
gc.setBackground(currentLineBackground);
gc.fillRectangle(0, y, rect.width, text.getLineHeight());
gc.fillRectangle(leftMargin, y, rect.width - leftMargin - rightMargin, text.getLineHeight());
}
else {
gc.setBackground(canvas.getBackground());
}
gc.drawString(sb.toString(), leftMargin, y);
gc.drawString(sb.toString(), leftMargin, y, true);
}
lineNumber++;

8
src/com/maccasoft/tools/Memory.java
Wyświetl plik

@ -70,17 +70,17 @@ public class Memory {
int x2 = x1 + BYTES_PER_ROW * (3 * fontMetrics.getAverageCharWidth());
e.gc.setForeground(normal);
e.gc.drawString(String.format("%04X", addr), marginWidth, y);
e.gc.drawString(String.format("%04X", addr), marginWidth, y, true);
for (int i = 0; i < BYTES_PER_ROW && addr < data.length; i++) {
e.gc.setForeground(dataUpdate[addr] != 0 ? highlight : normal);
e.gc.drawString(String.format("%02X", data[addr] & 0xFF), x1, y);
e.gc.drawString(String.format("%02X", data[addr] & 0xFF), x1, y, true);
if (data[addr] >= 0x20 && data[addr] <= 0x7F) {
e.gc.drawString(String.format("%c", data[addr] & 0xFF), x2, y);
e.gc.drawString(String.format("%c", data[addr] & 0xFF), x2, y, true);
}
else {
e.gc.drawString(".", x2, y);
e.gc.drawString(".", x2, y, true);
}
x1 += fontMetrics.getAverageCharWidth() * 3;

26
src/com/maccasoft/tools/SerialTerminal.java
Wyświetl plik

@ -100,13 +100,7 @@ public class SerialTerminal extends Window {
try {
final byte[] rx = serialPort.readBytes();
if (rx != null) {
display.syncExec(new Runnable() {
@Override
public void run() {
term.write(rx);
}
});
term.write(rx);
}
} catch (Exception e) {
e.printStackTrace();
@ -402,11 +396,11 @@ public class SerialTerminal extends Window {
while (true) {
byte[] b = serialPort.readBytes(1, 5000);
print(b[0]);
term.write(b[0]);
if (b[0] == '\r') {
try {
b = serialPort.readBytes(1, 200);
print(b[0]);
term.write(b[0]);
} catch (SerialPortTimeoutException e) {
// Do nothing
}
@ -420,21 +414,11 @@ public class SerialTerminal extends Window {
return s;
}
void print(byte b) {
display.syncExec(new Runnable() {
@Override
public void run() {
term.write(b);
}
});
}
void waitDot() throws SerialPortException, SerialPortTimeoutException {
while (true) {
byte[] b = serialPort.readBytes(1, 5000);
if (b != null) {
print(b[0]);
term.write(b[0]);
if (b[0] == '.') {
break;
}
@ -464,7 +448,7 @@ public class SerialTerminal extends Window {
s = "";
while (true) {
byte[] b = serialPort.readBytes(1, 15000);
print(b[0]);
term.write(b[0]);
if (b[0] >= ' ') {
s = s + (char) b[0];
if (s.endsWith("Overwrite (Y/N)?")) {

40
src/com/maccasoft/tools/Terminal.java
Wyświetl plik

@ -10,6 +10,8 @@
package com.maccasoft.tools;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.dnd.TextTransfer;
@ -36,7 +38,7 @@ import org.eclipse.swt.widgets.Display;
public class Terminal {
public static final int BLINK_TIMER = 250;
public static final int FRAME_TIMER = 16;
public static final int CURSOR_OFF = 0x00;
public static final int CURSOR_ON = 0x04;
@ -53,6 +55,7 @@ public class Terminal {
Image image;
PaletteData paletteData;
Rectangle bounds;
AtomicBoolean needsUpdate;
TerminalFont font;
Color[] colors;
@ -72,25 +75,27 @@ public class Terminal {
boolean cursorState;
final Runnable blinkRunnable = new Runnable() {
final Runnable screenUpdateRunnable = new Runnable() {
int counter;
@Override
public void run() {
if (canvas.isDisposed() || bounds == null) {
return;
}
GC gc = new GC(canvas);
try {
counter++;
if (counter >= 15) {
if ((cursor & CURSOR_FLASH) != 0) {
cursorState = !cursorState;
canvas.redraw(cx, cy, font.getWidth(), font.getHeight(), false);
}
} finally {
gc.dispose();
counter = 0;
}
display.timerExec(BLINK_TIMER, blinkRunnable);
if (needsUpdate.getAndSet(false)) {
canvas.redraw();
}
display.timerExec(FRAME_TIMER, this);
}
};
@ -100,6 +105,7 @@ public class Terminal {
public Terminal(Composite parent) {
display = parent.getDisplay();
needsUpdate = new AtomicBoolean();
canvas = new Canvas(parent, SWT.NONE);
canvas.setBackground(display.getSystemColor(SWT.COLOR_BLACK));
@ -141,7 +147,7 @@ public class Terminal {
@Override
public void widgetDisposed(DisposeEvent e) {
display.timerExec(-1, blinkRunnable);
display.timerExec(-1, screenUpdateRunnable);
font.dispose();
for (int i = 0; i < colors.length; i++) {
colors[i].dispose();
@ -239,7 +245,7 @@ public class Terminal {
cursorState = (cursor & CURSOR_ON) != 0 && (cursor & CURSOR_FLASH) == 0;
display.timerExec(BLINK_TIMER, blinkRunnable);
display.timerExec(FRAME_TIMER, screenUpdateRunnable);
}
public int getCursorKeys() {
@ -404,6 +410,7 @@ public class Terminal {
GC gc = new GC(image);
try {
write(gc, c);
needsUpdate.set(true);
} finally {
gc.dispose();
}
@ -412,7 +419,6 @@ public class Terminal {
void write(GC gc, int c) {
int p0;
canvas.redraw(cx, cy, font.getWidth(), font.getHeight(), false);
if (state == 0) {
if (c == 0x1B) {
state = 1;
@ -495,7 +501,6 @@ public class Terminal {
else if (args[0] == 2) {
gc.fillRectangle(0, 0, bounds.width, bounds.height);
}
canvas.redraw();
break;
}
case 'K': {
@ -509,7 +514,6 @@ public class Terminal {
else if (args[0] == 2) {
gc.fillRectangle(0, 0, bounds.width, font.getHeight() - 1);
}
canvas.redraw();
break;
}
case 'L': {
@ -519,14 +523,12 @@ public class Terminal {
gc.setBackground(colors[background]);
gc.fillRectangle(0, cy, bounds.width, font.getHeight());
temp.dispose();
canvas.redraw();
break;
}
case 'M': {
gc.copyArea(0, cy + font.getHeight(), bounds.width, bounds.height - cy - font.getHeight(), 0, cy);
gc.setBackground(colors[background]);
gc.fillRectangle(0, bounds.height - font.getHeight(), bounds.width, font.getHeight());
canvas.redraw();
break;
}
case 'm': {
@ -650,14 +652,12 @@ public class Terminal {
gc.setBackground(colors[background]);
gc.fillRectangle(0, bounds.height - font.getHeight(), bounds.width, font.getHeight());
cy -= font.getHeight();
canvas.redraw();
}
break;
case 0x0C:
cx = cy = 0;
gc.setBackground(colors[background]);
gc.fillRectangle(bounds);
canvas.redraw();
break;
case 0x0D:
cx = 0;
@ -671,12 +671,10 @@ public class Terminal {
gc.setBackground(colors[background]);
gc.fillRectangle(0, bounds.height - font.getHeight(), bounds.width, font.getHeight());
cy -= font.getHeight();
canvas.redraw();
}
}
font.print(gc, c, cx, cy);
canvas.redraw(cx, cy, font.getWidth(), font.getHeight(), false);
cx += font.getWidth();
break;
@ -689,6 +687,7 @@ public class Terminal {
for (int i = 0; i < s.length(); i++) {
write(gc, s.charAt(i));
}
needsUpdate.set(true);
} finally {
gc.dispose();
}
@ -700,6 +699,7 @@ public class Terminal {
for (int i = 0; i < b.length; i++) {
write(gc, b[i]);
}
needsUpdate.set(true);
} finally {
gc.dispose();
}