53 files changed, 2001 insertions, 735 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..ce883be
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: billiob
diff --git a/ChangeLog b/ChangeLog
index 6b5fc5e..c0e2a0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2019-11-16
+        * Release v1.5.0
+        * Show title tab on splits, depending on configuration
+        * Show tabs that had a bell rang and had not been focused
+        * Add wizard on new configuration to set scaling
+        * Add scale configuration in the Settings panel
+        * Add Polish translation
+        * Themes: make tab title readable based on theme default colors
+        * Move the tab selector on the tab line
+        * Be able to select and copy tabs
+        * Better handle stalled unix socket when using one terminology with
+          multiple instances
+        * Change typop behavior to queue files in case there are multiple files to
+          look at
+        * Update Italian translation
+        * Fix live selections in the scrollback
+        * Fix unchecking "auto-hide cursor" not working
+        * Fix memory leaks related to looking for links under the mouse
+        * Ensure Terminology compiles with EFL-1.20
+        * Fix link detection over spaces
+        * Fix tab selector no longer taking into account the new destination
+        * Fix crash when using typop with multiple files
+        * No longer set environment variable DESKTOP_STARTUP_ID as it may no
+          longer be accurate
+        * Allow tabs to be pasted
 2019-07-20
        * Release v1.5.0
        * Handle emoji has double-width character, introduced in Unicode 9.0.
diff --git a/ChangeLog.theme b/ChangeLog.theme
index a6acf98..2b2ba8d 100644
--- a/ChangeLog.theme
+++ b/ChangeLog.theme
@@ -9,6 +9,11 @@ Changes since 1.5.0:
  * In group "terminology/background", add signals "tab,bell,on" and
  "tab,bell,off" from "terminology" to set bell status on tab if there is a
  tab.
+  * In group "terminology/background", change signals "tabcount,go",
+  "tabcount,prev", "tabcount,next" to "tab,go", "tab,prev" and "tab,next"
+  respectively.
+  * In group "terminology/background", add signal "tab,new" from "terminology"
+  to create a new tab.
 Changes since 1.2.0:
 --------------------
diff --git a/DESIGN.md b/DESIGN.md
index ba46615..e277a67 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -1,6 +1,7 @@
 A simple documentation to navige through the C files:
 * `src/bin/about.c` handles the About widget
+* `src/bin/backlog.c`: backlog handling
 * `src/bin/col.c` is about the colors handled by the terminal
 * `src/bin/config.c`: how the configuration is saved/loaded/updated
 * `src/bin/controls.c`: the widget when a right-click is done on a terminal
@@ -33,7 +34,6 @@ A simple documentation to navige through the C files:
 * `src/bin/termptyext.c`: extented terminology escape handling
 * `src/bin/termptygfx.c`: charset translations
 * `src/bin/termptyops.c`: handling history
-* `src/bin/termptysave.c`: compression of the backlog
 * `src/bin/tyalpha.c`: the `tyalpha` tool
 * `src/bin/tybg.c`: the `tybg` tool
 * `src/bin/tycat.c`: the `tycat` tool
diff --git a/NEWS b/NEWS
index e992e23..59c9774 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,40 @@
 =================
-Terminology 1.5.0
+Terminology 1.6.0
 =================
+Changes since 1.5.0:
+--------------------
+Additions:
+    * Show title tab on splits, depending on configuration
+    * Show tabs that had a bell rang and had not been focused
+    * Add wizard on new configuration to set scaling
+    * Add scale configuration in the Settings panel
+    * Add Polish translation
+Improvements:
+    * Themes: make tab title readable based on theme default colors
+    * Move the tab selector on the tab line
+    * Be able to select and copy tabs
+    * Better handle stalled unix socket when using one terminology with
+      multiple instances
+    * Change typop behavior to queue files in case there are multiple files to
+      look at
+    * Update Italian translation
+Fixes:
+    * Fix live selections in the scrollback
+    * Fix unchecking "auto-hide cursor" not working
+    * Fix memory leaks related to looking for links under the mouse
+    * Ensure Terminology compiles with EFL-1.20
+    * Fix link detection over spaces
+    * Fix tab selector no longer taking into account the new destination
+    * Fix crash when using typop with multiple files
+    * No longer set environment variable DESKTOP_STARTUP_ID as it may no
+      longer be accurate
+    * Allow tabs to be pasted
 Changes since 1.4.1:
 --------------------
diff --git a/README.md b/README.md
index 796c230..3ef7464 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Terminology 1.5.0
+Terminology 1.6.0
 =================
 This is an EFL terminal emulator with some extra bells and whistles.
