popup: improve positioning.

1/ for full-width ("4") popups, use full height too.
2/ drop the bw/bh offset as this is wrong.
   This requires refreshing most tests.

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

diff --git a/lib-popup.c b/lib-popup.c
index d7c19423c3cec9586b81b848df0197740b98d351..ee48fc5138db1afe52dc66306cc3ef0c3c518317 100644 (file)
--- a/lib-popup.c
+++ b/lib-popup.c
@@ -110,13 +110,14 @@ static void popup_resize(struct pane *p safe, const char *style safe,
                        w = w / 4;
                else if (strchr(style, '3'))
                        w = 3 * w / 4;
-               else if (strchr(style, '4'))
+               else if (strchr(style, '4')) {
                        w = w;
-               else
+                       h = p->parent->h - 2 * bh;
+               } else
                        w = w / 2;
 
-               x = p->parent->w/2 - w/2 - bw;
-               y = p->parent->h/2 - h/2 - bh;
+               x = p->parent->w/2 - w/2;
+               y = p->parent->h/2 - h/2;
                if (strchr(style, 'T')) { y = 0; h -= bh; }
                if (strchr(style, 'B')) { h -= bh; y = p->parent->h - h; }
                if (strchr(style, 'L')) x = 0;

diff --git a/tests.d/00-basic b/tests.d/00-basic
index bf1ff9732f3c4f34d86cf9e398635fbe97130dca..3f805aeac3675c1bf8113e5fed5110678dfe7571 100644 (file)
--- a/tests.d/00-basic
+++ b/tests.d/00-basic
@@ -568,35 +568,35 @@ Display 80,30 41AC9C3CD03D07B52B6A3DA48C7AB730 1,8
 Key ":C-X"
 Display 80,30 D9F43AF47815B46A3E90E0795A30B979 1,8
 Key ":C-F"
-Display 80,30 9EC0A0D1DB4CD25212BDA621C552CF7C 49,13
+Display 80,30 A0BA96835B3A89C59BD9A5A3DF75F85A 50,14
 Key "-m"
-Display 80,30 3BC95BDD5BACBD3424D4CA16942C7F63 50,13
+Display 80,30 2ED194DC47AD6893C7461DBD14FA2AC9 51,14
 Key ":Tab"
-Display 80,30 A3AB040521784BFB976BA37EECC20F06 31,13
+Display 80,30 E5D462E372651A3748E07E554F87C839 32,14
 Key ":Up"
-Display 80,30 A3AB040521784BFB976BA37EECC20F06 31,12
+Display 80,30 E5D462E372651A3748E07E554F87C839 32,13
 Key ":Up"
-Display 80,30 A3AB040521784BFB976BA37EECC20F06 31,11
+Display 80,30 E5D462E372651A3748E07E554F87C839 32,12
 Key ":Up"
-Display 80,30 A3AB040521784BFB976BA37EECC20F06 31,10
+Display 80,30 E5D462E372651A3748E07E554F87C839 32,11
 Key ":Up"
-Display 80,30 A3AB040521784BFB976BA37EECC20F06 31,9
+Display 80,30 E5D462E372651A3748E07E554F87C839 32,10
 Key ":Up"
-Display 80,30 A3AB040521784BFB976BA37EECC20F06 31,8
+Display 80,30 E5D462E372651A3748E07E554F87C839 32,9
 Key ":Enter"
-Display 80,30 5ADBAFFE404A3D51F765A468BFF4323E 55,13
+Display 80,30 2BA288030D075F14C55AFDF1340B650D 56,14
 Key ":Enter"
 Display 80,30 25679283B88265B98ADEB89F60C76D93 1,0
 Key ":C-X"
 Display 80,30 84F4B35BF26F9D5EEBB67D572ADD0BBF 1,0
 Key ":C-F"
-Display 80,30 7C0F0C177E21F3D7A13F7EF584009F9F 49,13
+Display 80,30 6963EEBA08194A8F88F34469313901A6 50,14
 Key "-R"
-Display 80,30 FDA5EA9A53329FB91BC5D4C3D1FD83F3 50,13
+Display 80,30 F66738349A9DCEEC4E9FB0EA258A3A82 51,14
 Key "-E"
-Display 80,30 9B750D9D668BB50CE7739F48F04F2910 51,13
+Display 80,30 EF253733A2BAA9BEC3F95C465106D57F 52,14
 Key ":Tab"
-Display 80,30 921BB37575FB218DE71F646EE21973BB 50,13
+Display 80,30 433C7366774191E881F337B29D5F86F8 51,14
 Key ":Enter"
 Display 80,30 B116277653C29D730B60D8C76FE09D5A 1,0
 Key ":C-X"
@@ -727,5 +727,5 @@ Display 80,30 29F3151EB6D0ED1BF8BC637E0E8F41CB 1,3
 Key ":C-X"
 Display 80,30 6C71927B10030D3ABC828BF38CF37799 1,3
 Key ":C-C"
-Display 80,30 39B814F1E8577AAD3DF0FAE0D5E0B412 21,8
+Display 80,30 60C06DE811C9BE3B3E757CEA540BABE1 22,9
 Close 1965

diff --git a/tests.d/00-mouse b/tests.d/00-mouse
index c95ab82f3bd404d31a91a9ba1fe2df09266e3a2b..e44bd70debf35281325c437385ecb40898861ec1 100644 (file)
--- a/tests.d/00-mouse
+++ b/tests.d/00-mouse
@@ -6,13 +6,13 @@ Display 80,30 53E4AE539BA6C01DF05AC2021B864416 1,1
 Key ":C-X"
 Display 80,30 CDEF36693D7EB7F48B0DB2AB92D5132B 1,1
 Key ":C-F"
-Display 80,30 7ABE88B13410A89D2E677014D5279865 49,13
+Display 80,30 97FEDF25ABB2F789E5157E5BA403CE6B 50,14
 Key "-R"
-Display 80,30 B6DAFFB84AA88FEC8AEC3A9CA5263DA6 50,13
+Display 80,30 006491AA028CE38C1C263F0252B03BB3 51,14
 Key "-E"
-Display 80,30 CE5A493401F50E4EE41EF6FDA0BE5ED4 51,13
+Display 80,30 65B3DC11BBA0DB4627FEBC99324E98B8 52,14
 Key ":Tab"
-Display 80,30 D02D43C9F92418F8D59A95C8AE83CA00 50,13
+Display 80,30 2C52CB31CF00C46C205BEC76BFEC1698 51,14
 Key ":Enter"
 Display 80,30 7629824FF11BC1240661B1AB42459CDC 1,0
 Mouse ":Press-1" 20,17

diff --git a/tests.d/01-c-mode b/tests.d/01-c-mode
index 5592cb601a136d312d46be6870f167e2c6233181..c7929ed2362f08ada3a020572d6be9cc581cf3b6 100644 (file)
--- a/tests.d/01-c-mode
+++ b/tests.d/01-c-mode
@@ -2,21 +2,21 @@ Display 80,30 CB3B03DAB19CF99E39369DE43D3BEF7B 1,1
 Key ":C-X"
 Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
 Key ":C-F"
-Display 80,30 9D61812C8B7EBE9538925D736D82B71E 49,13
+Display 80,30 441B61CA180208BDCCE8BE2177E99CB1 50,14
 Key "-c"
-Display 80,30 6A3524366BCE59C10EEC10D8FBB9E939 50,13
+Display 80,30 AEAA54F64DDFFC91A34F79FC9B8BE714 51,14
 Key "-o"
-Display 80,30 F06D783A6FC698C464292CAFABEA1D80 51,13
+Display 80,30 CB2FC257000525F47DB5B2D6602F1ED8 52,14
 Key "-r"
-Display 80,30 72B0207A60367153F8071D5AB676CB33 52,13
+Display 80,30 857EB1BB01DD23648432F3DC5E9C2366 53,14
 Key "-e"
-Display 80,30 6F628B4C0F7CF56D7398354CC0259B5F 53,13
+Display 80,30 C6A8C4F847A3FE7F91F8D89A07626B1F 54,14
 Key "--"
-Display 80,30 E1570BCB8812DDF9869279C78D88102F 54,13
+Display 80,30 F9908CD3F856B8F6E96DB01E48216066 55,14
 Key "-p"
-Display 80,30 7EF57467A7A7ECEF20213979133D7BAB 55,13
+Display 80,30 AB8208EA35F2CE176A2D0F003486E919 56,14
 Key ":Tab"
-Display 80,30 2236CE712FC975126F8CDB1CDB83CDFF 52,13
+Display 80,30 9016154BFED6BE7B355804750528B26D 53,14
 Key ":Enter"
 Display 80,30 6C95AD11B7B25C02D3341A9CC1FE089B 1,0
 Key ":C-V"
@@ -246,19 +246,19 @@ Display 80,30 07587E175E887F3D213B6793128A4743 1,16
 Key ":C-X"
 Display 80,30 7C314DBBCD68C1BCC7CDD6975056C58D 1,16
 Key ":C-F"
-Display 80,30 72EDBFD7EEED5E86D1F6829B9CAA0501 49,13
+Display 80,30 1AD9719E75892B3DC9C0DD0EA671C6B2 50,14
 Key "-c"
-Display 80,30 0E076FC6EAB7F0E68F9BC034E753F41F 50,13
+Display 80,30 35D339472F6DD423B90B7F8B17EC943C 51,14
 Key "-o"
-Display 80,30 111F350C20CB43E6D1FDA43AA8FF9426 51,13
+Display 80,30 7E6CDC6A541652D556A65B77EE6D3776 52,14
 Key "-r"
-Display 80,30 947F60B8C15DDEE270D43A125FD1D2AB 52,13
+Display 80,30 4A62883CF5D469940220C86E9DE7A870 53,14
 Key "-e"
-Display 80,30 4D43A57293BD8338A221EFAA4347572C 53,13
+Display 80,30 89F8403E57ABAEDCD47124AA21FFC46F 54,14
 Key "-."
-Display 80,30 20DF909DE3EAFAE593366A243BE4D42D 54,13
+Display 80,30 4CD1FFE8A4460FD415B49300010FD6B6 55,14
 Key "-h"
-Display 80,30 B08CAE6FDB9A639B4C8519D2BB8F636B 55,13
+Display 80,30 933233D449BDE9EE98FBD9127D877535 56,14
 Key ":Enter"
 Display 80,30 A6364D21C49824B1F01977985C05381F 1,0
 Key ":A->"
@@ -561,6 +561,6 @@ Display 80,30 7996593A95F76AA26DF90ACEAFC666FF 1,22
 Key ":C-X"
 Display 80,30 0BFBAC9A38865191F8B8BD526D88E147 1,22
 Key ":C-C"
-Display 80,30 02095F4E624010B3B164BD2E62DDF854 21,8
+Display 80,30 272DB155A9CAADFF6CF1A088D3D8BDE7 22,9
 Key "-n"
 Close 1130

diff --git a/tests.d/01-markup b/tests.d/01-markup
index a6de36089767773a07ee173badbb45e32535e79f..4e77c64823d31ce5c06b5053b79522db0e23a632 100644 (file)
--- a/tests.d/01-markup
+++ b/tests.d/01-markup
@@ -2,67 +2,67 @@ Display 80,30 CB3B03DAB19CF99E39369DE43D3BEF7B 1,1
 Key ":C-X"
 Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
 Key ":C-F"
-Display 80,30 9D61812C8B7EBE9538925D736D82B71E 49,13
+Display 80,30 441B61CA180208BDCCE8BE2177E99CB1 50,14
 Key "-D"
-Display 80,30 4142AA4D2A3661FA8141455C54E4BA9F 50,13
+Display 80,30 55915388030A86B8F820097146FB7F6F 51,14
 Key "-O"
-Display 80,30 82011980B3C7A31148961D77DC94507C 51,13
+Display 80,30 4EF2631A4931EB9336B9041456F739F3 52,14
 Key "-C"
-Display 80,30 178980CAE142EF4AFE53BD1CF8C5FD95 52,13
+Display 80,30 3A05DC15E95F5CDF83DBCB7B121D0462 53,14
 Key "-/"
-Display 80,30 9E26F90B527F9BC498B77676FF8973D8 53,13
+Display 80,30 DD57C1B08494EBA54FF8B54A2B646612 54,14
 Key "-e"
-Display 80,30 EE86A4459D61456D82A780F8F49013EC 54,13
+Display 80,30 8E41DD739466FD4F410E3EBB8C31145D 55,14
 Key "-x"
-Display 80,30 73D2C24EC0B16E67BE8356C80C0A421A 55,13
+Display 80,30 35427C5A3C117F9C4BF141256ADFF215 56,14
 Key "-t"
-Display 80,30 E5AB77F093F61937F66BB91CA07AB116 56,13
+Display 80,30 65CFF1F3512012F772F29B8D68B9A639 57,14
 Key "-r"
-Display 80,30 FCF02F793F63CF984C23CF22F231B2D7 57,13
+Display 80,30 D303B18FA2DF214F41C219013CF7C189 58,14
 Key "-a"
-Display 80,30 8AF80A13F948F8A5E87BB2EB9586EDF7 50,13
+Display 80,30 BA5F34EBA5D4A31487260F5D546F4442 51,14
 Key "-/"
-Display 80,30 4C4168A84C8EEA12D98B3045252EFE6E 51,13
+Display 80,30 5C3D17F416AD00A7443C81977E77E296 52,14
 Key "-D"
-Display 80,30 10FE362DC0945AE8D48E346B49682840 52,13
+Display 80,30 85186D9D66863A705B451A545C8E42FD 53,14
 Key "--"
-Display 80,30 E083C02ABF68F11567C4896273FC0A9A 53,13
+Display 80,30 808DFFE07D4F4D97178A324ED20C7EC9 54,14
 Key "-t"
-Display 80,30 2329CF2B5B4F0BCACE7934A44AE31840 54,13
+Display 80,30 81400100313D48BAB14785795BBFEC36 55,14
 Key "-e"
-Display 80,30 227147F7D7F4F1FF67522F25ACDC1F79 55,13
+Display 80,30 106D76167D5D32734B211D3E6BD07029 56,14
 Key "-s"
-Display 80,30 86B9054ED3FACECF8E8B1EC8E305E491 56,13
+Display 80,30 C0049F40D8EA7FEC9B4A36CAAD17F8F1 57,14
 Key "-t"
-Display 80,30 5DC5F07B44FAEEFF0FD836F1A0E57ABF 57,13
+Display 80,30 0E13F64A1C8157F05F7E53481AD8882A 58,14
 Key "--"
-Display 80,30 8EBFE376FB5FA1BEA59BBCCD700340D3 50,13
+Display 80,30 FA7EB6627AB5C5BBFE4083875C360367 51,14
 Key "-m"
-Display 80,30 496783CB11E8E96286F11FDB12CDC322 51,13
+Display 80,30 72A77862896182C90F3572A6DD520FE6 52,14
 Key "-a"
-Display 80,30 EB6B85D1891D31FB342F9963FAC34EF1 52,13
+Display 80,30 116C41EEE18086F715ADAD50D56CE26D 53,14
 Key "-r"
-Display 80,30 C93BA280297D2D267FE2E63C16E14C31 53,13
+Display 80,30 167E415F066D3910597857DD5FBE7DEF 54,14
 Key "-k"
-Display 80,30 D79CEBFEE5E393E54E1AAA53E7B3E51A 54,13
+Display 80,30 86C72D5EC4B43015196A2AD8D45BFBDC 55,14
 Key "-u"
-Display 80,30 125093C7430A2BC98FFB4C0D44022F08 55,13
+Display 80,30 BB356A50545B26D9A79C2825D20CEC92 56,14
 Key "-p"
-Display 80,30 95512B109D72A603E35EF18D54F82BB5 56,13
+Display 80,30 07D8BE92D5FAEFC74B072463E0BB9911 57,14
 Key ":Enter"
 Display 80,30 055172E6AF6EB4ACCFC468789FDBEF6A 1,0
 Key ":A-x"
-Display 80,30 4B219973AD90D16B9D40886FB0816468 26,13
+Display 80,30 7464B315CFBA791391D115D48B6394D2 27,14
 Key "-t"
-Display 80,30 5F3B8EB8451DBF416AB3D89398816C61 27,13
+Display 80,30 569F6F96AD6E112819A363B4EDD0ECBE 28,14
 Key "-e"
-Display 80,30 6C45BBE3777FBE59DAC1D2D695C22FE8 28,13
+Display 80,30 353A74989F5305BB04CDD2FE2999CBBC 29,14
 Key "-s"
-Display 80,30 DA3EF2D2B17DB020E988274360029EAC 29,13
+Display 80,30 5AB7BBA129F8408C8AB983881D658D35 30,14
 Key "-t"
-Display 80,30 45889D375C85523B729E8C5D2F0EF48A 30,13
+Display 80,30 441438E58D03492CDCE5C358FC27312A 31,14
 Key ":Tab"
-Display 80,30 6C94956491F202D6EE7CE32BE609C97A 37,13
+Display 80,30 83E55338C7594DC5A0A6ECA337C62E4A 38,14
 Key ":Enter"
 Display 80,30 F16D66F00816A2B9A11D20AB5C937CAB 25,3
 Key ":A->"

diff --git a/tests.d/01-textfill b/tests.d/01-textfill
index 3d549f173ad08f4e73265ab33397c22abc7fee57..05de32575f4d73ebc61929b33d859c919d4942b6 100644 (file)
--- a/tests.d/01-textfill
+++ b/tests.d/01-textfill
@@ -194,29 +194,29 @@ Display 80,30 2CFBC0E50B09C5EBD309EAC5A6894516 48,21
 Key "- "
 Display 80,30 5B13B50A1E17E7109E98B7199579E428 19,23
 Key ":A-x"
-Display 80,30 84B555E61C2DDE92723E24FC8A8705AB 26,13
+Display 80,30 16ADC3E817C421218C88F2A522F57B24 27,14
 Key "-f"
-Display 80,30 FAFF84D31792DDF7390352F3D3A64B75 27,13
+Display 80,30 F711F4B7AF91E48616F4639FBEE75080 28,14
 Key "-i"
-Display 80,30 04D3B1AD6D1A67E39FCC9842D4FA4315 28,13
+Display 80,30 2D541172AE5C4D908510B026228A72BF 29,14
 Key "-l"
-Display 80,30 4BD4F52E9A4B774A879B732C5DBC9A37 29,13
+Display 80,30 78DFF3ECF892E40634C45B221225E6A8 30,14
 Key "-l"
-Display 80,30 CEDFEBA4B37853BCB3644CFCFA6961B6 30,13
+Display 80,30 2149040B8B9858E28C443ED1A5A6AF63 31,14
 Key ":Enter"
 Display 80,30 CE142473DEDBB2D137DD33D9431F3677 19,23
 Key ":A-x"
-Display 80,30 84B555E61C2DDE92723E24FC8A8705AB 26,13
+Display 80,30 16ADC3E817C421218C88F2A522F57B24 27,14
 Key "-f"
-Display 80,30 FAFF84D31792DDF7390352F3D3A64B75 27,13
+Display 80,30 F711F4B7AF91E48616F4639FBEE75080 28,14
 Key "-i"
-Display 80,30 04D3B1AD6D1A67E39FCC9842D4FA4315 28,13
+Display 80,30 2D541172AE5C4D908510B026228A72BF 29,14
 Key "-l"
-Display 80,30 4BD4F52E9A4B774A879B732C5DBC9A37 29,13
+Display 80,30 78DFF3ECF892E40634C45B221225E6A8 30,14
 Key "-l"
-Display 80,30 CEDFEBA4B37853BCB3644CFCFA6961B6 30,13
+Display 80,30 2149040B8B9858E28C443ED1A5A6AF63 31,14
 Key ":Tab"
-Display 80,30 0A848FDD2F877C6208050633E9687F09 35,13
+Display 80,30 99DE2D5FE5EC2778EA2F3EA23168A205 36,14
 Key ":Enter"
 Display 80,30 5B13B50A1E17E7109E98B7199579E428 19,23
 Key "- "
@@ -437,23 +437,23 @@ Display 80,30 7AB4BC2C6C0D46EC99AE14E057A50AC2 53,18
 Key ":C-X"
 Display 80,30 489E56718B5B843296D37E6C59186B10 53,18
 Key ":C-F"
-Display 80,30 43A86873E19585C86A5A7AACEA730482 49,13
+Display 80,30 714B55F101DCDDA754FEBDE54E648D77 50,14
 Key "-c"
-Display 80,30 1832CDE1CB7F1C9EDFF86D0D5F4C0934 50,13
+Display 80,30 E73D04C02FD2A851A809577A4825A3FD 51,14
 Key "-o"
-Display 80,30 35A7A007DBF11E9C5ADB7961CB85C30F 51,13
+Display 80,30 F46134819954B10B00CAA8A215EB53EE 52,14
 Key "-r"
-Display 80,30 C17645A96F7088ABCD5FF05BEB55F518 52,13
+Display 80,30 3283C59407274F9B4A0F00EA1377C632 53,14
 Key "-e"
-Display 80,30 E4AD8402B40999519DB0956C2500E2EF 53,13
+Display 80,30 5B741434BE908AB30F7F3ECF740DA430 54,14
 Key "--"
-Display 80,30 92F44715EA2F11DB44EFD47C74DCF9EA 54,13
+Display 80,30 8831ACDCE0FF5AD3E8B619FA04E5ABC0 55,14
 Key "-d"
-Display 80,30 63CA32384F320604713B4217BDB59FE6 55,13
+Display 80,30 C601FCB0DC159AF34FD60053330F5F4E 56,14
 Key "-o"
-Display 80,30 3ABE6298B6E86C9ED278B33B285661DF 56,13
+Display 80,30 CD873D74F0AB0B8969A9E591D17C8EB6 57,14
 Key ":Tab"
-Display 80,30 B98BD1374C4CB3DC49C38FD9EAD20B32 51,13
+Display 80,30 AD026FF51B6C7C585E4ECC7FA93CE5D7 52,14
 Key ":Enter"
 Display 80,30 FFEC7420A3B5103AB4745EC78CECA75D 1,0
 Key ":C-N"
@@ -570,8 +570,8 @@ Display 80,30 0C940443A32001D6D892719A48108782 12,13
 Key ":C-X"
 Display 80,30 05546B93D9066F6349E248340D0926C3 12,13
 Key ":C-C"
-Display 80,30 E8DAB623AACE47112EF6E455DC9FDAFA 21,8
+Display 80,30 763A653F81E9059CD90446B6F1009645 22,9
 Key "-n"
-Display 80,30 E8DAB623AACE47112EF6E455DC9FDAFA 21,9
+Display 80,30 763A653F81E9059CD90446B6F1009645 22,10
 Key "-n"
 Close 1022

diff --git a/tests.d/02-diff b/tests.d/02-diff
index e0db8a7c7f16d26190b9576684d145a4897244b2..8cc52ad76be6cbc76e549bda03c62dac84dc03d6 100644 (file)
--- a/tests.d/02-diff
+++ b/tests.d/02-diff
@@ -1,22 +1,22 @@
 Display 80,30 CB3B03DAB19CF99E39369DE43D3BEF7B 1,1
 Key ":A-!"
-Display 80,30 4E31E5AB3350A01B582B05CF00207219 36,13
+Display 80,30 F17579966DDB5C36C0B3B41BF979C6F3 37,14
 Key "-g"
-Display 80,30 9736D057AADD723D6DFA438FE89D4539 37,13
+Display 80,30 54E0B3FD2B75B0A80D66BB93F57E7518 38,14
 Key "-i"
-Display 80,30 4FED1A307AEC9FC760D665D03B155398 38,13
+Display 80,30 D42E57F24C1C77B41A8F93EC93DD0530 39,14
 Key "-t"
-Display 80,30 4D68251DE4D3E0FDCE8914ED9AD2C0E0 39,13
+Display 80,30 76775DDC7B2A2FCDCAC2B5BFEDDCEEF7 40,14
 Key "- "
-Display 80,30 4D68251DE4D3E0FDCE8914ED9AD2C0E0 40,13
+Display 80,30 76775DDC7B2A2FCDCAC2B5BFEDDCEEF7 41,14
 Key "-s"
-Display 80,30 39FF4C9860087E0ADC0E685A71B481B2 41,13
+Display 80,30 248CA6C12E4D883720BD501C7FEC7A11 42,14
 Key "-h"
-Display 80,30 615494E9C40AD6893209B4288D909275 42,13
+Display 80,30 1D2157E7472A666C241D283F0E4771E4 43,14
 Key "-o"
-Display 80,30 849590645D223B3ADA15EFB067E8A74D 43,13
+Display 80,30 A377491216A7F0B8E02687F658B8DC09 44,14
 Key "-w"
-Display 80,30 01352D6812FE8460A94B364848A4729B 44,13
+Display 80,30 742F64D9B2E1C9EFD8532410563F2FB2 45,14
 Key ":Enter"
 Display 80,30 CB3B03DAB19CF99E39369DE43D3BEF7B 1,1
 Display 80,30 83C3DCA7C9095D800999DA158E936009 1,1

diff --git a/tests.d/02-grep b/tests.d/02-grep
index 301a999d8ee21bcf997bbd92dc23a074a8434d98..f4d7339f0b83cba66694f806c13301beae30d1d8 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -2,25 +2,25 @@ Display 80,30 CB3B03DAB19CF99E39369DE43D3BEF7B 1,1
 Key ":C-X"
 Display 80,30 72554BDCE7C88CB96C5C31E58EEE15AB 1,1
 Key ":C-F"
-Display 80,30 9D61812C8B7EBE9538925D736D82B71E 49,13
+Display 80,30 441B61CA180208BDCCE8BE2177E99CB1 50,14
 Key "-D"
-Display 80,30 4142AA4D2A3661FA8141455C54E4BA9F 50,13
+Display 80,30 55915388030A86B8F820097146FB7F6F 51,14
 Key "-O"
-Display 80,30 82011980B3C7A31148961D77DC94507C 51,13
+Display 80,30 4EF2631A4931EB9336B9041456F739F3 52,14
 Key "-C"
-Display 80,30 178980CAE142EF4AFE53BD1CF8C5FD95 52,13
+Display 80,30 3A05DC15E95F5CDF83DBCB7B121D0462 53,14
 Key "-/"
-Display 80,30 9E26F90B527F9BC498B77676FF8973D8 53,13
+Display 80,30 DD57C1B08494EBA54FF8B54A2B646612 54,14
 Key "-C"
-Display 80,30 B741716FF954CD033D4C4A8B4754CD60 54,13
+Display 80,30 E90E3EA63E9AF4071EF06468270334E3 55,14
 Key "-a"
-Display 80,30 FDD019CC34510A0C5A8727C8C7A96EF7 55,13
+Display 80,30 3D417ABC621FA35F305408744C9C832D 56,14
 Key "-l"
-Display 80,30 E5182FE362910CA8A8F83372190721E4 56,13
+Display 80,30 2FCEC21167EF30CB3D71089C9468FD81 57,14
 Key "-l"
-Display 80,30 C751D59E7C26262C443F20E387292CDD 57,13
+Display 80,30 98A5ED0C01328F599CF3F6AB2F6E0974 58,14
 Key "-s"
-Display 80,30 E80372591A7E1A3DF8268DC796DE96D8 50,13
+Display 80,30 BE1AD56D67215AA73E499914FE3EA36E 51,14
 Key ":Enter"
 Display 80,30 B9847B5CD308DB10334032B362DCBE2A 1,0
 Key ":C-N"
@@ -62,16 +62,16 @@ Display 80,30 DA08FE7CCE07E5849307E9CE24E547ED 53,0
 Key ":Enter"
 Display 80,30 44B002156909B51522B115FF51C48301 28,7
 Key ":A-."
-Display 80,30 15E8DDBEB337FDD79AF90739AE6C2260 52,13
+Display 80,30 8A2B877A2027A3F5E1BFDD4642EE7A0B 53,14
 Key ":Enter"
-Display 80,30 0071CBFF5B26AACB5F7EE193D8E10DBC 11,10
-Display 80,30 BD02E2C0808B1B1A822745F5A029FBA6 11,10
+Display 80,30 8AD6E3354892AEC4ECB79D5287F3152F 12,11
+Display 80,30 059A40E79D566CE0C5A0EA3C4A89BF90 12,11
 Key ":Enter"
 Display 80,30 195C2466FF42AB63B832030E4B44D3F4 1,1
 Key ":C-X"
 Display 80,30 6480624A6FD9BE7C74F17BA5F093F3AD 1,1
 Key "-`"
-Display 80,30 0BC8B8BCE02BFFDADAFCC520BA81A133 1,7
+Display 80,30 C95517897FA2FDD36E0D32F2ADE24A99 1,7
 Display 80,30 0BC8B8BCE02BFFDADAFCC520BA81A133 1,7
 Key "-`"
 Display 80,30 A493DDF40FA2085D4FC2CB2A8D3190E1 1,6
@@ -116,72 +116,72 @@ Display 80,30 2D5FBF9D6847197E8686AE154C0CA6B2 1,6
 Key ":C-X"
 Display 80,30 77F1C291B9214AE59842D4BD18F6A05F 1,6
 Key ":C-F"
-Display 80,30 D2460E7D49046D32273B031251DD556E 53,13
+Display 80,30 F17C3842141C6B59368AC59AB6DDC0A0 54,14
 Key ":Backspace"
-Display 80,30 6222E14C4AC1180F3D1BBB04756EB87E 52,13
+Display 80,30 8DABC36EAE88C2B4E3C236C32547C696 53,14
 Key ":Backspace"
-Display 80,30 715A63E20837FE4AAAE585F685464EB8 51,13
+Display 80,30 D327F9A8B4563C35207C4655738451E1 52,14
 Key ":Backspace"
-Display 80,30 D63D8B6DE1DE6952E963A22DC53247B8 50,13
+Display 80,30 C78414C99BD66367DF42E4DD8D5AA2D4 51,14
 Key ":Backspace"
-Display 80,30 6B66521709A221E0CE14EF969C46A4DB 49,13
+Display 80,30 EFA4AE7BA114764B8905D9C8D76A14B6 50,14
 Key ":Enter"
 Display 80,30 3527F566C234E9DCBFEE76C17F412D0E 1,1
 Key ":A-x"
-Display 80,30 F87C36D1116E8153B6263478C3E684F8 26,13
+Display 80,30 65BB05910BA526420FEB2F1FEBA2E942 27,14
 Key "-g"
-Display 80,30 0A84826B26379943F423DE43A745F437 27,13
+Display 80,30 05644ABDF2B8C20E99BD79D6C100BB72 28,14
 Key "-r"
-Display 80,30 6D424C5075E390F503688874E4BDC069 28,13
+Display 80,30 794EBD2F0AB9FFE98F82285D78C75FC2 29,14
 Key "-e"
-Display 80,30 B1EF479BBD104FE23324A759AF07DFA9 29,13
+Display 80,30 9527D9ABA33AC99DC32D60B9492631A2 30,14
 Key "-p"
-Display 80,30 2D222FF66AEA2D4BD72DD073C6A31B3B 30,13
+Display 80,30 B3BF7F1B4AD0CC7B7EA7378E11207467 31,14
 Key ":Enter"
-Display 80,30 B56F87E0965AD89BBB49B9774D6DD07A 44,13
+Display 80,30 8193FA76A10810B5CCA74FC2A5CC4D62 45,14
 Key "-w"
-Display 80,30 DEA40B1E140B01CED175AC6DCB32892F 45,13
+Display 80,30 9D27B3DB49BD7B61DEA9B97A90FA7E87 46,14
 Key "-i"
-Display 80,30 D06A9CEE97FF5C5C2E0243CDF6AA1C04 46,13
+Display 80,30 DFCE0E4F8E1B0E79155ACF94EA8A20C4 47,14
 Key "-n"
-Display 80,30 5EEDC8346EB422083530DE84254F71CB 47,13
+Display 80,30 4F956D623A0861CA6B882BF530EB5B1B 48,14
 Key "-d"
-Display 80,30 8E97326EC56AF330E8707E8DA8625305 48,13
+Display 80,30 010DCD90EE19485E049961A2F8536E87 49,14
 Key "-o"
-Display 80,30 54C1D67379A462EF251DCB90258DBA2E 49,13
+Display 80,30 A069AC8B2A68AB69BFFD74250390CB5F 50,14
 Key "-w"
-Display 80,30 29033D70A9A8BBCD7EB75DF49790BB27 50,13
+Display 80,30 6C9DCE2C61C32C98B16A5FB5F329D38E 51,14
 Key "- "
-Display 80,30 29033D70A9A8BBCD7EB75DF49790BB27 51,13
+Display 80,30 6C9DCE2C61C32C98B16A5FB5F329D38E 52,14
 Key "-*"
-Display 80,30 2AAE382B216E25E4A268F9EA64C76D12 52,13
+Display 80,30 63F6E157178C5DF1C1C9B6FAF1D7A70A 53,14
 Key "-."
-Display 80,30 31084F2057083CA352163B9B265304E2 53,13
+Display 80,30 77D94690EF21A104BE4BB99D6C145F83 54,14
 Key "-c"
-Display 80,30 0DF02C2716EAF6BE3C0BC5953D249EE2 54,13
+Display 80,30 2BB048F1CADA2D697F8E9BD3964E2C5C 55,14
 Key ":Enter"
-Display 80,30 758EE820C91E1300C958C29EFC827962 11,10
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,10
+Display 80,30 F0DE3C9ED7C2737A9821CCC07AD89524 12,11
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,11
 Key ":C-N"
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,11
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,12
 Key ":C-N"
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,12
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,13
 Key ":C-N"
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,13
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,14
 Key ":C-N"
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,14
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,15
 Key ":C-N"
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,15
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,16
 Key ":C-N"
-Display 80,30 3F26641418797ABE90449E8B2761DC8A 11,16
+Display 80,30 92997C66E576253A0C80BD8FDEA4EE5E 12,17
 Key "-f"
-Display 80,30 BCF867E56762B25F8063EA5D717DA883 11,12
+Display 80,30 78B674604B555E388158CD8727EDC535 12,13
 Key ":C-V"
-Display 80,30 AA2F9479DE71D75D91A09A91A1A8DF52 11,7
+Display 80,30 143DA72FD4FC261359DBF1C7064E4DE8 12,8
 Key ":C-V"
-Display 80,30 1E66EACCFA54C567773279D577CED179 11,7
+Display 80,30 5EDB0933F2E3CC8FC78E6A336B8EBFC5 12,8
 Key ":C-V"
-Display 80,30 750E1F1A314AB4AD5DA9B538FAFA728F 11,7
+Display 80,30 A3D3338CBED7E648B25A4987761B96F3 12,8
 Key ":A-B"
 Display 80,30 3527F566C234E9DCBFEE76C17F412D0E 1,1
 Key ":C-X"
@@ -242,4 +242,4 @@ Key ":C-X"
 Display 80,30 1B93FE4A0F3F6D0DA9A9A7767239F356 1,6
 Key ":C-C"
 Display 80,30 B37B7E24D9F5A46FEB16A84E6714994B 1,6
-Close 904
+Close 905

diff --git a/tests.d/02-spell b/tests.d/02-spell
index de308f4c1e4af8e4e161ba409646a4ab5554f928..acb7a33e5d67b4ddb03427de2b49f25e621636a8 100644 (file)
--- a/tests.d/02-spell
+++ b/tests.d/02-spell
@@ -16,17 +16,17 @@ Display 80,30 41AC9C3CD03D07B52B6A3DA48C7AB730 1,8
 Key "-f"
 Display 80,30 B116277653C29D730B60D8C76FE09D5A 1,0
 Key ":A-x"
-Display 80,30 DFA7B186409B702BD0D9BC2B23FDD28F 26,13
+Display 80,30 B1ACC2C34A3E17A972E41795C801E18E 27,14
 Key "-a"
-Display 80,30 81E85939B675D01E58482D2E39BE1FB1 27,13
+Display 80,30 D2B7587AF57DD0125D0D9BA2BF0E7447 28,14
 Key "-u"
-Display 80,30 164C95D6ABD259EBBFCB61B79139FA36 28,13
+Display 80,30 ED6DDE8C7DB38E219ABE182BB7B4967D 29,14
 Key "-t"
-Display 80,30 9705189EC4A1C304E52496F9639AAE6F 29,13
+Display 80,30 011205C260E32100BE6EFAA9F1D0B455 30,14
 Key "-o"
-Display 80,30 190DC53F99C9EFB7171BFC24249A1BF8 30,13
+Display 80,30 768D62AF54BC224547F09865C361ECCF 31,14
 Key ":Tab"
-Display 80,30 34C813C546036FEC555F08134C506CDC 35,13
+Display 80,30 FF903E5A5BECDE10A8C5F0E6646681CE 36,14
 Key ":Enter"
 Display 80,30 0EB3DE2C84005009AB80CF9854D7D6E8 1,0
 Display 80,30 6ABEA8B275EC6D7B92488E21C9FB170D 1,0
@@ -254,5 +254,5 @@ Key ":C-X"
 Display 80,30 9AC2CD699B751F6C8D4F68C6CA5DBC72 23,19
 Display 80,30 9CE289F5C4929A417715FC8452DBAE82 23,19
 Key ":C-C"
-Display 80,30 E2A9E719B8A2DF4347D05357739C8527 21,8
+Display 80,30 4FDC5CAAA104633A69CEE2675A2A70BD 22,9
 Close 784