Merge branch 'osc-10-query'

Currently translated at 100.0% (234 of 234 strings)

Co-authored-by: 复予 <clonewith@qq.com>
Translate-URL: https://hosted.weblate.org/projects/terminology/terminology/zh_Hans/
Translation: Terminology/Terminology

.arcconfig

@@ -1,7 +0,0 @@
-{
-  "project_id" : "terminology",
-  "projects" : "terminology",
-  "conduit_uri" : "https://phab.enlightenment.org/",
-  "phabricator.uri" : "https://phab.enlightenment.org/",
-  "repository.callsign" : "TRM"
-}

.circleci/config.yml

@@ -1,62 +1,35 @@
-version: 2
+version: 2.1
 
 jobs:
   checkout_code:
     docker:
       - image: borisfaure/terminology-ci:latest
+    environment:
+      - COLUMNS: 150
+      - TERM: xterm-256color
     steps:
       - run: |
           cd /terminology
           git pull --ff-only
           if [ -n "$CIRCLE_PR_NUMBER" ]; then
               git fetch origin pull/$CIRCLE_PR_NUMBER/head
-          fi
-          if [ -n "$CIRCLE_SHA1" ]; then
-            git reset --hard $CIRCLE_SHA1
           else
-            git reset --hard origin/master
+              if [ -n "$CIRCLE_SHA1" ]; then
+                git reset --hard $CIRCLE_SHA1
+              else
+                git reset --hard origin/master
+              fi
           fi
       - save_cache:
           key: checkout-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - /terminology
-  build_minimal_gcc_efl-1.22:
-    docker:
-      - image: borisfaure/terminology-ci:latest
-    steps:
-      - restore_cache:
-          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Install EFL
-          command: apk add /pkg/efl-1.22.6-r0.apk /pkg/efl-dev-1.22.6-r0.apk
-      - run:
-          name: Compile with GCC
-          command: |
-            cd /terminology
-            meson . build
-            meson configure build
-            cd build
-            ninja -j4
-  build_minimal_gcc_efl-1.23:
-    docker:
-      - image: borisfaure/terminology-ci:latest
-    steps:
-      - restore_cache:
-          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Install EFL
-          command: apk add /pkg/efl-1.23.3-r2.apk /pkg/efl-dev-1.23.3-r2.apk
-      - run:
-          name: Compile with GCC
-          command: |
-            cd /terminology
-            meson . build
-            meson configure build
-            cd build
-            ninja -j4
   build_and_test_debug_gcc_efl_latest:
     docker:
       - image: borisfaure/terminology-ci:latest
+    environment:
+      - COLUMNS: 150
+      - TERM: xterm-256color
     steps:
       - restore_cache:
           key: checkout-{{ .Environment.CIRCLE_SHA1 }}
@@ -69,7 +42,7 @@ jobs:
             CFLAGS: -O0 -g
           command: |
             cd /terminology
-            meson -Dtests=true -Dfuzzing=true -Db_coverage=true -Dbuildtype=debug . build
+            meson -Dnls=false -Dtests=true -Dfuzzing=true -Db_coverage=true -Dbuildtype=debug . build
             meson configure build
             cd build
             ninja -j4
@@ -96,6 +69,9 @@ jobs:
   build_and_test_release_gcc_efl_latest:
     docker:
       - image: borisfaure/terminology-ci:latest
+    environment:
+      - COLUMNS: 150
+      - TERM: xterm-256color
     steps:
       - restore_cache:
           key: checkout-{{ .Environment.CIRCLE_SHA1 }}
@@ -108,7 +84,7 @@ jobs:
             CFLAGS: -O0 -g
           command: |
             cd /terminology
-            meson -Dtests=true -Dbuildtype=release . build
+            meson -Dnls=false -Dtests=true -Dbuildtype=release . build
             meson configure build
             cd build
             ninja -j4
@@ -124,6 +100,8 @@ jobs:
       - image: borisfaure/terminology-ci:latest
     environment:
       - CC: clang
+      - COLUMNS: 150
+      - TERM: xterm-256color
     steps:
       - restore_cache:
           key: checkout-{{ .Environment.CIRCLE_SHA1 }}
@@ -134,16 +112,133 @@ jobs:
           name: Compile with Clang
           command: |
             cd /terminology
-            meson -Dtests=true -Dfuzzing=true . build
+            meson -Dnls=false -Dtests=true -Dfuzzing=true . build
             meson configure build
             cd build
             ninja -j4
+  build_and_test_clang_asan_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    environment:
+      - CC: clang
+      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=address -fno-sanitize-recover=address
+      - COLUMNS: 150
+      - TERM: xterm-256color
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with Clang
+          command: |
+            cd /terminology
+            meson -Dnls=false -Dtests=true . build
+            meson configure build
+            cd build
+            ninja -j4
+      - run:
+          name: Launch tests
+          command: |
+            cd /terminology
+            tests/run_tests.sh -v -t build/src/bin/tytest -r tests/tests.results -d tests/
+            build/src/bin/tytest dummy
+            build/src/bin/tytest all
+  build_and_test_clang_msan_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    environment:
+      - CC: clang
+      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=memory -fno-sanitize-recover=memory
+      - COLUMNS: 150
+      - TERM: xterm-256color
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with Clang
+          command: |
+            cd /terminology
+            meson -Dnls=false -Dtests=true . build
+            meson configure build
+            cd build
+            ninja -j4
+      - run:
+          name: Launch tests
+          command: |
+            cd /terminology
+            build/src/bin/tytest dummy
+            build/src/bin/tytest all
+  build_and_test_clang_lsan_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    environment:
+      - CC: clang
+      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=leak -fno-sanitize-recover=leak
+      - COLUMNS: 150
+      - TERM: xterm-256color
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with Clang
+          command: |
+            cd /terminology
+            meson -Dnls=false -Dtests=true . build
+            meson configure build
+            cd build
+            ninja -j4
+      - run:
+          name: Launch tests
+          command: |
+            cd /terminology
+            tests/run_tests.sh -v -t build/src/bin/tytest -r tests/tests.results -d tests/
+            build/src/bin/tytest dummy
+            build/src/bin/tytest all
+  build_and_test_clang_isan_efl_latest:
+    docker:
+      - image: borisfaure/terminology-ci:latest
+    environment:
+      - CC: clang
+      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=integer -fno-sanitize-recover=integer
+      - COLUMNS: 150
+      - TERM: xterm-256color
+    steps:
+      - restore_cache:
+          key: checkout-{{ .Environment.CIRCLE_SHA1 }}
+      - run:
+          name: Install EFL
+          command: apk add /pkg/efl-latest.apk /pkg/efl-dev-latest.apk
+      - run:
+          name: Compile with Clang
+          command: |
+            cd /terminology
+            meson -Dnls=false -Dtests=true . build
+            meson configure build
+            cd build
+            ninja -j4
+      - run:
+          name: Launch tests
+          command: |
+            cd /terminology
+            tests/run_tests.sh -v -t build/src/bin/tytest -r tests/tests.results -d tests/
+            build/src/bin/tytest dummy
+            build/src/bin/tytest all
   build_and_test_clang_ubsan_efl_latest:
     docker:
       - image: borisfaure/terminology-ci:latest
     environment:
       - CC: clang
-      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=undefined,float-divide-by-zero,unsigned-integer-overflow,implicit-conversion,local-bounds,nullability -fno-sanitize-recover=undefined,float-divide-by-zero,unsigned-integer-overflow,implicit-conversion,local-bounds,nullability
+      - CFLAGS: -O0 -pipe -g -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=undefined
+      - COLUMNS: 150
+      - TERM: xterm-256color
     steps:
       - restore_cache:
           key: checkout-{{ .Environment.CIRCLE_SHA1 }}
@@ -154,7 +249,7 @@ jobs:
           name: Compile with Clang
           command: |
             cd /terminology
-            meson -Dtests=true . build
+            meson -Dnls=false -Dtests=true . build
             meson configure build
             cd build
             ninja -j4
@@ -171,12 +266,6 @@ workflows:
   build-and-deploy:
     jobs:
       - checkout_code
-      - build_minimal_gcc_efl-1.22:
-          requires:
-            - checkout_code
-      - build_minimal_gcc_efl-1.23:
-          requires:
-            - checkout_code
       - build_and_test_debug_gcc_efl_latest:
           requires:
             - checkout_code
@@ -186,6 +275,15 @@ workflows:
       - build_full_clang_efl_latest:
           requires:
             - checkout_code
+      - build_and_test_clang_asan_efl_latest:
+          requires:
+            - checkout_code
+      - build_and_test_clang_msan_efl_latest:
+          requires:
+            - checkout_code
+      - build_and_test_clang_lsan_efl_latest:
+          requires:
+            - checkout_code
       - build_and_test_clang_ubsan_efl_latest:
           requires:
             - checkout_code

.codecov.yml

@@ -1,3 +1,2 @@
 fixes:
-  - "../::"
   - "/terminology/::"

.github/FUNDING.yml

@@ -1 +1 @@
-github: billiob
+github: borisfaure

.github/workflows/coccinelle.yaml

@@ -0,0 +1,18 @@
+name: coccinelle
+
+on: [push]
+
+jobs:
+  coccinelle:
+    runs-on: ubuntu-22.04
+    steps:
+    - name: install coccinelle
+      run: |
+        sudo apt update
+        sudo apt install -y coccinelle
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        token: ${{ github.token }}
+    - name: coccinelle check
+      run: scripts/coccinelle/coccicheck.sh

.gitignore

