view: fix scroll bar on directories etc.

When linecount is attached to a view, as with lib-format (directories)
and emails, the location of the scroll bar handle is wrong.

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

diff --git a/lib-view.c b/lib-view.c
index 7ae09c88bc1a1d8d29134e7d443dda1c68acc9ce..87e08fb2d40f9ca1cb19c7f808511b78d3e79fa6 100644 (file)
--- a/lib-view.c
+++ b/lib-view.c
@@ -203,7 +203,7 @@ DEF_CMD(view_refresh)
                                vpln = attr_find_int(*mark_attr(pm), "line");
                        }
 
-                       l = pane_attr_get_int(ci->home, "lines", 1);
+                       l = pane_attr_get_int(ci->focus, "lines", 1);
                        if (l <= 0)
                                l = 1;
                        mid = vd->line_height + (p->h - 4 * vd->line_height) * vpln / l;

diff --git a/tests.d/00-basic b/tests.d/00-basic
index 4196ce6d449c81a94105157fb23a4526edc90d44..53839a4946651b287a8b74e30a056702f8e8a12e 100644 (file)
--- a/tests.d/00-basic
+++ b/tests.d/00-basic
@@ -1,18 +1,18 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-N"
-Display 80,30 C15BE3A74052133419244D26B597EC30 1,2
+Display 80,30 19495E8BAB456D3B8151778AFB87F934 1,2
 Key ":C-N"
-Display 80,30 6993C09533D3BC7A68494654DAA5BAEE 1,3
+Display 80,30 5C808FD1DA9BC6D374E4A0C6F1DAF415 1,3
 Key ":C-N"
-Display 80,30 268AD7C6C562EA9F91B813B5855F57BA 1,4
+Display 80,30 0F0D6A5FDA9765C25ACE8B7946FCCFE2 1,4
 Key ":C-N"
-Display 80,30 A4F3A90F915D6CF3A9D40057E1CD7283 1,5
+Display 80,30 4227B91515E6A9865D22995E4BF1BAB2 1,5
 Key ":C-N"
-Display 80,30 E8144A2470F729A0160C201C9741784C 1,6
+Display 80,30 F03D3559FBC5AB0F82A840100F882274 1,6
 Key ":C-N"
-Display 80,30 7223397940E4CE11A4F353B7CC9082DF 1,7
+Display 80,30 14DF59CD936EFA04483069B763360A86 1,7
 Key ":C-N"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Key ":Enter"
 Display 80,30 453755D55FC0151ED0852A2467A28FF4 1,0
 Key ":A->"
@@ -578,27 +578,27 @@ Display 80,30 4B1C47234051213271FED14393477B35 1,3
 Key ":C-X"
 Display 80,30 F96972F072D843A031AD49641130AF4E 1,3
 Key "-k"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Key ":C-X"
-Display 80,30 F99CB281FCAB081AD57FCDB39F9BF460 1,8
+Display 80,30 D9F43AF47815B46A3E90E0795A30B979 1,8
 Key ":C-F"
-Display 80,30 349CA33C0DDE2428FA63CB7D2C6AF62C 49,13
+Display 80,30 68D0D05251382990C09B0FA8A66BAA7F 49,13
 Key "-m"
-Display 80,30 5FA1E0AD97DC565FB67915F3C20F7452 50,13
+Display 80,30 136DE0C0F245E6A7F3165A29734F7587 50,13
 Key ":Tab"
-Display 80,30 751978936E0627C4C3A8100715597342 31,13
+Display 80,30 6AD8892B2CC308E426B87D80B190E9DD 31,13
 Key ":Up"
-Display 80,30 751978936E0627C4C3A8100715597342 31,12
+Display 80,30 6AD8892B2CC308E426B87D80B190E9DD 31,12
 Key ":Up"
-Display 80,30 751978936E0627C4C3A8100715597342 31,11
+Display 80,30 6AD8892B2CC308E426B87D80B190E9DD 31,11
 Key ":Up"
-Display 80,30 751978936E0627C4C3A8100715597342 31,10
+Display 80,30 6AD8892B2CC308E426B87D80B190E9DD 31,10
 Key ":Up"
-Display 80,30 751978936E0627C4C3A8100715597342 31,9
+Display 80,30 6AD8892B2CC308E426B87D80B190E9DD 31,9
 Key ":Up"
-Display 80,30 751978936E0627C4C3A8100715597342 31,8
+Display 80,30 6AD8892B2CC308E426B87D80B190E9DD 31,8
 Key ":Enter"
-Display 80,30 F80868D5018ECCB11A8F03A4E7BC0D18 55,13
+Display 80,30 E9914A925E6F54843F7AF66944F7E727 55,13
 Key ":Enter"
 Display 80,30 D2E6DB1DE1E62B191C28D1B2CFF7F1C0 1,0
 Key ":C-X"

diff --git a/tests.d/00-mouse b/tests.d/00-mouse
index faac65e2335d1e3372d59353de8172d3590bbde1..50a896da31f94d7968af658fcb14862833351ab6 100644 (file)
--- a/tests.d/00-mouse
+++ b/tests.d/00-mouse
@@ -1,43 +1,43 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-X"
-Display 80,30 4B286F8D524DAB672B799E321FD42B17 1,1
+Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
 Key "-3"
-Display 80,30 3E1D6AF760EFEFFE6D09C55B9C506D0E 1,1
+Display 80,30 AD535CDE34BCCD927143F1ACCBE80D75 1,1
 Key ":C-X"
