X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbits%2FColorTheme.java;h=e55398a8235f38b4677f2dc9cd81edf514cdf735;hb=6f8ff91a29056209f9fd5f40e2dcf1ae285e0210;hp=60f2bd36c7bb0ccce1caaede6ea5e2d007ed4edb;hpb=daa4106c096cd4d2b92c3cbae6491edccd25fcc4;p=fanfix.git diff --git a/src/jexer/bits/ColorTheme.java b/src/jexer/bits/ColorTheme.java index 60f2bd3..e55398a 100644 --- a/src/jexer/bits/ColorTheme.java +++ b/src/jexer/bits/ColorTheme.java @@ -1,29 +1,27 @@ /* * Jexer - Java Text User Interface * - * License: LGPLv3 or later + * The MIT License (MIT) * - * 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) 2017 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. - * - * 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 @@ -34,6 +32,10 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; import java.util.SortedMap; import java.util.StringTokenizer; import java.util.TreeMap; @@ -68,6 +70,29 @@ public final class ColorTheme { return attr; } + /** + * Retrieve all the names in the theme. + * + * @return a list of names + */ + public List getColorNames() { + Set keys = colors.keySet(); + List names = new ArrayList(keys.size()); + names.addAll(keys); + return names; + } + + /** + * Set the color for a named theme color. + * + * @param name theme color name, e.g. "twindow.border" + * @param color the new color to associate with name, e.g. bold yellow on + * blue + */ + public void setColor(final String name, final CellAttributes color) { + colors.put(name, color); + } + /** * Save the color theme mappings to an ASCII file. * @@ -90,31 +115,54 @@ public final class ColorTheme { * @throws IOException if the I/O fails */ public void load(final String filename) throws IOException { - BufferedReader reader = new BufferedReader(new FileReader(filename)); - String line = reader.readLine(); - for (; line != null; line = reader.readLine()) { + load(new FileReader(filename)); + } + + /** + * Read color theme mappings from a Reader. The reader is closed at the + * end. + * + * @param reader the reader to read from + * @throws IOException if the I/O fails + */ + public void load(final Reader reader) throws IOException { + BufferedReader bufferedReader = new BufferedReader(reader); + String line = bufferedReader.readLine(); + for (; line != null; line = bufferedReader.readLine()) { String key; - String bold; + boolean bold = false; + boolean blink = false; String foreColor; String backColor; + String token; // Look for lines that resemble: // "key = blah on blah" // "key = bold blah on blah" + // "key = blink bold blah on blah" + // "key = bold blink blah on blah" + // "key = blink blah on blah" StringTokenizer tokenizer = new StringTokenizer(line); key = tokenizer.nextToken(); if (!tokenizer.nextToken().equals("=")) { // Skip this line continue; } - bold = tokenizer.nextToken(); - if (!bold.toLowerCase().equals("bold")) { - // "key = blah on blah" - foreColor = bold; - } else { - // "key = bold blah on blah" - foreColor = tokenizer.nextToken().toLowerCase(); + token = tokenizer.nextToken(); + while (token.equals("bold") || token.equals("blink")) { + if (token.equals("bold")) { + bold = true; + token = tokenizer.nextToken(); + } + if (token.equals("blink")) { + blink = true; + token = tokenizer.nextToken(); + } } + + // What's left is "blah on blah" or "blah" + foreColor = token.toLowerCase(); + if (!tokenizer.nextToken().toLowerCase().equals("on")) { // Skip this line continue; @@ -122,15 +170,18 @@ public final class ColorTheme { backColor = tokenizer.nextToken().toLowerCase(); CellAttributes color = new CellAttributes(); - if (bold.equals("bold")) { + if (bold) { color.setBold(true); } + if (blink) { + color.setBlink(true); + } color.setForeColor(Color.getColor(foreColor)); color.setBackColor(Color.getColor(backColor)); colors.put(key, color); } // All done. - reader.close(); + bufferedReader.close(); } /** @@ -216,12 +267,12 @@ public final class ColorTheme { color.setBold(false); colors.put("twindow.background.windowmove", color); - // TApplication background + // TDesktop background color = new CellAttributes(); color.setForeColor(Color.BLUE); color.setBackColor(Color.WHITE); color.setBold(false); - colors.put("tapplication.background", color); + colors.put("tdesktop.background", color); // TButton text color = new CellAttributes(); @@ -230,7 +281,7 @@ public final class ColorTheme { color.setBold(false); colors.put("tbutton.inactive", color); color = new CellAttributes(); - color.setForeColor(Color.WHITE); + color.setForeColor(Color.CYAN); color.setBackColor(Color.GREEN); color.setBold(true); colors.put("tbutton.active", color); @@ -260,7 +311,7 @@ public final class ColorTheme { // TText text color = new CellAttributes(); color.setForeColor(Color.WHITE); - color.setBackColor(Color.BLACK); + color.setBackColor(Color.BLUE); color.setBold(false); colors.put("ttext", color); @@ -391,32 +442,49 @@ public final class ColorTheme { color.setBold(true); colors.put("ttreeview.inactive", color); - // TText text + // TList color = new CellAttributes(); color.setForeColor(Color.WHITE); color.setBackColor(Color.BLUE); color.setBold(false); - colors.put("tdirectorylist", color); + colors.put("tlist", color); color = new CellAttributes(); color.setForeColor(Color.BLACK); color.setBackColor(Color.CYAN); color.setBold(false); - colors.put("tdirectorylist.selected", color); + colors.put("tlist.selected", color); color = new CellAttributes(); color.setForeColor(Color.BLACK); color.setBackColor(Color.CYAN); color.setBold(false); - colors.put("tdirectorylist.unreadable", color); + colors.put("tlist.unreadable", color); color = new CellAttributes(); color.setForeColor(Color.BLACK); color.setBackColor(Color.BLUE); color.setBold(true); - colors.put("tdirectorylist.inactive", color); + colors.put("tlist.inactive", color); + + // TStatusBar + color = new CellAttributes(); + color.setForeColor(Color.BLACK); + color.setBackColor(Color.WHITE); + color.setBold(false); + colors.put("tstatusbar.text", color); + color = new CellAttributes(); + color.setForeColor(Color.RED); + color.setBackColor(Color.WHITE); + color.setBold(false); + colors.put("tstatusbar.button", color); + color = new CellAttributes(); + color.setForeColor(Color.WHITE); + color.setBackColor(Color.BLUE); + color.setBold(false); + colors.put("tstatusbar.selected", color); // TEditor color = new CellAttributes(); color.setForeColor(Color.WHITE); - color.setBackColor(Color.BLACK); + color.setBackColor(Color.BLUE); color.setBold(false); colors.put("teditor", color);