X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjexer%2Fio%2FSwingScreen.java;h=24710101ee5b1fb44ebe25ee126390e523ccb244;hb=1d14ffab43232e04a7d60ac496152510fa47b407;hp=2c31d765ac1f15f7e8b4fa93229e371b3ff7f695;hpb=55b4f29bc5389d9ce185efa9f6e14c5f3882ac70;p=nikiroo-utils.git diff --git a/src/jexer/io/SwingScreen.java b/src/jexer/io/SwingScreen.java index 2c31d76..2471010 100644 --- a/src/jexer/io/SwingScreen.java +++ b/src/jexer/io/SwingScreen.java @@ -1,29 +1,27 @@ -/** +/* * Jexer - Java Text User Interface * - * License: LGPLv3 or later - * - * This module is licensed under the GNU Lesser General Public License - * Version 3. Please see the file "COPYING" in this directory for more - * information about the GNU Lesser General Public License Version 3. + * The MIT License (MIT) * - * Copyright (C) 2015 Kevin Lamonte + * Copyright (C) 2016 Kevin Lamonte * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see - * http://www.gnu.org/licenses/, or write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @author Kevin Lamonte [kevin.lamonte@gmail.com] * @version 1 @@ -57,9 +55,9 @@ import jexer.session.SwingSessionInfo; public final class SwingScreen extends Screen { /** - * If true, use double buffering thread. + * If true, use triple buffering thread. */ - private static final boolean doubleBuffer = true; + private static final boolean tripleBuffer = true; /** * Cursor style to draw. @@ -144,7 +142,7 @@ public final class SwingScreen extends Screen { private static final String FONTFILE = "terminus-ttf-4.39/TerminusTTF-Bold-4.39.ttf"; /** - * The BufferStrategy object needed for double-buffering. + * The BufferStrategy object needed for triple-buffering. */ private BufferStrategy bufferStrategy; @@ -168,6 +166,16 @@ public final class SwingScreen extends Screen { */ private int maxDescent = 0; + /** + * System-dependent Y adjustment for text in the character cell. + */ + private int textAdjustY = 0; + + /** + * System-dependent X adjustment for text in the character cell. + */ + private int textAdjustX = 0; + /** * Top pixel absolute location. */ @@ -328,10 +336,10 @@ public final class SwingScreen extends Screen { // Save the text cell width/height getFontDimensions(); - // Setup double-buffering - if (screen.doubleBuffer) { + // Setup triple-buffering + if (SwingScreen.tripleBuffer) { setIgnoreRepaint(true); - createBufferStrategy(2); + createBufferStrategy(3); bufferStrategy = getBufferStrategy(); } } @@ -350,6 +358,11 @@ public final class SwingScreen extends Screen { // This also produces the same number, but works better for ugly // monospace. textHeight = fm.getMaxAscent() + maxDescent - leading; + + if (System.getProperty("os.name").startsWith("Windows")) { + textAdjustY = -1; + textAdjustX = 0; + } } /** @@ -477,8 +490,10 @@ public final class SwingScreen extends Screen { gr.setColor(attrToForegroundColor(lCellColor)); char [] chars = new char[1]; chars[0] = lCell.getChar(); - gr.drawChars(chars, 0, 1, xPixel, - yPixel + textHeight - maxDescent); + gr.drawChars(chars, 0, 1, xPixel + textAdjustX, + yPixel + textHeight - maxDescent + + textAdjustY); + if (lCell.isUnderline()) { gr.fillRect(xPixel, yPixel + textHeight - 2, textWidth, 2); @@ -502,6 +517,8 @@ public final class SwingScreen extends Screen { Cell lCell = screen.logical[cursorX][cursorY]; gr.setColor(attrToForegroundColor(lCell)); switch (cursorStyle) { + default: + // Fall through... case UNDERLINE: gr.fillRect(xPixel, yPixel + textHeight - 2, textWidth, 2); @@ -554,7 +571,7 @@ public final class SwingScreen extends Screen { SwingScreen.this.frame.resizeToScreen(); SwingScreen.this.frame.setVisible(true); } - } ); + }); } catch (Exception e) { e.printStackTrace(); } @@ -580,17 +597,24 @@ public final class SwingScreen extends Screen { @Override public void flushPhysical() { - if (reallyCleared) { - // Really refreshed, do it all - if (doubleBuffer) { - Graphics gr = frame.bufferStrategy.getDrawGraphics(); - frame.paint(gr); - gr.dispose(); - frame.bufferStrategy.show(); - Toolkit.getDefaultToolkit().sync(); - } else { - frame.repaint(); - } + /* + System.err.printf("flushPhysical(): reallyCleared %s dirty %s\n", + reallyCleared, dirty); + */ + + // If reallyCleared is set, we have to draw everything. + if ((frame.bufferStrategy != null) && (reallyCleared == true)) { + // Triple-buffering: we have to redraw everything on this thread. + Graphics gr = frame.bufferStrategy.getDrawGraphics(); + frame.paint(gr); + gr.dispose(); + frame.bufferStrategy.show(); + // sync() doesn't seem to help the tearing for me. + // Toolkit.getDefaultToolkit().sync(); + return; + } else if ((frame.bufferStrategy == null) && (reallyCleared == true)) { + // Repaint everything on the Swing thread. + frame.repaint(); return; } @@ -647,9 +671,11 @@ public final class SwingScreen extends Screen { } // Repaint the desired area - // System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax, - // yMin, yMax); - if (doubleBuffer) { + /* + System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax, + yMin, yMax); + */ + if (frame.bufferStrategy != null) { Graphics gr = frame.bufferStrategy.getDrawGraphics(); Rectangle bounds = new Rectangle(xMin, yMin, xMax - xMin, yMax - yMin); @@ -657,7 +683,8 @@ public final class SwingScreen extends Screen { frame.paint(gr); gr.dispose(); frame.bufferStrategy.show(); - Toolkit.getDefaultToolkit().sync(); + // sync() doesn't seem to help the tearing for me. + // Toolkit.getDefaultToolkit().sync(); } else { frame.repaint(xMin, yMin, xMax - xMin, yMax - yMin); }