-Display 80,30 8A952026042107C94674A179292BE6D7 1,1
+Display 80,30 CDEF36693D7EB7F48B0DB2AB92D5132B 1,1
 Key ":C-F"
-Display 80,30 AF1F1B5642D8A448F7975A64979F6363 49,13
+Display 80,30 1CBE95039207B580B57684C8F77A9605 49,13
 Key "-R"
-Display 80,30 077992C4C442E0594AF380B64F119692 50,13
+Display 80,30 100FE89979F0D59AA2D2B12653357612 50,13
 Key "-E"
-Display 80,30 3B61BAB23EA49A70506AE285619FE43C 51,13
+Display 80,30 077E6486B0B127020429FED219731B3A 51,13
 Key ":Tab"
-Display 80,30 0A14B735783A22C9CB7FA5CA9EC3BDC7 50,13
+Display 80,30 6965F0AFBDA8866739BDD8FCC4A33960 50,13
 Key ":Enter"
-Display 80,30 D76558D3483ABF8CA6814413B6056282 1,0
+Display 80,30 B017465007BFB4F4DA973362D8FC0FD8 1,0
 Mouse ":Press-1" 20,17
-Display 80,30 11FA0C3BE341CA3E04AD8980E779967E 20,17
+Display 80,30 B10653B5C7CBC9275FF3B8C26B5BD83A 20,17
 Mouse ":Release-1" 20,17
 Mouse ":Press-1" 60,16
-Display 80,30 D04E18C15564DE41D6C9F19E78A103CC 60,16
+Display 80,30 A45BFF448767139AB0CDFF4EE76F15C4 60,16
 Mouse ":Release-1" 60,16
 Key ":C-E"
-Display 80,30 DF2561DD4F5C02DAD249CF68D5D4C060 76,16
+Display 80,30 A2EF28CA1589063F537DEA6553EBF139 76,16
 Mouse ":Press-1" 66,13
-Display 80,30 2207BC81F7DFF6A134DEE475433E1427 66,13
+Display 80,30 76BA3C5B083DE80129E1D72E52B9E2B3 66,13
 Mouse ":Release-1" 66,13
 Mouse ":Press-1" 65,22
-Display 80,30 CFA6E0938B162CA1202C15786F271973 65,22
+Display 80,30 5A413D27D8CD7AABACA3278D54354013 65,22
 Mouse ":Release-1" 65,22
 Mouse ":Press-1" 60,11
-Display 80,30 BA7479AF751F633F7A7C911D6B262772 60,11
+Display 80,30 45A837A48E0E7247225714259D1EFEB5 60,11
 Mouse ":Release-1" 60,20
-Display 80,30 2A914B792B85F92CF8D32452B011D3E9 60,20
+Display 80,30 50235A2F60095AF7A9160E118743583F 60,20
 Mouse ":Press-1" 17,7
-Display 80,30 4626DDB9699F7590343243212EDC915A 17,7
+Display 80,30 E2BACFD27BAA568D4EF2D374F67BEC7C 17,7
 Mouse ":Release-1" 17,20
-Display 80,30 1C5C746E0DB29A97964ACCC5D6C1AEC0 17,20
+Display 80,30 42DAE331969832A9C83007C5BC78AE92 17,20
 Mouse ":Press-1" 8,4
-Display 80,30 9D680EC4B783164F75FFDDCF639EBF5A 8,4
+Display 80,30 3B1F9CE09ABC9D8E093A44FE2DA9717A 8,4
 Mouse ":Release-1" 8,4
 Close 244

diff --git a/tests.d/01-c-mode b/tests.d/01-c-mode
index a20eadd3b4caec8d669e2889934703046ea03a11..6f5791e73c7c0b8bb82a5808a7b71d7d05a87f7b 100644 (file)
--- a/tests.d/01-c-mode
+++ b/tests.d/01-c-mode
@@ -1,22 +1,22 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-X"
-Display 80,30 4B286F8D524DAB672B799E321FD42B17 1,1
+Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
 Key ":C-F"
-Display 80,30 6EE16CAA1D71E64174801F830FCB273C 49,13
+Display 80,30 DAC2F760D96062CCBFD5507E71CF77E0 49,13
 Key "-c"
-Display 80,30 7B867C99A5AFAAD65A6B4FBBD6D1DA32 50,13
+Display 80,30 DC1FC5BB8D68BBA90F581A466A409232 50,13
 Key "-o"
-Display 80,30 2F155A84F3A53E2149B7847C6AD953BC 51,13
+Display 80,30 F31701CE31897B81F80E632ED7D49B7E 51,13
 Key "-r"
-Display 80,30 2F4B3E55033E2E4F476AD68BB99575D5 52,13
+Display 80,30 250ACEFE0C5ECEBE126687703995B3CE 52,13
 Key "-e"
-Display 80,30 3C14C46BE65C8D95755F2D94DB8D366C 53,13
+Display 80,30 F98164DC691832F0C45D1A2D71DEE606 53,13
 Key "--"
-Display 80,30 564A1438F795687488037596BE619621 54,13
+Display 80,30 3917DE688BDBC2A2541B1729081A8778 54,13
 Key "-p"
-Display 80,30 6F76481D9FB7187052EDAA8E4E60B118 55,13
+Display 80,30 B6903D482482D6C6046FC7E429D15C61 55,13
 Key ":Tab"
