X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbits%2FMnemonicString.java;h=58575b570cf0f84330aa93859e8c36d974b798e2;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=08770acc8e806faad6813270c9c35b0f40ad0e81;hpb=8582f35a3ffb8212463076217eb89278f42331d4;p=fanfix.git diff --git a/src/jexer/bits/MnemonicString.java b/src/jexer/bits/MnemonicString.java index 08770ac..58575b5 100644 --- a/src/jexer/bits/MnemonicString.java +++ b/src/jexer/bits/MnemonicString.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) 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. - * - * 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 @@ -31,26 +29,21 @@ package jexer.bits; /** - * MnemonicString is used to render a string like "&File" into a highlighted - * 'F' and the rest of 'ile'. To insert a literal '&', use two '&&' - * characters, e.g. "&File && Stuff" would be "File & Stuff" with the first - * 'F' highlighted. + * MnemonicString is used to render a string like "&File" into a + * highlighted 'F' and the rest of 'ile'. To insert a literal '&', use + * two '&&' characters, e.g. "&File && Stuff" would be + * "File & Stuff" with the first 'F' highlighted. */ -public final class MnemonicString { +public class MnemonicString { + + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ /** * Keyboard shortcut to activate this item. */ - private char shortcut; - - /** - * Get the keyboard shortcut character. - * - * @return the highlighted character - */ - public char getShortcut() { - return shortcut; - } + private int shortcut; /** * Location of the highlighted character. @@ -58,64 +51,104 @@ public final class MnemonicString { private int shortcutIdx = -1; /** - * Get location of the highlighted character. - * - * @return location of the highlighted character + * Screen location of the highlighted character (number of text cells + * required to display from the beginning to shortcutIdx). */ - public int getShortcutIdx() { - return shortcutIdx; - } + private int screenShortcutIdx = -1; /** * The raw (uncolored) string. */ private String rawLabel; - /** - * Get the raw (uncolored) string. - * - * @return the raw (uncolored) string - */ - public String getRawLabel() { - return rawLabel; - } - + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * Public constructor. * * @param label widget label or title. Label must contain a keyboard - * shortcut, denoted by prefixing a letter with "&", e.g. "&File" + * shortcut, denoted by prefixing a letter with "&", e.g. "&File" */ public MnemonicString(final String label) { // Setup the menu shortcut - String newLabel = ""; + StringBuilder newLabel = new StringBuilder(); boolean foundAmp = false; boolean foundShortcut = false; int scanShortcutIdx = 0; - for (int i = 0; i < label.length(); i++) { - char c = label.charAt(i); + int scanScreenShortcutIdx = 0; + for (int i = 0; i < label.length();) { + int c = label.codePointAt(i); + i += Character.charCount(c); + if (c == '&') { if (foundAmp) { - newLabel += '&'; + newLabel.append('&'); scanShortcutIdx++; + scanScreenShortcutIdx++; } else { foundAmp = true; } } else { - newLabel += c; + newLabel.append(Character.toChars(c)); if (foundAmp) { if (!foundShortcut) { shortcut = c; foundAmp = false; foundShortcut = true; shortcutIdx = scanShortcutIdx; + screenShortcutIdx = scanScreenShortcutIdx; } } else { scanShortcutIdx++; + scanScreenShortcutIdx += StringUtils.width(c); } } } - this.rawLabel = newLabel; + this.rawLabel = newLabel.toString(); } + + // ------------------------------------------------------------------------ + // MnemonicString --------------------------------------------------------- + // ------------------------------------------------------------------------ + + /** + * Get the keyboard shortcut character. + * + * @return the highlighted character + */ + public int getShortcut() { + return shortcut; + } + + /** + * Get location of the highlighted character. + * + * @return location of the highlighted character + */ + public int getShortcutIdx() { + return shortcutIdx; + } + + /** + * Get the screen location of the highlighted character. + * + * @return the number of text cells required to display from the + * beginning of the label to shortcutIdx + */ + public int getScreenShortcutIdx() { + return screenShortcutIdx; + } + + /** + * Get the raw (uncolored) string. + * + * @return the raw (uncolored) string + */ + public String getRawLabel() { + return rawLabel; + } + }