X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fio%2FSwingScreen.java;h=1519079d50b68e6578a0d7cf060763ba1bbaa5b9;hb=e16dda65585466c8987bd1efd718431450a96605;hp=8677fdff122d1746d5368b27812bab17cde8cb6b;hpb=e3dfbd233442a877d5efa1bc177c3d357771e5cb;p=nikiroo-utils.git diff --git a/src/jexer/io/SwingScreen.java b/src/jexer/io/SwingScreen.java index 8677fdf..1519079 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 @@ -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. */ @@ -329,7 +337,7 @@ public final class SwingScreen extends Screen { getFontDimensions(); // Setup double-buffering - if (screen.doubleBuffer) { + if (SwingScreen.doubleBuffer) { setIgnoreRepaint(true); createBufferStrategy(2); 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; + } } /** @@ -452,24 +465,40 @@ public final class SwingScreen extends Screen { Cell lCell = screen.logical[x][y]; Cell pCell = screen.physical[x][y]; - if (!lCell.equals(pCell) || reallyCleared) { + if (!lCell.equals(pCell) + || lCell.isBlink() + || reallyCleared) { + + Cell lCellColor = new Cell(); + lCellColor.setTo(lCell); - /* - * TODO: - * reverse - * blink - * underline - */ + // Check for reverse + if (lCell.isReverse()) { + lCellColor.setForeColor(lCell.getBackColor()); + lCellColor.setBackColor(lCell.getForeColor()); + } // Draw the background rectangle, then the // foreground character. - gr.setColor(attrToBackgroundColor(lCell)); + gr.setColor(attrToBackgroundColor(lCellColor)); gr.fillRect(xPixel, yPixel, textWidth, textHeight); - gr.setColor(attrToForegroundColor(lCell)); - char [] chars = new char[1]; - chars[0] = lCell.getChar(); - gr.drawChars(chars, 0, 1, xPixel, - yPixel + textHeight - maxDescent); + + // Handle blink and underline + if (!lCell.isBlink() + || (lCell.isBlink() && cursorBlinkVisible) + ) { + gr.setColor(attrToForegroundColor(lCellColor)); + char [] chars = new char[1]; + chars[0] = lCell.getChar(); + gr.drawChars(chars, 0, 1, xPixel + textAdjustX, + yPixel + textHeight - maxDescent + + textAdjustY); + + if (lCell.isUnderline()) { + gr.fillRect(xPixel, yPixel + textHeight - 2, + textWidth, 2); + } + } // Physical is always updated physical[x][y].setTo(lCell); @@ -488,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); @@ -540,7 +571,7 @@ public final class SwingScreen extends Screen { SwingScreen.this.frame.resizeToScreen(); SwingScreen.this.frame.setVisible(true); } - } ); + }); } catch (Exception e) { e.printStackTrace(); } @@ -568,7 +599,7 @@ public final class SwingScreen extends Screen { if (reallyCleared) { // Really refreshed, do it all - if (doubleBuffer) { + if (SwingScreen.doubleBuffer) { Graphics gr = frame.bufferStrategy.getDrawGraphics(); frame.paint(gr); gr.dispose(); @@ -607,6 +638,7 @@ public final class SwingScreen extends Screen { || ((x == cursorX) && (y == cursorY) && cursorVisible) + || lCell.isBlink() ) { if (xPixel < xMin) { xMin = xPixel; @@ -634,7 +666,7 @@ 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) { + if (SwingScreen.doubleBuffer) { Graphics gr = frame.bufferStrategy.getDrawGraphics(); Rectangle bounds = new Rectangle(xMin, yMin, xMax - xMin, yMax - yMin);