-Display 80,30 14E0011D606D2F7434DFB6145D12DDED 52,13
+Display 80,30 CE20A38470B24490ABFADA24F99B7F38 52,13
 Key ":Enter"
 Display 80,30 C75DFF2937E8C40C0284E2679F39485A 1,0
 Key ":C-V"

diff --git a/tests.d/01-hex b/tests.d/01-hex
index 1a01044b2cdf3178e493f9ab8370db44afdca42b..ed70c4ec57261115e5aea974dd1e1502027d2f62 100644 (file)
--- a/tests.d/01-hex
+++ b/tests.d/01-hex
@@ -1,16 +1,16 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-N"
-Display 80,30 C15BE3A74052133419244D26B597EC30 1,2
+Display 80,30 19495E8BAB456D3B8151778AFB87F934 1,2
 Key ":C-N"
-Display 80,30 6993C09533D3BC7A68494654DAA5BAEE 1,3
+Display 80,30 5C808FD1DA9BC6D374E4A0C6F1DAF415 1,3
 Key ":C-N"
-Display 80,30 268AD7C6C562EA9F91B813B5855F57BA 1,4
+Display 80,30 0F0D6A5FDA9765C25ACE8B7946FCCFE2 1,4
 Key ":C-N"
-Display 80,30 A4F3A90F915D6CF3A9D40057E1CD7283 1,5
+Display 80,30 4227B91515E6A9865D22995E4BF1BAB2 1,5
 Key ":C-N"
-Display 80,30 E8144A2470F729A0160C201C9741784C 1,6
+Display 80,30 F03D3559FBC5AB0F82A840100F882274 1,6
 Key ":C-N"
-Display 80,30 7223397940E4CE11A4F353B7CC9082DF 1,7
+Display 80,30 14DF59CD936EFA04483069B763360A86 1,7
 Key "-H"
 Display 80,30 DE94663244D06B5A6A83191757901031 11,1
 Key ":C-N"

diff --git a/tests.d/01-python b/tests.d/01-python
index 65310d082a139a70490e0da656ec0fef497bf206..07e0d87d242c633c4439a057201acc4ddc843af1 100644 (file)
--- a/tests.d/01-python
+++ b/tests.d/01-python
@@ -1,27 +1,27 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-S"
-Display 80,30 455549D8F9385139F439CB26C1483CFB 50,0
+Display 80,30 D4EBA19E1BBC89B73803A057DF69E5FA 50,0
 Key "-p"
-Display 80,30 60442BE2484784EE3184F1B4FB91F7EC 10,0
-Display 80,30 576F90C9F8C45AD2E08AA041F2EC3F69 10,0
+Display 80,30 82DAA2D2A7E34E22619ED1A7C796C4E3 10,0
+Display 80,30 B3894E80989D0984C36908A731BC4F71 10,0
 Key "-y"
-Display 80,30 CE558F9D9FB0D799F47A5BE1456C635D 51,0
+Display 80,30 3BA47A36EA7E30C5A628B767FB4C69E2 51,0
 Key "-t"
-Display 80,30 77E5DD1B4BF350C795A6CE18D984F06C 53,0
+Display 80,30 1CC44AF4569B26CF96D5B988C70D06CC 53,0
 Key "-h"
-Display 80,30 94CF165CFBDBBCE14D90BA8AEBCDF754 54,0
+Display 80,30 CE939CB132B112E5CBA8D1243A27CF40 54,0
 Key ":C-S"
-Display 80,30 7CDA61C32B1A5F21A9CD9181BF3D818A 54,0
+Display 80,30 D1F2CC0170FCEB7D2F7C9346BDCBCAB9 54,0
 Key ":Enter"
-Display 80,30 0794978F279A7E1187663271C3E2BF70 61,16
+Display 80,30 03A8C2118CA808DFC0F0AB2107FC9EF3 61,16
 Key ":Enter"
-Display 80,30 6E5197769B4E7B772861FC05A6D236F6 1,1
+Display 80,30 9E65B78D77378C66D9864431EF57ECD6 1,1
 Key ":C-N"
-Display 80,30 2E444C7373F5AE36BAC3C3B338178DD5 1,2
+Display 80,30 BF4D7871843D1A73804975ABF02D590C 1,2
 Key ":C-N"
-Display 80,30 AAF65169A7F70050C6C5FE60C74FAD62 1,3
+Display 80,30 7D5DCC92F5B08AE403C3E06EC14102B4 1,3
 Key ":C-N"
-Display 80,30 547FB960FC193233CA7677E6DD68281E 1,4
+Display 80,30 30D165DC3A1B9781B20C07A4B0DFCE42 1,4
 Key "-f"
 Display 80,30 DCCA578C947E85079B678CAABA067C7C 1,0
 Key ":C-N"
@@ -493,9 +493,9 @@ Display 80,30 AB95403275CC666D8C3723A2D0485DEA 9,9
 Key ":C-X"
 Display 80,30 907C02FAECEA47C211FC58CDFA5A9D84 9,9
 Key "-k"
-Display 80,30 0794978F279A7E1187663271C3E2BF70 61,16
+Display 80,30 03A8C2118CA808DFC0F0AB2107FC9EF3 61,16
 Key ":C-X"
-Display 80,30 FB5AFD4627214C1B1CBEE5CE437CD80A 61,16
+Display 80,30 662292DCAF96B09B7F39A91DB348091A 61,16
 Key ":C-C"
