Add a couple new fonts and smaller improvements all around.

app/fontmanager.cpp

@@ -7,7 +7,7 @@
 namespace {
 constexpr int kModernRasterization = 4;
 constexpr int kBaseFontPixelHeight = 32;
-constexpr int kSystemFontPixelSize = 30;
+constexpr int kSystemFontPixelSize = 32;
 }
 
 FontManager::FontManager(QObject *parent)
@@ -197,9 +197,16 @@ void FontManager::populateBundledFonts()
     m_allFonts.clear();
 
     addBundledFont(
-        "TERMINUS_SCALED",
+        "TERMINESS_SCALED",
-        "Terminus",
+        "Terminess",
-        ":/fonts/terminus/TerminusTTF-4.49.3.ttf",
+        ":/fonts/terminus/TerminessNerdFontMono-Regular.ttf",
+        1.0,
+        12,
+        true);
+    addBundledFont(
+        "BIGBLUE_TERMINAL_SCALED",
+        "BigBlue Terminal",
+        ":/fonts/bigblue-terminal/BigBlueTerm437NerdFontMono-Regular.ttf",
         1.0,
         12,
         true);
@@ -300,9 +307,9 @@ void FontManager::populateBundledFonts()
         "UNSCII_16_SCALED");
 
     addBundledFont(
-        "TERMINUS",
+        "TERMINESS",
-        "Terminus",
+        "Terminess",
-        ":/fonts/terminus/TerminusTTF-4.49.3.ttf",
+        ":/fonts/terminus/TerminessNerdFontMono-Regular.ttf",
         1.0,
         32,
         false);

app/fontmanager.h

@@ -96,7 +96,7 @@ private:
 
     int m_fontSource = 0;
     int m_rasterization = 0;
-    QString m_fontName = QStringLiteral("TERMINUS_SCALED");
+    QString m_fontName = QStringLiteral("TERMINESS_SCALED");
     qreal m_fontScaling = 1.0;
     qreal m_fontWidth = 1.0;
     qreal m_lineSpacing = 0.1;

app/qml/ApplicationSettings.qml

