implement ECH

5 files changed, 344 insertions, 308 deletions

diff --git a/src/parser.c b/src/parser.c
index d843dfc..679c448 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -360,24 +360,25 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[151] =
+static yyconst flex_int16_t yy_accept[152] =
     {   0,
         0,    0,   59,   56,    1,    2,    3,    4,    5,    6,
-        7,    8,   50,   42,   57,   44,   45,   46,   54,   55,
+        7,    8,   50,   43,   57,   45,   46,   47,   54,   55,
        55,   55,   55,   55,   14,   15,    9,   10,   11,   48,
-       49,   12,   13,    0,    0,    0,   42,    0,    0,    0,
-       43,   45,   46,    0,   38,    0,   39,    0,   40,    0,
-       41,   51,   52,   47,   47,   52,   52,   16,   17,   18,
+       49,   12,   13,    0,    0,    0,   43,    0,    0,    0,
+       44,   46,   47,    0,   39,    0,   40,    0,   41,    0,
+       42,   51,   52,   48,   48,   48,   48,   16,   17,   18,
        19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-       29,   30,   31,   32,    0,    0,    0,   53,   49,   49,
-       49,   49,    0,    0,    0,    0,    0,    0,    0,   46,
-       47,   47,   47,   33,   34,    0,    0,   49,   49,   49,
-
-        0,    0,    0,    0,    0,    0,   47,    0,   35,   49,
-        0,    0,    0,   36,   49,    0,    0,    0,   37,   49,
-        0,    0,    0,    0,   47,   47,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   29,   30,   47,    0,
-        0,    0,   47,   47,    0,   47,   47,    0,   47,    0
+       29,   30,   31,   32,   33,    0,    0,    0,   53,   49,
+       49,   49,   49,    0,    0,    0,    0,    0,    0,    0,
+       47,   48,   48,   48,   34,   35,    0,    0,   49,   49,
+
+       49,    0,    0,    0,    0,   48,    0,   48,    0,   36,
+       49,    0,    0,    0,   37,   49,    0,    0,    0,   38,
+       49,    0,    0,    0,    0,   48,   48,    0,   48,    0,
+        0,    0,    0,    0,    0,   48,    0,   30,   31,   48,
+        0,    0,    0,   48,   48,   48,   48,   48,   48,   48,
+        0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -390,258 +391,248 @@ static yyconst flex_int32_t yy_ec[256] =
        19,   19,   19,   19,   20,   21,   19,   22,   23,   24,
        25,   26,   27,   28,   29,   30,   31,   32,   22,   22,
        33,   34,   22,   35,   36,   37,   38,   22,   22,   39,
-       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-       40,   22,   41,   22,   22,   22,   22,   22,   42,   43,
-
-       22,   22,   44,   45,   22,   22,   22,   46,   47,   22,
-       22,   22,   22,   48,   22,   22,   22,   22,   22,   22,
-       22,   22,   22,   22,   22,   22,    1,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
-       49,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       22,   22,   22,   22,   22,   22,   22,   40,   22,   22,
+       41,   22,   42,   22,   22,   22,   22,   22,   43,   44,
 
+       22,   22,   45,   46,   22,   22,   22,   47,   48,   22,
+       22,   22,   22,   49,   22,   22,   22,   22,   22,   22,
+       22,   22,   22,   22,   22,   22,    1,   50,   50,   50,
        50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
        50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   51,   51,   51,   51,   51,   51,   51,
-       51,   51,   51,   51,   51,   51,   51,   51,   51,   52,
-       52,   52,   52,   52,   52,   52,   52,   53,   53,   53,
-       53,   53,   53,   53,   53
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
+       50,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+
+       51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
+       51,   51,   51,   52,   52,   52,   52,   52,   52,   52,
+       52,   52,   52,   52,   52,   52,   52,   52,   52,   53,
+       53,   53,   53,   53,   53,   53,   53,   54,   54,   54,
+       54,   54,   54,   54,   54
     } ;
 
-static yyconst flex_int32_t yy_meta[54] =
+static yyconst flex_int32_t yy_meta[55] =
     {   0,
         1,    2,    1,    1,    1,    1,    1,    1,    1,    1,
         3,    3,    3,    3,    3,    4,    4,    4,    4,    4,
         4,    3,    5,    6,    6,    3,    6,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    5,    5,    3,    3,    7,    8,
-        8,    8,    7
+        3,    3,    3,    3,    3,    5,    5,    3,    3,    7,
+        8,    8,    8,    7
     } ;
 