-Display 80,30 0794978F279A7E1187663271C3E2BF70 61,16
+Display 80,30 03A8C2118CA808DFC0F0AB2107FC9EF3 61,16
 Close 864

diff --git a/tests.d/01-redraw b/tests.d/01-redraw
index ca025b52ac8e405f2b14d813cebd66b1e14e9f56..7140d5a5b060809c40061cafcf866bb5519f84bf 100644 (file)
--- a/tests.d/01-redraw
+++ b/tests.d/01-redraw
@@ -1,18 +1,18 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-N"
-Display 80,30 C15BE3A74052133419244D26B597EC30 1,2
+Display 80,30 19495E8BAB456D3B8151778AFB87F934 1,2
 Key ":C-N"
-Display 80,30 6993C09533D3BC7A68494654DAA5BAEE 1,3
+Display 80,30 5C808FD1DA9BC6D374E4A0C6F1DAF415 1,3
 Key ":C-N"
-Display 80,30 268AD7C6C562EA9F91B813B5855F57BA 1,4
+Display 80,30 0F0D6A5FDA9765C25ACE8B7946FCCFE2 1,4
 Key ":C-N"
-Display 80,30 A4F3A90F915D6CF3A9D40057E1CD7283 1,5
+Display 80,30 4227B91515E6A9865D22995E4BF1BAB2 1,5
 Key ":C-N"
-Display 80,30 E8144A2470F729A0160C201C9741784C 1,6
+Display 80,30 F03D3559FBC5AB0F82A840100F882274 1,6
 Key ":C-N"
-Display 80,30 7223397940E4CE11A4F353B7CC9082DF 1,7
+Display 80,30 14DF59CD936EFA04483069B763360A86 1,7
 Key ":C-N"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Key "-f"
 Display 80,30 453755D55FC0151ED0852A2467A28FF4 1,0
 Key ":A->"
@@ -36,9 +36,9 @@ Display 80,30 0FECC1058FFD056D9BACBCC5B317281A 1,1
 Key ":C-X"
 Display 80,30 2F49E1FB67BC2A2DDC2CA32459BB574B 1,1
 Key "-k"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Key ":C-X"
-Display 80,30 F99CB281FCAB081AD57FCDB39F9BF460 1,8
+Display 80,30 D9F43AF47815B46A3E90E0795A30B979 1,8
 Key ":C-C"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Close 185

diff --git a/tests.d/01-textfill b/tests.d/01-textfill
index dc30aaf60769aef9f87e70140f272d38b2ffd2d3..d48d7022c75adccf58f6a5c74255673037b8b096 100644 (file)
--- a/tests.d/01-textfill
+++ b/tests.d/01-textfill
@@ -1,18 +1,18 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-N"
-Display 80,30 C15BE3A74052133419244D26B597EC30 1,2
+Display 80,30 19495E8BAB456D3B8151778AFB87F934 1,2
 Key ":C-N"
-Display 80,30 6993C09533D3BC7A68494654DAA5BAEE 1,3
+Display 80,30 5C808FD1DA9BC6D374E4A0C6F1DAF415 1,3
 Key ":C-N"
-Display 80,30 268AD7C6C562EA9F91B813B5855F57BA 1,4
+Display 80,30 0F0D6A5FDA9765C25ACE8B7946FCCFE2 1,4
 Key ":C-N"
-Display 80,30 A4F3A90F915D6CF3A9D40057E1CD7283 1,5
+Display 80,30 4227B91515E6A9865D22995E4BF1BAB2 1,5
 Key ":C-N"
-Display 80,30 E8144A2470F729A0160C201C9741784C 1,6
+Display 80,30 F03D3559FBC5AB0F82A840100F882274 1,6
 Key ":C-N"
-Display 80,30 7223397940E4CE11A4F353B7CC9082DF 1,7
+Display 80,30 14DF59CD936EFA04483069B763360A86 1,7
 Key ":C-N"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Key "-f"
 Display 80,30 453755D55FC0151ED0852A2467A28FF4 1,0
 Key ":C-N"
@@ -568,8 +568,8 @@ Display 80,30 0583241404FDD3ABC6D829C0BC4F765D 12,13
 Key ":C-X"
 Display 80,30 05546B93D9066F6349E248340D0926C3 12,13
 Key ":C-C"
-Display 80,30 B057FE89FC624044EE3ABE377D466D16 21,9
+Display 80,30 8AFD6B53262C6D39D2C93373D2AB6995 21,9
 Key "-n"
-Display 80,30 B057FE89FC624044EE3ABE377D466D16 21,10
+Display 80,30 8AFD6B53262C6D39D2C93373D2AB6995 21,10
 Key "-n"
 Close 1020

diff --git a/tests.d/02-diff b/tests.d/02-diff
index a99210b37a64a299dddfd5a3bac7c0554a2a5a35..904ab27defca36b12a85ac44fbb4bf52eaa40571 100644 (file)
--- a/tests.d/02-diff
+++ b/tests.d/02-diff
@@ -1,40 +1,40 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":A-!"
-Display 80,30 8B30E299253ED4DF343ACE9CC9C01D92 36,13
+Display 80,30 FCD20C27C09915B7AFE308070BC1F09A 36,13
 Key "-g"
-Display 80,30 A86B01C4126016EC53BBF78351126B0A 37,13
+Display 80,30 7B374BCF3F49DF463346CF58DAA4280A 37,13
 Key "-i"
