X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbits%2FCellAttributes.java;h=99366fda690740b738563493fef900a506436d7d;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=7dce699468562bf3b9f776a79a58eb66ada3f9bd;hpb=2420f903afc54a5bcf61f1bdd5e3dfada2fab5b2;p=fanfix.git diff --git a/src/jexer/bits/CellAttributes.java b/src/jexer/bits/CellAttributes.java index 7dce699..99366fd 100644 --- a/src/jexer/bits/CellAttributes.java +++ b/src/jexer/bits/CellAttributes.java @@ -1,34 +1,30 @@ -/** +/* * Jexer - Java Text User Interface * - * Version: $Id$ - * - * Author: Kevin Lamonte, kevin.lamonte@gmail.com - * - * License: LGPLv3 or later + * The MIT License (MIT) * - * Copyright: 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. + * Copyright (C) 2019 Kevin Lamonte * - * Copyright (C) 2015 Kevin Lamonte + * 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 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. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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 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. * - * 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 + * @author Kevin Lamonte [kevin.lamonte@gmail.com] + * @version 1 */ package jexer.bits; @@ -37,165 +33,363 @@ package jexer.bits; */ public class CellAttributes { + // ------------------------------------------------------------------------ + // Constants -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** - * Bold + * Bold attribute. */ - public boolean bold; + private static final int BOLD = 0x01; /** - * Blink + * Blink attribute. */ - public boolean blink; + private static final int BLINK = 0x02; /** - * Reverse + * Reverse attribute. */ - public boolean reverse; + private static final int REVERSE = 0x04; /** - * Underline + * Underline attribute. */ - public boolean underline; + private static final int UNDERLINE = 0x08; + + /** + * Protected attribute. + */ + private static final int PROTECT = 0x10; + + + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ /** - * Protected + * Boolean flags. */ - public boolean protect; + private int flags = 0; /** * Foreground color. Color.WHITE, Color.RED, etc. */ - public Color foreColor; + private Color foreColor = Color.WHITE; /** * Background color. Color.WHITE, Color.RED, etc. */ - public Color backColor; + private Color backColor = Color.BLACK; + + /** + * Foreground color as 24-bit RGB value. Negative value means not set. + */ + private int foreColorRGB = -1; + + /** + * Background color as 24-bit RGB value. Negative value means not set. + */ + private int backColorRGB = -1; + + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ + + /** + * Public constructor sets default values of the cell to white-on-black, + * no bold/blink/reverse/underline/protect. + * + * @see #reset() + */ + public CellAttributes() { + // NOP + } + + /** + * Public constructor makes a copy from another instance. + * + * @param that another CellAttributes instance + * @see #reset() + */ + public CellAttributes(final CellAttributes that) { + setTo(that); + } + + // ------------------------------------------------------------------------ + // CellAttributes --------------------------------------------------------- + // ------------------------------------------------------------------------ + + /** + * Getter for bold. + * + * @return bold value + */ + public final boolean isBold() { + return ((flags & BOLD) == 0 ? false : true); + } + + /** + * Setter for bold. + * + * @param bold new bold value + */ + public final void setBold(final boolean bold) { + if (bold) { + flags |= BOLD; + } else { + flags &= ~BOLD; + } + } + + /** + * Getter for blink. + * + * @return blink value + */ + public final boolean isBlink() { + return ((flags & BLINK) == 0 ? false : true); + } + + /** + * Setter for blink. + * + * @param blink new blink value + */ + public final void setBlink(final boolean blink) { + if (blink) { + flags |= BLINK; + } else { + flags &= ~BLINK; + } + } /** - * Set to default not-bold, white foreground on black background. + * Getter for reverse. + * + * @return reverse value + */ + public final boolean isReverse() { + return ((flags & REVERSE) == 0 ? false : true); + } + + /** + * Setter for reverse. + * + * @param reverse new reverse value + */ + public final void setReverse(final boolean reverse) { + if (reverse) { + flags |= REVERSE; + } else { + flags &= ~REVERSE; + } + } + + /** + * Getter for underline. + * + * @return underline value + */ + public final boolean isUnderline() { + return ((flags & UNDERLINE) == 0 ? false : true); + } + + /** + * Setter for underline. + * + * @param underline new underline value + */ + public final void setUnderline(final boolean underline) { + if (underline) { + flags |= UNDERLINE; + } else { + flags &= ~UNDERLINE; + } + } + + /** + * Getter for protect. + * + * @return protect value + */ + public final boolean isProtect() { + return ((flags & PROTECT) == 0 ? false : true); + } + + /** + * Setter for protect. + * + * @param protect new protect value + */ + public final void setProtect(final boolean protect) { + if (protect) { + flags |= PROTECT; + } else { + flags &= ~PROTECT; + } + } + + /** + * Getter for foreColor. + * + * @return foreColor value + */ + public final Color getForeColor() { + return foreColor; + } + + /** + * Setter for foreColor. + * + * @param foreColor new foreColor value + */ + public final void setForeColor(final Color foreColor) { + this.foreColor = foreColor; + } + + /** + * Getter for backColor. + * + * @return backColor value + */ + public final Color getBackColor() { + return backColor; + } + + /** + * Setter for backColor. + * + * @param backColor new backColor value + */ + public final void setBackColor(final Color backColor) { + this.backColor = backColor; + } + + /** + * Getter for foreColor RGB. + * + * @return foreColor value. Negative means unset. + */ + public final int getForeColorRGB() { + return foreColorRGB; + } + + /** + * Setter for foreColor RGB. + * + * @param foreColorRGB new foreColor RGB value + */ + public final void setForeColorRGB(final int foreColorRGB) { + this.foreColorRGB = foreColorRGB; + } + + /** + * Getter for backColor RGB. + * + * @return backColor value. Negative means unset. + */ + public final int getBackColorRGB() { + return backColorRGB; + } + + /** + * Setter for backColor RGB. + * + * @param backColorRGB new backColor RGB value + */ + public final void setBackColorRGB(final int backColorRGB) { + this.backColorRGB = backColorRGB; + } + + /** + * See if this cell uses RGB or ANSI colors. + * + * @return true if this cell has a RGB color + */ + public final boolean isRGB() { + return (foreColorRGB >= 0) || (backColorRGB >= 0); + } + + /** + * Set to default: white foreground on black background, no + * bold/underline/blink/rever/protect. */ public void reset() { - bold = false; - blink = false; - reverse = false; - protect = false; - underline = false; - foreColor = Color.WHITE; - backColor = Color.BLACK; + flags = 0; + foreColor = Color.WHITE; + backColor = Color.BLACK; + foreColorRGB = -1; + backColorRGB = -1; } /** - * Public constructor + * Comparison check. All fields must match to return true. + * + * @param rhs another CellAttributes instance + * @return true if all fields are equal */ - public CellAttributes() { - reset(); + @Override + public boolean equals(final Object rhs) { + if (!(rhs instanceof CellAttributes)) { + return false; + } + + CellAttributes that = (CellAttributes) rhs; + return ((flags == that.flags) + && (foreColor == that.foreColor) + && (backColor == that.backColor) + && (foreColorRGB == that.foreColorRGB) + && (backColorRGB == that.backColorRGB)); } /** - * Comparison. All fields must match to return true. + * Hashcode uses all fields in equals(). + * + * @return the hash */ @Override - public boolean equals(Object rhs) { - if (!(rhs instanceof CellAttributes)) { - return false; - } - - CellAttributes that = (CellAttributes)rhs; - return ((bold == that.bold) && - (blink == that.blink) && - (reverse == that.reverse) && - (underline == that.underline) && - (protect == that.protect) && - (foreColor == that.foreColor) && - (backColor == that.backColor)); - } - - /** - * Set my field values to that's field - */ - public void setTo(Object rhs) { - CellAttributes that = (CellAttributes)rhs; - - this.bold = that.bold; - this.blink = that.blink; - this.reverse = that.reverse; - this.underline = that.underline; - this.protect = that.protect; - this.foreColor = that.foreColor; - this.backColor = that.backColor; - } - - /** - * Convert enum to string - * - * @param color Color.RED, Color.BLUE, etc. - * @return "red", "blue", etc. - */ - static public String stringFromColor(Color color) { - if (color.equals(Color.BLACK)) { - return "black"; - } else if (color.equals(Color.WHITE)) { - return "white"; - } else if (color.equals(Color.RED)) { - return "red"; - } else if (color.equals(Color.CYAN)) { - return "cyan"; - } else if (color.equals(Color.GREEN)) { - return "green"; - } else if (color.equals(Color.MAGENTA)) { - return "magenta"; - } else if (color.equals(Color.BLUE)) { - return "blue"; - } else if (color.equals(Color.YELLOW)) { - return "yellow"; - } - throw new IllegalArgumentException("Invalid Color value: " + - color.value); - } - - /** - * Convert string to enum - * - * @param color "red", "blue", etc. - * @return Color.RED, Color.BLUE, etc. - */ - static public Color colorFromString(String color) { - switch (color.toLowerCase()) { - case "black": - return Color.BLACK; - case "white": - return Color.WHITE; - case "red": - return Color.RED; - case "cyan": - return Color.CYAN; - case "green": - return Color.GREEN; - case "magenta": - return Color.MAGENTA; - case "blue": - return Color.BLUE; - case "yellow": - return Color.YELLOW; - case "brown": - return Color.YELLOW; - default: - // Let unknown strings become white - return Color.WHITE; - } - } - - /** - * Make human-readable description of this CellAttributes + public int hashCode() { + int A = 13; + int B = 23; + int hash = A; + hash = (B * hash) + flags; + hash = (B * hash) + foreColor.hashCode(); + hash = (B * hash) + backColor.hashCode(); + hash = (B * hash) + foreColorRGB; + hash = (B * hash) + backColorRGB; + return hash; + } + + /** + * Set my field values to that's field. + * + * @param rhs another CellAttributes instance + */ + public void setTo(final Object rhs) { + CellAttributes that = (CellAttributes) rhs; + + this.flags = that.flags; + this.foreColor = that.foreColor; + this.backColor = that.backColor; + this.foreColorRGB = that.foreColorRGB; + this.backColorRGB = that.backColorRGB; + } + + /** + * Make human-readable description of this CellAttributes. + * + * @return displayable String */ @Override public String toString() { - return String.format("%s%s on %s", - bold ? "bold " : "", - stringFromColor(foreColor), - stringFromColor(backColor)); + if ((foreColorRGB >= 0) || (backColorRGB >= 0)) { + return String.format("RGB: #%06x on #%06x", + (foreColorRGB & 0xFFFFFF), + (backColorRGB & 0xFFFFFF)); + } + return String.format("%s%s%s on %s", (isBold() ? "bold " : ""), + (isBlink() ? "blink " : ""), foreColor, backColor); } } -