Allow customizing line spacing.

Feature/appimage in GitHub actions

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: swordfish90
+custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=flscogna%40gmail.com&item_name=Support+CRT&currency_code=EUR&source=url']

.github/workflows/appimage.yml

@@ -0,0 +1,98 @@
+name: "ci"
+
+on:
+  push:
+    tags: "**"
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  appimage:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Install dependencies
+      run: |
+        sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-bionic
+        sudo apt-get update -qq
+        sudo apt-get install -y \
+        build-essential make wget libgl1-mesa-dev \
+        qt515declarative qt515graphicaleffects \
+        qt515quickcontrols qt515quickcontrols2
+
+    - name: Download QT appimage builder
+      run: |
+        wget -c -O linuxdeployqt.AppImage \
+        https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+        chmod a+x linuxdeployqt.AppImage
+
+    - name: Build project
+      run: |
+        source /opt/qt*/bin/qt*-env.sh && \
+        qmake -v && \
+        qmake CONFIG+=release PREFIX=/usr && \
+        make -j$(nproc)
+
+    - name: Install to appdir
+      run: |
+        source /opt/qt*/bin/qt*-env.sh && \
+        make INSTALL_ROOT=appdir -j$(nproc) install
+
+    - name: Extract version number
+      run: |
+        # Extract version for linuxdeployqt to name the file. Use the tag as
+        # release name but remove prefix.
+        echo "VERSION=$(echo '${{ github.ref }}' | sed 's;.*/;;')" >> $GITHUB_ENV
+
+    - name: Build appimage directory
+      run: |
+        mkdir -p \
+        appdir/usr/bin \
+        appdir/usr/lib \
+        appdir/usr/share/applications \
+        appdir/usr/share/metainfo \
+        appdir/usr/share/icons/hicolor/128x128/apps
+
+        cp cool-retro-term appdir/usr/bin/
+        cp cool-retro-term.desktop appdir/usr/share/applications/
+        cp packaging/appdata/cool-retro-term.appdata.xml appdir/usr/share/metainfo/
+        cp app/icons/128x128/cool-retro-term.png appdir/usr/share/icons/hicolor/128x128/apps/
+        cp -r ./app/qml appdir/usr/
+        # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78
+        cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/
+
+        find appdir | sort
+
+    - name: Build appimage
+      run: |
+        source /opt/qt*/bin/qt*-env.sh && \
+        ./linuxdeployqt.AppImage appdir/usr/share/applications/cool-retro-term.desktop \
+        -verbose=1 -appimage \
+        -qmldir=./app/qml/ \
+        -qmldir=./qmltermwidget/
+      env:
+        # Unset environment variables
+        QTDIR:
+        QT_PLUGIN_PATH:
+        LD_LIBRARY_PATH:
+
+    - name: Upload release
+      uses: softprops/action-gh-release@v1
+      with:
+        body: appimage release
+        files: ./**/Cool_Retro_Term-*-x86_64.AppImage
+
+    - name: Clean up
+      if: always()
+      run: |
+        find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+        make clean
+        rm -rf appdir

.gitignore

@@ -18,6 +18,7 @@
 *.pro.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
 Makefile*
@@ -42,6 +43,7 @@ Makefile*
 # Excludes compiled files
 imports
 cool-retro-term
+build
 
 # Mac OSX
 

README.md

@@ -8,9 +8,11 @@
 cool-retro-term is a terminal emulator which mimics the look and feel of the old cathode tube screens.
 It has been designed to be eye-candy, customizable, and reasonably lightweight.
 
-It uses the QML port of qtermwidget (Konsole) developed by me: https://github.com/Swordfish90/qmltermwidget .
+It uses the QML port of qtermwidget (Konsole): https://github.com/Swordfish90/qmltermwidget.
 
