git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cjk support wip
[fanfix.git]
/
src
/
jexer
/
backend
/
SwingTerminal.java
diff --git
a/src/jexer/backend/SwingTerminal.java
b/src/jexer/backend/SwingTerminal.java
index 6a3b203dbff2d5f4d8ad59ed992cf62b549ff75c..bd1ba87ce2d3c442ce5254f358254586cae0227e 100644
(file)
--- a/
src/jexer/backend/SwingTerminal.java
+++ b/
src/jexer/backend/SwingTerminal.java
@@
-51,8
+51,8
@@
import java.awt.event.WindowListener;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.io.InputStream;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.swing.JComponent;
import java.util.List;
import java.util.Map;
import javax.swing.JComponent;
@@
-98,7
+98,7
@@
public class SwingTerminal extends LogicalScreen
/**
* The terminus font resource filename.
*/
/**
* The terminus font resource filename.
*/
- p
rivate
static final String FONTFILE = "terminus-ttf-4.39/TerminusTTF-Bold-4.39.ttf";
+ p
ublic
static final String FONTFILE = "terminus-ttf-4.39/TerminusTTF-Bold-4.39.ttf";
/**
* Cursor style to draw.
/**
* Cursor style to draw.
@@
-301,6
+301,13
@@
public class SwingTerminal extends LogicalScreen
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
+ /**
+ * Static constructor.
+ */
+ static {
+ setDOSColors();
+ }
+
/**
* Public constructor creates a new JFrame to render to.
*
/**
* Public constructor creates a new JFrame to render to.
*
@@
-316,7
+323,6
@@
public class SwingTerminal extends LogicalScreen
this.fontSize = fontSize;
this.fontSize = fontSize;
- setDOSColors();
reloadOptions();
try {
reloadOptions();
try {
@@
-411,7
+417,7
@@
public class SwingTerminal extends LogicalScreen
mouse1 = false;
mouse2 = false;
mouse3 = false;
mouse1 = false;
mouse2 = false;
mouse3 = false;
- eventQueue = new
Linked
List<TInputEvent>();
+ eventQueue = new
Array
List<TInputEvent>();
// Add listeners to Swing.
swing.addKeyListener(this);
// Add listeners to Swing.
swing.addKeyListener(this);
@@
-438,7
+444,6
@@
public class SwingTerminal extends LogicalScreen
this.fontSize = fontSize;
this.fontSize = fontSize;
- setDOSColors();
reloadOptions();
try {
reloadOptions();
try {
@@
-525,7
+530,7
@@
public class SwingTerminal extends LogicalScreen
mouse1 = false;
mouse2 = false;
mouse3 = false;
mouse1 = false;
mouse2 = false;
mouse3 = false;
- eventQueue = new
Linked
List<TInputEvent>();
+ eventQueue = new
Array
List<TInputEvent>();
// Add listeners to Swing.
swing.addKeyListener(this);
// Add listeners to Swing.
swing.addKeyListener(this);
@@
-714,6
+719,15
@@
public class SwingTerminal extends LogicalScreen
return blinkMillis;
}
return blinkMillis;
}
+ /**
+ * Get the current status of the blink flag.
+ *
+ * @return true if the cursor and blinking text should be visible
+ */
+ public boolean getCursorBlinkVisible() {
+ return cursorBlinkVisible;
+ }
+
/**
* Get the font size in points.
*
/**
* Get the font size in points.
*
@@
-881,7
+895,7
@@
public class SwingTerminal extends LogicalScreen
* @param attr the text attributes
* @return the Swing Color
*/
* @param attr the text attributes
* @return the Swing Color
*/
- p
rivate
Color attrToForegroundColor(final CellAttributes attr) {
+ p
ublic static
Color attrToForegroundColor(final CellAttributes attr) {
int rgb = attr.getForeColorRGB();
if (rgb >= 0) {
int red = (rgb >> 16) & 0xFF;
int rgb = attr.getForeColorRGB();
if (rgb >= 0) {
int red = (rgb >> 16) & 0xFF;
@@
-938,7
+952,7
@@
public class SwingTerminal extends LogicalScreen
* @param attr the text attributes
* @return the Swing Color
*/
* @param attr the text attributes
* @return the Swing Color
*/
- p
rivate
Color attrToBackgroundColor(final CellAttributes attr) {
+ p
ublic static
Color attrToBackgroundColor(final CellAttributes attr) {
int rgb = attr.getBackColorRGB();
if (rgb >= 0) {
int red = (rgb >> 16) & 0xFF;
int rgb = attr.getBackColorRGB();
if (rgb >= 0) {
int red = (rgb >> 16) & 0xFF;
@@
-1096,10
+1110,12
@@
public class SwingTerminal extends LogicalScreen
}
/**
}
/**
- * Resize t
o font
dimensions.
+ * Resize t
he physical screen to match the logical screen
dimensions.
*/
*/
+ @Override
public void resizeToScreen() {
public void resizeToScreen() {
- swing.setDimensions(textWidth * (width + 1), textHeight * (height + 1));
+ swing.setDimensions(textWidth * width, textHeight * height);
+ clearPhysical();
}
/**
}
/**
@@
-1184,8
+1200,7
@@
public class SwingTerminal extends LogicalScreen
gr2 = (Graphics2D) gr;
}
gr2 = (Graphics2D) gr;
}
- Cell cellColor = new Cell();
- cellColor.setTo(cell);
+ Cell cellColor = new Cell(cell);
// Check for reverse
if (cell.isReverse()) {
// Check for reverse
if (cell.isReverse()) {
@@
-1217,8
+1232,7
@@
public class SwingTerminal extends LogicalScreen
// We need a new key that will not be mutated by
// invertCell().
// We need a new key that will not be mutated by
// invertCell().
- Cell key = new Cell();
- key.setTo(cell);
+ Cell key = new Cell(cell);
if (cell.isBlink() && !cursorBlinkVisible) {
glyphCacheBlink.put(key, image);
} else {
if (cell.isBlink() && !cursorBlinkVisible) {
glyphCacheBlink.put(key, image);
} else {
@@
-1251,18
+1265,31
@@
public class SwingTerminal extends LogicalScreen
int xPixel = cursorX * textWidth + left;
int yPixel = cursorY * textHeight + top;
Cell lCell = logical[cursorX][cursorY];
int xPixel = cursorX * textWidth + left;
int yPixel = cursorY * textHeight + top;
Cell lCell = logical[cursorX][cursorY];
+ int cursorWidth = textWidth;
+ switch (lCell.getWidth()) {
+ case SINGLE:
+ // NOP
+ break;
+ case LEFT:
+ cursorWidth *= 2;
+ break;
+ case RIGHT:
+ cursorWidth *= 2;
+ xPixel -= textWidth;
+ break;
+ }
gr.setColor(attrToForegroundColor(lCell));
switch (cursorStyle) {
default:
// Fall through...
case UNDERLINE:
gr.setColor(attrToForegroundColor(lCell));
switch (cursorStyle) {
default:
// Fall through...
case UNDERLINE:
- gr.fillRect(xPixel, yPixel + textHeight - 2,
text
Width, 2);
+ gr.fillRect(xPixel, yPixel + textHeight - 2,
cursor
Width, 2);
break;
case BLOCK:
break;
case BLOCK:
- gr.fillRect(xPixel, yPixel,
text
Width, textHeight);
+ gr.fillRect(xPixel, yPixel,
cursor
Width, textHeight);
break;
case OUTLINE:
break;
case OUTLINE:
- gr.drawRect(xPixel, yPixel,
text
Width - 1, textHeight - 1);
+ gr.drawRect(xPixel, yPixel,
cursor
Width - 1, textHeight - 1);
break;
}
}
break;
}
}
@@
-1840,9
+1867,9
@@
public class SwingTerminal extends LogicalScreen
* @param event window event received
*/
public void windowClosing(final WindowEvent event) {
* @param event window event received
*/
public void windowClosing(final WindowEvent event) {
- // Drop a cm
Abor
t and walk away
+ // Drop a cm
BackendDisconnec
t and walk away
synchronized (eventQueue) {
synchronized (eventQueue) {
- eventQueue.add(new TCommandEvent(cm
Abor
t));
+ eventQueue.add(new TCommandEvent(cm
BackendDisconnec
t));
resetBlinkTimer();
}
if (listener != null) {
resetBlinkTimer();
}
if (listener != null) {
@@
-1932,6
+1959,12
@@
public class SwingTerminal extends LogicalScreen
return;
}
return;
}
+ if (sessionInfo == null) {
+ // This is the initial component resize in construction, bail
+ // out.
+ return;
+ }
+
// Drop a new TResizeEvent into the queue
sessionInfo.queryWindowSize();
synchronized (eventQueue) {
// Drop a new TResizeEvent into the queue
sessionInfo.queryWindowSize();
synchronized (eventQueue) {