@@ -3,3 +3,4 @@
 *~
 /po/*.gmo
 /build
+/data/colorschemes/__pycache__/

COLORSCHEMES.md

@@ -0,0 +1,109 @@
+# Color Schemes in Terminology
+
+Terminology uses color schemes to define the usual colors used by terminal
+applications, and a bit more: color schemes can also have an impact on the
+theme used.
+
+
+# Configuration file
+
+The colorschemes are stored in EET format for speed up and ease of
+development.
+This format being a bit cumbersome to edit, color schemes can be edit in an
+easy INI format described below.
+
+One can have a look at `data/color_schemes/Default.ini` for an example.
+
+## Organisation of the file
+
+The INI format is made of sections, where the name appears in square brackets
+(`[` and `]`), that contain keys. Every key has a name and a value, delimited
+by an equals sign (`=`).
+
+Those value have 3 types:
+ * integers, mostly used to describe versions,
+ * strings, surrounded by double quotes (`"`) or not,
+ * colors, described as hex color codes, with or without alpha channels, like
+   `#00ffcc` or `#00ff00aa`.
+
+Semicolons (`;`) at the beginning of the line indicate a comment.
+
+The color scheme file contains the following sections that are mandatory:
+`Main`, `Metadata`, `Colors`, `Normal`, `Bright`, `Faint` and `BrightFaint`.
+
+## `Main`
+
+This section has only one field `version` with a default of `1`.
+In case the format has to change, this value will change.
+
+## `Metadata`
+
+This describes everything that is related to the color scheme but is not
+actually a color!
+The fields are the following:
+
+* `version`: an integer, this is the version of the color scheme itself
+* `name` is the name of the color scheme. It is expected to be the same as the
+  file name without the `.ini` extension
+* `author`: who made this color scheme
+* `website`
+* `license`: the short code of an opensource-approved license as listed on
+  https://spdx.org/licenses/
+
+## `Colors`
+
+This section describes colors used in the UI.  The fields are:
+
+* `bg`: the background color of the terminal
+* `main`: this color is used as the main color for cursor and various effects
+  on the terminal, like change of border on focus …
+* `hl`: a color used for an object or text when being highlighted. Usually
+  surrounded by the `main` color.
+* `end_sel`: on selections, the color of the handles used to expand or shrink
+  the area of the selection
+* `tab_missed_1`, `tab_missed_2`, `tab_missed_3`: the main color, the outline
+  color and the shadow color of the number of tabs where a bell has rung, tabs
+  that need attention.
+* `tab_missed_over_1`, `tab_missed_over_2`, `tab_missed_over_3`: same as
+  before but when the mouse is over that number
+* `tab_title_2`: the outline color of the active tab title. The foreground
+  used is `Normal.def` and the shadow is `bg`.
+
+
+## `Normal`, `Bright`, `Faint`, `BrightFaint`
+
+All those sections offer the same set of colors.
+`Normal` are the base colors. `Bright` are a brighter version of the `Normal`
+colors, while `Faint` are a dimer version of the `Normal` colors. Finally,
+`BrightFaint` are a dimer version of the `Bright` colors.
+
+They all have those fields:
+
+* `def`: the default foreground color
+* `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white` are
+  self-explanatory
+* `inverse_fg` and `inverse_fg` are the colors used when espace codes are used
+  to reverse background and foreground. Sometimes used to display selections
+  by the terminal applications
+
+
+# How to add a new color scheme
+
+First, one has to write a color scheme file as described above.  Let's say we
+are creating the color scheme `FooBar` stored in file `FooBar.ini`.
+
+The `Faint` and `BrightFaint` version can be generated by using the
+`gen_faint.py` script stored in `data/color_schemes/` as seen below:
+`gen_faint.py FooBar.ini`
+
+What this script does is to pick the colors from `Normal` and `Bright` and
+merge them with the background color (`Colors.bg`) in a 70/30 proportion. This
+proportion is configurable, like this for a 80/20 proportion:
+`gen_faint.py FooBar.ini 80`
+
+Now that we are happy with the content of `FooBar.ini`, we can call
+the script `add_color_scheme.sh` stored in `data/color_schemes/` as seen
+below:
+`add_color_scheme.sh eet ~/.config/terminology/colorschemes/FooBar.eet FooBar.ini`
+
+Now you should be able to select your color scheme in Terminology!

ChangeLog

@@ -1,3 +1,96 @@
+2022-12-01
+        * Release v1.13.0
+        * Colorshemes: add Fir Dark, Selenized Dark, Selenized Black,
+          Selenized Light and Selenized White schemes
+        * New translations: Indonesian
+        * Translation updates for Catalan, Chinese (Simplified), Croatian,
+          Dutch, French, German, Italian, Portuguese, Portuguese (Brazil),
+          Russian, Spanish, Swedish, Turkish
+        * Handle scale changes on the fly
+        * Better named option to enable/disable typing sounds
+        * Improved README file
+        * The tyls tools now supports pls files
+        * Fade the background of the terminal with the background color
+          defined in the color scheme
+        * Update the default theme to customize selection arrows
+        * Update color schemes about selection arrows
+        * Better documentation of the tyalpha tool
+        * Fix issue when restoring the cursor state
+        * Fix issue preventing some red color from being displayed
+        * Cleanup the code base about C reserved identifiers
+        * Code analyzed with Coverity 2022.06
+        * Test code with some Coccinelle script in the GitHub's CI
+        * Update the ChangeLog.theme file
+
+2022-01-03
+        * Release v1.12.1
+        * Build and install Default colorscheme
+        * Correctly set the version
+
+2022-01-02
+        * Release v1.12.0
+        * New default theme!
+        * Support EFL 1-26 or newer only
+        * Colorschemes generate their own configuration file, allowing for
+          easy management of outside contributions
+
+2021-11-11
+        * Release v1.11.0
+        * Support for focus reporting escape codes
+        * Translation updates for Finnish and Ukrainian
+        * Fix handling of escape code OSC 11
+
+2021-10-03
+        * Release v1.10.0
+        * Colorshemes: add Black scheme
+        * New translations: Sinhala, Hebrew
+        * Translation updates for Chinese (Simplified), Croatian, Danish,
+          French, Greek, Italian, Norwegian Bokmål, Polish, Portuguese,
+          Portuguese (Brazil), Russian, Spanish, Swedish, Ukrainian
+        * Focus font search in the Font settings panel
+        * Fix issue when configuration was marked as Temporary
+        * Stop jumping down to the botton when configuration changed
+        * Respect login shell on start
+        * Fix drag'n'drop of paths or media on the terminal
+        * Fix libintl detection
+
+2021-01-18
+        * Release v1.9.0
+        * Colorshemes: easily change the colors of the terminal
+        * Add the following color schemes: Tango Dark, Tango light, Dracula,
+          Belafonte Day, Belafonte Night, Material, Fahrenheit, Tomorrow Night
+          Burns, PaleNight, Soft Era, One Dark, Cobalt2
+        * New translations: Chinese (Simplified), Japanese, Norwegian Bokmål,
+          Russian and Ukrainian
+        * Handle OSC 12 to change the cursor color
+        * Translation updates for Catalan, Croatian, Danish, Dutch, French,
+          German, Italian, Spanish
+        * Add font search in the fonts panel
+        * Set TERM to xterm_256color by default
+        * Focus simplifications when going into the settings
+        * Tests: better compatibility with debian-based systems
+        * Fix tyls with png/jpg thumbnails
+
+2020-08-11
+        * Release v1.8.1
+        * Be stricter on which characters can be considered wide or not
+        * Apply change about hiding mouse pointer after idle time on all
+          terminals
+
+2020-07-26
+        * Release v1.8.0
+        * Small framework to add unit tests
+        * Display tooltips on when hovering color descriptions
+        * Handle OSC 10/11 to change/get background and foreground colors
+        * Reworked build system for testing and fuzzing
+        * Use of switch-case constructs when home-made binary search was not
+          efficient
+        * Support EFL 1-22 or newer only
+        * Larger list of word separators when doing word-selection
+        * Reworked the Settings panel to add one panel on Mouse interactions
+        * Handle Emoji characters as double-width, following Unicode 13.0
+        * Fix issues detected by UndefinedBehavior Sanitizer
+
 2020-05-10
         * Release v1.7.0
         * Terminology is packaged on the snapstore at https://snapcraft.io/terminology

ChangeLog.theme

@@ -1,6 +1,21 @@
-=================
-Terminology 1.8.0
-=================
+==================
+Terminology 1.13.0
+==================
+
+Changes since 1.12.1:
+--------------------
+  * Add part "terminology.fade" in group "terminology/core" to set the color
+  used to fade the background of the terminal.  Terminology sets it to the
+  background color of the colorscheme.
+
+Changes since 1.11.0:
+--------------------
+  * New default theme!
+
+Changes since 1.8.0:
+--------------------
+  * Add group "terminology/color_preview" to display a preview of a
+  colorscheme.
 
 Changes since 1.7.0:
 --------------------

DESIGN.md

@@ -1,4 +1,4 @@
-A simple documentation to navige through the C files:
+A simple documentation to navigate through the C files:
 
 * `src/bin/about.c` handles the About widget
 * `src/bin/backlog.c`: backlog handling

DEV.md

@@ -0,0 +1,10 @@
+# Double Width
+
+The code to decide whether a unicode codepoint should be rendered double-width
+is generated from the Unicode specification.
+This is done by using `tools/unicode_dbl_width.py`.
+
+1. Download <https://www.unicode.org/Public/UCD/latest/ucdxml/ucd.all.flat.zip>
+2. Extract it
+3. Run `tools/unicode_dbl_width.py ucd.all.flat.xml src/bin/termptydbl.h src/bin/termptydbl.c`_
+4. Commit the files modified

INSTALL

@@ -1,59 +0,0 @@
-** COMPILING and INSTALLING **
-------------------------------
-
-Meson is the build system used for this project. For more information please
-see:
-
-    http://mesonbuild.com
-
-----
-
-Normal compilation in /usr/local:
-
-    meson . build
-    ninja -C build
-    sudo ninja -C build install
-
-For meson build generic options:
-
-    meson --help
-
-For a list of project specific options supported:
-
-    cat meson_options.txt
-
-To set 1 or more project specific options:
-
-    meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
-
-To display current configuration:
-
-    meson configure build
-
-The above will only work after at least the following is done:
-
-    meson . build
-
-** QUICK AND DIRTY HELP **
---------------------------
-
-How clean out the build and config and start fresh:
-
-    rm -rf build
-
-How to make a dist tarball and check its build:
-(must do it from git tree clone and commit all changes to git first)
-
-    ninja -C build dist
-
-How to change prefix:
-
-    meson --prefix=/path/to/prefix . build
-
-How to install in a specific destination directory for packaging:
-
-    DESTDIR=/path/to/destdir ninja -C build install
-
-How to build with verbose output (full commands run):
-
-    ninja -C build -v

NEWS

@@ -1,6 +1,146 @@
-=================
-Terminology 1.7.0
-=================
+==================
+Terminology 1.13.1
+==================
+
+Changes since 1.12.1:
+---------------------
+
+Additions:
+    * Colorshemes: add Fir Dark, Selenized Dark, Selenized Black,
+      Selenized Light and Selenized White schemes
+    * New translations: Indonesian
+
+Improvements:
+    * Translation updates for Catalan, Chinese (Simplified), Croatian, Dutch,
+      French, German, Italian, Portuguese, Portuguese (Brazil),
+      Russian, Spanish, Swedish, Turkish
+    * Handle scale changes on the fly
+    * Better named option to enable/disable typing sounds
+    * Improved README file
+    * The tyls tools now supports pls files
+    * Fade the background of the terminal with the background color defined in
+      the color scheme
+    * Update the default theme to customize selection arrows
+    * Update color schemes about selection arrows
+    * Better documentation of the tyalpha tool
+
+Fixes:
+    * Fix issue when restoring the cursor state
+    * Fix issue preventing some red color from being displayed
+
+Internal improvements:
+    * Cleanup the code base about C reserved identifiers
+    * Code analyzed with Coverity 2022.06
+    * Test code with some Coccinelle script in the GitHub's CI
+    * Update the ChangeLog.theme file
+
+
+Changes since 1.12.0:
+---------------------
+
+Fixes:
+    * Build and install Default colorscheme
+    * Correctly set the version
+
+
+Changes since 1.11.0:
+---------------------
+
+Additions:
+    * New default theme!
+
+Improvements:
+    * Support EFL 1-26 or newer only
+    * Colorschemes generate their own configuration file, allowing for easy
+      management of outside contributions
+
+
+Changes since 1.10.0:
+---------------------
+
+Additions:
+    * Support for focus reporting escape codes
+
+Improvements:
+    * Translation updates for Finnish and Ukrainian
+
+Fixes:
+    * Fix handling of escape code OSC 11
+
+
+Changes since 1.9.0:
+--------------------
+
+Additions:
+    * Colorshemes: add Black scheme
+    * New translations: Sinhala, Hebrew
+
+Improvements:
+    * Translation updates for Chinese (Simplified), Croatian, Danish, French,
+      Greek, Italian, Norwegian Bokmål, Polish, Portuguese,
+      Portuguese (Brazil), Russian, Spanish, Swedish, Ukrainian
+    * Focus font search in the Font settings panel
+
+Fixes:
+    * Fix issue when configuration was marked as Temporary
+    * Stop jumping down to the botton when configuration changed
+    * Respect login shell on start
+    * Fix drag'n'drop of paths or media on the terminal
+    * Fix libintl detection
+
+
+Changes since 1.8.1:
+--------------------
+
+Additions:
+    * Colorshemes: easily change the colors of the terminal
+    * Add the following color schemes: Tango Dark, Tango light, Dracula,
+      Belafonte Day, Belafonte Night, Material, Fahrenheit, Tomorrow Night
+      Burns, PaleNight, Soft Era, One Dark, Cobalt2
+    * New translations: Chinese (Simplified), Japanese, Norwegian Bokmål,
+      Russian and Ukrainian
+    * Handle OSC 12 to change the cursor color
+
+Improvements:
+    * Translation updates for Catalan, Croatian, Danish, Dutch, French,
+      German, Italian, Spanish
+    * Add font search in the fonts panel
+    * Set TERM to xterm_256color by default
+    * Focus simplifications when going into the settings
+    * Tests: better compatibility with debian-based systems
+
+Fixes:
+    * Fix tyls with png/jpg thumbnails
+
+
+Changes since 1.8.0:
+--------------------
+
+Fixes:
+    * Be stricter on which characters can be considered wide or not
+    * Apply change about hiding mouse pointer after idle time on all terminals
+
+
+Changes since 1.7.0:
+--------------------
+
+Additions:
+    * Small framework to add unit tests
+    * Display tooltips on when hovering color descriptions
+    * Handle OSC 10/11 to change/get background and foreground colors
+
+Improvements:
+    * Reworked build system for testing and fuzzing
+    * Use of switch-case constructs when home-made binary search was not
+      efficient
+    * Support EFL 1-22 or newer only
+    * Larger list of word separators when doing word-selection
+    * Reworked the Settings panel to add one panel on Mouse interactions
+    * Handle Emoji characters as double-width, following Unicode 13.0
+
+Fixes:
+    * Fix issues detected by UndefinedBehavior Sanitizer
+
 
 Changes since 1.6.0:
 --------------------

README.md

@@ -1,160 +1,165 @@
-Terminology 1.7.0
-=================
+![Terminology](/data/readme/terminology.png)
+# Terminology
 
-This is an EFL terminal emulator with some extra bells and whistles.
+-----
 
-:warning: :warning: :warning:
+*Please report bugs/issues at*
+[git.enlightenment.org](https://git.enlightenment.org/enlightenment/terminology/issues)
 
-> FOR ANY ISSUES, PLEASE CONSULT THEM ON
-> http://issues.terminolo.gy/
-
-:warning: :warning: :warning:
+-----
 
 [![Coverity](https://scan.coverity.com/projects/terminology/badge.svg)](https://scan.coverity.com/projects/terminology)
-[![CircleCI](https://circleci.com/gh/billiob/terminology.svg?style=shield)](https://circleci.com/gh/billiob/terminology)
-[![codecov](https://codecov.io/gh/billiob/terminology/branch/master/graph/badge.svg)](https://codecov.io/gh/billiob/terminology)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/49a51811016a44279cb969af82cd246f)](https://www.codacy.com/app/billiob/terminology)
+[![CircleCI](https://circleci.com/gh/borisfaure/terminology.svg?style=shield)](https://circleci.com/gh/borisfaure/terminology)
+[![Codecov](https://codecov.io/gh/borisfaure/terminology/branch/master/graph/badge.svg)](https://codecov.io/gh/borisfaure/terminology)
 [![Twitter: _Terminology_](https://img.shields.io/twitter/follow/_Terminology_?style=social)](https://twitter.com/_Terminology_)
-[![terminology](https://snapcraft.io//terminology/badge.svg)](https://snapcraft.io/terminology)
+[![Snapcraft](https://snapcraft.io//terminology/badge.svg)](https://snapcraft.io/terminology)
+[![Weblate](https://hosted.weblate.org/widgets/terminology/-/terminology/svg-badge.svg)](https://hosted.weblate.org/engage/terminology/)
 
-Requirements
-------------
+-----
 
-  * `efl` (>= 1.22.0)
+This is an EFL terminal emulator with some extra bells and whistles
+such as the ability to display in-line images, video and even play
+music files, background images, videos, Z-Modem like sending (e.g. SSH
+into a server and use tysend to send a file back to the local
+terminal), GPU Accelerated rendering (optional - just set the
+EFL Elementary toolkit  engine to use OpenGL) and much more.
+
+## Requirements
+
+* [efl](https://git.enlightenment.org/enlightenment/efl)
 
 Please see http://www.enlightenment.org for information on these.
 
+## Compiling
 
-Compiling
----------
+Once you have met requirements, compiling and installing are simple:
 
-Once you have met requirements, compiling and installing is simple:
-
-```sh
-  meson build
-  cd build
-  ninja
-  ninja install
+``` sh
+meson build
+ninja -C build
+sudo ninja -C build install
 ```
 
-Note: to make terminology work with input methods in general you need:
+At the end of this file is more complete information on cimpiling and
+installing.
 
-```sh
-  export ECORE_IMF_MODULE="xim"
-  export XMODIFIERS="@im=none"
+**NOTE:** to make terminology work with input methods in general you need:
+
+``` sh
+export ECORE_IMF_MODULE="xim"
+export XMODIFIERS="@im=none"
 ```
 
-
-Mouse controls
---------------
-
-  * `Right mouse button` = controls menu
-  * `Middle mouse button` = paste highlight selection
-  * `Left mouse button/drag` = make highlight
-  * `Wheel` = scroll up or down in history
-  * `Ctrl+Wheel` = zoom font size up/down
-  * `Ctrl+Left mouse button/drag` = make block selection highlight
-
-
-Default key controls
---------------------
-
-  * `Shift+PgUp` = Scroll 1 page up
-  * `Shift+PgDn` = Scroll 1 page down
-  * `Shift+Up` = Scroll 1 line up
-  * `Shift+Down` = Scroll 1 line down
-  * `Shift+Home` = Scroll to the top of the backlog
-  * `Shift+End` = Reset scroll
-  * `Shift+Left` = switch focus to previous terminal inside a window
-  * `Shift+Right` = switch focus to next terminal inside a window
-  * `Shift+Insert` = Paste Clipboard (`ctrl+v/c`) selection
-  * `Shift+Ctrl+Insert` = Paste Primary (highlight) selection
-  * `Shift+Keypad-Plus` = Font size up 1
-  * `Shift+Keypad-Minus` = Font size down 1
-  * `Shift+Keypad-Multiply` = Reset font size
-  * `Shift+Keypad-Divide` = Copy highlight to Clipboard (same as `Ctrl+c` in gui apps)
-  * `Ctrl+PgUp` = switch focus to previous terminal inside a window
-  * `Ctrl+PgDn` = switch focus to next terminal inside a window
-  * `Ctrl+Shift+t` = create new terminal on top of current inside window (tabs)
-  * `Ctrl+Shift+End` = close the focused terminal.
-  * `Ctrl+Shift+h` = toggle displaying the miniview of the history
-  * `Ctrl+Shift+Home` = bring up "tab" switcher
-  * `Ctrl+Shift+PgUp` = split terminal horizontally (1 term above the other)
-  * `Ctrl+Shift+PgDn` = split terminal vertically (1 term to the left of the other)
-  * `Ctrl+Shift+c` = copy current selection to clipboard
-  * `Ctrl+Shift+v` = paste current clipboard selection
-  * `Alt+Home` = Enter command mode (enter commands to control terminology itself)
-  * `Alt+Return` = Paste primary selection
-  * `Alt+g` = Group input: send input to all visible terminals in the window
-  * `Alt+Shift+g` = Group input: send input to all terminals in the window
-  * `Alt+w` = Copy selection to primary
-  * `Alt+Up` = Focus the terminal above
-  * `Alt+Down` = Focus the terminal below
-  * `Alt+Left` = Focus the terminal on the left
-  * `Alt+Right` = Focus the terminal on the right
-  * `Ctrl+Alt+Equal` = Font size up 1
-  * `Ctrl+Alt+Minus` = Font size down 1
-  * `Ctrl+Alt+0` = Reset font size
-  * `Ctrl+Alt+9` = Big font size
-  * `Ctrl+Alt+t` = Set terminal title
-  * `Ctrl+1` = switch to terminal tab 1
-  * `Ctrl+2` = switch to terminal tab 2
-  * `Ctrl+3` = switch to terminal tab 3
-  * `Ctrl+4` = switch to terminal tab 4
-  * `Ctrl+5` = switch to terminal tab 5
-  * `Ctrl+6` = switch to terminal tab 6
-  * `Ctrl+7` = switch to terminal tab 7
-  * `Ctrl+8` = switch to terminal tab 8
-  * `Ctrl+9` = switch to terminal tab 9
-  * `Ctrl+0` = switch to terminal tab 10
-
-
-
-Themes
-------
+## Themes
 
 Apart from the ones shipped with Terminology, themes can be stored in
-`~/.config/terminology/themes/` .
+`~/.config/terminology/themes/`.
 
+Documentation on themes is written in [THEMES.md](THEMES.md).
 
-Companion tools
----------------
+## Color Schemes
+
+Terminology ships with some common color schemes.
+
+To know how to modify or add some new color schemes, please read
+[COLORSCHEMES.md](COLORSCHEMES.md).
+
+## Mouse controls
+
+* `Right mouse button` = controls menu
+* `Middle mouse button` = paste highlight selection
+* `Left mouse button/drag` = make highlight
+* `Wheel` = scroll up or down in history
+* `Ctrl+Wheel` = zoom font size up/down
+* `Ctrl+Left mouse button/drag` = make block selection highlight
+
+## Default key controls
+
+* `Shift+PgUp` = Scroll 1 page up
+* `Shift+PgDn` = Scroll 1 page down
+* `Shift+Up` = Scroll 1 line up
+* `Shift+Down` = Scroll 1 line down
+* `Shift+Home` = Scroll to the top of the backlog
+* `Shift+End` = Reset scroll
+* `Shift+Left` = switch focus to previous terminal inside a window
+* `Shift+Right` = switch focus to next terminal inside a window
+* `Shift+Insert` = Paste Clipboard (`ctrl+v/c`) selection
+* `Shift+Ctrl+Insert` = Paste Primary (highlight) selection
+* `Shift+Keypad-Plus` = Font size up 1
+* `Shift+Keypad-Minus` = Font size down 1
+* `Shift+Keypad-Multiply` = Reset font size
+* `Shift+Keypad-Divide` = Copy highlight to Clipboard (same as `Ctrl+c` in gui apps)
+* `Ctrl+PgUp` = switch focus to previous terminal inside a window
+* `Ctrl+PgDn` = switch focus to next terminal inside a window
+* `Ctrl+Shift+t` = create new terminal on top of current inside window (tabs)
+* `Ctrl+Shift+End` = close the focused terminal.
+* `Ctrl+Shift+h` = toggle displaying the miniview of the history
+* `Ctrl+Shift+Home` = bring up "tab" switcher
+* `Ctrl+Shift+PgUp` = split terminal horizontally (1 term above the other)
+* `Ctrl+Shift+PgDn` = split terminal vertically (1 term to the left of the other)
+* `Ctrl+Shift+c` = copy current selection to clipboard
+* `Ctrl+Shift+v` = paste current clipboard selection
+* `Alt+Home` = Enter command mode (enter commands to control terminology itself)
+* `Alt+Return` = Paste primary selection
+* `Alt+g` = Group input: send input to all visible terminals in the window
+* `Alt+Shift+g` = Group input: send input to all terminals in the window
+* `Alt+w` = Copy selection to primary
+* `Alt+Up` = Focus the terminal above
+* `Alt+Down` = Focus the terminal below
+* `Alt+Left` = Focus the terminal on the left
+* `Alt+Right` = Focus the terminal on the right
+* `Ctrl+Alt+Equal` = Font size up 1
+* `Ctrl+Alt+Minus` = Font size down 1
+* `Ctrl+Alt+0` = Reset font size
+* `Ctrl+Alt+9` = Big font size
+* `Ctrl+Alt+t` = Set terminal title
+* `Ctrl+1` = switch to terminal tab 1
+* `Ctrl+2` = switch to terminal tab 2
+* `Ctrl+3` = switch to terminal tab 3
+* `Ctrl+4` = switch to terminal tab 4
+* `Ctrl+5` = switch to terminal tab 5
+* `Ctrl+6` = switch to terminal tab 6
+* `Ctrl+7` = switch to terminal tab 7
+* `Ctrl+8` = switch to terminal tab 8
+* `Ctrl+9` = switch to terminal tab 9
+* `Ctrl+0` = switch to terminal tab 10
+
+## Companion tools
 
 Terminology ships with a set of tools to help you get the best out of
 Terminology.
 
-  * `tyls`: list directory contents with bells and whistles
-  * `tyalpha`: set transparency level of the background
-  * `tybg`: change the background image
-  * `tycat`: display inline a media file or a URI
-  * `typop`: display in a popup a media file or a URI
-  * `tyq`: queue media files or URI to be popped up
-  * `tysend`: send files to the terminal (useful through ssh)
+* `tyls`: list directory contents with bells and whistles
+* `tyalpha`: set transparency level of the background
+* `tybg`: change the background image
+* `tycat`: display inline a media file or a URI
+* `typop`: display in a popup a media file or a URI
+* `tyq`: queue media files or URI to be popped up
+* `tysend`: send files to the terminal (useful through ssh)
 
-
-
-Extended escapes for terminology only
---------------------------------------
+## Extended escapes for terminology only
 
 `[\033][}][COMMAND][\000]`
 i.e.
-  1. `ESC` char (`\033` or `0x1b`)
-  2. `}` char
-  3. a sequence of UTF8 chars other than `nul` (`\000` or `0x00`).
-  4. `\000` char (`nul` byte or `0x00` to indicate end of sequence)
+1. `ESC` char (`\033` or `0x1b`)
+2. `}` char
+3. a sequence of UTF8 chars other than `nul` (`\000` or `0x00`).
+4. `\000` char (`nul` byte or `0x00` to indicate end of sequence)
 
 e.g.
+``` sh
   `echo -n '\033}Hello world\000'`
+```
 
 ## Commands
 
 In the following, any values inside square brackets `[]` are to be replaced
 by some content (numbers, strings, paths, url's etc.).
 
-examples:
+Examples:
 
-  * `aa[PATH-OF-FILE]` should become something like: `aa/tmp/file.png`
-  * `aa[true/false]` should become something like:  `aatrue` or `aafalse`
+* `aa[PATH-OF-FILE]` should become something like: `aa/tmp/file.png`
+* `aa[true/false]` should become something like:  `aatrue` or `aafalse`
 
 ## Available commands
 
@@ -207,7 +212,7 @@ examples:
     destination URI when a user may click on the given media image.
 
     example:
-    ```sh
+    ``` sh
       printf("\033}is#5;3;%s\000"
              "\033}ib\000#####\033}ie\000\n"
              "\033}ib\000#####\033}ie\000\n"
@@ -333,3 +338,107 @@ examples:
   * `fx`
     exit file send mode (normally at the end of the file or when it's
     complete)
+
+## Compiling and Installing
+
+Meson is the build system used for this project. For more information
+please see [mesonbuild.com](https://mesonbuild.com)
+
+You will need normal build tooling installed such as a compiler (gcc
+or clang for example), pkg-config, ninja, any relevant package-dev or
+package-devel packages if your distribution splits out development
+headers (e.g. libc6-dev) etc.
+
+Depending on where dependencies (like efl) are installed, you might have to
+set your `PKG_CONFIG_PATH` environment variable like:
+```sh
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+```
+
+Also note that some distributions like to add extra arch directories
+to your library locations so you might have to have more like:
+```sh
+export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
+```
+
+You will need to ensure that the destination library directory (e.g.
+`/usr/local/lib` is in your /etc/ld.so.conf or /etc/ld.so.conf.d/
+files and after installing anything that installs libraries you
+re-run `ldconfig`. Please see relevant documentation on ldconfig and
+ld.so.conf for your distribution.
+
+You might also want to add the destination bin dir to your environment
+variable PATH (see documentation on your shell PATH variable) such as:
+```sh
+export PATH=/usr/local/bin:/usr/bin:/bin
+```
+
+Normal compilation in /usr/local:
+```sh
+meson . build
+ninja -C build
+sudo ninja -C build install
+```
+
+For meson build generic options:
+```sh
+meson --help
+```
+
+For a list of project specific options supported:
+```sh
+cat meson_options.txt
+```
+
+To set 1 or more project specific options:
+```sh
+meson --prefix=/path/to -Doption=value [-Dother=value2] [...] . build
+```
+
+To display current configuration:
+```sh
+meson configure build
+```
+
+The above will only work after at least the following is done:
+```sh
+meson . build
+```
+
+### Quick build help
+
+How to clean out the build and config and start fresh:
+```sh
+rm -rf build
+```
+
+How to make a dist tarball and check its build:
+(must do it from git tree clone and commit all changes to git first)
+```sh
+ninja -C build dist
+```
+
+How to change prefix:
+```sh
+meson --prefix=/path/to/prefix . build
+```
+
+How to install in a specific destination directory for packaging:
+```sh
+DESTDIR=/path/to/destdir ninja -C build install
+```
+
+How to build with verbose output (full commands run):
+```sh
+ninja -C build -v
+```
+
+## Running on framebuffer
+
+Terminology can run on the framebuffer, if EFL is compiled with ``fb`` or
+``drm`` support.
+Then the following environment need to be set:
+
+*  ``ELM_DISPLAY=fb``
+*  ``ELM_ACCEL=none``
+*  ``EVAS_FB_DEV=/dev/fb0``

THEME.md

@@ -1,243 +0,0 @@
-This document describes how Terminology interacts with themes and what needs
-to be handled by themes.
-
-See `ChangeLog.theme` on changes related to themes.
-
-
-Windows contain group `terminology/base`.
-
-
-# `terminology/base`
-Contains what is global to a window.
-
-## Swallowed parts
-
-### `terminology.content`
-where `terminology/background`, or a split widget can be swallowed.
-
-### `terminology.cmdbox`
-To swallow a command box.
-It reacts to the following signals:
-* `cmdbox,show`
-* `cmdbox,hide`
-
-### `terminology.about`
-It reacts to the following signals:
-* `about,show`
-* `about,hide`
-
-### `terminology.optdetails`
-Detailed settings panel.
-It reacts to the following signals:
-* `optdetails,show`
-* `optdetails,hide`
-It emits the following signal:
-* `optdetails,hide,done`
-
-### `terminology.options`
-It reacts to the following signals:
-* `options,show`
-* `options,hide`
-
-### `terminology.controls`
-The controls box shown on right click.
-It reacts to the following signals:
-* `controls,show`
-* `controls,hide`
-
-
-
-# `terminology/background`
-
-## Swallowed parts
-
-### `terminology.content`
-Here is swallowed an object of group `terminology.background`.
-
-### TODO
-
-## Special parts
-
-### `tabdrag` and `tabmiddle`
-Their geometry are used to adjust drag values.
-
-### `drag_left_outline`, `drag_right_outline`, `drag_top_outline`, `drag_bottom_outline` and `terminology.tabregion`
-Their geometry are used to know when the cursor enters them when dragging a
-tab.
-
-## Signal received
-### `tabbar,off` and `tabbar,on`
-Whether to display a tab bar. Default is off.
-### `tab_btn,off` and `tab_btn,on`
-Whether to display a tab button to easily navigate through tabs. Default is off.
-### `drag_left,on`, `drag_right,on`, `drag_top,on`, `drag_bottom,on`
-When to start an animation when the cursor enters `drag_XXXX_outline` while
-dragging a tab.
-### `drag_left,off`, `drag_right,off`, `drag_top,off`, `drag_bottom,off`
-When to stop an animation started by the related `*,on` signals.
-### `drag_over_tabs,on` and `drag_over_tabs,off`
-When the mouse, while dragging a tab, enters or leaves the tab region.
-### `grouped,on` and `grouped,off`
-When input is broadcast to multiple terminals.
-
-### TODO
-
-## Signal emitted
-### `tab,hdrag`
-To notify that the current tab is being dragged.
-### `tab,drag,stop`
-To notify that the current tab is no longer being dragged.
-### `tab,drag,move`
-To notify that the current tab is being dragged outside of other tabs.
-
-### TODO
-
-
-
-# `terminology/core`
-
-## Swallowed parts
-
-### `terminology.background`
-
-Actual background.
-It reacts to the following signals based on the media to play in background:
-* `media,off`
-* `media,image`
-* `media,scale`
-* `media,edje`
-* `media,movie`
-
-### `terminology.tabregion`
-Here is swalloed a fully transparent rectangle to move down the textgrid.
-
-### `terminology.content`
-Where actual text grid goes.
-
-## Signal received
-### `tabbar,off` and `tabbar,on`
-Whether to display a tab bar. Default is off.
-### `tab_btn,off` and `tab_btn,on`
-Whether to display a tab button to easily navigate through tabs. Default is off.
-### `hdrag,on` and `hdrag,off`
-Whether to restrict (default) horizontal tab drag
-
-## Signal emitted
-### `tab,drag` and `tab,drag,stop`
-To notify that the current tab is being dragged.
-### `tab,mouse,down`
-Whenever the left mouse button is pressed on a tab.
-
-
-
-# `terminology/about`
-## Text parts
-### `terminology.text`
-The text of the __About__ message.
-
-
-
-# `terminology.tabbar_back`
-An inactive tab item
-## Text parts
-### `terminology.title`
-Title of the tab.
-
-## Signal emitted
-### `tab,activate`
-When clicked on it, to notify that the user wants to go to that tab.
-
-## Signal received
-### `bell`
-To mark the tab as having missed a bell.
-### `bell,off`
-To unmark the tab as having missed a bell.
-### `grouped,on` and `grouped,off`
-When input is broadcast to multiple terminals.
-
-
-
-# `terminology/keybinding`
-__TODO__
-
-
-
-# `terminology/miniview`
-__TODO__
-
-
-
-# `terminology/fontpreview`
-__TODO__
-
-
-
-# `terminology/selection`
-An object used when selecting text.
-__TODO__
-
-
-
-# `terminology/cursor`
-__TODO__
-
-
-
-# `terminology/cursor_bar`
-__TODO__
-
-
-
-# `terminology/cursor_underline`
-__TODO__
-
-
-
-# `terminology/sel/base`
-__TODO__
-
-
-
-# `terminology/sel/item`
-__TODO__
-
-
-
-# `terminology/link`
-An object overlayd on text that is a link.
-
-
-
-# `terminology/mediabusy`
-__TODO__
-
-
-
-# `terminology/mediactrl`
-__TODO__
-
-
-
-# `terminology/tab_drag_thumb`
-A thumbnail of a tab being dragged.
-
-## Swallowed parts
-### `terminology.content`
-Here is swallowed an object of group `terminology.background`.
-
-### `terminology.title`
-Title of the tab.
-
-## Signal received
-### `bell`
-To mark the tab as having missed a bell.
-
-
-
-# `terminology/color_preview`
-A group to preview a color in a tooltip. The color is defined by the color
-class `color_preview`.
-
-## Swallowed part
-### `name`
-Name of the color being previewed

THEMES.md

@@ -0,0 +1,345 @@
+# Themes in Terminology
+
+This document describes how Terminology interacts with themes and what needs
+to be handled by themes.
+
+See `ChangeLog.theme` on changes related to themes.
+
+# Color classes
+
+Based on the chosen color scheme, Terminology sets the following color classes
+on all the following edje groups:
+
+* `BG`: the background color of the terminal
+* `FG`: the default foreground color
+* `CURSOR`: the color of the cursor
+* `GLOW`: the color in the UI to ouline elements
+* `HIGHLIGHT`: the color used as main color when an element is highlighted
+* `GLOW_TXT`: text colors with some glow
+* `GLOW_TXT_HIGHLIGHT`: text with glow that is highlighted
+* `TAB_MISSED`: the number of tabs where a bell has rung, tabs that need
+  attention
+* `TAB_MISSED_OVER`: same but when the mouse is over that number
+* `TAB_TITLE`: the colors of the active tab title
+* `BG_SENDFILE` is the background color when there is a sendfile action. See
+  `man tysend`. It is set to `#404040`.
+* `END_SELECTION`: on selections, the color of the handles used to expand or shrink
+  the area of the selection
+* `/fg/normal/term/selection/arrow/left`,
+  `/fg/normal/term/selection/arrow/down`,
+  `/fg/normal/term/selection/arrow/up`,
+  `/fg/normal/term/selection/arrow/right` replace `END_SELECTION` and are used
+  to control the different arrows used to change the area of the selection
+
+The following table explains how color classes are set from color scheme
+values:
+
+| Color Class          | Object color     | Outline color    | Shadow color  |
+| -------------------- | ---------------- | ---------------- | ------------- |
+| `BG`                 | `Colors.bg`      | `Colors.bg`      | `Colors.bg`   |
+| `FG`                 | `Normal.def`     | `Normal.def`     | `Normal.def`  |
+| `CURSOR`             | `Colors.main`    | `Colors.main`    | `Colors.main` |
+| `GLOW`               | `Colors.main`    | `Colors.main`    | `Colors.main` |
+| `GLOW_TXT_HIGHLIGHT` | `Colors.hl`      | `Colors.main`    | `Colors.main` |
+| `END_SELECTION`      | `Colors.end_sel` | `Colors.end_sel` | `Colors.end_sel` |
+| `TAB_MISSED`         | `Colors.tab_missed_1` | `Colors.tab_missed_2` | `Colors.tab_missed_3` |
+| `TAB_MISSED_OVER`    | `Colors.tab_missed_1` | `Colors.tab_missed_2` | `Colors.tab_missed_3` |
+| `TAB_TITLE`          | `Normal.def` | `Colors.tab_title_2` | `Colors.bg`   |
+| `BG_SENDFILE`        | `#404040`    | `#404040`            | `#404040`     |
+
+
+
+Let's dive into the edje groups that Terminology uses.
+
+# Group `terminology/base`
+All windows contain a group `terminology/base`.
+Contains what is global to a window.
+
+## Swallowed parts
+
+### Part `terminology.content`
+where `terminology/background`, or a split widget can be swallowed.
+
+### Part `terminology.cmdbox`
+To swallow a command box.
+It reacts to the following signals:
+* `cmdbox,show`
+* `cmdbox,hide`
+
+### Part `terminology.about`
+It reacts to the following signals:
+* `about,show`
+* `about,hide`
+
+### Part `terminology.optdetails`
+Detailed settings panel.
+It reacts to the following signals:
+* `optdetails,show`
+* `optdetails,hide`
+It emits the following signal:
+* `optdetails,hide,done`
+
+### Part `terminology.options`
+It reacts to the following signals:
+* `options,show`
+* `options,hide`
+
+### Part `terminology.controls`
+The controls box shown on right click.
+It reacts to the following signals:
+* `controls,show`
+* `controls,hide`
+
+## Special parts
+
+### Part `youtube.txt`
+A text part used to hold `YouTube channel` when the About is shown.
+
+### Part `twitter.txt`
+A text part used to hold `YouTube channel` when the About is shown.
+
+## Signals emitted
+
+### Signal `about,twitter`
+When the Twitter link on the About page is clicked.
+
+### Signal `about,twitter,ctx`
+When the Twitter link on the About page is right-clicked.
+
+### Signal `about,youtube`
+When the YouTube link on the About page is clicked.
+
+### Signal `about,youtube,ctx`
+When the YouTube link on the About page is right-clicked.
+
+### Signal `optdetails,hide,done`
+When the swallowed part `terminology.optdetails` is finally hidden.
+
+
+## Signals received
+
+### Signals `about,show` and `about,hide`
+Used to hide or show the about page, swallowed in `terminology.about`.
+
+### Signals `controls,show` and `controls,hide`
+Used to hide or show the controls, swallowed in `terminology.controls`.
+
+### Signals `options,show` and `options,hide`
+Used to hide or show the options panel, swallowed in `terminology.options`.
+
+### Signals `optdetails,show` and `optdetails,hide`
+Used to hide or show the options details settings panel, swallowed in `terminology.optdetails`.
+
+### Signals `cmdbox,show` and `cmdbox,hide`
+Used to hide or show the command box, swallowed in `terminology.cmdbox`.
+
+
+
+# Group `terminology/background`
+
+## Swallowed parts
+
+### Parts `terminology.content`
+Here is swallowed an object of group `terminology.background`.
+
+## Special parts
+
+### Parts `tabdrag` and `tabmiddle`
+Their geometry are used to adjust drag values.
+
+### Parts `drag_left_outline`, `drag_right_outline`, `drag_top_outline`, `drag_bottom_outline` and `terminology.tabregion`
+Their geometry are used to know when the cursor enters them when dragging a
+tab.
+
+## Signals received
+### Signals `tabbar,off` and `tabbar,on`
+Whether to display a tab bar. Default is off.
+### Signals `tab_btn,off` and `tab_btn,on`
+Whether to display a tab button to easily navigate through tabs. Default is off.
+### Signals `drag_left,on`, `drag_right,on`, `drag_top,on`, `drag_bottom,on`
+When to start an animation when the cursor enters `drag_XXXX_outline` while
+dragging a tab.
+### Signals `drag_left,off`, `drag_right,off`, `drag_top,off`, `drag_bottom,off`
+When to stop an animation started by the related `*,on` signals.
+### Signals `drag_over_tabs,on` and `drag_over_tabs,off`
+When the mouse, while dragging a tab, enters or leaves the tab region.
+### Signals `grouped,on` and `grouped,off`
+When input is broadcast to multiple terminals.
+
+## Signal emitted
+### Signal `tab,hdrag`
+To notify that the current tab is being dragged.
+### Signal `tab,drag,stop`
+To notify that the current tab is no longer being dragged.
+### Signal `tab,drag,move`
+To notify that the current tab is being dragged outside of other tabs.
+
+
+
+
+# Group `terminology/core`
+
+## Swallowed parts
+
+### Part `terminology.fade`
+
+Part used to fade the background, either with a solid color or the screen
+background when the `translucent` option is set.
+
+### Part `terminology.background`
+
+Actual background.
+It reacts to the following signals based on the media to play in background:
+* `media,off`
+* `media,image`
+* `media,scale`
+* `media,edje`
+* `media,movie`
+
+### Part `terminology.tabregion`
+Here is swalloed a fully transparent rectangle to move down the textgrid.
+
+### Part `terminology.content`
+Where actual text grid goes.
+
+## Signals received
+### Signals `tabbar,off` and `tabbar,on`
+Whether to display a tab bar. Default is off.
+### Signals `tab_btn,off` and `tab_btn,on`
+Whether to display a tab button to easily navigate through tabs. Default is off.
+### Signals `hdrag,on` and `hdrag,off`
+Whether to restrict (default) horizontal tab drag
+
+## Signal emitted
+### Signals `tab,drag` and `tab,drag,stop`
+To notify that the current tab is being dragged.
+### Signals `tab,mouse,down`
+Whenever the left mouse button is pressed on a tab.
+
+
+
+# Group `terminology/about`
+## Text parts
+### Part `terminology.text`
+The text of the __About__ message.
+
+
+
+# Group `terminology.tabbar_back`
+An inactive tab item
+## Text parts
+### Part `terminology.title`
+Title of the tab.
+
+## Signal emitted
+### Signal `tab,activate`
+When clicked on it, to notify that the user wants to go to that tab.
+
+## Signals received
+### Signal `bell`
+To mark the tab as having missed a bell.
+### Signal `bell,off`
+To unmark the tab as having missed a bell.
+### Signals `grouped,on` and `grouped,off`
+When input is broadcast to multiple terminals.
+
+
+
+# Group `terminology/keybinding`
+__TODO__
+
+
+
+# Group `terminology/miniview`
+__TODO__
+
+
+
+# Group `terminology/fontpreview`
+__TODO__
+
+
+
+# Group `terminology/selection`
+An object used when selecting text.
+
+## Parts
+
+### Parts `terminology.top_left` and `terminology.bottom_right`
+Swallow parts used to communicate via min/max size the size of the top and
+bottom lines.
+
+
+# Group `terminology/cursor`
+__TODO__
+
+
+
+# Group `terminology/cursor_bar`
+__TODO__
+
+
+
+# Group `terminology/cursor_underline`
+__TODO__
+
+
+
+# Group `terminology/sel/base`
+__TODO__
+
+
+
+# Group `terminology/sel/item`
+__TODO__
+
+
+
+# Group `terminology/link`
+An object overlayd on text that is a link.
+
+
+
+# Group `terminology/mediabusy`
+__TODO__
+
+
+
+# Group `terminology/mediactrl`
+__TODO__
+
+
+
+# Group `terminology/tab_drag_thumb`
+A thumbnail of a tab being dragged.
+
+## Swallowed part
+### Part `terminology.content`
+Here is swallowed an object of group `terminology.background`.
+
+## Text part
+### Part `terminology.title`
+Title of the tab.
+
+## Signal received
+### Signal `bell`
+To mark the tab as having missed a bell.
+
+
+
+# Group `terminology/colorscheme_preview`
+A group to preview a colorscheme. Used in the Colors panel in the settings.
+
+## Swallowed part
+### Part `terminology.content`
+Where a textgrid showing off a color scheme is displayed.
+
+
+
+# Group `terminology/color_preview`
+A group to preview a color in a tooltip. The color is defined by the color
+class `color_preview`.
+
+## Text part
+### Part `name`
+Name of the color being previewed

autogen.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-rm -rf build
-meson $@ . build
-meson configure build

data/colorschemes/Belafonte Day.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Belafonte Day
+author = Jan T. Sott
+website = https://github.com/idleberg/Zissou-iTerm2
+license = CC-BY-SA-4.0
+
+[Colors]
+bg = #d5ccba
+main = #964700
+hl = #332211
+end_sel = #bf5b00
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #45373c
+black = #20111b
+red = #be100e
+green = #858162
+yellow = #eaa549
+blue = #426a79
+magenta = #97522c
+cyan = #989a9c
+white = #968c83
+inverse_fg = #d5ccba
+inverse_bg = #45373c
+
+[Bright]
+def = #45373c
+black = #5e5252
+red = #be100e
+green = #858162
+yellow = #eaa549
+blue = #426a79
+magenta = #97522c
+cyan = #989a9c
+white = #d5ccba
+inverse_fg = #d5ccba
+inverse_bg = #45373c
+
+[Faint]
+def = #695c5b
+black = #4d3f42
+red = #c33f39
+green = #999378
+yellow = #e4ae65
+blue = #668289
+magenta = #a6704f
+cyan = #a7a6a3
+white = #a59c90
+inverse_fg = #d5ccba
+inverse_bg = #695c5b
+
+[BrightFaint]
+def = #695c5b
+black = #7b706c
+red = #c33f39
+green = #999378
+yellow = #e4ae65
+blue = #668289
+magenta = #a6704f
+cyan = #a7a6a3
+white = #d5ccba
+inverse_fg = #d5ccba
+inverse_bg = #695c5b
+

data/colorschemes/Belafonte Night.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Belafonte Night
+author = Jan T. Sott
+website = https://github.com/idleberg/Zissou-iTerm2
+license = CC-BY-SA-4.0
+
+[Colors]
+bg = #20111b
+main = #e26b00
+hl = #ffffff
+end_sel = #bf5b00
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #968c83
+black = #20111b
+red = #be100e
+green = #858162
+yellow = #eaa549
+blue = #426a79
+magenta = #97522c
+cyan = #989a9c
+white = #968c83
+inverse_fg = #20111b
+inverse_bg = #968c83
+
+[Bright]
+def = #968c83
+black = #5e5252
+red = #be100e
+green = #858162
+yellow = #eaa549
+blue = #426a79
+magenta = #97522c
+cyan = #989a9c
+white = #d5ccba
+inverse_fg = #20111b
+inverse_bg = #968c83
+
+[Faint]
+def = #786d69
+black = #20111b
+red = #961011
+green = #6b6550
+yellow = #b7803d
+blue = #395361
+magenta = #794127
+cyan = #7a777b
+white = #786d69
+inverse_fg = #20111b
+inverse_bg = #786d69
+
+[BrightFaint]
+def = #786d69
+black = #4e4144
+red = #961011
+green = #6b6550
+yellow = #b7803d
+blue = #395361
+magenta = #794127
+cyan = #7a777b
+white = #a79d92
+inverse_fg = #20111b
+inverse_bg = #786d69
+

data/colorschemes/Black.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Black
+author = Terminology's developers
+website = https://www.enlightenment.org/about-terminology
+license = BSD-2-Clause
+
+[Colors]
+bg = #000000
+main = #dcdcdc
+hl = #ffffff
+end_sel = #ffffff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #aaaaaa
+black = #000000
+red = #ff6565
+green = #93d44f
+yellow = #eab93d
+blue = #204a87
+magenta = #ce5c00
+cyan = #89b6e2
+white = #cccccc
+inverse_bg = #aaaaaa
+inverse_fg = #000000
+
+[Bright]
+def = #cccccc
+black = #555753
+red = #ff8d8d
+green = #c8e7a8
+yellow = #ffc123
+blue = #3465a4
+magenta = #f57900
+cyan = #46a400
+white = #ffffff
+inverse_bg = #cccccc
+inverse_fg = #000000
+
+[Faint]
+def = #7f7f7f
+black = #000000
+red = #bf4b4b
+green = #6e9f3b
+yellow = #af8a2d
+blue = #183765
+magenta = #9a4500
+cyan = #6688a9
+white = #999999
+inverse_fg = #000000
+inverse_bg = #7f7f7f
+
+[BrightFaint]
+def = #999999
+black = #3f413e
+red = #bf6969
+green = #96ad7e
+yellow = #bf901a
+blue = #274b7b
+magenta = #b75a00
+cyan = #347b00
+white = #bfbfbf
+inverse_fg = #000000
+inverse_bg = #999999
+

data/colorschemes/Cobalt2.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Cobalt2
+author = wesbos
+website = https://github.com/wesbos/cobalt2-vscode
+license = MIT
+
+[Colors]
+bg = #122637
+main = #f0cb09
+hl = #ffffff
+end_sel = #f0cb09
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #ffffff
+black = #000000
+red = #ff0000
+green = #37dd21
+yellow = #fee409
+blue = #1460d2
+magenta = #ff005d
+cyan = #00bbbb
+white = #bbbbbb
+inverse_fg = #122637
+inverse_bg = #ffffff
+
+[Bright]
+def = #ffffff
+black = #555555
+red = #f40d17
+green = #3bcf1d
+yellow = #ecc809
+blue = #5555ff
+magenta = #ff55ff
+cyan = #6ae3f9
+white = #ffffff
+inverse_fg = #122637
+inverse_bg = #ffffff
+
+[Faint]
+def = #c3c8cd
+black = #04090d
+red = #c3090d
+green = #2daf26
+yellow = #c3b414
+blue = #1351ab
+magenta = #c30953
+cyan = #04959a
+white = #90959a
+inverse_fg = #122637
+inverse_bg = #c3c8cd
+
+[BrightFaint]
+def = #c3c8cd
+black = #44494d
+red = #bb131f
+green = #30a423
+yellow = #b59f14
+blue = #4449cd
+magenta = #c349cd
+cyan = #54b3c8
+white = #c3c8cd
+inverse_fg = #122637
+inverse_bg = #c3c8cd
+

data/colorschemes/Default.ini

@@ -0,0 +1,76 @@
+# The content is hard coded in src/bin/colors.c
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Default
+author = Terminology's developers,
+website = https://www.enlightenment.org/about-terminology
+license = BSD-2-Clause
+
+[Colors]
+bg = #202020
+main = #3599ff
+hl = #ffffff
+end_sel = #3599ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #aaaaaa
+black = #000000
+red = #cc3333
+green = #33cc33
+yellow = #cc8833
+blue = #3333cc
+magenta = #cc33cc
+cyan = #33cccc
+white = #cccccc
+inverse_fg = #222222
+inverse_bg = #aaaaaa
+
+[Bright]
+def = #eeeeee
+black = #666666
+red = #ff6666
+green = #66ff66
+yellow = #ffff66
+blue = #6666ff
+magenta = #ff66ff
+cyan = #66ffff
+white = #ffffff
+inverse_fg = #111111
+inverse_bg = #eeeeee
+
+[Faint]
+def = #878787
+black = #080808
+red = #980808
+green = #089808
+yellow = #989808
+blue = #080898
+magenta = #980898
+cyan = #089898
+white = #989898
+inverse_fg = #212121
+inverse_bg = #878787
+
+[BrightFaint]
+def = #bababa
+black = #545454
+red = #c75454
+green = #54c754
+yellow = #c7c754
+blue = #5454c7
+magenta = #c754c7
+cyan = #54c7c7
+white = #c7c7c7
+inverse_fg = #141414
+inverse_bg = #bababa
+

data/colorschemes/Dracula.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Dracula
+author = Zeno Rocha
+website = https://draculatheme.com/
+license = MIT
+
+[Colors]
+bg = #282A36
+main = #bd93f9
+hl = #ffffff
+end_sel = #bd93f9
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #f8f8f2
+black = #21222c
+red = #ff5555
+green = #50fa7b
+yellow = #f1fa8c
+blue = #bd93f9
+magenta = #ff79c6
+cyan = #8be9fd
+white = #f8f8f2
+inverse_fg = #282a36
+inverse_bg = #f8f8f2
+
+[Bright]
+def = #ffffff
+black = #6272a4
+red = #ff6e6e
+green = #69ff94
+yellow = #ffffa5
+blue = #d6acff
+magenta = #ff92df
+cyan = #a4ffff
+white = #ffffff
+inverse_fg = #44475a
+inverse_bg = #ffffff
+
+[Faint]
+def = #c4c4c3
+black = #22242e
+red = #c94a4d
+green = #46c669
+yellow = #bec676
+blue = #9778c8
+magenta = #c965a2
+cyan = #72b9cb
+white = #c4c4c3
+inverse_fg = #282a36
+inverse_bg = #c4c4c3
+
+[BrightFaint]
+def = #c9c9cc
+black = #536088
+red = #c95d60
+green = #58c97c
+yellow = #c9c989
+blue = #aa8bcc
+magenta = #c978b4
+cyan = #85c9cc
+white = #c9c9cc
+inverse_fg = #3d3f51
+inverse_bg = #c9c9cc
+

data/colorschemes/Fahrenheit.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Fahrenheit
+author = Jonas Carpay
+website = https://github.com/mbadolato/iTerm2-Color-Schemes#fahrenheit
+license = MIT
+
+[Colors]
+bg = #000000
+main = #4d729f
+hl = #ffffff
+end_sel = #3599ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #ffffcd
+black = #1c1c1c
+red = #cc9f74
+green = #9e744c
+yellow = #fdcf74
+blue = #720001
+magenta = #734b4c
+cyan = #979797
+white = #ffffcd
+inverse_fg = #000000
+inverse_bg = #ffffcd
+
+[Bright]
+def = #ffffcd
+black = #000000
+red = #fdce9f
+green = #cb724c
+yellow = #fd9f4d
+blue = #cb4905
+magenta = #4d729f
+cyan = #fecf4d
+white = #ffffff
+inverse_fg = #000000
+inverse_bg = #ffffcd
+
+[Faint]
+def = #bfbf99
+black = #151515
+red = #997757
+green = #765739
+yellow = #bd9b57
+blue = #550000
+magenta = #563839
+cyan = #717171
+white = #bfbf99
+inverse_fg = #000000
+inverse_bg = #bfbf99
+
+[BrightFaint]
+def = #bfbf99
+black = #000000
+red = #bd9a77
+green = #985539
+yellow = #bd7739
+blue = #983603
+magenta = #395577
+cyan = #be9b39
+white = #bfbfbf
+inverse_fg = #000000
+inverse_bg = #bfbf99
+

data/colorschemes/Fir Dark.ini

@@ -0,0 +1,78 @@
+;; Based on Default.ini, but with green-ish main color and black-green bg,
+;;  and some brighter colors (red, blue, etc) to be more distinctive against that background.
+;; New brighter colors are produced using e.g.: gtk-color-calc 'shade(#9696e0, 1.1)'
+;; Faint colors simply have alpha=c8 instead of being blended with full opacity, so can be updated easily here.
+
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Fir Dark
+author = Terminology developers, mk-fg
+license = BSD-2-Clause
+
+[Colors]
+bg = #001800
+main = #3599ff
+hl = #ffffff
+end_sel = #3599ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #79fe6c
+black = #000000
+red = #d31200
+green = #1ad91a
+yellow = #c0c000
+blue = #9696e0
+magenta = #c000c0
+cyan = #00c0c0
+white = #c0c0c0
+inverse_fg = #222222
+inverse_bg = #aaaaaa
+
+[Bright]
+def = #baffb3
+black = #404040
+red = #ff6666
+green = #00ff00
+yellow = #ffff66
+blue = #b0b0eb
+magenta = #ff66ff
+cyan = #66ffff
+white = #ffffff
+inverse_fg = #111111
+inverse_bg = #eeeeee
+
+[Faint]
+def = #79fe6cc8
+black = #000000c8
+red = #d31200c8
+green = #1ad91ac8
+yellow = #c0c000c8
+blue = #9696e0c8
+magenta = #c000c0c8
+cyan = #00c0c0c8
+white = #c0c0c0c8
+inverse_fg = #222222c8
+inverse_bg = #aaaaaac8
+
+[BrightFaint]
+def = #baffb3c8
+black = #404040c8
+red = #ff6666c8
+green = #00ff00c8
+yellow = #ffff66c8
+blue = #b0b0ebc8
+magenta = #ff66ffc8
+cyan = #66ffffc8
+white = #ffffffc8
+inverse_fg = #111111c8
+inverse_bg = #eeeeeec8

data/colorschemes/GruvBox Material Dark.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = GruvBox Material Dark
+author = Sainnhe Park
+website = https://github.com/sainnhe/gruvbox-material
+license = MIT
+
+[Colors]
+bg = #32302f
+main = #ea6962
+hl = #d4be98
+end_sel = #472322
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #d4bd98
+
+[Normal]
+def = #ddc7a1
+black = #252423
+red = #ea6962
+green = #a9b665
+yellow = #d8a657
+blue = #7daea3
+magenta = #d3869b
+cyan = #89b482
+white = #deddda
+inverse_bg = #d4be98
+inverse_fg = #252423
+
+[Bright]
+def = #f2c25e
+black = #474543
+red = #ea3f36
+green = #a0b62e
+yellow = #d88d16
+blue = #46ae97
+magenta = #d3476d
+cyan = #57b448
+white = #decd9b
+inverse_bg = #d4a759
+inverse_fg = #25201c
+
+[Faint]
+def = #b2a184
+black = #282726
+red = #bc5a55
+green = #8b9457
+yellow = #ae884d
+blue = #6a8e86
+magenta = #aa7080
+cyan = #73936d
+white = #b3b1af
+inverse_fg = #282726
+inverse_bg = #ab9a7d
+
+[BrightFaint]
+def = #c29d52
+black = #413f3e
+red = #bc3b34
+green = #84942e
+yellow = #ae751c
+blue = #418e7d
+magenta = #aa415d
+cyan = #4d9341
+white = #b3a580
+inverse_fg = #282420
+inverse_bg = #ab894e
+

data/colorschemes/Material Dark.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Material Dark
+author = Chris Jones
+website = https://github.com/mitoca?tab=repositories
+license = MIT
+
+[Colors]
+bg = #263238
+main = #90a4ae
+hl = #ffffff
+end_sel = #90a4ae
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #eceff1
+black = #364349
+red = #eb5f59
+green = #8eedb3
+yellow = #f8d85e
+blue = #68c1f9
+magenta = #eb5181
+cyan = #8ff8db
+white = #fefefe
+inverse_fg = #0b0d0f
+inverse_bg = #c2cfd6
+
+[Bright]
+def = #eceff1
+black = #8a9ea8
+red = #ef9084
+green = #c5f4cd
+yellow = #fae58d
+blue = #94d5fa
+magenta = #ee86aa
+cyan = #bafaeb
+white = #fefefe
+inverse_fg = #0b0d0f
+inverse_bg = #c2cfd6
+
+[Faint]
+def = #babfc2
+black = #323e44
+red = #b95350
+green = #74be94
+yellow = #c3ae54
+blue = #579dc8
+magenta = #b9496e
+cyan = #74c6b2
+white = #c8cbcc
+inverse_fg = #111619
+inverse_bg = #9ba7ae
+
+[BrightFaint]
+def = #babfc2
+black = #71838c
+red = #bc7871
+green = #9dc3a7
+yellow = #c5b877
+blue = #78acc9
+magenta = #bc718d
+cyan = #95c8be
+white = #c8cbcc
+inverse_fg = #111619
+inverse_bg = #9ba7ae
+

data/colorschemes/Material.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Material
+author = Terminology's developers,
+website = https://www.enlightenment.org/about-terminology
+license = BSD-2-Clause
+
+[Colors]
+bg = #3d3d3d
+main = #b7141e
+hl = #ffffff
+end_sel = #ff3300
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #e4e4e4
+black = #212121
+red = #b7141e
+green = #457b23
+yellow = #f5971d
+blue = #1565c0
+magenta = #6a1e9a
+cyan = #00838f
+white = #d8d8d8
+inverse_fg = #303030
+inverse_bg = #e4e4e4
+
+[Bright]
+def = #e4e4e4
+black = #525252
+red = #e83a3f
+green = #7aba39
+yellow = #fee92e
+blue = #4cb2ff
+magenta = #be86e3
+cyan = #2dced0
+white = #eeeeee
+inverse_fg = #3b3b3a
+inverse_bg = #e4e4e4
+
+[Faint]
+def = #bababa
+black = #282828
+red = #981e25
+green = #436b29
+yellow = #c78025
+blue = #1f5b9f
+magenta = #5e2582
+cyan = #0f717a
+white = #b1b1b1
+inverse_fg = #333333
+inverse_bg = #bababa
+
+[BrightFaint]
+def = #bababa
+black = #4c4c4c
+red = #bd3a3e
+green = #6a9a3a
+yellow = #cdbe31
+blue = #4894ce
+magenta = #9d73b9
+cyan = #31a9ab
+white = #c1c1c1
+inverse_fg = #3b3b3a
+inverse_bg = #bababa
+

data/colorschemes/Mild.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Mild
+author = Terminology's developers
+website = https://www.enlightenment.org/about-terminology
+license = BSD-2-Clause
+
+[Colors]
+bg = #303030
+main = #dcdcdc
+hl = #ffffff
+end_sel = #ffffff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #aaaaaa
+black = #000000
+red = #ff6565
+green = #93d44f
+yellow = #eab93d
+blue = #204a87
+magenta = #ce5c00
+cyan = #89b6e2
+white = #cccccc
+inverse_bg = #aaaaaa
+inverse_fg = #303030
+
+[Bright]
+def = #cccccc
+black = #555753
+red = #ff8d8d
+green = #c8e7a8
+yellow = #ffc123
+blue = #3465a4
+magenta = #f57900
+cyan = #46a400
+white = #ffffff
+inverse_bg = #cccccc
+inverse_fg = #303030
+
+[Faint]
+def = #8b8b8b
+black = #0c0c0c
+red = #cb5757
+green = #7aab47
+yellow = #bb9639
+blue = #244371
+magenta = #a6510c
+cyan = #7294b5
+white = #a5a5a5
+inverse_fg = #303030
+inverse_bg = #8b8b8b
+
+[BrightFaint]
+def = #a5a5a5
+black = #4b4d4a
+red = #cb7575
+green = #a2b98a
+yellow = #cb9c26
+blue = #335787
+magenta = #c3660c
+cyan = #40870c
+white = #cbcbcb
+inverse_fg = #303030
+inverse_bg = #a5a5a5

data/colorschemes/Mustang.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Mustang
+author = Henrique C. Alves
+website = https://www.deviantart.com/hcalves/art/Mustang-Vim-Colorscheme-98974484
+license = MIT
+
+[Colors]
+bg = #1a1a1a
+main = #3399ff
+hl = #ffffff
+end_sel = #3599ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #aaaaaa
+black = #000000
+red = #ff6565
+green = #93d44f
+yellow = #eab93d
+blue = #204a87
+magenta = #ce5c00
+cyan = #89b6e2
+white = #cccccc
+inverse_bg = #aaaaaa
+inverse_fg = #1a1a1a
+
+[Bright]
+def = #ffffff
+black = #555753
+red = #ff8d8d
+green = #c8e7a8
+yellow = #ffc123
+blue = #3465a4
+magenta = #f57900
+cyan = #46a400
+white = #ffffff
+inverse_bg = #ffffff
+inverse_fg = #1a1a1a
+
+[Faint]
+def = #868686
+black = #060606
+red = #c55252
+green = #74a541
+yellow = #b69134
+blue = #1e3e6b
+magenta = #a14b06
+cyan = #6d8fb0
+white = #9f9f9f
+inverse_fg = #1a1a1a
+inverse_bg = #868686
+
+[BrightFaint]
+def = #c5c5c5
+black = #464744
+red = #c57070
+green = #9cb384
+yellow = #c59720
+blue = #2d5281
+magenta = #be6106
+cyan = #3b8106
+white = #c5c5c5
+inverse_fg = #1a1a1a
+inverse_bg = #c5c5c5

data/colorschemes/Nord.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Nord
+author = Arctic Ice Studio
+website = https://git.io/nord
+license = MIT
+
+[Colors]
+bg = #2e3440
+main = #88c0d0
+hl = #ffffff
+end_sel = #88c0d0
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #d8dee9
+black = #3b4252
+red = #bf616a
+green = #a3be8c
+yellow = #ebcb8b
+blue = #81a1c1
+magenta = #b48ead
+cyan = #88c0d0
+white = #e5e9f0
+inverse_fg = #2e3440
+inverse_bg = #d8dee9
+
+[Bright]
+def = #eceff4
+black = #4c566a
+red = #bf616a
+green = #a3be8c
+yellow = #ebcb8b
+blue = #81a1c1
+magenta = #b48ead
+cyan = #8fbcbb
+white = #eceff4
+inverse_fg = #2e3440
+inverse_bg = #eceff4
+
+[Faint]
+def = #adb3be
+black = #373e4d
+red = #9a555f
+green = #859b79
+yellow = #bba578
+blue = #6c85a0
+magenta = #927791
+cyan = #719dac
+white = #b7bbc4
+inverse_fg = #2e3440
+inverse_bg = #adb3be
+
+[BrightFaint]
+def = #bcc0c7
+black = #444d5f
+red = #9a555f
+green = #859b79
+yellow = #bba578
+blue = #6c85a0
+magenta = #927791
+cyan = #769a9c
+white = #bcc0c7
+inverse_fg = #2e3440
+inverse_bg = #bcc0c7

data/colorschemes/Ocean Dark.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Ocean Dark
+author = Chris Kempson
+website = https://github.com/chriskempson/base16-builder/blob/master/schemes/ocean.yml
+license = MIT
+
+[Colors]
+bg = #2b303b
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #c0c5ce
+black = #2b303b
+red = #bf616a
+green = #a3be8c
+yellow = #ebcb8b
+blue = #8ba1b3
+magenta = #b48ead
+cyan = #96b5b4
+white = #c0c5ce
+inverse_fg = #2b303b
+inverse_bg = #c0c5ce
+
+[Bright]
+def = #eff1f5
+black = #65737e
+red = #d08770
+green = #343d46
+yellow = #4f5b66
+blue = #a7adba
+magenta = #dfe1e8
+cyan = #ab7967
+white = #eff1f5
+inverse_fg = #2b303b
+inverse_bg = #eff1f5
+
+[Faint]
+def = #9a9fa9
+black = #2b303b
+red = #9a545e
+green = #859a77
+yellow = #bba477
+blue = #738495
+magenta = #917690
+cyan = #7b9395
+white = #9a9fa9
+inverse_fg = #2b303b
+inverse_bg = #9a9fa9
+
+[BrightFaint]
+def = #bec0c6
+black = #56626d
+red = #a67162
+green = #313943
+yellow = #46505b
+blue = #888d9a
+magenta = #b2b4bc
+cyan = #8b665c
+white = #bec0c6
+inverse_fg = #2b303b
+inverse_bg = #bec0c6

data/colorschemes/One Dark.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = One Dark
+author = Mark Skelton
+website = https://github.com/one-dark/iterm-one-dark-theme
+license = MIT
+
+[Colors]
+bg = #21252b
+main = #abb2bf
+hl = #ffffff
+end_sel = #abb2bf
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #abb2bf
+black = #21252b
+red = #e06c75
+green = #98c379
+yellow = #e5c07b
+blue = #61afef
+magenta = #c678dd
+cyan = #56b6c2
+white = #abb2bf
+inverse_fg = #21252b
+inverse_bg = #abb2bf
+
+[Bright]
+def = #abb2bf
+black = #767676
+red = #e06c75
+green = #98c379
+yellow = #e5c07b
+blue = #61afef
+magenta = #c678dd
+cyan = #56b6c2
+white = #abb2bf
+inverse_fg = #21252b
+inverse_bg = #abb2bf
+
+[Faint]
+def = #888e9a
+black = #21252b
+red = #b05a62
+green = #7a9b65
+yellow = #b49967
+blue = #518cbe
+magenta = #9c63b0
+cyan = #48919c
+white = #888e9a
+inverse_fg = #21252b
+inverse_bg = #888e9a
+
+[BrightFaint]
+def = #888e9a
+black = #606163
+red = #b05a62
+green = #7a9b65
+yellow = #b49967
+blue = #518cbe
+magenta = #9c63b0
+cyan = #48919c
+white = #888e9a
+inverse_fg = #21252b
+inverse_bg = #888e9a
+

data/colorschemes/PaleNight.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = PaleNight
+author = Jonathan Speek
+website = https://github.com/JonathanSpeek/palenight-iterm2
+license = MIT
+
+[Colors]
+bg = #292d3e
+main = #ffcc00
+hl = #ffffff
+end_sel = #ffcc00
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #959dcb
+black = #292d3e
+red = #f07178
+green = #c3e88d
+yellow = #ffcb6b
+blue = #82aaff
+magenta = #c792ea
+cyan = #89ddff
+white = #d0d0d0
+inverse_fg = #292d3e
+inverse_bg = #959dcb
+
+[Bright]
+def = #959dcb
+black = #434758
+red = #ff8b92
+green = #ddffa7
+yellow = #ffe585
+blue = #9cc4ff
+magenta = #e1acff
+cyan = #a3f7ff
+white = #fefefe
+inverse_fg = #292d3e
+inverse_bg = #959dcb
+
+[Faint]
+def = #7a81a7
+black = #292d3e
+red = #be6069
+green = #9cb979
+yellow = #c9a35f
+blue = #6b8ace
+magenta = #9f78bf
+cyan = #71b1ce
+white = #a6a7ab
+inverse_fg = #292d3e
+inverse_bg = #7a81a7
+
+[BrightFaint]
+def = #7a81a7
+black = #3c4051
+red = #c9737d
+green = #b0ca8c
+yellow = #c9b773
+blue = #7f9ece
+magenta = #b38cce
+cyan = #84c4ce
+white = #c8c9ce
+inverse_fg = #292d3e
+inverse_bg = #7a81a7
+

data/colorschemes/PaperColor.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = PaperColor
+author = Nikyle Nguyen
+website = https://github.com/NLKNguyen/papercolor-theme
+license = MIT
+
+[Colors]
+bg = #eeeeee
+main = #b7141e
+hl = #222222
+end_sel = #88003d
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #444444
+black = #f2f2f2
+red = #c62828
+green = #558b2e
+yellow = #ff8f01
+blue = #1565c0
+magenta = #6a1e9a
+cyan = #00838f
+white = #2c2c2c
+inverse_bg = #444444
+inverse_fg = #eeeeee
+
+[Bright]
+def = #333333
+black = #fbfbdb
+red = #e17e85
+green = #61ba86
+yellow = #ffb68e
+blue = #4cb2ff
+magenta = #be86e3
+cyan = #2dced0
+white = #546386
+inverse_bg = #333333
+inverse_fg = #eeeeee
+
+[Faint]
+def = #6e6e6e
+black = #f1f1f1
+red = #d05959
+green = #7ba35e
+yellow = #faa63c
+blue = #4b87cb
+magenta = #8b52af
+cyan = #3b9da6
+white = #5c5c5c
+inverse_fg = #eeeeee
+inverse_bg = #6e6e6e
+
+[BrightFaint]
+def = #616161
+black = #f7f7df
+red = #e49a9f
+green = #84c7a0
+yellow = #fac4a6
+blue = #74c1fa
+magenta = #caa0e5
+cyan = #5dd6d7
+white = #7a85a0
+inverse_fg = #eeeeee
+inverse_bg = #616161

data/colorschemes/Selenized Black.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Selenized Black
+author = Jan Warchol
+website = https://github.com/jan-warchol/selenized
+license = MIT
+
+[Colors]
+bg = #181818
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #b9b9b9
+black = #252525
+red = #ed4a46
+green = #70b433
+yellow = #dbb32d
+blue = #368aeb
+magenta = #eb6eb7
+cyan = #3fc5b7
+white = #777777
+inverse_bg = #b9b9b9
+inverse_fg = #181818
+
+[Bright]
+def = #dedede
+black = #3b3b3b
+red = #ff5e56
+green = #83c746
+yellow = #efc541
+blue = #4f9cfe
+magenta = #ff81ca
+cyan = #56d8c9
+white = #dedede
+inverse_bg = #dedede
+inverse_fg = #252525
+
+[Faint]
+def = #909090
+black = #212121
+red = #b73d3a
+green = #5a8d2c
+yellow = #aa8c27
+blue = #2e6db6
+magenta = #b6588f
+cyan = #35998f
+white = #5f5f5f
+inverse_fg = #181818
+inverse_bg = #909090
+
+[BrightFaint]
+def = #acacac
+black = #323232
+red = #c54c46
+green = #689b3a
+yellow = #b99936
+blue = #417bc4
+magenta = #c5669d
+cyan = #46a89c
+white = #acacac
+inverse_fg = #212121
+inverse_bg = #acacac
+

data/colorschemes/Selenized Dark.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Selenized Dark
+author = Jan Warchol
+website = https://github.com/jan-warchol/selenized
+license = MIT
+
+[Colors]
+bg = #103c48
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #adbcbc
+black = #184956
+red = #fa5750
+green = #75b938
+yellow = #dbb32d
+blue = #4695f7
+magenta = #f275be
+cyan = #41c7b9
+white = #72898f
+inverse_bg = #adbcbc
+inverse_fg = #103c48
+
+[Bright]
+def = #cad8d9
+black = #2d5b69
+red = #ff665c
+green = #84c747
+yellow = #ebc13d
+blue = #58a3ff
+magenta = #ff84cd
+cyan = #53d6c7
+white = #cad8d9
+inverse_bg = #cad8d9
+inverse_fg = #184956
+
+[Faint]
+def = #859c9f
+black = #164552
+red = #bf504e
+green = #5b993c
+yellow = #a89533
+blue = #387ecb
+magenta = #b966a0
+cyan = #34a49c
+white = #59757d
+inverse_fg = #103c48
+inverse_bg = #859c9f
+
+[BrightFaint]
+def = #9bb1b4
+black = #255360
+red = #c35b57
+green = #67a447
+yellow = #b49f3f
+blue = #4689d1
+magenta = #c372ab
+cyan = #42afa7
+white = #9bb1b4
+inverse_fg = #164552
+inverse_bg = #9bb1b4
+

data/colorschemes/Selenized Light.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Selenized Light
+author = Jan Warchol
+website = https://github.com/jan-warchol/selenized
+license = MIT
+
+[Colors]
+bg = #fbf3db
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #53676d
+black = #ece3cc
+red = #d2212d
+green = #489100
+yellow = #ad8900
+blue = #0072d4
+magenta = #ca4898
+cyan = #009c8f
+white = #909995
+inverse_bg = #53676d
+inverse_fg = #fdf3db
+
+[Bright]
+def = #3a4d53
+black = #d5cdb6
+red = #cc1729
+green = #428b00
+yellow = #a78300
+blue = #006dce
+magenta = #c44392
+cyan = #00978a
+white = #3a4d53
+inverse_bg = #3a4d53
+inverse_fg = #ece3cc
+
+[Faint]
+def = #7d8a88
+black = #efe7cf
+red = #dc5558
+green = #74a936
+yellow = #c0a336
+blue = #3e92d5
+magenta = #d672a8
+cyan = #3eb1a2
+white = #aaafa6
+inverse_fg = #fcf3db
+inverse_bg = #7d8a88
+
+[BrightFaint]
+def = #6a7675
+black = #ded6bf
+red = #d74e55
+green = #70a536
+yellow = #bc9f36
+blue = #3e8ed1
+magenta = #d16fa4
+cyan = #3eae9e
+white = #6a7675
+inverse_fg = #efe7cf
+inverse_bg = #6a7675
+

data/colorschemes/Selenized White.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Selenized White
+author = Jan Warchol
+website = https://github.com/jan-warchol/selenized
+license = MIT
+
+[Colors]
+bg = #ffffff
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #474747
+black = #ebebeb
+red = #d6000c
+green = #1d9700
+yellow = #c49700
+blue = #0064e4
+magenta = #dd0f9d
+cyan = #00ad9c
+white = #878787
+inverse_bg = #474747
+inverse_fg = #ffffff
+
+[Bright]
+def = #ebebeb
+black = #cdcdcd
+red = #bf0000
+green = #008400
+yellow = #af8500
+blue = #0054cf
+magenta = #c7008b
+cyan = #009a8a
+white = #282828
+inverse_bg = #ebebeb
+inverse_fg = #282828
+
+[Faint]
+def = #757575
+black = #f0f0f0
+red = #e03f48
+green = #55b13f
+yellow = #d2b13f
+blue = #3f8aea
+magenta = #e54bb5
+cyan = #3fc1b4
+white = #a5a5a5
+inverse_fg = #ffffff
+inverse_bg = #757575
+
+[BrightFaint]
+def = #f0f0f0
+black = #d9d9d9
+red = #cf3f3f
+green = #3fa23f
+yellow = #c3a33f
+blue = #3f7edb
+magenta = #d53fa8
+cyan = #3fb3a7
+white = #5d5d5d
+inverse_fg = #5d5d5d
+inverse_bg = #f0f0f0
+

data/colorschemes/Smyck.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Smyck
+author = John-Paul Bader (hukl)
+website = http://color.smyck.ork/
+license = MIT
+
+[Colors]
+bg = #000000
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #aaaaaa
+black = #000000
+red = #c75646
+green = #8eb33b
+yellow = #d0b03c
+blue = #4e90a7
+magenta = #c8a0d1
+cyan = #218693
+white = #b0b0b0
+inverse_fg = #000000
+inverse_bg = #aaaaaa
+
+[Bright]
+def = #cccccc
+black = #5d5d5d
+red = #e09690
+green = #cdee69
+yellow = #ffe377
+blue = #9cd9f0
+magenta = #fbb1f9
+cyan = #77dfd8
+white = #f7f7f7
+inverse_fg = #000000
+inverse_bg = #cccccc
+
+[Faint]
+def = #7f7f7f
+black = #000000
+red = #954034
+green = #6a862c
+yellow = #9c842d
+blue = #3a6c7d
+magenta = #96789c
+cyan = #18646e
+white = #848484
+inverse_fg = #000000
+inverse_bg = #7f7f7f
+
+[BrightFaint]
+def = #999999
+black = #454545
+red = #a8706c
+green = #99b24e
+yellow = #bfaa59
+blue = #75a2b4
+magenta = #bc84ba
+cyan = #59a7a2
+white = #b9b9b9
+inverse_fg = #000000
+inverse_bg = #999999

data/colorschemes/Soft Era.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Soft Era
+author = Audrey Moon
+website = http://soft-aesthetic.club/soft-era.html
+license = MIT
+
+[Colors]
+bg = #f7f2f2
+main = #e796b0
+hl = #222222
+end_sel = #e796b0
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #bba3a3
+black = #1c1b28
+red = #e36a85
+green = #87b8ab
+yellow = #fda2a9
+blue = #70a3dc
+magenta = #e796b0
+cyan = #a49ad7
+white = #f7f2f2
+inverse_fg = #f7f2f2
+inverse_bg = #bba3a3
+
+[Bright]
+def = #bba3a3
+black = #1c1b28
+red = #e36a85
+green = #87b8ab
+yellow = #fda2a9
+blue = #70a3dc
+magenta = #e796b0
+cyan = #a49ad7
+white = #f7f2f2
+inverse_fg = #f7f2f2
+inverse_bg = #bba3a3
+
+[Faint]
+def = #cab6b6
+black = #52505a
+red = #e88ca0
+green = #a3c6bc
+yellow = #fbb6bb
+blue = #91b6e1
+magenta = #ebadc0
+cyan = #b8b0dd
+white = #f7f2f2
+inverse_fg = #f7f2f2
+inverse_bg = #cab6b6
+
+[BrightFaint]
+def = #cab6b6
+black = #52505a
+red = #e88ca0
+green = #a3c6bc
+yellow = #fbb6bb
+blue = #91b6e1
+magenta = #ebadc0
+cyan = #b8b0dd
+white = #f7f2f2
+inverse_fg = #f7f2f2
+inverse_bg = #cab6b6
+

data/colorschemes/Solarized Light.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Solarized Light
+author = Ethan Schoonover
+website = https://ethanschoonover.com/solarized/
+license = MIT
+
+[Colors]
+bg = #fdf6e3
+main = #aa9966
+hl = #222222
+end_sel = #aa9966
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #839496
+black = #002b36
+red = #dc322f
+green = #859900
+yellow = #b58900
+blue = #268bd2
+magenta = #d33682
+cyan = #2aa198
+white = #eee8d5
+inverse_bg = #839496
+inverse_fg = #fdf6e3
+
+[Bright]
+def = #839496
+black = #073642
+red = #cb4b16
+green = #586e75
+yellow = #657b83
+blue = #839496
+magenta = #6c71c4
+cyan = #93a1a1
+white = #fdf6e3
+inverse_bg = #839496
+inverse_fg = #fdf6e3
+
+[Faint]
+def = #a1aca9
+black = #3f5d61
+red = #e4635c
+green = #a3b038
+yellow = #c7a438
+blue = #5ba5d6
+magenta = #dd669a
+cyan = #5eb6aa
+white = #f1ebd8
+inverse_fg = #fdf6e3
+inverse_bg = #a1aca9
+
+[BrightFaint]
+def = #a1aca9
+black = #44666a
+red = #d77549
+green = #819090
+yellow = #8b999b
+blue = #a1aca9
+magenta = #9092cb
+cyan = #adb6b1
+white = #fdf6e3
+inverse_fg = #fdf6e3
+inverse_bg = #a1aca9

data/colorschemes/Solarized.ini

@@ -0,0 +1,74 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Solarized
+author = Ethan Schoonover
+website = https://ethanschoonover.com/solarized/
+license = MIT
+
+[Colors]
+bg = #002b36
+main = #3399ff
+hl = #ffffff
+end_sel = #3399ff
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff33
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #839496
+black = #073642
+red = #dc322f
+green = #859900
+yellow = #b58900
+blue = #268bd2
+magenta = #d33682
+cyan = #2aa198
+white = #eee8d5
+inverse_bg = #839496
+inverse_fg = #002b36
+
+[Bright]
+def = #839496
+black = #002b36
+red = #cb4b16
+green = #586e75
+yellow = #657b83
+blue = #839496
+magenta = #6c71c4
+cyan = #93a1a1
+white = #fdf6e3
+inverse_bg = #839496
+inverse_fg = #002b36
+
+[Faint]
+def = #62797e
+black = #05333f
+red = #a53030
+green = #637d0d
+yellow = #87710d
+blue = #1c73ab
+magenta = #9e336f
+cyan = #1f837f
+white = #b2b8ad
+inverse_fg = #002b36
+inverse_bg = #62797e
+
+[BrightFaint]
+def = #62797e
+black = #002b36
+red = #98431e
+green = #425d65
+yellow = #4b676f
+blue = #62797e
+magenta = #515fa0
+cyan = #6e8386
+white = #bdc3b7
+inverse_fg = #002b36
+inverse_bg = #62797e

data/colorschemes/Tango Dark.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Tango Dark
+author = Tango developers,
+website = http://tango-project.org/
+license = Public Domain
+
+[Colors]
+bg = #2e3436
+main = #f57900
+hl = #ffffff
+end_sel = #f57900
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #d3d7cf
+black = #000000
+red = #cc0000
+green = #4e9a06
+yellow = #c4a000
+blue = #3465a4
+magenta = #75507b
+cyan = #06989a
+white = #d3d7cf
+inverse_fg = #2e3436
+inverse_bg = #d3d7cf
+
+[Bright]
+def = #eeeeec
+black = #555753
+red = #ef2929
+green = #8ae234
+yellow = #fce94f
+blue = #729fcf
+magenta = #ad7fa8
+cyan = #34e2e2
+white = #eeeeec
+inverse_fg = #2e3436
+inverse_bg = #eeeeec
+
+[Faint]
+def = #a9aea8
+black = #0b0d0d
+red = #a40d0d
+green = #468012
+yellow = #9e850d
+blue = #325888
+magenta = #634969
+cyan = #107f81
+white = #a9aea8
+inverse_fg = #2e3436
+inverse_bg = #a9aea8
+
+[BrightFaint]
+def = #bebfbe
+black = #4b4e4b
+red = #be2b2c
+green = #73b634
+yellow = #c8bb48
+blue = #6184a8
+magenta = #8d6c8b
+cyan = #32b6b7
+white = #bebfbe
+inverse_fg = #2e3436
+inverse_bg = #bebfbe
+

data/colorschemes/Tango Light.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Tango Light
+author = Tango developers,
+website = http://tango-project.org/
+license = Public Domain
+
+[Colors]
+bg = #eeeeec
+main = #ce5c00
+hl = #222222
+end_sel = #ce5c00
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #555753
+black = #d3d7cf
+red = #cc0000
+green = #4e9a06
+yellow = #c4a000
+blue = #3465a4
+magenta = #75507b
+cyan = #06989a
+white = #000000
+inverse_bg = #555753
+inverse_fg = #eeeeec
+
+[Bright]
+def = #2e3436
+black = #eeeeec
+red = #ef2929
+green = #8ae234
+yellow = #fce94f
+blue = #729fcf
+magenta = #ad7fa8
+cyan = #34e2e2
+white = #555753
+inverse_bg = #2e3436
+inverse_fg = #eeeeec
+
+[Faint]
+def = #7b7c79
+black = #d9dcd6
+red = #d43b3b
+green = #76af3f
+yellow = #ceb33b
+blue = #6287b6
+magenta = #937797
+cyan = #40adae
+white = #3b3b3b
+inverse_fg = #eeeeec
+inverse_bg = #7b7c79
+
+[BrightFaint]
+def = #5e6263
+black = #eeeeec
+red = #ee5a59
+green = #a3e562
+yellow = #f8ea76
+blue = #91b2d6
+magenta = #bd9ab9
+cyan = #62e5e4
+white = #7b7c79
+inverse_fg = #eeeeec
+inverse_bg = #5e6263
+

data/colorschemes/Tomorrow Night Burns.ini

@@ -0,0 +1,75 @@
+[Main]
+version = 1
+
+[Metadata]
+version = 1
+name = Tomorrow Night Burns
+author = Ashwin Vaswani
+website = https://github.com/mbadolato/iTerm2-Color-Schemes
+license = MIT
+
+[Colors]
+bg = #151515
+main = #a1b0b8
+hl = #ffffff
+end_sel = #ff3300
+tab_missed_1 = #ff9933
+tab_missed_2 = #ff3300
+tab_missed_3 = #ff0000
+tab_missed_over_1 = #ffff40
+tab_missed_over_2 = #ff9933
+tab_missed_over_3 = #ff0000
+tab_title_2 = #000000
+
+[Normal]
+def = #a1b0b8
+black = #252525
+red = #832e31
+green = #a63b3f
+yellow = #d2494e
+blue = #fc595f
+magenta = #df9395
+cyan = #b98486
+white = #f5f5f5
+inverse_fg = #151515
+inverse_bg = #a1b0b8
+
+[Bright]
+def = #a1b0b8
+black = #5d6f71
+red = #832e31
+green = #a63c3f
+yellow = #d2484d
+blue = #fc595f
+magenta = #df9395
+cyan = #b98486
+white = #f5f5f5
+inverse_fg = #151515
+inverse_bg = #a1b0b8
+
+[Faint]
+def = #7e898f
+black = #212121
+red = #67272a
+green = #813134
+yellow = #a23c3f
+blue = #c2484c
+magenta = #ac7375
+cyan = #906869
+white = #bdbdbd
+inverse_fg = #151515
+inverse_bg = #7e898f
+
+[BrightFaint]
+def = #7e898f
+black = #4b585a
+red = #67272a
+green = #813234
+yellow = #a23b3f
+blue = #c2484c
+magenta = #ac7375
+cyan = #906869
+white = #bdbdbd
+inverse_fg = #151515
+inverse_bg = #7e898f
+

data/colorschemes/add_color_scheme.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+set -e
+set -u
+
+COMPRESS=1
+
+EET=$1
+shift
+EET_FILE=$1
+shift
+INI=$1
+shift
+
+INI2DESC=$(dirname "$0")/ini2desc.py
+GET_NAME=$(dirname "$0")/get_name.py
+
+NAME=$($GET_NAME "$INI")
+
+# ensure output directory exists
+mkdir -p "$(dirname "$EET_FILE")"
+
+# generate desc on a temporary file
+TMP_DESC=$(mktemp "$NAME-DESC-XXXXXX")
+
+# trap to avoid creating orphan files
+trap 'rm -f "$TMP_DESC"' INT TERM HUP EXIT
+
+NAME=$($GET_NAME "$INI")
+
+[ ! -w "$EET_FILE" ] && touch "$EET_FILE"
+
+echo "Generating $EET_FILE"
+
+$INI2DESC "$INI" "$TMP_DESC"
+$EET -e "$EET_FILE" "$NAME" "$TMP_DESC" "$COMPRESS"
+
+rm "$TMP_DESC"
+
+# file successfully written, so no need to trap to remove temp file
+trap - INT TERM HUP EXIT

data/colorschemes/gen_faint.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+import argparse
+import configparser
+import sys
+from ini2desc import parse_color
+
+def blend_color(cfg, blend_factor, src, dest, color_name):
+    (r1, g1, b1, a1) = parse_color(cfg.get('Colors', 'bg'))
+    (r2, g2, b2, a2) = parse_color(cfg.get(src, color_name))
+    def blend(c1, c2, f):
+        d = c2 - c1
+        return int(c1 + d * f)
+    r = blend(r1, r2, blend_factor)
+    g = blend(g1, g2, blend_factor)
+    b = blend(b1, b2, blend_factor)
+    a = blend(a1, a2, blend_factor)
+    if a != 255:
+        cfg.set(dest, color_name,
+                '#{:02x}{:02x}{:02x}{:02x}'.format(r, g, b, a))
+    else:
+        cfg.set(dest, color_name,
+                '#{:02x}{:02x}{:02x}'.format(r, g, b))
+
+def main():
+    parser = argparse.ArgumentParser(description='Generate Faint colors in INI colorschemes description files.')
+    parser.add_argument('file',
+                        type=argparse.FileType('r+'),
+                        help='INI File to convert')
+    parser.add_argument('blend_factor',
+                        type=int, nargs='?', default=75,
+                        help='blend factor between normal color and background')
+    args = parser.parse_args()
+
+    cfg = configparser.ConfigParser()
+    cfg.read_file(args.file)
+
+    f = args.blend_factor
+
+    assert( 0 < f and f < 100)
+    f = f / 100
+
+    if not cfg.has_section('Faint'):
+        cfg.add_section('Faint')
+    if not cfg.has_section('BrightFaint'):
+        cfg.add_section('BrightFaint')
+
+    blend_color(cfg, f, 'Normal', 'Faint', 'def')
+    blend_color(cfg, f, 'Normal', 'Faint', 'black')
+    blend_color(cfg, f, 'Normal', 'Faint', 'red')
+    blend_color(cfg, f, 'Normal', 'Faint', 'green')
+    blend_color(cfg, f, 'Normal', 'Faint', 'yellow')
+    blend_color(cfg, f, 'Normal', 'Faint', 'blue')
+    blend_color(cfg, f, 'Normal', 'Faint', 'magenta')
+    blend_color(cfg, f, 'Normal', 'Faint', 'cyan')
+    blend_color(cfg, f, 'Normal', 'Faint', 'white')
+    blend_color(cfg, f, 'Normal', 'Faint', 'inverse_fg')
+    blend_color(cfg, f, 'Normal', 'Faint', 'inverse_bg')
+
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'def')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'black')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'red')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'green')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'yellow')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'blue')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'magenta')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'cyan')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'white')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'inverse_fg')
+    blend_color(cfg, f, 'Bright', 'BrightFaint', 'inverse_bg')
+
+    args.file.seek(0)
+    args.file.truncate()
+    cfg.write(args.file)
+
+
+if __name__ == "__main__":
+    main()

data/colorschemes/get_name.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+
+import argparse
+import configparser
+import sys
+
+def main():
+    parser = argparse.ArgumentParser(description='Get color scheme name from an INI colorschemes description file.')
+    parser.add_argument('input_file',
+                        type=argparse.FileType('r'),
+                        help='INI File to convert')
+    args = parser.parse_args()
+
+    cfg = configparser.ConfigParser()
+    cfg.read_file(args.input_file)
+
+    print(cfg.get('Metadata', 'name'))
+
+
+if __name__ == "__main__":
+    main()

data/colorschemes/ini2desc.py

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+
+import argparse
+import configparser
+
+def ensure_premultiplied(t):
+    (r, g, b, a) = t
+    if a != 255 and (a > r or a > g or a > b):
+        r = (r * a) // 255
+        g = (g * a) // 255
+        b = (b * a) // 255
+    return (r, g, b, a)
+
+def parse_color(color_string):
+    h = color_string.lstrip('#')
+    if len(h) == 6:
+        return tuple(int(h[i:i+2], 16) for i in (0, 2, 4)) + (255,)
+    elif len(h) == 3:
+        return tuple(int(h[i]+h[i], 16) for i in (0, 1, 2)) + (255,)
+    elif len(h) == 8:
+        t = tuple(int(h[i:i+2], 16) for i in (0, 2, 4, 6))
+        t = ensure_premultiplied(t)
+        return t
+    elif len(h) == 4:
+        t = tuple(int(h[i]+h[i], 16) for i in (0, 1, 2, 3))
+        t = ensure_premultiplied(t)
+        return t
+
+def write_color(out, color_string):
+    (r, g, b, a) = parse_color(color_string)
+    out.write('        group "Color" struct {\n')
+    out.write('            value "r" uchar: {};\n'.format(r))
+    out.write('            value "g" uchar: {};\n'.format(g))
+    out.write('            value "b" uchar: {};\n'.format(b))
+    out.write('            value "a" uchar: {};\n'.format(a))
+    out.write('        }\n')
+
+def write_md(out, cfg):
+    out.write('    value "version" int: {};\n'
+              .format(cfg.get('Main', 'version', fallback='1')))
+
+    out.write('    value "md.version" int: {};\n'
+              .format(cfg.get('Metadata', 'version', fallback='1')))
+    out.write('    value "md.name" string: "{}";\n'
+              .format(cfg['Metadata']['name']))
+    out.write('    value "md.author" string: "{}";\n'
+              .format(cfg['Metadata']['author']))
+    out.write('    value "md.website" string: "{}";\n'
+              .format(cfg.get('Metadata', 'website', fallback='')))
+    out.write('    value "md.license" string: "{}";\n'
+              .format(cfg['Metadata']['license']))
+
+def write_named_color(out, cfg, section, color_name, default=None):
+    out.write('    group "{}" struct {{\n'.format(color_name))
+    write_color(out, cfg.get(section, color_name, fallback=default))
+    out.write('    }\n')
+
+def write_ui_colors(out, cfg):
+    write_named_color(out, cfg, 'Colors', 'def', '#aaaaaa')
+    write_named_color(out, cfg, 'Colors', 'bg', '#202020')
+    write_named_color(out, cfg, 'Colors', 'fg', '#aaaaaa')
+    write_named_color(out, cfg, 'Colors', 'main', '#3599ff')
+    write_named_color(out, cfg, 'Colors', 'hl', '#ffffff')
+    write_named_color(out, cfg, 'Colors', 'end_sel', '#ff3300')
+    write_named_color(out, cfg, 'Colors', 'tab_missed_1', '#ff9933')
+    write_named_color(out, cfg, 'Colors', 'tab_missed_2', '#ff3300')
+    write_named_color(out, cfg, 'Colors', 'tab_missed_3', '#ff0000')
+    write_named_color(out, cfg, 'Colors', 'tab_missed_over_1', '#ffff40')
+    write_named_color(out, cfg, 'Colors', 'tab_missed_over_2', '#ff9933')
+    write_named_color(out, cfg, 'Colors', 'tab_missed_over_3', '#ff0000')
+    write_named_color(out, cfg, 'Colors', 'tab_title_2', '#000000')
+
+def write_color_block(out, cfg, block):
+    out.write('    group "{}" struct {{\n'.format(block))
+    out.write('    group "Color_Block" struct {\n')
+    write_named_color(out, cfg, block, 'def')
+    write_named_color(out, cfg, block, 'black')
+    write_named_color(out, cfg, block, 'red')
+    write_named_color(out, cfg, block, 'green')
+    write_named_color(out, cfg, block, 'yellow')
+    write_named_color(out, cfg, block, 'blue')
+    write_named_color(out, cfg, block, 'magenta')
+    write_named_color(out, cfg, block, 'cyan')
+    write_named_color(out, cfg, block, 'white')
+    write_named_color(out, cfg, block, 'inverse_fg')
+    write_named_color(out, cfg, block, 'inverse_bg')
+    out.write('    }\n')
+    out.write('    }\n')
+
+def main():
+    parser = argparse.ArgumentParser(description='Convert INI colorschemes to EET description files.')
+    parser.add_argument('input_file',
+                        type=argparse.FileType('r'),
+                        help='INI File to convert')
+    parser.add_argument('output_file',
+                        type=argparse.FileType('w'),
+                        help='EET description to write')
+    args = parser.parse_args()
+
+    cfg = configparser.ConfigParser()
+    cfg.read_file(args.input_file)
+
+    out = args.output_file
+
+    assert(int(cfg['Main']['version']) == 1)
+    out.write('group "Color_Scheme" struct {\n')
+    write_md(out, cfg)
+    write_ui_colors(out, cfg)
+    write_color_block(out, cfg, 'Normal')
+    write_color_block(out, cfg, 'Bright')
+    write_color_block(out, cfg, 'Faint')
+    out.write('}\n')
+
+if __name__ == "__main__":
+    main()

data/colorschemes/meson.build

@@ -0,0 +1,58 @@
+colorschemes = [
+  'Belafonte Day',
+  'Belafonte Night',
+  'Black',
+  'Cobalt2',
+  'Default',
+  'Dracula',
+  'Fahrenheit',
+  'Fir Dark',
+  'Material',
+  'Mild',
+  'Mustang',
+  'Nord',
+  'Ocean Dark',
+  'One Dark',
+  'PaleNight',
+  'PaperColor',
+  'Smyck',
+  'Soft Era',
+  'Solarized',
+  'Solarized Light',
+  'Selenized Black',
+  'Selenized Dark',
+  'Selenized Light',
+  'Selenized White',
+  'Tango Dark',
+  'Tango Light',
+  'Tomorrow Night Burns',
+]
+
+add_color_scheme_sh = find_program(
+  'add_color_scheme.sh',
+  native: false,
+  required: true,
+  dirs: [join_paths(meson.source_root(), 'data', 'colorschemes')])
+
+cs_builder = [add_color_scheme_sh,
+              eet_bin, '@OUTPUT@', '@INPUT@']
+
+cs_install_dir = join_paths(get_option('datadir'),
+                              meson.project_name())
+
+cs_install_dir = join_paths(
+  get_option('datadir'),
+  meson.project_name(),
+  'colorschemes')
+
+
+foreach c : colorschemes
+  custom_target(c,
+    install:true,
+    install_dir: cs_install_dir,
+    install_mode: 'rw-r--r--',
+    depend_files : ['ini2desc.py', 'get_name.py', 'add_color_scheme.sh'],
+    command: cs_builder,
+    input: [c + '.ini'],
+    output: [c + '.eet'])
+endforeach

data/desktop/meson.build

@@ -1,12 +1,2 @@
-icon_sed = 's~%ICON_PATH%~@0@~'.format(join_paths(get_option('prefix'),
-                                                  get_option('datadir'),
-                                                  'icons/hicolor/128x128/apps'))
-
-custom_target(
-  'terminology.desktop',
-  input : 'terminology.desktop.in',
-  output: 'terminology.desktop',
-  command : [sed, icon_sed, '@INPUT@'],
-  capture : true,
-  install : true,
-  install_dir : join_paths(get_option('datadir'), 'applications'))
+install_data('terminology.desktop',
+             install_dir: join_paths(get_option('datadir'), 'applications'))

data/desktop/terminology.desktop

@@ -20,6 +20,6 @@ Comment[ru]=Эмулятор терминала
 Comment[ko]=터미널 에뮬레이터
 Keywords=shell;prompt;command;commandline;
 Exec=terminology
-Icon=%ICON_PATH%/terminology.png
+Icon=terminology
 Categories=System;TerminalEmulator;
 StartupWMClass=terminology

data/meson.build

@@ -4,3 +4,4 @@ subdir('images')
 subdir('fonts')
 subdir('themes')
 subdir('backgrounds')
+subdir('colorschemes')

data/themes/base16_ocean_dark.edc

@@ -1,37 +0,0 @@
-// Adapted from "base16/ocean" by Chris Kempson
-// See https://github.com/chriskempson/base16-builder/blob/master/schemes/ocean.yml
-
-#define BG_COLOR 43 48 59 255
-#define BG_COLOR_TRANSLUCENT 43 48 59 200
-#define FG_COLOR_NO_ALPHA  192 197 206
-#define FG_COLOR  FG_COLOR_NO_ALPHA 255
-
-#define BELL_OVERLAY_COLOR 43 48 59 32
-#define INHERIT_PROVIDE_OWN_COLORS 1
-
-collections {
-    color_classes {
-        color_class { name: "BG";  color: BG_COLOR; }
-        color_class { name: "FG"  ;  color: FG_COLOR; }
-
-        color_class { name: "c0";  color: 192 197 206 255; }
-        color_class { name: "C0";  color: 43 48 59 255; }
-        color_class { name: "C1";  color: 191 97 106 255; }
-        color_class { name: "C10";  color: 52 61 70 255; }
-        color_class { name: "C11";  color: 79 91 102 255; }
-        color_class { name: "C12";  color: 167 173 186 255; }
-        color_class { name: "C13";  color: 223 225 232 255; }
-        color_class { name: "C14";  color: 171 121 103 255; }
-        color_class { name: "C15";  color: 239 241 245 255; }
-        color_class { name: "C2";  color: 163 190 140 255; }
-        color_class { name: "C3";  color: 235 203 139 255; }
-        color_class { name: "C4";  color: 143 161 179 255; }
-        color_class { name: "C5";  color: 180 142 173 255; }
-        color_class { name: "C6";  color: 150 181 180 255; }
-        color_class { name: "C7";  color: 192 197 206 255; }
-        color_class { name: "C8";  color: 101 115 126 255; }
-        color_class { name: "C9";  color: 208 135 112 255; }
-    }
-}
-
-#include "mild.edc"

data/themes/black.edc

@@ -1,5 +0,0 @@
-#define BG_COLOR 0 0 0 255
-#define BG_COLOR_TRANSLUCENT 0 0 0 200
-#define BELL_OVERLAY_COLOR 220 220 220 32
-
-#include "mild.edc"

data/themes/default.edc

@@ -16,7 +16,202 @@ color_classes {
 
 efl_version: 1 20;
 
+#define IMAGE_RING(x, sz) \
+   set { name: x; \
+      image { image: x"1.png" COMP; size:  (sz/2)   (sz/2)  99999   99999;   } \
+      image { image: x"2.png" COMP; size:  (sz/4)   (sz/4)  (sz/2)  (sz/2);  } \
+      image { image: x"3.png" COMP; size:  (sz/8)   (sz/8)  (sz/4)  (sz/4);  } \
+      image { image: x"4.png" COMP; size:  (sz/16)  (sz/16) (sz/8)  (sz/8);  } \
+      image { image: x"5.png" COMP; size:       0        0  (sz/16) (sz/16); } \
+   }
+
+#define BUSY(x, start1, start2, stop1, stop2) \
+   program { signal: start1; source: start2; \
+      action: STATE_SET "visible" 0.0; \
+      transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1; \
+      target: "busy"; } \
+   program { signal: start1; source: start2; \
+      action: STATE_SET "default" 0.0; \
+      target: "busy1"; \
+      target: "busy2"; \
+      target: "busy3"; \
+      after: "busy-p11"; \
+      after: "busy-p21"; \
+      after: "busy-p31"; } \
+   program { signal: stop1; source: stop2; \
+      action: STATE_SET "default" 0.0; \
+      transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1; \
+      target: "busy"; \
+      after: "busy_stop2"; } \
+   program { name: "busy_stop2"; \
+      action: ACTION_STOP; \
+      target: "busy-p11"; \
+      target: "busy-p12"; \
+      target: "busy-p21"; \
+      target: "busy-p22"; \
+      target: "busy-p31"; \
+      target: "busy-p32"; } \
+   part { name: "busy"; type: RECT; \
+      description { state: "default" 0.0; \
+         rel1.to: x; rel2.to: x; \
+         color: 255 255 255 0; /* no cc */ visible: 0; } \
+      description { state: "visible" 0.0; \
+         inherit: "default" 0.0; \
+         color: 255 255 255 255; /* no cc */ visible: 1; } } \
+   part { name: "busy1"; mouse_events: 0; \
+      clip_to: "busy"; \
+      description { state: "default" 0.0; \
+         rel1.to: "busy"; rel2.to: "busy"; \
+         aspect: 1.0 1.0; aspect_preference: BOTH; \
+         image.normal: "ringa"; \
+         color_class: "/fg/normal/progress/busy/1"; \
+         map.on: 1; \
+         map.smooth: 1; \
+         map.rotation.center: "busy"; \
+         map.rotation.z: 0; } \
+      description { state: "default" 1.0; \
+         inherit: "default" 0.0; \
+         map.rotation.z: 360; } } \
+   program { name: "busy-p11"; \
+      action: STATE_SET "default" 1.0; \
+      transition: LINEAR 1.0; \
+      target: "busy1"; \
+      after: "busy-p12"; } \
+   program { name: "busy-p12"; \
+      action: STATE_SET "default" 0.0; \
+      target: "busy1"; \
+      after: "busy-p11"; } \
+   part { name: "busy2"; mouse_events: 0; \
+      clip_to: "busy"; \
+      description { state: "default" 0.0; \
+         rel1.to: "busy"; rel2.to: "busy"; \
+         aspect: 1.0 1.0; aspect_preference: BOTH; \
+         image.normal: "ringb"; \
+         color_class: "/fg/normal/progress/busy/2"; \
+         map.on: 1; \
+         map.smooth: 1; \
+         map.rotation.center: "busy"; \
+         map.rotation.z: 420; } \
+      description { state: "default" 1.0; \
+         inherit: "default" 0.0; \
+         map.rotation.z: 80; } } \
+   program { name: "busy-p21"; \
+      action: STATE_SET "default" 1.0; \
+      transition: LINEAR 0.7; \
+      target: "busy2"; \
+      after: "busy-p22"; } \
+   program { name: "busy-p22"; \
+      action: STATE_SET "default" 0.0; \
+      target: "busy2"; \
+      after: "busy-p21"; } \
+   part { name: "busy3"; mouse_events: 0; \
+      clip_to: "busy"; \
+      description { state: "default" 0.0; \
+         rel1.to: "busy"; rel2.to: "busy"; \
+         aspect: 1.0 1.0; aspect_preference: BOTH; \
+         image.normal: "ringc"; \
+         color_class: "/fg/normal/progress/busy/3"; \
+         map.on: 1; \
+         map.smooth: 1; \
+         map.rotation.center: "busy"; \
+         map.rotation.z: 170; } \
+      description { state: "default" 1.0; \
+         inherit: "default" 0.0; \
+         map.rotation.z: 530; } } \
+   program { name: "busy-p31"; \
+      action: STATE_SET "default" 1.0; \
+      transition: LINEAR 1.4; \
+      target: "busy3"; \
+      after: "busy-p32"; } \
+   program { name: "busy-p32"; \
+      action: STATE_SET "default" 0.0; \
+      target: "busy3"; \
+      after: "busy-p31"; }
+
+#define I060(_NAME, _FILE) \
+   set { name: _NAME; \
+      image { image: _FILE"-060.png" COMP; size: 31 31 60000 60000; } \
+      image { image: _FILE"-030.png" COMP; size: 16 16    30    30; } \
+      image { image: _FILE"-015.png" COMP; size:  0  0    15    15; } \
+   }
+
 collections {
+   color_tree {
+      ":bg" {
+         "/bg/normal/tab";
+         "/bg/normal/background";
+      }
+      ":bg-dark" {
+         "/bg/selected/titlebar";
+         "/bg/normal/term/font_preview";
+      }
+      ":dim-dark" {
+         "/bg/normal/term/keybinding";
+      }
+      ":fg" {
+         "/fg/normal/term/tab/title/text";
+         "/fg/normal/tab/term/icon/grouped";
+         "/fg/normal/term/tab_button";
+         "/fg/pressed/term/miniview/close";
+         "/fg/normal/term/sel/title/text";
+         "/fg/normal/term/drag/target";
+      }
+      ":fg-light" {
+         "/fg/normal/progress/busy/1";
+         "/fg/normal/term/tabcount";
+         "/fg/selected/term/tab/title/close";
+         "/fg/selected/term/tab/title/text";
+         "/fg/pressed/term/tab_button";
+         "/fg/normal/term/keybinding";
+         "/fg/normal/term/miniview/close";
+         "/fg/normal/term/selection/arrow/left";
+         "/fg/normal/term/selection/arrow/up";
+         "/fg/normal/term/selection/arrow/right";
+         "/fg/normal/term/selection/arrow/down";
+         "/fg/selected/term/sel/title/text";
+         "/bg/normal/term/drag/target";
+         "/fg/selected/term/drag/target";
+      }
+      ":light-medium" {
+         "/fg/normal/progress/busy/2";
+      }
+      ":selected-medium" {
+         "/fg/normal/progress/busy/3";
+      }
+      ":bg-dark" {
+         "/bg-dark/normal/background";
+      }
+      ":bg-dark-alt" {
+         "/bg-dark-alt/normal/background";
+      };
+      ":selected" {
+         "/bg/selected/tab/hilight";
+         "/fg/normal/term/text/tabcount";
+         "/bg/selected/media/position";
+         "/fg/selected/term/miniview/screen";
+         "/bg/selected/term/text";
+      };
+      ":selected-alt" {
+         "/fg/normal/term/text/tabcount/missed";
+         "/fg/selected/term/tab/title/text/bell";
+         "/fg/disabled/term/miniview/screen";
+         "/bg/selected/term/drag/target";
+      };
+      ":shadow" {
+         "/shadow/normal/tab";
+         "/shadow/normal/term/sel/item";
+         "/shadow/normal/term/drag_thumb";
+      }
+      ":shadow-selected" {
+         "/shadow/selected/tab";
+         "/shadow/selected/term/sel/item";
+      }
+   }
+
+   IMAGE_RING("ringa", 160)
+   IMAGE_RING("ringb", 160)
+   IMAGE_RING("ringc", 160)
+
    #include "default/keybinding.edc"
    #include "default/miniview.edc"
    #include "default/core.edc"
@@ -34,3 +229,4 @@ collections {
    #include "default/tab_drag_thumb.edc"
    #include "default/color_preview.edc"
 }
+

data/themes/default/about.edc

@@ -1,10 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////
 //// the about box content image
 group { name: "terminology/about";
-   images {
-      image: "ab_base.png" COMP;
-      image: "ab_shell.png" COMP;
-   }
+   images.image: "ab_base.png" COMP;
+   images.image: "ab_shell.png" COMP;
    styles {
       style { name: "aboutstyle";
          base: "font=Sans font_size=8 color=#3f1 style=glow glow2_color=#3f13 glow_color=#3f11 wrap=word";
@@ -12,43 +10,29 @@ group { name: "terminology/about";
       }
    }
    parts {
-      part { name: "base";
-         mouse_events: 0;
+      part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1 {
-               relative: (39/198) (27/198);
-               to: "shell";
-            }
-            rel2 {
-               relative: (151/198) (115/198);
-               to: "shell";
-            }
+            rel.to: "shell";
+            rel1.relative: (39/198) (27/198);
+            rel2.relative: (151/198) (115/198);
             image.normal: "ab_base.png";
          }
       }
       part { name: "baseclip"; type: RECT;
          description { state: "default" 0.0;
-            color: 255 255 255 255;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
       }
       part { name: "terminology.text"; type: TEXTBLOCK;
-         clip_to: "baseclip";
-         mouse_events: 1;
          scale: 1;
+         clip_to: "baseclip";
          description { state: "default" 0.0;
             fixed: 1 1;
             align: 0.5 0.0;
             max: 10000 10000;
-            rel1 {
-               to: "base";
-               relative: 0.08 1.0;
-            }
-            rel2 {
-               to: "base";
-               relative: 0.97 1.0;
-            }
+            rel.to: "base";
+            rel1.relative: 0.08 1.0;
+            rel2.relative: 0.97 1.0;
             text {
                style: "aboutstyle";
                text: "Hello world.<br>This is <b>Terminology</b>, your friendly neighbourhood terminal.<br><br>This needs more text to test vertical scrolling to see if the animation works right.<br>I hope this will be enough now.";
@@ -70,11 +54,10 @@ group { name: "terminology/about";
             aspect_preference: BOTH;
             image.normal: "ab_shell.png";
          }
-      }                                              
+      }
    }
    programs {
-      program {
-         signal: "begin"; source: "terminology";
+      program { signal: "begin"; source: "terminology";
          action: ACTION_STOP;
          target: "show";
          target: "show2";

data/themes/default/base.edc

@@ -1,7 +1,4 @@
 group { name: "terminology/base";
-   images.image: "pm_shadow.png" COMP;
-   images.image: "bg_bevel.png" COMP;
-   images.image: "bg_glint.png" COMP;
    parts {
       part { name: "terminology.content"; type: SWALLOW;
          description { state: "default" 0.0;
@@ -15,39 +12,29 @@ group { name: "terminology/base";
             rel1.offset: -100 -100;
             rel2.to: "terminology.cmdbox";
             rel2.offset: 99 99;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
             visible: 1;
          }
       }
-      part { name: "cmdshadow"; mouse_events: 0;
-         clip_to: "cmdclip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "cmdback";
-            rel1.offset: -32 -32;
-            rel2.to: "cmdback";
-            rel2.offset: 31 31;
-            image.normal: "pm_shadow.png";
-            image.border: 64 64 64 64;
-            fill.smooth: 0;
-         }
-      }
       part { name: "cmdback"; type: RECT;
+         scale: 1;
          clip_to: "cmdclip";
          description { state: "default" 0.0;
             color: 48 48 48 255;
             rel1.to: "terminology.cmdbox";
-            rel1.offset: -2 -2;
+            rel1.offset: -4 -4;
             rel2.to: "terminology.cmdbox";
-            rel2.offset: 1 1;
+            rel2.offset: 3 3;
+            offscale;
          }
       }
       part { name: "terminology.cmdbox"; type: SWALLOW;
+         scale: 1;
          clip_to: "cmdclip";
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -56,6 +43,7 @@ group { name: "terminology/base";
             rel1.offset: 8 9;
             rel2.offset: -9 9;
             align: 0.5 0.0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -64,57 +52,30 @@ group { name: "terminology/base";
             align: 0.5 1.0;
          }
       }
-      part { name: "cmdbevel"; mouse_events: 0;
-         clip_to: "cmdclip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "cmdback";
-            rel2.to: "cmdback";
-            image.normal: "bg_bevel.png";
-            image.border: 3 3 3 3;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "cmdglint"; mouse_events: 0;
-         clip_to: "cmdclip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 79 5;
-            max: 79 5;
-            rel1 {
-               to: "cmdback";
-               relative: 0.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "cmdback";
-               relative: 1.0 0.0;
-               offset: -1 0;
-            }
-            image.normal: "bg_glint.png";
-         }
-      }
-      program {
-         signal: "cmdbox,show"; source: "terminology";
+      program { signal: "cmdbox,show"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.2;
          target: "cmdclip";
       }
-      program {
-         signal: "cmdbox,show"; source: "terminology";
+      program { signal: "cmdbox,show"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         transition: SPRING 0.4 0.5 4;
+         transition: SPRING 0.2 0.2 4;
          target: "terminology.cmdbox";
       }
-      program {
-         signal: "cmdbox,hide"; source: "terminology";
+      program { signal: "cmdbox,hide"; source: "terminology";
          action: STATE_SET "default" 0.0;
-         transition: ACCELERATE 0.5;
+         transition: ACCELERATE 0.3;
          target: "terminology.cmdbox";
          target: "cmdclip";
       }
 
+      ////////////////////////////////////////////////////////////////////
+      // swallow to hold invisible rect to click on to dismiss things
+      part { name: "terminology.dismiss"; type: SWALLOW;
+         description { state: "default" 0.0;
+         }
+      }
+
       ////////////////////////////////////////////////////////////////////
       // overlayed options and controls
       part { name: "terminology.about"; type: SWALLOW;
@@ -136,25 +97,127 @@ group { name: "terminology/base";
             rel2.relative: 1.0 1.0;
          }
       }
-      program {
-         signal: "about,show"; source: "terminology";
+      part { name: "twitter.base"; type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1 {
+               to_y: "terminology.about";
+               relative: 0.0 1.0;
+            }
+            rel2 {
+               relative: 0.5 1.0;
+            }
+         }
+      }
+      part { name: "twitter.txt"; type: TEXT;
+         mouse_events: 1;
+         scale: 1;
+         effect: GLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 1.0 0.5;
+            fixed: 1 1;
+            rel1 {
+               to: "twitter.base";
+               relative: 0.5 0.5;
+            }
+            rel2 {
+               to: "twitter.base";
+               relative: 0.5 0.5;
+            }
+            color: 51 255 17 255;
+            color2: 136 255 136 40;
+            color3: 136 255 136 8;
+            text {
+               font: "Sans"; size: 10;
+               text: "Twitter: @_Terminology_";
+               align: 1.0 0.5;
+               min: 1 1;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      program { signal: "mouse,clicked,1"; source: "twitter.txt";
+         action: SIGNAL_EMIT "about,twitter" "terminology";
+      }
+      program { signal: "mouse,clicked,3"; source: "twitter.txt";
+         action: SIGNAL_EMIT "about,twitter,ctx" "terminology";
+      }
+
+      part { name: "youtube.base"; type: RECT;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            rel1 {
+               to_y: "terminology.about";
+               relative: 0.5 1.0;
+            }
+            rel2 {
+               relative: 1.0 1.0;
+            }
+         }
+      }
+      part { name: "youtube.txt"; type: TEXT;
+         mouse_events: 1;
+         scale: 1;
+         effect: GLOW;
+         description { state: "default" 0.0;
+            visible: 0;
+            align: 0.0 0.5;
+            fixed: 1 1;
+            rel1 {
+               to: "youtube.base";
+               relative: 0.5 0.5;
+            }
+            rel2 {
+               to: "youtube.base";
+               relative: 0.5 0.5;
+            }
+            color: 51 255 17 255;
+            color2: 136 255 136 40;
+            color3: 136 255 136 8;
+            text {
+               font: "Sans"; size: 10;
+               text: "YouTube channel";
+               align: 0.0 0.5;
+               min: 1 1;
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      program { signal: "mouse,clicked,1"; source: "youtube.txt";
+         action: SIGNAL_EMIT "about,youtube" "terminology";
+      }
+      program { signal: "mouse,clicked,3"; source: "youtube.txt";
+         action: SIGNAL_EMIT "about,youtube,ctx" "terminology";
+      }
+
+      program { signal: "about,show"; source: "terminology";
          action: STATE_SET "visible" 0.0;
          transition: SPRING 1.2 2.0 6;
          target: "terminology.about";
+         target: "twitter.txt";
+         target: "youtube.txt";
       }
-      program {
-         signal: "about,hide"; source: "terminology";
+      program { signal: "about,hide"; source: "terminology";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.6;
          target: "terminology.about";
+         target: "twitter.txt";
+         target: "youtube.txt";
       }
 
-      ////////////////////////////////////////////////////////////////////
-      // swallow to hold invisible rect to click on to dismiss things
-      part { name: "terminology.dismiss"; type: SWALLOW;
-         description { state: "default" 0.0;
-         }
-      }
 
       ////////////////////////////////////////////////////////////////////
       // overlayed options and controls
@@ -173,6 +236,7 @@ group { name: "terminology/base";
                relative: 1.0 0.98;
                offset: 8 -9;
             }
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -189,16 +253,14 @@ group { name: "terminology/base";
             }
          }
       }
-      program {
-         signal: "optdetails,show"; source: "terminology";
+      program { signal: "optdetails,show"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.2;
          target: "terminology.optdetails";
       }
-      program {
-         signal: "optdetails,hide"; source: "terminology";
+      program { signal: "optdetails,hide"; source: "terminology";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.3;
          target: "terminology.optdetails";
          after: "opdt_hide2";
       }
@@ -220,6 +282,7 @@ group { name: "terminology/base";
                relative: 1.0 0.98;
                offset: 8 -9;
             }
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -233,16 +296,14 @@ group { name: "terminology/base";
             }
          }
       }
-      program {
-         signal: "options,show"; source: "terminology";
+      program { signal: "options,show"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.2;
          target: "terminology.options";
       }
-      program {
-         signal: "options,hide"; source: "terminology";
+      program { signal: "options,hide"; source: "terminology";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.6;
+         transition: DECELERATE 0.3;
          target: "terminology.options";
       }
 
@@ -261,6 +322,7 @@ group { name: "terminology/base";
                relative: 1.0 0.5;
                offset: 8 -9;
             }
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -275,16 +337,14 @@ group { name: "terminology/base";
             }
          }
       }
-      program {
-         signal: "controls,show"; source: "terminology";
+      program { signal: "controls,show"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.3;
+         transition: DECELERATE 0.2;
          target: "terminology.controls";
       }
-      program {
-         signal: "controls,hide"; source: "terminology";
+      program { signal: "controls,hide"; source: "terminology";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.3;
          target: "terminology.controls";
       }
    }

data/themes/default/color_preview.edc

@@ -1,29 +1,31 @@
 group { name: "terminology/color_preview";
-   images.image: "pm_overlay.png" COMP;
-   images.image: "tiles.png" COMP;
+   images.image: "checks.png" COMP;
    parts {
-      part { name: "tiles";
-         mouse_events: 0;
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            color_class: "/bg-dark/normal/background";
+         }
+      }
+      part { name: "checks"; mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            image.normal: "tiles.png";
+            image.normal: "checks.png";
+            color_class: "/bg-dark-alt/normal/background";
             fill.type: TILE;
          }
       }
       part { name: "preview"; type: RECT;
-         mouse_events: 1;
          description { state: "default" 0.0;
             color_class: "color_preview";
          }
       }
-      part { name: "name"; type: TEXT;
-         mouse_events: 0;
+      part { name: "name"; type: TEXT; mouse_events: 0;
          effect: OUTLINE_SOFT_SHADOW;
          scale: 1;
          description { state: "default" 0.0;
             color: 255 255 255 255;
-            color2: 0 0 0 128;
-            color3: 0 0 0 20;
+            color2: 0 0 0 64;
+            color3: 0 0 0 16;
             align: 0.5 0.0;
             text { font: "monospace"; size: 10;
                align: 0.5 0.0;
@@ -31,12 +33,22 @@ group { name: "terminology/color_preview";
             }
          }
       }
-      part { name: "overlay";
-         mouse_events: 0;
+   }
+}
+
+group { name: "terminology/colorscheme_preview";
+   parts {
+      part { name: "bg"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            fixed: 1 1;
-            image.normal: "pm_overlay.png";
-            fill.smooth: 0;
+            color_class: "BG";
+         }
+      }
+      part { name: "terminology.content"; type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+            offscale;
          }
       }
    }

data/themes/default/colors.edc

@@ -1,362 +1,21 @@
-color_class { name: "BG";       color: BG_COLOR ; }
-color_class { name: "FG";       color: FG_COLOR ; }
-color_class { name: "CURSOR"; color: 51 153 255 255; }
-color_class { name: "CURSOR_HIGHLIGHT"; color: 255 255 255 255; }
-color_class { name: "GLOW";     color: 51 153 255 255; }
-color_class { name: "GLOW_HIGHLIGHT";  color: 255 255 255 255; }
-color_class { name: "GLOW_TXT";
-   color: 255 255 255 255;
-   color2: 51 153 255 255;
-   color3: 51 153 255 255;
-}
 
-color_class { name: "c0";       color: 170 170 170 255; } // COL_DEF
-color_class { name: "c1";       color:   0   0   0 255; } // COL_BLACK
-color_class { name: "c2";       color: 204  51  51 255; } // COL_RED
-color_class { name: "c3";       color:  51 204  51 255; } // COL_GREEN
-color_class { name: "c4";       color: 204 136  51 255; } // COL_YELLOW
-color_class { name: "c5";       color:  51  51 204 255; } // COL_BLUE
-color_class { name: "c6";       color: 204  51 204 255; } // COL_MAGENTA
-color_class { name: "c7";       color:  51 204 204 255; } // COL_CYAN
-color_class { name: "c8";       color: 204 204 204 255; } // COL_WHITE
-color_class { name: "c9";       color:   0   0   0   0; } // COL_INVIS
-color_class { name: "c10";      color:  34  34  34 255; } // COL_INVERSE
-color_class { name: "c11";      color: 170 170 170 255; } // COL_INVERSEBG
+color_class { name: "HIGHLIGHT";  color: 255 255 255 255; }
 
-color_class { name: "c12";      color: 238 238 238 255; } // COL_DEF
-color_class { name: "c13";      color: 102 102 102 255; } // COL_BLACK
-color_class { name: "c14";      color: 255 102 102 255; } // COL_RED
-color_class { name: "c15";      color: 102 255 102 255; } // COL_GREEN
-color_class { name: "c16";      color: 255 255 102 255; } // COL_YELLOW
-color_class { name: "c17";      color: 102 102 255 255; } // COL_BLUE
-color_class { name: "c18";      color: 255 102 255 255; } // COL_MAGENTA
-color_class { name: "c19";      color: 102 255 255 255; } // COL_CYAN
-color_class { name: "c20";      color: 255 255 255 255; } // COL_WHITE
-color_class { name: "c21";      color:   0   0   0   0; } // COL_INVIS
-color_class { name: "c22";      color:  17  17  17 255; } // COL_INVERSE
-color_class { name: "c23";      color: 238 238 238 255; } // COL_INVERSEBG
+color_class { name: "BG_SENDFILE";      color:  64  64  64 255; }
 
-color_class { name: "c24";      color: 221 221 221 255; } // COL_DEF
-color_class { name: "c25";      color: 128 128 128 255; } // COL_BLACK
-color_class { name: "c26";      color: 204 136 136 255; } // COL_RED
-color_class { name: "c27";      color: 136 204 136 255; } // COL_GREEN
-color_class { name: "c28";      color: 204 170 136 255; } // COL_YELLOW
-color_class { name: "c29";      color: 136 136 204 255; } // COL_BLUE
-color_class { name: "c30";      color: 204 136 204 255; } // COL_MAGENTA
-color_class { name: "c31";      color: 136 204 204 255; } // COL_CYAN
-color_class { name: "c32";      color: 204 204 204 255; } // COL_WHITE
-color_class { name: "c33";      color:   0   0   0   0; } // COL_INVIS
-color_class { name: "c34";      color:  17  17  17 255; } // COL_INVERSE
-color_class { name: "c35";      color: 204 204 204 255; } // COL_INVERSEBG
+color_class { name: "BG";               color:  32  32  32 255; }
+color_class { name: "FG";               color: 170 170 170 255; }
+color_class { name: "CURSOR";           color: 255 255 255 255; }
+color_class { name: "GLOW";             color:  51 153 255 255; }
 
-color_class { name: "c36";      color: 255 255 255 255; } // COL_DEF
-color_class { name: "c37";      color: 204 204 204 255; } // COL_BLACK
-color_class { name: "c38";      color: 255 204 204 255; } // COL_RED
-color_class { name: "c39";      color: 204 255 204 255; } // COL_GREEN
-color_class { name: "c40";      color: 255 255 204 255; } // COL_YELLOW
-color_class { name: "c41";      color: 204 204 255 255; } // COL_BLUE
-color_class { name: "c42";      color: 255 204 255 255; } // COL_MAGENTA
-color_class { name: "c43";      color: 204 255 255 255; } // COL_CYAN
-color_class { name: "c44";      color: 255 255 255 255; } // COL_WHITE
-color_class { name: "c45";      color:   0   0   0   0; } // COL_INVIS
-color_class { name: "c46";      color:   0   0   0 255; } // COL_INVERSE
-color_class { name: "c47";      color: 255 255 255 255; } // COL_INVERSEBG
-
-color_class { name: "C0";   color:   0   0   0 255; } // COL_BLACK
-color_class { name: "C1";   color: 204  51  51 255; } // COL_RED
-color_class { name: "C2";   color:  51 204  51 255; } // COL_GREEN
-color_class { name: "C3";   color: 204 136  51 255; } // COL_YELLOW
-color_class { name: "C4";   color:  51  51 204 255; } // COL_BLUE
-color_class { name: "C5";   color: 204  51 204 255; } // COL_MAGENTA
-color_class { name: "C6";   color:  51 204 204 255; } // COL_CYAN
-color_class { name: "C7";   color: 204 204 204 255; } // COL_WHITE
-
-color_class { name: "C8";   color: 102 102 102 255; } // COL_BLACK
-color_class { name: "C9";   color: 255 102 102 255; } // COL_RED
-color_class { name: "C10";  color: 102 255 102 255; } // COL_GREEN
-color_class { name: "C11";  color: 255 255 102 255; } // COL_YELLOW
-color_class { name: "C12";  color: 102 102 255 255; } // COL_BLUE
-color_class { name: "C13";  color: 255 102 255 255; } // COL_MAGENTA
-color_class { name: "C14";  color: 102 255 255 255; } // COL_CYAN
-color_class { name: "C15";  color: 255 255 255 255; } // COL_WHITE
-
-#if 0 // disabled, use defaults.
-// pure 6x6x6 colorcube
-color_class { name: "C16";   color:   0   0   0 255; }
-color_class { name: "C17";   color:   0   0  95 255; }
-color_class { name: "C18";   color:   0   0 135 255; }
-color_class { name: "C19";   color:   0   0 175 255; }
-color_class { name: "C20";   color:   0   0 215 255; }
-color_class { name: "C21";   color:   0   0 255 255; }
-
-color_class { name: "C22";   color:   0  95   0 255; }
-color_class { name: "C23";   color:   0  95  95 255; }
-color_class { name: "C24";   color:   0  95 135 255; }
-color_class { name: "C25";   color:   0  95 175 255; }
-color_class { name: "C26";   color:   0  95 215 255; }
-color_class { name: "C27";   color:   0  95 255 255; }
-
-color_class { name: "C28";   color:   0 135   0 255; }
-color_class { name: "C29";   color:   0 135  95 255; }
-color_class { name: "C30";   color:   0 135 135 255; }
-color_class { name: "C31";   color:   0 135 175 255; }
-color_class { name: "C32";   color:   0 135 215 255; }
-color_class { name: "C33";   color:   0 135 255 255; }
-
-color_class { name: "C34";   color:   0 175   0 255; }
-color_class { name: "C35";   color:   0 175  95 255; }
-color_class { name: "C36";   color:   0 175 135 255; }
-color_class { name: "C37";   color:   0 175 175 255; }
-color_class { name: "C38";   color:   0 175 215 255; }
-color_class { name: "C39";   color:   0 175 255 255; }
-
-color_class { name: "C40";   color:   0 215   0 255; }
-color_class { name: "C41";   color:   0 215  95 255; }
-color_class { name: "C42";   color:   0 215 135 255; }
-color_class { name: "C43";   color:   0 215 175 255; }
-color_class { name: "C44";   color:   0 215 215 255; }
-color_class { name: "C45";   color:   0 215 255 255; }
-
-color_class { name: "C46";   color:   0 255   0 255; }
-color_class { name: "C47";   color:   0 255  95 255; }
-color_class { name: "C48";   color:   0 255 135 255; }
-color_class { name: "C49";   color:   0 255 175 255; }
-color_class { name: "C50";   color:   0 255 215 255; }
-color_class { name: "C51";   color:   0 255 255 255; }
-
-color_class { name: "C52";   color:  95   0   0 255; }
-color_class { name: "C53";   color:  95   0  95 255; }
-color_class { name: "C54";   color:  95   0 135 255; }
-color_class { name: "C55";   color:  95   0 175 255; }
-color_class { name: "C56";   color:  95   0 215 255; }
-color_class { name: "C57";   color:  95   0 255 255; }
-
-color_class { name: "C58";   color:  95  95   0 255; }
-color_class { name: "C59";   color:  95  95  95 255; }
-color_class { name: "C60";   color:  95  95 135 255; }
-color_class { name: "C61";   color:  95  95 175 255; }
-color_class { name: "C62";   color:  95  95 215 255; }
-color_class { name: "C63";   color:  95  95 255 255; }
-
-color_class { name: "C64";   color:  95 135   0 255; }
-color_class { name: "C65";   color:  95 135  95 255; }
-color_class { name: "C66";   color:  95 135 135 255; }
-color_class { name: "C67";   color:  95 135 175 255; }
-color_class { name: "C68";   color:  95 135 215 255; }
-color_class { name: "C69";   color:  95 135 255 255; }
-
-color_class { name: "C70";   color:  95 175   0 255; }
-color_class { name: "C71";   color:  95 175  95 255; }
-color_class { name: "C72";   color:  95 175 135 255; }
-color_class { name: "C73";   color:  95 175 175 255; }
-color_class { name: "C74";   color:  95 175 215 255; }
-color_class { name: "C75";   color:  95 175 255 255; }
-
-color_class { name: "C76";   color:  95 215   0 255; }
-color_class { name: "C77";   color:  95 215  95 255; }
-color_class { name: "C78";   color:  95 215 135 255; }
-color_class { name: "C79";   color:  95 215 175 255; }
-color_class { name: "C80";   color:  95 215 215 255; }
-color_class { name: "C81";   color:  95 215 255 255; }
-
-color_class { name: "C82";   color:  95 255   0 255; }
-color_class { name: "C83";   color:  95 255  95 255; }
-color_class { name: "C84";   color:  95 255 135 255; }
-color_class { name: "C85";   color:  95 255 175 255; }
-color_class { name: "C86";   color:  95 255 215 255; }
-color_class { name: "C87";   color:  95 255 255 255; }
-
-color_class { name: "C88";   color: 135   0   0 255; }
-color_class { name: "C89";   color: 135   0  95 255; }
-color_class { name: "C90";   color: 135   0 135 255; }
-color_class { name: "C91";   color: 135   0 175 255; }
-color_class { name: "C92";   color: 135   0 215 255; }
-color_class { name: "C93";   color: 135   0 255 255; }
-
-color_class { name: "C94";   color: 135 111   0 255; }
-color_class { name: "C95";   color: 135  95  95 255; }
-color_class { name: "C96";   color: 135  95 135 255; }
-color_class { name: "C97";   color: 135  95 175 255; }
-color_class { name: "C98";   color: 135  95 215 255; }
-color_class { name: "C99";   color: 135  95 255 255; }
-
-color_class { name: "C100";  color: 135 135   0 255; }
-color_class { name: "C101";  color: 135 135  95 255; }
-color_class { name: "C102";  color: 135 135 135 255; }
-color_class { name: "C103";  color: 135 135 175 255; }
-color_class { name: "C104";  color: 135 135 215 255; }
-color_class { name: "C105";  color: 135 135 255 255; }
-
-color_class { name: "C106";  color: 135 175   0 255; }
-color_class { name: "C107";  color: 135 175  95 255; }
-color_class { name: "C108";  color: 135 175 135 255; }
-color_class { name: "C109";  color: 135 175 175 255; }
-color_class { name: "C110";  color: 135 175 215 255; }
-color_class { name: "C111";  color: 135 175 255 255; }
-
-color_class { name: "C112";  color: 135 215   0 255; }
-color_class { name: "C113";  color: 135 215  95 255; }
-color_class { name: "C114";  color: 135 215 135 255; }
-color_class { name: "C115";  color: 135 215 175 255; }
-color_class { name: "C116";  color: 135 215 215 255; }
-color_class { name: "C117";  color: 135 215 255 255; }
-
-color_class { name: "C118";  color: 135 255   0 255; }
-color_class { name: "C119";  color: 135 255  95 255; }
-color_class { name: "C120";  color: 135 255 135 255; }
-color_class { name: "C121";  color: 135 255 175 255; }
-color_class { name: "C122";  color: 135 255 215 255; }
-color_class { name: "C123";  color: 135 255 255 255; }
-
-color_class { name: "C124";  color: 175   0   0 255; }
-color_class { name: "C125";  color: 175   0  95 255; }
-color_class { name: "C126";  color: 175   0 135 255; }
-color_class { name: "C127";  color: 175   0 175 255; }
-color_class { name: "C128";  color: 175   0 215 255; }
-color_class { name: "C129";  color: 175   0 255 255; }
-
-color_class { name: "C130";  color: 175  95   0 255; }
-color_class { name: "C131";  color: 175  95  95 255; }
-color_class { name: "C132";  color: 175  95 135 255; }
-color_class { name: "C133";  color: 175  95 175 255; }
-color_class { name: "C134";  color: 175  95 215 255; }
-color_class { name: "C135";  color: 175  95 255 255; }
-
-color_class { name: "C136";  color: 175 135   0 255; }
-color_class { name: "C137";  color: 175 135  95 255; }
-color_class { name: "C138";  color: 175 135 135 255; }
-color_class { name: "C139";  color: 175 135 175 255; }
-color_class { name: "C140";  color: 175 135 215 255; }
-color_class { name: "C141";  color: 175 135 255 255; }
-
-color_class { name: "C142";  color: 175 175   0 255; }
-color_class { name: "C143";  color: 175 175  95 255; }
-color_class { name: "C144";  color: 175 175 135 255; }
-color_class { name: "C145";  color: 175 175 175 255; }
-color_class { name: "C146";  color: 175 175 215 255; }
-color_class { name: "C147";  color: 175 175 255 255; }
-
-color_class { name: "C148";  color: 175 215   0 255; }
-color_class { name: "C149";  color: 175 215  95 255; }
-color_class { name: "C150";  color: 175 215 135 255; }
-color_class { name: "C151";  color: 175 215 175 255; }
-color_class { name: "C152";  color: 175 215 215 255; }
-color_class { name: "C153";  color: 175 215 255 255; }
-
-color_class { name: "C154";  color: 175 255   0 255; }
-color_class { name: "C155";  color: 175 255  95 255; }
-color_class { name: "C156";  color: 175 255 135 255; }
-color_class { name: "C157";  color: 175 255 175 255; }
-color_class { name: "C158";  color: 175 255 215 255; }
-color_class { name: "C159";  color: 175 255 255 255; }
-
-color_class { name: "C160";  color: 215   0   0 255; }
-color_class { name: "C161";  color: 215   0  95 255; }
-color_class { name: "C162";  color: 215   0 135 255; }
-color_class { name: "C163";  color: 215   0 175 255; }
-color_class { name: "C164";  color: 215   0 215 255; }
-color_class { name: "C165";  color: 215   0 255 255; }
-
-color_class { name: "C166";  color: 215  95   0 255; }
-color_class { name: "C167";  color: 215  95  95 255; }
-color_class { name: "C168";  color: 215  95 135 255; }
-color_class { name: "C169";  color: 215  95 175 255; }
-color_class { name: "C170";  color: 215  95 215 255; }
-color_class { name: "C171";  color: 215  95 255 255; }
-
-color_class { name: "C172";  color: 215 135   0 255; }
-color_class { name: "C173";  color: 215 135  95 255; }
-color_class { name: "C174";  color: 215 135 135 255; }
-color_class { name: "C175";  color: 215 135 175 255; }
-color_class { name: "C176";  color: 215 135 215 255; }
-color_class { name: "C177";  color: 215 135 255 255; }
-
-color_class { name: "C178";  color: 215 175   0 255; }
-color_class { name: "C179";  color: 215 175  95 255; }
-color_class { name: "C180";  color: 215 175 135 255; }
-color_class { name: "C181";  color: 215 175 175 255; }
-color_class { name: "C182";  color: 215 175 215 255; }
-color_class { name: "C183";  color: 215 175 255 255; }
-
-color_class { name: "C184";  color: 215 215   0 255; }
-color_class { name: "C185";  color: 215 215  95 255; }
-color_class { name: "C186";  color: 215 215 135 255; }
-color_class { name: "C187";  color: 215 215 175 255; }
-color_class { name: "C188";  color: 215 215 215 255; }
-color_class { name: "C189";  color: 215 215 255 255; }
-
-color_class { name: "C190";  color: 215 255   0 255; }
-color_class { name: "C191";  color: 215 255  95 255; }
-color_class { name: "C192";  color: 215 255 135 255; }
-color_class { name: "C193";  color: 215 255 175 255; }
-color_class { name: "C194";  color: 215 255 215 255; }
-color_class { name: "C195";  color: 215 255 255 255; }
-
-color_class { name: "C196";  color: 255   0   0 255; }
-color_class { name: "C197";  color: 255   0  95 255; }
-color_class { name: "C198";  color: 255   0 135 255; }
-color_class { name: "C199";  color: 255   0 175 255; }
-color_class { name: "C200";  color: 255   0 215 255; }
-color_class { name: "C201";  color: 255   0 255 255; }
-
-color_class { name: "C202";  color: 255  95   0 255; }
-color_class { name: "C203";  color: 255  95  95 255; }
-color_class { name: "C204";  color: 255  95 135 255; }
-color_class { name: "C205";  color: 255  95 175 255; }
-color_class { name: "C206";  color: 255  95 215 255; }
-color_class { name: "C207";  color: 255  95 255 255; }
-
-color_class { name: "C208";  color: 255 135   0 255; }
-color_class { name: "C209";  color: 255 135  95 255; }
-color_class { name: "C210";  color: 255 135 135 255; }
-color_class { name: "C211";  color: 255 135 175 255; }
-color_class { name: "C212";  color: 255 135 215 255; }
-color_class { name: "C213";  color: 255 135 255 255; }
-
-color_class { name: "C214";  color: 255 175   0 255; }
-color_class { name: "C215";  color: 255 175  95 255; }
-color_class { name: "C216";  color: 255 175 135 255; }
-color_class { name: "C217";  color: 255 175 175 255; }
-color_class { name: "C218";  color: 255 175 215 255; }
-color_class { name: "C219";  color: 255 175 255 255; }
-
-color_class { name: "C220";  color: 255 215   0 255; }
-color_class { name: "C221";  color: 255 215  95 255; }
-color_class { name: "C222";  color: 255 215 135 255; }
-color_class { name: "C223";  color: 255 215 175 255; }
-color_class { name: "C224";  color: 255 215 215 255; }
-color_class { name: "C225";  color: 255 215 255 255; }
-
-color_class { name: "C226";  color: 255 255   0 255; }
-color_class { name: "C227";  color: 255 255  95 255; }
-color_class { name: "C228";  color: 255 255 135 255; }
-color_class { name: "C229";  color: 255 255 175 255; }
-color_class { name: "C230";  color: 255 255 215 255; }
-color_class { name: "C231";  color: 255 255 255 255; }
-
-// greyscale ramp (24 not including black and white, so 26 if included)
-color_class { name: "C232";  color:   8   8   8 255; }
-color_class { name: "C233";  color:  18  18  18 255; }
-color_class { name: "C234";  color:  28  28  28 255; }
-color_class { name: "C235";  color:  38  38  38 255; }
-color_class { name: "C236";  color:  48  48  48 255; }
-color_class { name: "C237";  color:  58  58  58 255; }
-color_class { name: "C238";  color:  68  68  68 255; }
-color_class { name: "C239";  color:  78  78  78 255; }
-color_class { name: "C240";  color:  88  88  88 255; }
-color_class { name: "C241";  color:  98  98  98 255; }
-color_class { name: "C242";  color: 108 108 108 255; }
-color_class { name: "C243";  color: 118 118 118 255; }
-color_class { name: "C244";  color: 128 128 128 255; }
-color_class { name: "C245";  color: 138 138 138 255; }
-color_class { name: "C246";  color: 148 148 148 255; }
-color_class { name: "C247";  color: 158 158 158 255; }
-color_class { name: "C248";  color: 168 168 168 255; }
-color_class { name: "C249";  color: 178 178 178 255; }
-color_class { name: "C250";  color: 188 188 188 255; }
-color_class { name: "C251";  color: 198 198 198 255; }
-color_class { name: "C252";  color: 210 210 210 255; }
-color_class { name: "C253";  color: 218 218 218 255; }
-color_class { name: "C254";  color: 228 228 228 255; }
-color_class { name: "C255";  color: 238 238 238 255; }
-#endif
+color_class { name: ":bg";              color:  64  64  64 255; }
+color_class { name: ":bg-dark";         color:  32  32  32 255; }
+color_class { name: ":dim-dark";        color:   0   0   0 200; }
+color_class { name: ":fg";              color: 160 160 160 255; }
+color_class { name: ":fg-light";        color: 255 255 255 255; }
+color_class { name: ":light-medium";    color: 255 255 255 128; }
+color_class { name: ":selected-medium"; color:  51 153 255 128; }
+color_class { name: ":selected";        color:  51 153 255 255; }
+color_class { name: ":selected-alt";    color: 255 153  51 255; }
+color_class { name: ":shadow";          color:   0   0   0 128; }
+color_class { name: ":shadow-selected"; color:   0   0   0 255; }

data/themes/default/core.edc

@@ -10,23 +10,41 @@ group { name: "terminology/core";
             new r, g, b, a, v;
             v = (getarg(2) * 255) / 100;
 
-            custom_state(PART:"fade", "default", 0.0);
-            get_state_val(PART:"fade", STATE_COLOR, r, g, b, a);
-            set_state_val(PART:"fade", STATE_COLOR, r, g, b, v);
-            set_state(PART:"fade", "custom", 0.0);
+            custom_state(PART:"terminology.fade", "default", 0.0);
+            get_state_val(PART:"terminology.fade", STATE_COLOR, r, g, b, a);
+            set_state_val(PART:"terminology.fade", STATE_COLOR, r, g, b, v);
+            set_state(PART:"terminology.fade", "custom", 0.0);
          }
       }
    }
    parts {
         ////////////////////////////////////////////////////////////////////
         // background handling
-      part { name: "fade"; type: RECT;
+      part { name: "terminology.fade"; type: RECT;
          description { state: "default" 0.0;
+             color_class: "BG";
+         }
+         description { state: "image" 0.0;
+            inherit: "default" 0.0;
+             color_class: "";
+         }
+         description { state: "scale" 0.0;
+            inherit: "default" 0.0;
+             color_class: "";
+         }
+         description { state: "edje" 0.0;
+            inherit: "default" 0.0;
+             color_class: "";
+         }
+         description { state: "movie" 0.0;
+            inherit: "default" 0.0;
+             color_class: "";
          }
       }
       part { name: "terminology.background"; type: SWALLOW;
-         clip_to: "fade";
+         clip_to: "terminology.fade";
          description { state: "default" 0.0;
+             color_class: "BG";
          }
          description { state: "image" 0.0;
             inherit: "default" 0.0;
@@ -45,26 +63,31 @@ group { name: "terminology/core";
          signal: "media,off"; source: "terminology";
          action: STATE_SET "default" 0.0;
          target: "terminology.background";
+         target: "terminology.fade";
       }
       program {
          signal: "media,image"; source: "terminology";
          action: STATE_SET "image" 0.0;
          target: "terminology.background";
+         target: "terminology.fade";
       }
       program {
          signal: "media,scale"; source: "terminology";
          action: STATE_SET "scale" 0.0;
          target: "terminology.background";
+         target: "terminology.fade";
       }
       program {
          signal: "media,edje"; source: "terminology";
          action: STATE_SET "edje" 0.0;
          target: "terminology.background";
+         target: "terminology.fade";
       }
       program {
          signal: "media,movie"; source: "terminology";
          action: STATE_SET "movie" 0.0;
          target: "terminology.background";
+         target: "terminology.fade";
       }
 
       part { name: "terminology.tabregion"; type: SWALLOW;
@@ -78,13 +101,14 @@ group { name: "terminology/core";
       ////////////////////////////////////////////////////////////////////
       // actual text grid for chars, cursors, selectiond etc. goes here
       part { name: "terminology.content"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 1 0;
             rel1.relative: 0.0 1.0;
             rel1.to_y: "terminology.tabregion";
             rel2.offset: -2 -2;
+            offscale;
          }
       }
-
    }
 }

data/themes/default/fontpreview.edc

@@ -2,54 +2,34 @@
 //// used in the font selection dialog to give a base for black text
 //// previews so they are always visible
 group { name: "terminology/fontpreview";
-   images {
-      image: "fn_shadow.png" COMP;
-   }
    parts {
-      part { name: "shadow";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               offset: -2 -1;
-               to: "base";
-            }
-            rel2 {
-               offset: 1 2;
-               to: "base";
-            }
-            image {
-               normal: "fn_shadow.png";
-               border: 5 5 5 5;
-            }
-            fill.smooth: 0;
-         }
-      }
       part { name: "base"; type: RECT;
-         mouse_events: 1;
+         scale: 1;
          description { state: "default" 0.0;
-            color_class: "BG";
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
+            color_class: "/bg/normal/term/font_preview";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 255 255 255 255;
+            rel.to: "base";
          }
       }
       part { name: "terminology.text.preview"; type: SWALLOW;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             rel1 {
                to: "base";
-               offset: 1 1;
+               offset: 4 4;
             }
             rel2 {
                to: "base";
-               offset: -2 -2;
+               offset: -5 -5;
             }
+            offscale;
          }
       }
    }

data/themes/default/icon.edc

@@ -4,13 +4,13 @@
       parts { part { name: "base"; description { state: "default" 0.0; \
       aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: Img; \
    } } } }
-   ICON("new",      "icon_new.png");
-   ICON("split-h",  "icon_split_h.png");
-   ICON("split-v",  "icon_split_v.png");
-   ICON("mini-view",  "icon_miniview.png");
-   ICON("close",    "icon_close.png");
-   ICON("copy",     "icon_copy.png");
-   ICON("paste",    "icon_paste.png");
-   ICON("settings", "icon_settings.png");
-   ICON("about",    "icon_about.png");
+   ICON("new",       "icon_new.png");
+   ICON("split-h",   "icon-split-h-060.png");
+   ICON("split-v",   "icon-split-v-060.png");
+   ICON("mini-view", "icon_miniview.png");
+   ICON("close",     "icon_close.png");
+   ICON("copy",      "icon_copy.png");
+   ICON("paste",     "icon_paste.png");
+   ICON("settings",  "icon_settings.png");
+   ICON("about",     "icon_about.png");
 #undef ICON

data/themes/default/keybinding.edc

@@ -1,27 +1,20 @@
 group { name: "terminology/keybinding";
    parts {
       part { name: "shadow"; type: RECT;
-         mouse_events: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 196;
+            color_class: "/bg/normal/term/keybinding";
          }
       }
-      part { name: "label"; type: TEXT;
-         mouse_events: 0;
-         effect: SOFT_SHADOW BOTTOM;
+      part { name: "label"; type: TEXT; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "shadow";
-            rel2.to: "shadow";
-            rel1.relative: 0.5 0.5;
-            rel1.offset: 0 0;
-            rel2.relative: 0.5 0.5;
-            rel2.offset: 0 0;
-            color: 255 255 255 255;
-            color3: 0 0 0 18;
-            align: 0.5 0.5;
-            text { font: "Sans"; size: 12;
+            rel.to: "shadow";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
+            color_class: "/fg/normal/term/keybinding";
+            text { font: "Sans"; size: 10;
                min: 1 1;
                ellipsis: 0;
             }

data/themes/default/link.edc

@@ -1,115 +1,54 @@
 ///////////////////////////////////////////////////////////////////////////
 //// an object overlayd on text that is a link
 group { name: "terminology/link";
-   images {
-      image: "lk_bottom.png" COMP;
-      image: "lk_left.png" COMP;
-      image: "lk_right.png" COMP;
-   }
    parts {
-      part { name: "bottom";
+      part { name: "bottom"; type: RECT;
          mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            image.normal: "lk_bottom.png";
-            image.border: 9 9 0 0;
             align: 0.5 1.0;
-            min: 20 8;
-            rel1.offset: -6 0;
+            min: 20 1;
+            rel1.offset: -1 -1;
             rel1.relative: 0.0 1.0;
-            rel2.offset: 5 0;
+            rel2.offset: 0 -1;
             color: 51 153 255 255;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "l";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            image.normal: "lk_left.png";
-            align: 0.0 1.0;
-            min: 4 4;
-            rel1.offset: 16 -1;
-            rel1.relative: 0.0 1.0;
-            rel2.offset: 16 -1;
-            rel2.relative: 0.0 1.0;
-            color: 51 153 255 0;
+            offscale;
          }
          description { state: "out" 0.0;
-            fixed: 1 1;
             inherit: "default" 0.0;
-            min: 16 16;
-            rel1.offset: -10 -1;
-            rel2.offset: -10 -1;
-            color: 51 153 255 255;
+            rel1.offset: -5 -1;
+            rel2.offset: 4 -1;
          }
          description { state: "out2" 0.0;
-            fixed: 1 1;
             inherit: "default" 0.0;
-            min: 32 32;
-            rel1.offset: -26 -1;
-            rel2.offset: -26 -1;
-            color: 51 153 255 0;
-         }
-      }
-      part { name: "r";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            image.normal: "lk_right.png";
-            align: 1.0 1.0;
-            min: 4 4;
-            rel1.offset: -15 0;
-            rel1.relative: 1.0 1.0;
-            rel2.offset: -15 0;
-            rel2.relative: 1.0 1.0;
-            color: 51 153 255 0;
-         }
-         description { state: "out" 0.0;
-            fixed: 1 1;
-            inherit: "default" 0.0;
-            min: 16 16;
-            rel1.offset: 9 -1;
-            rel2.offset: 9 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "out2" 0.0;
-            fixed: 1 1;
-            inherit: "default" 0.0;
-            min: 32 32;
-            rel1.offset: 25 -1;
-            rel2.offset: 25 -1;
-            color: 51 153 255 0;
          }
       }
       part { name: "event"; type: RECT;
-         mouse_events: 1;
          repeat_events: 1;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       programs {
          program { name: "show";
             signal: "show"; source: "";
             action: STATE_SET "out" 0.0;
-            transition: LINEAR 0.3;
-            target: "l";
-            target: "r";
+            transition: SINUSOIDAL 0.5;
+            target: "bottom";
             after: "show2";
          }
          program { name: "show2";
             action: STATE_SET "out2" 0.0;
-            transition: LINEAR 0.3;
-            target: "l";
-            target: "r";
+            transition: SINUSOIDAL 0.2;
+            target: "bottom";
             after: "show3";
          }
          program { name: "show3";
-            action: STATE_SET "default" 0.0;
-            target: "l";
-            target: "r";
-            after: "show";
+            action: STATE_SET "out" 0.0;
+            transition: SINUSOIDAL 0.2;
+            target: "bottom";
+            after: "show2";
          }
       }
    }

data/themes/default/media.edc

@@ -1,11 +1,6 @@
 //////////////////////////////////////////////////////////////////////////////
 //// the multimedia controls
 group { name: "terminology/mediabusy";
-   images {
-      image: "media_busy_knob.png" COMP;
-      image: "media_busy_spinner.png" COMP;
-      image: "media_busy_progress.png" COMP;
-   }
    script {
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_FLOAT) && (id == 1)) {
@@ -23,101 +18,56 @@ group { name: "terminology/mediabusy";
          mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel2.to_x: "knob";
-            rel2.relative: 0.0 1.0;
-            min: 10 40;
-            max: 99999 40;
+            min: 0 5;
+            max: 99999 5;
             align: 0.0 1.0;
          }
       }
-      part { name: "progress";
-         mouse_events: 0;
+      part { name: "progress"; type: RECT; mouse_events: 0;
          clip_to: "fade";
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "progress_area";
-            rel2.to: "progress_area";
+            rel.to: "progress_area";
             rel2.relative: 0.0 1.0;
-            color: 51 153 255 255;
-            image.normal: "media_busy_progress.png";
-            image.border: 5 5 0 0;
-            min: 10 40;
+            color_class: "/bg/selected/media/position";
+            min: 0 5;
             align: 0.0 1.0;
          }
       }
       part { name: "fade"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
-            color: 255 255 255 0;
+            color: 255 255 255 0; // no cc
             visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
-      part { name: "knob";
-         clip_to: "fade";
-         mouse_events: 0;
+      part { name: "busy_base"; type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            image.normal: "media_busy_knob.png";
-            min: 40 40;
-            max: 40 40;
+            min: 40 40; max: 40 40;
             align: 1.0 1.0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
-      part { name: "knob_spinner";
-         clip_to: "fade";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            color: 51 153 255 255;
-            rel1.to: "knob";
-            rel2.to: "knob";
-            image.normal: "media_busy_spinner.png";
-            map {
-               on: 1;
-               smooth: 1;
-               rotation.center: "knob";
-            }
-         }
-         description { state: "spin" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            map.rotation.z: 360;
-         }
-      }
+      BUSY("busy_base", "busy", "terminology", "done", "terminology")
    }
    programs {
-      program {
-         signal: "busy"; source: "terminology";
+      program { signal: "busy"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1 CURRENT;
          target: "fade";
       }
-      program { name: "spin1";
-         signal: "busy"; source: "terminology";
-         action: STATE_SET "spin" 0.0;
-         transition: LINEAR 0.5;
-         target: "knob_spinner";
-         after: "spin2";
-      }
-      program { name: "spin2";
+      program { signal: "done"; source: "terminology";
          action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-         after: "spin1";
-      }
-      //         program { name: "downloading";
-      //            signal: "busy";
-      //            source: "terminology";
-      //            action: STATE_SET "default" 0.0;
-      //         }
-      program {
-         signal: "done"; source: "terminology";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 1.5;
+         transition: DECELERATE 1.5 USE_DURATION_FACTOR 1 CURRENT;
          target: "fade";
       }
    }
@@ -138,8 +88,7 @@ group { name: "terminology/mediactrl";
       part { name: "media_clip"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "media_bg";
-            rel2.to: "media_bg";
+            rel.to: "media_bg";
          }
       }
       part { name: "media_bg";
@@ -149,7 +98,7 @@ group { name: "terminology/mediactrl";
             image.border: 11 11 11 11;
             min: 24 24;
             max: 24 24;
-            align: 1.0 0.0;
+            align: 1.0 1.0;
          }
          description { state: "expanded" 0.0;
             inherit: "default" 0.0;
@@ -162,6 +111,7 @@ group { name: "terminology/mediactrl";
          repeat_events: 1;
          clip_to: "media_clip";
          description { state: "default" 0.0;
+            rel.to: "media_bg";
             image.normal: "media_pause.png";
             max: 24 24;
             align: 1.0 0.0;
@@ -193,8 +143,7 @@ group { name: "terminology/mediactrl";
             image.border: 15 15 0 0;
             min: 90 14;
             max: 90 14;
-            rel1.to: "stop";
-            rel2.to: "stop";
+            rel.to: "stop";
             rel1.offset: -25 0;
             rel2.offset: -90 0;
          }
@@ -257,54 +206,46 @@ group { name: "terminology/mediactrl";
       }
    }
    programs {
-      program {
-         signal: "mouse,in"; source: "media_bg";
+      program { signal: "pause,set"; source: "terminology";
+         action: STATE_SET "paused" 0.0;
+         target: "play";
+      }
+      program { signal: "play,set"; source: "terminology";
+         action: STATE_SET "default" 0.0;
+         target: "play";
+      }
+      program { signal: "mute,set"; source: "terminology";
+         action: STATE_SET "muted" 0.0;
+         target: "terminology.voldrag";
+      }
+      program { signal: "mute,unset"; source: "terminology";
+         action: STATE_SET "default" 0.0;
+         target: "terminology.voldrag";
+      }
+
+      program { signal: "mouse,in"; source: "media_bg";
          action: STATE_SET "expanded" 0.0;
          transition: SINUSOIDAL 0.4 CURRENT;
          target: "media_bg";
       }
-      program {
-         signal: "mouse,out"; source: "media_bg";
+      program { signal: "mouse,out"; source: "media_bg";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.4 CURRENT;
          target: "media_bg";
       }
-      program {
-         signal: "mouse,up,*"; source: "play";
+      program { signal: "mouse,up,*"; source: "play";
          filter: "play" "default";
          action: SIGNAL_EMIT "pause" "";
       }
-      program {
-         signal: "mouse,up,1"; source: "play";
+      program { signal: "mouse,up,1"; source: "play";
          filter: "play" "paused";
          action: SIGNAL_EMIT "play" "";
       }
-      program {
-         signal: "mouse,up,1"; source: "stop";
+      program { signal: "mouse,up,1"; source: "stop";
          action: SIGNAL_EMIT "stop" "";
       }
-      program {
-         signal: "pause,set"; source: "terminology";
-         action: STATE_SET "paused" 0.0;
-         target: "play";
-      }
-      program {
-         signal: "play,set"; source: "terminology";
-         action: STATE_SET "default" 0.0;
-         target: "play";
-      }
-      program {
-         signal: "mute,set"; source: "terminology";
-         action: STATE_SET "muted" 0.0;
-         target: "terminology.voldrag";
-      }
-      program {
-         signal: "mute,unset"; source: "terminology";
-         action: STATE_SET "default" 0.0;
-         target: "terminology.voldrag";
-      }
-      program {
-         signal: "mouse,down,1"; source: "posline";
+
+      program { signal: "mouse,down,1"; source: "posline";
          filter: "terminology.posdrag" "default";
          script {
             new x, y, w, h, m_x, m_y;
@@ -319,12 +260,10 @@ group { name: "terminology/mediactrl";
 
          }
       }
-      program {
-         signal: "mouse,up,1"; source: "posline";
+      program { signal: "mouse,up,1"; source: "posline";
          action: SIGNAL_EMIT "pos,drag,stop" "";
       }
-      program {
-         signal: "mouse,move"; source: "posline";
+      program { signal: "mouse,move"; source: "posline";
          script {
             new x, y, w, h, m_x, m_y;
             new Float:pos;
@@ -339,8 +278,7 @@ group { name: "terminology/mediactrl";
             emit("pos,drag", "");
          }
       }
-      program {
-         signal: "mouse,down,1"; source: "volline";
+      program { signal: "mouse,down,1"; source: "volline";
          filter: "terminology.voldrag" "default";
          script {
             new x, y, w, h, m_x, m_y;
@@ -355,8 +293,7 @@ group { name: "terminology/mediactrl";
 
          }
       }
-      program {
-         signal: "mouse,move"; source: "volline";
+      program { signal: "mouse,move"; source: "volline";
          script {
             new x, y, w, h, m_x, m_y;
             new Float:pos;

data/themes/default/miniview.edc

@@ -1,97 +1,83 @@
 group { name: "terminology/miniview";
-   images {
-      image: "icon_close.png" COMP;
-      image: "fn_shadow.png" COMP;
-   }
-   set { name: "bg_shadow";
-      image { image: "bg_shadow.png"  COMP; size: 0 0 200 150; }
-      image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
-      image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
-   }
    parts {
-      part { name: "miniview.bg"; type: RECT;
-           //mouse_events: 1;
+      part { name: "miniview_bg"; type: RECT;
          description { state: "default" 0.0;
             color_class: "BG";
          }
       }
-      part { name: "shadow";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bg_shadow";
-            fill.smooth: 0;
-         }
-      }
       part { name: "miniview.img"; type: SWALLOW;
          description { state: "default" 0.0;
-            visible: 1;
             rel1 {
-               to: "miniview.bg";
+               to: "miniview_bg";
                relative: 0.0 0.0;
                offset: 0 0;
             }
             rel2 {
-               to: "miniview.bg";
+               to: "miniview_bg";
                relative: 1.0 1.0;
                offset: -1 -1;
             }
          }
       }
       part { name: "miniview_screen"; type: RECT;
-         mouse_events: 1;
          dragable {
             confine: "miniview.img";
             x: 0 0 0;
             y: 1 1 0;
          }
          description { state: "default" 0.0;
-            color: 255 255 255 40;
-            fixed:1 1;
+            rel.to: "miniview.img";
+            color_class: "/fg/selected/term/miniview/screen";
+            color: 255 255 255 40; // no cc
+            fixed: 1 1;
          }
          description { state: "outbounds" 0.0;
-            color: 255 25 35 40;
-            fixed:1 1;
+            inherit : "default" 0.0;
+            color_class: "/fg/disabled/term/miniview/screen";
          }
       }
-      part { name: "miniview.close_shadow"; type: IMAGE;
+      part { name: "miniview_close";
+         scale: 1;
          description { state: "default" 0.0;
-            image {
-               normal: "fn_shadow.png";
-            };
-            rel1 {
-               to: "miniview.bg";
-               relative: 0.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "miniview.bg";
-               relative: 0.0 0.0;
-               offset: 16 16;
-            }
+            image.normal: "tab_close";
+            rel.to: "miniview_ev";
+            color_class: "/fg/normal/term/miniview/close";
+            min: 15 15;
+            max: 15 15;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color_class: "/fg/pressed/term/miniview/close";
          }
       }
-      part { name: "miniview.close"; type: IMAGE;
+      part { name: "miniview_ev"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            image {
-               normal: "icon_close.png";
-            };
-            rel1.to: "miniview.close_shadow";
-            rel2.to: "miniview.close_shadow";
+            color: 0 0 0 0; // no cc
+            rel.to: "miniview_bg";
+            min: 25 25;
+            max: 25 25;
+            align: 1.0 0.0;
          }
       }
    };
    programs {
-      program {
-         signal: "mouse,clicked,1"; source: "miniview.close";
+      program { signal: "mouse,down,1"; source: "miniview_ev";
+         action: STATE_SET "pressed" 0.0;
+         target: "miniview_close";
+      }
+      program { signal: "mouse,up,1"; source: "miniview_ev";
+         action: STATE_SET "default" 0.0;
+         target: "miniview_close";
+      }
+      program { signal: "mouse,clicked,1"; source: "miniview_ev";
          action: SIGNAL_EMIT "miniview,close" "terminology";
       }
-      program {
-         signal: "miniview_screen,inbounds"; source: "miniview";
+      program { signal: "miniview_screen,inbounds"; source: "miniview";
          action: STATE_SET "default" 0.0;
          target: "miniview_screen";
       }
-      program {
-         signal: "miniview_screen,outbounds"; source: "miniview";
+      program { signal: "miniview_screen,outbounds"; source: "miniview";
          action: STATE_SET "outbounds" 0.0;
          target: "miniview_screen";
       }

data/themes/default/sel.edc

@@ -2,53 +2,33 @@
 //// an object to contain the selection tool used for selecting tabs (with
 //// a glow grid of terms
 group { name: "terminology/sel/base";
-   images {
-      image: "pm_overlay.png" COMP;
-      image: "pm_fill.png" COMP;
-      image: "inset_shadow.png" COMP;
-   }
-   set { name: "bg_shadow";
-      image { image: "bg_shadow.png"  COMP; size: 0 0 200 150; }
-      image { image: "bg_shadow2.png" COMP; size: 200 150 400 300; }
-      image { image: "bg_shadow3.png" COMP; size: 400 300 99999 99999; }
-   }
    script {
       public message(Msg_Type:type, id, ...) {
-         new r, g, b, a, v;
+//         new r, g, b, a;
+         new v;
 
          if ((type != MSG_INT) || (id != 1)) return;
 
          v = (getarg(2) * 255) / 100;
 
-         custom_state(PART:"shadow", "default", 0.0);
-         get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
-         set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
-         set_state(PART:"shadow", "custom", 0.0);
+//         custom_state(PART:"shadow", "default", 0.0);
+//         get_state_val(PART:"shadow", STATE_COLOR, r, g, b, a);
+//         set_state_val(PART:"shadow", STATE_COLOR, r, g, b, v);
+//         set_state(PART:"shadow", "custom", 0.0);
 
          if (v < 255)
-         set_state(PART:"fill", "translucent", 0.0);
+           set_state(PART:"fill", "translucent", 0.0);
          else
-         set_state(PART:"fill", "default", 0.0);
+           set_state(PART:"fill", "default", 0.0);
       }
    }
    parts {
-        ////////////////////////////////////////////////////////////////////
-        // background and shadows
-      part { name: "shadow";
+      ////////////////////////////////////////////////////////////////////
+      // background and shadows
+      part { name: "fill"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bg_shadow";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "fill";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "pm_fill.png";
-            fill {
-               size.relative: 0.0 0.0;
-               size.offset: 64 64;
-            }
+            color: 32 32 32 255;
          }
          description { state: "translucent" 0.0;
             inherit: "default" 0.0;
@@ -70,118 +50,57 @@ group { name: "terminology/sel/base";
 
       ////////////////////////////////////////////////////////////////////
       // fancy stuff on top
-      part { name: "overlay";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "pm_overlay.png";
-            color: 255 255 255 0;
-            fill.smooth: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "overlay_shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      program {
-         signal: "begin"; source: "terminology";
-         action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.3;
-         target: "overlay";
-         target: "overlay_shadow";
-      }
-      program {
-         signal: "end"; source: "terminology";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.3 CURRENT;
-         target: "overlay";
-         target: "overlay_shadow";
-      }
+//      program { signal: "begin"; source: "terminology";
+//         action: STATE_SET "visible" 0.0;
+//         transition: DECELERATE 0.3;
+//         target: "overlay";
+//      }
+//      program { signal: "end"; source: "terminology";
+//         action: STATE_SET "default" 0.0;
+//         transition: DECELERATE 0.3 CURRENT;
+//         target: "overlay";
+//         target: "overlay_shadow";
+//      }
    }
 }
 
 group { name: "terminology/sel/item";
-   images {
-      image: "bg_bevel.png" COMP;
-      image: "bg_glint.png" COMP;
-      image: "pm_shadow.png" COMP;
-      image: "cr_glow.png" COMP;
-      image: "bg_led_glow.png" COMP;
-      image: "bg_led_base.png" COMP;
-      image: "bg_led.png" COMP;
-      image: "bg_led_strobe.png" COMP;
-   }
-   set { name: "bg_shine";
-      image { image: "bg_shine5.png" COMP; size: 0 0 256 120; }
-      image { image: "bg_shine4.png" COMP; size: 256 120 512 240; }
-      image { image: "bg_shine3.png" COMP; size: 512 240 1024 480; }
-      image { image: "bg_shine2.png" COMP; size: 1024 480 2048 960; }
-      image { image: "bg_shine.png"  COMP; size: 2048 960 99999 99999; }
-   }
+   images.image: "pm_shadow.png" COMP;
    parts {
-        ////////////////////////////////////////////////////////////////////
-        // base background and selection image
+      ////////////////////////////////////////////////////////////////////
+      // base background and selection image
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            color: 128 128 128 255;
+            rel.to: "terminology.content";
+            color: 192 192 192 255; // no cc
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            color: 255 255 255 255; // no cc
          }
       }
       part { name: "shadow";
          mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            rel1.offset: -5 -5;
-            rel2.offset: 4 4;
+            rel.to: "terminology.content";
+            rel1.offset: -32 -32;
+            rel2.offset: 31 31;
             image.normal: "pm_shadow.png";
             image.border: 64 64 64 64;
-            image.border_scale_by: 0.1;
-            color: 255 255 255 128;
+            image.border_scale_by: 0.5;
+            image.border_scale: 1;
+            color_class: "/shadow/normal/term/sel/item";
             fill.smooth: 0;
+            offscale;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -40 -40;
-            rel2.offset: 39 39;
+            rel1.offset: -64 -64;
+            rel2.offset: 63 63;
             image.border_scale_by: 1.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "glow";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            rel1.offset: -4 -4;
-            rel2.offset: 3 3;
-            image {
-               normal: "cr_glow.png";
-               border: 9 9 9 9;
-            }
-            color: 51 153 255 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            color: 51 153 255 255;
+            color_class: "/shadow/selected/term/sel/item";
          }
       }
 
@@ -191,8 +110,7 @@ group { name: "terminology/sel/item";
          clip_to: "clip";
          description { state: "default" 0.0;
             color_class: "BG";
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
+            rel.to: "terminology.content";
          }
       }
       part { name: "terminology.content"; type: SWALLOW;
@@ -207,255 +125,160 @@ group { name: "terminology/sel/item";
             rel2.relative: 1.0 1.0;
          }
       }
-      program {
-         signal: "selected"; source: "terminology";
+      program { signal: "selected"; source: "terminology";
          action: STATE_SET "selected" 0.0;
          transition: DECELERATE 0.2 CURRENT;
          target: "terminology.content";
          target: "terminology.label";
          target: "shadow";
          target: "clip";
-         target: "glow";
       }
-      program {
-         signal: "selected,start"; source: "terminology";
+      program { signal: "selected,start"; source: "terminology";
          action: STATE_SET "selected" 0.0;
          target: "terminology.content";
          target: "terminology.label";
          target: "shadow";
          target: "clip";
-         target: "glow";
       }
-      program {
-         signal: "unselected"; source: "terminology";
+      program { signal: "unselected"; source: "terminology";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.4 CURRENT;
          target: "terminology.content";
          target: "terminology.label";
          target: "shadow";
          target: "clip";
-         target: "glow";
       }
 
       ////////////////////////////////////////////////////////////////////
       // fancy stuff over the top of the terminal for shading and labelling
-      part { name: "overlay";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            image.normal: "pm_overlay.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "bevel";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            image.normal: "bg_bevel.png";
-            image.border: 3 3 3 3;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
       part { name: "terminology.label"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            color: 51 153 255 255;
-            color2: 51 153 255 24;
-            color3: 51 153 255 18;
-            align: 0.5 1.0;
+            rel.to: "terminology.content";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
+            color_class: "/fg/normal/term/sel/title/text";
+            align: 0.5 0.0;
             text { font: "Sans"; size: 10;
-               align: 0.5 1.0;
+               align: 0.5 0.0;
                min: 0 1;
             }
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
-            color2: 51 153 255 128;
-            color3: 51 153 255 20;
-         }
-      }
-      part { name: "clip2"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-         }
-      }
-
-      ////////////////////////////////////////////////////////////////////
-      // fancy stuff on top
-      part { name: "glint";
-         mouse_events: 0;
-         clip_to: "clip2";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 79 5;
-            max: 79 5;
-            rel1 {
-               to: "terminology.content";
-               relative: 0.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "terminology.content";
-               relative: 1.0 0.0;
-               offset: -1 0;
-            }
-            image.normal: "bg_glint.png";
-         }
-      }
-      part { name: "shine";
-         mouse_events: 0;
-         clip_to: "clip2";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            image.normal: "bg_shine";
-            fill.smooth: 0;
-            align: 0.5 0.0;
-            aspect: (256/120) (256/120);
-            aspect_preference: HORIZONTAL;
+            color_class: "/fg/selected/term/sel/title/text";
          }
       }
 
       ////////////////////////////////////////////////////////////////////
       // visual bell - spinning red siren light
-      part { name: "bell_glow";
-         mouse_events: 0;
+      images.image: "circle-1200.png" COMP;
+      images.image: "strobe-600.png" COMP;
+      part { name: "bell_glow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             visible: 0;
-            color: 255 255 255 0;
-            rel1.to: "bell_base";
-            rel2.to: "bell_base";
-            min: 200 200;
-            fill.smooth: 0;
-            image.normal: "bg_led_glow.png";
+            color: 255 80 60 0; // no cc
+            rel.to: "bell";
+            min: 100 100;
+            image.normal: "circle-1200.png";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
+            color: 255 80 60 32;
          }
       }
-      part { name: "bell_base";
-         mouse_events: 0;
+      part { name: "bell_glow2"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             visible: 0;
-            color: 255 255 255 0;
-            min: 32 32;
-            max: 32 32;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            align: 1.0 1.0;
-            image.normal: "bg_led_base.png";
+            color: 255 240 160 0; // no cc
+            rel.to: "bell";
+            min: 50 50;
+            image.normal: "circle-1200.png";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "bell";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            visible: 0;
-            color: 255 255 255 0;
-            rel1.to: "bell_base";
-            rel2.to: "bell_base";
-            image.normal: "bg_led.png";
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            color: 255 255 255 255;
+            color: 255 220 120 32;
          }
       }
       part { name: "bell_strobe";
          mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            visible: 0;
-            color: 255 255 255 0;
-            rel1.to: "bell";
-            rel2.to: "bell";
-            image.normal: "bg_led_strobe.png";
+            color: 255 255 200 255;
+            rel.to: "bell_glow2";
+            image.normal: "strobe-600.png";
+            rel1.relative: -0.5 -0.5;
+            rel2.relative: 1.5 1.5;
             map {
                on: 1;
                smooth: 1;
                rotation.center: "bell";
             }
+            visible: 0;
          }
          description { state: "spin" 0.0;
             inherit: "default" 0.0;
+            map.rotation.z: 0.0;
             visible: 1;
-            color: 255 255 255 255;
-            map.rotation.z: 36.0;
          }
          description { state: "spin_done" 0.0;
-            inherit: "spin" 0.0;
+            inherit: "default" 0.0;
             map.rotation.z: 720.0;
-         }
-         description { state: "spin_done2" 0.0;
-            inherit: "spin" 0.0;
-            map.rotation.z: 1440.0;
+            visible: 1;
          }
       }
-      program {
-         signal: "bell"; source: "terminology";
-         action: STATE_SET "default" 0.0;
-         target: "bell_base";
-         target: "bell";
-         target: "bell_strobe";
-         target: "bell_glow";
-         after: "bell";
+      part { name: "bell";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            visible: 0;
+            color: 255 255 255 0;
+            max: 20 20;
+            min: 20 20;
+            align: 1.0 1.0;
+            rel1.offset: 15 15;
+            rel2.offset: -16 -16;
+            rel.to: "terminology.content";
+            image.normal: "circle-1200.png";
+            offscale;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
       }
-      program { name: "bell";
+      program { signal: "bell"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         target: "bell_base";
-         target: "bell_glow";
-         after: "bell2";
-      }
-      program { name: "bell2";
-         action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.1;
          target: "bell";
          target: "bell_glow";
+         target: "bell_glow2";
          after: "bell3";
       }
       program { name: "bell3";
          action: STATE_SET "spin" 0.0;
          transition: LINEAR 0.1;
          target: "bell_strobe";
+         after: "bell4.1";
+      }
+      program { name: "bell4.1";
+         action: STATE_SET "spin" 0.0;
+         target: "bell_strobe";
          after: "bell4.2";
       }
       program { name: "bell4.2";
          action: STATE_SET "spin_done" 0.0;
          transition: LINEAR 0.9;
          target: "bell_strobe";
-         after: "bell4.3";
-      }
-      program { name: "bell4.3";
-         action: STATE_SET "spin_done2" 0.0;
-         transition: LINEAR 1.0;
-         target: "bell_strobe";
-         after: "bell4.4";
-      }
-      program { name: "bell4.4";
-         action: STATE_SET "spin_done" 0.0;
-         target: "bell_strobe";
-         after: "bell4.3";
+         after: "bell4.1";
       }
    }
 }

data/themes/default/tab_drag_thumb.edc

@@ -1,28 +1,11 @@
 group { name: "terminology/tab_drag_thumb";
-   images {
-      image: "bg_bevel.png" COMP;
-      image: "bg_glint.png" COMP;
-      image: "pm_shadow.png" COMP;
-      image: "cr_glow.png" COMP;
-      image: "bg_led_glow.png" COMP;
-      image: "bg_led_base.png" COMP;
-      image: "bg_led.png" COMP;
-      image: "bg_led_strobe.png" COMP;
-   }
-   set { name: "bg_shine";
-      image { image: "bg_shine5.png" COMP; size: 0 0 256 120; }
-      image { image: "bg_shine4.png" COMP; size: 256 120 512 240; }
-      image { image: "bg_shine3.png" COMP; size: 512 240 1024 480; }
-      image { image: "bg_shine2.png" COMP; size: 1024 480 2048 960; }
-      image { image: "bg_shine.png"  COMP; size: 2048 960 99999 99999; }
-   }
+   images.image: "pm_shadow.png" COMP;
    parts {
         ////////////////////////////////////////////////////////////////////
         // base background and selection image
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
+            rel.to: "terminology.content";
             color: 255 255 255 255;
          }
       }
@@ -30,29 +13,16 @@ group { name: "terminology/tab_drag_thumb";
          mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            rel1.offset: -40 -40;
-            rel2.offset: 39 39;
+            rel.to: "terminology.content";
+            rel1.offset: -32 -32;
+            rel2.offset: 31 31;
             image.normal: "pm_shadow.png";
             image.border: 64 64 64 64;
-            image.border_scale_by: 1.0;
-            color: 255 255 255 255;
+            image.border_scale_by: 0.5;
+            image.border_scale: 1;
+            color_class: "/shadow/normal/term/drag_thumb";
             fill.smooth: 0;
-         }
-      }
-      part { name: "glow";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            rel1.offset: -4 -4;
-            rel2.offset: 3 3;
-            image {
-               normal: "cr_glow.png";
-               border: 9 9 9 9;
-            }
-            color_class: "GLOW";
+            offscale;
          }
       }
 
@@ -62,53 +32,24 @@ group { name: "terminology/tab_drag_thumb";
          clip_to: "clip";
          description { state: "default" 0.0;
             color_class: "BG";
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
+            rel.to: "terminology.content";
          }
       }
       part { name: "terminology.content"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
          }
       }
 
-      ////////////////////////////////////////////////////////////////////
-      // fancy stuff over the top of the terminal for shading and title
-      part { name: "overlay";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            image.normal: "pm_overlay.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "bevel";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            image.normal: "bg_bevel.png";
-            image.border: 3 3 3 3;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
       part { name: "terminology.title"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            color:  255 255 255 255;
-            color2: 255 255 255 128;
-            color3: 255 255 255  20;
-            color_class: "GLOW_TXT";
-            align: 0.5 1.0;
+            rel.to: "terminology.content";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color_class: "/fg/normal/term/sel/title/text";
+            align: 0.5 0.0;
+            offscale;
             text { font: "Sans"; size: 10;
                align: 0.5 1.0;
                min: 0 1;
@@ -116,173 +57,114 @@ group { name: "terminology/tab_drag_thumb";
          }
       }
 
-      ////////////////////////////////////////////////////////////////////
-      // fancy stuff on top
-      part { name: "glint";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 79 5;
-            max: 79 5;
-            rel1 {
-               to: "terminology.content";
-               relative: 0.0 0.0;
-               offset: 0 0;
-            }
-            rel2 {
-               to: "terminology.content";
-               relative: 1.0 0.0;
-               offset: -1 0;
-            }
-            image.normal: "bg_glint.png";
-         }
-      }
-      part { name: "shine";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            image.normal: "bg_shine";
-            fill.smooth: 0;
-            align: 0.5 0.0;
-            aspect: (256/120) (256/120);
-            aspect_preference: HORIZONTAL;
-         }
-      }
-
       ////////////////////////////////////////////////////////////////////
       // visual bell - spinning red siren light
-      part { name: "bell_glow";
-         mouse_events: 0;
-         clip_to: "clip";
+      images.image: "circle-1200.png" COMP;
+      images.image: "strobe-600.png" COMP;
+      part { name: "bell_glow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             visible: 0;
-            color: 255 255 255 0;
-            rel1.to: "bell_base";
-            rel2.to: "bell_base";
-            min: 200 200;
-            fill.smooth: 0;
-            image.normal: "bg_led_glow.png";
+            color: 255 80 60 0; // no cc
+            rel.to: "bell";
+            min: 100 100;
+            image.normal: "circle-1200.png";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
+            color: 255 80 60 32;
          }
       }
-      part { name: "bell_base";
-         mouse_events: 0;
+      part { name: "bell_glow2"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             visible: 0;
-            color: 255 255 255 0;
-            min: 32 32;
-            max: 32 32;
-            rel1.to: "terminology.content";
-            rel2.to: "terminology.content";
-            align: 1.0 1.0;
-            image.normal: "bg_led_base.png";
+            color: 255 240 160 0; // no cc
+            rel.to: "bell";
+            min: 50 50;
+            image.normal: "circle-1200.png";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "bell";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            visible: 0;
-            color: 255 255 255 0;
-            rel1.to: "bell_base";
-            rel2.to: "bell_base";
-            image.normal: "bg_led.png";
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            color: 255 255 255 255;
+            color: 255 220 120 32;
          }
       }
       part { name: "bell_strobe";
          mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 1;
-            visible: 0;
-            color: 255 255 255 0;
-            rel1.to: "bell";
-            rel2.to: "bell";
-            image.normal: "bg_led_strobe.png";
+            color: 255 255 200 255;
+            rel.to: "bell_glow2";
+            image.normal: "strobe-600.png";
+            rel1.relative: -0.5 -0.5;
+            rel2.relative: 1.5 1.5;
             map {
                on: 1;
                smooth: 1;
                rotation.center: "bell";
             }
+            visible: 0;
          }
          description { state: "spin" 0.0;
             inherit: "default" 0.0;
+            map.rotation.z: 0.0;
             visible: 1;
-            color: 255 255 255 255;
-            map.rotation.z: 36.0;
          }
          description { state: "spin_done" 0.0;
-            inherit: "spin" 0.0;
+            inherit: "default" 0.0;
             map.rotation.z: 720.0;
-         }
-         description { state: "spin_done2" 0.0;
-            inherit: "spin" 0.0;
-            map.rotation.z: 1440.0;
+            visible: 1;
          }
       }
-      program {
-         signal: "bell"; source: "terminology";
-         action: STATE_SET "default" 0.0;
-         target: "bell_base";
-         target: "bell";
-         target: "bell_strobe";
-         target: "bell_glow";
-         after: "bell";
+      part { name: "bell";
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            visible: 0;
+            color: 255 255 255 0;
+            max: 20 20;
+            min: 20 20;
+            align: 1.0 1.0;
+            rel1.offset: 15 15;
+            rel2.offset: -16 -16;
+            rel.to: "terminology.content";
+            image.normal: "circle-1200.png";
+            offscale;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
       }
-      program { name: "bell";
+      program { signal: "bell"; source: "terminology";
          action: STATE_SET "visible" 0.0;
-         target: "bell_base";
-         target: "bell_glow";
-         after: "bell2";
-      }
-      program { name: "bell2";
-         action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.1;
          target: "bell";
          target: "bell_glow";
+         target: "bell_glow2";
          after: "bell3";
       }
       program { name: "bell3";
          action: STATE_SET "spin" 0.0;
          transition: LINEAR 0.1;
          target: "bell_strobe";
+         after: "bell4.1";
+      }
+      program { name: "bell4.1";
+         action: STATE_SET "spin" 0.0;
+         target: "bell_strobe";
          after: "bell4.2";
       }
       program { name: "bell4.2";
          action: STATE_SET "spin_done" 0.0;
          transition: LINEAR 0.9;
          target: "bell_strobe";
-         after: "bell4.3";
-      }
-      program { name: "bell4.3";
-         action: STATE_SET "spin_done2" 0.0;
-         transition: LINEAR 1.0;
-         target: "bell_strobe";
-         after: "bell4.4";
-      }
-      program { name: "bell4.4";
-         action: STATE_SET "spin_done" 0.0;
-         target: "bell_strobe";
-         after: "bell4.3";
+         after: "bell4.1";
       }
    }
 }

data/themes/default/tabbar_back.edc

@@ -1,210 +1,130 @@
 group { name: "terminology/tabbar_back";
-   images {
-      image: "tab_base_l1.png" COMP;
-      image: "tab_base_m.png" COMP;
-      image: "tab_base_r1.png" COMP;
-      image: "tab_other_l.png" COMP;
-      image: "tab_other_m.png" COMP;
-      image: "tab_other_r.png" COMP;
-      image: "tab_shad_l2.png" COMP;
-      image: "tab_shad_r2.png" COMP;
-   }
    set { name: "tab_grouped";
       image { image: "tab_grouped_8.png" COMP; size: 0 0 8 8; }
       image { image: "tab_grouped_16.png" COMP; size: 8 8 16 16; }
       image { image: "tab_grouped_32.png" COMP; size: 16 16 99999 99999; }
    }
    parts {
-      part { name: "tab_bevel_shad1";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "tab_bevel_top1";
-            rel2.to: "tab_bevel_top1";
-            image.normal: "tab_shad_l2.png";
-            image.border: 0 0 10 10;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "tab_bevel_shad3";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "tab_bevel_top3";
-            rel2.to: "tab_bevel_top3";
-            image.normal: "tab_shad_r2.png";
-            image.border: 0 0 10 10;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "tab_base_top1";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "tab_bevel_top1";
-            rel2.to: "tab_bevel_top1";
-            image.normal: "tab_other_l.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "tab_base_top2";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "tab_bevel_top2";
-            rel2.to: "tab_bevel_top2";
-            image.normal: "tab_other_m.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "tab_base_top3";
-         mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "tab_bevel_top3";
-            rel2.to: "tab_bevel_top3";
-            image.normal: "tab_other_r.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "tab_bevel_top1";
-         mouse_events: 0;
+      images.image: "tab_shad_l.png" COMP;
+      part { name: "tab_bevel_top1"; mouse_events: 0;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            rel1.offset: -4 0;
-            max: 12 99999;
-            min: 12 0;
-            image.normal: "tab_base_l1.png";
-            image.border: 0 0 4 4;
+            max: 5 99999;
+            min: 5 0;
+            image.normal: "tab_shad_l.png";
+            image.border: 0 20 5 15;
+            image.border_scale_by: 0.25;
+            image.border_scale: 1;
             fill.smooth: 0;
             fixed: 1 0;
+            color_class: "/shadow/normal/tab";
          }
       }
-      part { name: "tab_bevel_top2";
-         mouse_events: 0;
+      part { name: "tab_bevel_top2"; type: RECT; mouse_events: 0;
          clip_to: "clip";
          description { state: "default" 0.0;
             rel1.to: "tab_bevel_top1";
             rel1.relative: 1.0 0.0;
             rel2.to: "tab_bevel_top3";
             rel2.relative: 0.0 1.0;
-            image.normal: "tab_base_m.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
+            color_class: "/bg/normal/tab";
          }
       }
-      part { name: "tab_bevel_top3";
-         mouse_events: 0;
+      images.image: "tab_shad_r.png" COMP;
+      part { name: "tab_bevel_top3"; mouse_events: 0;
          clip_to: "clip";
-         description { state: "default" 0.0;
-            align: 1.0 0.0;
-            rel2.offset: 3 -1;
-            max: 12 99999;
-            min: 12 0;
-            image.normal: "tab_base_r1.png";
-            image.border: 0 0 4 4;
-            fill.smooth: 0;
-            fixed: 1 0;
-         }
-      }
-      part { name: "tabgrouped"; type: IMAGE;
          scale: 1;
          description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
+            align: 1.0 0.0;
+            max: 5 99999;
+            min: 5 0;
+            image.normal: "tab_shad_r.png";
+            image.border: 20 0 5 15;
+            image.border_scale_by: 0.25;
+            image.border_scale: 1;
+            fill.smooth: 0;
+            fixed: 1 0;
+            color_class: "/shadow/normal/tab";
+         }
+      }
+      part { name: "tabgrouped";
+         scale: 1;
+         description { state: "default" 0.0;
             align: 0.0 0.5;
-            min: 0 0;
-            max: 0 0;
             fixed: 1 1;
+            max: 0 0;
             rel1 {
                to: "tab_bevel_top2";
-               relative: 0.0 0.3;
-               offset: -1 0;
+               relative: 0.0 0.0;
+               offset: 3 3;
             }
             rel2 {
                to: "tab_bevel_top2";
-               relative: 1.0 0.7;
+               relative: 0.0 1.0;
+               offset: 3 -4;
             }
+            image.normal: "tab_grouped";
+            color_class: "/fg/normal/tab/term/icon/grouped";
             visible: 0;
+            offscale;
          }
          description { state: "grouped" 0.0;
             inherit: "default" 0.0;
-            min: 8 8;
-            max: 32 32;
-            image.normal: "tab_grouped";
-            rel1 {
-               to: "tab_bevel_top2";
-               relative: 0.0 0.3;
-            }
-            rel2 {
-               to: "tab_bevel_top2";
-               relative: 1.0 0.7;
-            }
-            color: 180 180 180 255;
+            min: 15 15;
+            max: 15 15;
             visible: 1;
          }
       }
-      program {
-         signal: "grouped,on"; source: "terminology";
+      program { signal: "grouped,on"; source: "terminology";
          action: STATE_SET "grouped" 0.0;
          target: "tabgrouped";
       }
-      program {
-         signal: "grouped,off"; source: "terminology";
+      program { signal: "grouped,off"; source: "terminology";
          action: STATE_SET "default" 0.0;
          target: "tabgrouped";
       }
       part { name: "terminology.title"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: OUTLINE_SOFT_SHADOW;
          description { state: "default" 0.0;
             text { font: "Sans:style=Bold"; size: 10;
                align: 0.5 0.5;
                min: 0 1;
             }
-            align: 0.5 0.5;
-            color: 180 180 180 255;
-            color3: 0 0 0 18;
             rel1 {
                to_x: "tabgrouped";
                to_y: "tab_bevel_top2";
                relative: 1.0 0.0;
-               offset: 2 0;
             }
             rel2.to: "tab_bevel_top2";
+            rel2.offset: -19 -1;
+            offscale;
+            color_class: "/fg/selected/term/tab/title/text";
          }
          description { state: "bell" 0.0;
             inherit: "default" 0.0;
-            color: 255 219 0 96;
-            color2: 255 51 0 48;
-            color3: 255 51 0 8;
+            color_class: "/fg/selected/term/tab/title/text/bell";
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel2.offset: -1 -2;
          }
       }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
-            color: 0 0 0 0;
+            color: 0 0 0 0; // no cc
          }
       }
       programs {
-         program {
-            signal: "mouse,clicked,1"; source: "event";
+         program { signal: "mouse,clicked,1"; source: "event";
             action: SIGNAL_EMIT "tab,activate" "terminology";
          }
-         program { name: "bell";
-            signal: "bell"; source: "terminology";
+         program { signal: "bell"; source: "terminology";
             action: STATE_SET "bell" 0.0;
             target: "terminology.title";
          }
-         program { name: "bell,off";
-            signal: "bell,off"; source: "terminology";
+         program { signal: "bell,off"; source: "terminology";
             action: STATE_SET "default" 0.0;
             target: "terminology.title";
          }