@@ -40,11 +40,6 @@ QtObject {
     property bool isMacOS: Qt.platform.os === "osx"
 
     // GENERAL SETTINGS ///////////////////////////////////////////////////////
-    property int x: 100
-    property int y: 100
-    property int width: 1024
-    property int height: 768
-
     property bool fullscreen: false
     property bool showMenubar: false
 
@@ -163,10 +158,6 @@ QtObject {
     function composeSettingsString() {
         var settings = {
             "effectsFrameSkip": effectsFrameSkip,
-            "x": x,
-            "y": y,
-            "width": width,
-            "height": height,
             "windowScaling": windowScaling,
             "showTerminalSize": showTerminalSize,
             "fontScaling": fontScaling,
@@ -255,11 +246,6 @@ QtObject {
         windowScaling = settings.windowScaling
                 !== undefined ? settings.windowScaling : windowScaling
 
-        x = settings.x !== undefined ? settings.x : x
-        y = settings.y !== undefined ? settings.y : y
-        width = settings.width !== undefined ? settings.width : width
-        height = settings.height !== undefined ? settings.height : height
-
         fontScaling = settings.fontScaling !== undefined ? settings.fontScaling : fontScaling
 
         showMenubar = settings.showMenubar !== undefined ? settings.showMenubar : showMenubar
@@ -387,7 +373,7 @@ QtObject {
                 "contrast": 0.8,
                 "flickering": 0.1,
                 "fontColor": "#ff8100",
-                "fontName": "TERMINUS_SCALED",
+                "fontName": "TERMINESS_SCALED",
                 "fontSource": 0,
                 "fontWidth": 1,
                 "lineSpacing": 0.1,

app/qml/Fonts.qml

@@ -1,278 +0,0 @@
-
-/*******************************************************************************
-* Copyright (c) 2013-2021 "Filippo Scognamiglio"
-* https://github.com/Swordfish90/cool-retro-term
-*
-* This file is part of cool-retro-term.
-*
-* cool-retro-term is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* 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 General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*******************************************************************************/
-import QtQuick 2.2
-
-QtObject {
-    property int selectedFontIndex
-    property real scaling
-    property var source: fontlist.get(selectedFontIndex).source
-    property var _font: fontlist.get(selectedFontIndex)
-    property bool lowResolutionFont: _font.lowResolutionFont
-
-    // Reference height (in pixels) that represents the "normal" on-screen size at scaling=1.0.
-    // Adjust this single value to tune how large fonts appear by default.
-    property int baseFontPixelHeight: 32
-
-    // Target pixel height we want on screen for the current zoom level. Low-res fonts will be scaled
-    // up to this height, high-res fonts render directly at this size.
-    property real targetPixelHeight: baseFontPixelHeight * scaling
-
-    property int pixelSize: lowResolutionFont ? _font.pixelSize : targetPixelHeight
-
-    property real baseWidth: _font.baseWidth ?? 1.0
-
-    // Line spacing expressed as a relative factor for all fonts.
-    property real lineSpacingFactor: appSettings.lineSpacing
-    property int lineSpacing: Math.round(targetPixelHeight * lineSpacingFactor)
-
-    // Use total line height (glyph + spacing) for scaling computations on low-res fonts.
-    property real nativeLineHeight: _font.pixelSize + Math.round(
-                                        _font.pixelSize * lineSpacingFactor)
-    property real targetLineHeight: targetPixelHeight + lineSpacing
-
-    // Scale low-res font textures to hit the target line height; high-res fonts don't need scaling.
-    property real screenScaling: lowResolutionFont ? targetLineHeight / nativeLineHeight : 1.0
-
-    // Uniform default font width (user width scaling still applies).
-    property real defaultFontWidth: 1.0
-
-    property bool isSystemFont: fontlist.get(selectedFontIndex).isSystemFont
-
-    property string family: fontlist.get(selectedFontIndex).family ?? ""
-
-    // There are two kind of fonts: low resolution and high resolution.
-    // Low resolution font sets the lowResolutionFont property to true.
-    // They are rendered at a fixed pixel size and the texture is upscaled
-    // to fill the screen (they are much faster to render).
-    // High resolution fonts are instead drawn on a texture which has the
-    // size of the screen, and the scaling directly controls their pixels size.
-    // Those are slower to render but are not pixelated.
-    property ListModel fontlist: ListModel {
-        ListElement {
-            name: "TERMINUS_SCALED"
-            text: "Terminus"
-            source: "fonts/terminus/TerminusTTF-4.49.3.ttf"
-            baseWidth: 1.0
-            pixelSize: 12
-            lowResolutionFont: true
-            isSystemFont: false
-        }
-        ListElement {
-            name: "EXCELSIOR_SCALED"
-            text: "Fixedsys Excelsior"
-            source: "fonts/fixedsys-excelsior/FSEX301-L2.ttf"
-            baseWidth: 1.0
-            pixelSize: 16
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_16_SCALED"
-        }
-        ListElement {
-            name: "GREYBEARD_SCALED"
-            text: "Greybeard"
-            source: "fonts/greybeard/Greybeard-16px.ttf"
-            baseWidth: 1.0
-            pixelSize: 16
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_16_SCALED"
-        }
-        ListElement {
-            name: "COMMODORE_PET_SCALED"
-            text: "Commodore PET"
-            source: "fonts/pet-me/PetMe.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "COZETTE_SCALED"
-            text: "Cozette"
-            source: "fonts/cozette/CozetteVector.ttf"
-            baseWidth: 1.0
-            pixelSize: 13
-            lowResolutionFont: true
-            isSystemFont: false
-        }
-        ListElement {
-            name: "UNSCII_8_SCALED"
-            text: "Unscii 8"
-            source: "fonts/unscii/unscii-8.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "UNSCII_8_THIN_SCALED"
-            text: "Unscii 8 Thin"
-            source: "fonts/unscii/unscii-8-thin.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "UNSCII_16_SCALED"
-            text: "Unscii 16"
-            source: "fonts/unscii/unscii-16-full.ttf"
-            baseWidth: 1.0
-            pixelSize: 16
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_16_SCALED"
-        }
-        ListElement {
-            name: "APPLE_II_SCALED"
-            text: "Apple ]["
-            source: "fonts/apple2/PrintChar21.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "ATARI_400_SCALED"
-            text: "Atari 400-800"
-            source: "fonts/atari-400-800/AtariClassic-Regular.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "COMMODORE_64_SCALED"
-            text: "Commodore 64"
-            source: "fonts/pet-me/PetMe64.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "IBM_EGA_8x8"
-            text: "IBM EGA 8x8"
-            source: "fonts/oldschool-pc-fonts/PxPlus_IBM_EGA_8x8.ttf"
-            baseWidth: 0.5
-            pixelSize: 8
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_8_SCALED"
-        }
-        ListElement {
-            name: "IBM_VGA_8x16"
-            text: "IBM VGA 8x16"
-            source: "fonts/oldschool-pc-fonts/PxPlus_IBM_VGA_8x16.ttf"
-            baseWidth: 1.0
-            pixelSize: 16
-            lowResolutionFont: true
-            isSystemFont: false
-            fallbackName: "UNSCII_16_SCALED"
-        }
-        ListElement {
-            name: "TERMINUS"
-            text: "Terminus"
-            source: "fonts/terminus/TerminusTTF-4.49.3.ttf"
-            baseWidth: 1.0
-            pixelSize: 32
-            lowResolutionFont: false
-            isSystemFont: false
-        }
-        ListElement {
-            name: "HACK"
-            text: "Hack"
-            source: "fonts/hack/Hack-Regular.ttf"
-            baseWidth: 1.0
-            pixelSize: 32
-            lowResolutionFont: false
-            isSystemFont: false
-        }
-        ListElement {
-            name: "FIRA_CODE"
-            text: "Fira Code"
-            source: "fonts/fira-code/FiraCode-Medium.ttf"
-            baseWidth: 1.0
-            pixelSize: 32
-            lowResolutionFont: false
-            isSystemFont: false
-        }
-        ListElement {
-            name: "IOSEVKA"
-            text: "Iosevka"
-            source: "fonts/iosevka/IosevkaTerm-ExtendedMedium.ttf"
-            baseWidth: 1.0
-            pixelSize: 32
-            lowResolutionFont: false
-            isSystemFont: false
-        }
-        ListElement {
-            name: "JETBRAINS_MONO"
-            text: "JetBrains Mono"
-            source: "fonts/jetbrains-mono/JetBrainsMono-Medium.ttf"
-            baseWidth: 1.0
-            pixelSize: 32
-            lowResolutionFont: false
-            isSystemFont: false
-        }
-        ListElement {
-            name: "IBM_3278"
-            text: "IBM 3278"
-            source: "fonts/ibm-3278/3270-Regular.ttf"
-            baseWidth: 1.0
-            pixelSize: 32
-            lowResolutionFont: false
-            isSystemFont: false
-        }
-    }
-
-    Component.onCompleted: addSystemFonts()
-
-    function addSystemFonts() {
-        var families = monospaceSystemFonts
-        for (var i = 0; i < families.length; i++) {
-            if (verbose) {
-                console.log("Adding system font: ", families[i])
-            }
-            fontlist.append(convertToListElement(families[i]))
-        }
-        appSettings.updateFont()
-    }
-
-    function convertToListElement(family) {
-        return {
-            "name": family,
-            "text": family,
-            "source": "",
-            "pixelSize": 30,
-            "baseScaling": 1.0,
-            "lowResolutionFont": false,
-            "isSystemFont": true,
-            "family": family
-        }
-    }
-}

app/qml/PreprocessedTerminal.qml

@@ -116,14 +116,11 @@ Item{
             return Math.round(size / factor) * factor;
         }
 
-        colorScheme: "cool-retro-term"
-
-        antialiasText: !appSettings.lowResolutionFont
-        smooth: !appSettings.lowResolutionFont
-        enableBold: !appSettings.lowResolutionFont
         fullCursorHeight: true
         blinkingCursor: appSettings.blinkingCursor
 
+        colorScheme: "cool-retro-term"
+
         session: QMLTermSession {
             id: ksession
 
@@ -142,12 +139,16 @@ Item{
                 anchors.topMargin: 1
                 anchors.bottomMargin: 1
                 color: "white"
-                radius: width * 0.25
                 opacity: 0.7
             }
         }
 
         function handleFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling, fontWidth, fallbackFontFamily, lowResolutionFont) {
+            kterminal.lineSpacing = lineSpacing;
+            kterminal.antialiasText = !lowResolutionFont;
+            kterminal.smooth = !lowResolutionFont;
+            kterminal.enableBold = !lowResolutionFont;
+
             kterminal.font = Qt.font({
                 family: fontFamily,
                 pixelSize: pixelSize
@@ -156,8 +157,6 @@ Item{
             terminalContainer.fontWidth = fontWidth;
             terminalContainer.screenScaling = screenScaling;
             scaleTexture = Math.max(1.0, Math.floor(screenScaling * appSettings.windowScaling));
-
-            kterminal.lineSpacing = lineSpacing;
         }
 
         Connections {

app/qml/Storage.qml

@@ -22,7 +22,7 @@ import QtQuick 2.2
 import QtQuick.LocalStorage 2.0
 
 QtObject {
-    readonly property string dbMajorVersion: "1"
+    readonly property string dbMajorVersion: "2"
     readonly property string dbMinorVersion: "1.0"
     property bool initialized: false
 

app/qml/TerminalTabs.qml

@@ -31,6 +31,13 @@ Item {
     readonly property int count: tabsModel.count
     property var hostWindow
 
+    function normalizeTitle(rawTitle) {
+        if (rawTitle === undefined || rawTitle === null) {
+            return ""
+        }
+        return String(rawTitle).trim()
+    }
+
     function addTab() {
         tabsModel.append({ title: "" })
         tabBar.currentIndex = tabsModel.count - 1
@@ -129,7 +136,7 @@ Item {
                             activate()
                         }
                     }
-                    onTitleChanged: tabsModel.setProperty(index, "title", title)
+                    onTitleChanged: tabsModel.setProperty(index, "title", normalizeTitle(title))
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     onSessionFinished: tabsRoot.closeTab(index)

app/qml/TerminalWindow.qml

@@ -29,19 +29,8 @@ ApplicationWindow {
     width: 1024
     height: 768
 
-    // Save window properties automatically
+    // Show the window once it is ready.
-    onXChanged: appSettings.x = x
-    onYChanged: appSettings.y = y
-    onWidthChanged: appSettings.width = width
-    onHeightChanged: appSettings.height = height
-
-    // Load saved window geometry and show the window
     Component.onCompleted: {
-        x = appSettings.x
-        y = appSettings.y
-        width = appSettings.width
-        height = appSettings.height
-
         visible = true
     }
 

app/qml/fonts/bigblue-terminal/LICENSE.TXT

@@ -0,0 +1,428 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+

app/qml/fonts/terminus/LICENSE-Terminess.txt

@@ -1,127 +1,97 @@
-This package was debianized by Anton Zinoviev <zinoviev@debian.ort>.
+Copyright (c) 2010 Dimitar Toshkov Zhekov,
-
+with Reserved Font Name "Terminus Font".
-It was downloaded from http://terminus-font.sourceforge.net/
+
-
+Copyright (c) 2011-2021 Tilman Blumenbach,
-Terminus Font is licensed under the SIL Open Font License, Version 1.1.
+with Reserved Font Name "Terminus (TTF)".
-
+
-Copyright (c) 2010-2014 Dimitar Toshkov Zhekov,
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
-with Reserved Font Name "Terminus Font".
+This license is copied below, and is also available with a FAQ at:
-
+http://scripts.sil.org/OFL
-To avoid name conflicts with other products named "Terminus", the
+
-archive should be distributed as "Terminus Font", not "Terminus".
+
-
+-----------------------------------------------------------
-
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
+-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+
------------------------------------------------------------
+PREAMBLE
-
+The goals of the Open Font License (OFL) are to stimulate worldwide
-PREAMBLE
+development of collaborative font projects, to support the font creation
-The goals of the Open Font License (OFL) are to stimulate worldwide
+efforts of academic and linguistic communities, and to provide a free and
-development of collaborative font projects, to support the font creation
+open framework in which fonts may be shared and improved in partnership
-efforts of academic and linguistic communities, and to provide a free and
+with others.
-open framework in which fonts may be shared and improved in partnership
+
-with others.
+The OFL allows the licensed fonts to be used, studied, modified and
-
+redistributed freely as long as they are not sold by themselves. The
-The OFL allows the licensed fonts to be used, studied, modified and
+fonts, including any derivative works, can be bundled, embedded, 
-redistributed freely as long as they are not sold by themselves. The
+redistributed and/or sold with any software provided that any reserved
-fonts, including any derivative works, can be bundled, embedded, 
+names are not used by derivative works. The fonts and derivatives,
-redistributed and/or sold with any software provided that any reserved
+however, cannot be released under any other type of license. The
-names are not used by derivative works. The fonts and derivatives,
+requirement for fonts to remain under this license does not apply
-however, cannot be released under any other type of license. The
+to any document created using the fonts or their derivatives.
-requirement for fonts to remain under this license does not apply
+
-to any document created using the fonts or their derivatives.
+DEFINITIONS
-
+"Font Software" refers to the set of files released by the Copyright
-DEFINITIONS
+Holder(s) under this license and clearly marked as such. This may
-"Font Software" refers to the set of files released by the Copyright
+include source files, build scripts and documentation.
-Holder(s) under this license and clearly marked as such. This may
+
-include source files, build scripts and documentation.
+"Reserved Font Name" refers to any names specified as such after the
-
+copyright statement(s).
-"Reserved Font Name" refers to any names specified as such after the
+
-copyright statement(s).
+"Original Version" refers to the collection of Font Software components as
-
+distributed by the Copyright Holder(s).
-"Original Version" refers to the collection of Font Software components as
+
-distributed by the Copyright Holder(s).
+"Modified Version" refers to any derivative made by adding to, deleting,
-
+or substituting -- in part or in whole -- any of the components of the
-"Modified Version" refers to any derivative made by adding to, deleting,
+Original Version, by changing formats or by porting the Font Software to a
-or substituting -- in part or in whole -- any of the components of the
+new environment.
-Original Version, by changing formats or by porting the Font Software to a
+
-new environment.
+"Author" refers to any designer, engineer, programmer, technical
-
+writer or other person who contributed to the Font Software.
-"Author" refers to any designer, engineer, programmer, technical
+
-writer or other person who contributed to the Font Software.
+PERMISSION & CONDITIONS
-
+Permission is hereby granted, free of charge, to any person obtaining
-PERMISSION & CONDITIONS
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
-Permission is hereby granted, free of charge, to any person obtaining
+redistribute, and sell modified and unmodified copies of the Font
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
+Software, subject to the following conditions:
-redistribute, and sell modified and unmodified copies of the Font
+
-Software, subject to the following conditions:
+1) Neither the Font Software nor any of its individual components,
-
+in Original or Modified Versions, may be sold by itself.
-1) Neither the Font Software nor any of its individual components,
+
-in Original or Modified Versions, may be sold by itself.
+2) Original or Modified Versions of the Font Software may be bundled,
-
+redistributed and/or sold with any software, provided that each copy
-2) Original or Modified Versions of the Font Software may be bundled,
+contains the above copyright notice and this license. These can be
-redistributed and/or sold with any software, provided that each copy
+included either as stand-alone text files, human-readable headers or
-contains the above copyright notice and this license. These can be
+in the appropriate machine-readable metadata fields within text or
-included either as stand-alone text files, human-readable headers or
+binary files as long as those fields can be easily viewed by the user.
-in the appropriate machine-readable metadata fields within text or
+
-binary files as long as those fields can be easily viewed by the user.
+3) No Modified Version of the Font Software may use the Reserved Font
-
+Name(s) unless explicit written permission is granted by the corresponding
-3) No Modified Version of the Font Software may use the Reserved Font
+Copyright Holder. This restriction only applies to the primary font name as
-Name(s) unless explicit written permission is granted by the corresponding
+presented to the users.
-Copyright Holder. This restriction only applies to the primary font name as
+
-presented to the users.
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-
+Software shall not be used to promote, endorse or advertise any
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Modified Version, except to acknowledge the contribution(s) of the
-Software shall not be used to promote, endorse or advertise any
+Copyright Holder(s) and the Author(s) or with their explicit written
-Modified Version, except to acknowledge the contribution(s) of the
+permission.
-Copyright Holder(s) and the Author(s) or with their explicit written
+
-permission.
+5) The Font Software, modified or unmodified, in part or in whole,
-
+must be distributed entirely under this license, and must not be
-5) The Font Software, modified or unmodified, in part or in whole,
+distributed under any other license. The requirement for fonts to
-must be distributed entirely under this license, and must not be
+remain under this license does not apply to any document created
-distributed under any other license. The requirement for fonts to
+using the Font Software.
-remain under this license does not apply to any document created
+
-using the Font Software.
+TERMINATION
-
+This license becomes null and void if any of the above conditions are
-TERMINATION
+not met.
-This license becomes null and void if any of the above conditions are
+
-not met.
+DISCLAIMER
-
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-DISCLAIMER
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+OTHER DEALINGS IN THE FONT SOFTWARE.
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-=================================================================
-
-The fonts from the package xfonts-terminus-oblique are automatically
-generated from the fonts in xfonts-terminus using the script
-bdfslant.pl.  This script has the following copyright:
-
-Copyright (C) 1994-95 Cronyx Ltd, author: Serge Vakulenko, <vak@cronyx.ru>
-Changes Copyright (C) 1995-1997 by Andrey A. Chernov, Moscow, Russia.
-Changes (C) 2000 by Serge Winitzki
-
-This software may be used, modified, copied, distributed, and sold,
-in both source and binary form provided that the above copyright
-and these terms are retained. Under no circumstances is the author
-responsible for the proper functioning of this software, nor does
-the author assume any responsibility for damages incurred with its use.
-
-=================================================================
-
-The source package includes the bdftopsf.pl and ucstoany.pl utilities.
-These are not used in order to build the binary Debian packages.  They
-are distributed under the GNU General Public License version 2.0 or
-(at your choice) any later version.  You should have received a copy
-of the GNU General Public License with your Debian GNU/Linux system,
-in /usr/share/common-licenses/GPL.  If not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
-USA
-

app/qml/resources.qrc

@@ -30,6 +30,7 @@
         <file>fonts/greybeard/Greybeard-16px.ttf</file>
         <file>fonts/hack/Hack-Regular.ttf</file>
         <file>fonts/fira-code/FiraCode-Medium.ttf</file>
+        <file>fonts/bigblue-terminal/BigBlueTerm437NerdFontMono-Regular.ttf</file>
         <file>fonts/iosevka/IosevkaTerm-ExtendedMedium.ttf</file>
         <file>fonts/jetbrains-mono/JetBrainsMono-Medium.ttf</file>
         <file>../icons/32x32/cool-retro-term.png</file>
@@ -38,7 +39,7 @@
         <file>fonts/pet-me/PetMe64.ttf</file>
         <file>fonts/pet-me/PetMe.ttf</file>
         <file>BurnInEffect.qml</file>
-        <file>fonts/terminus/TerminusTTF-4.49.3.ttf</file>
+        <file>fonts/terminus/TerminessNerdFontMono-Regular.ttf</file>
         <file>TerminalFrame.qml</file>
         <file>menus/WindowMenu.qml</file>
         <file>menus/FullContextMenu.qml</file>

app/shaders/terminal_frame.frag

@@ -64,7 +64,7 @@ void main() {
 
     float distPixels = roundedRectSdfPixels(coords, vec2(0.0), vec2(1.0), screenRadiusPixels);
     float frameShadow = (e * 0.66 + w * 0.66 + n * 0.33 + s) * depth;
-    frameShadow *= smoothstep(0.0, edgeSoftPixels * 10.0, distPixels);
+    frameShadow *= smoothstep(0.0, edgeSoftPixels * 5.0, distPixels);
 
     float frameAlpha = 1.0 - frameShininess * 0.4;