-static yyconst flex_int16_t yy_base[170] =
+static yyconst flex_int16_t yy_base[171] =
     {   0,
-        0,   53,  391,  726,  726,  726,  726,  726,  726,  726,
-      726,  726,  106,   14,  726,  340,  339,  338,  726,  726,
-        0,    5,   10,   15,  726,  726,  726,  726,  726,  158,
-       29,  726,  726,  337,  336,  335,   17,  334,  333,  332,
-       20,  331,  329,   21,  726,   26,  726,   62,  726,   71,
-      726,  726,  726,  188,  726,  236,  288,  726,  726,  726,
-      726,  726,  726,  726,  726,  726,  726,  726,  726,  726,
-      726,  726,  726,  726,  320,  319,  318,  726,   40,  212,
-      224,  227,  317,  316,  310,  309,  308,  306,  300,  298,
-       69,  325,   55,  726,  726,  288,  286,  215,  218,  221,
-
-      273,  272,  264,  263,  356,  264,  194,  261,  726,  249,
-      212,  211,  209,  726,  300,  200,  199,  185,  726,  312,
-      183,  179,  173,  167,  389,  200,  280,  299,  158,  106,
-       50,   49,   48,   46,  422,  206,  726,  726,  311,   40,
-       39,   38,  455,  309,  488,  521,  329,  554,  586,  726,
-      633,  639,  645,  649,  653,  657,  662,  668,  676,  681,
-      686,  693,  700,  705,  708,  711,  713,  716,  719
+        0,   54,  408,  676,  676,  676,  676,  676,  676,  676,
+      676,  676,  108,   14,  676,  357,  356,  355,  676,  676,
+        0,    5,   10,   15,  676,  676,  676,  676,  676,  161,
+       29,  676,  676,  354,  353,  352,   17,  350,  349,  347,
+       20,  346,  344,   21,  676,   26,  676,   63,  676,   72,
+      676,  676,  676,  192,  676,  241,  294,  676,  676,  676,
+      676,  676,  676,  676,  676,  676,  676,  676,  676,  676,
+      676,  676,  676,  676,  676,  336,  327,  325,  676,   40,
+      216,  229,  232,  316,  315,  314,  313,  312,  311,  310,
+      308,   70,  332,   56,  676,  676,  304,  294,   47,  219,
+
+      222,  293,  291,  278,  276,  364,  209,  208,  266,  676,
+      235,  259,  228,  216,  676,  238,  215,  213,  204,  676,
+      254,  203,  188,  186,  173,  398,  252,  285,  302,  172,
+      170,  161,  108,   51,   46,  432,  300,  676,  676,  317,
+       40,   39,   38,  466,  315,  500,  534,  332,  353,  372,
+      676,  583,  589,  595,  599,  603,  607,  612,  618,  626,
+      631,  636,  643,  650,  655,  658,  661,  663,  666,  669
     } ;
 
-static yyconst flex_int16_t yy_def[170] =
+static yyconst flex_int16_t yy_def[171] =
     {   0,
-      151,  151,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  152,  150,  150,  150,  150,  150,  150,
-      153,  154,  155,  156,  150,  150,  150,  150,  150,  150,
-      157,  150,  150,  150,  150,  150,  152,  150,  150,  150,
-      158,  150,  150,  153,  150,  154,  150,  155,  150,  156,
-      150,  150,  150,   30,  150,  159,  159,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  157,  157,
-      157,  157,  150,  150,  150,  150,  150,  150,  150,  150,
-      160,   57,   57,  150,  150,  150,  150,  161,  162,  163,
-
-      150,  150,  150,  150,   92,  150,  164,  150,  150,  161,
-      150,  150,  150,  150,  162,  150,  150,  150,  150,  163,
-      150,  150,  150,  150,   92,  165,  166,   92,  150,  150,
-      150,  150,  150,  150,   92,  167,  150,  150,   92,  150,
-      150,  150,   92,  168,   92,   92,  169,   92,   92,    0,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150
+      152,  152,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  153,  151,  151,  151,  151,  151,  151,
+      154,  155,  156,  157,  151,  151,  151,  151,  151,  151,
+      158,  151,  151,  151,  151,  151,  153,  151,  151,  151,
+      159,  151,  151,  154,  151,  155,  151,  156,  151,  157,
+      151,  151,  151,   30,  151,  160,  160,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  158,
+      158,  158,  158,  151,  151,  151,  151,  151,  151,  151,
+      151,  161,   57,   57,  151,  151,  151,  151,  162,  163,
+
+      164,  151,  151,  151,  151,   93,  151,  165,  151,  151,
+      162,  151,  151,  151,  151,  163,  151,  151,  151,  151,
+      164,  151,  151,  151,  151,   93,  166,  167,   93,  151,
+      151,  151,  151,  151,  151,   93,  168,  151,  151,   93,
+      151,  151,  151,   93,  169,   93,   93,  170,   93,   93,
+        0,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151
     } ;
 
-static yyconst flex_int16_t yy_nxt[780] =
+static yyconst flex_int16_t yy_nxt[731] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        44,   44,   44,   44,   44,   46,   46,   46,   46,   46,
        48,   48,   48,   48,   48,   50,   50,   50,   50,   50,