-Display 80,30 A3BF64821663939552F248157476A5B1 38,13
+Display 80,30 D23AE57652172B49EC8C88B3E0C1D767 38,13
 Key "-t"
-Display 80,30 1614E75A110B618D38DE5241054FC0CD 39,13
+Display 80,30 F54FA4B49E893B5F7F870BD8C41E8902 39,13
 Key "- "
-Display 80,30 1614E75A110B618D38DE5241054FC0CD 40,13
+Display 80,30 F54FA4B49E893B5F7F870BD8C41E8902 40,13
 Key "-s"
-Display 80,30 129C47DA29A7C7940DDE14F6DD2ECB0D 41,13
+Display 80,30 23DE91B64BD2A0549D45C4BC8895EF49 41,13
 Key "-h"
-Display 80,30 C3068F580DA37EE3F90879B8448B7FE7 42,13
+Display 80,30 9687ED0F98EA4FDBCE183CEF473ECA8C 42,13
 Key "-o"
-Display 80,30 065CDAA84AAE54B62DDE9307EE8591EC 43,13
+Display 80,30 0681BEA55D4917B71B34C2F1303B4F94 43,13
 Key "-w"
-Display 80,30 7EB171B492641ECAB3012D7A344C3338 44,13
+Display 80,30 B1088BC63D111FA20389C7804D450B49 44,13
 Key ":Enter"
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
-Display 80,30 707C05EA3107138E0E886DB18A40A2EE 1,1
-Display 80,30 FBF9D45946EEAF40C00118AD2BFFC797 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
+Display 80,30 A85CEF38E25532BEE579E27EA9CCE94B 1,1
+Display 80,30 A43CF66BC48E92C836EF14292F2C2B54 1,1
 Key ":C-X"
-Display 80,30 EB11E8DDD22F63F7625C2DEA19DDB26F 1,1
+Display 80,30 6FC535EACF0D5E3F53C81794965F92A8 1,1
 Key "-o"
-Display 80,30 FBF9D45946EEAF40C00118AD2BFFC797 1,15
+Display 80,30 A43CF66BC48E92C836EF14292F2C2B54 1,15
 Key ":C-V"
-Display 80,30 4EDDBEDB73B00AD14E037CB2ABD329C5 1,15
+Display 80,30 1E6CE28D7F258885FEA925982E37F39B 1,15
 Key ":C-V"
-Display 80,30 C7BFD14527CA99B3D84A6367F294DC57 1,15
+Display 80,30 8CB60D50607BCFE9A54EA233F18EF931 1,15
 Key ":C-V"
-Display 80,30 DDE54505778D9077D14138B4776AC602 1,15
+Display 80,30 230EA05B499AE8000F5ADFD79EBA00A6 1,15
 Key ":C-N"
-Display 80,30 2B0627B7342E290FD23E8E8AFE53FAAA 1,16
+Display 80,30 A4B058EEBDDC417E4E684B935EB66A11 1,16
 Key ":C-N"
-Display 80,30 559F8BEE1A49FE682AA3BD5508BC8240 1,18
+Display 80,30 E04A353BD607ADD6295CFC92EEA60FEA 1,18
 Key ":Enter"
 Display 80,30 BA18E8DFC0889E15672B877DC9F118F8 1,6
 Key ":C-L"

diff --git a/tests.d/02-grep b/tests.d/02-grep
index 746eec94e95ce1350cc49fe219b36e404e1117a0..da8de42db07195b623ff59ff3f8f76a0b6760f11 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -1,26 +1,26 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-X"
-Display 80,30 4B286F8D524DAB672B799E321FD42B17 1,1
+Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
 Key ":C-F"
-Display 80,30 6EE16CAA1D71E64174801F830FCB273C 49,13
+Display 80,30 DAC2F760D96062CCBFD5507E71CF77E0 49,13
 Key "-D"
-Display 80,30 FAA22543C70609B7EFB19BE2A5DF8C60 50,13
+Display 80,30 423BDB2871FE67A0B571F38C15947F82 50,13
 Key "-O"
-Display 80,30 4EA4155C8F18CF652149EA8125847B4D 51,13
+Display 80,30 02A4545AA986796FEEFF378C8CAAA3F1 51,13
 Key "-C"
-Display 80,30 F82281D4282B838EBDC499133A1FABCB 52,13
+Display 80,30 4286251FAE7A6CCCB6A44EB1A783D049 52,13
 Key "-/"
-Display 80,30 F432A29359EB15DC006B68E43E98F584 53,13
+Display 80,30 C5AB62FD8BA50E7F5590324893B1926A 53,13
 Key "-C"
-Display 80,30 89969EAAC64F999799A1F03757471EC4 54,13
+Display 80,30 FAC7A2BBA811FB1C5EC6FA3275D8B8C4 54,13
 Key "-a"
-Display 80,30 FED4E439E63738A679BA40B82AC72FD6 55,13
+Display 80,30 C6FBFB848F2D7592ECB9B40BFC8E1C46 55,13
 Key "-l"
-Display 80,30 D402AA38E44BB80E4EA0DB3BE323B028 56,13
+Display 80,30 84B4B4327EE9B820531DCFEBD1FCD5C1 56,13
 Key "-l"
-Display 80,30 12827D7BDA2BF284393F5C4909AD1DD0 49,13
+Display 80,30 64C0896B3CEBB0A1AD76140579FB823F 49,13
 Key "-s"
