render-lines: don't change y_pre or y_post after found_start/end set

To be able to achieve precise positioning on the display (e.g.  with
vline) we need to stop changing y_pre or y_post once found_start or
found_end are set - respectively.

So when we hit EOF and set a 10% y_post, we should NOT set found_end
yet.

This shows an off-by-one error in vline calculation which was previously
hidden as consume_space() would always move us to the start of that line.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/render-lines.c b/render-lines.c
index f9e200476bebbd77b92aee5286262b67097e6701..bc7d7307d1772521fffcc2d19001032feac17c0b 100644 (file)
--- a/render-lines.c
+++ b/render-lines.c
@@ -398,12 +398,11 @@ static bool step_fore(struct pane *p safe, struct pane *focus safe,
                      short *y_post safe, short *line_height_post safe)
 {
        struct mark *end = *endp;
-       bool found_end = False;
 
        if (!end)
                return True;
        call_render_line(p, focus, end, startp);
-       found_end = measure_line(p, focus, end, -1);
+       measure_line(p, focus, end, -1);
        if (end->mdata)
                *y_post = end->mdata->h;
        if (*y_post > 0 && end->mdata)
@@ -415,13 +414,12 @@ static bool step_fore(struct pane *p safe, struct pane *focus safe,
        else
                end = vmark_next(end);
        if (!end) {
-               found_end = 1;
                if (p->h >= *line_height_post *2)
                        *y_post = p->h / 10;
        }
 
        *endp = end;
-       return found_end;
+       return False;
 }
 
 static int consume_space(struct pane *p safe, int y,
@@ -433,7 +431,7 @@ static int consume_space(struct pane *p safe, int y,
        int y_pre = *y_prep;
        int y_post = *y_postp;
 
-       if (y_pre > 0 && y_post > 0) {
+       if (y_pre > 0 && y_post > 0 && !found_start && !found_end) {
                int consume = (y_post < y_pre
                               ? y_post : y_pre) * 2;
                int above, below;
@@ -456,7 +454,7 @@ static int consume_space(struct pane *p safe, int y,
                 * both > 0
                 */
        }
-       if (found_end && y_pre) {
+       if (found_end && y_pre && !found_start) {
                int consume = p->h - y;
                if (consume > y_pre)
                        consume = y_pre;
@@ -464,7 +462,7 @@ static int consume_space(struct pane *p safe, int y,
                y += consume;
                *lines_above += consume / (line_height_pre?:1);
        }
-       if (found_start && y_post) {
+       if (found_start && y_post && !found_end) {
                int consume = p->h - y;
                if (consume > y_post)
                        consume = y_post;
@@ -575,12 +573,13 @@ static void find_lines(struct mark *pm safe, struct pane *p safe,
                y_post = 0;
        }
        if (!end) {
-               found_end = True;
                if (p->h > line_height_pre * 2)
                        y_post += p->h / 10;
-               else
+               else {
                        /* Small display, no space at EOF */
                        y_post = 0;
+                       found_end = True;
+               }
        }
        y = 0;
        if (rl->header && rl->header->mdata)
@@ -602,8 +601,13 @@ static void find_lines(struct mark *pm safe, struct pane *p safe,
 
        while ((!found_start || !found_end) && y < p->h) {
                if (vline != NO_NUMERIC) {
+                       /* As lines_above/below measure from the baseline
+                        * of the cursor line, and as we want to see the top
+                        * of he cursor line as well, these two cases are
+                        * asymmetric.
+                        */
                        if (!found_start && vline > 0 &&
-                           lines_above >= vline-1)
+                           lines_above >= vline)
                                found_start = True;
                        if (!found_end && vline < 0 &&
                            lines_below >= -vline-1)

diff --git a/tests.d/00-basic b/tests.d/00-basic
index cf115f048af1bb4781ad4884e45e858ffb98c556..4196ce6d449c81a94105157fb23a4526edc90d44 100644 (file)
--- a/tests.d/00-basic
+++ b/tests.d/00-basic
@@ -605,4 +605,4 @@ Key ":C-X"
 Display 80,30 84F4B35BF26F9D5EEBB67D572ADD0BBF 1,0
 Key ":C-C"
 Display 80,30 D2E6DB1DE1E62B191C28D1B2CFF7F1C0 1,0
-Close 1549
+Close 1550

diff --git a/tests.d/01-c-mode b/tests.d/01-c-mode
index 9dce4d765ac5ce4618d28494aa2b9a43063fa981..a20eadd3b4caec8d669e2889934703046ea03a11 100644 (file)
--- a/tests.d/01-c-mode
+++ b/tests.d/01-c-mode
@@ -178,87 +178,87 @@ Display 80,30 2E039D04A3A141A7D2D9E911DCC91DD4 1,13
 Key ":A:C-Q"
 Display 80,30 580AB331CC6E850D75B96F42F25384A3 1,14
 Key ":A:C-B"
-Display 80,30 D92009DB49CB8B31A0F25EF43ED95F96 1,12
+Display 80,30 A15364BF119D26144750FC82CA290873 1,11
 Key ":C-N"
-Display 80,30 1679AB8BB45B06447B498F4AE7912D43 1,13
+Display 80,30 45CE387B0B473F1416C11406D20CA3D7 1,12
 Key ":C-N"
-Display 80,30 A0D018932518021CCDFF6E5FE6D2DB1E 1,14
+Display 80,30 6FA6A0B154F72BB7DA90421755985E34 1,13
 Key ":C-N"
-Display 80,30 CF46C9930B0A4714B470C3347FD81C63 1,15
+Display 80,30 CD7BB4150046136D4299B25257886295 1,14
 Key ":C-E"
-Display 80,30 CF46C9930B0A4714B470C3347FD81C63 56,15
+Display 80,30 CD7BB4150046136D4299B25257886295 56,14
 Key ":C-B"
-Display 80,30 F6A1B8024512374367473A5AE94B41C1 55,15
+Display 80,30 B21844D30B1935608C20A8B936B92431 55,14
 Key ":C-B"
-Display 80,30 CF46C9930B0A4714B470C3347FD81C63 54,15
+Display 80,30 CD7BB4150046136D4299B25257886295 54,14
 Key "-,"
-Display 80,30 D578E811344B6A7082DBB2D385517513 55,15
+Display 80,30 D1B59CC2D51B126C7B78B4A705F424AA 55,14
 Key ":Enter"
-Display 80,30 5C95F269ED867478104CAD7030A8910A 17,16
+Display 80,30 CB91B332C966B062FD28648E910FECF9 17,15
 Key "-t"
-Display 80,30 FBE5ACE2FB319B10249B2479F3D2241C 18,16
+Display 80,30 8098416AFC15A2593578A3C8DD399056 18,15
 Key "-h"
-Display 80,30 7123CA78A54E6F7335547B354A6D7712 19,16
+Display 80,30 BA8DBFC8DADDA01B5D3175935C732C91 19,15
 Key "-i"
-Display 80,30 DAAAB537D1DF2CF16F4CC6397FEF9A4C 20,16
+Display 80,30 0C58AFF6BC3188BA655BF0B92F2A4D6B 20,15
 Key "-n"
-Display 80,30 79A4D9DA268C03C9B7996B38F4B683E2 21,16
+Display 80,30 6454ADFAF6CE9F37F15F032D6EC75B1E 21,15
 Key "-g"
-Display 80,30 93D9D9B3DAA82AC6349FDA9CD515628A 22,16
+Display 80,30 0C13723EAD3C72C7B3E7561F62BD2230 22,15
 Key "-,"
-Display 80,30 3B338FD7AD77A67234A717568DD3A686 32,16
+Display 80,30 C481803CBBB26094F6E1D2C854E0CB99 32,15
 Key ":C-P"
-Display 80,30 ED0CD0143BC2B82D357B2C07D99A46D5 32,15
+Display 80,30 CCE5C71E6C3F96BFC6D87CF143CA4A10 32,14
 Key ":C-E"
-Display 80,30 ED0CD0143BC2B82D357B2C07D99A46D5 55,15
+Display 80,30 CCE5C71E6C3F96BFC6D87CF143CA4A10 55,14
 Key ":C-D"
-Display 80,30 4C3012DD12C07C69CB8DB72F3645F490 55,15
+Display 80,30 852F71CF20F6F33D69DB17819A7673D7 55,14
 Key ":C-D"
-Display 80,30 29447F60F231A8031DFD2F6936009EA4 55,15
+Display 80,30 B9FCCBD0A8D53D57D7CB55BAADF90AF5 55,14
 Key ":C-D"
-Display 80,30 B7873CF5B1AE867362710EA5F68C0661 55,15
+Display 80,30 F7B090C8615516137717144244DF153A 55,14
 Key ":C-D"
-Display 80,30 AB5D87A2856CE0D9393A427BDCE13C9C 55,15
+Display 80,30 F52D1DC242BAE1A022082A87C63BE2B0 55,14
 Key ":C-E"
-Display 80,30 AB5D87A2856CE0D9393A427BDCE13C9C 64,15
+Display 80,30 F52D1DC242BAE1A022082A87C63BE2B0 64,14
 Key ":C-D"
-Display 80,30 F7016E8171B7A159F8C8FFBD07E6304C 64,15
+Display 80,30 8ABA1AF14A90A128D37AB554B681FF8D 64,14
 Key ":C-E"
-Display 80,30 F7016E8171B7A159F8C8FFBD07E6304C 73,15
+Display 80,30 8ABA1AF14A90A128D37AB554B681FF8D 73,14
 Key ":C-D"
-Display 80,30 71FDA84C67357934A33C001A9F38B95B 73,15
+Display 80,30 6D86A6752BC3494B0DE947473BBC502D 73,14
 Key ":C-P"
-Display 80,30 3AABCC8B85E1E62AF97AD37D28AE7B10 33,14
+Display 80,30 66472F80C89049DC6CD0ADCDC0787E57 33,13
 Key ":C-N"
-Display 80,30 71FDA84C67357934A33C001A9F38B95B 73,15
+Display 80,30 6D86A6752BC3494B0DE947473BBC502D 73,14
 Key "- "
-Display 80,30 D0ED34FBE5277D2259750E58C907AE50 74,15
+Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 74,14
 Key ":C-F"
-Display 80,30 D0ED34FBE5277D2259750E58C907AE50 4,16
+Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 4,15
 Key ":C-F"
-Display 80,30 D0ED34FBE5277D2259750E58C907AE50 12,16
+Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 12,15
 Key ":C-B"
-Display 80,30 D0ED34FBE5277D2259750E58C907AE50 4,16
+Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 4,15
 Key "- "
-Display 80,30 D0ED34FBE5277D2259750E58C907AE50 5,16
+Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 5,15
 Key ":C-N"
-Display 80,30 686A3A78190090D0F2A0797351FB9D80 1,17
+Display 80,30 28341A08AF53AD3377796BC52E331AA6 1,16
 Key ":C-X"
-Display 80,30 9122476ED758FA5D460E26EAEE5523F9 1,17
+Display 80,30 FACAEF1EF75F5D52F48EFD8A5EEFABA7 1,16
 Key ":C-F"
-Display 80,30 A0743B9B5C39ED23FE379DE21A6C2947 49,13
+Display 80,30 0A7D70868D2023F9E82FD15EC84564AD 49,13
 Key "-c"
-Display 80,30 343E230CB24A3FA7C3DBD69972FA16A5 50,13
+Display 80,30 7A2D1292C66C3B5E247123C95116420E 50,13
 Key "-o"
-Display 80,30 EDF99A4AC0D4A0355766175E64D226E0 51,13
+Display 80,30 8B529AFA892F47B9D7EE9A572A7D1EB3 51,13
 Key "-r"
-Display 80,30 3DE7FC777C32B2F123D17D34A2AB15C4 52,13
+Display 80,30 D4D9546CAC569BF84827A3A1E35A338C 52,13
 Key "-e"
-Display 80,30 92C810EB9B1B4A4ECC35AFA646A6B20E 53,13
+Display 80,30 32BD8BCDF3303948163A031EB2CFFC46 53,13
 Key "-."
-Display 80,30 28A87CB4BD597C4CC90DFD1CE75D76F7 54,13
+Display 80,30 0C495315E0AC3BCC109E4F1BCC98EC12 54,13
 Key "-h"
-Display 80,30 144D62F054CFD10EECD3BD25AEE435F9 55,13
+Display 80,30 86F9C2B5557D639DD2783E9BCF9EB47A 55,13
 Key ":Enter"
 Display 80,30 B51E88824AEAAF338E614368C07F2116 1,0
 Key ":A->"
@@ -449,4 +449,4 @@ Display 80,30 9668618AF877EA4CD97E4F8D2C729215 1,22
 Key ":Up"
 Display 80,30 F6BF3A75AC3B026DCFAC496EECDD4E0A 1,21
 Key ":Tab"
-Close 824
+Close 823

diff --git a/tests.d/02-grep b/tests.d/02-grep
index 45b1d1795d5d9a605e1390ce61c0d570ec3c0508..746eec94e95ce1350cc49fe219b36e404e1117a0 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -82,7 +82,7 @@ Display 80,30 81119695E2E7A0B9EDC84A473C6F63ED 1,6
 Key "-`"
 Display 80,30 D47F384C4EE423774166414B7C928D6A 1,7
 Key "-`"
-Display 80,30 BCB642A843697EAC24C93E65BD548B2D 1,9
+Display 80,30 93B17AFD6CA4A10F46F8930D9DFF2A46 1,9
 Key "-`"
 Display 80,30 C4558E086434B6CEA6F28EC38DC0ECD0 1,6
 Key ":A-0"
@@ -90,102 +90,102 @@ Display 80,30 F3D5D6A5E0A5D5975ECB6E7F00917039 1,6
 Key ":C-X"
 Display 80,30 2D8E0ECD65429DDDA3F1C8A49A73E1D8 1,6
 Key "-`"
-Display 80,30 1A4BDA70365FA2BE77204B4D3C5A71FD 1,1
+Display 80,30 8C5006B950CA2BEB4E936CCBAC1B6592 1,1
 Key "-`"
-Display 80,30 6488347D7F4C458D0C4DB4DD9EDB8DA5 1,7
+Display 80,30 2B92DBCEE330D073BD5C0A47EFE783B6 1,7
 Key "-`"
-Display 80,30 69AD76906A155260B345D2BA411F3921 1,6
+Display 80,30 C8582801EA4EB730362C8E28C7408B33 1,6
 Key "-`"
-Display 80,30 047048FF34AD3B5A3C889C79BEC80EAB 1,7
+Display 80,30 AC1DE4A9739FFCEFD87C066C2BAE7B8A 1,7
 Key "-`"
-Display 80,30 2D5FBF9D6847197E8686AE154C0CA6B2 1,6
+Display 80,30 1A236C860DE13BBBC446C143CAF21813 1,6
 Key "-`"
-Display 80,30 14302278E63F297EDCB931F482E34BDE 1,7
+Display 80,30 28F045FE67ADE62B92F3A4E02A295234 1,7
 Key "-`"
-Display 80,30 BCB642A843697EAC24C93E65BD548B2D 1,9
+Display 80,30 5A3D99C44BCE3F01AF08C0ABA187E8F8 1,9
 Key ":A--"
-Display 80,30 7A911AEF593FC17E29D5B1B39B19D154 1,9
+Display 80,30 23588A716A8C327CA5BB29B0F391EB58 1,9
 Key ":C-X"
-Display 80,30 01EC2055C21E211A34F4A0EEB1C00AC9 1,9
+Display 80,30 6821203991872E2268CE855FB748B630 1,9
 Key "-`"
-Display 80,30 BCB642A843697EAC24C93E65BD548B2D 1,9
+Display 80,30 5A3D99C44BCE3F01AF08C0ABA187E8F8 1,9
 Key "-`"
-Display 80,30 14302278E63F297EDCB931F482E34BDE 1,7
+Display 80,30 28F045FE67ADE62B92F3A4E02A295234 1,7
 Key "-`"
-Display 80,30 2D5FBF9D6847197E8686AE154C0CA6B2 1,6
+Display 80,30 1A236C860DE13BBBC446C143CAF21813 1,6
 Key ":C-X"
-Display 80,30 77F1C291B9214AE59842D4BD18F6A05F 1,6
+Display 80,30 8710264955CE9B1E9FDE8137F8435A4F 1,6
 Key ":C-F"
-Display 80,30 1E7384AE76BB991FAFA7F02E7DD3EEEB 53,13
+Display 80,30 E0392781F1477405B591F751E22B806E 53,13
 Key ":Backspace"
-Display 80,30 35348689E9324FAFFBBE96CA75ACC343 52,13
+Display 80,30 05C7C6F7453F37042098818395938252 52,13
 Key ":Backspace"
-Display 80,30 EDD2BA2F188B83EB303752022182BD67 51,13
+Display 80,30 A6C7DF0EEA1D2267C1CA174AFBFB1DDE 51,13
 Key ":Backspace"
-Display 80,30 4D15F5967422B54DD7F304F81681E7EB 50,13
+Display 80,30 9E6ED319D3AEC31ABA74A237746020D7 50,13
 Key ":Backspace"
-Display 80,30 B330CA9B8C5C00592DC1CB634BB76B98 49,13
+Display 80,30 9A43E6961B7CC401A14C3329A66A75E9 49,13
 Key ":Enter"
-Display 80,30 4CDCE5F70E3A2B61CE45E1A5DC40637B 1,1
+Display 80,30 63DC4E9C5B1B6FA5B7B0930750D40A97 1,1
 Key ":A-x"
-Display 80,30 FF5C4E11E3DAF1DEDF56B87F657E85C9 26,13
+Display 80,30 40D74C45E4D10ACE3311E4D55B34B421 26,13
 Key "-g"
-Display 80,30 2AC5C8000B2A57C94D2187E9D2758D5A 27,13
+Display 80,30 1A5F0B1A87B0992733A7037C275A4945 27,13
 Key "-r"
-Display 80,30 24B8AB3614B4BFC803CDD2F357E8F7D1 28,13
+Display 80,30 9B3EFE7D0EAB494FD0B45C3233915D59 28,13
 Key "-e"
-Display 80,30 F0F0FB4B62AC3853E79E75D21786AD33 29,13
+Display 80,30 1EDC00E972C049766EEDF727A3EADF4D 29,13
 Key "-p"
-Display 80,30 CD9C3CCDEB49ABE93EE60B9EA4988C13 30,13
+Display 80,30 0E4F8457CD9572593465026210960F1B 30,13
 Key ":Enter"
-Display 80,30 E0516BD76651D9DDC3BDF2AD9F31FB3D 44,13
+Display 80,30 FD24E591A525CA0A3F8B7E3A8EC114C3 44,13
 Key "-w"
-Display 80,30 A30DAA84C3DAA520FB75A711CB4497F9 45,13
+Display 80,30 71E1F41F8C06D14E89558499801517FA 45,13
 Key "-i"
-Display 80,30 E54E16AA802717E2B2523B1ABCD61B87 46,13
+Display 80,30 A09D72C2F8D86367CDBEF8158E70C722 46,13
 Key "-n"
-Display 80,30 13770EDF6B16CA0B10923138FE56128C 47,13
+Display 80,30 A30E6C09B4D8AE40D4F98340E8639222 47,13
 Key "-d"
-Display 80,30 CD678752F6F8E1BC985352F93B73A604 48,13
+Display 80,30 C710FF8DDE964600F245BB4A886F1A1A 48,13
 Key "-o"
-Display 80,30 B3557F0046BC5B11342FF7E6D2DF6538 49,13
+Display 80,30 5B7E90C9765576DC6DB3E05183326F5D 49,13
 Key "-w"
-Display 80,30 89AD144B1BF3C5704EB3A6D668CAA84A 50,13
+Display 80,30 CB9D1AA5D1C741BEC82529ED57615503 50,13
 Key "- "
-Display 80,30 89AD144B1BF3C5704EB3A6D668CAA84A 51,13
+Display 80,30 CB9D1AA5D1C741BEC82529ED57615503 51,13
 Key "-*"
-Display 80,30 ABDEC1A4859DEE6CCFF018F3B4B74070 52,13
+Display 80,30 FB9AAE72BF7C4B42640CAC050E0BE54D 52,13
 Key "-."
-Display 80,30 05E4CA242066D2FCC8EAFF6BE8EF4901 53,13
+Display 80,30 2B3EC3792A2B5142515EF4A02B91042B 53,13
 Key "-c"
-Display 80,30 64A375CFAE40617D11F3D9238A3B9E40 54,13
+Display 80,30 FBD5DF4047331FF879A6478B880E8338 54,13
 Key ":Enter"
-Display 80,30 C95CF7DEB7C6A2E2BE6B28A91918F62A 11,10
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,10
+Display 80,30 EB18C1A4FC4D98F7A67823245C4BE143 11,10
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,10
 Key ":C-N"
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,11
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,11
 Key ":C-N"
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,12
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,12
 Key ":C-N"
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,13
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,13
 Key ":C-N"
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,14
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,14
 Key ":C-N"
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,15
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,15
 Key ":C-N"
-Display 80,30 1514582478CF41DD9FBA510A3098B175 11,16
+Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,16
 Key "-f"
-Display 80,30 75A63D7B5A45FE1C2B9A3F0159357DA0 11,12
+Display 80,30 9FD9E07BD0B16A1153DAFF9907E5B91F 11,12
 Key ":C-V"
-Display 80,30 E9ED6C6E65B93D29623723CE2827C30B 11,7
+Display 80,30 7935B8A8CE96AA0841480F3A25DB4808 11,7
 Key ":C-V"
-Display 80,30 1EBC095C49E5A243086E5DE07378A6AD 11,7
+Display 80,30 A44CA9E4F34068B52C8BFF25679F8695 11,7
 Key ":C-V"
-Display 80,30 A92625794269F8A1EB3B1D9BF96AC5F4 11,7
+Display 80,30 1E42E3E91C39AA91CB54B74073BC14B0 11,7
 Key ":A-B"
-Display 80,30 4CDCE5F70E3A2B61CE45E1A5DC40637B 1,1
+Display 80,30 63DC4E9C5B1B6FA5B7B0930750D40A97 1,1
 Key ":C-X"
-Display 80,30 0AE046CA7C250270DBE14564AFC5D6B1 1,1
+Display 80,30 881A0D99BF84CDFC4916F1BBFEDB62FD 1,1
 Key "-`"
 Display 80,30 8557455273011DFCCAB6707018F20080 1,6
 Key "-`"
@@ -225,11 +225,11 @@ Display 80,30 9BFCD6FB7DDEEB9FF736EEE48A983DF2 1,6
 Key "-`"
 Display 80,30 5BC5B368B3E25A73BE8F8D595D61AEE6 1,6
 Key "-`"
-Display 80,30 3A381382535261F222BA0E5DC190CC2A 1,6
+Display 80,30 833C0953C1A07AB120C791119694A956 1,6
 Key ":A-0"
-Display 80,30 39B33778D79D98A2B192BD7E2CF1D965 1,6
+Display 80,30 D2C4EC51CA2F4603BF5077E49BB9E062 1,6
 Key ":C-X"
-Display 80,30 54671D08555CC4B9B55C3E6FA019584F 1,6
+Display 80,30 F7F97F692331C536CBE72D9B591B3029 1,6
 Key "-`"
 Display 80,30 DF026DBC4E8B692B626AB5D9364E8DD1 1,6
 Key "-`"
@@ -242,4 +242,4 @@ Key ":C-X"
 Display 80,30 1B93FE4A0F3F6D0DA9A9A7767239F356 1,6
 Key ":C-C"
 Display 80,30 010E4E8994BB534A4F27DD543E023E74 1,6
-Close 907
+Close 909

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index 7a0d1eba674c547ba92331d2419d270129f7d306..c73b5d8fff35744d37c3b025d0601e9d190c4d0e 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -140,7 +140,7 @@ Display 80,30 880BB70FA320DB38D6A1F6A17BE1BBFF 41,19
 Key ":C-V"
 Display 80,30 55E7EC6F1D0014C43AAB7828596A1BB8 41,25
 Key ":C-V"
-Display 80,30 F9030F8D938F9F3CA9A96001F4AD8A1C 41,21
+Display 80,30 F377B6AE12DD1574E59B1017C2C02966 41,22
 Key ":C-V"
 Display 80,30 F8A564286C888DC61BC395F62DB042EB 41,20
 Key ":C-V"
@@ -150,25 +150,25 @@ Display 80,30 9589B1C03AA99BF093F1EDEEEC0D9ABF 41,19
 Key ":A-v"
 Display 80,30 C035AD94405AEC3A44B02667E74E27FA 41,4
 Key ":A-v"
-Display 80,30 7BD15EC29C1CE8DE9B2FCB12FD099C77 41,3
+Display 80,30 C799603795FEB053D3ADC12DD1670719 41,2
 Key ":A-v"
-Display 80,30 2BC2347354CF0E5F5C2255B797C346A6 41,6
+Display 80,30 72E3DCDB5CD5DB5BBC4EC6C7237EED4C 41,5
 Key ":C-X"
-Display 80,30 1365BCB0D4EB140F6166292E23A6D2F1 41,6
+Display 80,30 BA638330EBD654C22A685C3F3A49A19E 41,5
 Key "-o"
-Display 80,30 2BC2347354CF0E5F5C2255B797C346A6 41,6
+Display 80,30 72E3DCDB5CD5DB5BBC4EC6C7237EED4C 41,5
 Key "- "
-Display 80,30 251DF49D4194A9348ED9B0E424B7C42C 41,6
+Display 80,30 BE242D1AD3966DCC594BF09FB6C6AC3F 41,5
 Key "- "
-Display 80,30 97D93F5A6D73E69AD40222EA8B1A6878 41,6
+Display 80,30 77E4F3B07E5BF0DE43D08BBC43983FC5 41,5
 Key ":Backspace"
-Display 80,30 AD973EAB6DB2DA0AFDE2803670F094EA 41,6
+Display 80,30 0394E773581B005B412623487DBED1CA 41,5
 Key ":Backspace"
-Display 80,30 3E41553C44D7C187BC4FC2D34C4AAA60 41,6
+Display 80,30 8293453FEEFEC39F2609467FDB1F8A86 41,5
 Key ":C-X"
-Display 80,30 B95031AAB9ACC24E3C35DE40353EC9CB 41,6
+Display 80,30 241A0290B2D28847D8FD0C4374FB0439 41,5
 Key "-o"
-Display 80,30 3E41553C44D7C187BC4FC2D34C4AAA60 41,6
+Display 80,30 8293453FEEFEC39F2609467FDB1F8A86 41,5
 Key ":A-<"
 Display 80,30 4D5BD5CA030420B0C03E4AEB2A087D49 41,0
 Key ":C-V"
@@ -212,13 +212,13 @@ Display 80,30 1D01CD6F5882A920FA950B64648868B1 41,2
 Key ":C-P"
 Display 80,30 0AEE37672B46ACD5B40CF7858A4AC027 41,1
 Key ":C-P"
-Display 80,30 43AAFD0E7799B8A170552941FCFFC6FA 41,0
+Display 80,30 856629CF797E687B1CF405673E5548D2 41,-1
 Key ":C-P"
-Display 80,30 F6421EC5A0230B9D2706E9A9324138E7 41,0
+Display 80,30 A9438640D4D27E7DA1530B425E1BCDA7 79,27
 Key ":C-L"
-Display 80,30 226B2EED2A0201FB9BB582D05A85EEE7 41,13
+Display 80,30 2C2BCA9050E59298FEDEB5EFAF528EAE 41,13
 Key ":C-X"
-Display 80,30 FBA91029719D49956F70E72B42856A95 41,13
+Display 80,30 94C4FAFAE138C1E42A69D6B45DDB2F6F 41,13
 Key ":C-C"
-Display 80,30 7D84584D915627F5F537ADA2D45D6BB1 41,13
-Close 1441
+Display 80,30 5FFCAF70E166C6D80CDC2B4726ABFB53 41,13
+Close 1440