-       78,   44,   44,   44,   44,   44,   46,   46,   46,   46,
-       46,   78,  150,  150,   80,   81,   82,  150,   15,   16,
-       17,   18,   15,    4,    5,    6,    7,    8,    9,   10,
-       11,   12,   13,   38,   39,   40,   38,   39,   40,   38,
-       39,   40,   48,   48,   48,   48,   48,  107,   83,   84,
-       85,   50,   50,   50,   50,   50,  120,  115,  110,   83,
-       84,   85,  106,  106,  142,  106,  120,  141,  115,   71,
-
-       72,   15,   16,   17,   18,   15,   19,   19,   19,   19,
-       19,   19,   19,   19,   19,   19,   20,   21,   22,   23,
-       24,   20,   20,   20,   20,   25,   26,   20,   20,   20,
-       27,   28,   20,   20,   20,   20,   20,   20,   20,   20,
-       20,   20,   20,   29,   20,   30,   31,   32,   20,   33,
-       20,   20,   20,   20,  140,   34,   35,   36,   52,   52,
-       52,   52,   52,   52,   52,   52,   52,   52,   53,   53,
-       53,   53,   53,   54,   54,   54,   54,   54,   54,   53,
-       55,   56,   56,   53,   57,   58,   59,   60,   61,   62,
-       63,   64,   65,   66,   67,   68,   69,   53,   53,   53,
-
-       70,   53,   71,   72,   73,   74,  110,   75,   76,   77,
-       91,   53,   53,   78,   53,   79,  109,  106,  106,  114,
-      106,  134,  119,  106,  106,   78,  106,  133,   78,  106,
-      106,  120,  106,  132,   98,   53,   52,   52,   52,   52,
-       52,   52,   52,   52,   52,   52,   99,  131,  115,  100,
-      109,   92,   92,   92,   92,   92,   92,  130,   55,  129,
-      110,   83,   84,   85,  111,  112,  113,  116,  117,  118,
-      121,  122,  123,   83,   84,   85,   83,   84,   85,  127,
-      127,  127,  127,  127,  127,   75,   76,   77,   52,   52,
-       52,   52,   52,   52,   52,   52,   52,   52,  111,  112,
-
-      113,  114,  136,   93,   93,   93,   93,   93,   93,   53,
-       55,   41,   20,  119,  139,  139,  139,  139,  139,  139,
-      124,   79,   94,   95,  137,  138,  139,  139,  139,  139,
-      139,  139,  106,  106,  108,  106,   53,   75,   76,   77,
-       92,   92,   92,   92,   92,   92,   41,  107,  104,  116,
-      117,  118,  106,  106,   41,  106,  103,   20,  102,   53,
-       53,  121,  122,  123,  101,   79,   97,   96,   53,   71,
-       72,  125,  125,  125,  125,  125,  125,   90,  126,   41,
-       89,   88,   41,   87,   86,   20,   43,   42,   41,   64,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-
-      150,  150,   73,   74,  125,  125,  125,  125,  125,  125,
-      150,  126,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,   64,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,   73,   74,  143,  143,  143,
-      143,  143,  143,  150,  144,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,   73,   74,
-      143,  143,  143,  143,  143,  143,  150,  144,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-
-      150,   73,   74,  146,  146,  146,  146,  146,  146,  150,
-      147,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,   73,   74,  146,  146,  146,  146,
-      146,  146,  150,  147,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,   73,   74,  149,
-      149,  149,  149,  149,  149,  150,  147,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-
-       73,  149,  149,  149,  149,  149,  149,  150,  147,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,   73,   14,   14,   14,   14,   14,   14,   14,
-       14,   37,   37,   37,   37,  150,   37,   45,   45,   45,
+       79,   44,   44,   44,   44,   44,   46,   46,   46,   46,
+       46,   79,  151,  151,   81,   82,   83,  151,  110,   15,
+       16,   17,   18,   15,    4,    5,    6,    7,    8,    9,
+       10,   11,   12,   13,   38,   39,   40,   38,   39,   40,
+       38,   39,   40,   48,   48,   48,   48,   48,  108,   84,
+       85,   86,   50,   50,   50,   50,   50,  121,  116,  111,
+       84,   85,   86,  107,  107,  143,  107,  112,  113,  114,
+
+      121,   72,   73,   15,   16,   17,   18,   15,   19,   19,
+       19,   19,   19,   19,   19,   19,   19,   19,   20,   21,
+       22,   23,   24,   20,   20,   20,   20,   25,   26,   20,
+       20,   20,   27,   28,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,   20,   20,   29,   20,   20,   30,   31,
+       32,   20,   33,   20,   20,   20,   20,  142,   34,   35,
+       36,   52,   52,   52,   52,   52,   52,   52,   52,   52,
+       52,   53,   53,   53,   53,   53,   54,   54,   54,   54,
+       54,   54,   53,   55,   56,   56,   53,   57,   58,   59,
+       60,   61,   62,   63,   64,   65,   66,   67,   68,   69,
+
+       70,   53,   53,   53,   71,   53,   72,   73,   74,   75,
+      116,   76,   77,   78,   92,   53,   53,   79,   53,  141,
+      115,  111,   80,  120,  128,  128,  128,  128,  128,  128,
+       79,  107,  107,   79,  107,  135,  110,  134,   99,  115,
+       53,   52,   52,   52,   52,   52,   52,   52,   52,   52,
+       52,  100,  121,  133,  101,  120,   93,   93,   93,   93,
+       93,   93,  132,   55,  116,  131,   84,   85,   86,  117,
+      118,  119,  122,  123,  124,  107,  107,  130,  107,   84,
+       85,   86,   84,   85,   86,  112,  113,  114,  117,  118,
+      119,   76,   77,   78,   52,   52,   52,   52,   52,   52,
+
+       52,   52,   52,   52,  122,  123,  124,  137,  111,   94,
+       94,   94,   94,   94,   94,   53,   55,  140,  140,  140,
+      140,  140,  140,  107,  107,   41,  107,   20,   95,   96,
+      138,  139,  140,  140,  140,  140,  140,  140,  107,  107,
+      125,  107,   80,  109,   76,   77,   78,   93,   93,   93,
+       93,   93,   93,   53,  108,  107,  107,   41,  107,  105,
+       41,  104,   20,  103,  102,   80,   53,   53,  150,  150,
+      150,  150,  150,  150,   98,  148,   97,   72,   73,  126,
+      126,  126,  126,  126,  126,   53,  127,  150,  150,  150,
+      150,  150,  150,   91,  148,   41,   90,   64,   89,   41,
+
+       74,   88,   87,   20,   43,   42,   41,  151,  151,  151,
+      151,   74,   75,  126,  126,  126,  126,  126,  126,   74,
+      127,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,   64,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,   74,   75,  144,  144,  144,
+      144,  144,  144,  151,  145,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,   74,
+       75,  144,  144,  144,  144,  144,  144,  151,  145,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,   74,   75,  147,  147,  147,  147,  147,
+      147,  151,  148,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,   74,   75,  147,
+      147,  147,  147,  147,  147,  151,  148,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,   74,   75,   14,   14,   14,   14,   14,   14,   14,
+       14,   37,   37,   37,   37,  151,   37,   45,   45,   45,
+
        45,   47,   47,   47,   47,   49,   49,   49,   49,   51,