-Display 80,30 D9193136350153A820971D4439DFCE30 50,13
+Display 80,30 0BCDBE7601C6CAAE1F9AEA767CB96003 50,13
 Key ":Enter"
 Display 80,30 0ED92C8DD681911AE440AFB9571A648A 1,0
 Key ":C-N"
@@ -126,66 +126,66 @@ Display 80,30 9E6ED319D3AEC31ABA74A237746020D7 50,13
 Key ":Backspace"
 Display 80,30 9A43E6961B7CC401A14C3329A66A75E9 49,13
 Key ":Enter"
-Display 80,30 63DC4E9C5B1B6FA5B7B0930750D40A97 1,1
+Display 80,30 D8C8FB1FCA3B454D26ECA5F0F8C73332 1,1
 Key ":A-x"
-Display 80,30 40D74C45E4D10ACE3311E4D55B34B421 26,13
+Display 80,30 130F4BD0560C5B628E1872D1E1F15E7F 26,13
 Key "-g"
-Display 80,30 1A5F0B1A87B0992733A7037C275A4945 27,13
+Display 80,30 9F4229F6DB56268B8E16B3228B2D146E 27,13
 Key "-r"
-Display 80,30 9B3EFE7D0EAB494FD0B45C3233915D59 28,13
+Display 80,30 6678DA2D6D2AE75D81E9F4726B5FAD04 28,13
 Key "-e"
-Display 80,30 1EDC00E972C049766EEDF727A3EADF4D 29,13
+Display 80,30 495FAF1FD56212D6FAFCB4536C8C51B3 29,13
 Key "-p"
-Display 80,30 0E4F8457CD9572593465026210960F1B 30,13
+Display 80,30 D465905309000463FAB5DB288CA22BDD 30,13
 Key ":Enter"
-Display 80,30 FD24E591A525CA0A3F8B7E3A8EC114C3 44,13
+Display 80,30 886493CD557ACA404CA2DE3BE2775755 44,13
 Key "-w"
-Display 80,30 71E1F41F8C06D14E89558499801517FA 45,13
+Display 80,30 19D7A430BE3252936B88B0DA6C0221F6 45,13
 Key "-i"
-Display 80,30 A09D72C2F8D86367CDBEF8158E70C722 46,13
+Display 80,30 7D73517D44CAABA514D62A490C778799 46,13
 Key "-n"
-Display 80,30 A30E6C09B4D8AE40D4F98340E8639222 47,13
+Display 80,30 45A6D1257C2E5F8E472898D6FCB23F87 47,13
 Key "-d"
-Display 80,30 C710FF8DDE964600F245BB4A886F1A1A 48,13
+Display 80,30 1C616B6400B620C172C4B2EE92FA9772 48,13
 Key "-o"
-Display 80,30 5B7E90C9765576DC6DB3E05183326F5D 49,13
+Display 80,30 1FBA12433A070016D5C6EB48E85FE9DF 49,13
 Key "-w"
-Display 80,30 CB9D1AA5D1C741BEC82529ED57615503 50,13
+Display 80,30 01B616E5FC1C6E5C3319BDD67DCD467E 50,13
 Key "- "
-Display 80,30 CB9D1AA5D1C741BEC82529ED57615503 51,13
+Display 80,30 01B616E5FC1C6E5C3319BDD67DCD467E 51,13
 Key "-*"
-Display 80,30 FB9AAE72BF7C4B42640CAC050E0BE54D 52,13
+Display 80,30 51599B8AFDF8F59384CBF9EA76E40944 52,13
 Key "-."
-Display 80,30 2B3EC3792A2B5142515EF4A02B91042B 53,13
+Display 80,30 E91C5809890A6029A5AAD5EF4B51947E 53,13
 Key "-c"
-Display 80,30 FBD5DF4047331FF879A6478B880E8338 54,13
+Display 80,30 A02C8F9C87AFBA88C1747360F3E89931 54,13
 Key ":Enter"
-Display 80,30 EB18C1A4FC4D98F7A67823245C4BE143 11,10
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,10
+Display 80,30 6FC9201493F2B4AA8301B257BCD2177E 11,10
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,10
 Key ":C-N"
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,11
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,11
 Key ":C-N"
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,12
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,12
 Key ":C-N"
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,13
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,13
 Key ":C-N"
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,14
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,14
 Key ":C-N"
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,15
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,15
 Key ":C-N"
-Display 80,30 C2552291A83844EAB57DFCDC112A7529 11,16
+Display 80,30 3F11378374AB743F15EEAA73544864F1 11,16
 Key "-f"
-Display 80,30 9FD9E07BD0B16A1153DAFF9907E5B91F 11,12
+Display 80,30 A73A6090F8B6FE5421867051742AF0B6 11,12
 Key ":C-V"
-Display 80,30 7935B8A8CE96AA0841480F3A25DB4808 11,7
+Display 80,30 BD854B0497808D377B3CCAD6C7B119F7 11,7
 Key ":C-V"
-Display 80,30 A44CA9E4F34068B52C8BFF25679F8695 11,7
+Display 80,30 185265E51CAB0A8F427E4E649B95C80E 11,7
 Key ":C-V"
-Display 80,30 1E42E3E91C39AA91CB54B74073BC14B0 11,7
+Display 80,30 8B3A348574A918BDEDE51730B797717B 11,7
 Key ":A-B"