-This terminal emulator works under Linux and macOS and requires Qt 5.2 or higher.
+This terminal emulator works under Linux and macOS and requires Qt5. It's suggested that you stick to the latest LTS version.
+
+Settings such as colors, fonts, and effects can be accessed via context menu.
 
 ## Screenshots
 ![Image](<https://i.imgur.com/TNumkDn.png>)
@@ -18,164 +20,11 @@ This terminal emulator works under Linux and macOS and requires Qt 5.2 or higher
 ![Image](<https://i.imgur.com/GYRDPzJ.jpg>)
 
 ## Install
-Walk the easy way and install cool-retro-term using one of these convenient packages:
 
-**Fedora** has the `cool-retro-term` in the offcial repositories. All you have to do is `sudo dnf install cool-retro-term`.
+If you want to get a hold of the latest version, just go to the Releases page and grab the latest AppImage (Linux) or dmg (macOS).
 
-Users of **openSUSE** can grab a package from [Open Build Service](http://software.opensuse.org/package/cool-retro-term).
+Alternatively, most distributions such as Ubuntu, Fedora or Arch already package cool-retro-term in their official repositories.
 
-**Arch** users can install this [package](https://aur.archlinux.org/packages/cool-retro-term-git/) directly via the [AUR](https://aur.archlinux.org):
+## Building
 
-    yaourt -S aur/cool-retro-term-git
-
-or use:
-
-    pacman -S cool-retro-term
-
-to install precompiled from community repository.
-
-**Gentoo** users can now install the third release "1.1.0" from a 3rd-party repository preferably via layman:
-
-    USE="git" emerge app-portage/layman
-    wget https://www.gerczei.eu/files/gerczei.xml -O /etc/layman/overlays/gerczei.xml
-    layman -f -a qt -a gerczei # those who've added the repo before 27/08/17 should remove, update and add it again as its source has changed
-    ACCEPT_KEYWORDS="~*" emerge =x11-terms/cool-retro-term-1.1.0::gerczei
-
-The live ebuild (version 9999-r1) tracking the bleeding-edge WIP codebase also remains available.
-
-A word of warning: USE flags and keywords are to be added to portage's configuration files and every emerge operation should be executed with '-p' (short option for --pretend) appended to the command line first as per best practice!
-
-Users of **Ubuntu 14.04 LTS (Trusty) up to 15.10 (Wily)** can use [this PPA](https://launchpad.net/~bugs-launchpad-net-falkensweb).
-
-**Ubuntu 17.10** can use [this PPA](https://launchpad.net/%7Evantuz/+archive/ubuntu/cool-retro-term)
-
-**macOS** users can grab the latest dmg from the release page: https://github.com/Swordfish90/cool-retro-term/releases
-
-## Build instructions (Linux)
-
-Build cool-retro-term yourself, you know, the retro way.
-
-## Dependencies
-Make sure to install these first.
-
----
-
-**Ubuntu 14.04**
-
-    sudo apt-get install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qtdeclarative5-controls-plugin qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qtdeclarative5-dialogs-plugin qtdeclarative5-localstorage-plugin qtdeclarative5-window-plugin
-
----
-
-**Ubuntu 16.10**
-
-    sudo apt-get install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qml-module-qtquick-controls qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qml-module-qtquick-dialogs qtdeclarative5-localstorage-plugin qtdeclarative5-window-plugin
-
----
-
-**Ubuntu 17.04**
-
-    sudo apt install build-essential libqt5qml-graphicaleffects qml-module-qt-labs-folderlistmodel qml-module-qt-labs-settings qml-module-qtquick-controls qml-module-qtquick-dialogs qmlscene qt5-default qt5-qmake qtdeclarative5-dev qtdeclarative5-localstorage-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin
-
----
-
-**Ubuntu 17.10**
-
-    sudo apt-get install build-essential qml-module-qtgraphicaleffects qml-module-qt-labs-folderlistmodel qml-module-qt-labs-settings qml-module-qtquick-controls qml-module-qtquick-dialogs qmlscene qt5-default qt5-qmake qtdeclarative5-dev qtdeclarative5-localstorage-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin
-
----
-
-**Debian Jessie and above**
-
-    sudo apt install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtgraphicaleffects qml-module-qtquick-dialogs qml-module-qtquick-localstorage qml-module-qtquick-window2 qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel
-
----
-
-**Fedora**
-This command should install the known fedora dependencies:
-
-    sudo yum -y install qt5-qtbase qt5-qtbase-devel qt5-qtdeclarative qt5-qtdeclarative-devel qt5-qtgraphicaleffects qt5-qtquickcontrols redhat-rpm-config
-
-or:
-
-    sudo dnf -y install qt5-qtbase qt5-qtbase-devel qt5-qtdeclarative qt5-qtdeclarative-devel qt5-qtgraphicaleffects qt5-qtquickcontrols redhat-rpm-config
-
----
-
-**Arch Linux**
-
-    sudo pacman -S qt5-base qt5-declarative qt5-quickcontrols qt5-graphicaleffects
-    
----
-
-**openSUSE**
-
-Add repository with latest Qt 5 (this is only needed on openSUSE 13.1, Factory already has it):
-
-    sudo zypper ar http://download.opensuse.org/repositories/KDE:/Qt5/openSUSE_13.1/ KDE:Qt5
-
-Install dependencies:
-
-    sudo zypper install libqt5-qtbase-devel libqt5-qtdeclarative-devel libqt5-qtquickcontrols libqt5-qtgraphicaleffects
-
----
-
-**Anyone else**
-
-Install Qt directly from here http://qt-project.org/downloads . Once done export them in you path (replace "_/opt/Qt5.3.1/5.3/gcc_64/bin_" with your correct folder):
-    
-    export PATH=/opt/Qt5.3.1/5.3/gcc_64/bin/:$PATH
----
-
-### Compile
-Once you installed all dependencies (Qt is installed and in your path) you need to compile and run the application: 
-
-```bash
-# Get it from GitHub
-git clone --recursive https://github.com/Swordfish90/cool-retro-term.git
-
-# Build it
-cd cool-retro-term
-
-# Compile (Fedora and OpenSUSE user should use qmake-qt5 instead of qmake)
-qmake && make
-
-# Have fun!
-./cool-retro-term
-```
-
-## Build instructions (macOS)
-
-1. Install [Xcode](https://developer.apple.com/xcode/) and agree to the licence agreement
-2. Enter the following commands into the terminal:
-
-**Brew**
-
-```sh
-brew install qt5
-git clone --recursive https://github.com/Swordfish90/cool-retro-term.git
-export CPPFLAGS="-I/usr/local/opt/qt5/include"
-export LDFLAGS="-L/usr/local/opt/qt5/lib"
-export PATH=/usr/local/opt/qt5/bin:$PATH
-cd cool-retro-term
-qmake && make
-mkdir cool-retro-term.app/Contents/PlugIns
-cp -r qmltermwidget/QMLTermWidget cool-retro-term.app/Contents/PlugIns
-open cool-retro-term.app
-```
-
-**MacPorts**
-
-```sh
-sudo port install qt5
-git clone --recursive https://github.com/Swordfish90/cool-retro-term.git
-cd cool-retro-term
-/opt/local/libexec/qt5/bin/qmake && make
-mkdir cool-retro-term.app/Contents/PlugIns
-cp -r qmltermwidget/QMLTermWidget cool-retro-term.app/Contents/PlugIns
-open cool-retro-term.app
-```
-
-## Donations
-I made this project in my spare time because I love what I'm doing. If you are enjoying it and you want to buy me a beer click [here](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=flscogna%40gmail%2ecom&lc=IT&item_name=Filippo%20Scognamiglio&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted).
-
-You can also add "bounties" on your favourite issues. More information on the [Bountysource](https://www.bountysource.com/teams/crt/issues) page.
+Check out the wiki and follow the instructions on how to build it on [Linux](https://github.com/Swordfish90/cool-retro-term/wiki/Build-Instructions-(Linux)) and [macOS](https://github.com/Swordfish90/cool-retro-term/wiki/Build-Instructions-(macOS)).

app/app.pro

@@ -1,4 +1,4 @@
-QT += qml quick widgets sql
+QT += qml quick widgets sql quickcontrols2
 TARGET = cool-retro-term 
 
 DESTDIR = $$OUT_PWD/../
@@ -15,6 +15,23 @@ macx:ICON = icons/crt.icns
 
 RESOURCES += qml/resources.qrc
 
+# Shader compilation (Qt Shader Baker)
+QSB_BIN = $$[QT_HOST_BINS]/qsb
+isEmpty(QSB_BIN): QSB_BIN = $$[QT_INSTALL_BINS]/qsb
+
+SHADERS_DIR = $${_PRO_FILE_PWD_}/shaders
+SHADERS += $$files($$SHADERS_DIR/*.frag) $$files($$SHADERS_DIR/*.vert)
+
+qsb.input = SHADERS
+qsb.output = ../../app/shaders/${QMAKE_FILE_NAME}.qsb
+qsb.commands = $$QSB_BIN --glsl \"100 es,120,150\" --hlsl 50 --msl 12 --qt6 -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
+qsb.clean = $$qsb.output
+qsb.name = qsb ${QMAKE_FILE_IN}
+qsb.variable_out = QSB_FILES
+QMAKE_EXTRA_COMPILERS += qsb
+PRE_TARGETDEPS += $$QSB_FILES
+OTHER_FILES += $$SHADERS $$QSB_FILES
+
 #########################################
 ##              INTALLS
 #########################################

app/main.cpp

@@ -6,15 +6,22 @@
 
 #include <QtWidgets/QApplication>
 #include <QIcon>
+#include <QQuickStyle>
 
 #include <QDebug>
 #include <stdlib.h>
 
 #include <QFontDatabase>
+#include <QLoggingCategory>
 
 #include <fileio.h>
 #include <monospacefontmanager.h>
 
+#if defined(Q_OS_MAC)
+#include <CoreFoundation/CoreFoundation.h>
+#include <QStyleFactory>
+#endif
+
 QString getNamedArgument(QStringList args, QString name, QString defaultName)
 {
     int index = args.indexOf(name);
@@ -29,23 +36,50 @@ QString getNamedArgument(QStringList args, QString name)
 int main(int argc, char *argv[])
 {
     // Some environmental variable are necessary on certain platforms.
+    // Disable Connections slot warnings
+    QLoggingCategory::setFilterRules("qt.qml.connections.warning=false");
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::Round);
 
-    // This disables QT appmenu under Ubuntu, which is not working with QML apps.
-    setenv("QT_QPA_PLATFORMTHEME", "", 1);
-
-#if defined (Q_OS_LINUX)
-    setenv("QSG_RENDER_LOOP", "threaded", 0);
-#endif
+// #if defined (Q_OS_LINUX)
+//     setenv("QSG_RENDER_LOOP", "threaded", 0);
+// #endif
 
 #if defined(Q_OS_MAC)
     // This allows UTF-8 characters usage in OSX.
     setenv("LC_CTYPE", "UTF-8", 1);
+
+    // Ensure key repeat works for letter keys (disable macOS press-and-hold for this app).
+    CFPreferencesSetAppValue(CFSTR("ApplePressAndHoldEnabled"), kCFBooleanFalse, kCFPreferencesCurrentApplication);
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+
+    // Qt6 macOS default look is still lacking, so let's force Fusion for now
+    QQuickStyle::setStyle(QStringLiteral("Fusion"));
 #endif
 
+    if (argc>1 && (!strcmp(argv[1],"-h") || !strcmp(argv[1],"--help"))) {
+        QTextStream cout(stdout, QIODevice::WriteOnly);
+        cout << "Usage: " << argv[0] << " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]" << Qt::endl;
+        cout << "  --default-settings  Run cool-retro-term with the default settings" << Qt::endl;
+        cout << "  --workdir <dir>     Change working directory to 'dir'" << Qt::endl;
+        cout << "  -e <cmd>            Command to execute. This option will catch all following arguments, so use it as the last option." << Qt::endl;
+        cout << "  -T <title>          Set window title to 'title'." << Qt::endl;
+        cout << "  --fullscreen        Run cool-retro-term in fullscreen." << Qt::endl;
+        cout << "  -p|--profile <prof> Run cool-retro-term with the given profile." << Qt::endl;
+        cout << "  -h|--help           Print this help." << Qt::endl;
+        cout << "  --verbose           Print additional information such as profiles and settings." << Qt::endl;
+        return 0;
+    }
+
+    QString appVersion("1.2.0");
+
+    if (argc>1 && (!strcmp(argv[1],"-v") || !strcmp(argv[1],"--version"))) {
+        QTextStream cout(stdout, QIODevice::WriteOnly);
+        cout << "cool-retro-term " << appVersion << Qt::endl;
+        return 0;
+    }
+
     QApplication app(argc, argv);
-    // set application attributes
-    // Has no effects, see https://bugreports.qt.io/browse/QTBUG-51293
-    // app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
+    app.setAttribute(Qt::AA_MacDontSwapCtrlAndMeta, true);
 
     QQmlApplicationEngine engine;
     FileIO fileIO;
@@ -57,29 +91,11 @@ int main(int argc, char *argv[])
     app.setWindowIcon(QIcon(":../icons/32x32/cool-retro-term.png"));
 #endif
 
+    app.setOrganizationName("cool-retro-term");
+    app.setOrganizationDomain("cool-retro-term");
+
     // Manage command line arguments from the cpp side
     QStringList args = app.arguments();
-    if (args.contains("-h") || args.contains("--help")) {
-        // BUG: This usage help text goes to stderr, should go to stdout.
-        // BUG: First line of output is surrounded by double quotes.
-        qDebug() << "Usage: " + args.at(0) + " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]";
-        qDebug() << "  --default-settings  Run cool-retro-term with the default settings";
-        qDebug() << "  --workdir <dir>     Change working directory to 'dir'";
-        qDebug() << "  -e <cmd>            Command to execute. This option will catch all following arguments, so use it as the last option.";
-        qDebug() << "  -T <title>          Set window title to 'title'.";
-        qDebug() << "  --fullscreen        Run cool-retro-term in fullscreen.";
-        qDebug() << "  -p|--profile <prof> Run cool-retro-term with the given profile.";
-        qDebug() << "  -h|--help           Print this help.";
-        qDebug() << "  --verbose           Print additional information such as profiles and settings.";
-        return 0;
-    }
-
-    QString appVersion("1.1.1");
-
-    if (args.contains("-v") || args.contains("--version")) {
-        qDebug() << ("cool-retro-term " + appVersion).toStdString().c_str();
-	return 0;
-    }
 
     // Manage default command
     QStringList cmdList;
@@ -94,6 +110,7 @@ int main(int argc, char *argv[])
 
     engine.rootContext()->setContextProperty("workdir", getNamedArgument(args, "--workdir", "$HOME"));
     engine.rootContext()->setContextProperty("fileIO", &fileIO);
+    engine.rootContext()->setContextProperty("monospaceFontManager", &monospaceFontManager);
     engine.rootContext()->setContextProperty("monospaceSystemFonts", monospaceFontManager.retrieveMonospaceFonts());
 
     engine.rootContext()->setContextProperty("devicePixelRatio", app.devicePixelRatio());

app/monospacefontmanager.cpp

@@ -1,6 +1,7 @@
 #include "monospacefontmanager.h"
 
 #include <QDebug>
+#include <QFont>
 
 MonospaceFontManager::MonospaceFontManager(QObject *parent) : QObject(parent)
 {
@@ -23,3 +24,27 @@ QStringList MonospaceFontManager::retrieveMonospaceFonts() {
 
     return result;
 }
+
+void MonospaceFontManager::setFontSubstitutions(const QString &family, const QStringList &substitutes)
+{
+    if (family.isEmpty()) {
+        return;
+    }
+
+    QFont::removeSubstitutions(family);
+
+    if (substitutes.isEmpty()) {
+        return;
+    }
+
+    QFont::insertSubstitutions(family, substitutes);
+}
+
+void MonospaceFontManager::removeFontSubstitution(const QString &family)
+{
+    if (family.isEmpty()) {
+        return;
+    }
+
+    QFont::removeSubstitutions(family);
+}

app/monospacefontmanager.h

@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QFontDatabase>
+#include <QStringList>
 
 class MonospaceFontManager : public QObject
 {
@@ -10,6 +11,10 @@ class MonospaceFontManager : public QObject
 public:
     explicit MonospaceFontManager(QObject *parent = nullptr);
     Q_INVOKABLE QStringList retrieveMonospaceFonts();
+
+public slots:
+    Q_INVOKABLE void setFontSubstitutions(const QString &family, const QStringList &substitutes);
+    void removeFontSubstitution(const QString &family);
 };
 
 #endif // MONOSPACEFONTMANAGER_H

app/qml/AboutDialog.qml

@@ -1,9 +1,28 @@
+/*******************************************************************************
+* 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
 
-Window{
+ApplicationWindow {
     id: dialogwindow
     title: qsTr("About")
     width: 600
@@ -11,16 +30,20 @@ Window{
 
     modality: Qt.ApplicationModal
 
-    ColumnLayout{
+    ColumnLayout {
         anchors.fill: parent
         anchors.margins: 15
         spacing: 15
         Text {
             Layout.alignment: Qt.AlignHCenter
             text: "cool-retro-term"
-            font {bold: true; pointSize: 18}
+            color: palette.text
+            font {
+                bold: true
+                pointSize: 18
+            }
         }
-        Loader{
+        Loader {
             id: mainContent
             Layout.fillHeight: true
             Layout.fillWidth: true
@@ -41,32 +64,33 @@ Window{
                     }
                 }
             ]
-            Component.onCompleted: mainContent.state = "Default";
+            Component.onCompleted: mainContent.state = "Default"
         }
-        Item{
+        Item {
             Layout.fillWidth: true
             height: childrenRect.height
-            Button{
+            Button {
                 anchors.left: parent.left
                 text: qsTr("License")
                 onClicked: {
-                    mainContent.state == "Default" ? mainContent.state = "License" : mainContent.state = "Default"
+                    mainContent.state == "Default" ? mainContent.state
+                                                     = "License" : mainContent.state = "Default"
                 }
             }
-            Button{
+            Button {
                 anchors.right: parent.right
                 text: qsTr("Close")
-                onClicked: dialogwindow.close();
+                onClicked: dialogwindow.close()
             }
         }
     }
     // MAIN COMPONENTS ////////////////////////////////////////////////////////
-    Component{
+    Component {
         id: defaultComponent
-        ColumnLayout{
+        ColumnLayout {
             anchors.fill: parent
             spacing: 10
-            Image{
+            Image {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 Layout.alignment: Qt.AlignHCenter
@@ -74,36 +98,39 @@ Window{
                 source: "images/crt256.png"
                 smooth: true
             }
-            Text{
+            Text {
                 Layout.alignment: Qt.AlignCenter
                 horizontalAlignment: Text.AlignHCenter
-                text: appSettings.version + "\n" +
-                      qsTr("Author: ") + "Filippo Scognamiglio\n" +
-                      qsTr("Email: ")  + "flscogna@gmail.com\n" +
-                      qsTr("Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
+                color: palette.text
+                text: appSettings.version + "\n" + qsTr(
+                          "Author: ") + "Filippo Scognamiglio\n" + qsTr(
+                          "Email: ") + "flscogna@gmail.com\n" + qsTr(
+                          "Source: ") + "https://github.com/Swordfish90/cool-retro-term\n"
             }
         }
     }
-    Component{
+    Component {
         id: licenseComponent
-        TextArea{
+        ScrollView {
             anchors.fill: parent
-            readOnly: true
-            text: "Copyright (c) 2013 Filippo Scognamiglio <flscogna@gmail.com>\n\n" +
-                  "https://github.com/Swordfish90/cool-retro-term\n\n" +
-
-                  "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.\n\n" +
-
-                  "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.\n\n" +
-
-                  "You should have received a copy of the GNU General Public License " +
-                  "along with this program.  If not, see <http://www.gnu.org/licenses/>."
+            clip: true
+            TextArea {
+                readOnly: true
+                wrapMode: TextEdit.Wrap
+                color: palette.text
+                text: "Copyright (c) 2013-2025 Filippo Scognamiglio <flscogna@gmail.com>\n\n"
+                      + "https://github.com/Swordfish90/cool-retro-term\n\n" +
+                      "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.\n\n" +
+                      "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.\n\n" +
+                      "You should have received a copy of the GNU General Public License "
+                      + "along with this program.  If not, see <http://www.gnu.org/licenses/>."
+            }
         }
     }
 }

app/qml/BurnInEffect.qml

@@ -1,3 +1,22 @@
+/*******************************************************************************
+* 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.0
 
 import "utils.js" as Utils
@@ -10,26 +29,29 @@ Loader {
     property real lastUpdate: 0
     property real prevLastUpdate: 0
 
-    property real delay: (1.0 / appSettings.fps) * 1000
     property real burnIn: appSettings.burnIn
     property real burnInFadeTime: 1 / Utils.lint(_minBurnInFadeTime, _maxBurnInFadeTime, burnIn)
     property real _minBurnInFadeTime: appSettings.minBurnInFadeTime
     property real _maxBurnInFadeTime: appSettings.maxBurnInFadeTime
 
-    active: appSettings.useFastBurnIn && appSettings.burnIn !== 0
+    active: appSettings.burnIn !== 0
 
     anchors.fill: parent
 
     function completelyUpdate() {
-        prevLastUpdate = lastUpdate;
-        lastUpdate = timeManager.time;
-        item.source.scheduleUpdate();
+        let newTime = timeManager.time
+        if (newTime > lastUpdate) {
+            prevLastUpdate = lastUpdate
+            lastUpdate = newTime
+        }
+
+        item.source.scheduleUpdate()
     }
 
-    function restartBlurSource(){
-        prevLastUpdate = timeManager.time;
-        lastUpdate = prevLastUpdate;
-        completelyUpdate();
+    function restartBlurSource() {
+        prevLastUpdate = timeManager.time
+        lastUpdate = prevLastUpdate
+        completelyUpdate()
     }
 
     sourceComponent: Item {
@@ -53,20 +75,30 @@ Loader {
 
             Connections {
                 target: kterminal
-                onImagePainted: completelyUpdate()
+
+                onImagePainted: {
+                    completelyUpdate()
+                }
             }
             // Restart blurred source settings change.
-            Connections{
-                target: appSettings
-                onBurnInChanged: burnInEffect.restartBlurSource();
-                onTerminalFontChanged: burnInEffect.restartBlurSource();
-                onRasterizationChanged: burnInEffect.restartBlurSource();
-                onBurnInQualityChanged: burnInEffect.restartBlurSource();
-            }
-
             Connections {
-                target: kterminalScrollbar
-                onOpacityChanged: completelyUpdate()
+                target: appSettings
+
+                onBurnInChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onTerminalFontChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onRasterizationChanged: {
+                    burnInEffect.restartBlurSource()
+                }
+
+                onBurnInQualityChanged: {
+                    burnInEffect.restartBlurSource()
+                }
             }
         }
 
@@ -76,50 +108,44 @@ Loader {
             property variant txt_source: kterminalSource
             property variant burnInSource: burnInEffectSource
             property real burnInTime: burnInFadeTime
-            property real lastUpdate: burnInEffect.lastUpdate
+            property real burnInLastUpdate: burnInEffect.lastUpdate
             property real prevLastUpdate: burnInEffect.prevLastUpdate
 
             anchors.fill: parent
             blending: false
 
-            fragmentShader:
-                "#ifdef GL_ES
-                        precision mediump float;
-                    #endif\n" +
+            // Extra uniforms required by shared block
+            property real qt_Opacity: 1.0
+            property real time: timeManager.time
+            property color fontColor: appSettings.fontColor
+            property color backgroundColor: appSettings.backgroundColor
+            property real shadowLength: 0
+            property size virtualResolution: Qt.size(width, height)
+            property real rasterizationIntensity: 0
+            property int rasterizationMode: 0
+            property real burnIn: appSettings.burnIn
+            property real staticNoise: 0
+            property real screenCurvature: 0
+            property real glowingLine: 0
+            property real chromaColor: 0
+            property size jitterDisplacement: Qt.size(0, 0)
+            property real ambientLight: 0
+            property real jitter: 0
+            property real horizontalSync: 0
+            property real horizontalSyncStrength: 0
+            property real flickering: 0
+            property real displayTerminalFrame: 0
+            property size scaleNoiseSize: Qt.size(0, 0)
+            property real screen_brightness: 1.0
+            property real bloom: 0
+            property real rbgShift: 0
+            property real screenShadowCoeff: 0
+            property real frameShadowCoeff: 0
+            property color frameColor: backgroundColor
+            property size margin: Qt.size(0, 0)
 
-                "uniform lowp float qt_Opacity;" +
-                "uniform lowp sampler2D txt_source;" +
-
-                "varying highp vec2 qt_TexCoord0;
-
-                 uniform lowp sampler2D burnInSource;
-                 uniform highp float burnInTime;
-
-                 uniform highp float lastUpdate;
-
-                 uniform highp float prevLastUpdate;" +
-
-                "float rgb2grey(vec3 v){
-                    return dot(v, vec3(0.21, 0.72, 0.04));
-                }" +
-
-                "void main() {
-                    vec2 coords = qt_TexCoord0;
-
-                    vec3 txtColor = texture2D(txt_source, coords).rgb;
-                    vec4 accColor = texture2D(burnInSource, coords);
-
-                    float prevMask = accColor.a;
-                    float currMask = rgb2grey(txtColor);
-
-                    highp float blurDecay = clamp((lastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
-                    blurDecay = max(0.0, blurDecay - prevMask);
-                    vec3 blurColor = accColor.rgb - vec3(blurDecay);
-                    vec3 color = max(blurColor, txtColor);
-
-                    gl_FragColor = vec4(color, currMask);
-                }
-            "
+            fragmentShader: "qrc:/shaders/burn_in.frag.qsb"
+            vertexShader: "qrc:/shaders/passthrough.vert.qsb"
 
             onStatusChanged: if (log) console.log(log) //Print warning messages
         }

app/qml/CRTMainMenuBar.qml

@@ -1,51 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-
-MenuBar {
-    id: defaultMenuBar
-    property bool visible: true
-    Menu {
-        title: qsTr("File")
-        visible: defaultMenuBar.visible
-        MenuItem {action: quitAction}
-    }
-    Menu {
-        title: qsTr("Edit")
-        visible: defaultMenuBar.visible && appSettings.showMenubar
-        MenuItem {action: copyAction}
-        MenuItem {action: pasteAction}
-        MenuSeparator{visible: Qt.platform.os !== "osx"}
-        MenuItem {action: showsettingsAction}
-    }
-    Menu{
-        title: qsTr("View")
-        visible: defaultMenuBar.visible
-        MenuItem {action: fullscreenAction; visible: fullscreenAction.enabled}
-        MenuItem {action: showMenubarAction; visible: showMenubarAction.enabled}
-        MenuSeparator{visible: showMenubarAction.enabled}
-        MenuItem {action: zoomIn}
-        MenuItem {action: zoomOut}
-    }
-    Menu{
-        id: profilesMenu
-        title: qsTr("Profiles")
-        visible: defaultMenuBar.visible
-        Instantiator{
-            model: appSettings.profilesList
-            delegate: MenuItem {
-                text: model.text
-                onTriggered: {
-                    appSettings.loadProfileString(obj_string);
-                    appSettings.handleFontChanged();
-                }
-            }
-            onObjectAdded: profilesMenu.insertItem(index, object)
-            onObjectRemoved: profilesMenu.removeItem(object)
-        }
-    }
-    Menu{
-        title: qsTr("Help")
-        visible: defaultMenuBar.visible
-        MenuItem {action: showAboutAction}
-    }
-}

app/qml/CheckableSlider.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,9 +17,8 @@
 * 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
 import "Components"
@@ -28,46 +27,46 @@ RowLayout {
     property alias name: check.text
 
     property double value
-    property alias min_value: slider.minimumValue
-    property alias max_value: slider.maximumValue
+    property alias min_value: slider.from
+    property alias max_value: slider.to
     property alias stepSize: slider.stepSize
 
-    signal newValue(real newValue);
+    signal newValue(real newValue)
 
     id: setting_component
     Layout.fillWidth: true
 
     onValueChanged: {
-        check.checked = !(value == 0);
-        if(check.checked)
-            slider.value = value;
+        check.checked = !(value == 0)
+        if (check.checked)
+            slider.value = value
     }
 
-    CheckBox{
+    CheckBox {
         id: check
         implicitWidth: 160
         onClicked: {
-            if(!checked){
-                checked = false;
-                slider.enabled = false;
-                newValue(0);
+            if (!checked) {
+                checked = false
+                slider.enabled = false
+                newValue(0)
             } else {
-                checked = true;
-                newValue(slider.value);
-                slider.enabled = true;
+                checked = true
+                newValue(slider.value)
+                slider.enabled = true
             }
         }
     }
-    Slider{
+    Slider {
         id: slider
         stepSize: parent.stepSize
         Layout.fillWidth: true
         onValueChanged: {
-            newValue(value);
+            newValue(value)
         }
     }
     SizedLabel {
-        Layout.fillHeight: true
-        text: Math.round(((value - min_value) / (max_value - min_value)) * 100) + "%"
+        text: Math.round(
+                  ((value - min_value) / (max_value - min_value)) * 100) + "%"
     }
 }

app/qml/ColorButton.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,14 +17,13 @@
 * 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
-import QtQuick.Dialogs 1.1
+import QtQuick.Dialogs
 
 Item {
     id: rootItem
 
-    signal colorSelected (color color)
+    signal colorSelected(color color)
     property color color
     property string name
 
@@ -32,18 +31,19 @@ Item {
         id: colorDialog
         title: qsTr("Choose a color")
         modality: Qt.ApplicationModal
-        visible: false
+        selectedColor: rootItem.color
 
-        //This is a workaround to a Qt 5.2 bug.
-        onColorChanged: if (Qt.platform.os !== "osx") colorSelected(color)
-        onAccepted: if (Qt.platform.os === "osx") colorSelected(color)
+        onSelectedColorChanged: {
+            if (!appSettings.isMacOS && visible)
+                colorSelected(selectedColor)
+        }
+        onAccepted: colorSelected(selectedColor)
     }
-    Rectangle{
+    Rectangle {
         anchors.fill: parent
         radius: 10
         color: rootItem.color
-        border.color: "black"
-        Glossy {}
+
         Rectangle {
             anchors.fill: parent
             anchors.margins: parent.height * 0.25
@@ -51,14 +51,14 @@ Item {
             color: "white"
             opacity: 0.5
         }
-        Text{
+        Text {
             anchors.centerIn: parent
             z: parent.z + 1
             text: name + ":  " + rootItem.color
         }
     }
-    MouseArea{
+    MouseArea {
         anchors.fill: parent
-        onClicked: colorDialog.visible = true;
+        onClicked: colorDialog.open()
     }
 }

app/qml/Components/SizedLabel.qml

@@ -1,5 +1,7 @@
+
+
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,19 +19,14 @@
 * 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.0
-import QtQuick.Controls 1.0
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.0
 
 // This component is simply a label with a predefined size.
 // Used to improve alignment.
-
-Item {
-    property alias text: textfield.text
+Label {
+    id: textfield
+    Layout.minimumWidth: appSettings.labelWidth
     width: appSettings.labelWidth
-    Label{
-        id: textfield
-        anchors { right: parent.right; verticalCenter: parent.verticalCenter }
-    }
 }

app/qml/FontPixels.qml

@@ -1,108 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "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 _font: fontlist.get(selectedFontIndex)
-    property var source: _font.source
-    property int pixelSize: _font.pixelSize
-    property int lineSpacing: _font.lineSpacing
-    property real screenScaling: scaling * _font.baseScaling
-    property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
-    property bool lowResolutionFont: true
-
-    property ListModel fontlist: ListModel{
-        ListElement{
-            name: "COMMODORE_PET"
-            text: "Commodore PET (1977)"
-            source: "fonts/1977-commodore-pet/PetMe.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "IBM_PC"
-            text: "IBM PC (1981)"
-            source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "PROGGY_TINY"
-            text: "Proggy Tiny (Modern)"
-            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
-            lineSpacing: 1
-            pixelSize: 16
-            baseScaling: 3.3
-            fontWidth: 0.9
-        }
-        ListElement{
-            name: "TERMINUS_SCALED"
-            text: "Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "PRO_FONT_SCALED"
-            text: "Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "APPLE_II"
-            text: "Apple ][ (1977)"
-            source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 2
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.9
-        }
-        ListElement{
-            name: "ATARI_400"
-            text: "Atari 400-800 (1979)"
-            source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "COMMODORE_64"
-            text: "Commodore 64 (1982)"
-            source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-    }
-}

app/qml/FontScanlines.qml

@@ -1,108 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013 "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 _font: fontlist.get(selectedFontIndex)
-    property var source: _font.source
-    property int pixelSize: _font.pixelSize
-    property int lineSpacing: _font.lineSpacing
-    property real screenScaling: scaling * _font.baseScaling
-    property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
-    property bool lowResolutionFont: true
-
-    property ListModel fontlist: ListModel{
-        ListElement{
-            name: "COMMODORE_PET"
-            text: "Commodore PET (1977)"
-            source: "fonts/1977-commodore-pet/PetMe.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-        }
-        ListElement{
-            name: "IBM_PC"
-            text: "IBM PC (1981)"
-            source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "PROGGY_TINY"
-            text: "Proggy Tiny (Modern)"
-            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
-            lineSpacing: 1
-            pixelSize: 16
-            baseScaling: 3.3
-            fontWidth: 0.9
-        }
-        ListElement{
-            name: "TERMINUS_SCALED"
-            text: "Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "PRO_FONT_SCALED"
-            text: "Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-        }
-        ListElement{
-            name: "APPLE_II"
-            text: "Apple ][ (1977)"
-            source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-        }
-        ListElement{
-            name: "ATARI_400"
-            text: "Atari 400-800 (1979)"
-            source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-        }
-        ListElement{
-            name: "COMMODORE_64"
-            text: "Commodore 64 (1982)"
-            source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
-        }
-    }
-}

app/qml/Fonts.qml

@@ -1,5 +1,6 @@
+
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,34 +18,44 @@
 * 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{
+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
 
-    property int pixelSize: lowResolutionFont
-                                 ? _font.pixelSize
-                                 : _font.pixelSize * scaling
+    // 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
 
-    property int lineSpacing: lowResolutionFont
-                                  ? _font.lineSpacing
-                                  : pixelSize * _font.lineSpacing
+    // 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 real screenScaling: lowResolutionFont
-                                     ? _font.baseScaling * scaling
-                                     : 1.0
+    property int pixelSize: lowResolutionFont ? _font.pixelSize : targetPixelHeight
 
-    property real defaultFontWidth: fontlist.get(selectedFontIndex).fontWidth
+    // Line spacing expressed as a relative factor for all fonts.
+    property real lineSpacingFactor: appSettings.lineSpacing
+    property int lineSpacing: Math.round(targetPixelHeight * lineSpacingFactor)
 
-    property string family: fontlist.get(selectedFontIndex).family
+    // 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
@@ -52,209 +63,195 @@ QtObject{
     // 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{
+        ListElement {
             name: "TERMINUS_SCALED"
-            text: "Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 1
+            text: "Terminus"
+            source: "fonts/terminus/TerminusTTF-4.49.3.ttf"
             pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
         }
-        ListElement{
-            name: "PRO_FONT_SCALED"
-            text: "Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 1
-            pixelSize: 12
-            baseScaling: 3.0
-            fontWidth: 1.0
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
+        ListElement {
             name: "EXCELSIOR_SCALED"
-            text: "Fixedsys Excelsior (Modern)"
-            source: "fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf"
-            lineSpacing: 0
+            text: "Fixedsys Excelsior"
+            source: "fonts/fixedsys-excelsior/FSEX301-L2.ttf"
             pixelSize: 16
-            baseScaling: 2.4
-            fontWidth: 1.0
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_16_SCALED"
         }
-        ListElement{
+        ListElement {
+            name: "GREYBEARD_SCALED"
+            text: "Greybeard"
+            source: "fonts/greybeard/Greybeard-16px.ttf"
+            pixelSize: 16
+            lowResolutionFont: true
+            isSystemFont: false
+            fallbackName: "UNSCII_16_SCALED"
+        }
+        ListElement {
             name: "COMMODORE_PET_SCALED"
-            text: "Commodore PET (1977)"
-            source: "fonts/1977-commodore-pet/PetMe.ttf"
-            lineSpacing: 3
+            text: "Commodore PET"
+            source: "fonts/pet-me/PetMe.ttf"
             pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_8_SCALED"
         }
-        ListElement{
-            name: "PROGGY_TINY_SCALED"
-            text: "Proggy Tiny (Modern)"
-            source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
-            lineSpacing: 1
+        ListElement {
+            name: "COZETTE_SCALED"
+            text: "Cozette"
+            source: "fonts/cozette/CozetteVector.ttf"
+            pixelSize: 13
+            lowResolutionFont: true
+            isSystemFont: false
+        }
+        ListElement {
+            name: "UNSCII_8_SCALED"
+            text: "Unscii 8"
+            source: "fonts/unscii/unscii-8.ttf"
+            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"
+            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"
             pixelSize: 16
-            baseScaling: 3.3
-            fontWidth: 0.9
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_16_SCALED"
         }
-        ListElement{
+        ListElement {
             name: "APPLE_II_SCALED"
-            text: "Apple ][ (1977)"
-            source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 3
+            text: "Apple ]["
+            source: "fonts/apple2/PrintChar21.ttf"
             pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_8_SCALED"
         }
-        ListElement{
+        ListElement {
             name: "ATARI_400_SCALED"
-            text: "Atari 400-800 (1979)"
-            source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
-            lineSpacing: 3
+            text: "Atari 400-800"
+            source: "fonts/atari-400-800/AtariClassic-Regular.ttf"
             pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_8_SCALED"
         }
-        ListElement{
-            name: "IBM_PC_SCALED"
-            text: "IBM PC (1981)"
-            source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
-            lineSpacing: 3
-            pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.8
-            lowResolutionFont: true
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
+        ListElement {
             name: "COMMODORE_64_SCALED"
-            text: "Commodore 64 (1982)"
-            source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
-            lineSpacing: 3
+            text: "Commodore 64"
+            source: "fonts/pet-me/PetMe64.ttf"
             pixelSize: 8
-            baseScaling: 3.5
-            fontWidth: 0.7
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_8_SCALED"
         }
-        ListElement{
-            name: "IBM_DOS"
-            text: "IBM DOS (1985)"
-            source: "fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf"
-            lineSpacing: 3
+        ListElement {
+            name: "IBM_EGA_8x8"
+            text: "IBM EGA 8x8"
+            source: "fonts/oldschool-pc-fonts/PxPlus_IBM_EGA_8x8.ttf"
+            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"
             pixelSize: 16
-            baseScaling: 2.0
-            fontWidth: 1.0
             lowResolutionFont: true
             isSystemFont: false
-            family: ""
+            fallbackName: "UNSCII_16_SCALED"
         }
-        ListElement{
-            name: "HERMIT"
-            text: "HD: Hermit (Modern)"
-            source: "fonts/modern-hermit/Hermit-medium.otf"
-            lineSpacing: 0.05
-            pixelSize: 27
-            fontWidth: 1.0
-            lowResolutionFont: false
-            isSystemFont: false
-            family: ""
-        }
-        ListElement{
+        ListElement {
             name: "TERMINUS"
-            text: "HD: Terminus (Modern)"
-            source: "fonts/modern-terminus/TerminusTTF-4.46.0.ttf"
-            lineSpacing: 0.1
+            text: "Terminus"
+            source: "fonts/terminus/TerminusTTF-4.49.3.ttf"
             pixelSize: 35
-            fontWidth: 1.0
             lowResolutionFont: false
             isSystemFont: false
-            family: ""
         }
-        ListElement{
-            name: "PRO_FONT"
-            text: "HD: Pro Font (Modern)"
-            source: "fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf"
-            lineSpacing: 0.1
+        ListElement {
+            name: "HACK"
+            text: "Hack"
+            source: "fonts/hack/Hack-Regular.ttf"
             pixelSize: 35
-            fontWidth: 1.0
             lowResolutionFont: false
             isSystemFont: false
-            family: ""
         }
-        ListElement{
-            name: "INCONSOLATA"
-            text: "HD: Inconsolata (Modern)"
-            source: "fonts/modern-inconsolata/Inconsolata.otf"
-            lineSpacing: 0.1
+        ListElement {
+            name: "FIRA_CODE"
+            text: "Fira Code"
+            source: "fonts/fira-code/FiraCode-Medium.ttf"
             pixelSize: 35
-            fontWidth: 1.0
             lowResolutionFont: false
             isSystemFont: false
-            family: ""
         }
-        ListElement{
+        ListElement {
+            name: "IOSEVKA"
+            text: "Iosevka"
+            source: "fonts/iosevka/IosevkaTerm-ExtendedMedium.ttf"
+            pixelSize: 35
+            lowResolutionFont: false
+            isSystemFont: false
+        }
+        ListElement {
+            name: "JETBRAINS_MONO"
+            text: "JetBrains Mono"
+            source: "fonts/jetbrains-mono/JetBrainsMono-Medium.ttf"
+            pixelSize: 35
+            lowResolutionFont: false
+            isSystemFont: false
+        }
+        ListElement {
             name: "IBM_3278"
-            text: "HD: IBM 3278 (1971)"
-            source: "fonts/1971-ibm-3278/3270Medium.ttf"
-            lineSpacing: 0.2
+            text: "IBM 3278"
+            source: "fonts/ibm-3278/3270-Regular.ttf"
             pixelSize: 32
-            fontWidth: 1.0
             lowResolutionFont: false
             isSystemFont: false
-            family: ""
         }
     }
 
     Component.onCompleted: addSystemFonts()
 
     function addSystemFonts() {
-        var families = monospaceSystemFonts;
+        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: "System: " + family,
-            text: qsTr("System: ") + family,
-            source: "",
-            lineSpacing: 0.1,
-            pixelSize: 30,
-            fontWidth: 1.0,
-            baseScaling: 1.0,
-            lowResolutionFont: false,
-            isSystemFont: true,
-            family: family
+            "name": family,
+            "text": family,
+            "source": "",
+            "pixelSize": 30,
+            "baseScaling": 1.0,
+            "lowResolutionFont": false,
+            "isSystemFont": true,
+            "family": family
         }
     }
 }

app/qml/Glossy.qml

@@ -1,21 +0,0 @@
-import QtQuick 2.2
-
-Rectangle {
-    anchors.centerIn: parent
-    width: parent.width - parent.border.width
-    height: parent.height - parent.border.width
-    radius:parent.radius - parent.border.width/2
-    smooth: true
-
-    border.width: parent.border.width/2
-    border.color: "#22FFFFFF"
-
-    gradient: Gradient {
-        GradientStop { position: 0;    color: "#88FFFFFF" }
-        GradientStop { position: .1;   color: "#55FFFFFF" }
-        GradientStop { position: .5;   color: "#33FFFFFF" }
-        GradientStop { position: .501; color: "#11000000" }
-        GradientStop { position: .8;   color: "#11FFFFFF" }
-        GradientStop { position: 1;    color: "#55FFFFFF" }
-    }
-}

app/qml/InsertNameDialog.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,14 +17,13 @@
 * 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
 import QtQuick.Window 2.0
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
+import QtQuick.Dialogs
 
-Window{
+Window {
     id: insertnamedialog
     width: 400
     height: 100
@@ -39,50 +38,53 @@ Window{
         title: qsTr("Error")
         visible: false
 
-        function showError(message){
-            text = message;
-            open();
+        function showError(message) {
+            text = message
+            open()
         }
     }
 
-    function validateName(name){
-        var profile_list = appSettings.profilesList;
+    function validateName(name) {
+        var profile_list = appSettings.profilesList
         if (name === "")
-            return 1;
-        return 0;
+            return 1
+        return 0
     }
 
-    ColumnLayout{
+    ColumnLayout {
         anchors.margins: 10
         anchors.fill: parent
-        RowLayout{
-            Label{text: qsTr("Name")}
-            TextField{
+        RowLayout {
+            Label {
+                text: qsTr("Name")
+            }
+            TextField {
                 id: namefield
                 Layout.fillWidth: true
                 Component.onCompleted: forceActiveFocus()
                 onAccepted: okbutton.clickAction()
             }
         }
-        RowLayout{
+        RowLayout {
             Layout.alignment: Qt.AlignBottom | Qt.AlignRight
-            Button{
+            Button {
                 id: okbutton
                 text: qsTr("OK")
                 onClicked: clickAction()
-                function clickAction(){
-                    var name = namefield.text;
-                    switch(validateName(name)){
+                function clickAction() {
+                    var name = namefield.text
+                    switch (validateName(name)) {
                     case 1:
-                        errorDialog.showError(qsTr("The name you inserted is empty. Please choose a different one."));
-                        break;
+                        errorDialog.showError(
+                                    qsTr("The name you inserted is empty. Please choose a different one."))
+                        break
                     default:
-                        nameSelected(name);
-                        close();
+                        nameSelected(name)
+                        close()
                     }
                 }
             }
-            Button{
+            Button {
                 text: qsTr("Cancel")
                 onClicked: close()
             }

app/qml/NewTerminalFrame.qml

@@ -1,78 +0,0 @@
-import QtQuick 2.0
-
-import "utils.js" as Utils
-
-ShaderEffect {
-    property color _staticFrameColor: "#ffffff"
-    property color _backgroundColor: appSettings.backgroundColor
-    property color _fontColor: appSettings.fontColor
-    property color _lightColor: Utils.mix(_fontColor, _backgroundColor, 0.2)
-    property real _ambientLight: Utils.lint(0.2, 0.8, appSettings.ambientLight)
-
-    property color frameColor: Utils.mix(_staticFrameColor, _lightColor, _ambientLight)
-    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize
-    property real shadowLength: 0.5 * screenCurvature * Utils.lint(0.50, 1.5, _ambientLight)
-
-    property size aadelta: Qt.size(1.0 / width, 1.0 / height)
-
-    fragmentShader: "
-        #ifdef GL_ES
-            precision mediump float;
-        #endif
-
-        uniform lowp float screenCurvature;
-        uniform lowp float shadowLength;
-        uniform highp float qt_Opacity;
-        uniform lowp vec4 frameColor;
-        uniform mediump vec2 aadelta;
-
-        varying highp vec2 qt_TexCoord0;
-
-        vec2 distortCoordinates(vec2 coords){
-            vec2 cc = (coords - vec2(0.5));
-            float dist = dot(cc, cc) * screenCurvature;
-            return (coords + cc * (1.0 + dist) * dist);
-        }
-
-        float max2(vec2 v) {
-            return max(v.x, v.y);
-        }
-
-        float min2(vec2 v) {
-            return min(v.x, v.y);
-        }
-
-        float prod2(vec2 v) {
-            return v.x * v.y;
-        }
-
-        float sum2(vec2 v) {
-            return v.x + v.y;
-        }
-
-        void main(){
-            vec2 staticCoords = qt_TexCoord0;
-            vec2 coords = distortCoordinates(staticCoords);
-
-            vec3 color = vec3(0.0);
-            float alpha = 0.0;
-
-            float outShadowLength = shadowLength;
-            float inShadowLength = shadowLength * 0.5;
-
-            float outShadow = max2(1.0 - smoothstep(vec2(-outShadowLength), vec2(0.0), coords) + smoothstep(vec2(1.0), vec2(1.0 + outShadowLength), coords));
-            outShadow = clamp(sqrt(outShadow), 0.0, 1.0);
-            color += frameColor.rgb * outShadow;
-            alpha = sum2(1.0 - smoothstep(vec2(0.0), aadelta, coords) + smoothstep(vec2(1.0) - aadelta, vec2(1.0), coords));
-            alpha = clamp(alpha, 0.0, 1.0) * mix(1.0, 0.9, outShadow);
-
-            float inShadow = 1.0 - prod2(smoothstep(0.0, inShadowLength, coords) - smoothstep(1.0 - inShadowLength, 1.0, coords));
-            inShadow = 0.5 * inShadow * inShadow;
-            alpha = max(alpha, inShadow);
-
-            gl_FragColor = vec4(color * alpha, alpha);
-        }
-    "
-
-    onStatusChanged: if (log) console.log(log) //Print warning messages
-}

app/qml/PreprocessedTerminal.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -19,10 +19,11 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 
 import QMLTermWidget 1.0
 
+import "menus"
 import "utils.js" as Utils
 
 Item{
@@ -33,7 +34,6 @@ Item{
 
     property ShaderEffectSource mainSource: kterminalSource
     property BurnInEffect burnInEffect: burnInEffect
-    property SlowBurnIn slowBurnInEffect: slowBurnInEffect
     property real fontWidth: 1.0
     property real screenScaling: 1.0
     property real scaleTexture: 1.0
@@ -44,35 +44,61 @@ Item{
     property size fontMetrics: kterminal.fontMetrics
 
     // Manage copy and paste
-    Connections{
+    Connections {
         target: copyAction
-        onTriggered: kterminal.copyClipboard();
+
+        onTriggered: {
+            kterminal.copyClipboard()
+        }
     }
-    Connections{
+    Connections {
         target: pasteAction
-        onTriggered: kterminal.pasteClipboard()
+
+        onTriggered: {
+            kterminal.pasteClipboard()
+        }
     }
 
     //When settings are updated sources need to be redrawn.
-    Connections{
+    Connections {
         target: appSettings
-        onFontScalingChanged: terminalContainer.updateSources();
-        onFontWidthChanged: terminalContainer.updateSources();
+
+        onFontScalingChanged: {
+            terminalContainer.updateSources()
+        }
+
+        onFontWidthChanged: {
+            terminalContainer.updateSources()
+        }
     }
-    Connections{
+    Connections {
         target: terminalContainer
-        onWidthChanged: terminalContainer.updateSources();
-        onHeightChanged: terminalContainer.updateSources();
+
+        onWidthChanged: {
+            terminalContainer.updateSources()
+        }
+
+        onHeightChanged: {
+            terminalContainer.updateSources()
+        }
     }
+    Connections {
+        target: terminalWindow
+
+        onActiveChanged: {
+            kterminal.forceActiveFocus()
+        }
+    }
+
     function updateSources() {
-        kterminal.update();
+        kterminal.update()
     }
 
     QMLTermWidget {
         id: kterminal
 
         property int textureResolutionScale: appSettings.lowResolutionFont ? devicePixelRatio : 1
-        property int margin: appSettings.margin / screenScaling
+        property int margin: appSettings.totalMargin / screenScaling
         property int totalWidth: Math.floor(parent.width / (screenScaling * fontWidth))
         property int totalHeight: Math.floor(parent.height / screenScaling)
 
@@ -94,6 +120,7 @@ Item{
         smooth: !appSettings.lowResolutionFont
         enableBold: false
         fullCursorHeight: true
+        blinkingCursor: appSettings.blinkingCursor
 
         session: QMLTermSession {
             id: ksession
@@ -118,16 +145,26 @@ Item{
             }
         }
 
-        function handleFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling, fontWidth) {
+        function handleFontChanged(fontFamily, pixelSize, lineSpacing, screenScaling, fontWidth, fallbackFontFamily) {
             kterminal.antialiasText = !appSettings.lowResolutionFont;
-            font.pixelSize = pixelSize;
-            font.family = fontFamily;
+            var updatedFont = Qt.font({
+                family: fontFamily,
+                pixelSize: pixelSize
+            });
+            kterminal.font = updatedFont;
 
             terminalContainer.fontWidth = fontWidth;
             terminalContainer.screenScaling = screenScaling;
             scaleTexture = Math.max(1.0, Math.floor(screenScaling * appSettings.windowScaling));
 
             kterminal.lineSpacing = lineSpacing;
+
+            var fallbackChain = [];
+            if (fallbackFontFamily && fallbackFontFamily.length > 0) {
+                fallbackChain.push(fallbackFontFamily);
+            }
+            fallbackChain.push(appSettings.isMacOS ? "Menlo" : "Monospace");
+            monospaceFontManager.setFontSubstitutions(fontFamily, fallbackChain);
         }
 
         function startSession() {
@@ -141,7 +178,7 @@ Item{
                 var args = Utils.tokenizeCommandLine(appSettings.customCommand);
                 ksession.setShellProgram(args[0]);
                 ksession.setArgs(args.slice(1));
-            } else if (!defaultCmd && Qt.platform.os === "osx") {
+            } else if (!defaultCmd && appSettings.isMacOS) {
                 // OSX Requires the following default parameters for auto login.
                 ksession.setArgs(["-i", "-l"]);
             }
@@ -155,65 +192,57 @@ Item{
         Component.onCompleted: {
             appSettings.terminalFontChanged.connect(handleFontChanged);
             appSettings.initializedSettings.connect(startSession);
+            appSettings.updateFont()
         }
     }
+
     Component {
-        id: linuxContextMenu
-        Menu{
-            id: contextmenu
-            MenuItem { action: copyAction }
-            MenuItem { action: pasteAction }
-            MenuSeparator { visible: !appSettings.showMenubar }
-            MenuItem { action: showsettingsAction ; visible: !appSettings.showMenubar}
-            MenuSeparator { visible: !appSettings.showMenubar }
-            CRTMainMenuBar { visible: !appSettings.showMenubar }
-        }
+        id: shortContextMenu
+        ShortContextMenu { }
     }
+
     Component {
-        id: osxContextMenu
-        Menu{
-            id: contextmenu
-            MenuItem{action: copyAction}
-            MenuItem{action: pasteAction}
-        }
+        id: fullContextMenu
+        FullContextMenu { }
     }
+
     Loader {
         id: menuLoader
-        sourceComponent: (Qt.platform.os === "osx" ? osxContextMenu : linuxContextMenu)
+        sourceComponent: (appSettings.isMacOS || appSettings.showMenubar ? shortContextMenu : fullContextMenu)
     }
     property alias contextmenu: menuLoader.item
 
-    MouseArea{
-        property real margin: appSettings.margin
+    MouseArea {
+        property real margin: appSettings.totalMargin
 
         acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: parent
         cursorShape: kterminal.terminalUsesMouse ? Qt.ArrowCursor : Qt.IBeamCursor
-        onWheel:{
-            if(wheel.modifiers & Qt.ControlModifier){
+        onWheel: function(wheel) {
+            if (wheel.modifiers & Qt.ControlModifier) {
                wheel.angleDelta.y > 0 ? zoomIn.trigger() : zoomOut.trigger();
             } else {
                 var coord = correctDistortion(wheel.x, wheel.y);
                 kterminal.simulateWheel(coord.x, coord.y, wheel.buttons, wheel.modifiers, wheel.angleDelta);
             }
         }
-        onDoubleClicked: {
+        onDoubleClicked: function(mouse) {
             var coord = correctDistortion(mouse.x, mouse.y);
             kterminal.simulateMouseDoubleClick(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers);
         }
-        onPressed: {
-            if((!kterminal.terminalUsesMouse || mouse.modifiers & Qt.ShiftModifier) && mouse.button == Qt.RightButton) {
+        onPressed: function(mouse) {
+            if ((!kterminal.terminalUsesMouse || mouse.modifiers & Qt.ShiftModifier) && mouse.button == Qt.RightButton) {
                 contextmenu.popup();
             } else {
                 var coord = correctDistortion(mouse.x, mouse.y);
                 kterminal.simulateMousePress(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers)
             }
         }
-        onReleased: {
+        onReleased: function(mouse) {
             var coord = correctDistortion(mouse.x, mouse.y);
             kterminal.simulateMouseRelease(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers);
         }
-        onPositionChanged: {
+        onPositionChanged: function(mouse) {
             var coord = correctDistortion(mouse.x, mouse.y);
             kterminal.simulateMouseMove(coord.x, coord.y, mouse.button, mouse.buttons, mouse.modifiers);
         }
@@ -225,8 +254,8 @@ Item{
             var cc = Qt.size(0.5 - x, 0.5 - y);
             var distortion = (cc.height * cc.height + cc.width * cc.width) * appSettings.screenCurvature * appSettings.screenCurvatureSize;
 
-            return Qt.point((x - cc.width  * (1+distortion) * distortion) * kterminal.totalWidth,
-                           (y - cc.height * (1+distortion) * distortion) * kterminal.totalHeight)
+            return Qt.point((x - cc.width  * (1+distortion) * distortion) * (kterminal.totalWidth),
+                           (y - cc.height * (1+distortion) * distortion) * (kterminal.totalHeight))
         }
     }
     ShaderEffectSource{
@@ -256,9 +285,5 @@ Item{
         BurnInEffect {
             id: burnInEffect
         }
-
-        SlowBurnIn {
-            id: slowBurnInEffect
-        }
     }
 }

app/qml/SettingsAdvancedTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,128 +17,148 @@
 * 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
+import QtQml 2.0
 
 import "Components"
 
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
+ColumnLayout {
+    GroupBox {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        title: qsTr("Command")
+        padding: appSettings.defaultMargin
 
-        GroupBox{
-            Layout.fillWidth: true
-            title: qsTr("Command")
-            ColumnLayout {
-                anchors.fill: parent
-                CheckBox{
-                    id: useCustomCommand
-                    text: qsTr("Use custom command instead of shell at startup")
-                    checked: appSettings.useCustomCommand
-                    onCheckedChanged: appSettings.useCustomCommand = checked
-                }
-                // Workaround for QTBUG-31627 for pre 5.3.0
-                Binding{
-                    target: useCustomCommand
-                    property: "checked"
-                    value: appSettings.useCustomCommand
-                }
-                TextField{
-                    id: customCommand
-                    Layout.fillWidth: true
-                    text: appSettings.customCommand
-                    enabled: useCustomCommand.checked
-                    onEditingFinished: appSettings.customCommand = text
+        ColumnLayout {
+            anchors.fill: parent
+            CheckBox {
+                id: useCustomCommand
+                text: qsTr("Use custom command instead of shell at startup")
+                checked: appSettings.useCustomCommand
+                onCheckedChanged: appSettings.useCustomCommand = checked
+            }
+            // Workaround for QTBUG-31627 for pre 5.3.0
+            Binding {
+                target: useCustomCommand
+                property: "checked"
+                value: appSettings.useCustomCommand
+            }
+            TextField {
+                id: customCommand
+                Layout.fillWidth: true
+                text: appSettings.customCommand
+                enabled: useCustomCommand.checked
+                onEditingFinished: appSettings.customCommand = text
 
-                    // Save text even if user forgets to press enter or unfocus
-                    function saveSetting() {
-                        appSettings.customCommand = text;
-                    }
-                    Component.onCompleted: settings_window.closing.connect(saveSetting)
+                // Save text even if user forgets to press enter or unfocus
+                function saveSetting() {
+                    appSettings.customCommand = text
                 }
+                Component.onCompleted: settings_window.closing.connect(
+                                           saveSetting)
             }
         }
+    }
 
-        GroupBox{
-            title: qsTr("Performance")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                rows: 2
-                columns: 3
+    GroupBox {
+        title: qsTr("Cursor")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        ColumnLayout {
+            anchors.fill: parent
+            CheckBox {
+                id: blinkingCursor
+                text: qsTr("Blinking Cursor")
+                checked: appSettings.blinkingCursor
+                onCheckedChanged: appSettings.blinkingCursor = checked
+            }
+            Binding {
+                target: blinkingCursor
+                property: "checked"
+                value: appSettings.blinkingCursor
+            }
+        }
+    }
 
-                Label{text: qsTr("Effects FPS")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: fpsSlider
-                    onValueChanged: {
-                        if (enabled) {
-                            appSettings.fps = value !== 60 ? value + 1 : 0;
-                        }
-                    }
-                    stepSize: 1
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0;
-                        maximumValue = 60;
-                        value = appSettings.fps !== 0 ? appSettings.fps - 1 : 60;
-                        enabled = true;
-                    }
-                }
+    GroupBox {
+        title: qsTr("Performance")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        GridLayout {
+            anchors.fill: parent
+            columns: 4
 
-                SizedLabel{text: appSettings.fps !== 0 ? appSettings.fps : qsTr("Max")}
-                Label{text: qsTr("Texture Quality")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: txtslider
-                    onValueChanged: if (enabled) appSettings.windowScaling = value;
-                    stepSize: 0.05
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0.25 //Without this value gets set to 0.5
-                        value = appSettings.windowScaling;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: Math.round(txtslider.value * 100) + "%"}
+            Label {
+                text: qsTr("Effects FPS")
+            }
+            Slider {
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                id: effectsFpsSlider
+                onValueChanged: appSettings.effectsFrameSkip = Math.round(value)
+                stepSize: 1
+                enabled: true
+                from: 5
+                to: 1
+                value: appSettings.effectsFrameSkip
+            }
 
-                Label{text: qsTr("Bloom Quality")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: bloomSlider
-                    onValueChanged: if (enabled) appSettings.bloomQuality = value;
-                    stepSize: 0.05
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0.25
-                        value = appSettings.bloomQuality;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: Math.round(bloomSlider.value * 100) + "%"}
+            SizedLabel {
+                text: Math.round(100 / Math.max(1, Math.round(effectsFpsSlider.value))) + "%"
+            }
+            Label {
+                text: qsTr("Texture Quality")
+            }
+            Slider {
+                id: txtslider
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                onValueChanged: appSettings.windowScaling = value
+                stepSize: 0.05
+                enabled: true
+                from: 0.25
+                value: appSettings.windowScaling
+            }
+            SizedLabel {
+                text: Math.round(txtslider.value * 100) + "%"
+            }
 
-                Label{text: qsTr("BurnIn Quality")}
-                Slider{
-                    Layout.fillWidth: true
-                    id: burnInSlider
-                    onValueChanged: if (enabled) appSettings.burnInQuality = value;
-                    stepSize: 0.05
-                    enabled: false
-                    Component.onCompleted: {
-                        minimumValue = 0.25
-                        value = appSettings.burnInQuality;
-                        enabled = true;
-                    }
-                }
-                SizedLabel{text: Math.round(burnInSlider.value * 100) + "%"}
-                CheckBox{
-                    Layout.columnSpan: 2
-                    text: qsTr("Burnin optimization (Might display timing artifacts)")
-                    checked: appSettings.useFastBurnIn
-                    onCheckedChanged: appSettings.useFastBurnIn = checked
-                }
+            Label {
+                text: qsTr("Bloom Quality")
+            }
+            Slider {
+                Layout.fillWidth: true
+                Layout.columnSpan: 2
+                id: bloomSlider
+                onValueChanged: appSettings.bloomQuality = value
+                stepSize: 0.05
+                enabled: true
+                from: 0.25
+                value: appSettings.bloomQuality
+            }
+            SizedLabel {
+                text: Math.round(bloomSlider.value * 100) + "%"
+            }
+
+            Label {
+                text: qsTr("BurnIn Quality")
+            }
+            Slider {
+                Layout.fillWidth: true
+                id: burnInSlider
+                Layout.columnSpan: 2
+                onValueChanged: appSettings.burnInQuality = value
+                stepSize: 0.05
+                enabled: true
+                from: 0.25
+                value: appSettings.burnInQuality
+            }
+            SizedLabel {
+                text: Math.round(burnInSlider.value * 100) + "%"
             }
         }
     }

app/qml/SettingsEffectsTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,74 +17,74 @@
 * 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-        spacing: 2
+ColumnLayout {
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    spacing: 2
 
-        GroupBox{
-            title: qsTr("Effects")
-            Layout.fillWidth: true
+    GroupBox {
+        title: qsTr("Effects")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
 
-            ColumnLayout {
-                anchors.fill: parent
+        ColumnLayout {
+            anchors.fill: parent
 
-                CheckableSlider{
-                    name: qsTr("Bloom")
-                    onNewValue: appSettings.bloom = newValue
-                    value: appSettings.bloom
-                }
-                CheckableSlider{
-                    name: qsTr("BurnIn")
-                    onNewValue: appSettings.burnIn = newValue
-                    value: appSettings.burnIn
-                }
-                CheckableSlider{
-                    name: qsTr("Static Noise")
-                    onNewValue: appSettings.staticNoise = newValue
-                    value: appSettings.staticNoise
-                }
-                CheckableSlider{
-                    name: qsTr("Jitter")
-                    onNewValue: appSettings.jitter = newValue
-                    value: appSettings.jitter
-                }
-                CheckableSlider{
-                    name: qsTr("Glow Line")
-                    onNewValue: appSettings.glowingLine = newValue;
-                    value: appSettings.glowingLine
-                }
-                CheckableSlider{
-                    name: qsTr("Screen Curvature")
-                    onNewValue: appSettings.screenCurvature = newValue;
-                    value: appSettings.screenCurvature;
-                }
-                CheckableSlider{
-                    name: qsTr("Ambient Light")
-                    onNewValue: appSettings.ambientLight = newValue;
-                    value: appSettings.ambientLight
-                    enabled: appSettings.framesIndex !== 0
-                }
-                CheckableSlider{
-                    name: qsTr("Flickering")
-                    onNewValue: appSettings.flickering = newValue;
-                    value: appSettings.flickering;
-                }
-                CheckableSlider{
-                    name: qsTr("Horizontal Sync")
-                    onNewValue: appSettings.horizontalSync = newValue;
-                    value: appSettings.horizontalSync;
-                }
-                CheckableSlider{
-                    name: qsTr("RGB Shift")
-                    onNewValue: appSettings.rbgShift = newValue;
-                    value: appSettings.rbgShift;
-                }
+            CheckableSlider {
+                name: qsTr("Bloom")
+                onNewValue: function(newValue) { appSettings.bloom = newValue }
+                value: appSettings.bloom
+            }
+            CheckableSlider {
+                name: qsTr("BurnIn")
+                onNewValue: function(newValue) { appSettings.burnIn = newValue }
+                value: appSettings.burnIn
+            }
+            CheckableSlider {
+                name: qsTr("Static Noise")
+                onNewValue: function(newValue) { appSettings.staticNoise = newValue }
+                value: appSettings.staticNoise
+            }
+            CheckableSlider {
+                name: qsTr("Jitter")
+                onNewValue: function(newValue) { appSettings.jitter = newValue }
+                value: appSettings.jitter
+            }
+            CheckableSlider {
+                name: qsTr("Glow Line")
+                onNewValue: function(newValue) { appSettings.glowingLine = newValue }
+                value: appSettings.glowingLine
+            }
+            CheckableSlider {
+                name: qsTr("Screen Curvature")
+                onNewValue: function(newValue) { appSettings.screenCurvature = newValue }
+                value: appSettings.screenCurvature
+            }
+            CheckableSlider {
+                name: qsTr("Ambient Light")
+                onNewValue: function(newValue) { appSettings.ambientLight = newValue }
+                value: appSettings.ambientLight
+                enabled: appSettings.framesIndex !== 0
+            }
+            CheckableSlider {
+                name: qsTr("Flickering")
+                onNewValue: function(newValue) { appSettings.flickering = newValue }
+                value: appSettings.flickering
+            }
+            CheckableSlider {
+                name: qsTr("Horizontal Sync")
+                onNewValue: function(newValue) { appSettings.horizontalSync = newValue }
+                value: appSettings.horizontalSync
+            }
+            CheckableSlider {
+                name: qsTr("RGB Shift")
+                onNewValue: function(newValue) { appSettings.rbgShift = newValue }
+                value: appSettings.rbgShift
             }
         }
     }

app/qml/SettingsGeneralTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,218 +17,255 @@
 * 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
+import QtQuick.Dialogs
 
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-        GroupBox{
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            title: qsTr("Profile")
-            RowLayout {
-                anchors.fill: parent
-                TableView {
-                    id: profilesView
+ColumnLayout {
+    GroupBox {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        title: qsTr("Profile")
+        padding: appSettings.defaultMargin
+        RowLayout {
+            anchors.fill: parent
+            ListView {
+                id: profilesView
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                model: appSettings.profilesList
+                clip: true
+                delegate: Rectangle {
+                    width: label.width
+                    height: label.height
+                    color: (index == profilesView.currentIndex) ? palette.highlight : palette.base
+                    Label {
+                        id: label
+                        text: appSettings.profilesList.get(index).text
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: profilesView.currentIndex = index
+                            onDoubleClicked: appSettings.loadProfile(index)
+                        }
+                    }
+                }
+            }
+            ColumnLayout {
+                Layout.fillHeight: true
+                Layout.fillWidth: false
+                Button {
                     Layout.fillWidth: true
+                    text: qsTr("Save")
+                    onClicked: {
+                        insertname.profileName = ""
+                        insertname.show()
+                    }
+                }
+                Button {
+                    Layout.fillWidth: true
+                    property alias currentIndex: profilesView.currentIndex
+                    enabled: currentIndex >= 0
+                    text: qsTr("Load")
+                    onClicked: {
+                        var index = currentIndex
+                        if (index >= 0)
+                            appSettings.loadProfile(index)
+                    }
+                }
+                Button {
+                    Layout.fillWidth: true
+                    text: qsTr("Remove")
+                    property alias currentIndex: profilesView.currentIndex
+
+                    enabled: currentIndex >= 0 && !appSettings.profilesList.get(
+                                 currentIndex).builtin
+                    onClicked: {
+                        appSettings.profilesList.remove(currentIndex)
+                        profilesView.selection.clear()
+
+                        // TODO This is a very ugly workaround. The view didn't update on Qt 5.3.2.
+                        profilesView.model = 0
+                        profilesView.model = appSettings.profilesList
+                    }
+                }
+                Item {
+                    // Spacing
                     Layout.fillHeight: true
-                    model: appSettings.profilesList
-                    headerVisible: false
-                    TableViewColumn {
-                        title: qsTr("Profile")
-                        role: "text"
-                        width: parent.width * 0.5
-                    }
-                    onActivated: {
-                        appSettings.loadProfile(row);
-                    }
                 }
-                ColumnLayout {
-                    Layout.fillHeight: true
-                    Layout.fillWidth: false
-                    Button{
-                        Layout.fillWidth: true
-                        text: qsTr("Save")
-                        onClicked: {
-                            insertname.profileName = "";
-                            insertname.show()
+                Button {
+                    Layout.fillWidth: true
+                    text: qsTr("Import")
+                    onClicked: {
+                        fileDialog.selectExisting = true
+                        fileDialog.callBack = function (url) {
+                            loadFile(url)
                         }
+                        fileDialog.open()
                     }
-                    Button{
-                        Layout.fillWidth: true
-                        property alias currentIndex: profilesView.currentRow
-                        enabled: currentIndex >= 0
-                        text: qsTr("Load")
-                        onClicked: {
-                            var index = profilesView.currentRow;
-                            if (index >= 0)
-                                appSettings.loadProfile(index);
-                        }
-                    }
-                    Button{
-                        Layout.fillWidth: true
-                        text: qsTr("Remove")
-                        property alias currentIndex: profilesView.currentRow
+                    function loadFile(url) {
+                        try {
+                            if (appSettings.verbose)
+                                console.log("Loading file: " + url)
 
-                        enabled: currentIndex >= 0 && !appSettings.profilesList.get(currentIndex).builtin
-                        onClicked: {
-                            appSettings.profilesList.remove(currentIndex);
-                            profilesView.selection.clear();
+                            var profileObject = JSON.parse(fileIO.read(url))
+                            var name = profileObject.name
 
-                            // TODO This is a very ugly workaround. The view didn't update on Qt 5.3.2.
-                            profilesView.model = 0;
-                            profilesView.model = appSettings.profilesList;
-                        }
-                    }
-                    Item {
-                        // Spacing
-                        Layout.fillHeight: true
-                    }
-                    Button{
-                        Layout.fillWidth: true
-                        text: qsTr("Import")
-                        onClicked: {
-                            fileDialog.selectExisting = true;
-                            fileDialog.callBack = function (url) {loadFile(url);};
-                            fileDialog.open();
-                        }
-                        function loadFile(url) {
-                            try {
-                                if (appSettings.verbose)
-                                    console.log("Loading file: " + url);
+                            if (!name)
+                                throw "Profile doesn't have a name"
 
-                                var profileObject = JSON.parse(fileIO.read(url));
-                                var name = profileObject.name;
+                            var version = profileObject.version
+                                    !== undefined ? profileObject.version : 1
+                            if (version !== appSettings.profileVersion)
+                                throw "This profile is not supported on this version of CRT."
 
-                                if (!name)
-                                    throw "Profile doesn't have a name";
+                            delete profileObject.name
 
-                                var version = profileObject.version !== undefined ? profileObject.version : 1;
-                                if (version !== appSettings.profileVersion)
-                                    throw "This profile is not supported on this version of CRT.";
-
-                                delete profileObject.name;
-
-                                appSettings.appendCustomProfile(name, JSON.stringify(profileObject));
-                            } catch (err) {
-                                messageDialog.text = qsTr(err)
-                                messageDialog.open();
-                            }
-                        }
-                    }
-                    Button{
-                        property alias currentIndex: profilesView.currentRow
-
-                        Layout.fillWidth: true
-
-                        text: qsTr("Export")
-                        enabled: currentIndex >= 0 && !appSettings.profilesList.get(currentIndex).builtin
-                        onClicked: {
-                            fileDialog.selectExisting = false;
-                            fileDialog.callBack = function (url) {storeFile(url);};
-                            fileDialog.open();
-                        }
-                        function storeFile(url) {
-                            try {
-                                var urlString = url.toString();
-
-                                // Fix the extension if it's missing.
-                                var extension = urlString.substring(urlString.length - 5, urlString.length);
-                                var urlTail = (extension === ".json" ? "" : ".json");
-                                url += urlTail;
-
-                                if (true)
-                                    console.log("Storing file: " + url);
-
-                                var profileObject = appSettings.profilesList.get(currentIndex);
-                                var profileSettings = JSON.parse(profileObject.obj_string);
-                                profileSettings["name"] = profileObject.text;
-                                profileSettings["version"] = appSettings.profileVersion;
-
-                                var result = fileIO.write(url, JSON.stringify(profileSettings, undefined, 2));
-                                if (!result)
-                                    throw "The file could not be written.";
-                            } catch (err) {
-                                console.log(err);
-                                messageDialog.text = qsTr("There has been an error storing the file.")
-                                messageDialog.open();
-                            }
+                            appSettings.appendCustomProfile(name,
+                                                            JSON.stringify(
+                                                                profileObject))
+                        } catch (err) {
+                            messageDialog.text = qsTr(err)
+                            messageDialog.open()
                         }
                     }
                 }
-            }
-        }
+                Button {
+                    property alias currentIndex: profilesView.currentIndex
 
-        GroupBox{
-            title: qsTr("Screen")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                columns: 2
-                Label{ text: qsTr("Brightness") }
-                SimpleSlider{
-                    onValueChanged: appSettings.brightness = value
-                    value: appSettings.brightness
+                    Layout.fillWidth: true
+
+                    text: qsTr("Export")
+                    enabled: currentIndex >= 0 && !appSettings.profilesList.get(
+                                 currentIndex).builtin
+                    onClicked: {
+                        fileDialog.selectExisting = false
+                        fileDialog.callBack = function (url) {
+                            storeFile(url)
+                        }
+                        fileDialog.open()
+                    }
+                    function storeFile(url) {
+                        try {
+                            var urlString = url.toString()
+
+                            // Fix the extension if it's missing.
+                            var extension = urlString.substring(
+                                        urlString.length - 5, urlString.length)
+                            var urlTail = (extension === ".json" ? "" : ".json")
+                            url += urlTail
+
+                            if (true)
+                                console.log("Storing file: " + url)
+
+                            var profileObject = appSettings.profilesList.get(
+                                        currentIndex)
+                            var profileSettings = JSON.parse(
+                                        profileObject.obj_string)
+                            profileSettings["name"] = profileObject.text
+                            profileSettings["version"] = appSettings.profileVersion
+
+                            var result = fileIO.write(url, JSON.stringify(
+                                                          profileSettings,
+                                                          undefined, 2))
+                            if (!result)
+                                throw "The file could not be written."
+                        } catch (err) {
+                            console.log(err)
+                            messageDialog.text = qsTr(
+                                        "There has been an error storing the file.")
+                            messageDialog.open()
+                        }
+                    }
                 }
-                Label{ text: qsTr("Contrast") }
-                SimpleSlider{
-                    onValueChanged: appSettings.contrast = value
-                    value: appSettings.contrast
-                }
-                Label{ text: qsTr("Margin") }
-                SimpleSlider{
-                    onValueChanged: appSettings._margin = value
-                    value: appSettings._margin
-                }
-                Label{ text: qsTr("Opacity") }
-                SimpleSlider{
-                    onValueChanged: appSettings.windowOpacity = value
-                    value: appSettings.windowOpacity
-                }
-            }
-        }
-
-        // DIALOGS ////////////////////////////////////////////////////////////////
-        InsertNameDialog{
-            id: insertname
-            onNameSelected: {
-                appSettings.appendCustomProfile(name, appSettings.composeProfileString());
-            }
-        }
-        MessageDialog {
-            id: messageDialog
-            title: qsTr("File Error")
-            onAccepted: {
-                messageDialog.close();
-            }
-        }
-        Loader {
-            property var callBack
-            property bool selectExisting: false
-            id: fileDialog
-
-            sourceComponent: FileDialog{
-                nameFilters: ["Json files (*.json)"]
-                selectMultiple: false
-                selectFolder: false
-                selectExisting: fileDialog.selectExisting
-                onAccepted: callBack(fileUrl);
-            }
-
-            onSelectExistingChanged: reload()
-
-            function open() {
-                item.open();
-            }
-
-            function reload() {
-                active = false;
-                active = true;
             }
         }
     }
+
+    GroupBox {
+        title: qsTr("Screen")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        GridLayout {
+            anchors.fill: parent
+            columns: 2
+            Label {
+                text: qsTr("Brightness")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings.brightness = value
+                value: appSettings.brightness
+            }
+            Label {
+                text: qsTr("Contrast")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings.contrast = value
+                value: appSettings.contrast
+            }
+            Label {
+                text: qsTr("Margin")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings._margin = value
+                value: appSettings._margin
+            }
+            Label {
+                text: qsTr("Frame size")
+            }
+            SimpleSlider {
+                onValueChanged: appSettings._frameMargin = value
+                value: appSettings._frameMargin
+            }
+            Label {
+                text: qsTr("Opacity")
+                visible: !appSettings.isMacOS
+            }
+            SimpleSlider {
+                onValueChanged: appSettings.windowOpacity = value
+                value: appSettings.windowOpacity
+                visible: !appSettings.isMacOS
+            }
+        }
+    }
+
+    // DIALOGS ////////////////////////////////////////////////////////////////
+    InsertNameDialog {
+        id: insertname
+        onNameSelected: {
+            appSettings.appendCustomProfile(name,
+                                            appSettings.composeProfileString())
+        }
+    }
+    MessageDialog {
+        id: messageDialog
+        title: qsTr("File Error")
+        buttons: MessageDialog.Ok
+        onAccepted: {
+            messageDialog.close()
+        }
+    }
+    Loader {
+        property var callBack
+        property bool selectExisting: false
+        id: fileDialog
+
+        sourceComponent: FileDialog {
+            nameFilters: ["Json files (*.json)"]
+            fileMode: fileDialog.selectExisting ? FileDialog.OpenFile : FileDialog.SaveFile
+            onAccepted: callBack(selectedFile)
+        }
+
+        onSelectExistingChanged: reload()
+
+        function open() {
+            item.open()
+        }
+
+        function reload() {
+            active = false
+            active = true
+        }
+    }
 }

app/qml/SettingsTerminalTab.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,138 +17,197 @@
 * 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
+import QtQml 2.0
 
 import "Components"
 
-Tab{
-    ColumnLayout{
-        anchors.fill: parent
-
-        GroupBox{
-            title: qsTr("Font")
-            Layout.fillWidth: true
-            GridLayout{
-                anchors.fill: parent
-                columns: 2
-                Label { text: qsTr("Rasterization") }
-                ComboBox {
-                    id: rasterizationBox
-
-                    property string selectedElement: model[currentIndex]
-
-                    Layout.fillWidth: true
-                    model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels")]
-                    currentIndex: appSettings.rasterization
-                    onCurrentIndexChanged: {
-                        appSettings.rasterization = currentIndex
+ColumnLayout {
+    GroupBox {
+        title: qsTr("Font")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        GridLayout {
+            anchors.fill: parent
+            columns: 2
+            Label {
+                text: qsTr("Source")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                RadioButton {
+                    text: qsTr("Bundled")
+                    checked: appSettings.fontSource === appSettings.bundled_fonts
+                    onClicked: {
+                        appSettings.fontSource = appSettings.bundled_fonts
                     }
                 }
-                Label{ text: qsTr("Name") }
-                ComboBox{
-                    id: fontChanger
-                    Layout.fillWidth: true
-                    model: appSettings.fontlist
-                    onActivated: {
-                        var name = appSettings.fontlist.get(index).name;
-                        appSettings.fontNames[appSettings.rasterization] = name;
-                        appSettings.handleFontChanged();
-                    }
-                    function updateIndex(){
-                        var name = appSettings.fontNames[appSettings.rasterization];
-                        var index = appSettings.getIndexByName(name);
-                        if (index !== undefined)
-                            currentIndex = index;
-                    }
-                    Connections{
-                        target: appSettings
-                        onTerminalFontChanged: fontChanger.updateIndex();
-                    }
-                    Component.onCompleted: updateIndex();
-                }
-                Label{ text: qsTr("Scaling") }
-                RowLayout{
-                    Layout.fillWidth: true
-                    Slider{
-                        Layout.fillWidth: true
-                        id: fontScalingChanger
-                        onValueChanged: if(enabled) appSettings.fontScaling = value
-                        stepSize: 0.05
-                        enabled: false // Another trick to fix initial bad behavior.
-                        Component.onCompleted: {
-                            minimumValue = appSettings.minimumFontScaling;
-                            maximumValue = appSettings.maximumFontScaling;
-                            value = appSettings.fontScaling;
-                            enabled = true;
-                        }
-                        Connections{
-                            target: appSettings
-                            onFontScalingChanged: fontScalingChanger.value = appSettings.fontScaling;
-                        }
-                    }
-                    SizedLabel{
-                        text: Math.round(fontScalingChanger.value * 100) + "%"
-                    }
-                }
-                Label{ text: qsTr("Font Width") }
-                RowLayout{
-                    Layout.fillWidth: true
-                    Slider{
-                        Layout.fillWidth: true
-                        id: widthChanger
-                        onValueChanged: appSettings.fontWidth = value;
-                        value: appSettings.fontWidth
-                        stepSize: 0.05
-                        Component.onCompleted: {
-                            // This is needed to avoid unnecessary chnaged events.
-                            minimumValue = 0.5;
-                            maximumValue = 1.5;
-                        }
-                    }
-                    SizedLabel{
-                        text: Math.round(widthChanger.value * 100) + "%"
+                RadioButton {
+                    text: qsTr("System")
+                    checked: appSettings.fontSource === appSettings.system_fonts
+                    onClicked: {
+                        appSettings.fontSource = appSettings.system_fonts
                     }
                 }
             }
-        }
-        GroupBox{
-            title: qsTr("Colors")
-            Layout.fillWidth: true
-            ColumnLayout{
-                anchors.fill: parent
-                ColumnLayout{
-                    Layout.fillWidth: true
-                    CheckableSlider{
-                        name: qsTr("Chroma Color")
-                        onNewValue: appSettings.chromaColor = newValue
-                        value: appSettings.chromaColor
+            Label {
+                text: qsTr("Rendering")
+                enabled: appSettings.fontSource === appSettings.bundled_fonts
+            }
+            ComboBox {
+                id: renderingBox
+
+                property string selectedElement: model[currentIndex]
+
+                Layout.fillWidth: true
+                model: [qsTr("Default"), qsTr("Scanlines"), qsTr("Pixels"), qsTr("Sub-Pixels"), qsTr("Modern")]
+                currentIndex: appSettings.rasterization
+                onCurrentIndexChanged: {
+                    appSettings.rasterization = currentIndex
+                }
+                enabled: appSettings.fontSource === appSettings.bundled_fonts
+            }
+            Label {
+                text: qsTr("Name")
+            }
+            ComboBox {
+                id: fontChanger
+                Layout.fillWidth: true
+                model: appSettings.filteredFontList
+                textRole: "text"
+                onActivated: {
+                    var font = appSettings.filteredFontList.get(index)
+
+                    // If selecting a high-res font while not in Modern mode,
+                    // switch to Modern to render at full resolution.
+                    if (!font.lowResolutionFont && appSettings.rasterization !== appSettings.modern_rasterization) {
+                        appSettings.rasterization = appSettings.modern_rasterization
                     }
-                    CheckableSlider{
-                        name: qsTr("Saturation Color")
-                        onNewValue: appSettings.saturationColor = newValue
-                        value: appSettings.saturationColor
-                        enabled: appSettings.chromaColor !== 0
+                    // If selecting a low-res font while in Modern mode, switch back to default.
+                    if (font.lowResolutionFont && appSettings.rasterization === appSettings.modern_rasterization) {
+                        appSettings.rasterization = appSettings.no_rasterization
+                    }
+
+                    appSettings.fontName = font.name
+                }
+                function updateIndex() {
+                    for (var i = 0; i < appSettings.filteredFontList.count; i++) {
+                        var font = appSettings.filteredFontList.get(i)
+                        if (font.name === appSettings.fontName) {
+                            currentIndex = i
+                            return
+                        }
+                    }
+                    currentIndex = 0
+                }
+                Connections {
+                    target: appSettings
+
+                    onTerminalFontChanged: {
+                        fontChanger.updateIndex()
+                    }
+
+                    onFilteredFontListChanged: {
+                        fontChanger.updateIndex()
                     }
                 }
-                RowLayout{
+                Component.onCompleted: updateIndex()
+            }
+            Label {
+                text: qsTr("Scaling")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Slider {
                     Layout.fillWidth: true
-                    ColorButton{
-                        name: qsTr("Font")
-                        height: 50
-                        Layout.fillWidth: true
-                        onColorSelected: appSettings._fontColor = color;
-                        color: appSettings._fontColor
-                    }
-                    ColorButton{
-                        name: qsTr("Background")
-                        height: 50
-                        Layout.fillWidth: true
-                        onColorSelected: appSettings._backgroundColor = color;
-                        color: appSettings._backgroundColor
-                    }
+                    id: fontScalingChanger
+                    onValueChanged: appSettings.fontScaling = value
+                    value: appSettings.fontScaling
+                    stepSize: 0.05
+                    from: appSettings.minimumFontScaling
+                    to: appSettings.maximumFontScaling
+                }
+                SizedLabel {
+                    text: Math.round(fontScalingChanger.value * 100) + "%"
+                }
+            }
+            Label {
+                text: qsTr("Font Width")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Slider {
+                    Layout.fillWidth: true
+                    id: widthChanger
+                    onValueChanged: appSettings.fontWidth = value
+                    value: appSettings.fontWidth
+                    stepSize: 0.05
+                    from: 0.5
+                    to: 1.5
+                }
+                SizedLabel {
+                    text: Math.round(widthChanger.value * 100) + "%"
+                }
+            }
+            Label {
+                text: qsTr("Line Spacing")
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                Slider {
+                    Layout.fillWidth: true
+                    id: lineSpacingChanger
+                    onValueChanged: appSettings.lineSpacing = value
+                    value: appSettings.lineSpacing
+                    stepSize: 0.01
+                    from: 0.0
+                    to: 1.0
+                }
+                SizedLabel {
+                    text: Math.round(lineSpacingChanger.value * 100) + "%"
+                }
+            }
+        }
+    }
+    GroupBox {
+        title: qsTr("Colors")
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+        padding: appSettings.defaultMargin
+        ColumnLayout {
+            anchors.fill: parent
+            ColumnLayout {
+                Layout.fillWidth: true
+                CheckableSlider {
+                    name: qsTr("Chroma Color")
+                    onNewValue: function(newValue) { appSettings.chromaColor = newValue }
+                    value: appSettings.chromaColor
+                }
+                CheckableSlider {
+                    name: qsTr("Saturation Color")
+                    onNewValue: function(newValue) { appSettings.saturationColor = newValue }
+                    value: appSettings.saturationColor
+                    enabled: appSettings.chromaColor !== 0
+                }
+            }
+            RowLayout {
+                Layout.fillWidth: true
+                ColorButton {
+                    name: qsTr("Font")
+                    height: 50
+                    Layout.fillWidth: true
+                    onColorSelected: appSettings._fontColor = color
+                    color: appSettings._fontColor
+                }
+                ColorButton {
+                    name: qsTr("Background")
+                    height: 50
+                    Layout.fillWidth: true
+                    onColorSelected: appSettings._backgroundColor = color
+                    color: appSettings._backgroundColor
                 }
             }
         }

app/qml/SettingsWindow.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -19,46 +19,52 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Window 2.1
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
+import QtQuick.Layouts 1.3
+import QtQuick.Dialogs
 
-Window {
+ApplicationWindow {
     id: settings_window
     title: qsTr("Settings")
-    width: 580
-    height: 400
+    width: 640
+    height: 480
 
-    property int tabmargins: 15
+    Item {
+        anchors { fill: parent; }
 
-    TabView{
-        id: tabView
-        anchors.fill: parent
-        anchors.margins: 10
-        SettingsGeneralTab {
-            id: generalTab
-            title: qsTr("General")
-            anchors.fill: parent
-            anchors.margins: tabmargins
+        TabBar {
+            id: bar
+            anchors { left: parent.left; right: parent.right; top: parent.top; }
+            TabButton {
+                text: qsTr("General")
+            }
+            TabButton {
+                text: qsTr("Terminal")
+            }
+            TabButton {
+                text: qsTr("Effects")
+            }
+            TabButton {
+                text: qsTr("Advanced")
+            }
         }
-        SettingsTerminalTab {
-            id: terminalTab
-            title: qsTr("Terminal")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsEffectsTab {
-            id: effectsTab
-            title: qsTr("Effects")
-            anchors.fill: parent
-            anchors.margins: tabmargins
-        }
-        SettingsAdvancedTab {
-            id: performanceTab
-            title: qsTr("Advanced")
-            anchors.fill: parent
-            anchors.margins: tabmargins
+
+        StackLayout {
+            anchors {
+                top: bar.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: 16
+            }
+
+            currentIndex: bar.currentIndex
+
+            SettingsGeneralTab { }
+            SettingsTerminalTab { }
+            SettingsEffectsTab { }
+            SettingsAdvancedTab { }
         }
     }
 }

app/qml/ShaderLibrary.qml

@@ -0,0 +1,92 @@
+import QtQuick 2.0
+
+QtObject {
+    property string rasterizationShader:
+        ((appSettings.rasterization === appSettings.no_rasterization) ||
+         (appSettings.rasterization === appSettings.modern_rasterization) ? "
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                return texel;
+            }" : "") +
+
+        (appSettings.rasterization === appSettings.scanline_rasterization ? "
+            #define INTENSITY 0.30
+            #define BRIGHTBOOST 0.30
+
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                lowp vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * texel)) * texel;
+                lowp vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * texel)) * texel;
+
+                vec2 coords = fract(screenCoords * virtualResolution) * 2.0 - vec2(1.0);
+                lowp float mask = 1.0 - abs(coords.y);
+
+                lowp vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+                return mix(texel, rasterizationColor, intensity);
+            }" : "") +
+
+        (appSettings.rasterization === appSettings.pixel_rasterization ? "
+            #define INTENSITY 0.30
+            #define BRIGHTBOOST 0.30
+
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                lowp vec3 result = texel;
+
+                lowp vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * texel)) * texel;
+                lowp vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * texel)) * texel;
+
+                vec2 coords = fract(screenCoords * virtualResolution) * 2.0 - vec2(1.0);
+                coords = coords * coords;
+                lowp float mask = 1.0 - coords.x - coords.y;
+
+                lowp vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+                return mix(texel, rasterizationColor, intensity);
+            }" : "") +
+
+        (appSettings.rasterization === appSettings.subpixel_rasterization ? "
+            #define INTENSITY 0.30
+            #define BRIGHTBOOST 0.30
+            #define SUBPIXELS 3.0
+            const vec3 offsets = vec3(3.141592654) * vec3(1.0/2.0,1.0/2.0 - 2.0/3.0,1.0/2.0-4.0/3.0);
+
+            lowp vec3 applyRasterization(vec2 screenCoords, lowp vec3 texel, vec2 virtualResolution, float intensity) {
+                vec2 omega = vec2(3.141592654) * vec2(2.0) * virtualResolution;
+                vec2 angle = screenCoords * omega;
+                vec3 xfactors = (SUBPIXELS + sin(angle.x + offsets)) / (SUBPIXELS + 1.0);
+
+                lowp vec3 result = texel * xfactors;
+                lowp vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * result)) * result;
+                lowp vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * result)) * result;
+
+                vec2 coords = fract(screenCoords * virtualResolution) * 2.0 - vec2(1.0);
+                lowp float mask = 1.0 - abs(coords.y);
+
+                lowp vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+                return mix(texel, rasterizationColor, intensity);
+            }" : "") +
+
+        "\n\n"
+
+    property string min2: "
+        float min2(vec2 v) {
+            return min(v.x, v.y);
+        }\n\n"
+
+    property string rgb2grey: "
+        float rgb2grey(vec3 v) {
+            return dot(v, vec3(0.21, 0.72, 0.04));
+        }\n\n"
+
+    property string max2: "
+        float max2(vec2 v) {
+            return max(v.x, v.y);
+        }\n\n"
+
+    property string prod2: "
+        float prod2(vec2 v) {
+            return v.x * v.y;
+        }\n\n"
+
+    property string sum2: "
+        float sum2(vec2 v) {
+            return v.x + v.y;
+        }\n\n"
+}

app/qml/ShaderTerminal.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -19,12 +19,10 @@
 *******************************************************************************/
 
 import QtQuick 2.2
-import QtGraphicalEffects 1.0
 
 import "utils.js" as Utils
 
 Item {
-    property SlowBurnIn slowBurnInEffect
     property ShaderEffectSource source
     property BurnInEffect burnInEffect
     property ShaderEffectSource bloomSource
@@ -38,498 +36,182 @@ Item {
 
     property real ambientLight: appSettings.ambientLight * 0.2
 
-    property size virtual_resolution
-
-     ShaderEffect {
-         id: dynamicShader
-
-         property ShaderEffectSource screenBuffer: frameBuffer
-         property ShaderEffectSource burnInSource: burnInEffect.source
-         property ShaderEffectSource frameSource: terminalFrameLoader.item
-
-         property color fontColor: parent.fontColor
-         property color backgroundColor: parent.backgroundColor
-         property real screenCurvature: parent.screenCurvature
-         property real chromaColor: parent.chromaColor
-         property real ambientLight: parent.ambientLight
-
-         property real flickering: appSettings.flickering
-         property real horizontalSync: appSettings.horizontalSync
-         property real horizontalSyncStrength: Utils.lint(0.05, 0.35, horizontalSync)
-         property real glowingLine: appSettings.glowingLine * 0.2
-
-         // Fast burnin properties
-         property real burnIn: appSettings.useFastBurnIn ? appSettings.burnIn : 0
-         property real burnInLastUpdate: burnInEffect.lastUpdate
-         property real burnInTime: burnInEffect.burnInFadeTime
-
-         // Slow burnin properties
-         property real slowBurnIn: appSettings.useFastBurnIn ? 0 : appSettings.burnIn
-         property ShaderEffectSource slowBurnInSource: slowBurnInEffect.source
-
-         property real jitter: appSettings.jitter
-         property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter)
-         property real shadowLength: 0.25 * screenCurvature * Utils.lint(0.50, 1.5, ambientLight)
-         property real staticNoise: appSettings.staticNoise
-         property size scaleNoiseSize: Qt.size((width) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling),
-                                               (height) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling))
-
-         property size virtual_resolution: parent.virtual_resolution
-
-         property real time: timeManager.time
-         property ShaderEffectSource noiseSource: noiseShaderSource
-
-         // If something goes wrong activate the fallback version of the shader.
-         property bool fallBack: false
-
-         anchors.fill: parent
-         blending: false
-
-         //Smooth random texture used for flickering effect.
-         Image{
-             id: noiseTexture
-             source: "images/allNoise512.png"
-             width: 512
-             height: 512
-             fillMode: Image.Tile
-             visible: false
-         }
-         ShaderEffectSource{
-             id: noiseShaderSource
-             sourceItem: noiseTexture
-             wrapMode: ShaderEffectSource.Repeat
-             visible: false
-             smooth: true
-         }
-
-         //Print the number with a reasonable precision for the shader.
-         function str(num){
-             return num.toFixed(8);
-         }
-
-         vertexShader: "
-             uniform highp mat4 qt_Matrix;
-             uniform highp float time;
-
-             attribute highp vec4 qt_Vertex;
-             attribute highp vec2 qt_MultiTexCoord0;
-
-             varying highp vec2 qt_TexCoord0;" +
-
-             (!fallBack ? "
-                 uniform sampler2D noiseSource;" : "") +
-
-             (!fallBack && flickering !== 0.0 ?"
-                 varying lowp float brightness;
-                 uniform lowp float flickering;" : "") +
-
-             (!fallBack && horizontalSync !== 0.0 ?"
-                 uniform lowp float horizontalSyncStrength;
-                 varying lowp float distortionScale;
-                 varying lowp float distortionFreq;" : "") +
-
-             "
-             void main() {
-                 qt_TexCoord0 = qt_MultiTexCoord0;
-                 vec2 coords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));" +
-
-                 (!fallBack && (flickering !== 0.0 || horizontalSync !== 0.0) ?
-                     "vec4 initialNoiseTexel = texture2D(noiseSource, coords);"
-                 : "") +
-
-                 (!fallBack && flickering !== 0.0 ? "
-                     brightness = 1.0 + (initialNoiseTexel.g - 0.5) * flickering;"
-                 : "") +
-
-                 (!fallBack && horizontalSync !== 0.0 ? "
-                     float randval = horizontalSyncStrength - initialNoiseTexel.r;
-                     distortionScale = step(0.0, randval) * randval * horizontalSyncStrength;
-                     distortionFreq = mix(4.0, 40.0, initialNoiseTexel.g);"
-                 : "") +
-
-                 "gl_Position = qt_Matrix * qt_Vertex;
-             }"
-
-         fragmentShader: "
-             #ifdef GL_ES
-                 precision mediump float;
-             #endif
-
-             uniform sampler2D screenBuffer;
-             uniform highp float qt_Opacity;
-             uniform highp float time;
-             varying highp vec2 qt_TexCoord0;
-
-             uniform highp vec4 fontColor;
-             uniform highp vec4 backgroundColor;
-             uniform lowp float shadowLength;
-
-             uniform highp vec2 virtual_resolution;" +
-
-             (burnIn !== 0 ? "
-                 uniform sampler2D burnInSource;
-                 uniform highp float burnInLastUpdate;
-                 uniform highp float burnInTime;" : "") +
-             (slowBurnIn !== 0 ? "
-                 uniform sampler2D slowBurnInSource;" : "") +
-             (staticNoise !== 0 ? "
-                 uniform highp float staticNoise;" : "") +
-             (((staticNoise !== 0 || jitter !== 0)
-               ||(fallBack && (flickering || horizontalSync))) ? "
-                 uniform lowp sampler2D noiseSource;
-                 uniform highp vec2 scaleNoiseSize;" : "") +
-             (screenCurvature !== 0 ? "
-                 uniform highp float screenCurvature;
-                 uniform lowp sampler2D frameSource;" : "") +
-             (glowingLine !== 0 ? "
-                 uniform highp float glowingLine;" : "") +
-             (chromaColor !== 0 ? "
-                 uniform lowp float chromaColor;" : "") +
-             (jitter !== 0 ? "
-                 uniform lowp vec2 jitterDisplacement;" : "") +
-             (ambientLight !== 0 ? "
-                 uniform lowp float ambientLight;" : "") +
-
-             (fallBack && horizontalSync !== 0 ? "
-                 uniform lowp float horizontalSyncStrength;" : "") +
-             (fallBack && flickering !== 0.0 ?"
-                 uniform lowp float flickering;" : "") +
-             (!fallBack && flickering !== 0 ? "
-                 varying lowp float brightness;"
-             : "") +
-             (!fallBack && horizontalSync !== 0 ? "
-                 varying lowp float distortionScale;
-                 varying lowp float distortionFreq;" : "") +
-
-             (glowingLine !== 0 ? "
-                 float randomPass(vec2 coords){
-                     return fract(smoothstep(-120.0, 0.0, coords.y - (virtual_resolution.y + 120.0) * fract(time * 0.00015)));
-                 }" : "") +
-
-             "float min2(vec2 v) {
-                 return min(v.x, v.y);
-             }
-
-             float rgb2grey(vec3 v){
-                 return dot(v, vec3(0.21, 0.72, 0.04));
-             }
-
-             float isInScreen(vec2 v) {
-                 return min2(step(0.0, v) - step(1.0, v));
-             }
-
-             vec2 barrel(vec2 v, vec2 cc) {" +
-
-                 (screenCurvature !== 0 ? "
-                     float distortion = dot(cc, cc) * screenCurvature;
-                     return (v - cc * (1.0 + distortion) * distortion);"
-                 :
-                     "return v;") +
-             "}" +
-
-             "vec3 convertWithChroma(vec3 inColor) {
-                vec3 outColor = inColor;" +
-
-                 (chromaColor !== 0 ?
-                     "outColor = fontColor.rgb * mix(vec3(rgb2grey(inColor)), inColor, chromaColor);"
-                 :
-                     "outColor = fontColor.rgb * rgb2grey(inColor);") +
-
-             "  return outColor;
-             }" +
-
-             "void main() {" +
-                 "vec2 cc = vec2(0.5) - qt_TexCoord0;" +
-                 "float distance = length(cc);" +
-
-                 //FallBack if there are problems
-                 (fallBack && (flickering !== 0.0 || horizontalSync !== 0.0) ?
-                     "vec2 initialCoords = vec2(fract(time/(1024.0*2.0)), fract(time/(1024.0*1024.0)));
-                      vec4 initialNoiseTexel = texture2D(noiseSource, initialCoords);"
-                 : "") +
-                 (fallBack && flickering !== 0.0 ? "
-                     float brightness = 1.0 + (initialNoiseTexel.g - 0.5) * flickering;"
-                 : "") +
-                 (fallBack && horizontalSync !== 0.0 ? "
-                     float randval = horizontalSyncStrength - initialNoiseTexel.r;
-                     float distortionScale = step(0.0, randval) * randval * horizontalSyncStrength;
-                     float distortionFreq = mix(4.0, 40.0, initialNoiseTexel.g);"
-                 : "") +
-
-                 (staticNoise ? "
-                     float noise = staticNoise;" : "") +
-
-                 (screenCurvature !== 0 ? "
-                     vec2 staticCoords = barrel(qt_TexCoord0, cc);"
-                 :"
-                     vec2 staticCoords = qt_TexCoord0;") +
-
-                 "vec2 coords = qt_TexCoord0;" +
-
-                 (horizontalSync !== 0 ? "
-                     float dst = sin((coords.y + time * 0.001) * distortionFreq);
-                     coords.x += dst * distortionScale;" +
-
-                     (staticNoise ? "
-                         noise += distortionScale * 7.0;" : "")
-
-                 : "") +
-
-                 (jitter !== 0 || staticNoise !== 0 ?
-                     "vec4 noiseTexel = texture2D(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 51.0), fract(time / 237.0)));"
-                 : "") +
-
-                 (jitter !== 0 ? "
-                     vec2 offset = vec2(noiseTexel.b, noiseTexel.a) - vec2(0.5);
-                     vec2 txt_coords = coords + offset * jitterDisplacement;"
-                 :  "vec2 txt_coords = coords;") +
+    property size virtualResolution
+    property size screenResolution
+
+    property real _screenDensity: Math.min(
+        screenResolution.width / virtualResolution.width,
+        screenResolution.height / virtualResolution.height
+    )
+
+    ShaderEffect {
+        id: dynamicShader
+
+        property ShaderEffectSource screenBuffer: frameBuffer
+        property ShaderEffectSource burnInSource: burnInEffect.source
+        property ShaderEffectSource frameSource: terminalFrameLoader.item
+
+        property color fontColor: parent.fontColor
+        property color backgroundColor: parent.backgroundColor
+        property real screenCurvature: parent.screenCurvature
+        property real chromaColor: parent.chromaColor
+        property real ambientLight: parent.ambientLight
+
+        property real flickering: appSettings.flickering
+        property real horizontalSync: appSettings.horizontalSync
+        property real horizontalSyncStrength: Utils.lint(0.05, 0.35, horizontalSync)
+        property real glowingLine: appSettings.glowingLine * 0.2
+
+        // Fast burnin properties
+        property real burnIn: appSettings.burnIn
+        property real burnInLastUpdate: burnInEffect.lastUpdate
+        property real burnInTime: burnInEffect.burnInFadeTime
+
+        property real jitter: appSettings.jitter
+        property size jitterDisplacement: Qt.size(0.007 * jitter, 0.002 * jitter)
+        property real shadowLength: 0.25 * screenCurvature * Utils.lint(0.50, 1.5, ambientLight)
+        property real staticNoise: appSettings.staticNoise
+        property size scaleNoiseSize: Qt.size((width * 0.75) / (noiseTexture.width * appSettings.windowScaling * appSettings.totalFontScaling),
+                                              (height * 0.75) / (noiseTexture.height * appSettings.windowScaling * appSettings.totalFontScaling))
 
-                 "float color = 0.0001;" +
+        property size virtualResolution: parent.virtualResolution
 
-                 (staticNoise !== 0 ? "
-                     float noiseVal = noiseTexel.a;
-                     color += noiseVal * noise * (1.0 - distance * 1.3);" : "") +
-
-                 (glowingLine !== 0 ? "
-                     color += randomPass(coords * virtual_resolution) * glowingLine;" : "") +
-
-                 "vec3 txt_color = texture2D(screenBuffer, txt_coords).rgb;" +
-
-                 (burnIn !== 0 ? "
-                     vec4 txt_blur = texture2D(burnInSource, staticCoords);
-                     float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
-                     vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay));
-                     txt_color = max(txt_color, convertWithChroma(burnInColor));"
-                 : "") +
-
-                 (slowBurnIn !== 0 ? "
-                     vec4 txt_blur = texture2D(slowBurnInSource, staticCoords);
-                     txt_color = max(txt_color, convertWithChroma(txt_blur.rgb * txt_blur.a));
-                 " : "") +
-
-                  "txt_color += fontColor.rgb * vec3(color);" +
-
-                 "vec3 finalColor = txt_color;" +
-
-                 (flickering !== 0 ? "
-                     finalColor *= brightness;" : "") +
-
-                 (ambientLight !== 0 ? "
-                     finalColor += vec3(ambientLight) * (1.0 - distance) * (1.0 - distance);" : "") +
-
-                 (screenCurvature !== 0 ?
-                    "vec4 frameColor = texture2D(frameSource, qt_TexCoord0);
-                     finalColor = mix(finalColor, frameColor.rgb, frameColor.a);"
-                 : "") +
-
-                 "gl_FragColor = vec4(finalColor, qt_Opacity);" +
-             "}"
-
-          onStatusChanged: {
-              // Print warning messages
-              if (log)
-                  console.log(log);
-
-              // Activate fallback mode
-              if (status == ShaderEffect.Error) {
-                 fallBack = true;
-              }
-          }
-     }
-
-     Loader {
-         id: terminalFrameLoader
-
-         active: screenCurvature !== 0
-
-         width: staticShader.width
-         height: staticShader.height
-
-         sourceComponent: ShaderEffectSource {
-
-             sourceItem: terminalFrame
-             hideSource: true
-             visible: false
-             format: ShaderEffectSource.RGBA
-
-             NewTerminalFrame {
-                 id: terminalFrame
-                 blending: false
-                 anchors.fill: parent
-             }
-         }
-     }
-
-     ShaderEffect {
-         id: staticShader
-
-         width: parent.width * appSettings.windowScaling
-         height: parent.height * appSettings.windowScaling
-
-         property ShaderEffectSource source: parent.source
-         property ShaderEffectSource bloomSource: parent.bloomSource
-
-         property color fontColor: parent.fontColor
-         property color backgroundColor: parent.backgroundColor
-         property real bloom: appSettings.bloom * 2.5
-
-         property real screenCurvature: parent.screenCurvature
-
-         property real chromaColor: appSettings.chromaColor;
-
-         property real rbgShift: (appSettings.rbgShift / width) * appSettings.totalFontScaling // TODO FILIPPO width here is wrong.
-
-         property int rasterization: appSettings.rasterization
-
-         property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness)
-
-         property real ambientLight: parent.ambientLight
-
-         property size virtual_resolution: parent.virtual_resolution
-
-         blending: false
-         visible: false
-
-         //Print the number with a reasonable precision for the shader.
-         function str(num){
-             return num.toFixed(8);
-         }
-
-         fragmentShader: "
-             #ifdef GL_ES
-                 precision mediump float;
-             #endif
-
-             uniform sampler2D source;
-             uniform highp float qt_Opacity;
-             varying highp vec2 qt_TexCoord0;
-
-             uniform highp vec4 fontColor;
-             uniform highp vec4 backgroundColor;
-             uniform lowp float screen_brightness;
-
-             uniform highp vec2 virtual_resolution;" +
-
-             (bloom !== 0 ? "
-                 uniform highp sampler2D bloomSource;
-                 uniform lowp float bloom;" : "") +
-
-             (screenCurvature !== 0 ? "
-                 uniform highp float screenCurvature;" : "") +
-
-             (chromaColor !== 0 ? "
-                 uniform lowp float chromaColor;" : "") +
-
-             (rbgShift !== 0 ? "
-                 uniform lowp float rbgShift;" : "") +
-
-             (ambientLight !== 0 ? "
-                 uniform lowp float ambientLight;" : "") +
-
-             "highp float getScanlineIntensity(vec2 coords) {
-                 float result = 1.0;" +
-
-                (appSettings.rasterization != appSettings.no_rasterization ?
-                    "float val = 0.0;
-                     vec2 rasterizationCoords = fract(coords * virtual_resolution);
-                     val += smoothstep(0.0, 0.5, rasterizationCoords.y);
-                     val -= smoothstep(0.5, 1.0, rasterizationCoords.y);
-                     result *= mix(0.5, 1.0, val);" : "") +
-
-                (appSettings.rasterization == appSettings.pixel_rasterization ?
-                    "val = 0.0;
-                     val += smoothstep(0.0, 0.5, rasterizationCoords.x);
-                     val -= smoothstep(0.5, 1.0, rasterizationCoords.x);
-                     result *= mix(0.5, 1.0, val);" : "") + "
-
-                return result;
-             }
-
-             float min2(vec2 v) {
-                 return min(v.x, v.y);
-             }
-
-             float sum2(vec2 v) {
-                 return v.x + v.y;
-             }
-
-             float rgb2grey(vec3 v){
-                 return dot(v, vec3(0.21, 0.72, 0.04));
-             }" +
-
-             "vec3 convertWithChroma(vec3 inColor) {
-                vec3 outColor = inColor;" +
-
-                 (chromaColor !== 0 ?
-                     "outColor = fontColor.rgb * mix(vec3(rgb2grey(inColor)), inColor, chromaColor);"
-                 :
-                     "outColor = fontColor.rgb * rgb2grey(inColor);") +
-
-             "  return outColor;
-             }" +
-
-
-             "void main() {" +
-                 "vec2 cc = vec2(0.5) - qt_TexCoord0;" +
-
-                 (screenCurvature !== 0 ? "
-                     float distortion = dot(cc, cc) * screenCurvature;
-                     vec2 curvatureCoords = (qt_TexCoord0 - cc * (1.0 + distortion) * distortion);
-                     vec2 txt_coords = - 2.0 * curvatureCoords + 3.0 * step(vec2(0.0), curvatureCoords) * curvatureCoords - 3.0 * step(vec2(1.0), curvatureCoords) * curvatureCoords;"
-                 :"
-                     vec2 txt_coords = qt_TexCoord0;") +
-
-                 "vec3 txt_color = texture2D(source, txt_coords).rgb;" +
-
-                 (rbgShift !== 0 ? "
-                     vec2 displacement = vec2(12.0, 0.0) * rbgShift;
-                     vec3 rightColor = texture2D(source, txt_coords + displacement).rgb;
-                     vec3 leftColor = texture2D(source, txt_coords - displacement).rgb;
-                     txt_color.r = leftColor.r * 0.10 + rightColor.r * 0.30 + txt_color.r * 0.60;
-                     txt_color.g = leftColor.g * 0.20 + rightColor.g * 0.20 + txt_color.g * 0.60;
-                     txt_color.b = leftColor.b * 0.30 + rightColor.b * 0.10 + txt_color.b * 0.60;
-                 " : "") +
-
-                  "txt_color *= getScanlineIntensity(txt_coords);" +
-
-                  "txt_color += vec3(0.0001);" +
-                  "float greyscale_color = rgb2grey(txt_color);" +
-
-                 (screenCurvature !== 0 ? "
-                     float reflectionMask = sum2(step(vec2(0.0), curvatureCoords) - step(vec2(1.0), curvatureCoords));
-                     reflectionMask = clamp(reflectionMask, 0.0, 1.0);"
-                 :
-                     "float reflectionMask = 1.0;") +
-
-                 (chromaColor !== 0 ?
-                     "vec3 foregroundColor = mix(fontColor.rgb, txt_color * fontColor.rgb / greyscale_color, chromaColor);
-                      vec3 finalColor = mix(backgroundColor.rgb, foregroundColor, greyscale_color * reflectionMask);"
-                 :
-                     "vec3 finalColor = mix(backgroundColor.rgb, fontColor.rgb, greyscale_color * reflectionMask);") +
-
-                     (bloom !== 0 ?
-                         "vec4 bloomFullColor = texture2D(bloomSource, txt_coords);
-                          vec3 bloomColor = bloomFullColor.rgb;
-                          float bloomAlpha = bloomFullColor.a;
-                          bloomColor = convertWithChroma(bloomColor);
-                          finalColor += clamp(bloomColor * bloom * bloomAlpha, 0.0, 0.5);"
-                     : "") +
-
-                 "finalColor *= screen_brightness;" +
-
-                 "gl_FragColor = vec4(finalColor, qt_Opacity);" +
-             "}"
-
-         onStatusChanged: {
-             // Print warning messages
-             if (log) console.log(log);
-         }
-     }
-
-     ShaderEffectSource {
-         id: frameBuffer
-         visible: false
-         sourceItem: staticShader
-         hideSource: true
-     }
+        // Rasterization might display oversamping issues if virtual resolution is close to physical display resolution.
+        // We progressively disable rasterization from 4x up to 2x resolution.
+        property real rasterizationIntensity: Utils.smoothstep(2.0, 4.0, _screenDensity)
+        property int rasterizationMode: appSettings.rasterization
+
+        property real displayTerminalFrame: appSettings._frameMargin > 0 || appSettings.screenCurvature > 0
+
+        property real time: timeManager.time
+        property ShaderEffectSource noiseSource: noiseShaderSource
+
+        // Extra uniforms expected by the shared uniform block
+        property real screenShadowCoeff: 0
+        property real frameShadowCoeff: 0
+        property color frameColor: backgroundColor
+        property size margin: Qt.size(0, 0)
+        property real prevLastUpdate: burnInEffect.prevLastUpdate
+        property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness)
+        property real bloom: appSettings.bloom
+        property real rbgShift: (appSettings.rbgShift / Math.max(width, 1)) * appSettings.totalFontScaling
+
+        anchors.fill: parent
+        blending: false
+
+        Image {
+            id: noiseTexture
+            source: "images/allNoise512.png"
+            width: 512
+            height: 512
+            fillMode: Image.Tile
+            visible: false
+        }
+        ShaderEffectSource {
+            id: noiseShaderSource
+            sourceItem: noiseTexture
+            wrapMode: ShaderEffectSource.Repeat
+            visible: false
+            smooth: true
+        }
+
+        vertexShader: "qrc:/shaders/terminal_dynamic.vert.qsb"
+        fragmentShader: "qrc:/shaders/terminal_dynamic.frag.qsb"
+
+        onStatusChanged: if (log) console.log(log)
+    }
+
+    Loader {
+        id: terminalFrameLoader
+
+        active: dynamicShader.displayTerminalFrame
+
+        width: staticShader.width
+        height: staticShader.height
+
+        sourceComponent: ShaderEffectSource {
+
+            sourceItem: terminalFrame
+            hideSource: true
+            visible: false
+            format: ShaderEffectSource.RGBA
+
+            TerminalFrame {
+                id: terminalFrame
+                blending: false
+                anchors.fill: parent
+            }
+        }
+    }
+
+    ShaderLibrary {
+        id: shaderLibrary
+    }
+
+    ShaderEffect {
+        id: staticShader
+
+        width: parent.width * appSettings.windowScaling
+        height: parent.height * appSettings.windowScaling
+
+        property ShaderEffectSource source: parent.source
+        property ShaderEffectSource bloomSource: parent.bloomSource
+
+        property color fontColor: parent.fontColor
+        property color backgroundColor: parent.backgroundColor
+        property real bloom: bloomSource ? appSettings.bloom * 2.5 : 0
+
+        property real screenCurvature: parent.screenCurvature
+
+        property real chromaColor: appSettings.chromaColor;
+
+        property real rbgShift: (appSettings.rbgShift / width) * appSettings.totalFontScaling
+
+        property int rasterization: appSettings.rasterization
+
+        property real screen_brightness: Utils.lint(0.5, 1.5, appSettings.brightness)
+
+        property real ambientLight: parent.ambientLight
+
+        property size virtualResolution: parent.virtualResolution
+
+        // Extra uniforms to match shared uniform block
+        property real time: timeManager.time
+        property real shadowLength: 0
+        property real rasterizationIntensity: Utils.smoothstep(2.0, 4.0, _screenDensity)
+        property int rasterizationMode: appSettings.rasterization
+        property real burnInLastUpdate: burnInEffect.lastUpdate
+        property real burnInTime: burnInEffect.burnInFadeTime
+        property real burnIn: appSettings.burnIn
+        property real staticNoise: appSettings.staticNoise
+        property real glowingLine: appSettings.glowingLine * 0.2
+        property size jitterDisplacement: Qt.size(0, 0)
+        property real jitter: appSettings.jitter
+        property real horizontalSync: appSettings.horizontalSync
+        property real horizontalSyncStrength: Utils.lint(0.05, 0.35, horizontalSync)
+        property real flickering: appSettings.flickering
+        property real displayTerminalFrame: dynamicShader.displayTerminalFrame
+        property size scaleNoiseSize: Qt.size((width * 0.75) / (512 * appSettings.windowScaling * appSettings.totalFontScaling),
+                                              (height * 0.75) / (512 * appSettings.windowScaling * appSettings.totalFontScaling))
+        property real screenShadowCoeff: 0
+        property real frameShadowCoeff: 0
+        property color frameColor: backgroundColor
+        property size margin: Qt.size(0, 0)
+        property real prevLastUpdate: burnInEffect.prevLastUpdate
+
+        blending: false
+        visible: false
+
+        vertexShader: "qrc:/shaders/passthrough.vert.qsb"
+        fragmentShader: "qrc:/shaders/terminal_static.frag.qsb"
+
+        onStatusChanged: if (log) console.log(log)
+    }
+
+    ShaderEffectSource {
+        id: frameBuffer
+        visible: false
+        sourceItem: staticShader
+        hideSource: true
+    }
 }

app/qml/SimpleSlider.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,9 +17,8 @@
 * 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
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
 import "Components"
@@ -27,18 +26,18 @@ import "Components"
 RowLayout {
     property alias value: slider.value
     property alias stepSize: slider.stepSize
-    property alias minimumValue: slider.minimumValue
-    property alias maximumValue: slider.maximumValue
+    property alias minimumValue: slider.from
+    property alias maximumValue: slider.to
     property real maxMultiplier: 100
 
     id: setting_component
     spacing: 10
-    Slider{
+    Slider {
         id: slider
         stepSize: parent.stepSize
         Layout.fillWidth: true
     }
-    SizedLabel{
+    SizedLabel {
         text: Math.round(value * maxMultiplier) + "%"
     }
 }

app/qml/SizeOverlay.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,12 +17,12 @@
 * 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
 
-Rectangle{
+Rectangle {
     property size terminalSize
     property real topOpacity: 0.6
+
     width: textSize.width * 2
     height: textSize.height * 2
     radius: 5
@@ -31,17 +31,21 @@ Rectangle{
     color: "black"
     opacity: sizetimer.running ? 0.6 : 0.0
 
-    Behavior on opacity{NumberAnimation{duration: 200}}
+    Behavior on opacity {
+        NumberAnimation {
+            duration: 200
+        }
+    }
 
     onTerminalSizeChanged: sizetimer.restart()
 
-    Text{
+    Text {
         id: textSize
         anchors.centerIn: parent
         color: "white"
         text: terminalSize.width + "x" + terminalSize.height
     }
-    Timer{
+    Timer {
         id: sizetimer
         interval: 1000
         running: false

app/qml/SlowBurnIn.qml

@@ -1,122 +0,0 @@
-import QtQuick 2.0
-
-import "utils.js" as Utils
-
-Loader {
-    property ShaderEffectSource source: item ? item.source : null
-
-    active: !appSettings.useFastBurnIn && appSettings.burnIn !== 0
-
-    anchors.fill: parent
-
-    sourceComponent: Item {
-        property alias source: burnInSourceEffect
-
-        property int burnInScaling: scaleTexture * appSettings.burnInQuality
-
-        ShaderEffectSource {
-            property bool updateBurnIn: false
-            property real burnIn: appSettings.burnIn
-            property real fps: appSettings.fps !== 0 ? appSettings.fps : 60
-            property real burnInFadeTime: Utils.lint(minBurnInFadeTime, maxBurnInFadeTime, burnIn)
-            property real burnInCoefficient: 1000 / (fps * burnInFadeTime)
-            property real minBurnInFadeTime: appSettings.minBurnInFadeTime
-            property real maxBurnInFadeTime: appSettings.maxBurnInFadeTime
-
-            id: burnInSourceEffect
-
-            anchors.fill: parent
-
-            sourceItem: burnInEffect
-            recursive: true
-            live: false
-            hideSource: true
-            wrapMode: kterminalSource.wrapMode
-
-            visible: false
-
-            function restartBlurSource(){
-                livetimer.restart();
-            }
-
-            // This updates the burnin synched with the timer.
-            Connections {
-                target: burnInSourceEffect.updateBurnIn ? timeManager : null
-                ignoreUnknownSignals: false
-                onTimeChanged: {
-                    burnInSourceEffect.scheduleUpdate();
-                }
-            }
-
-            Timer{
-                id: livetimer
-
-                // The interval assumes 60 fps. This is the time needed burnout a white pixel.
-                // We multiply 1.1 to have a little bit of margin over the theoretical value.
-                // This solution is not extremely clean, but it's probably the best to avoid measuring fps.
-
-                interval: burnInSourceEffect.burnInFadeTime * 1.1
-                running: true
-                onTriggered: burnInSourceEffect.updateBurnIn = false;
-            }
-            Connections{
-                target: kterminal
-                onImagePainted:{
-                    burnInSourceEffect.scheduleUpdate();
-                    burnInSourceEffect.updateBurnIn = true;
-                    livetimer.restart();
-                }
-            }
-            // Restart blurred source settings change.
-            Connections{
-                target: appSettings
-                onBurnInChanged: burnInSourceEffect.restartBlurSource();
-                onTerminalFontChanged: burnInSourceEffect.restartBlurSource();
-                onRasterizationChanged: burnInSourceEffect.restartBlurSource();
-                onBurnInQualityChanged: burnInSourceEffect.restartBlurSource();
-            }
-            Connections {
-                target: kterminalScrollbar
-                onOpacityChanged: burnInSourceEffect.restartBlurSource();
-            }
-
-            ShaderEffect {
-                id: burnInEffect
-
-                property variant txt_source: kterminalSource
-                property variant blurredSource: burnInSourceEffect
-                property real burnInCoefficient: burnInSourceEffect.burnInCoefficient
-
-                anchors.fill: parent
-                blending: false
-
-                fragmentShader:
-                    "#ifdef GL_ES
-                    precision mediump float;
-                #endif\n" +
-
-                "uniform lowp float qt_Opacity;" +
-                "uniform lowp sampler2D txt_source;" +
-
-                "varying highp vec2 qt_TexCoord0;
-             uniform lowp sampler2D blurredSource;
-             uniform highp float burnInCoefficient;" +
-
-                "float max3(vec3 v) {
-                     return max (max (v.x, v.y), v.z);
-                }" +
-
-                "void main() {" +
-                    "vec2 coords = qt_TexCoord0;" +
-                    "vec3 origColor = texture2D(txt_source, coords).rgb;" +
-                    "vec3 blur_color = texture2D(blurredSource, coords).rgb - vec3(burnInCoefficient);" +
-                    "vec3 color = min(origColor + blur_color, max(origColor, blur_color));" +
-
-                    "gl_FragColor = vec4(color, max3(color - origColor));" +
-                "}"
-
-                onStatusChanged: if (log) console.log(log) //Print warning messages
-            }
-        }
-    }
-}

app/qml/Storage.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -27,7 +27,7 @@ QtObject {
     property bool initialized: false
 
     function getDatabase() {
-         return LocalStorage.openDatabaseSync("coolretroterm" + dbMajorVersion, dbMinorVersion, "StorageDatabase", 100000);
+         return LocalStorage.openDatabaseSync("coolretroterm" + dbMajorVersion, dbMinorVersion, "StorageDatabase", 100000)
     }
 
     function initialize() {
@@ -35,43 +35,47 @@ QtObject {
         db.transaction(
             function(tx) {
                 tx.executeSql('CREATE TABLE IF NOT EXISTS settings(setting TEXT UNIQUE, value TEXT)');
-          });
+            }
+        )
 
-        initialized = true;
+        initialized = true
     }
 
     function setSetting(setting, value) {
-       if(!initialized) initialize();
+        if(!initialized) initialize();
 
-       var db = getDatabase();
-       var res = "";
-       db.transaction(function(tx) {
-            var rs = tx.executeSql('INSERT OR REPLACE INTO settings VALUES (?,?);', [setting,value]);
-                  //console.log(rs.rowsAffected)
-                  if (rs.rowsAffected > 0) {
+        var db = getDatabase();
+        var res = "";
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('INSERT OR REPLACE INTO settings VALUES (?,?);', [setting,value]);
+                //console.log(rs.rowsAffected)
+                if (rs.rowsAffected > 0) {
                     res = "OK";
-                  } else {
+                } else {
                     res = "Error";
-                  }
-            }
-      );
+                }
+           }
+      )
       // The function returns “OK” if it was successful, or “Error” if it wasn't
-      return res;
+      return res
     }
 
     function getSetting(setting) {
-       if(!initialized) initialize();
-       var db = getDatabase();
-       var res="";
-       db.transaction(function(tx) {
-         var rs = tx.executeSql('SELECT value FROM settings WHERE setting=?;', [setting]);
-         if (rs.rows.length > 0) {
-              res = rs.rows.item(0).value;
-         } else {
-             res = undefined;
-         }
-      })
-      return res
+        if(!initialized) initialize();
+        var db = getDatabase();
+        var res = "";
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('SELECT value FROM settings WHERE setting=?;', [setting]);
+                if (rs.rows.length > 0) {
+                res = rs.rows.item(0).value;
+                } else {
+                res = undefined;
+                }
+            }
+        )
+        return res
     }
 
     function dropSettings(){
@@ -79,6 +83,7 @@ QtObject {
         db.transaction(
             function(tx) {
                 tx.executeSql('DROP TABLE settings');
-          });
+            }
+        )
     }
 }

app/qml/TerminalContainer.qml

@@ -1,5 +1,24 @@
+/*******************************************************************************
+* 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
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 
 import "utils.js" as Utils
 
@@ -7,44 +26,49 @@ ShaderTerminal {
     property alias title: terminal.title
     property alias terminalSize: terminal.terminalSize
 
+    property real devicePixelRatio: terminalWindow.screen.devicePixelRatio
+
     id: mainShader
     opacity: appSettings.windowOpacity * 0.3 + 0.7
 
     source: terminal.mainSource
     burnInEffect: terminal.burnInEffect
-    slowBurnInEffect: terminal.slowBurnInEffect
-    virtual_resolution: terminal.virtualResolution
+    virtualResolution: terminal.virtualResolution
+    screenResolution: Qt.size(
+        terminalWindow.width * devicePixelRatio * appSettings.windowScaling,
+        terminalWindow.height * devicePixelRatio * appSettings.windowScaling
+    )
+    bloomSource: bloomSourceLoader.item
 
-    TimeManager{
+    TimeManager {
         id: timeManager
         enableTimer: terminalWindow.visible
     }
 
-    PreprocessedTerminal{
+    PreprocessedTerminal {
         id: terminal
         anchors.fill: parent
     }
 
     //  EFFECTS  ////////////////////////////////////////////////////////////////
-
-    Loader{
+    Loader {
         id: bloomEffectLoader
         active: appSettings.bloom
         asynchronous: true
         width: parent.width * appSettings.bloomQuality
         height: parent.height * appSettings.bloomQuality
 
-        sourceComponent: FastBlur{
-            radius: Utils.lint(16, 64, appSettings.bloomQuality);
+        sourceComponent: FastBlur {
+            radius: Utils.lint(16, 64, appSettings.bloomQuality)
             source: terminal.mainSource
             transparentBorder: true
         }
     }
-    Loader{
+    Loader {
         id: bloomSourceLoader
         active: appSettings.bloom !== 0
         asynchronous: true
-        sourceComponent: ShaderEffectSource{
+        sourceComponent: ShaderEffectSource {
             id: _bloomEffectSource
             sourceItem: bloomEffectLoader.item
             hideSource: true
@@ -52,73 +76,4 @@ ShaderTerminal {
             visible: false
         }
     }
-
-    bloomSource: bloomSourceLoader.item
-
-//    NewTerminalFrame {
-//        id: terminalFrame
-//        anchors.fill: parent
-//        blending: true
-//    }
-
-    // This shader might be useful in the future. Since we used it only for a couple
-    // of calculations is probably best to move those in the main shader. If in the future
-    // we need to store another fullScreen channel this might be handy.
-
-//    ShaderEffect {
-//        id: rasterizationEffect
-//        width: parent.width
-//        height: parent.height
-//        property real outColor: 0.0
-//        property real dispX: (5 / width) * appSettings.windowScaling
-//        property real dispY: (5 / height) * appSettings.windowScaling
-//        property size virtual_resolution: terminal.virtualResolution
-
-//        blending: false
-
-//        fragmentShader:
-//            "uniform lowp float qt_Opacity;" +
-
-//            "varying highp vec2 qt_TexCoord0;
-//             uniform highp vec2 virtual_resolution;
-//             uniform highp float dispX;
-//             uniform highp float dispY;
-//             uniform mediump float outColor;
-
-//             highp float getScanlineIntensity(vec2 coords) {
-//                 highp float result = 1.0;" +
-
-//                (appSettings.rasterization != appSettings.no_rasterization ?
-//                    "result *= abs(sin(coords.y * virtual_resolution.y * "+Math.PI+"));" : "") +
-//                (appSettings.rasterization == appSettings.pixel_rasterization ?
-//                    "result *= abs(sin(coords.x * virtual_resolution.x * "+Math.PI+"));" : "") + "
-
-//                return result;
-//             }" +
-
-//            "void main() {" +
-//                "highp float color = getScanlineIntensity(qt_TexCoord0);" +
-
-//                "float distance = length(vec2(0.5) - qt_TexCoord0);" +
-//                "color = mix(color, 0.0, 1.2 * distance * distance);" +
-
-//                "color *= outColor + smoothstep(0.00, dispX, qt_TexCoord0.x) * (1.0 - outColor);" +
-//                "color *= outColor + smoothstep(0.00, dispY, qt_TexCoord0.y) * (1.0 - outColor);" +
-//                "color *= outColor + (1.0 - smoothstep(1.00 - dispX, 1.00, qt_TexCoord0.x)) * (1.0 - outColor);" +
-//                "color *= outColor + (1.0 - smoothstep(1.00 - dispY, 1.00, qt_TexCoord0.y)) * (1.0 - outColor);" +
-
-//                "gl_FragColor.a = color;" +
-//            "}"
-
-//        onStatusChanged: if (log) console.log(log) //Print warning messages
-//    }
-
-//    rasterizationSource: ShaderEffectSource{
-//        id: rasterizationEffectSource
-//        sourceItem: rasterizationEffect
-//        hideSource: true
-//        smooth: true
-//        wrapMode: ShaderEffectSource.ClampToEdge
-//        visible: false
-//    }
 }

app/qml/TerminalFrame.qml

@@ -0,0 +1,75 @@
+/*******************************************************************************
+* 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.0
+
+import "utils.js" as Utils
+
+ShaderEffect {
+    property color _staticFrameColor: "#fff"
+    property color _backgroundColor: appSettings.backgroundColor
+    property color _fontColor: appSettings.fontColor
+    property color _lightColor: Utils.mix(_fontColor, _backgroundColor, 0.2)
+    property real _ambientLight: Utils.lint(0.2, 0.8, appSettings.ambientLight)
+
+    property color frameColor: Utils.mix(_staticFrameColor, _lightColor, _ambientLight)
+    property real screenCurvature: appSettings.screenCurvature * appSettings.screenCurvatureSize
+
+    // Coefficient of the log curve used to approximate shadowing
+    property real screenShadowCoeff: Utils.lint(20.0, 10.0, _ambientLight)
+    property real frameShadowCoeff: Utils.lint(20.0, 10.0, _ambientLight)
+
+    property size margin: Qt.size(
+        appSettings.frameMargin / width * appSettings.windowScaling,
+        appSettings.frameMargin / height * appSettings.windowScaling
+    )
+
+    // Uniforms required by the shared block
+    property real qt_Opacity: 1.0
+    property real time: timeManager.time
+    property color fontColor: appSettings.fontColor
+    property color backgroundColor: appSettings.backgroundColor
+    property real shadowLength: 0
+    property size virtualResolution: Qt.size(width, height)
+    property real rasterizationIntensity: 0
+    property int rasterizationMode: 0
+    property real burnInLastUpdate: 0
+    property real burnInTime: 0
+    property real burnIn: 0
+    property real staticNoise: 0
+    property real glowingLine: 0
+    property real chromaColor: 0
+    property size jitterDisplacement: Qt.size(0, 0)
+    property real ambientLight: _ambientLight
+    property real jitter: 0
+    property real horizontalSync: 0
+    property real horizontalSyncStrength: 0
+    property real flickering: 0
+    property real displayTerminalFrame: 0
+    property size scaleNoiseSize: Qt.size(0, 0)
+    property real screen_brightness: 1.0
+    property real bloom: 0
+    property real rbgShift: 0
+    property real prevLastUpdate: 0
+
+    vertexShader: "qrc:/shaders/passthrough.vert.qsb"
+    fragmentShader: "qrc:/shaders/terminal_frame.frag.qsb"
+
+    onStatusChanged: if (log) console.log(log) //Print warning messages
+}

app/qml/TimeManager.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,23 +17,29 @@
 * 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
 
-import QtQuick 2.2
+QtObject {
+    id: timeManager
 
-Timer{
-    default property bool enableTimer: false
-    property real time
+    property bool enableTimer: false
+    property real time: 0
 
-    NumberAnimation on time {
-        from: 0
-        to: 100000
-        running: appSettings.fps === 0 && enableTimer
-        duration: 100000
-        loops: Animation.Infinite
+    property int framesPerUpdate: Math.max(1, appSettings.effectsFrameSkip)
+    property int _frameCounter: 0
+
+    property var frameDriver: FrameAnimation {
+        running: enableTimer
+        onTriggered: {
+            timeManager._frameCounter += 1
+
+            if (timeManager._frameCounter >= timeManager.framesPerUpdate) {
+                time = elapsedTime
+                timeManager._frameCounter = 0
+            }
+        }
     }
 
-    onTriggered: time += interval
-    running: appSettings.fps !== 0 && enableTimer
-    interval: Math.round(1000 / appSettings.fps)
-    repeat: true
+    onEnableTimerChanged: if (!enableTimer) _frameCounter = 0
+    onFramesPerUpdateChanged: _frameCounter = 0
 }

app/qml/fonts/1982-commodore64/license.txt

@@ -1,8 +0,0 @@
-
-Fonts in this package are (c) 2010-2014 Style.
-
-This license is applicable to each font file included in this package in all their variants (ttf, eot, woff, woff2, svg).
-
-You MAY NOT: sell this font; include/redistribute the font in any font collection regardless of pricing; provide the font for direct download from any web site, modify or rename the font. You MAY: link to "http://style64.org/c64-truetype" in order for others to download and install the font; embed the font (without any modification or file renaming) for display on any web site using @font-face rules; use this font in static images and vector art; include this font (without any modification or file renaming) as part of a software package but ONLY if said software package is freely provided to end users. You may also contact us to negotiate a (possibly commercial) license for your use outside of these guidelines at "http://style64.org/contact-style".
-
-At all times the most recent version of this license can be found at "http://style64.org/c64-truetype/license".

app/qml/fonts/1985-ibm-pc-vga/LICENSE.TXT

@@ -1,428 +0,0 @@
-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/fira-code/LICENSE.txt

@@ -1,97 +1,158 @@
-Copyright (c) 2010 Dimitar Toshkov Zhekov,
-with Reserved Font Name "Terminus Font".
-
-Copyright (c) 2011 Tilman Blumenbach,
-with Reserved Font Name "Terminus (TTF)".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-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
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-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
-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).
-
-"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
-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.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-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.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-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
-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
-Modified Version, except to acknowledge the contribution(s) of the
-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
-distributed under any other license. The requirement for fonts to
-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
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+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
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+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
+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).
+
+"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
+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.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+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.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+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
+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
+Modified Version, except to acknowledge the contribution(s) of the
+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
+distributed under any other license. The requirement for fonts to
+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
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+About
+
+Free monospaced font with programming ligatures
+Topics
+font ligatures programming-ligatures
+Resources
+Readme
+License
+OFL-1.1 license
+Activity
+Stars
+80.8k stars
+Watchers
+704 watching
+Forks
+3.2k forks
+Report repository
+Releases 29
+6.2 Latest
+on Dec 6, 2021
++ 28 releases
+Used by 457
+
+    @bolabaden
+    @utkarshkrsingh
+    @elkozmon
+    @DVSB
+    @virtualtam
+    @techplayz32
+    @mecattaf
+    @MrTato
+
++ 449
+Contributors 124
+
+    @tonsky
+    @thundernixon
+    @jsoref
+    @joshka
+    @davelab6
+    @thaliaarchi
+    @drify
+    @eltociear
+    @j-f1
+    @ollicle
+    @vorburger
+    @gjvnq
+    @Dominionized
+    @ShalokShalom
+
++ 110 contributors
+Languages
+
+Clojure 47.3%
+Shell 22.4%
+Python 18.5%
+HTML 7.4%
+CSS 2.5%
+PureBasic 1.1%
+
+    Other 0.8% 
+
+Footer
+

app/qml/fonts/greybeard/LICENSE

@@ -1,7 +1,7 @@
-ProFont
 MIT License
 
-Copyright (c) 2014 Carl Osterwald, Stephen C. Gilardi, Andrew Welch
+Copyright (c) 2012-2015 Uwe Waldmann
+Modified work Copyright 2018 Andy Walker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -10,13 +10,13 @@ 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:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 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.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/qml/fonts/hack/LICENSE.txt

@@ -0,0 +1,31 @@
+The work in the Hack project is Copyright 2018 Source Foundry Authors and licensed under the MIT License
+
+The work in the DejaVu project was committed to the public domain.
+
+Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera"
+MIT License
+
+Copyright (c) 2018 Source Foundry Authors
+
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+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.
+BITSTREAM VERA LICENSE
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names.
+
+The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org.

app/qml/fonts/iosevka/LICENSE.txt

@@ -0,0 +1,110 @@
+Copyright (c) 2015-2025, Renzhi Li (aka. Belleve Invis, belleve@typeof.net)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+--------------------------
+
+
+SIL Open Font License v1.1
+====================================================
+
+
+Preamble
+----------
+
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+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
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+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
+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).
+
+`"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
+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.
+
+
+Permission & Conditions
+------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+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.
+
+2. Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   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
+   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
+   Modified Version, except to acknowledge the contribution(s) of the
+   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
+   distributed under any other license. The requirement for fonts to
+   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
+not met.
+
+
+    DISCLAIMER
+    
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/jetbrains-mono/LICENSE.txt

@@ -1,94 +1,93 @@
-Copyright (c) 2013, Pablo Caro <me AT pcaro DOT es> - http://pcaro.es/
-with Reserved Font Name Hermit.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-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
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-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
-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).
-
-"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
-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.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-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.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-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
-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
-Modified Version, except to acknowledge the contribution(s) of the
-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
-distributed under any other license. The requirement for fonts to
-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
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+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
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+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
+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).
+
+"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
+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.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+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.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+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
+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
+Modified Version, except to acknowledge the contribution(s) of the
+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
+distributed under any other license. The requirement for fonts to
+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
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/qml/fonts/modern-pro-font-win-tweaked/Comments for ProFontWindows

@@ -1 +0,0 @@
-dopustz:-480

app/qml/fonts/modern-pro-font-win-tweaked/readme.txt

@@ -1,31 +0,0 @@
-WHAT IS THIS?
-
-This is ProFont TrueType, converted to Windows TrueType format
-by Mike Smith, with some tweaks added by "ardu".
-
-Modifications include:
-- A Euro character
-- Missing characters from the Latin 1 code page
-- Full support for CodePage 850. These are mostly the famous
-  block/box characters you know from DOS. Very useful if you use
-  Mightnight Commander through PuTTY.
-- Fixed metrics so that point size of 9 works correctly. Until now
-  you had to select 7 to obtain the native point size of 9.
-- Added some quick&dirty hinting for point size of 9. Most characters
-  now match closely the look of the bitmap version.
-  Don't expect it to look good on anything else than Windows...
-
-
-
-To get the full original Distribution, other ProFont builds
-and more information
-go to <http://tobiasjung.name/profont/>
-
-
-DISCLAIMER
-See LICENSE file
-
-
-Tobias Jung
-January 2014
-profont@tobiasjung.name

app/qml/fonts/modern-proggy-tiny/Licence.txt

@@ -1,7 +0,0 @@
-Copyright (c) 2004, 2005 Tristan Grimmer
-
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-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.

app/qml/fonts/terminus/LICENSE

@@ -0,0 +1,127 @@
+This package was debianized by Anton Zinoviev <zinoviev@debian.ort>.
+
+It was downloaded from http://terminus-font.sourceforge.net/
+
+Terminus Font is licensed under the SIL Open Font License, Version 1.1.
+
+Copyright (c) 2010-2014 Dimitar Toshkov Zhekov,
+with Reserved Font Name "Terminus Font".
+
+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
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+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
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+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
+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).
+
+"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
+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.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+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.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+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
+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
+Modified Version, except to acknowledge the contribution(s) of the
+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
+distributed under any other license. The requirement for fonts to
+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
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+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/fonts/unscii/LICENSE

@@ -0,0 +1 @@
+You can consider it Public Domain (or CC-0) except for the files derived from or containing parts of Roman Czyborra's Unifont project (unifont.hex, hex2bdf.pl, unscii-16-full.*) which fall under GPL. See https://savannah.gnu.org/projects/unifont/ for more.

app/qml/main.qml

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2013 "Filippo Scognamiglio"
+* Copyright (c) 2013-2021 "Filippo Scognamiglio"
 * https://github.com/Swordfish90/cool-retro-term
 *
 * This file is part of cool-retro-term.
@@ -17,13 +17,13 @@
 * 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
 import QtQuick.Window 2.1
-import QtQuick.Controls 1.1
-import QtGraphicalEffects 1.0
+import QtQuick.Controls 2.3
 
-ApplicationWindow{
+import "menus"
+
+ApplicationWindow {
     id: terminalWindow
 
     width: 1024
@@ -36,9 +36,7 @@ ApplicationWindow{
     onHeightChanged: appSettings.height = height
 
     // Load saved window geometry and show the window
-    Component.onCompleted: {        
-        appSettings.handleFontChanged();
-
+    Component.onCompleted: {
         x = appSettings.x
         y = appSettings.y
         width = appSettings.width
@@ -55,22 +53,30 @@ ApplicationWindow{
     property bool fullscreen: appSettings.fullscreen
     onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
 
-    //Workaround: Without __contentItem a ugly thin border is visible.
-    menuBar: CRTMainMenuBar{
-        id: mainMenu
-        visible: (Qt.platform.os === "osx" || appSettings.showMenubar)
-        __contentItem.visible: mainMenu.visible
+    menuBar: qtquickMenuLoader.item
+
+    Loader {
+        id: qtquickMenuLoader
+        active: !appSettings.isMacOS && appSettings.showMenubar
+        sourceComponent: WindowMenu { }
+    }
+
+    Loader {
+        id: globalMenuLoader
+        active: appSettings.isMacOS
+        sourceComponent: OSXMenu { }
     }
 
     property string wintitle: appSettings.wintitle
 
     color: "#00000000"
+
     title: terminalContainer.title || qsTr(appSettings.wintitle)
 
     Action {
         id: showMenubarAction
         text: qsTr("Show Menubar")
-        enabled: Qt.platform.os !== "osx"
+        enabled: !appSettings.isMacOS
         shortcut: "Ctrl+Shift+M"
         checkable: true
         checked: appSettings.showMenubar
@@ -79,9 +85,9 @@ ApplicationWindow{
     Action {
         id: fullscreenAction
         text: qsTr("Fullscreen")
-        enabled: Qt.platform.os !== "osx"
+        enabled: !appSettings.isMacOS
         shortcut: "Alt+F11"
-        onTriggered: appSettings.fullscreen = !appSettings.fullscreen;
+        onTriggered: appSettings.fullscreen = !appSettings.fullscreen
         checkable: true
         checked: appSettings.fullscreen
     }
@@ -89,69 +95,68 @@ ApplicationWindow{
         id: quitAction
         text: qsTr("Quit")
         shortcut: "Ctrl+Shift+Q"
-        onTriggered: Qt.quit();
+        onTriggered: Qt.quit()
     }
-    Action{
+    Action {
         id: showsettingsAction
         text: qsTr("Settings")
         onTriggered: {
-            settingswindow.show();
-            settingswindow.requestActivate();
-            settingswindow.raise();
+            settingswindow.show()
+            settingswindow.requestActivate()
+            settingswindow.raise()
         }
     }
-    Action{
+    Action {
         id: copyAction
         text: qsTr("Copy")
         shortcut: "Ctrl+Shift+C"
     }
-    Action{
+    Action {
         id: pasteAction
         text: qsTr("Paste")
         shortcut: "Ctrl+Shift+V"
     }
-    Action{
+    Action {
         id: zoomIn
         text: qsTr("Zoom In")
         shortcut: "Ctrl++"
-        onTriggered: appSettings.incrementScaling();
+        onTriggered: appSettings.incrementScaling()
     }
-    Action{
+    Action {
         id: zoomOut
         text: qsTr("Zoom Out")
         shortcut: "Ctrl+-"
-        onTriggered: appSettings.decrementScaling();
+        onTriggered: appSettings.decrementScaling()
     }
-    Action{
+    Action {
         id: showAboutAction
         text: qsTr("About")
         onTriggered: {
-            aboutDialog.show();
-            aboutDialog.requestActivate();
-            aboutDialog.raise();
+            aboutDialog.show()
+            aboutDialog.requestActivate()
+            aboutDialog.raise()
         }
     }
-    ApplicationSettings{
+    ApplicationSettings {
         id: appSettings
     }
-    TerminalContainer{
+    TerminalContainer {
         id: terminalContainer
-        y: appSettings.showMenubar ? 0 : -2 // Workaroud to hide the margin in the menubar.
         width: parent.width
         height: (parent.height + Math.abs(y))
     }
-    SettingsWindow{
+    SettingsWindow {
         id: settingswindow
         visible: false
     }
-    AboutDialog{
+    AboutDialog {
         id: aboutDialog
         visible: false
     }
-    Loader{
+    Loader {
         anchors.centerIn: parent
         active: appSettings.showTerminalSize
-        sourceComponent: SizeOverlay{
+        sourceComponent: SizeOverlay {
             z: 3
             terminalSize: terminalContainer.terminalSize
         }
@@ -159,7 +164,7 @@ ApplicationWindow{
     onClosing: {
         // OSX Since we are currently supporting only one window
         // quit the application when it is closed.
-        if (Qt.platform.os === "osx")
+        if (appSettings.isMacOS)
             Qt.quit()
     }
 }

app/qml/menus/FullContextMenu.qml

@@ -0,0 +1,94 @@
+/*******************************************************************************
+* 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
+import QtQuick.Controls 2.3
+
+Menu {
+    id: contextmenu
+    MenuItem {
+        action: copyAction
+    }
+    MenuItem {
+        action: pasteAction
+    }
+    MenuItem {
+        action: showsettingsAction
+    }
+
+    MenuSeparator {}
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            action: quitAction
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            action: copyAction
+        }
+        MenuItem {
+            action: pasteAction
+        }
+        MenuSeparator {}
+        MenuItem {
+            action: showsettingsAction
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            action: fullscreenAction
+            visible: fullscreenAction.enabled
+        }
+        MenuItem {
+            action: showMenubarAction
+            visible: showMenubarAction.enabled
+        }
+        MenuItem {
+            action: zoomIn
+        }
+        MenuItem {
+            action: zoomOut
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                }
+            }
+            onObjectAdded: function(index, object) { profilesMenu.insertItem(index, object) }
+            onObjectRemoved: function(object) { profilesMenu.removeItem(object) }
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            action: showAboutAction
+        }
+    }
+}

app/qml/menus/OSXMenu.qml

@@ -0,0 +1,88 @@
+/*******************************************************************************
+* 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.3
+import Qt.labs.platform 1.1
+
+MenuBar {
+    id: defaultMenuBar
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            text: quitAction.text
+            onTriggered: quitAction.trigger()
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            text: copyAction.text
+            shortcut: "Meta+C"
+            onTriggered: copyAction.trigger()
+        }
+        MenuItem {
+            text: pasteAction.text
+            shortcut: "Meta+V"
+            onTriggered: pasteAction.trigger()
+        }
+        MenuSeparator {}
+        MenuItem {
+            text: showsettingsAction.text
+            shortcut: showsettingsAction.shortcut
+            onTriggered: showsettingsAction.trigger()
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            text: zoomIn.text
+            shortcut: "Meta++"
+            onTriggered: zoomIn.trigger()
+        }
+        MenuItem {
+            text: zoomOut.text
+            shortcut: "Meta+-"
+            onTriggered: zoomOut.trigger()
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                }
+            }
+            onObjectAdded: function(index, object) { profilesMenu.insertItem(index, object) }
+            onObjectRemoved: function(object) { profilesMenu.removeItem(object) }
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            text: showAboutAction.text
+            onTriggered: showAboutAction.trigger()
+        }
+    }
+}

app/qml/menus/ShortContextMenu.qml

@@ -0,0 +1,31 @@
+/*******************************************************************************
+* 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
+import QtQuick.Controls 2.3
+
+Menu {
+    id: contextmenu
+    MenuItem {
+        action: copyAction
+    }
+    MenuItem {
+        action: pasteAction
+    }
+}

app/qml/menus/WindowMenu.qml

@@ -0,0 +1,84 @@
+/*******************************************************************************
+* 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
+import QtQuick.Controls 2.3
+
+MenuBar {
+    id: defaultMenuBar
+    visible: appSettings.showMenubar
+
+    Menu {
+        title: qsTr("File")
+        MenuItem {
+            action: quitAction
+        }
+    }
+    Menu {
+        title: qsTr("Edit")
+        MenuItem {
+            action: copyAction
+        }
+        MenuItem {
+            action: pasteAction
+        }
+        MenuSeparator {}
+        MenuItem {
+            action: showsettingsAction
+        }
+    }
+    Menu {
+        title: qsTr("View")
+        MenuItem {
+            action: fullscreenAction
+            visible: fullscreenAction.enabled
+        }
+        MenuItem {
+            action: showMenubarAction
+            visible: showMenubarAction.enabled
+        }
+        MenuItem {
+            action: zoomIn
+        }
+        MenuItem {
+            action: zoomOut
+        }
+    }
+    Menu {
+        id: profilesMenu
+        title: qsTr("Profiles")
+        Instantiator {
+            model: appSettings.profilesList
+            delegate: MenuItem {
+                text: model.text
+                onTriggered: {
+                    appSettings.loadProfileString(obj_string)
+                }
+            }
+            onObjectAdded: function(index, object) { profilesMenu.insertItem(index, object) }
+            onObjectRemoved: function(object) { profilesMenu.removeItem(object) }
+        }
+    }
+    Menu {
+        title: qsTr("Help")
+        MenuItem {
+            action: showAboutAction
+        }
+    }
+}

app/qml/resources.qrc

@@ -6,43 +6,55 @@
         <file>ApplicationSettings.qml</file>
         <file>SettingsWindow.qml</file>
         <file>Fonts.qml</file>
-        <file>FontPixels.qml</file>
         <file>SettingsGeneralTab.qml</file>
         <file>PreprocessedTerminal.qml</file>
         <file>TimeManager.qml</file>
         <file>SimpleSlider.qml</file>
         <file>ColorButton.qml</file>
-        <file>Glossy.qml</file>
         <file>AboutDialog.qml</file>
         <file>InsertNameDialog.qml</file>
         <file>SettingsEffectsTab.qml</file>
         <file>main.qml</file>
         <file>SettingsTerminalTab.qml</file>
-        <file>FontScanlines.qml</file>
-        <file>fonts/1977-apple2/PrintChar21.ttf</file>
-        <file>fonts/1971-ibm-3278/3270Medium.ttf</file>
+        <file>fonts/apple2/PrintChar21.ttf</file>
+        <file>fonts/ibm-3278/3270-Regular.ttf</file>
         <file>Storage.qml</file>
-        <file>CRTMainMenuBar.qml</file>
         <file>SettingsAdvancedTab.qml</file>
         <file>TerminalContainer.qml</file>
         <file>images/crt256.png</file>
         <file>utils.js</file>
         <file>images/allNoise512.png</file>
-        <file>fonts/modern-proggy-tiny/ProggyTiny.ttf</file>
-        <file>fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf</file>
-        <file>fonts/modern-hermit/Hermit-medium.otf</file>
-        <file>fonts/modern-inconsolata/Inconsolata.otf</file>
-        <file>fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf</file>
+        <file>fonts/fixedsys-excelsior/FSEX301-L2.ttf</file>
+        <file>fonts/cozette/CozetteVector.ttf</file>
+        <file>fonts/greybeard/Greybeard-16px.ttf</file>
+        <file>fonts/hack/Hack-Regular.ttf</file>
+        <file>fonts/fira-code/FiraCode-Medium.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>
         <file>Components/SizedLabel.qml</file>
-        <file>fonts/1979-atari-400-800/AtariClassic-Regular.ttf</file>
-        <file>fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf</file>
-        <file>fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf</file>
-        <file>fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf</file>
-        <file>fonts/1977-commodore-pet/PetMe.ttf</file>
+        <file>fonts/atari-400-800/AtariClassic-Regular.ttf</file>
+        <file>fonts/pet-me/PetMe64.ttf</file>
+        <file>fonts/pet-me/PetMe.ttf</file>
         <file>BurnInEffect.qml</file>
-        <file>fonts/modern-terminus/TerminusTTF-4.46.0.ttf</file>
-        <file>NewTerminalFrame.qml</file>
-        <file>SlowBurnIn.qml</file>
+        <file>fonts/terminus/TerminusTTF-4.49.3.ttf</file>
+        <file>TerminalFrame.qml</file>
+        <file>menus/WindowMenu.qml</file>
+        <file>menus/FullContextMenu.qml</file>
+        <file>menus/ShortContextMenu.qml</file>
+        <file>ShaderLibrary.qml</file>
+        <file>menus/OSXMenu.qml</file>
+        <file>../shaders/terminal_dynamic.vert.qsb</file>
+        <file>../shaders/terminal_dynamic.frag.qsb</file>
+        <file>../shaders/passthrough.vert.qsb</file>
+        <file>../shaders/terminal_static.frag.qsb</file>
+        <file>../shaders/terminal_frame.frag.qsb</file>
+        <file>../shaders/burn_in.frag.qsb</file>
+        <file>fonts/unscii/unscii-8-thin.ttf</file>
+        <file>fonts/unscii/unscii-16-full.ttf</file>
+        <file>fonts/unscii/unscii-8.ttf</file>
+        <file>fonts/oldschool-pc-fonts/PxPlus_IBM_EGA_8x8.ttf</file>
+        <file>fonts/oldschool-pc-fonts/PxPlus_IBM_VGA8.ttf</file>
+        <file>fonts/oldschool-pc-fonts/PxPlus_IBM_VGA_8x16.ttf</file>
     </qresource>
 </RCC>

app/qml/utils.js

@@ -1,3 +1,23 @@
+/*******************************************************************************
+* 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/>.
+*******************************************************************************/
+
 .pragma library
 function clamp(x, min, max) {
     if (x <= min)
@@ -6,15 +26,23 @@ function clamp(x, min, max) {
         return max;
     return x;
 }
+
 function lint(a, b, t) {
     return (1 - t) * a + (t) * b;
 }
-function mix(c1, c2, alpha){
+
+function mix(c1, c2, alpha) {
     return Qt.rgba(c1.r * alpha + c2.r * (1-alpha),
                    c1.g * alpha + c2.g * (1-alpha),
                    c1.b * alpha + c2.b * (1-alpha),
                    c1.a * alpha + c2.a * (1-alpha))
 }
+
+function smoothstep(min, max, value) {
+    let x = Math.max(0, Math.min(1, (value - min) / (max - min)));
+    return x * x * (3 - 2 * x);
+}
+
 function strToColor(s){
     var r = parseInt(s.substring(1,3), 16) / 256;
     var g = parseInt(s.substring(3,5), 16) / 256;

app/shaders/burn_in.frag

@@ -0,0 +1,63 @@
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform ubuf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float time;
+    vec4 fontColor;
+    vec4 backgroundColor;
+    float shadowLength;
+    vec2 virtualResolution;
+    float rasterizationIntensity;
+    int rasterizationMode;
+    float burnInLastUpdate;
+    float burnInTime;
+    float burnIn;
+    float staticNoise;
+    float screenCurvature;
+    float glowingLine;
+    float chromaColor;
+    vec2 jitterDisplacement;
+    float ambientLight;
+    float jitter;
+    float horizontalSync;
+    float horizontalSyncStrength;
+    float flickering;
+    float displayTerminalFrame;
+    vec2 scaleNoiseSize;
+    float screen_brightness;
+    float bloom;
+    float rbgShift;
+    float screenShadowCoeff;
+    float frameShadowCoeff;
+    vec4 frameColor;
+    vec2 margin;
+    float prevLastUpdate;
+};
+
+layout(binding = 1) uniform sampler2D txt_source;
+layout(binding = 2) uniform sampler2D burnInSource;
+
+float rgb2grey(vec3 v) {
+    return dot(v, vec3(0.21, 0.72, 0.04));
+}
+
+void main() {
+    vec2 coords = qt_TexCoord0;
+
+    vec3 txtColor = texture(txt_source, coords).rgb;
+    vec4 accColor = texture(burnInSource, coords);
+
+    float prevMask = accColor.a;
+    float currMask = rgb2grey(txtColor);
+
+    float blurDecay = clamp((burnInLastUpdate - prevLastUpdate) * burnInTime, 0.0, 1.0);
+    blurDecay = max(0.0, blurDecay - prevMask);
+    vec3 blurColor = accColor.rgb - vec3(blurDecay);
+    vec3 color = max(blurColor, txtColor);
+
+    fragColor = vec4(color, currMask) * qt_Opacity;
+}

app/shaders/passthrough.vert

@@ -0,0 +1,46 @@
+#version 440
+
+layout(location = 0) in vec4 qt_Vertex;
+layout(location = 1) in vec2 qt_MultiTexCoord0;
+
+layout(std140, binding = 0) uniform ubuf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float time;
+    vec4 fontColor;
+    vec4 backgroundColor;
+    float shadowLength;
+    vec2 virtualResolution;
+    float rasterizationIntensity;
+    int rasterizationMode;
+    float burnInLastUpdate;
+    float burnInTime;
+    float burnIn;
+    float staticNoise;
+    float screenCurvature;
+    float glowingLine;
+    float chromaColor;
+    vec2 jitterDisplacement;
+    float ambientLight;
+    float jitter;
+    float horizontalSync;
+    float horizontalSyncStrength;
+    float flickering;
+    float displayTerminalFrame;
+    vec2 scaleNoiseSize;
+    float screen_brightness;
+    float bloom;
+    float rbgShift;
+    float screenShadowCoeff;
+    float frameShadowCoeff;
+    vec4 frameColor;
+    vec2 margin;
+    float prevLastUpdate;
+};
+
+layout(location = 0) out vec2 qt_TexCoord0;
+
+void main() {
+    qt_TexCoord0 = qt_MultiTexCoord0;
+    gl_Position = qt_Matrix * qt_Vertex;
+}

app/shaders/terminal_dynamic.frag

@@ -0,0 +1,163 @@
+#version 440
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 1) in float vBrightness;
+layout(location = 2) in float vDistortionScale;
+layout(location = 3) in float vDistortionFreq;
+
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform ubuf {
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float time;
+    vec4 fontColor;
+    vec4 backgroundColor;
+    float shadowLength;
+    vec2 virtualResolution;
+    float rasterizationIntensity;
+    int rasterizationMode;
+    float burnInLastUpdate;
+    float burnInTime;
+    float burnIn;
+    float staticNoise;
+    float screenCurvature;
+    float glowingLine;
+    float chromaColor;
+    vec2 jitterDisplacement;
+    float ambientLight;
+    float jitter;
+    float horizontalSync;
+    float horizontalSyncStrength;
+    float flickering;
+    float displayTerminalFrame;
+    vec2 scaleNoiseSize;
+    float screen_brightness;
+    float bloom;
+    float rbgShift;
+    float screenShadowCoeff;
+    float frameShadowCoeff;
+    vec4 frameColor;
+    vec2 margin;
+    float prevLastUpdate;
+};
+
+layout(binding = 0) uniform sampler2D noiseSource;
+layout(binding = 1) uniform sampler2D screenBuffer;
+layout(binding = 2) uniform sampler2D burnInSource;
+layout(binding = 3) uniform sampler2D frameSource;
+
+float min2(vec2 v) { return min(v.x, v.y); }
+float prod2(vec2 v) { return v.x * v.y; }
+float sum2(vec2 v) { return v.x + v.y; }
+float rgb2grey(vec3 v) { return dot(v, vec3(0.21, 0.72, 0.04)); }
+
+vec3 applyRasterization(vec2 screenCoords, vec3 texel, vec2 virtualRes, float intensity, int mode) {
+    if (intensity <= 0.0 || mode == 0) {
+        return texel;
+    }
+
+    const float INTENSITY = 0.30;
+    const float BRIGHTBOOST = 0.30;
+
+    if (mode == 1) { // scanline
+        vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * texel)) * texel;
+        vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * texel)) * texel;
+
+        vec2 coords = fract(screenCoords * virtualRes) * 2.0 - vec2(1.0);
+        float mask = 1.0 - abs(coords.y);
+
+        vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+        return mix(texel, rasterizationColor, intensity);
+    } else if (mode == 2) { // pixel
+        vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * texel)) * texel;
+        vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * texel)) * texel;
+
+        vec2 coords = fract(screenCoords * virtualRes) * 2.0 - vec2(1.0);
+        coords = coords * coords;
+        float mask = 1.0 - coords.x - coords.y;
+
+        vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+        return mix(texel, rasterizationColor, intensity);
+    } else if (mode == 3) { // subpixel
+        const float SUBPIXELS = 3.0;
+        vec3 offsets = vec3(3.141592654) * vec3(0.5, 0.5 - 2.0 / 3.0, 0.5 - 4.0 / 3.0);
+
+        vec2 omega = vec2(3.141592654) * vec2(2.0) * virtualRes;
+        vec2 angle = screenCoords * omega;
+        vec3 xfactors = (SUBPIXELS + sin(angle.x + offsets)) / (SUBPIXELS + 1.0);
+
+        vec3 result = texel * xfactors;
+        vec3 pixelHigh = ((1.0 + BRIGHTBOOST) - (0.2 * result)) * result;
+        vec3 pixelLow  = ((1.0 - INTENSITY) + (0.1 * result)) * result;
+
+        vec2 coords = fract(screenCoords * virtualRes) * 2.0 - vec2(1.0);
+        float mask = 1.0 - abs(coords.y);
+
+        vec3 rasterizationColor = mix(pixelLow, pixelHigh, mask);
+        return mix(texel, rasterizationColor, intensity);
+    }
+
+    return texel;
+}
+
+float randomPass(vec2 coords){
+    return fract(smoothstep(-120.0, 0.0, coords.y - (virtualResolution.y + 120.0) * fract(time * 0.15)));
+}
+
+vec2 barrel(vec2 v, vec2 cc) {
+    float distortion = dot(cc, cc) * screenCurvature;
+    return (v - cc * (1.0 + distortion) * distortion);
+}
+
+vec3 convertWithChroma(vec3 inColor) {
+    vec3 outColor = fontColor.rgb * rgb2grey(inColor);
+    if (chromaColor != 0.0) {
+        outColor = fontColor.rgb * mix(vec3(rgb2grey(inColor)), inColor, chromaColor);
+    }
+    return outColor;
+}
+
+void main() {
+    vec2 cc = vec2(0.5) - qt_TexCoord0;
+    float distance = length(cc);
+
+    vec2 staticCoords = barrel(qt_TexCoord0, cc);
+    vec2 coords = qt_TexCoord0;
+
+    float dst = sin((coords.y + time) * vDistortionFreq);
+    coords.x += dst * vDistortionScale;
+
+    vec4 noiseTexel = texture(noiseSource, scaleNoiseSize * coords + vec2(fract(time / 0.051), fract(time / 0.237)));
+
+    vec2 txt_coords = coords + (noiseTexel.ba - vec2(0.5)) * jitterDisplacement * jitter;
+
+    float color = 0.0001;
+    color += noiseTexel.a * staticNoise * (1.0 - distance * 1.3);
+    color += randomPass(coords * virtualResolution) * glowingLine;
+
+    vec3 txt_color = texture(screenBuffer, txt_coords).rgb;
+
+    if (burnIn > 0.0) {
+        vec4 txt_blur = texture(burnInSource, staticCoords);
+        float blurDecay = clamp((time - burnInLastUpdate) * burnInTime, 0.0, 1.0);
+        vec3 burnInColor = 0.65 * (txt_blur.rgb - vec3(blurDecay));
+        txt_color = max(txt_color, convertWithChroma(burnInColor));
+    }
+
+    txt_color += fontColor.rgb * vec3(color);
+    txt_color = applyRasterization(staticCoords, txt_color, virtualResolution, rasterizationIntensity, rasterizationMode);
+
+    vec3 finalColor = txt_color;
+    float brightness = mix(1.0, vBrightness, step(0.0, flickering));
+    finalColor *= brightness;
+
+    finalColor += vec3(ambientLight) * (1.0 - distance) * (1.0 - distance);
+
+    if (displayTerminalFrame > 0.0) {
+        vec4 frameColor = texture(frameSource, qt_TexCoord0);
+        finalColor = mix(finalColor, frameColor.rgb, frameColor.a);
+    }
+
+    fragColor = vec4(finalColor, qt_Opacity);
+}