-       51,   51,   51,   79,   79,   79,   79,   79,  150,   79,
-       41,   41,   41,   41,  150,   41,   53,   53,   53,   53,
-       53,   53,  150,   53,  105,  150,  105,  110,  110,  110,
-      110,  110,  150,  110,  115,  115,  115,  115,  115,  150,
-
-      115,  120,  120,  120,  120,  120,  150,  120,  128,  150,
-      128,  135,  150,  135,  127,  127,  127,  150,  127,  145,
-      150,  145,  148,  150,  148,    3,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150
+       51,   51,   51,   80,   80,   80,   80,   80,  151,   80,
+       41,   41,   41,   41,  151,   41,   53,   53,   53,   53,
+       53,   53,  151,   53,  106,  151,  106,  111,  111,  111,
+      111,  111,  151,  111,  116,  116,  116,  116,  116,  151,
+      116,  121,  121,  121,  121,  121,  151,  121,  129,  151,
+      129,  136,  151,  136,  128,  128,  128,  151,  128,  146,
+      151,  146,  149,  151,  149,    3,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151
     } ;
 
-static yyconst flex_int16_t yy_chk[780] =
+static yyconst flex_int16_t yy_chk[731] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
        21,   21,   21,   21,   21,   22,   22,   22,   22,   22,
        23,   23,   23,   23,   23,   24,   24,   24,   24,   24,
        31,   44,   44,   44,   44,   44,   46,   46,   46,   46,
-       46,   79,    0,    0,   31,   31,   31,    0,    1,    1,
-        1,    1,    1,    2,    2,    2,    2,    2,    2,    2,
-        2,    2,    2,   14,   14,   14,   37,   37,   37,   41,
-       41,   41,   48,   48,   48,   48,   48,   93,   31,   31,
-       31,   50,   50,   50,   50,   50,  142,  141,  140,   79,
-       79,   79,   91,   91,  134,   91,  133,  132,  131,   93,
-
-       93,    2,    2,    2,    2,    2,   13,   13,   13,   13,
+       46,   80,    0,    0,   31,   31,   31,    0,   99,    1,
+        1,    1,    1,    1,    2,    2,    2,    2,    2,    2,
+        2,    2,    2,    2,   14,   14,   14,   37,   37,   37,
+       41,   41,   41,   48,   48,   48,   48,   48,   94,   31,
+       31,   31,   50,   50,   50,   50,   50,  143,  142,  141,
+       80,   80,   80,   92,   92,  135,   92,   99,   99,   99,
+
+      134,   94,   94,    2,    2,    2,    2,    2,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-       13,   13,   13,   13,  130,   13,   13,   13,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
+       13,   13,   13,   13,   13,   13,   13,  133,   13,   13,
+       13,   30,   30,   30,   30,   30,   30,   30,   30,   30,
        30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
        30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
        30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
 