-Display 80,30 63DC4E9C5B1B6FA5B7B0930750D40A97 1,1
+Display 80,30 D8C8FB1FCA3B454D26ECA5F0F8C73332 1,1
 Key ":C-X"
-Display 80,30 881A0D99BF84CDFC4916F1BBFEDB62FD 1,1
+Display 80,30 E9EA03CE59D6B146608BFE19C64FF24E 1,1
 Key "-`"
 Display 80,30 8557455273011DFCCAB6707018F20080 1,6
 Key "-`"

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index c73b5d8fff35744d37c3b025d0601e9d190c4d0e..ae2a3169a850804cbe2b9b41ea3b6f142eb1c098 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -1,84 +1,84 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-N"
-Display 80,30 C15BE3A74052133419244D26B597EC30 1,2
+Display 80,30 19495E8BAB456D3B8151778AFB87F934 1,2
 Key ":C-N"
-Display 80,30 6993C09533D3BC7A68494654DAA5BAEE 1,3
+Display 80,30 5C808FD1DA9BC6D374E4A0C6F1DAF415 1,3
 Key ":C-N"
-Display 80,30 268AD7C6C562EA9F91B813B5855F57BA 1,4
+Display 80,30 0F0D6A5FDA9765C25ACE8B7946FCCFE2 1,4
 Key ":C-N"
-Display 80,30 A4F3A90F915D6CF3A9D40057E1CD7283 1,5
+Display 80,30 4227B91515E6A9865D22995E4BF1BAB2 1,5
 Key ":C-N"
-Display 80,30 E8144A2470F729A0160C201C9741784C 1,6
+Display 80,30 F03D3559FBC5AB0F82A840100F882274 1,6
 Key "-f"
-Display 80,30 4B7CBE1C34101549C0DB5E7D51F839F7 1,1
+Display 80,30 6D2F67AB72C2E3ED037A27EE21EED898 1,1
 Key ":C-N"
-Display 80,30 E7B1AFD6ED4DFFF77DA84D4DCA864C00 1,2
+Display 80,30 F92B6CC6CA419ECEFA63DFB7834CF3A5 1,2
 Key ":C-N"
-Display 80,30 072F69D70FEA39A4C56F8DB6858B6355 1,3
+Display 80,30 C1CB9EEEEE8D8D879B26ED59684D7FBB 1,3
 Key ":C-N"
-Display 80,30 813E476308A74ED1FE504A52AD0539F7 1,4
+Display 80,30 B94938A91A453C33062B7C19E160FC92 1,4
 Key ":C-N"
-Display 80,30 9DE2B2E15D1C2937544B5619C234A005 1,5
+Display 80,30 E55AF6ECD2BC1649A1C871623104C5B7 1,5
 Key "-f"
-Display 80,30 DFFE855809A02799837B70ECD4C643E4 1,1
+Display 80,30 4EE8C21A68FB745E13316E9AAC0754EC 1,1
 Key ":C-N"
-Display 80,30 7F231F201812816332277129F5CB14D2 1,2
+Display 80,30 52E605C5052029FBE197931081A7BA81 1,2
 Key ":C-N"
-Display 80,30 1AA42933DE992B0CC2CF9D6D533E08F6 1,3
+Display 80,30 1C632EA23D8209E1A3C6E18C6F77FA43 1,3
 Key ":C-N"
-Display 80,30 3B11D1D99A303BEA02852B474B601661 1,4
+Display 80,30 9F2A25773E72464A69FF24D04AE5DD76 1,4
 Key ":C-N"
-Display 80,30 0F3AADCB4F64C119F093463CBE8FF7A4 1,5
+Display 80,30 97ABC74FFE1F13646D44B42B00264A0D 1,5
 Key ":C-N"
-Display 80,30 A59E056B7C24F1455B6BEDA98E597410 1,6
+Display 80,30 2F0792B46099DDBD43D03A56ACB89591 1,6
 Key ":C-N"
-Display 80,30 BB91C1EBBE2233CFE36C819D1F46701A 1,7
+Display 80,30 73A89D6A579AFF1DE73CBF80907C1AA3 1,7
 Key ":C-N"
-Display 80,30 FAFD8F5EE48E0900D2275134D1B602D5 1,8
+Display 80,30 1F395127CC26A24A3F04264106BA52A8 1,8
 Key ":C-N"
-Display 80,30 A769B771C542314CA254DDD963E7373A 1,9
+Display 80,30 054823A01712D3C27D290493C746E5C8 1,9
 Key ":C-N"
-Display 80,30 74E7392AA622D5B75D582598F9DFD7A3 1,10
+Display 80,30 FF3E869EB5C607AC3F375E8E92B65483 1,10
 Key ":C-N"
-Display 80,30 6BDB299565C6913346F4CE0895E2AC43 1,11
+Display 80,30 0AD8D4047F9B7B6267492AF85679E7BA 1,11
 Key ":C-N"
-Display 80,30 7808B5A0775C75E4C5B7F5C4E9B35DE4 1,12
+Display 80,30 006CF940CD1D3A86FE87A2334D2D4550 1,12
 Key ":C-N"
-Display 80,30 3C00D148C367B520321075DFAFA23C20 1,13
+Display 80,30 87B60AB0616DAFA9F78E847D158814C7 1,13
 Key ":C-N"
-Display 80,30 FB9E8897296D7D30741295EF3BFB48D6 1,14
+Display 80,30 7E8E126D4BE4A718925F58E85D1C40D7 1,14
 Key ":C-N"