@@ -14,7 +14,8 @@ This is an EFL terminal emulator with some extra bells and whistles.
 [![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)
+[![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)
 Requirements
 ------------
diff --git a/data/desktop/meson.build b/data/desktop/meson.build
index 1eb4019..8c16dbe 100644
--- a/data/desktop/meson.build
+++ b/data/desktop/meson.build
@@ -1,2 +1,12 @@
-install_data('terminology.desktop',
+icon_sed = 's~%ICON_PATH%~@0@~'.format(join_paths(get_option('prefix'),
-             install_dir: join_paths(get_option('datadir'), 'applications'))
+                                                  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'))
diff --git a/data/desktop/terminology.desktop b/data/desktop/terminology.desktop.in
index 020891d..5fcfa40 100644
--- a/data/desktop/terminology.desktop
+++ b/data/desktop/terminology.desktop.in
@@ -12,6 +12,7 @@ Comment=Terminal emulator
 Comment[da]=Terminalemulator
 Comment[eo]=Terminalimitilo
 Comment[es]=Emulador de terminal
+Comment[fr]=Émulateur de terminal
 Comment[gl]=Emulador de terminal
 Comment[it]=Emulatore di terminale
 Comment[pt]=Emulador de terminal
@@ -19,6 +20,6 @@ Comment[ru]=Эмулятор терминала
 Comment[ko]=터미널 에뮬레이터
 Keywords=shell;prompt;command;commandline;
 Exec=terminology
-Icon=terminology
+Icon=%ICON_PATH%/terminology.png
 Categories=System;TerminalEmulator;
 StartupWMClass=terminology
diff --git a/data/themes/default.edc b/data/themes/default.edc
index fd7f214..af1f8e9 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -629,15 +629,19 @@ collections {
         }
         program {
            signal: "mouse,clicked,1"; source: "tabcount_ev";
-            action: SIGNAL_EMIT "tabcount,go" "terminology";
+            action: SIGNAL_EMIT "tab,go" "terminology";
+         }
+         program {
+            signal: "mouse,clicked,3"; source: "tabcount_ev";
+            action: SIGNAL_EMIT "tab,new" "terminology";
         }
         program {
            signal: "mouse,wheel,0,1"; source: "tabcount_ev";
-            action: SIGNAL_EMIT "tabcount,prev" "terminology";
+            action: SIGNAL_EMIT "tab,prev" "terminology";
         }
         program {
            signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
-            action: SIGNAL_EMIT "tabcount,next" "terminology";
+            action: SIGNAL_EMIT "tab,next" "terminology";
         }
         program {
            signal: "tabcount,off"; source: "terminology";
@@ -1287,7 +1291,6 @@ collections {
            target: "tableft";
            target: "tabmiddle";
            target: "tabright";
-            target: "tab_btn";
            target: "bevel";
            target: "glintclip";
            target: "tab_bevel_bottom";
@@ -1314,7 +1317,6 @@ collections {
            target: "tableft";
            target: "tabmiddle";
            target: "tabright";
-            target: "tab_btn";
            target: "bevel";
            target: "glintclip";
            target: "tab_bevel_bottom";
@@ -1334,21 +1336,253 @@ collections {
            target: "tabtitle";
            target: "tabclose";
         }
-         part { name: "tab_btn"; type: RECT;
+         program {
+            signal: "tab_btn,on"; source: "terminology";
+            action: STATE_SET "on" 0.0;
+            target: "tab_btn_clip";
+            target: "tab_btn_bg";
+            target: "terminology.tab_btn";
+         }
+         program {
+            signal: "tab_btn,off"; source: "terminology";
+            action: STATE_SET "default" 0.0;
+            target: "tab_btn_clip";
+            target: "tab_btn_bg";
+            target: "terminology.tab_btn";
+         }
+         part { name: "tab_btn_clip"; type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+            description { state: "on" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_bg";
+            mouse_events: 0;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               image.normal: "tab_bg_r0.png";
+               image.border: 0 2 4 4;
+               fill.smooth: 0;
+               visible: 0;
+               fixed: 1 1;
+            }
+            description { state: "on" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "tab_btn_glow_r0";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r0";
+               rel2.to: "tab_btn_r0";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_glow_r1";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r1";
+               rel2.to: "tab_btn_r1";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_glow_r2";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r2";
+               rel2.to: "tab_btn_r2";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_glow_r3";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r3";
+               rel2.to: "tab_btn_r3";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_r0"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.05 0.05;
+               rel2.relative: 0.45 0.45;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_r1"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.55 0.05;
+               rel2.relative: 0.95 0.45;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_r2"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.05 0.55;
+               rel2.relative: 0.45 0.95;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_r3"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.55 0.55;
+               rel2.relative: 0.95 0.95;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "terminology.tab_btn"; type: SWALLOW;
+            clip_to: "tab_btn_clip";
            mouse_events: 0;
            description { state: "default" 0.0;
               rel1.relative: 1.0 0.0;
               rel2.to_y: "tabmiddle";
               color: 250 0 250 255;
               visible: 0;
-               min: 64 16;
+               align: 1.0 0.0;
               fixed: 1 1;
            }
-            description { state: "tab" 0.0;
+            description { state: "on" 0.0;
               inherit: "default" 0.0;
+               min: 16 16;
               visible: 1;
            }
         }
+         part { name: "tab_btn_ev"; type: RECT; repeat_events: 1;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               color: 0 0 0 0;
+            }
+         }
+         program {
+            signal: "mouse,in"; source: "tab_btn_ev";
+            action: STATE_SET "over" 0.0;
+            transition: DECELERATE 0.5;
+            target: "tab_btn_r0";
+            target: "tab_btn_r1";
+            target: "tab_btn_r2";
+            target: "tab_btn_r3";
+            target: "tab_btn_glow_r0";
+            target: "tab_btn_glow_r1";
+            target: "tab_btn_glow_r2";
+            target: "tab_btn_glow_r3";
+         }
+         program {
+            signal: "mouse,out"; source: "tab_btn_ev";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 2.0;
+            target: "tab_btn_r0";
+            target: "tab_btn_r1";
+            target: "tab_btn_r2";
+            target: "tab_btn_r3";
+            target: "tab_btn_glow_r0";
+            target: "tab_btn_glow_r1";
+            target: "tab_btn_glow_r2";
+            target: "tab_btn_glow_r3";
+         }
+         program {
+            signal: "mouse,clicked,1"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,go" "terminology";
+         }
+         program {
+            signal: "mouse,clicked,3"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,new" "terminology";
+         }
+         program {
+            signal: "mouse,wheel,0,1"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,prev" "terminology";
+         }
+         program {
+            signal: "mouse,wheel,0,-1"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,next" "terminology";
+         }
         part { name: "terminology.tab"; type: SWALLOW;
            mouse_events: 0;
@@ -1366,7 +1600,7 @@ collections {
         part { name: "tabdrag"; type: SPACER;
            description { state: "default" 0.0;
               rel2.relative: 0.0 0.0;
-               rel2.to_x: "tab_btn";
+               rel2.to_x: "terminology.tab_btn";
               fixed: 1 1;
            }
         }
@@ -1386,7 +1620,7 @@ collections {
            dragable.confine: "tabdrag";
            description { state: "default" 0.0;
               rel2.relative: 0.0 0.0;
-               rel2.to_x: "tab_btn";
+               rel2.to_x: "terminology.tab_btn";
               max: 1 1;
               fixed: 1 1;
            }
@@ -1480,13 +1714,12 @@ collections {
               visible: 1;
            }
         }
-         /*TODO boris */
         part { name: "tabright"; type: RECT;
            mouse_events: 0;
            description { state: "default" 0.0;
               rel1.to: "terminology.tab";
               rel1.relative: 1.0 0.0;
-               rel2.to_x: "tab_btn";
+               rel2.to_x: "terminology.tab_btn";
               rel2.to_y: "tabmiddle";
               rel2.relative: 0.0 1.0;
               color: 0 0 0 0;
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index f8a79d0..bd5f63c 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -442,7 +442,19 @@ collections {
         }
         program {
            signal: "mouse,clicked,1"; source: "tabcount_ev";
-            action: SIGNAL_EMIT "tabcount,go" "terminology";
+            action: SIGNAL_EMIT "tab,go" "terminology";
+         }
+         program {
+            signal: "mouse,clicked,3"; source: "tabcount_ev";
+            action: SIGNAL_EMIT "tab,new" "terminology";
+         }
+         program {
+            signal: "mouse,wheel,0,1"; source: "tabcount_ev";
+            action: SIGNAL_EMIT "tab,prev" "terminology";
+         }
+         program {
+            signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
+            action: SIGNAL_EMIT "tab,next" "terminology";
         }
         program {
            signal: "tabcount,off"; source: "terminology";
@@ -635,6 +647,254 @@ collections {
            target: "tabtitle";
         }
+         program {
+            signal: "tab_btn,on"; source: "terminology";
+            action: STATE_SET "on" 0.0;
+            target: "tab_btn_clip";
+            target: "tab_btn_bg";
+            target: "terminology.tab_btn";
+         }
+         program {
+            signal: "tab_btn,off"; source: "terminology";
+            action: STATE_SET "default" 0.0;
+            target: "tab_btn_clip";
+            target: "tab_btn_bg";
+            target: "terminology.tab_btn";
+         }
+         part { name: "tab_btn_clip"; type: RECT;
+            description { state: "default" 0.0;
+               color: 255 255 255 0;
+               visible: 0;
+            }
+            description { state: "on" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_bg";
+            mouse_events: 0;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               image.normal: "tab_bg_r0.png";
+               image.border: 0 2 4 4;
+               fill.smooth: 0;
+               visible: 0;
+               fixed: 1 1;
+            }
+            description { state: "on" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         part { name: "tab_btn_glow_r0";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r0";
+               rel2.to: "tab_btn_r0";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_glow_r1";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r1";
+               rel2.to: "tab_btn_r1";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_glow_r2";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r2";
+               rel2.to: "tab_btn_r2";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_glow_r3";
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "tab_btn_r3";
+               rel2.to: "tab_btn_r3";
+               rel1.offset: -4 -4;
+               rel2.offset: 3 3;
+               image {
+                  normal: "cr_glow.png";
+                  border: 9 9 9 9;
+               }
+               color: 51 153 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 51 153 255 255;
+            }
+         }
+         part { name: "tab_btn_r0"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.05 0.05;
+               rel2.relative: 0.45 0.45;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_r1"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.55 0.05;
+               rel2.relative: 0.95 0.45;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_r2"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.05 0.55;
+               rel2.relative: 0.45 0.95;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "tab_btn_r3"; type: RECT;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               rel1.relative: 0.55 0.55;
+               rel2.relative: 0.95 0.95;
+               color: 255 255 255 32;
+            }
+            description { state: "over" 0.0;
+               inherit: "default" 0.0;
+               color: 255 255 255 255;
+            }
+         }
+         part { name: "terminology.tab_btn"; type: SWALLOW;
+            clip_to: "tab_btn_clip";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1.relative: 1.0 0.0;
+               rel2.to_y: "tabmiddle";
+               color: 250 0 250 255;
+               visible: 0;
+               align: 1.0 0.0;
+               fixed: 1 1;
+            }
+            description { state: "on" 0.0;
+               inherit: "default" 0.0;
+               min: 16 16;
+               visible: 1;
+            }
+         }
+         part { name: "tab_btn_ev"; type: RECT; repeat_events: 1;
+            clip_to: "tab_btn_clip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "terminology.tab_btn";
+               rel2.to: "terminology.tab_btn";
+               color: 0 0 0 0;
+            }
+         }
+         program {
+            signal: "mouse,in"; source: "tab_btn_ev";
+            action: STATE_SET "over" 0.0;
+            transition: DECELERATE 0.5;
+            target: "tab_btn_r0";
+            target: "tab_btn_r1";
+            target: "tab_btn_r2";
+            target: "tab_btn_r3";
+            target: "tab_btn_glow_r0";
+            target: "tab_btn_glow_r1";
+            target: "tab_btn_glow_r2";
+            target: "tab_btn_glow_r3";
+         }
+         program {
+            signal: "mouse,out"; source: "tab_btn_ev";
+            action: STATE_SET "default" 0.0;
+            transition: DECELERATE 2.0;
+            target: "tab_btn_r0";
+            target: "tab_btn_r1";
+            target: "tab_btn_r2";
+            target: "tab_btn_r3";
+            target: "tab_btn_glow_r0";
+            target: "tab_btn_glow_r1";
+            target: "tab_btn_glow_r2";
+            target: "tab_btn_glow_r3";
+         }
+         program {
+            signal: "mouse,clicked,1"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,go" "terminology";
+         }
+         program {
+            signal: "mouse,clicked,3"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,new" "terminology";
+         }
+         program {
+            signal: "mouse,wheel,0,1"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,prev" "terminology";
+         }
+         program {
+            signal: "mouse,wheel,0,-1"; source: "tab_btn_ev";
+            action: SIGNAL_EMIT "tab,next" "terminology";
+         }
         part { name: "terminology.tab"; type: SWALLOW;
            mouse_events: 0;
            description { state: "default" 0.0;
@@ -650,11 +910,12 @@ collections {
         // some slot for dragable parts to stayt in along top edge of bg
         part { name: "tabdrag"; type: SPACER;
            description { state: "default" 0.0;
-               rel2.relative: 1.0 0.0;
+               rel2.relative: 0.0 0.0;
+               rel2.to_x: "terminology.tab_btn";
               fixed: 1 1;
            }
         }
-         // left boundary of the active tab (ragable 0.0 -> 1.0)
+         // left boundary of the active tab (dragable 0.0 -> 1.0)
         part { name: "terminology.tabl"; type: SPACER;
            dragable.x: 1 1 0;
            dragable.confine: "tabdrag";
@@ -664,12 +925,13 @@ collections {
               fixed: 1 1;
            }
         }
-         // right boundary of the active tab (ragable 0.0 -> 1.0)
+         // right boundary of the active tab (dragable 0.0 -> 1.0)
         part { name: "terminology.tabr"; type: SPACER;
            dragable.x: 1 1 0;
            dragable.confine: "tabdrag";
            description { state: "default" 0.0;
-               rel2.relative: 1.0 0.0;
+               rel2.relative: 0.0 0.0;
+               rel2.to_x: "terminology.tab_btn";
               max: 1 1;
               fixed: 1 1;
            }
diff --git a/man/terminology-helpers.1 b/man/terminology-helpers.1
index 901ed3e..cbb1eba 100644
--- a/man/terminology-helpers.1
+++ b/man/terminology-helpers.1
@@ -1,5 +1,5 @@
 .\" Manpage for terminology helpers
-.TH TERMINOLOGY-HELPERS 1 "Jul 20, 2019"
+.TH TERMINOLOGY-HELPERS 1 "Nov 16, 2019"
 .SH NAME
 terminiology-helpers \- programs that enhance
 .B terminology(1)
diff --git a/man/terminology.1 b/man/terminology.1
index 1ee3b60..3d840f9 100644
--- a/man/terminology.1
+++ b/man/terminology.1
@@ -1,5 +1,5 @@
 .\" Manpage for Terminology
-.TH TERMINOLOGY 1 "Jul 20, 2019" "1.5.0" "Terminology man page"
+.TH TERMINOLOGY 1 "Nov 16, 2019" "1.6.0" "Terminology man page"
 .SH NAME
 Terminology \- Terminal Emulator written with EFL (Enlightenment Foundation Libraries).
 .SH SYNOPSIS
diff --git a/meson.build b/meson.build
index 2f52f5a..36ac0e0 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('terminology', 'c',
-        version: '1.5.99',
+        version: '1.6.99',
        default_options: ['buildtype=plain', 'c_std=gnu99'],
        license: 'BSD')
@@ -78,6 +78,10 @@ if cc.has_function('mkstemps')
  config_data.set('HAVE_MKSTEMPS', 1)
 endif
+if cc.has_function('strchrnul')
+  config_data.set('HAVE_STRCHRNUL', 1)
+endif
 url_head_code = '''#include <Ecore_Con.h>
 int main(void) { ecore_con_url_head(NULL); return 0; }
 '''
@@ -123,6 +127,8 @@ endif
 message('edje_cc set to:' + edje_cc)
+sed = find_program('sed')
 configure_file(output: 'terminology_config.h',
               configuration: config_data)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 0000000..737a586
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,174 @@
+name: terminology
+version: git
+summary: Terminal Emulator written with the Enlightenment Foundation Libraries
+description: |
+  Terminology is a terminal emulator for Linux/BSD/UNIX systems that uses EFL.
+  It has a whole bunch of bells and whistles. Use it as your regular vt100
+  terminal emulator with all the usual features, such as 256 color support.
+  Terminology is designed to emulate Xterm as closely as possible in most
+  respects.
+base: core18
+license: BSD-2-Clause
+confinement: classic
+grade: stable
+icon: data/images/terminology.png
+apps:
+  terminology:
+    command: terminology
+    desktop: usr/share/applications/terminology.desktop
+  tyalpha:
+    command: tyalpha
+  tybg:
+    command: tybg
+  tycat:
+    command: tycat
+  tyls:
+    command: tyls
+  typop:
+    command: typop
+  tyq:
+    command: tyq
+  tysend:
+    command: tysend
+parts:
+  efl:
+    plugin: meson
+    source-type: tar
+    source: https://download.enlightenment.org/rel/libs/efl/efl-1.23.2.tar.xz
+    meson-parameters:
+      - --prefix=/usr
+      - --libdir=/usr/lib
+      - --buildtype=release
+      - --default-library=shared
+      - -Dnls=false
+      - -Dopengl=es-egl
+      - -Dxinput22=true
+      - -Dbuffer=false
+      - -Dfb=false
+      - -Ddrm=false
+      - -Dtslib=false
+      - -Dharfbuzz=true
+      - -Dwl=true
+      - -Dnetwork-backend=connman
+      - -Devas-loaders-disabler=pdf,ps,raw,tiff,json,webp
+      - -Dphysics=false
+      - -Davahi=false
+      - -Deeze=false
+      - -Dbindings=
+      - -Dbuild-examples=false
+      - -Dbuild-tests=false
+    build-packages:
+      - gcc
+      - pkg-config
+      - libdbus-1-dev
+      - libssl-dev
+      - libfontconfig1-dev
+      - libfreetype6-dev
+      - libfribidi-dev
+      - libgif-dev
+      - libgstreamer1.0-dev
+      - libgstreamer-plugins-base1.0-dev
+      - libharfbuzz-dev
+      - libjpeg-turbo8-dev
+      - libpng-dev
+      - libpulse-dev
+      - librsvg2-dev
+      - libsndfile1-dev
+      - libx11-dev
+      - libxkbcommon-dev
+      - libxkbcommon-x11-dev
+      - libxcomposite-dev
+      - libxcursor-dev
+      - libxdamage-dev
+      - libxinerama-dev
+      - libxrandr-dev
+      - libxss-dev
+      - libxtst-dev
+      - libsystemd-dev
+      - libluajit-5.1-dev
+      - libibus-1.0-dev
+      - libscim-dev
+    stage-packages:
+      - libcairo2
+      - libcroco3
+      - libdatrie1
+      - libegl1
+      - libfontconfig1
+      - libfreetype6
+      - libfribidi0
+      - libgdk-pixbuf2.0-0
+      - libgif7
+      - libgles2
+      - libglvnd0
+      - libgraphite2-3
+      - libgstreamer-plugins-base1.0-0
+      - libgstreamer1.0-0
+      - libharfbuzz0b
+      - libibus-1.0-5
+      - libicu60
+      - libjpeg-turbo8
+      - libluajit-5.1-2
+      - liborc-0.4-0
+      - libpango-1.0-0
+      - libpangocairo-1.0-0
+      - libpangoft2-1.0-0
+      - libpixman-1-0
+      - libpng16-16
+      - librsvg2-2
+      - libthai0
+      - libwayland-egl1
+      - libx11-6
+      - libx11-xcb1
+      - libxau6
+      - libxcb-render0
+      - libxcb-shm0
+      - libxcb1
+      - libxcomposite1
+      - libxcursor1
+      - libxdamage1
+      - libxdmcp6
+      - libxext6
+      - libxfixes3
+      - libxi6
+      - libxinerama1
+      - libxkbcommon-x11-0
+      - libxml2
+      - libxrandr2
+      - libxrender1
+      - libxss1
+      - libxtst6
+  terminology:
+    plugin: meson
+    after: [ efl ]
+    source-type: git
+    source: https://github.com/billiob/terminology
+    meson-parameters:
+      - --prefix=/usr
+    stage-packages:
+      - libcurl4
+      - libfontconfig1
+      - libfreetype6
+      - libfribidi0
+      - libgif7
+      - libgraphite2-3
+      - libharfbuzz0b
+      - libjpeg-turbo8
+      - libluajit-5.1-2
+      - libpcre3
+      - libpng16-16
+      - libx11-6
+      - libx11-xcb1
+      - libxau6
+      - libxcb1
+      - libxcomposite1
+      - libxcursor1
+      - libxdamage1
+      - libxdmcp6
+      - libxext6
+      - libxfixes3
+      - libxi6
+      - libxinerama1
+      - libxrandr2
+      - libxrender1
+      - libxss1
+      - libxtst6
diff --git a/src/bin/backlog.c b/src/bin/backlog.c
new file mode 100644
index 0000000..b7271c8
--- /dev/null
+++ b/src/bin/backlog.c
@@ -0,0 +1,226 @@
+#include "private.h"
+#include <Elementary.h>
+#include "termpty.h"
+#include "backlog.h"
+static int ts_comp = 0;
+static int ts_uncomp = 0;
+static int ts_freeops = 0;
+static Eina_List *ptys = NULL;
+static int64_t _mem_used = 0;
+static void
+_accounting_change(int64_t diff)
+{
+   if (diff > 0)
+     {
+        diff = ((diff + 16-1) / 16) * 16;
+     }
+   else
+     {
+        diff = ((-1 * diff + 16-1) / 16) * -16;
+     }
+   _mem_used += diff;
+}
+int64_t
+termpty_backlog_memory_get(void)
+{
+   return _mem_used;
+}
+void
+termpty_save_register(Termpty *ty)
+{
+   termpty_backlog_lock();
+   ptys = eina_list_append(ptys, ty);
+   termpty_backlog_unlock();
+}
+void
+termpty_save_unregister(Termpty *ty)
+{
+   termpty_backlog_lock();
+   ptys = eina_list_remove(ptys, ty);
+   termpty_backlog_unlock();
+}
+Termsave *
+termpty_save_extract(Termsave *ts)
+{
+   if (!ts) return NULL;
+   return ts;
+}
+Termsave *
+termpty_save_new(Termpty *ty, Termsave *ts, int w)
+{
+   termpty_save_free(ty, ts);
+   Termcell *cells = calloc(1, w * sizeof(Termcell));
+   if (!cells ) return NULL;
+   ts->cells = cells;
+   ts->w = w;
+   _accounting_change(w * sizeof(Termcell));
+   return ts;
+}
+Termsave *
+termpty_save_expand(Termpty *ty, Termsave *ts, Termcell *cells, size_t delta)
+{
+   Termcell *newcells;
+   newcells = realloc(ts->cells, (ts->w + delta) * sizeof(Termcell));
+   if (!newcells)
+     return NULL;
+   memset(newcells + ts->w,
+          0, delta * sizeof(Termcell));
+   TERMPTY_CELL_COPY(ty, cells, &newcells[ts->w], (int)delta);
+   _accounting_change(-1 * ts->w * sizeof(Termcell));
+   ts->w += delta;
+   _accounting_change(ts->w * sizeof(Termcell));
+   ts->cells = newcells;
+   return ts;
+}
+void
+termpty_save_free(Termpty *ty, Termsave *ts)
+{
+   unsigned int i;
+   if (!ts) return;
+   if (ts->comp) ts_comp--;
+   else ts_uncomp--;
+   ts_freeops++;
+   for (i = 0; i < ts->w; i++)
+     {
+        if (EINA_UNLIKELY(ts->cells[i].att.link_id))
+          term_link_refcount_dec(ty, ts->cells[i].att.link_id, 1);
+     }
+   free(ts->cells);
+   ts->cells = NULL;
+   _accounting_change((-1) * (int)(ts->w * sizeof(Termcell)));
+   ts->w = 0;
+}
+void
+termpty_backlog_lock(void)
+{
+}
+void
+termpty_backlog_unlock(void)
+{
+}
+void
+termpty_backlog_free(Termpty *ty)
+{
+   size_t i;
+   if (!ty || !ty->back)
+     return;
+   for (i = 0; i < ty->backsize; i++)
+     termpty_save_free(ty, &ty->back[i]);
+   _accounting_change((-1) * (int)(sizeof(Termsave) * ty->backsize));
+   free(ty->back);
+   ty->back = NULL;
+}
+void
+termpty_clear_backlog(Termpty *ty)
+{
+   int backsize;
+   ty->backlog_beacon.screen_y = 0;
+   ty->backlog_beacon.backlog_y = 0;
+   termpty_backlog_lock();
+   termpty_backlog_free(ty);
+   ty->backpos = 0;
+   backsize = ty->backsize;
+   ty->backsize = 0;
+   termpty_backlog_size_set(ty, backsize);
+   termpty_backlog_unlock();
+}
+ssize_t
+termpty_backlog_length(Termpty *ty)
+{
+   int backlog_y = ty->backlog_beacon.backlog_y;
+   int screen_y = ty->backlog_beacon.screen_y;
+   if (!ty->backsize)
+     return 0;
+   for (backlog_y++; backlog_y < (int)ty->backsize; backlog_y++)
+     {
+        int nb_lines;
+        const Termsave *ts;
+        ts = BACKLOG_ROW_GET(ty, backlog_y);
+        if (!ts->cells)
+          goto end;
+        nb_lines = (ts->w == 0) ? 1 : (ts->w + ty->w - 1) / ty->w;
+        screen_y += nb_lines;
+        ty->backlog_beacon.screen_y = screen_y;
+        ty->backlog_beacon.backlog_y = backlog_y;
+     }
+end:
+     return ty->backlog_beacon.screen_y;
+}
+void
+termpty_backlog_size_set(Termpty *ty, size_t size)
+{
+   Termsave *new_back;
+   size_t i;
+   if (ty->backsize == size)
+     return;
+   termpty_backlog_lock();
+   if (size == 0)
+     {
+        termpty_backlog_free(ty);
+        goto end;
+     }
+   if (size > ty->backsize)
+     {
+        new_back = realloc(ty->back, sizeof(Termsave) * size);
+        if (!new_back)
+          return;
+        memset(new_back + ty->backsize, 0,
+               sizeof(Termsave) * (size - ty->backsize));
+        ty->back = new_back;
+     }
+   else
+     {
+        new_back = calloc(1, sizeof(Termsave) * size);
+        if (!new_back)
+          return;
+        for (i = 0; i < size; i++)
+          new_back[i] = ty->back[i];
+        for (i = size; i < ty->backsize; i++)
+          termpty_save_free(ty, &ty->back[i]);
+        free(ty->back);
+        ty->back = new_back;
+     }
+   _accounting_change(sizeof(Termsave) * (size - ty->backsize));
+end:
+   ty->backpos = 0;
+   ty->backsize = size;
+   /* Reset beacon */
+   ty->backlog_beacon.screen_y = 0;
+   ty->backlog_beacon.backlog_y = 0;
+   termpty_backlog_unlock();
+}
diff --git a/src/bin/backlog.h b/src/bin/backlog.h
new file mode 100644
index 0000000..dfe0fd7
--- /dev/null
+++ b/src/bin/backlog.h
@@ -0,0 +1,30 @@
+#ifndef _BACKLOG_H__
+#define _BACKLOG_H__ 1
+void termpty_save_register(Termpty *ty);
+void termpty_save_unregister(Termpty *ty);
+Termsave *termpty_save_extract(Termsave *ts);
+Termsave *termpty_save_new(Termpty *ty, Termsave *ts, int w);
+void termpty_save_free(Termpty *ty, Termsave *ts);
+Termsave *termpty_save_expand(Termpty *ty, Termsave *ts,
+                              Termcell *cells, size_t delta);
+void       termpty_backlog_lock(void);
+void       termpty_backlog_unlock(void);
+void
+termpty_clear_backlog(Termpty *ty);
+void
+termpty_backlog_free(Termpty *ty);
+void
+termpty_backlog_size_set(Termpty *ty, size_t size);
+ssize_t
+termpty_backlog_length(Termpty *ty);
+int64_t
+termpty_backlog_memory_get(void);
+#define BACKLOG_ROW_GET(Ty, Y) \
+   (&Ty->back[(Ty->backsize + ty->backpos - ((Y) - 1 )) % Ty->backsize])
+#endif
diff --git a/src/bin/config.c b/src/bin/config.c
index 52ff2d2..97e10a9 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -216,6 +216,7 @@ config_save(Config *config)
   char buf[PATH_MAX], buf2[PATH_MAX];
   const char *cfgdir;
   int ok;
+   Eet_Error err;
   EINA_SAFETY_ON_NULL_RETURN(config);
@@ -236,11 +237,28 @@ config_save(Config *config)
   snprintf(buf, sizeof(buf), "%s/terminology/config/standard/base.cfg.tmp", cfgdir);
   snprintf(buf2, sizeof(buf2), "%s/terminology/config/standard/base.cfg", cfgdir);
   ef = eet_open(buf, EET_FILE_MODE_WRITE);
-   if (ef)
+   if (!ef)
+     {
+        ERR("error opening file '%s' for writing", buf);
+        return;
+     }
+   ok = eet_data_write(ef, edd_base, CONFIG_KEY, config, 1);
+   if (!ok)
     {
-        ok = eet_data_write(ef, edd_base, CONFIG_KEY, config, 1);
        eet_close(ef);
-        if (ok) ecore_file_mv(buf, buf2);
+        ERR("error writing to file '%s'", buf);
+        return;
+     }
+   err = eet_close(ef);
+   if (err != EET_ERROR_NONE)
+     {
+        ERR("error #%d closing file '%s'", err, buf);
+        return;
+     }
+   if (!ecore_file_mv(buf, buf2))
+     {
+        ERR("error moving file '%s' to '%s'", buf, buf2);
+        return;
     }
   main_config_sync(config);
 }
@@ -718,10 +736,12 @@ config_load(void)
                  if (config->version < CONF_VER)
                    {
                       // currently no upgrade path so reset config.
+                       ERR("config is from a newer Terminology, discard it");
                       config_del(config);
-                       config = NULL;
+                       config = config_new();
+                       config->temporary = EINA_TRUE;
                    }
-                  /* do no thing in case the config is from a newer
+                  /* do nothing in case the config is from a newer
                   * terminology, we don't want to remove it. */
               }
          }
diff --git a/src/bin/controls.c b/src/bin/controls.c
index 279fea3..255eb6b 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -101,7 +101,7 @@ _cb_ct_new(void *data,
           void *_event EINA_UNUSED)
 {
   Controls_Ctx *ctx = data;
-   main_new(ctx->win, ctx->term);
+   main_new(ctx->term);
 }
 static void
diff --git a/src/bin/main.c b/src/bin/main.c
index 4aabc07..9bcd88b 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -111,7 +111,7 @@ _configure_instance(Ipc_Instance *inst)
        config->temporary = EINA_TRUE;
     }
-   if (inst->login_shell)
+   if (inst->login_shell != 0xff)
     {
        inst->config->login_shell = inst->login_shell;
        inst->config->temporary = EINA_TRUE;
diff --git a/src/bin/main.h b/src/bin/main.h
index 1a961d4..e870b32 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -4,7 +4,7 @@
 #include "config.h"
 Config * main_config_get(void);
-void main_new(Evas_Object *win, Evas_Object *term);
+void main_new(Evas_Object *term);
 void main_new_with_dir(Evas_Object *win, Evas_Object *term, const char *wdir);
 void main_split_h(Evas_Object *win, Evas_Object *term, const char *cmd);
 void main_split_v(Evas_Object *win, Evas_Object *term, const char *cmd);
diff --git a/src/bin/media.c b/src/bin/media.c
index 28bfd2b..6240445 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -964,8 +964,8 @@ _smart_del(Evas_Object *obj)
        if (sd->realf) unlink(sd->realf);
        close(sd->tmpfd);
     }
-   if (sd->src) eina_stringshare_del(sd->src);
+   eina_stringshare_del(sd->src);
-   if (sd->realf) eina_stringshare_del(sd->realf);
+   eina_stringshare_del(sd->realf);
   if (sd->clip) evas_object_del(sd->clip);
   if (sd->o_img) evas_object_del(sd->o_img);
   if (sd->o_tmp) evas_object_del(sd->o_tmp);
diff --git a/src/bin/meson.build b/src/bin/meson.build
index dc6c2a7..6de1d17 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -31,7 +31,7 @@ terminology_sources = ['private.h',
                       'termptyops.c', 'termptyops.h',
                       'termptygfx.c', 'termptygfx.h',
                       'termptyext.c', 'termptyext.h',
-                       'termptysave.c', 'termptysave.h',
+                       'backlog.c', 'backlog.h',
                       'md5/md5.c', 'md5/md5.h',
                       'utf8.c', 'utf8.h',
                       'win.c', 'win.h',
@@ -49,7 +49,7 @@ tycat_sources = ['tycommon.c', 'tycommon.h', 'tycat.c', 'extns.c', 'extns.h']
 tyls_sources = ['extns.c', 'extns.h', 'tyls.c', 'tycommon.c', 'tycommon.h']
 tysend_sources = ['tycommon.c', 'tycommon.h', 'tysend.c']
 tyfuzz_sources = ['termptyesc.c', 'termptyesc.h',
-                  'termptysave.c', 'termptysave.h',
+                  'backlog.c', 'backlog.h',
                  'termptyops.c', 'termptyops.h',
                  'termptydbl.c', 'termptydbl.h',
                  'termptyext.c', 'termptyext.h',
@@ -64,7 +64,7 @@ tyfuzz_sources = ['termptyesc.c', 'termptyesc.h',
                  'utils.c', 'utils.h',
                  'tyfuzz.c']
 tytest_sources = ['termptyesc.c', 'termptyesc.h',
-                  'termptysave.c', 'termptysave.h',
+                  'backlog.c', 'backlog.h',
                  'termptyops.c', 'termptyops.h',
                  'termptydbl.c', 'termptydbl.h',
                  'termptyext.c', 'termptyext.h',
diff --git a/src/bin/miniview.c b/src/bin/miniview.c
index 6149183..8eb7d55 100644
--- a/src/bin/miniview.c
+++ b/src/bin/miniview.c
@@ -12,6 +12,7 @@
 #include "miniview.h"
 #include "utils.h"
 #include "main.h"
+#include "backlog.h"
 /* specific log domain to help debug only miniview */
 int _miniview_log_dom = -1;
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 1fc4e4a..c945d5d 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -4,6 +4,8 @@
 #include <math.h>
 #include <Elementary.h>
 #include <assert.h>
+#include "termpty.h"
+#include "backlog.h"
 #include "config.h"
 #include "termio.h"
 #include "options.h"
@@ -17,6 +19,8 @@ typedef struct _Behavior_Ctx {
     Evas_Object *op_wh_current;
     Evas_Object *term;
     Evas_Object *sld_hide_cursor;
+     Evas_Object *backlock_label;
+     char *backlog_msg;
     Config *config;
 } Behavior_Ctx;
@@ -86,6 +90,24 @@ sback_units_format(double d)
 }
 static void
+_update_backlog_title(Behavior_Ctx *ctx)
+{
+   char *factor = " KMG";
+   double amount = termpty_backlog_memory_get();
+   while (amount > 1024.0 && factor[1] != '\0')
+     {
+        amount /= 1024;
+        factor++;
+     }
+   eina_stringshare_del(ctx->backlog_msg);
+   ctx->backlog_msg = (char*) eina_stringshare_printf(
+      _("Scrollback (current memory usage: %'.2f%cB):"),
+      amount, factor[0]);
+   elm_object_text_set(ctx->backlock_label, ctx->backlog_msg);
+}
+static void
 _cb_op_behavior_sback_chg(void *data,
                          Evas_Object *obj,
                          void *_event EINA_UNUSED)
@@ -95,6 +117,7 @@ _cb_op_behavior_sback_chg(void *data,
   config->scrollback = (double) sback_double_to_expo_int(elm_slider_value_get(obj));
   termio_config_update(ctx->term);
+   _update_backlog_title(ctx);
   config_save(config);
 }
@@ -187,6 +210,7 @@ _parent_del_cb(void *data,
 {
   Behavior_Ctx *ctx = data;
+   eina_stringshare_del(ctx->backlog_msg);
   free(ctx);
 }
@@ -563,7 +587,8 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
   o = elm_label_add(bx);
   evas_object_size_hint_weight_set(o, 0.0, 0.0);
   evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, _("Scrollback:"));
+   ctx->backlock_label = o;
+   _update_backlog_title(ctx);
   elm_box_pack_end(bx, o);
   evas_object_show(o);
diff --git a/src/bin/sb.c b/src/bin/sb.c
index a0dd9e8..f52f9d4 100644
--- a/src/bin/sb.c
+++ b/src/bin/sb.c
@@ -108,8 +108,17 @@ void
 ty_sb_lskip(struct ty_sb *sb, int len)
 {
   sb->len -= len;
-   sb->gap += len;
+   if (sb->len)
-   sb->buf += len;
+     {
+        sb->gap += len;
+        sb->buf += len;
+     }
+   else
+     {
+        /* buffer is empty, get rid of gap */
+        sb->buf -= sb->gap;
+        sb->gap = 0;
+     }
 }
 void
diff --git a/src/bin/termcmd.c b/src/bin/termcmd.c
index 3b2e733..e038bfc 100644
--- a/src/bin/termcmd.c
+++ b/src/bin/termcmd.c
@@ -57,15 +57,27 @@ _termcmd_font_size(Evas_Object *obj,
                  eina_stringshare_del(config->font.name);
                  config->font.name = eina_stringshare_add("10x20.pcf");
               }
-             new_size = 20;
+             new_size = config->font.size * 2;
          }
        else if (cmd[0] == '+') // size up
          {
-             new_size = config->font.size + 1;
+             int i;
+             new_size = config->font.size;
+             for (i = 0; cmd[i] == '+'; i++)
+               {
+                  new_size = ((double)new_size * 1.4) + 1;
+               }
          }
        else if (cmd[0] == '-') // size down
          {
-             new_size = config->font.size - 1;
+             int i;
+             new_size = config->font.size;
+             for (i = 0; cmd[i] == '-'; i++)
+               {
+                  new_size = (double)(new_size - 1) / 1.4;
+               }
          }
        else
          {
diff --git a/src/bin/termio.c b/src/bin/termio.c
index dea782e..2d86ea7 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -6,6 +6,7 @@
 #include "termio.h"
 #include "termiolink.h"
 #include "termpty.h"
+#include "backlog.h"
 #include "termptyops.h"
 #include "termcmd.h"
 #include "termptydbl.h"
@@ -175,11 +176,8 @@ termio_user_title_set(Evas_Object *obj, const char *title)
    size_t len = 0;
    EINA_SAFETY_ON_NULL_RETURN(sd);
-    if (sd->pty->prop.user_title)
+    eina_stringshare_del(sd->pty->prop.user_title);
-      {
+    sd->pty->prop.user_title = NULL;
-         eina_stringshare_del(sd->pty->prop.user_title);
-         sd->pty->prop.user_title = NULL;
-      }
    if (title)
      {
@@ -408,7 +406,7 @@ termio_config_update(Evas_Object *obj)
   EINA_SAFETY_ON_NULL_RETURN(sd);
-   if (sd->font.name) eina_stringshare_del(sd->font.name);
+   eina_stringshare_del(sd->font.name);
   sd->font.name = NULL;
   if (sd->config->font.bitmap)
@@ -871,11 +869,8 @@ _lost_selection(void *data, Elm_Sel_Type selection)
          }
        if (sd->have_sel)
          {
-             if (sd->sel_str)
+             eina_stringshare_del(sd->sel_str);
-               {
+             sd->sel_str = NULL;
-                  eina_stringshare_del(sd->sel_str);
-                  sd->sel_str = NULL;
-               }
             termio_sel_set(sd, EINA_FALSE);
             elm_object_cnp_selection_clear(sd->win, selection);
             termio_smart_update_queue(sd);
@@ -905,7 +900,7 @@ termio_take_selection_text(Termio *sd, Elm_Sel_Type type, const char *text)
   elm_cnp_selection_loss_callback_set(sd->win, type,
                                       _lost_selection, sd->self);
   sd->have_sel = EINA_TRUE;
-   if (sd->sel_str) eina_stringshare_del(sd->sel_str);
+   eina_stringshare_del(sd->sel_str);
   sd->sel_str = text;
 }
@@ -1043,8 +1038,7 @@ _getsel_cb(void *data,
                  int prev_i = i;
                  g = eina_unicode_utf8_next_get(s, &i);
                  /* Skip escape codes as a security measure */
-                  if ((g < '\n') ||
+                  if (! ((g == '\t') || (g == '\n') || (g >= ' ')))
-                      ((g > '\n') && (g < ' ')))
                    {
                       continue;
                    }
@@ -1074,9 +1068,9 @@ _getsel_cb(void *data,
        const char *fmt = "UNKNOWN";
        switch (ev->format)
          {
-           case ELM_SEL_FORMAT_TARGETS: fmt = "TARGETS"; break; /* shouldn't happen */
+           case ELM_SEL_FORMAT_TARGETS: fmt = "TARGETS"; break;
           case ELM_SEL_FORMAT_NONE: fmt = "NONE"; break;
-           case ELM_SEL_FORMAT_TEXT: fmt = "TEXT"; break;
+           case ELM_SEL_FORMAT_TEXT: fmt = "TEXT"; break; /* shouldn't happen */
           case ELM_SEL_FORMAT_MARKUP: fmt = "MARKUP"; break;
           case ELM_SEL_FORMAT_IMAGE: fmt = "IMAGE"; break;
           case ELM_SEL_FORMAT_VCARD: fmt = "VCARD"; break;
@@ -1439,11 +1433,9 @@ _remove_links(Termio *sd)
 {
   Eina_Bool same_geom = EINA_FALSE;
-   if (sd->link.string)
+   eina_stringshare_del(sd->link.string);
-     {
+   sd->link.string = NULL;
-        eina_stringshare_del(sd->link.string);
-        sd->link.string = NULL;
-     }
   sd->link.x1 = -1;
   sd->link.y1 = -1;
   sd->link.x2 = -1;
@@ -2383,8 +2375,7 @@ _smart_mouseover_apply(Termio *sd)
          goto end;
     }
-   if (sd->link.string)
+   eina_stringshare_del(sd->link.string);
-     eina_stringshare_del(sd->link.string);
   sd->link.string = eina_stringshare_add(s);
   if ((x1 == sd->link.x1) && (y1 == sd->link.y1) &&
@@ -2829,13 +2820,13 @@ termio_file_send_ok(const Evas_Object *obj, const char *file)
   sd->sendfile.f = fopen(file, "w");
   if (sd->sendfile.f)
     {
-        if (sd->sendfile.file) eina_stringshare_del(sd->sendfile.file);
+        eina_stringshare_del(sd->sendfile.file);
        sd->sendfile.file = eina_stringshare_add(file);
        sd->sendfile.active = EINA_TRUE;
        termpty_write(ty, "k\n", 2);
        return EINA_TRUE;
     }
-   if (sd->sendfile.file) eina_stringshare_del(sd->sendfile.file);
+   eina_stringshare_del(sd->sendfile.file);
   sd->sendfile.file = NULL;
   sd->sendfile.active = EINA_FALSE;
   termpty_write(ty, "n\n", 2);
@@ -3226,10 +3217,9 @@ _smart_del(Evas_Object *obj)
   if (sd->link_do_timer) ecore_timer_del(sd->link_do_timer);
   if (sd->mouse_move_job) ecore_job_del(sd->mouse_move_job);
   if (sd->mouseover_delay) ecore_timer_del(sd->mouseover_delay);
-   if (sd->font.name) eina_stringshare_del(sd->font.name);
+   eina_stringshare_del(sd->font.name);
   if (sd->pty) termpty_free(sd->pty);
-   if (sd->link.string)
+   eina_stringshare_del(sd->link.string);
-     eina_stringshare_del(sd->link.string);
   if (sd->glayer) evas_object_del(sd->glayer);
   if (sd->win)
     evas_object_event_callback_del_full(sd->win, EVAS_CALLBACK_DEL,
@@ -3255,7 +3245,7 @@ _smart_del(Evas_Object *obj)
          }
        sd->sendfile.active = EINA_FALSE;
     }
-   if (sd->sel_str) eina_stringshare_del(sd->sel_str);
+   eina_stringshare_del(sd->sel_str);
   if (sd->sel_reset_job) ecore_job_del(sd->sel_reset_job);
   EINA_LIST_FREE(sd->cur_chids, chid) eina_stringshare_del(chid);
   sd->sel_str = NULL;
@@ -3800,11 +3790,8 @@ _smart_pty_command(void *data)
               {
                  sd->sendfile.progress = 0.0;
                  sd->sendfile.size = 0;
-                  if (sd->sendfile.file)
+                  eina_stringshare_del(sd->sendfile.file);
-                    {
+                  sd->sendfile.file = NULL;
-                       eina_stringshare_del(sd->sendfile.file);
-                       sd->sendfile.file = NULL;
-                    }
                  if (sd->sendfile.f)
                    {
                       fclose(sd->sendfile.f);
diff --git a/src/bin/termiointernals.c b/src/bin/termiointernals.c
index 555c27a..cd17b29 100644
--- a/src/bin/termiointernals.c
+++ b/src/bin/termiointernals.c
@@ -5,6 +5,7 @@
 #include "termio.h"
 #include "miniview.h"
 #include "termpty.h"
+#include "backlog.h"
 #include "termptydbl.h"
 #include "termptyops.h"
 #include "termiointernals.h"
@@ -21,6 +22,16 @@ termio_selection_get(Termio *sd,
 {
   int x, y;
+#define SB_ADD(STR, LEN) do {         \
+     if (ty_sb_add(sb, STR, LEN) < 0) \
+       goto err;                      \
+} while (0)
+#define RTRIM() do {                  \
+     if (rtrim)                       \
+       ty_sb_spaces_rtrim(sb);        \
+} while (0)
   termpty_backlog_lock();
   for (y = c1y; y <= c2y; y++)
     {
@@ -33,51 +44,91 @@ termio_selection_get(Termio *sd,
        cells = termpty_cellrow_get(sd->pty, y, &w);
        if (!cells || !w)
          {
-             if (ty_sb_add(sb, "\n", 1) < 0) goto err;
+             SB_ADD("\n", 1);
             continue;
          }
-        if (w > sd->grid.w) w = sd->grid.w;
+        /* Define how much needs to be read on that line */
+        if (w > sd->grid.w)
+          w = sd->grid.w;
        if (y == c1y && c1x >= w)
          {
-             if (rtrim)
+             RTRIM();
-               ty_sb_spaces_rtrim(sb);
+             SB_ADD("\n", 1);
-             if (ty_sb_add(sb, "\n", 1) < 0) goto err;
             continue;
          }
        start_x = c1x;
        end_x = (c2x >= w) ? w - 1 : c2x;
        if (c1y != c2y)
          {
-             if (y == c1y) end_x = w - 1;
+             if (y == c1y)
-             else if (y == c2y) start_x = 0;
+               end_x = w - 1;
+             else if (y == c2y)
+               start_x = 0;
             else
               {
                  start_x = 0;
                  end_x = w - 1;
               }
          }
        for (x = start_x; x <= end_x; x++)
          {
             if ((cells[x].codepoint == 0) && (cells[x].att.dblwidth))
               {
-                  if (x < end_x) x++;
+                  if (x < end_x)
-                  else break;
+                    x++;
+                  else
+                    break;
+               }
+             if (x >= w)
+               break;
+             if (cells[x].att.tab_inserted)
+               {
+                  /* There was a tab inserted.
+                   * Only output it if there were spaces/empty cells "bellow"
+                   */
+                  Eina_Bool is_tab = EINA_TRUE;
+                  while ((is_tab) && (x < end_x))
+                    {
+                       if (((cells[x].codepoint == 0) ||
+                            (cells[x].att.invisible == 1) ||
+                            (cells[x].codepoint == ' ')))
+                         {
+                              x++;
+                         }
+                       else
+                         {
+                            is_tab = EINA_FALSE;
+                         }
+                       if (cells[x].att.tab_last)
+                         {
+                            SB_ADD("\t", 1);
+                            if (is_tab)
+                              {
+                                 x++;
+                                 is_tab = EINA_FALSE;
+                              }
+                            break;
+                         }
+                    }
               }
-             if (x >= w) break;
             if (cells[x].att.newline)
               {
                  last0 = -1;
                  if ((y != c2y) || (x != end_x))
                    {
-                       if (rtrim)
+                       RTRIM();
-                         ty_sb_spaces_rtrim(sb);
+                       SB_ADD("\n", 1);
-                       if (ty_sb_add(sb, "\n", 1) < 0) goto err;
                    }
                  break;
               }
             else if (cells[x].codepoint == 0)
               {
-                  if (last0 < 0) last0 = x;
+                  /* empty cell, track it to know whether to replace with
+                   * spaces */
+                  if (last0 < 0)
+                    last0 = x;
               }
             else
               {
@@ -90,27 +141,28 @@ termio_selection_get(Termio *sd,
                       last0 = -1;
                       while (v >= 0)
                         {
-                            if (ty_sb_add(sb, " ", 1) < 0) goto err;
+                            SB_ADD(" ", 1);
                            v--;
                         }
                    }
                  txtlen = codepoint_to_utf8(cells[x].codepoint, txt);
                  if (txtlen > 0)
-                    if (ty_sb_add(sb, txt, txtlen) < 0) goto err;
+                    SB_ADD(txt, txtlen);
                  if ((x == (w - 1)) &&
                      ((x != c2x) || (y != c2y)))
                    {
                       if (!cells[x].att.autowrapped)
                         {
-                            if (rtrim)
+                            RTRIM();
-                              ty_sb_spaces_rtrim(sb);
+                            SB_ADD("\n", 1);
-                            if (ty_sb_add(sb, "\n", 1) < 0) goto err;
                         }
                    }
               }
          }
        if (last0 >= 0)
          {
+             /* line stop by empty cell, need to know whether to insert spaces
+              * or just go to next line */
             if (y == c2y)
               {
                  Eina_Bool have_more = EINA_FALSE;
@@ -120,8 +172,10 @@ termio_selection_get(Termio *sd,
                       if ((cells[x].codepoint == 0) &&
                           (cells[x].att.dblwidth))
                         {
-                            if (x < (w - 1)) x++;
+                            if (x < (w - 1))
-                            else break;
+                              x++;
+                            else
+                              break;
                         }
                       if (((cells[x].codepoint != 0) &&
                            (cells[x].codepoint != ' ')) ||
@@ -133,9 +187,8 @@ termio_selection_get(Termio *sd,
                    }
                  if (!have_more)
                    {
-                       if (rtrim)
+                       RTRIM();
-                         ty_sb_spaces_rtrim(sb);
+                       SB_ADD("\n", 1);
-                       if (ty_sb_add(sb, "\n", 1) < 0) goto err;
                    }
                  else
                    {
@@ -144,31 +197,34 @@ termio_selection_get(Termio *sd,
                            if ((cells[x].codepoint == 0) &&
                                (cells[x].att.dblwidth))
                              {
-                                 if (x < (w - 1)) x++;
+                                 if (x < (w - 1))
-                                 else break;
+                                   x++;
+                                 else
+                                   break;
                              }
-                            if (x >= w) break;
+                            if (x >= w)
-                            if (ty_sb_add(sb, " ", 1) < 0) goto err;
+                              break;
+                            SB_ADD(" ", 1);
                         }
                    }
               }
             else
               {
-                  if (rtrim)
+                  RTRIM();
-                    ty_sb_spaces_rtrim(sb);
+                  SB_ADD("\n", 1);
-                  if (ty_sb_add(sb, "\n", 1) < 0) goto err;
               }
          }
     }
   termpty_backlog_unlock();
-   if (rtrim)
+   RTRIM();
-     ty_sb_spaces_rtrim(sb);
   return;
 err:
   ty_sb_free(sb);
+#undef SB_ADD
+#undef RTRIM
 }
@@ -359,9 +415,21 @@ termio_internal_get_selection(Termio *sd, size_t *lenp)
             if (isb.len)
               {
+                  int res;
                  if (isb.buf[isb.len - 1] != '\n' && i != end_y)
-                    ty_sb_add(&isb, "\n", 1);
+                    {
-                  ty_sb_add(&sb, isb.buf, isb.len);
+                       res = ty_sb_add(&isb, "\n", 1);
+                       if (res < 0)
+                         {
+                            ERR("failure to add newline to selection buffer");
+                         }
+                    }
+                  res = ty_sb_add(&sb, isb.buf, isb.len);
+                  if (res < 0)
+                    {
+                       ERR("failure to add %zd characters to selection buffer",
+                           isb.len);
+                    }
               }
             ty_sb_free(&isb);
          }
@@ -1305,8 +1373,6 @@ _selection_newline_extend_fix(Termio *sd)
   termpty_backlog_unlock();
 }
-/* }}} */
 void
 termio_selection_dbl_fix(Termio *sd)
 {
@@ -1393,6 +1459,7 @@ termio_selection_dbl_fix(Termio *sd)
   sd->pty->selection.end.y = end_y;
 }
+/* }}} */
 static void
 _handle_mouse_down_single_click(Termio *sd,
diff --git a/src/bin/termiolink.c b/src/bin/termiolink.c
index d5a3fd5..8a0696b 100644
--- a/src/bin/termiolink.c
+++ b/src/bin/termiolink.c
@@ -1,5 +1,7 @@
 #include "private.h"
 #include <Elementary.h>
+#include "termpty.h"
+#include "backlog.h"
 #include "termiolink.h"
 #include "termio.h"
 #include "sb.h"
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 879135f..f1fc815 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -6,7 +6,7 @@
 #include "termpty.h"
 #include "termptyesc.h"
 #include "termptyops.h"
-#include "termptysave.h"
+#include "backlog.h"
 #include "keyin.h"
 #if !defined(ENABLE_FUZZING) && !defined(ENABLE_TESTS)
 # include "win.h"
@@ -225,35 +225,13 @@ _pty_size(Termpty *ty)
 }
 static Eina_Bool
-_fd_read_do(Termpty *ty, Ecore_Fd_Handler *fd_handler, Eina_Bool false_on_empty)
+_handle_read(Termpty *ty, Eina_Bool false_on_empty)
 {
   char buf[4097];
   Eina_Unicode codepoint[4097];
   int len, i, j, reads;
   unsigned int k;
-   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
-     {
-        DBG("error while reading from tty slave fd");
-        ty->hand_fd = NULL;
-        return ECORE_CALLBACK_CANCEL;
-     }
-   if (ty->fd == -1)
-     {
-        ty->hand_fd = NULL;
-        return ECORE_CALLBACK_CANCEL;
-     }
-/* it seems the BSDs can not read from this side of the pair if the other side
- * is closed */
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
-   if (ty->pid == -1)
-     {
-        ty->hand_fd = NULL;
-        return ECORE_CALLBACK_CANCEL;
-     }
-#endif
   // read up to 64 * 4096 bytes
   for (reads = 0; reads < 64; reads++)
     {
@@ -268,7 +246,7 @@ _fd_read_do(Termpty *ty, Ecore_Fd_Handler *fd_handler, Eina_Bool false_on_empty)
          }
        errno = 0;
        len = read(ty->fd, rbuf, len);
-        if ((len < 0 && errno != EAGAIN) ||
+        if ((len < 0 && !(errno == EAGAIN || errno == EINTR)) ||
            (len == 0 && errno != 0))
          {
             /* Do not print error if the child has exited */
@@ -278,7 +256,8 @@ _fd_read_do(Termpty *ty, Ecore_Fd_Handler *fd_handler, Eina_Bool false_on_empty)
               }
             close(ty->fd);
             ty->fd = -1;
-             if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd);
+             if (ty->hand_fd)
+               ecore_main_fd_handler_del(ty->hand_fd);
             ty->hand_fd = NULL;
             return ECORE_CALLBACK_CANCEL;
          }
@@ -337,16 +316,19 @@ _fd_read_do(Termpty *ty, Ecore_Fd_Handler *fd_handler, Eina_Bool false_on_empty)
 //        DBG("---------------- handle buf %i", j);
        termpty_handle_buf(ty, codepoint, j);
     }
-   if (ty->cb.change.func) ty->cb.change.func(ty->cb.change.data);
+   if (ty->cb.change.func)
+     ty->cb.change.func(ty->cb.change.data);
 #if defined(ENABLE_FUZZING) || defined(ENABLE_TESTS)
   if (len <= 0)
     {
        ty->exit_code = 0;
        ty->pid = -1;
-        if (ty->hand_exe_exit) ecore_event_handler_del(ty->hand_exe_exit);
+        if (ty->hand_exe_exit)
+          ecore_event_handler_del(ty->hand_exe_exit);
        ty->hand_exe_exit = NULL;
-        if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd);
+        if (ty->hand_fd)
+          ecore_main_fd_handler_del(ty->hand_fd);
        ty->hand_fd = NULL;
        ty->fd = -1;
        ty->slavefd = -1;
@@ -355,14 +337,82 @@ _fd_read_do(Termpty *ty, Ecore_Fd_Handler *fd_handler, Eina_Bool false_on_empty)
        return ECORE_CALLBACK_CANCEL;
     }
 #endif
-   if ((false_on_empty) && (len <= 0)) return ECORE_CALLBACK_CANCEL;
+   if ((false_on_empty) && (len <= 0))
-   return EINA_TRUE;
+     return ECORE_CALLBACK_CANCEL;
+   return ECORE_CALLBACK_RENEW;
+}
+static Eina_Bool
+_handle_write(Termpty *ty)
+{
+   struct ty_sb *sb = &ty->write_buffer;
+   ssize_t len;
+   if (!sb->len)
+     return ECORE_CALLBACK_RENEW;
+   len = write(ty->fd, sb->buf, sb->len);
+   if (len < 0 && (errno != EINTR && errno != EAGAIN))
+     {
+        ERR(_("Could not write to file descriptor %d: %s"),
+            ty->fd, strerror(errno));
+        return ECORE_CALLBACK_CANCEL;
+     }
+   ty_sb_lskip(sb, len);
+   if (!sb->len)
+     ecore_main_fd_handler_active_set(ty->hand_fd,
+                                      ECORE_FD_ERROR |
+                                      ECORE_FD_READ);
+   return ECORE_CALLBACK_RENEW;
+}
+static Eina_Bool
+_fd_do(Termpty *ty, Ecore_Fd_Handler *fd_handler, Eina_Bool false_on_empty)
+{
+   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR))
+     {
+        DBG("error while doing I/O on tty slave fd");
+        ty->hand_fd = NULL;
+        return ECORE_CALLBACK_CANCEL;
+     }
+   if (ty->fd == -1)
+     {
+        ty->hand_fd = NULL;
+        return ECORE_CALLBACK_CANCEL;
+     }
+/* it seems the BSDs can not read from this side of the pair if the other side
+ * is closed */
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
+   if (ty->pid == -1)
+     {
+        ty->hand_fd = NULL;
+        return ECORE_CALLBACK_CANCEL;
+     }
+#endif
+   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
+     {
+        if (!_handle_read(ty, false_on_empty))
+          return ECORE_CALLBACK_CANCEL;
+     }
+   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
+     {
+        if (!_handle_write(ty))
+          return ECORE_CALLBACK_CANCEL;
+     }
+   return ECORE_CALLBACK_PASS_ON;
 }
 static Eina_Bool
-_cb_fd_read(void *data, Ecore_Fd_Handler *fd_handler)
+_cb_fd(void *data, Ecore_Fd_Handler *fd_handler)
 {
-   return _fd_read_do(data, fd_handler, EINA_FALSE);
+   return _fd_do(data, fd_handler, EINA_FALSE);
 }
 static Eina_Bool
@@ -386,7 +436,7 @@ _cb_exe_exit(void *data,
   res = ECORE_CALLBACK_PASS_ON;
   while (ty->hand_fd && res != ECORE_CALLBACK_CANCEL)
     {
-        res = _fd_read_do(ty, ty->hand_fd, EINA_TRUE);
+        res = _fd_do(ty, ty->hand_fd, EINA_TRUE);
     }
   if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd);
@@ -533,7 +583,7 @@ termpty_new(const char *cmd, Eina_Bool login_shell, const char *cd,
   ty->fd = STDIN_FILENO;
   ty->hand_fd = ecore_main_fd_handler_add(ty->fd,
                                           ECORE_FD_READ | ECORE_FD_ERROR,
-                                           _cb_fd_read, ty,
+                                           _cb_fd, ty,
                                           NULL, NULL);
   _pty_size(ty);
   termpty_save_register(ty);
@@ -728,6 +778,9 @@ termpty_new(const char *cmd, Eina_Bool login_shell, const char *cd,
             snprintf(buf, sizeof(buf), "WINDOWID=%lu", window_id);
             putenv(buf);
          }
+#if ((EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 24)) || ((EFL_VERSION_MAJOR == 1) && (EFL_VERSION_MINOR == 23) && (EFL_VERSION_MICRO == 99))
+        eina_file_close_from(3, NULL);
+#endif
        if (!login_shell)
          execvp(args[0], (char *const *)args);
        else
@@ -747,10 +800,10 @@ termpty_new(const char *cmd, Eina_Bool login_shell, const char *cd,
   ty->slavefd = -1;
   ty->hand_fd = ecore_main_fd_handler_add(ty->fd, ECORE_FD_READ,
-                                           _cb_fd_read, ty,
+                                           _cb_fd, ty,
                                           NULL, NULL);
   /* ensure we're not missing a read */
-   _cb_fd_read(ty, ty->hand_fd);
+   _cb_fd(ty, ty->hand_fd);
   _pty_size(ty);
   termpty_save_register(ty);
@@ -818,17 +871,10 @@ termpty_free(Termpty *ty)
     }
   if (ty->hand_exe_exit) ecore_event_handler_del(ty->hand_exe_exit);
   if (ty->hand_fd) ecore_main_fd_handler_del(ty->hand_fd);
-   if (ty->prop.title) eina_stringshare_del(ty->prop.title);
+   eina_stringshare_del(ty->prop.title);
-   if (ty->prop.user_title) eina_stringshare_del(ty->prop.user_title);
+   eina_stringshare_del(ty->prop.user_title);
-   if (ty->prop.icon) eina_stringshare_del(ty->prop.icon);
+   eina_stringshare_del(ty->prop.icon);
-   if (ty->back)
+   termpty_backlog_free(ty);
-     {
-        size_t i;
-        for (i = 0; i < ty->backsize; i++)
-          termpty_save_free(ty, &ty->back[i]);
-        free(ty->back);
-     }
   free(ty->screen);
   free(ty->screen2);
   if (ty->hl.links)
@@ -846,6 +892,7 @@ termpty_free(Termpty *ty)
   free(ty->hl.bitmap);
   free(ty->buf);
   free(ty->tabs);
+   ty_sb_free(&ty->write_buffer);
   free(ty);
 }
@@ -901,83 +948,6 @@ termpty_line_length(const Termcell *cells, ssize_t nb_cells)
   return 0;
 }
-#define BACKLOG_ROW_GET(Ty, Y) \
-   (&Ty->back[(Ty->backsize + ty->backpos - ((Y) - 1 )) % Ty->backsize])
-static inline void
-verify_beacon(const Termpty *ty EINA_UNUSED, int verbose EINA_UNUSED)
-{
-#if 0
-   Termsave *ts;
-   int nb_lines;
-   int backlog_y = ty->backlog_beacon.backlog_y;
-   int screen_y = ty->backlog_beacon.screen_y;
-   assert(ty->backlog_beacon.screen_y >= 0);
-   assert(ty->backlog_beacon.backlog_y >= 0);
-   assert(ty->backlog_beacon.screen_y >= ty->backlog_beacon.backlog_y);
-   if (verbose)
-     {
-        ERR("FROM screen_y:%d backlog_y:%d",
-            screen_y, backlog_y);
-     }
-   while (backlog_y > 0)
-     {
-        ts = BACKLOG_ROW_GET(ty, backlog_y);
-        if (!ts->cells)
-          {
-             if (verbose)
-               {
-                  ERR("went too far: screen_y:%d backlog_y:%d",
-                      screen_y, backlog_y);
-               }
-             return;
-          }
-        nb_lines = (ts->w == 0) ? 1 : (ts->w + ty->w - 1) / ty->w;
-        screen_y -= nb_lines;
-        backlog_y--;
-        if (verbose)
-          {
-             ERR("nb_lines:%d screen_y:%d backlog_y:%d ts->w:%d ty->w:%d",
-                 nb_lines, screen_y, backlog_y, ts->w, ty->w);
-          }
-        assert(screen_y >= backlog_y);
-     }
-   if (verbose)
-     {
-        ERR("TO screen_y:%d backlog_y:%d",
-            screen_y, backlog_y);
-     }
-   assert (backlog_y == 0);
-   assert (screen_y == 0);
-#endif
-}
-static void
-_backlog_remove_latest_nolock(Termpty *ty)
-{
-   Termsave *ts;
-   if (ty->backsize == 0)
-     return;
-   ts = BACKLOG_ROW_GET(ty, 1);
-   if (ty->backpos == 0)
-     ty->backpos = ty->backsize - 1;
-   else
-     ty->backpos--;
-   /* reset beacon */
-   ty->backlog_beacon.screen_y = 0;
-   ty->backlog_beacon.backlog_y = 0;
-   verify_beacon(ty, 0);
-   termpty_save_free(ty, ts);
-}
 void
 termpty_text_save_top(Termpty *ty, Termcell *cells, ssize_t w_max)
@@ -989,7 +959,6 @@ termpty_text_save_top(Termpty *ty, Termcell *cells, ssize_t w_max)
     return;
   assert(ty->back);
-   verify_beacon(ty, 0);
   termpty_backlog_lock();
   w = termpty_line_length(cells, w_max);
@@ -1009,7 +978,6 @@ termpty_text_save_top(Termpty *ty, Termcell *cells, ssize_t w_max)
             termpty_save_expand(ty, ts, cells, w);
             ty->backlog_beacon.screen_y += (ts->w + ty->w - 1) / ty->w
                                          - (old_len + ty->w - 1) / ty->w;
-             verify_beacon(ty, 0);
             return;
          }
     }
@@ -1032,7 +1000,6 @@ add_new_ts:
        ty->backlog_beacon.screen_y = 0;
        ty->backlog_beacon.backlog_y = 0;
     }
-   verify_beacon(ty, 0);
 }
@@ -1049,42 +1016,12 @@ termpty_row_length(Termpty *ty, int y)
   return wret;
 }
-ssize_t
-termpty_backlog_length(Termpty *ty)
-{
-   int backlog_y = ty->backlog_beacon.backlog_y;
-   int screen_y = ty->backlog_beacon.screen_y;
-   if (!ty->backsize)
-     return 0;
-   verify_beacon(ty, 0);
-   for (backlog_y++; backlog_y < (int)ty->backsize; backlog_y++)
-     {
-        int nb_lines;
-        const Termsave *ts;
-        ts = BACKLOG_ROW_GET(ty, backlog_y);
-        if (!ts->cells)
-          goto end;
-        nb_lines = (ts->w == 0) ? 1 : (ts->w + ty->w - 1) / ty->w;
-        screen_y += nb_lines;
-        ty->backlog_beacon.screen_y = screen_y;
-        ty->backlog_beacon.backlog_y = backlog_y;
-        verify_beacon(ty, 0);
-     }
-end:
-     return ty->backlog_beacon.screen_y;
-}
 void
 termpty_backscroll_adjust(Termpty *ty, int *scroll)
 {
   int backlog_y = ty->backlog_beacon.backlog_y;
   int screen_y = ty->backlog_beacon.screen_y;
-   verify_beacon(ty, 0);
   if ((ty->backsize == 0) || (*scroll <= 0))
     {
        *scroll = 0;
@@ -1092,7 +1029,6 @@ termpty_backscroll_adjust(Termpty *ty, int *scroll)
     }
   if (*scroll < screen_y)
     {
-        verify_beacon(ty, 0);
        return;
     }
@@ -1106,18 +1042,15 @@ termpty_backscroll_adjust(Termpty *ty, int *scroll)
        if (!ts->cells || backlog_y >= (int)ty->backsize)
          {
             *scroll = ty->backlog_beacon.screen_y;
-             verify_beacon(ty, 0);
             return;
          }
        nb_lines = (ts->w == 0) ? 1 : (ts->w + ty->w - 1) / ty->w;
        screen_y += nb_lines;
        ty->backlog_beacon.screen_y = screen_y;
        ty->backlog_beacon.backlog_y = backlog_y;
-        verify_beacon(ty, 0);
        backlog_y++;
        if (*scroll <= screen_y)
          {
-             verify_beacon(ty, 0);
             return;
          }
     }
@@ -1141,7 +1074,6 @@ _termpty_cellrow_from_beacon_get(Termpty *ty, int requested_y, ssize_t *wret)
        ty->backlog_beacon.backlog_y = 0;
        ty->backlog_beacon.screen_y = 0;
     }
-   verify_beacon(ty, 0);
   /* going upward */
   while (requested_y >= screen_y)
@@ -1160,7 +1092,6 @@ _termpty_cellrow_from_beacon_get(Termpty *ty, int requested_y, ssize_t *wret)
             screen_y += nb_lines;
             ty->backlog_beacon.screen_y = screen_y;
             ty->backlog_beacon.backlog_y = backlog_y;
-             verify_beacon(ty, 0);
          }
        if ((screen_y - nb_lines < requested_y) && (requested_y <= screen_y))
@@ -1187,7 +1118,6 @@ _termpty_cellrow_from_beacon_get(Termpty *ty, int requested_y, ssize_t *wret)
        ty->backlog_beacon.screen_y = screen_y;
        ty->backlog_beacon.backlog_y = backlog_y;
-        verify_beacon(ty, 0);
        if ((screen_y - nb_lines < requested_y) && (requested_y <= screen_y))
          {
@@ -1251,18 +1181,22 @@ termpty_cell_get(Termpty *ty, int y_requested, int x_requested)
 void
 termpty_write(Termpty *ty, const char *input, int len)
 {
-#if defined(ENABLE_TESTS)
-   ty_sb_add(&ty->write_buffer, input, len);
-#else
-   int fd = ty->fd;
 #if defined(ENABLE_FUZZING)
-   fd = ty->fd_dev_null;
+   return;
-#endif
-   if (fd < 0) return;
-   if (write(fd, input, len) < 0)
-     ERR(_("Could not write to file descriptor %d: %s"),
-         fd, strerror(errno));
 #endif
+   int res = ty_sb_add(&ty->write_buffer, input, len);
+   if (res < 0)
+     {
+        ERR("failure to add %d characters to write buffer", len);
+     }
+   else
+     {
+        ecore_main_fd_handler_active_set(ty->hand_fd,
+                                         ECORE_FD_ERROR |
+                                         ECORE_FD_READ |
+                                         ECORE_FD_WRITE);
+     }
 }
 struct screen_info
@@ -1365,6 +1299,26 @@ _termpty_line_rewrap(Termpty *ty, Termcell *src_cells, int len,
     }
 }
+static void
+_backlog_remove_latest_nolock(Termpty *ty)
+{
+   Termsave *ts;
+   if (ty->backsize == 0)
+     return;
+   ts = BACKLOG_ROW_GET(ty, 1);
+   if (ty->backpos == 0)
+     ty->backpos = ty->backsize - 1;
+   else
+     ty->backpos--;
+   /* reset beacon */
+   ty->backlog_beacon.screen_y = 0;
+   ty->backlog_beacon.backlog_y = 0;
+   termpty_save_free(ty, ts);
+}
 void
 termpty_resize(Termpty *ty, int new_w, int new_h)
 {
@@ -1482,7 +1436,6 @@ termpty_resize(Termpty *ty, int new_w, int new_h)
   ty->backlog_beacon.backlog_y = 0;
   ty->backlog_beacon.screen_y = 0;
-   verify_beacon(ty, 0);
   return;
 bad:
@@ -1490,32 +1443,6 @@ bad:
   free(new_screen);
 }
-void
-termpty_backlog_size_set(Termpty *ty, size_t size)
-{
-   if (ty->backsize == size)
-     return;
-   /* TODO: RESIZE: handle that case better: changing backscroll size */
-   termpty_backlog_lock();
-   if (ty->back)
-     {
-        size_t i;
-        for (i = 0; i < ty->backsize; i++)
-          termpty_save_free(ty, &ty->back[i]);
-        free(ty->back);
-     }
-   if (size > 0)
-     ty->back = calloc(1, sizeof(Termsave) * size);
-   else
-     ty->back = NULL;
-   ty->backpos = 0;
-   ty->backsize = size;
-   termpty_backlog_unlock();
-}
 pid_t
 termpty_pid_get(const Termpty *ty)
 {
@@ -1526,11 +1453,17 @@ void
 termpty_block_free(Termblock *tb)
 {
   char *s;
-   if (tb->path) eina_stringshare_del(tb->path);
-   if (tb->link) eina_stringshare_del(tb->link);
+   if (!tb)
-   if (tb->chid) eina_stringshare_del(tb->chid);
+     return;
-   if (tb->obj) evas_object_del(tb->obj);
-   EINA_LIST_FREE(tb->cmds, s) free(s);
+   eina_stringshare_del(tb->path);
+   eina_stringshare_del(tb->link);
+   eina_stringshare_del(tb->chid);
+   if (tb->obj)
+     evas_object_del(tb->obj);
+   EINA_LIST_FREE(tb->cmds, s)
+      free(s);
   free(tb);
 }
diff --git a/src/bin/termpty.h b/src/bin/termpty.h
index ef07cb9..faeaa6d 100644
--- a/src/bin/termpty.h
+++ b/src/bin/termpty.h
@@ -13,6 +13,7 @@ typedef struct _Termblock     Termblock;
 typedef struct _Termexp       Termexp;
 typedef struct _Termpty       Termpty;
 typedef struct _Termlink      Term_Link;
+typedef struct _TitleIconElem TitleIconElem;
 #define COL_DEF        0
 #define COL_BLACK      1
@@ -81,12 +82,14 @@ struct _Termatt
   unsigned short fraktur : 1;
   unsigned short framed : 1;
   unsigned short encircled : 1;
-   unsigned short overlined : 1;
+   unsigned short overlined : 1; // TODO: support it
+   unsigned short tab_inserted : 1;
+   unsigned short tab_last : 1;
 #if defined(SUPPORT_80_132_COLUMNS)
   unsigned short is_80_132_mode_allowed : 1;
-   unsigned short bit_padding : 11;
+   unsigned short bit_padding :  9;
 #else
-   unsigned short bit_padding : 12;
+   unsigned short bit_padding : 10;
 #endif
   uint16_t       link_id;
 };
@@ -166,12 +169,7 @@ struct _Termpty
   Backlog_Beacon backlog_beacon;
   int w, h;
   int fd, slavefd;
-#if defined(ENABLE_TESTS)
   struct ty_sb write_buffer;
-#endif
-#if defined(ENABLE_FUZZING)
-   int fd_dev_null;
-#endif
   struct {
      int curid;
      Eina_Hash *blocks;
@@ -210,6 +208,7 @@ struct _Termpty
       uint8_t *bitmap;
       uint32_t size;
   } hl;
+   TitleIconElem *title_icon_stack;
 };
 struct _Termcell
@@ -279,17 +278,12 @@ Termpty   *termpty_new(const char *cmd, Eina_Bool login_shell, const char *cd,
 void       termpty_free(Termpty *ty);
 void       termpty_config_update(Termpty *ty, Config *config);
-void       termpty_backlog_lock(void);
-void       termpty_backlog_unlock(void);
 Termcell  *termpty_cellrow_get(Termpty *ty, int y, ssize_t *wret);
 Termcell * termpty_cell_get(Termpty *ty, int y_requested, int x_requested);
 ssize_t termpty_row_length(Termpty *ty, int y);
 void       termpty_write(Termpty *ty, const char *input, int len);
 void       termpty_resize(Termpty *ty, int new_w, int new_h);
 void       termpty_resize_tabs(Termpty *ty, int old_w, int new_w);
-void       termpty_backlog_size_set(Termpty *ty, size_t size);
-ssize_t    termpty_backlog_length(Termpty *ty);
 void       termpty_backscroll_adjust(Termpty *ty, int *scroll);
 pid_t      termpty_pid_get(const Termpty *ty);
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index a92b4db..243b8c3 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -110,9 +110,9 @@ _cursor_is_within_margins(const Termpty *ty)
      );
 }
-enum csi_arg_error {
+enum esc_arg_error {
-     CSI_ARG_NO_VALUE = 1,
+     ESC_ARG_NO_VALUE = 1,
-     CSI_ARG_ERROR = 2
+     ESC_ARG_ERROR = 2
 };
 static int
@@ -124,7 +124,7 @@ _csi_arg_get(Termpty *ty, Eina_Unicode **ptr)
   if ((b == NULL) || (*b == '\0'))
     {
        *ptr = NULL;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   /* Skip potential '?', '>'.... */
@@ -135,13 +135,13 @@ _csi_arg_get(Termpty *ty, Eina_Unicode **ptr)
     {
        b++;
        *ptr = b;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   if (*b == '\0')
     {
        *ptr = NULL;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   while ((*b >= '0') && (*b <= '9'))
@@ -177,7 +177,7 @@ error:
   ERR("Invalid CSI argument");
   ty->decoding_error = EINA_TRUE;
   *ptr = NULL;
-   return -CSI_ARG_ERROR;
+   return -ESC_ARG_ERROR;
 }
 static void
@@ -207,6 +207,8 @@ _cursor_to_start_of_line(Termpty *ty)
 static void
 _handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
 {
+   Termcell *cell;
   switch (*cc)
     {
      case 0x07: // BEL '\a' (bell)
@@ -220,7 +222,11 @@ _handle_cursor_control(Termpty *ty, const Eina_Unicode *cc)
         return;
      case 0x09: // HT  '\t' (horizontal tab)
         DBG("->HT");
+         cell = &(TERMPTY_SCREEN(ty, ty->cursor_state.cx, ty->cursor_state.cy));
+         cell->att.tab_inserted = 1;
         _tab_forward(ty, 1);
+         cell = &(TERMPTY_SCREEN(ty, ty->cursor_state.cx -1, ty->cursor_state.cy));
+         cell->att.tab_last = 1;
         return;
      case 0x0a: // LF  '\n' (new line)
      case 0x0b: // VT  '\v' (vertical tab)
@@ -295,9 +301,9 @@ _handle_esc_csi_reset_mode(Termpty *ty, Eina_Unicode cc, Eina_Unicode *b,
             // http://ttssh2.sourceforge.jp/manual/en/about/ctrlseq.html
             switch (arg)
               {
-                case -CSI_ARG_ERROR:
+                case -ESC_ARG_ERROR:
                   return;
-              /* TODO: -CSI_ARG_NO_VALUE */
+              /* TODO: -ESC_ARG_NO_VALUE */
                case 1:
                   ty->termstate.appcursor = mode;
                   break;
@@ -547,9 +553,9 @@ _handle_esc_csi_reset_mode(Termpty *ty, Eina_Unicode cc, Eina_Unicode *b,
             switch (arg)
               {
-                case -CSI_ARG_ERROR:
+                case -ESC_ARG_ERROR:
                   return;
-              /* TODO: -CSI_ARG_NO_VALUE */
+              /* TODO: -ESC_ARG_NO_VALUE */
                case 1:
                   ty->termstate.appcursor = mode;
                   break;
@@ -587,7 +593,7 @@ _csi_truecolor_arg_get(Termpty *ty, Eina_Unicode **ptr)
   if ((b == NULL) || (*b == '\0'))
     {
        *ptr = NULL;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   /* by construction, shall be the same separator as the following ones */
@@ -595,26 +601,26 @@ _csi_truecolor_arg_get(Termpty *ty, Eina_Unicode **ptr)
   if ((separator != ';') && (separator != ':'))
     {
        *ptr = NULL;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   if (*b == separator)
     {
        b++;
        *ptr = b;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   if (*b == '\0')
     {
        *ptr = NULL;
-        return -CSI_ARG_NO_VALUE;
+        return -ESC_ARG_NO_VALUE;
     }
   /* invalid values */
   if ((*b < '0') || (*b > '9'))
     {
        *ptr = NULL;
-        return -CSI_ARG_ERROR;
+        return -ESC_ARG_ERROR;
     }
   while ((*b >= '0') && (*b <= '9'))
@@ -624,7 +630,7 @@ _csi_truecolor_arg_get(Termpty *ty, Eina_Unicode **ptr)
             *ptr = NULL;
             ERR("Invalid sequence: argument is too large");
             ty->decoding_error = EINA_TRUE;
-             return -CSI_ARG_ERROR;
+             return -ESC_ARG_ERROR;
          }
        sum *= 10;
        sum += *b - '0';
@@ -713,9 +719,9 @@ _handle_esc_csi_truecolor_rgb(Termpty *ty, Eina_Unicode **ptr)
   r = _csi_truecolor_arg_get(ty, ptr);
   g = _csi_truecolor_arg_get(ty, ptr);
   b = _csi_truecolor_arg_get(ty, ptr);
-   if ((r == -CSI_ARG_ERROR) ||
+   if ((r == -ESC_ARG_ERROR) ||
-       (g == -CSI_ARG_ERROR) ||
+       (g == -ESC_ARG_ERROR) ||
-       (b == -CSI_ARG_ERROR))
+       (b == -ESC_ARG_ERROR))
     return COL_DEF;
   if (separator == ':' && *ptr)
@@ -730,7 +736,7 @@ _handle_esc_csi_truecolor_rgb(Termpty *ty, Eina_Unicode **ptr)
             while ((*ptr) && (**ptr != ';'))
               {
                  int arg = _csi_truecolor_arg_get(ty, ptr);
-                  if (arg == -CSI_ARG_ERROR)
+                  if (arg == -ESC_ARG_ERROR)
                    break;
               }
          }
@@ -740,11 +746,11 @@ _handle_esc_csi_truecolor_rgb(Termpty *ty, Eina_Unicode **ptr)
          }
     }
-   if (r == -CSI_ARG_NO_VALUE)
+   if (r == -ESC_ARG_NO_VALUE)
     r = 0;
-   if (g == -CSI_ARG_NO_VALUE)
+   if (g == -ESC_ARG_NO_VALUE)
     g = 0;
-   if (b == -CSI_ARG_NO_VALUE)
+   if (b == -ESC_ARG_NO_VALUE)
     b = 0;
   return _approximate_truecolor_rgb(ty, r, g, b);
@@ -768,9 +774,9 @@ _handle_esc_csi_truecolor_cmy(Termpty *ty, Eina_Unicode **ptr)
   m = _csi_truecolor_arg_get(ty, ptr);
   y = _csi_truecolor_arg_get(ty, ptr);
-   if ((c == -CSI_ARG_ERROR) ||
+   if ((c == -ESC_ARG_ERROR) ||
-       (m == -CSI_ARG_ERROR) ||
+       (m == -ESC_ARG_ERROR) ||
-       (y == -CSI_ARG_ERROR))
+       (y == -ESC_ARG_ERROR))
     return COL_DEF;
   if (separator == ':' && *ptr)
@@ -785,7 +791,7 @@ _handle_esc_csi_truecolor_cmy(Termpty *ty, Eina_Unicode **ptr)
             while ((*ptr) && (**ptr != ';'))
               {
                  int arg = _csi_truecolor_arg_get(ty, ptr);
-                  if (arg == -CSI_ARG_ERROR)
+                  if (arg == -ESC_ARG_ERROR)
                    break;
               }
          }
@@ -795,11 +801,11 @@ _handle_esc_csi_truecolor_cmy(Termpty *ty, Eina_Unicode **ptr)
          }
     }
-   if (c == -CSI_ARG_NO_VALUE)
+   if (c == -ESC_ARG_NO_VALUE)
     c = 0;
-   if (m == -CSI_ARG_NO_VALUE)
+   if (m == -ESC_ARG_NO_VALUE)
     m = 0;
-   if (y == -CSI_ARG_NO_VALUE)
+   if (y == -ESC_ARG_NO_VALUE)
     y = 0;
   r = 255 - ((c * 255) / 100);
@@ -828,10 +834,10 @@ _handle_esc_csi_truecolor_cmyk(Termpty *ty, Eina_Unicode **ptr)
   y = _csi_truecolor_arg_get(ty, ptr);
   k = _csi_truecolor_arg_get(ty, ptr);
-   if ((c == -CSI_ARG_ERROR) ||
+   if ((c == -ESC_ARG_ERROR) ||
-       (m == -CSI_ARG_ERROR) ||
+       (m == -ESC_ARG_ERROR) ||
-       (y == -CSI_ARG_ERROR) ||
+       (y == -ESC_ARG_ERROR) ||
-       (k == -CSI_ARG_ERROR))
+       (k == -ESC_ARG_ERROR))
     return COL_DEF;
   if (separator == ':' && *ptr)
@@ -847,7 +853,7 @@ _handle_esc_csi_truecolor_cmyk(Termpty *ty, Eina_Unicode **ptr)
             while ((*ptr) && (**ptr != ';'))
               {
                  int arg = _csi_truecolor_arg_get(ty, ptr);
-                  if (arg == -CSI_ARG_ERROR)
+                  if (arg == -ESC_ARG_ERROR)
                    break;
               }
          }
@@ -857,13 +863,13 @@ _handle_esc_csi_truecolor_cmyk(Termpty *ty, Eina_Unicode **ptr)
          }
     }
-   if (c == -CSI_ARG_NO_VALUE)
+   if (c == -ESC_ARG_NO_VALUE)
     c = 0;
-   if (m == -CSI_ARG_NO_VALUE)
+   if (m == -ESC_ARG_NO_VALUE)
     m = 0;
-   if (y == -CSI_ARG_NO_VALUE)
+   if (y == -ESC_ARG_NO_VALUE)
     y = 0;
-   if (k == -CSI_ARG_NO_VALUE)
+   if (k == -ESC_ARG_NO_VALUE)
     k = 0;
   r = (255 * (100 - c) * (100 - k)) / 100 / 100;
@@ -891,9 +897,9 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr,
        int arg = _csi_arg_get(ty, &b);
        switch (arg)
          {
-           case -CSI_ARG_ERROR:
+           case -ESC_ARG_ERROR:
              return;
-           case -CSI_ARG_NO_VALUE:
+           case -ESC_ARG_NO_VALUE:
              EINA_FALLTHROUGH;
           case 0: // reset to normal
              termpty_reset_att(&(ty->termstate.att));
@@ -971,9 +977,9 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr,
              arg = _csi_arg_get(ty, &b);
              switch (arg)
                {
-                 case -CSI_ARG_ERROR:
+                 case -ESC_ARG_ERROR:
                    return;
-                   /* TODO: -CSI_ARG_NO_VALUE */
+                   /* TODO: -ESC_ARG_NO_VALUE */
                 case 1:
                    ty->termstate.att.fg256 = 0;
                    ty->termstate.att.fg = COL_INVIS;
@@ -1002,14 +1008,14 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr,
                 case 5:
                    // then get next arg - should be color index 0-255
                    arg = _csi_arg_get(ty, &b);
-                    if (arg <= -CSI_ARG_ERROR || arg > 255)
+                    if (arg <= -ESC_ARG_ERROR || arg > 255)
                      {
                         ERR("Invalid fg color %d", arg);
                         ty->decoding_error = EINA_TRUE;
                      }
                    else
                      {
-                         if (arg == -CSI_ARG_NO_VALUE)
+                         if (arg == -ESC_ARG_NO_VALUE)
                           arg = 0;
                         ty->termstate.att.fg256 = 1;
                         ty->termstate.att.fg = arg;
@@ -1042,9 +1048,9 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr,
              arg = _csi_arg_get(ty, &b);
              switch (arg)
                {
-                 case -CSI_ARG_ERROR:
+                 case -ESC_ARG_ERROR:
                    return;
-                   /* TODO: -CSI_ARG_NO_VALUE */
+                   /* TODO: -ESC_ARG_NO_VALUE */
                 case 1:
                    ty->termstate.att.bg256 = 0;
                    ty->termstate.att.bg = COL_INVIS;
@@ -1073,14 +1079,14 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr,
                 case 5:
                    // then get next arg - should be color index 0-255
                    arg = _csi_arg_get(ty, &b);
-                    if (arg <= -CSI_ARG_ERROR || arg > 255)
+                    if (arg <= -ESC_ARG_ERROR || arg > 255)
                      {
                         ERR("Invalid bg color %d", arg);
                         ty->decoding_error = EINA_TRUE;
                      }
                    else
                      {
-                         if (arg == -CSI_ARG_NO_VALUE)
+                         if (arg == -ESC_ARG_NO_VALUE)
                           arg = 0;
                         ty->termstate.att.bg256 = 1;
                         ty->termstate.att.bg = arg;
@@ -1164,7 +1170,7 @@ _handle_esc_csi_cnl(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int max = ty->h;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -1189,7 +1195,7 @@ _handle_esc_csi_cpl(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int max = ty->h;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -1215,7 +1221,7 @@ _handle_esc_csi_dch(Termpty *ty, Eina_Unicode **ptr)
   Termcell *cells;
   int x, lim, max;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   DBG("DCH - Delete Character: %d chars", arg);
@@ -1273,7 +1279,7 @@ _handle_esc_csi_dsr(Termpty *ty, Eina_Unicode *b)
   arg = _csi_arg_get(ty, &b);
   switch (arg)
     {
-      case -CSI_ARG_ERROR:
+      case -ESC_ARG_ERROR:
         return;
      case 5:
         if (question_mark)
@@ -1382,7 +1388,7 @@ _handle_esc_csi_dsr(Termpty *ty, Eina_Unicode *b)
           {
              /* DSR-DECCKSR (Memory Checksum) */
              int pid = _csi_arg_get(ty, &b);
-              if (pid == -CSI_ARG_NO_VALUE)
+              if (pid == -ESC_ARG_NO_VALUE)
                pid = 65535;
              len = snprintf(bf, sizeof(bf), "\033P%u!~0000\033\\",
                             ((unsigned int)pid) % 65536);
@@ -1408,7 +1414,7 @@ _handle_esc_csi_dsr(Termpty *ty, Eina_Unicode *b)
              ty->decoding_error = EINA_TRUE;
           }
         break;
-      /* TODO: -CSI_ARG_NO_VALUE */
+      /* TODO: -ESC_ARG_NO_VALUE */
      default:
         WRN("unhandled DSR (dec specific: %s) %d",
             (question_mark)? "yes": "no", arg);
@@ -1424,7 +1430,7 @@ _handle_esc_csi_decslrm(Termpty *ty, Eina_Unicode **b)
  int right = _csi_arg_get(ty, b);
  DBG("DECSLRM (%d;%d) Set Left and Right Margins", left, right);
-  if ((left == -CSI_ARG_ERROR) || (right == -CSI_ARG_ERROR))
+  if ((left == -ESC_ARG_ERROR) || (right == -ESC_ARG_ERROR))
    goto bad;
  TERMPTY_RESTRICT_FIELD(left, 1, ty->w);
@@ -1458,7 +1464,7 @@ _handle_esc_csi_decstbm(Termpty *ty, Eina_Unicode **b)
  int bottom = _csi_arg_get(ty, b);
  DBG("DECSTBM (%d;%d) Set Top and Bottom Margins", top, bottom);
-  if ((top == -CSI_ARG_ERROR) || (bottom == -CSI_ARG_ERROR))
+  if ((top == -ESC_ARG_ERROR) || (bottom == -ESC_ARG_ERROR))
    goto bad;
  TERMPTY_RESTRICT_FIELD(top, 1, ty->h);
@@ -1631,12 +1637,12 @@ _handle_esc_csi_decfra(Termpty *ty, Eina_Unicode **b)
   DBG("DECFRA (%d; %d;%d;%d;%d) Fill Rectangular Area",
       c, top, left, bottom, right);
-   if ((c == -CSI_ARG_ERROR) ||
+   if ((c == -ESC_ARG_ERROR) ||
-       (c == -CSI_ARG_NO_VALUE) ||
+       (c == -ESC_ARG_NO_VALUE) ||
-       (top == -CSI_ARG_ERROR) ||
+       (top == -ESC_ARG_ERROR) ||
-       (left == -CSI_ARG_ERROR) ||
+       (left == -ESC_ARG_ERROR) ||
-       (bottom == -CSI_ARG_ERROR) ||
+       (bottom == -ESC_ARG_ERROR) ||
-       (right == -CSI_ARG_ERROR))
+       (right == -ESC_ARG_ERROR))
     return;
   if (! ((c >= 32 && c <= 126) || (c >= 160 && c <= 255)))
@@ -1708,10 +1714,10 @@ _handle_esc_csi_deccara(Termpty *ty, Eina_Unicode **ptr,
   DBG("DECCARA (%d;%d;%d;%d) Change Attributes in Rectangular Area",
       top, left, bottom, right);
-   if ((top == -CSI_ARG_ERROR) ||
+   if ((top == -ESC_ARG_ERROR) ||
-       (left == -CSI_ARG_ERROR) ||
+       (left == -ESC_ARG_ERROR) ||
-       (bottom == -CSI_ARG_ERROR) ||
+       (bottom == -ESC_ARG_ERROR) ||
-       (right == -CSI_ARG_ERROR))
+       (right == -ESC_ARG_ERROR))
     return;
   while (b && b < end)
@@ -1719,9 +1725,9 @@ _handle_esc_csi_deccara(Termpty *ty, Eina_Unicode **ptr,
        int arg = _csi_arg_get(ty, &b);
        switch (arg)
          {
-           case -CSI_ARG_ERROR:
+           case -ESC_ARG_ERROR:
              return;
-           case -CSI_ARG_NO_VALUE:
+           case -ESC_ARG_NO_VALUE:
              EINA_FALLTHROUGH;
           case 0:
              set_bold = set_underline = set_blink = set_inverse = EINA_FALSE;
@@ -1876,10 +1882,10 @@ _handle_esc_csi_decrara(Termpty *ty, Eina_Unicode **ptr,
   DBG("DECRARA (%d;%d;%d;%d) Reverse Attributes in Rectangular Area",
       top, left, bottom, right);
-   if ((top == -CSI_ARG_ERROR) ||
+   if ((top == -ESC_ARG_ERROR) ||
-       (left == -CSI_ARG_ERROR) ||
+       (left == -ESC_ARG_ERROR) ||
-       (bottom == -CSI_ARG_ERROR) ||
+       (bottom == -ESC_ARG_ERROR) ||
-       (right == -CSI_ARG_ERROR))
+       (right == -ESC_ARG_ERROR))
     return;
   while (b && b < end)
@@ -1887,9 +1893,9 @@ _handle_esc_csi_decrara(Termpty *ty, Eina_Unicode **ptr,
        int arg = _csi_arg_get(ty, &b);
        switch (arg)
          {
-           case -CSI_ARG_ERROR:
+           case -ESC_ARG_ERROR:
              return;
-           case -CSI_ARG_NO_VALUE:
+           case -ESC_ARG_NO_VALUE:
              EINA_FALLTHROUGH;
           case 0:
              reverse_bold = reverse_underline = reverse_blink = reverse_inverse = EINA_TRUE;
@@ -1980,10 +1986,10 @@ _handle_esc_csi_decera(Termpty *ty, Eina_Unicode **b)
   DBG("DECERA (%d;%d;%d;%d) Erase Rectangular Area",
       top, left, bottom, right);
-   if ((top == -CSI_ARG_ERROR) ||
+   if ((top == -ESC_ARG_ERROR) ||
-       (left == -CSI_ARG_ERROR) ||
+       (left == -ESC_ARG_ERROR) ||
-       (bottom == -CSI_ARG_ERROR) ||
+       (bottom == -ESC_ARG_ERROR) ||
-       (right == -CSI_ARG_ERROR))
+       (right == -ESC_ARG_ERROR))
     return;
   if (_clean_up_rect_coordinates(ty, &top, &left, &bottom, &right) < 0)
@@ -2014,14 +2020,14 @@ _handle_esc_csi_deccra(Termpty *ty, Eina_Unicode **b)
   DBG("DECFRA (%d;%d;%d;%d -> %d;%d) Copy Rectangular Area",
       top, left, bottom, right, to_top, to_left);
-   if ((top == -CSI_ARG_ERROR) ||
+   if ((top == -ESC_ARG_ERROR) ||
-       (left == -CSI_ARG_ERROR) ||
+       (left == -ESC_ARG_ERROR) ||
-       (bottom == -CSI_ARG_ERROR) ||
+       (bottom == -ESC_ARG_ERROR) ||
-       (right == -CSI_ARG_ERROR) ||
+       (right == -ESC_ARG_ERROR) ||
-       (p1 == -CSI_ARG_ERROR) ||
+       (p1 == -ESC_ARG_ERROR) ||
-       (to_top == -CSI_ARG_ERROR) ||
+       (to_top == -ESC_ARG_ERROR) ||
-       (to_left == -CSI_ARG_ERROR) ||
+       (to_left == -ESC_ARG_ERROR) ||
-       (p2 == -CSI_ARG_ERROR))
+       (p2 == -ESC_ARG_ERROR))
     return;
   if (_clean_up_rect_coordinates(ty, &top, &left, &bottom, &right) < 0)
@@ -2131,7 +2137,7 @@ _handle_esc_csi_cursor_pos_set(Termpty *ty, Eina_Unicode **b,
   cy = _csi_arg_get(ty, b);
   cx = _csi_arg_get(ty, b);
-   if ((cx == -CSI_ARG_ERROR) || (cy == -CSI_ARG_ERROR))
+   if ((cx == -ESC_ARG_ERROR) || (cy == -ESC_ARG_ERROR))
     return;
   DBG("cursor pos set (%s) (%d;%d)", (*cc == 'H') ? "CUP" : "HVP",
@@ -2174,9 +2180,9 @@ _handle_esc_csi_decscusr(Termpty *ty, Eina_Unicode **b)
  switch (arg)
    {
-     case -CSI_ARG_ERROR:
+     case -ESC_ARG_ERROR:
        return;
-     case -CSI_ARG_NO_VALUE:
+     case -ESC_ARG_NO_VALUE:
        EINA_FALLTHROUGH;
     case 0:
        EINA_FALLTHROUGH;
@@ -2213,9 +2219,9 @@ _handle_esc_csi_decsace(Termpty *ty, Eina_Unicode **b)
  switch (arg)
    {
-     case -CSI_ARG_ERROR:
+     case -ESC_ARG_ERROR:
        return;
-     case -CSI_ARG_NO_VALUE:
+     case -ESC_ARG_NO_VALUE:
        EINA_FALLTHROUGH;
     case 0:
        EINA_FALLTHROUGH;
@@ -2245,7 +2251,7 @@ _handle_esc_csi_decic(Termpty *ty, Eina_Unicode **b)
   DBG("DECIC Insert %d Column", arg);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -2296,7 +2302,7 @@ _handle_esc_csi_decdc(Termpty *ty, Eina_Unicode **b)
   DBG("DECDC Delete %d Column", arg);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -2359,7 +2365,7 @@ _handle_esc_csi_ich(Termpty *ty, Eina_Unicode **ptr)
   int old_cx = ty->cursor_state.cx;
   int max = ty->w;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   TERMPTY_RESTRICT_FIELD(arg, 1, ty->w * ty->h);
@@ -2401,7 +2407,7 @@ _handle_esc_csi_cuu(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -2423,7 +2429,7 @@ _handle_esc_csi_cud_or_vpr(Termpty *ty, Eina_Unicode **ptr,
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
@@ -2454,7 +2460,7 @@ _handle_esc_csi_cuf(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -2475,7 +2481,7 @@ _handle_esc_csi_cub(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -2507,7 +2513,7 @@ _handle_esc_csi_cha(Termpty *ty, Eina_Unicode **ptr,
     {
        DBG("CHA - Cursor Horizontal Absolute: %d", arg);
     }
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 1;
@@ -2533,7 +2539,7 @@ _handle_esc_csi_cht(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   TERMPTY_RESTRICT_FIELD(arg, 1, ty->w);
   DBG("CHT - Cursor Forward Tabulation: %d", arg);
@@ -2546,7 +2552,7 @@ _handle_esc_csi_ed(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 0;
@@ -2586,7 +2592,7 @@ _handle_esc_csi_el(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg < 1)
     arg = 0;
@@ -2618,7 +2624,7 @@ _handle_esc_csi_il(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int sy1, sy2, i;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   TERMPTY_RESTRICT_FIELD(arg, 1, ty->h);
@@ -2656,7 +2662,7 @@ _handle_esc_csi_dl(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int sy1, sy2, i;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   TERMPTY_RESTRICT_FIELD(arg, 1, ty->h);
@@ -2694,7 +2700,7 @@ _handle_esc_csi_su(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int i;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   TERMPTY_RESTRICT_FIELD(arg, 1, ty->h);
@@ -2710,7 +2716,7 @@ _handle_esc_csi_sd(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int i;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   if (arg == 0)
     {
@@ -2746,9 +2752,9 @@ _handle_esc_csi_decst8c(Termpty *ty, Eina_Unicode **ptr)
   int arg = _csi_arg_get(ty, &b);
   int i;
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
-   if ((arg != -CSI_ARG_NO_VALUE) && (arg != 5))
+   if ((arg != -ESC_ARG_NO_VALUE) && (arg != 5))
     {
        ERR("Invalid DECST8C argument");
        ty->decoding_error = EINA_TRUE;
@@ -2769,13 +2775,13 @@ _handle_esc_csi_ctc(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   DBG("CTC - Cursor Tab Control: %d", arg);
   switch (arg)
     {
-      case -CSI_ARG_NO_VALUE:
+      case -ESC_ARG_NO_VALUE:
         EINA_FALLTHROUGH;
      case 0:
        TAB_SET(ty, ty->cursor_state.cx);
@@ -2800,12 +2806,12 @@ _handle_esc_csi_tbc(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   DBG("TBC - Tab Clear: %d", arg);
   switch (arg)
     {
-      case -CSI_ARG_NO_VALUE:
+      case -ESC_ARG_NO_VALUE:
         EINA_FALLTHROUGH;
      case 0:
        TAB_UNSET(ty, ty->cursor_state.cx);
@@ -2829,7 +2835,7 @@ _handle_esc_csi_ech(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   DBG("ECH - Erase Character: %d", arg);
   TERMPTY_RESTRICT_FIELD(arg, 1, ty->w);
@@ -2843,7 +2849,7 @@ _handle_esc_csi_cbt(Termpty *ty, Eina_Unicode **ptr)
   int cx = ty->cursor_state.cx;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   DBG("CBT - Cursor Horizontal Backward Tabulation: %d", arg);
@@ -2867,7 +2873,7 @@ _handle_esc_csi_rep(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;
   DBG("REP - Repeat last character %d times", arg);
@@ -2909,7 +2915,7 @@ _handle_esc_csi_da(Termpty *ty, Eina_Unicode **ptr)
     }
   arg = _csi_arg_get(ty, &b);
-   if ((arg == -CSI_ARG_ERROR) || (arg > 0))
+   if ((arg == -ESC_ARG_ERROR) || (arg > 0))
     return;
   DBG("DA - Device Attributes");
@@ -2971,7 +2977,7 @@ _handle_esc_csi_uts(Termpty *ty, Eina_Unicode **ptr)
   Eina_Unicode *b = *ptr;
   int arg = _csi_arg_get(ty, &b);
-   if (arg == -CSI_ARG_ERROR)
+   if (arg == -ESC_ARG_ERROR)
     return;