-       30,   30,   30,   30,   30,   30,  129,   30,   30,   30,
-       54,   54,   54,   80,   54,  124,   98,  107,  107,   99,
-      107,  123,  100,  126,  126,   81,  126,  122,   82,  136,
-      136,  121,  136,  118,   80,   54,   56,   56,   56,   56,
-       56,   56,   56,   56,   56,   56,   81,  117,  116,   82,
-      110,   56,   56,   56,   56,   56,   56,  113,   56,  112,
-      111,   80,   80,   80,   98,   98,   98,   99,   99,   99,
-      100,  100,  100,   81,   81,   81,   82,   82,   82,  106,
-      106,  106,  106,  106,  106,   56,   56,   56,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   57,  110,  110,
-
-      110,  115,  127,   57,   57,   57,   57,   57,   57,  108,
-       57,  104,  103,  120,  128,  128,  128,  128,  128,  128,
-      102,  101,   57,   57,  127,  127,  139,  139,  139,  139,
-      139,  139,  144,  144,   97,  144,   96,   57,   57,   57,
-       92,   92,   92,   92,   92,   92,   90,   92,   89,  115,
-      115,  115,  147,  147,   88,  147,   87,   86,   85,   92,
-       92,  120,  120,  120,   84,   83,   77,   76,   75,   92,
-       92,  105,  105,  105,  105,  105,  105,   43,  105,   42,
-       40,   39,   38,   36,   35,   34,   18,   17,   16,  105,
-        3,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,  105,  105,  125,  125,  125,  125,  125,  125,
-        0,  125,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  125,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  125,  125,  135,  135,  135,
-      135,  135,  135,    0,  135,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  135,  135,
-      143,  143,  143,  143,  143,  143,    0,  143,    0,    0,
+       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
+      132,   30,   30,   30,   54,   54,   54,   81,   54,  131,
+      100,  130,  125,  101,  107,  107,  107,  107,  107,  107,
+       82,  108,  108,   83,  108,  124,  111,  123,   81,  116,
+       54,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   82,  122,  119,   83,  121,   56,   56,   56,   56,
+       56,   56,  118,   56,  117,  114,   81,   81,   81,  100,
+      100,  100,  101,  101,  101,  127,  127,  113,  127,   82,
+       82,   82,   83,   83,   83,  111,  111,  111,  116,  116,
+      116,   56,   56,   56,   57,   57,   57,   57,   57,   57,
+
+       57,   57,   57,   57,  121,  121,  121,  128,  112,   57,
+       57,   57,   57,   57,   57,  109,   57,  129,  129,  129,
+      129,  129,  129,  137,  137,  105,  137,  104,   57,   57,
+      128,  128,  140,  140,  140,  140,  140,  140,  145,  145,
+      103,  145,  102,   98,   57,   57,   57,   93,   93,   93,
+       93,   93,   93,   97,   93,  148,  148,   91,  148,   90,
+       89,   88,   87,   86,   85,   84,   93,   93,  149,  149,
+      149,  149,  149,  149,   78,  149,   77,   93,   93,  106,
+      106,  106,  106,  106,  106,   76,  106,  150,  150,  150,
+      150,  150,  150,   43,  150,   42,   40,  106,   39,   38,
+
+      149,   36,   35,   34,   18,   17,   16,    3,    0,    0,
+        0,  106,  106,  126,  126,  126,  126,  126,  126,  150,
+      126,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  126,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  126,  126,  136,  136,  136,
+      136,  136,  136,    0,  136,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  136,
+      136,  144,  144,  144,  144,  144,  144,    0,  144,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,  143,  143,  145,  145,  145,  145,  145,  145,    0,
-      145,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  145,  145,  146,  146,  146,  146,
-      146,  146,    0,  146,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  144,  144,  146,  146,  146,  146,  146,
+      146,    0,  146,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  146,  146,  148,
-      148,  148,  148,  148,  148,    0,  148,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  146,  146,  147,
+      147,  147,  147,  147,  147,    0,  147,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-      148,  149,  149,  149,  149,  149,  149,    0,  149,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  149,  151,  151,  151,  151,  151,  151,  151,
-      151,  152,  152,  152,  152,    0,  152,  153,  153,  153,
-      153,  154,  154,  154,  154,  155,  155,  155,  155,  156,
-      156,  156,  156,  157,  157,  157,  157,  157,    0,  157,
-      158,  158,  158,  158,    0,  158,  159,  159,  159,  159,
-      159,  159,    0,  159,  160,    0,  160,  161,  161,  161,
-      161,  161,    0,  161,  162,  162,  162,  162,  162,    0,
-
-      162,  163,  163,  163,  163,  163,    0,  163,  164,    0,
-      164,  165,    0,  165,  166,  166,  167,    0,  167,  168,
-        0,  168,  169,    0,  169,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,  150
+        0,  147,  147,  152,  152,  152,  152,  152,  152,  152,
+      152,  153,  153,  153,  153,    0,  153,  154,  154,  154,
+
+      154,  155,  155,  155,  155,  156,  156,  156,  156,  157,
+      157,  157,  157,  158,  158,  158,  158,  158,    0,  158,
+      159,  159,  159,  159,    0,  159,  160,  160,  160,  160,
+      160,  160,    0,  160,  161,    0,  161,  162,  162,  162,
+      162,  162,    0,  162,  163,  163,  163,  163,  163,    0,
+      163,  164,  164,  164,  164,  164,    0,  164,  165,    0,
+      165,  166,    0,  166,  167,  167,  168,    0,  168,  169,
+        0,  169,  170,    0,  170,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
+      151,  151,  151,  151,  151,  151,  151,  151,  151,  151
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -663,7 +654,7 @@ static yyconst flex_int16_t yy_chk[780] =
 
 #define YY_EXIT_FAILURE (UNUSED(yyscanner), 2)
 #define YY_NO_INPUT 1
-#line 86 "src/parser.l"
+#line 87 "src/parser.l"
 static void vt100_parser_handle_bel(VT100Screen *vt);
 static void vt100_parser_handle_bs(VT100Screen *vt);
 static void vt100_parser_handle_tab(VT100Screen *vt);