-Display 80,30 E23977685CBAEBB418A71FFC70EBBD0D 1,15
+Display 80,30 CA7381AA0ECE906070A0369F8EFCE040 1,15
 Key ":C-N"
-Display 80,30 83207F237473EA641AB7787656A41AE1 1,16
+Display 80,30 EEB01D83A37666B47834C673497FF165 1,16
 Key ":C-N"
-Display 80,30 B1D844BD4CCB0254D35D4BD4E0DD4117 1,17
+Display 80,30 C3AC03838004C64FADED6D6220B34AEE 1,17
 Key ":C-N"
-Display 80,30 B1C7FEE9DE5527C1E1504F2E27959C4C 1,18
+Display 80,30 0CAD4A2A50989AB94F53869B72966747 1,18
 Key ":C-N"
-Display 80,30 8640926EB8129ADC15FE8A788396CB1E 1,19
+Display 80,30 FC7DFE2C95FA408FE1BE30E0EF1F7328 1,19
 Key ":C-N"
-Display 80,30 E0F8E87670A2F739D2136B0C359E690C 1,20
+Display 80,30 AD7AC56AE6351D1774E985849F35FEBF 1,20
 Key ":C-N"
-Display 80,30 980C8621D9167A5D964389C6D7C86807 1,21
+Display 80,30 31C2AF8B03E8F9B7C279D8B3E0DDED1B 1,21
 Key ":C-N"
-Display 80,30 8B2E3D460601E5BCA8D5CC06868E954B 1,22
+Display 80,30 B599FEB8B399451C33E2389DBC87F5E5 1,22
 Key ":C-X"
-Display 80,30 13A78D78CBB149DE4A88D43E4B1DD1F7 1,22
+Display 80,30 7E282C461DBFFADFF49A20AB08608A20 1,22
 Key "-3"
-Display 80,30 217FDA7995C1C9B5F1194AD2A84D1BC0 1,22
+Display 80,30 70D25F9095F632E568BBF247CE9C1F8C 1,22
 Key ":C-E"
-Display 80,30 9FD8B89E9170E1ACA9C62ABE2AF8513D 33,22
+Display 80,30 CD9AE3529CE49FA9AAF14BA6FF52FA43 33,22
 Key "-p"
-Display 80,30 B57163AC6C9D54000BD7F5C6D51FE0D0 33,22
+Display 80,30 9FB23C9B6DFCECC9D449CE02C7A8F8E2 33,22
 Key "-P"
-Display 80,30 E133E16DC8048EABB583F0A197433EF4 33,22
+Display 80,30 38904519220E482D823ABC7FFCE2FA60 33,22
 Key ":C-X"
-Display 80,30 B5F8698390E5255954777C8F8D728A7C 33,22
+Display 80,30 4831E2CA659B02BD1CEC08B521E0585B 33,22
 Key "-o"
-Display 80,30 E133E16DC8048EABB583F0A197433EF4 41,16
+Display 80,30 38904519220E482D823ABC7FFCE2FA60 41,16
 Key ":C-E"
-Display 80,30 2B5C817EA31FFF74C570CE480C099CA8 73,16
+Display 80,30 2750A812B32CB2262D142E6ED4BCC20D 73,16
 Key ":Enter"
 Display 80,30 183251B8F73A0DFDF6AE47B10E37533F 41,0
 Key ":C-N"

diff --git a/tests.d/02-spell b/tests.d/02-spell
index be097c08fd8e3682e7f2e9390c0c52186100bcf6..495d8f313f57e560bb1fded41fd37c02bfeea0c8 100644 (file)
--- a/tests.d/02-spell
+++ b/tests.d/02-spell
@@ -1,18 +1,18 @@
-Display 80,30 8E0475BEC615A014CF80DDDF73CE4ED6 1,1
+Display 80,30 1AB57F59371B6A76D54C91AEE13CF923 1,1
 Key ":C-N"
-Display 80,30 C15BE3A74052133419244D26B597EC30 1,2
+Display 80,30 19495E8BAB456D3B8151778AFB87F934 1,2
 Key ":C-N"
-Display 80,30 6993C09533D3BC7A68494654DAA5BAEE 1,3
+Display 80,30 5C808FD1DA9BC6D374E4A0C6F1DAF415 1,3
 Key ":C-N"
-Display 80,30 268AD7C6C562EA9F91B813B5855F57BA 1,4
+Display 80,30 0F0D6A5FDA9765C25ACE8B7946FCCFE2 1,4
 Key ":C-N"
-Display 80,30 A4F3A90F915D6CF3A9D40057E1CD7283 1,5
+Display 80,30 4227B91515E6A9865D22995E4BF1BAB2 1,5
 Key ":C-N"
-Display 80,30 E8144A2470F729A0160C201C9741784C 1,6
+Display 80,30 F03D3559FBC5AB0F82A840100F882274 1,6
 Key ":C-N"
-Display 80,30 7223397940E4CE11A4F353B7CC9082DF 1,7
+Display 80,30 14DF59CD936EFA04483069B763360A86 1,7
 Key ":C-N"
-Display 80,30 CA41F5D31A2F91361F819117D2442F56 1,8
+Display 80,30 CDBBFFABF0534E6F4508C0F00F8F75E0 1,8
 Key "-f"
 Display 80,30 453755D55FC0151ED0852A2467A28FF4 1,0
 Key ":A-x"