@@ -692,6 +683,7 @@ static void vt100_parser_handle_el(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_il(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_dl(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_dch(VT100Screen *vt, char *buf, size_t len);
+static void vt100_parser_handle_ech(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_vpa(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_sm(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_rm(VT100Screen *vt, char *buf, size_t len);
@@ -704,7 +696,7 @@ static void vt100_parser_handle_osc1(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_osc2(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_ascii(VT100Screen *vt, char *text, size_t len);
 static void vt100_parser_handle_text(VT100Screen *vt, char *text, size_t len);
-#line 708 "src/parser.c"
+#line 700 "src/parser.c"
 
 #define INITIAL 0
 
@@ -952,10 +944,10 @@ YY_DECL
 		}
 
 	{
-#line 128 "src/parser.l"
+#line 130 "src/parser.l"
 
 
-#line 959 "src/parser.c"
+#line 951 "src/parser.c"
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
@@ -982,13 +974,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 151 )
+				if ( yy_current_state >= 152 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 150 );
+		while ( yy_current_state != 151 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1010,248 +1002,251 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 130 "src/parser.l"
+#line 132 "src/parser.l"
 vt100_parser_handle_bel(yyextra);
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 131 "src/parser.l"
+#line 133 "src/parser.l"
 vt100_parser_handle_bs(yyextra);
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 132 "src/parser.l"
+#line 134 "src/parser.l"
 vt100_parser_handle_tab(yyextra);
 	YY_BREAK
 case 4:
 /* rule 4 can match eol */
-#line 134 "src/parser.l"
+#line 136 "src/parser.l"
 case 5:
 /* rule 5 can match eol */
-#line 135 "src/parser.l"
+#line 137 "src/parser.l"
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 135 "src/parser.l"
+#line 137 "src/parser.l"
 vt100_parser_handle_lf(yyextra);
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 136 "src/parser.l"
+#line 138 "src/parser.l"
 vt100_parser_handle_cr(yyextra);
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 137 "src/parser.l"
+#line 139 "src/parser.l"
 
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 139 "src/parser.l"
+#line 141 "src/parser.l"
 vt100_parser_handle_deckpam(yyextra);
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 140 "src/parser.l"
+#line 142 "src/parser.l"
 vt100_parser_handle_deckpnm(yyextra);
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 141 "src/parser.l"
+#line 143 "src/parser.l"
 vt100_parser_handle_ri(yyextra);
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 142 "src/parser.l"
+#line 144 "src/parser.l"
 vt100_parser_handle_ris(yyextra);
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 143 "src/parser.l"
+#line 145 "src/parser.l"
 vt100_parser_handle_vb(yyextra);
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 144 "src/parser.l"
+#line 146 "src/parser.l"
 vt100_parser_handle_decsc(yyextra);
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 145 "src/parser.l"
+#line 147 "src/parser.l"
 vt100_parser_handle_decrc(yyextra);
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 147 "src/parser.l"
+#line 149 "src/parser.l"
 vt100_parser_handle_ich(yyextra, yytext, yyleng);
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 148 "src/parser.l"
+#line 150 "src/parser.l"
 vt100_parser_handle_cuu(yyextra, yytext, yyleng);
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 149 "src/parser.l"
+#line 151 "src/parser.l"
 vt100_parser_handle_cud(yyextra, yytext, yyleng);
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 150 "src/parser.l"
+#line 152 "src/parser.l"
 vt100_parser_handle_cuf(yyextra, yytext, yyleng);
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 151 "src/parser.l"
+#line 153 "src/parser.l"
 vt100_parser_handle_cub(yyextra, yytext, yyleng);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 152 "src/parser.l"
+#line 154 "src/parser.l"
 vt100_parser_handle_cha(yyextra, yytext, yyleng);
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 153 "src/parser.l"
+#line 155 "src/parser.l"
 vt100_parser_handle_cup(yyextra, yytext, yyleng);
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 154 "src/parser.l"
+#line 156 "src/parser.l"
 vt100_parser_handle_ed(yyextra, yytext, yyleng);
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 155 "src/parser.l"
+#line 157 "src/parser.l"
 vt100_parser_handle_el(yyextra, yytext, yyleng);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 156 "src/parser.l"
+#line 158 "src/parser.l"
 vt100_parser_handle_il(yyextra, yytext, yyleng);
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 157 "src/parser.l"
+#line 159 "src/parser.l"
 vt100_parser_handle_dl(yyextra, yytext, yyleng);
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 158 "src/parser.l"
+#line 160 "src/parser.l"
 vt100_parser_handle_dch(yyextra, yytext, yyleng);
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 159 "src/parser.l"
-vt100_parser_handle_vpa(yyextra, yytext, yyleng);
+#line 161 "src/parser.l"
+vt100_parser_handle_ech(yyextra, yytext, yyleng);
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 160 "src/parser.l"
-vt100_parser_handle_sm(yyextra, yytext, yyleng);
+#line 162 "src/parser.l"
+vt100_parser_handle_vpa(yyextra, yytext, yyleng);
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 161 "src/parser.l"
-vt100_parser_handle_rm(yyextra, yytext, yyleng);
+#line 163 "src/parser.l"
+vt100_parser_handle_sm(yyextra, yytext, yyleng);
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 162 "src/parser.l"
-vt100_parser_handle_sgr(yyextra, yytext, yyleng);
+#line 164 "src/parser.l"
+vt100_parser_handle_rm(yyextra, yytext, yyleng);
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 163 "src/parser.l"
-vt100_parser_handle_csr(yyextra, yytext, yyleng);
+#line 165 "src/parser.l"
+vt100_parser_handle_sgr(yyextra, yytext, yyleng);
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 165 "src/parser.l"
-vt100_parser_handle_decsed(yyextra, yytext, yyleng);
+#line 166 "src/parser.l"
+vt100_parser_handle_csr(yyextra, yytext, yyleng);
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 166 "src/parser.l"
-vt100_parser_handle_decsel(yyextra, yytext, yyleng);
+#line 168 "src/parser.l"
+vt100_parser_handle_decsed(yyextra, yytext, yyleng);
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 168 "src/parser.l"
-vt100_parser_handle_osc0(yyextra, yytext, yyleng);
+#line 169 "src/parser.l"
+vt100_parser_handle_decsel(yyextra, yytext, yyleng);
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 169 "src/parser.l"
-vt100_parser_handle_osc1(yyextra, yytext, yyleng);
+#line 171 "src/parser.l"
+vt100_parser_handle_osc0(yyextra, yytext, yyleng);
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 170 "src/parser.l"
-vt100_parser_handle_osc2(yyextra, yytext, yyleng);
+#line 172 "src/parser.l"
+vt100_parser_handle_osc1(yyextra, yytext, yyleng);
 	YY_BREAK
 case 38:
+YY_RULE_SETUP
 #line 173 "src/parser.l"
+vt100_parser_handle_osc2(yyextra, yytext, yyleng);
+	YY_BREAK
 case 39:
-#line 174 "src/parser.l"
+#line 176 "src/parser.l"
 case 40:
-#line 175 "src/parser.l"
+#line 177 "src/parser.l"
 case 41:
+#line 178 "src/parser.l"
+case 42:
 YY_RULE_SETUP
-#line 175 "src/parser.l"
+#line 178 "src/parser.l"
 
 	YY_BREAK
-case 42:
+case 43:
 YY_RULE_SETUP
-#line 177 "src/parser.l"
+#line 180 "src/parser.l"
 vt100_parser_handle_ascii(yyextra, yytext, yyleng);
 	YY_BREAK
-case 43:
+case 44:
 YY_RULE_SETUP
-#line 178 "src/parser.l"
+#line 181 "src/parser.l"
 vt100_parser_handle_text(yyextra, yytext, yyleng);
 	YY_BREAK
-case 44:
-#line 181 "src/parser.l"
 case 45:
-#line 182 "src/parser.l"
+#line 184 "src/parser.l"
 case 46:
-#line 183 "src/parser.l"
+#line 185 "src/parser.l"
 case 47:
-#line 184 "src/parser.l"
+#line 186 "src/parser.l"
 case 48:
-#line 185 "src/parser.l"
+#line 187 "src/parser.l"
 case 49:
-#line 186 "src/parser.l"
+#line 188 "src/parser.l"
 case 50:
 YY_RULE_SETUP
-#line 186 "src/parser.l"
+#line 188 "src/parser.l"
 return yyleng;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 188 "src/parser.l"
+#line 190 "src/parser.l"
 return 0;
 	YY_BREAK
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
-#line 190 "src/parser.l"
+#line 192 "src/parser.l"
 {
     fprintf(stderr,
-        "unhandled CSI sequence: \\033%s\\%hho\n",
+        "unhandled CSI sequence: \\033%s\\%03hho\n",
         yytext + 1, yytext[yyleng - 1]);
 }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 196 "src/parser.l"
+#line 198 "src/parser.l"
 {
     fprintf(stderr, "unhandled CSI sequence: \\033%s\n", yytext + 1);
 }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 200 "src/parser.l"
+#line 202 "src/parser.l"
 {
     if (!strncmp(yytext, "\e]50;", 5)) { // osx terminal.app private stuff
         // not interested in non-portable extensions
@@ -1270,14 +1265,14 @@ YY_RULE_SETUP
 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP
-#line 215 "src/parser.l"
+#line 217 "src/parser.l"
 {
-    fprintf(stderr, "unhandled escape sequence: \\%hho\n", yytext[1]);
+    fprintf(stderr, "unhandled escape sequence: \\%03hho\n", yytext[1]);
 }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 219 "src/parser.l"
+#line 221 "src/parser.l"
 {
     switch (yytext[1]) {
     case '(': // character sets
@@ -1293,24 +1288,24 @@ YY_RULE_SETUP
 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP
-#line 231 "src/parser.l"
+#line 233 "src/parser.l"
 {
-    fprintf(stderr, "unhandled control character: \\%hho\n", yytext[0]);
+    fprintf(stderr, "unhandled control character: \\%03hho\n", yytext[0]);
 }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 235 "src/parser.l"
+#line 237 "src/parser.l"
 {
-    fprintf(stderr, "invalid utf8 byte: \\%hho\n", yytext[0]);
+    fprintf(stderr, "invalid utf8 byte: \\%03hho\n", yytext[0]);
 }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 239 "src/parser.l"
+#line 241 "src/parser.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1314 "src/parser.c"
+#line 1309 "src/parser.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1604,7 +1599,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 151 )
+			if ( yy_current_state >= 152 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1633,11 +1628,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 151 )
+		if ( yy_current_state >= 152 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 150);
+	yy_is_jam = (yy_current_state == 151);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -2402,7 +2397,7 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 239 "src/parser.l"
+#line 241 "src/parser.l"
 
 
 
@@ -2657,6 +2652,14 @@ static void vt100_parser_handle_dch(VT100Screen *vt, char *buf, size_t len)
     vt100_screen_delete_characters(vt, params[0]);
 }
 
+static void vt100_parser_handle_ech(VT100Screen *vt, char *buf, size_t len)
+{
+    int params[VT100_PARSER_CSI_MAX_PARAMS] = { 1 }, nparams;
+
+    vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams);
+    vt100_screen_erase_characters(vt, params[0]);
+}
+
 static void vt100_parser_handle_vpa(VT100Screen *vt, char *buf, size_t len)
 {
     int params[VT100_PARSER_CSI_MAX_PARAMS] = { 1 }, nparams;
diff --git a/src/parser.h b/src/parser.h
index 0fed85e..0545145 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -330,7 +330,7 @@ extern int vt100_parser_yylex (yyscan_t yyscanner);
 #undef YY_DECL
 #endif
 
-#line 239 "src/parser.l"
+#line 241 "src/parser.l"
 
 
 #line 337 "src/parser.h"
diff --git a/src/parser.l b/src/parser.l
index e249a79..4aae2f4 100644
--- a/src/parser.l
+++ b/src/parser.l
@@ -64,6 +64,7 @@ EL  {CSI}{CSIPARAM1}K
 IL  {CSI}{CSIPARAM1}L
 DL  {CSI}{CSIPARAM1}M
 DCH {CSI}{CSIPARAM1}P
+ECH {CSI}{CSIPARAM1}X
 VPA {CSI}{CSIPARAM1}d
 SM  {CSI}{SMPARAMS}h
 RM  {CSI}{SMPARAMS}l
@@ -111,6 +112,7 @@ static void vt100_parser_handle_el(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_il(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_dl(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_dch(VT100Screen *vt, char *buf, size_t len);
+static void vt100_parser_handle_ech(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_vpa(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_sm(VT100Screen *vt, char *buf, size_t len);
 static void vt100_parser_handle_rm(VT100Screen *vt, char *buf, size_t len);
@@ -156,6 +158,7 @@ static void vt100_parser_handle_text(VT100Screen *vt, char *text, size_t len);
 {IL}      vt100_parser_handle_il(yyextra, yytext, yyleng);
 {DL}      vt100_parser_handle_dl(yyextra, yytext, yyleng);
 {DCH}     vt100_parser_handle_dch(yyextra, yytext, yyleng);
+{ECH}     vt100_parser_handle_ech(yyextra, yytext, yyleng);
 {VPA}     vt100_parser_handle_vpa(yyextra, yytext, yyleng);
 {SM}      vt100_parser_handle_sm(yyextra, yytext, yyleng);
 {RM}      vt100_parser_handle_rm(yyextra, yytext, yyleng);
@@ -488,6 +491,14 @@ static void vt100_parser_handle_dch(VT100Screen *vt, char *buf, size_t len)
     vt100_screen_delete_characters(vt, params[0]);
 }
 
+static void vt100_parser_handle_ech(VT100Screen *vt, char *buf, size_t len)
+{
+    int params[VT100_PARSER_CSI_MAX_PARAMS] = { 1 }, nparams;
+
+    vt100_parser_extract_csi_params(buf + 2, len - 3, params, &nparams);
+    vt100_screen_erase_characters(vt, params[0]);
+}
+
 static void vt100_parser_handle_vpa(VT100Screen *vt, char *buf, size_t len)
 {
     int params[VT100_PARSER_CSI_MAX_PARAMS] = { 1 }, nparams;
diff --git a/src/screen.c b/src/screen.c
index 8e8f783..4abbbdc 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -488,6 +488,27 @@ void vt100_screen_delete_lines(VT100Screen *vt, int count)
     vt->dirty = 1;
 }
 
+void vt100_screen_erase_characters(VT100Screen *vt, int count)
+{
+    if (count >= vt->grid->max.col - vt->grid->cur.col) {
+        vt100_screen_kill_line_forward(vt);
+    }
+    else {
+        struct vt100_row *row;
+        int i;
+
+        row = vt100_screen_row_at(vt, vt->grid->cur.row);
+
+        for (i = vt->grid->cur.col; i < vt->grid->cur.col + count; ++i) {
+            struct vt100_cell *cell = &row->cells[i];
+
+            cell->len = 0;
+        }
+    }
+
+    vt->dirty = 1;
+}
+
 void vt100_screen_set_scroll_region(
     VT100Screen *vt, int top, int bottom, int left, int right)
 {
diff --git a/src/screen.h b/src/screen.h
index 881a76f..f363071 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -138,6 +138,7 @@ void vt100_screen_insert_characters(VT100Screen *vt, int count);
 void vt100_screen_insert_lines(VT100Screen *vt, int count);
 void vt100_screen_delete_characters(VT100Screen *vt, int count);
 void vt100_screen_delete_lines(VT100Screen *vt, int count);
+void vt100_screen_erase_characters(VT100Screen *vt, int count);
 void vt100_screen_set_scroll_region(
     VT100Screen *vt, int top, int bottom, int left, int right);
 void vt100_screen_reset_text_attributes(VT100Screen *vt);