Don't show default wrap tail for requested wrap point.

Requested wrap points suggest wrap is expected, so don't show the
wrap tail.  I think it is ugly.

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

diff --git a/lib-renderline.c b/lib-renderline.c
index b6d21ce88079af965af6577b7e54bce88f365d32..5d76e04c93a5d41f53b665849cfc2abaeb9e1533 100644 (file)
--- a/lib-renderline.c
+++ b/lib-renderline.c
@@ -288,9 +288,10 @@ static int flush_line(struct pane *p safe, struct pane *focus safe, int dodraw,
        /* Draw the wrap-tail */
        if (wrap_pos && last_rl && dodraw) {
                char *e = get_last_attr(last_rl->attr, "wrap-tail");
-               home_call(focus, "Draw:text", p, -1, NULL, e ?: "\\",
-                         scale, NULL, "underline,fg:blue",
-                         wrap_pos, y + ascent);
+               if (e || !last_wrap)
+                       home_call(focus, "Draw:text", p, -1, NULL, e ?: "\\",
+                                 scale, NULL, "underline,fg:blue",
+                                 wrap_pos, y + ascent);
                free(e);
        }
 

diff --git a/tests.d/00-basic b/tests.d/00-basic
index 32da2b5a511c8aa2be52643737e159303151d277..02f837dd2129c50387c74d009ef28322075404ae 100644 (file)
--- a/tests.d/00-basic
+++ b/tests.d/00-basic
@@ -162,7 +162,7 @@ Display 80,30 52A1D57F778AF3B6D8401C75EFD32183 6,7
 Key ":A-0"
 Display 80,30 00BF59DCCD2402BDF95916B26B5F8C56 6,7
 Key ":C-V"
-Display 80,30 A2C7FD634D2C9707C11361499077BE86 6,0
+Display 80,30 952C030811426A107342D723274A6D8D 6,0
 Key ":A-<"
 Display 80,30 453755D55FC0151ED0852A2467A28FF4 1,0
 Key ":A->"
@@ -496,23 +496,23 @@ Display 80,30 D93F2373A7DF927C9EB3D262820B6AE7 39,12
 Key ":C-X"
 Display 80,30 1DDA3EB8BD545775122754FBB14890C3 39,12
 Key "-3"
-Display 80,30 58B79584895A22F7F6D2934365972CF3 1,22
+Display 80,30 CFA5451193DFC1577BCD5A44D2352FD5 1,22
 Key ":C-X"
-Display 80,30 03F2BF2B224BBADB9E75582C0E6AA757 1,22
+Display 80,30 CC99B3DB56A53019FA6FCAC63030980D 1,22
 Key "-2"
-Display 80,30 47EB4BA683EEB3DE68227C0ED37AFC36 1,6
+Display 80,30 D81F2C938FD0EAAE10B26D4019BAD9EA 1,6
 Key ":C-X"
-Display 80,30 1AD9BF42BFFD42D681A496C9DDB953C7 1,6
+Display 80,30 28AE72129103B1C0F7CD5792338B7877 1,6
 Key "-3"
-Display 80,30 D0B86C4C628747A9B094BD788ADA64E7 5,12
+Display 80,30 527B0C87BB47DF04505DE2168AB66B56 5,12
 Key ":C-X"
-Display 80,30 01CA85EACF31394601C1CAAE1E18F2B8 5,12
+Display 80,30 4E062FC31924BF613C116E9BDF558400 5,12
 Key "-1"
-Display 80,30 F8A3DAE457BDDA2A77CA2497866396C0 1,5
+Display 80,30 492579A17EB3AB136ED171A0B1F95294 1,5
 Key "-1"
-Display 80,30 AA7C15947078EAA89C0CBAB58A931FD5 1,5
+Display 80,30 AAC8757F1F89839D84651ABC5CE859FF 1,5
 Key ":C-X"
-Display 80,30 9E98619598E1956593E790204F1F985A 1,5
+Display 80,30 8A2FB14B047A45D03C0C6ADACF2BC3A1 1,5
 Key "-0"
 Display 80,30 A0D3F582FB0BC89B3E583EE79401D7E9 39,6
 Key ":C-P"

diff --git a/tests.d/00-mouse b/tests.d/00-mouse
index 83210f19d00b0fb904c6a7d1bf0cfe80a37a42f5..e91eadd28dfee7c598f6207b712365fcda612cf8 100644 (file)
--- a/tests.d/00-mouse
+++ b/tests.d/00-mouse
@@ -14,30 +14,30 @@ Display 80,30 077E6486B0B127020429FED219731B3A 51,13
 Key ":Tab"
 Display 80,30 6965F0AFBDA8866739BDD8FCC4A33960 50,13
 Key ":Enter"
-Display 80,30 B017465007BFB4F4DA973362D8FC0FD8 1,0
+Display 80,30 A60542A1F2191336E0748EFB88216098 1,0
 Mouse ":Press-1" 20,17
-Display 80,30 B10653B5C7CBC9275FF3B8C26B5BD83A 20,17
+Display 80,30 A607664894D4C946238A3D124C2C02A7 20,17
 Mouse ":Release-1" 20,17
 Mouse ":Press-1" 60,16
-Display 80,30 A45BFF448767139AB0CDFF4EE76F15C4 60,16
+Display 80,30 72DE50068EA7C425AC8D7F27DD5EA563 60,16
 Mouse ":Release-1" 60,16
 Key ":C-E"
-Display 80,30 A2EF28CA1589063F537DEA6553EBF139 76,16
+Display 80,30 BA6364B564EC18C74ABDB80134BBF0AA 76,16
 Mouse ":Press-1" 66,13
-Display 80,30 76BA3C5B083DE80129E1D72E52B9E2B3 66,13
+Display 80,30 112C87D80D8BAD23D8F6678908D3C00D 66,13
 Mouse ":Release-1" 66,13
 Mouse ":Press-1" 65,22
-Display 80,30 5A413D27D8CD7AABACA3278D54354013 65,22
+Display 80,30 3E0E3DFB99AB1D89D60CE2E7426C90C9 65,22
 Mouse ":Release-1" 65,22
 Mouse ":Press-1" 60,11
-Display 80,30 45A837A48E0E7247225714259D1EFEB5 60,11
+Display 80,30 27C121EBE21ABA8891DD8A7EB03B3529 60,11
 Mouse ":Release-1" 60,20
-Display 80,30 DC2DBB157C5F70CF7697A6DC9756A18A 60,20
+Display 80,30 4B1B08FE9B5C44FE4D4D39160C4E7355 60,20
 Mouse ":Press-1" 17,7
-Display 80,30 E2BACFD27BAA568D4EF2D374F67BEC7C 17,7
+Display 80,30 F37E12ABEE2F5197666B267CDE45E88D 17,7
 Mouse ":Release-1" 17,20
-Display 80,30 42DAE331969832A9C83007C5BC78AE92 17,20
+Display 80,30 DB275F76399C8920DC868E1293A49190 17,20
 Mouse ":Press-1" 8,4
-Display 80,30 3B1F9CE09ABC9D8E093A44FE2DA9717A 8,4
+Display 80,30 2426943EADD4EAB3792DC10C849EA4C4 8,4
 Mouse ":Release-1" 8,4
 Close 244

diff --git a/tests.d/01-textfill b/tests.d/01-textfill
index d48d7022c75adccf58f6a5c74255673037b8b096..8a5c03e97aa38a05a63747b4e13244d91ed0c9b2 100644 (file)
--- a/tests.d/01-textfill
+++ b/tests.d/01-textfill
@@ -38,9 +38,9 @@ Display 80,30 0BF8A3329820C0BABD0071D9106FA5F4 1,10
 Key ":C-E"
 Display 80,30 0BF8A3329820C0BABD0071D9106FA5F4 67,10
 Key ":C-D"
-Display 80,30 5A8AF2E739B6EBE13EA667E3BFD30F16 67,10
+Display 80,30 0EB974B845899B07E316B72DA8A9A7C2 67,10
 Key "- "
-Display 80,30 FC2F92E8CDAEA7859ECAD13E056B24B4 68,10
+Display 80,30 C162ED6AF8CC017A4BCAD2F53A1F9275 68,10
 Key ":A-q"
 Display 80,30 FA67B2D87113A78A2A78DD4874AAC023 1,11
 Key ":C-N"
@@ -50,29 +50,29 @@ Display 80,30 58B2E5FC79B802E33AFDF75116A5E4DD 1,13
 Key ":C-N"
 Display 80,30 B578FB4C292BB3C399992EC2E0965A09 1,14
 Key ":Backspace"
-Display 80,30 633E7BA68884133C320B3DA4596F70BC 69,13
+Display 80,30 FD4E06BFE6CDE70D7C46DB0220B4CF76 69,13
 Key "- "
-Display 80,30 A71A233863D815EFEB18F14394A3967D 1,14
+Display 80,30 196C3E7351561901F28CBDC7DF45687E 1,14
 Key ":C-N"
-Display 80,30 186CA8BA00775667310AAFF585180DCE 1,15
+Display 80,30 B055B23428B4AC5B0357DABB297F4339 1,15
 Key ":C-D"
-Display 80,30 80EBDEE773D761CAF9FF9AEC7282BF87 1,15
+Display 80,30 80582183AA9037B111A6B0AB98556D9A 1,15
 Key "- "
-Display 80,30 91ED66A7B48A88805DED0CFEF6B5594D 2,15
+Display 80,30 18A39A95F40CFF85560046443D3B3BC6 2,15
 Key ":C-N"
-Display 80,30 87DD162C1667791E59E16DEF7773225E 2,16
+Display 80,30 3B31660B88F9BFFB5EA7734EE1A19AD6 2,16
 Key ":C-F"
-Display 80,30 87DD162C1667791E59E16DEF7773225E 3,16
+Display 80,30 3B31660B88F9BFFB5EA7734EE1A19AD6 3,16
 Key ":C-P"
-Display 80,30 91ED66A7B48A88805DED0CFEF6B5594D 3,15
+Display 80,30 18A39A95F40CFF85560046443D3B3BC6 3,15
 Key ":C-P"
-Display 80,30 6451CE9EA4179FFA6008123D6ED05382 3,13
+Display 80,30 A2C9862B0385D55D7C13DBE87BB0E625 3,13
 Key ":C-E"
-Display 80,30 6451CE9EA4179FFA6008123D6ED05382 70,14
+Display 80,30 A2C9862B0385D55D7C13DBE87BB0E625 70,14
 Key ":C-D"
-Display 80,30 684AA30495C3F8F316DA6DBC85AE60A6 70,14
+Display 80,30 CB3DFEC69DAE0BE3BCC6EC7B296CB7CD 70,14
 Key "- "
-Display 80,30 60E419782F256F529FF80895C8895D65 71,14
+Display 80,30 D06FD759C811DEE78E89CAD2016C6C0E 71,14
 Key ":A-q"
 Display 80,30 40B143D919E0708D3C48DA445B146889 1,15
 Key ":A-3"
@@ -164,31 +164,31 @@ Display 80,30 39B3DFF74C22524EBF0D4B2C112BA090 6,17
 Key ":C-E"
 Display 80,30 39B3DFF74C22524EBF0D4B2C112BA090 59,17
 Key ":C-D"
-Display 80,30 80649262D0C5B02D7602982B0AE542AD 59,17
+Display 80,30 35A4C78D76F13D6DA74480FEA26A68EE 59,17
 Key "- "
-Display 80,30 13B8068C3A5AC90BF5CA13D4B5B5DA48 60,17
+Display 80,30 265D033819BF84302A425F2F97133F59 60,17
 Key ":C-E"
-Display 80,30 13B8068C3A5AC90BF5CA13D4B5B5DA48 41,18
+Display 80,30 265D033819BF84302A425F2F97133F59 41,18
 Key ":C-D"
-Display 80,30 8D09DBFDD39E8B9573DC27783C11EA3E 41,18
+Display 80,30 7003C48D0B7AC03F0F74C6B4C7284F45 41,18
 Key ":C-E"
-Display 80,30 8D09DBFDD39E8B9573DC27783C11EA3E 22,19
+Display 80,30 7003C48D0B7AC03F0F74C6B4C7284F45 22,19
 Key ":C-D"
-Display 80,30 BCFAA13EC48571B3243E427A5F3B14E6 22,19
+Display 80,30 E5D3E56CA45CFECC0C248B29B0D4E40B 22,19
 Key ":C-E"
-Display 80,30 BCFAA13EC48571B3243E427A5F3B14E6 68,19
+Display 80,30 E5D3E56CA45CFECC0C248B29B0D4E40B 68,19
 Key ":C-D"
-Display 80,30 A486F41ECE3E7B45A39CBEF4F3F3CBF5 68,19
+Display 80,30 31A1F8F1454768FD2A0EBBA00DA61CA8 68,19
 Key ":C-E"
-Display 80,30 A486F41ECE3E7B45A39CBEF4F3F3CBF5 68,19
+Display 80,30 31A1F8F1454768FD2A0EBBA00DA61CA8 68,19
 Key ":C-D"
-Display 80,30 AF0494DB61C25BE52AC5D33DEF441581 68,19
+Display 80,30 6660834499503B2B95F2ED20EE43F9C7 68,19
 Key ":C-E"
-Display 80,30 AF0494DB61C25BE52AC5D33DEF441581 59,20
+Display 80,30 6660834499503B2B95F2ED20EE43F9C7 59,20
 Key ":C-D"
-Display 80,30 2BC65AF337F72FD96CEAAE4BD1547A28 59,20
+Display 80,30 4C12D3DF995794AC88DC2B7DC7944D31 59,20
 Key ":C-E"
-Display 80,30 2BC65AF337F72FD96CEAAE4BD1547A28 48,21
+Display 80,30 4C12D3DF995794AC88DC2B7DC7944D31 48,21
 Key "- "
 Display 80,30 C53FF098F31AA5E8781D1B7B4C73972D 19,23
 Key ":A-x"
@@ -271,11 +271,11 @@ Display 80,30 C636FEF7811F136DB3D5B6E8AE71E9C1 3,21
 Key ":C-E"
 Display 80,30 C636FEF7811F136DB3D5B6E8AE71E9C1 47,21
 Key ":C-D"
-Display 80,30 C7450EFFA465319F02C0E53FD4E697A2 47,21
+Display 80,30 CA01987DA6372D00B55E5766F9B5FA56 47,21
 Key "- "
-Display 80,30 2B9369E5F18A1C0D70E193F4A6F1A8A4 48,21
+Display 80,30 B5903238CC224D95A27DDBFDEFBCA0BB 48,21
 Key ":C-E"
-Display 80,30 2B9369E5F18A1C0D70E193F4A6F1A8A4 32,22
+Display 80,30 B5903238CC224D95A27DDBFDEFBCA0BB 32,22
 Key "- "
 Display 80,30 74ABDDE9FF0C8D3B46E03346D60BF1B3 62,22
 Key ":Backspace"

diff --git a/tests.d/02-diff b/tests.d/02-diff
index 904ab27defca36b12a85ac44fbb4bf52eaa40571..998435f39520bd8d4102ee788a1c223eb5435f56 100644 (file)
--- a/tests.d/02-diff
+++ b/tests.d/02-diff
@@ -36,31 +36,31 @@ Display 80,30 A4B058EEBDDC417E4E684B935EB66A11 1,16
 Key ":C-N"
 Display 80,30 E04A353BD607ADD6295CFC92EEA60FEA 1,18
 Key ":Enter"
-Display 80,30 BA18E8DFC0889E15672B877DC9F118F8 1,6
+Display 80,30 6140B15CD5CB308C28412F460F1C0CAC 1,6
 Key ":C-L"
-Display 80,30 BA18E8DFC0889E15672B877DC9F118F8 1,6
+Display 80,30 6140B15CD5CB308C28412F460F1C0CAC 1,6
 Key ":C-X"
-Display 80,30 A0878B0A95EE7145C0AD480B9F439EEE 1,6
+Display 80,30 5B30B3E92B0CB93A6D503C7E0BF3A2FB 1,6
 Key "-o"
-Display 80,30 BA18E8DFC0889E15672B877DC9F118F8 1,18
+Display 80,30 6140B15CD5CB308C28412F460F1C0CAC 1,18
 Key ":C-V"
-Display 80,30 9091927D9DF03A168731098FA76662E5 1,15
+Display 80,30 801C0EBB6D8617C5B97E2FCD395C654A 1,15
 Key ":C-N"
-Display 80,30 40F2AF0C8A34E5DF00348B90D3FBFCFC 1,16
+Display 80,30 08D0422B041E1E165B033A8906B2C749 1,16
 Key ":C-N"
-Display 80,30 C2AC7A3907CAB4B8C0CCA61029D80F90 1,17
+Display 80,30 CC4389F468B987D5AD6A0AFA3D03DB17 1,17
 Key ":C-N"
-Display 80,30 84F38643BEF6A5B25EEC2B7561AA24BF 1,18
+Display 80,30 7F650B8BC838824EC46F21273962B809 1,18
 Key ":C-N"
-Display 80,30 7504EF58E12624F70D7E61A6CF3E5183 1,19
+Display 80,30 7DBE9A1BFDFF287524FF619300135FB2 1,19
 Key ":C-N"
-Display 80,30 44593182A6950A6594DAE274F54D440C 1,20
+Display 80,30 3B687E156BAA679947AD7669EEA16018 1,20
 Key ":C-N"
-Display 80,30 E8D7F945C52B47F03913D384B9203A81 1,21
+Display 80,30 58C9727E62827A90F994A02A71CC3765 1,21
 Key ":C-N"
-Display 80,30 4021929E46848034887F7B51034BB70E 1,22
+Display 80,30 68D344D20D7E9EAC227EE7FF3318F9F0 1,22
 Key ":C-N"
-Display 80,30 F81AF935BE742D024767F40CB31A9423 1,23
+Display 80,30 24E6CE1BC671173EB205DA1B36D3B41F 1,23
 Key ":Enter"
 Display 80,30 24CF3DE9EA6B46B61D0C09F6319CDF95 1,6
 Key ":C-X"

diff --git a/tests.d/02-grep b/tests.d/02-grep
index 7b4c3b398bc7601cbc7fe719a203d304b759cdf8..196bea7fd8cb4c099de67ebd0fe0bee252ba06ce 100644 (file)
--- a/tests.d/02-grep
+++ b/tests.d/02-grep
@@ -84,11 +84,11 @@ Display 80,30 D47F384C4EE423774166414B7C928D6A 1,7
 Key "-`"
 Display 80,30 93B17AFD6CA4A10F46F8930D9DFF2A46 1,9
 Key "-`"
-Display 80,30 C4558E086434B6CEA6F28EC38DC0ECD0 1,6
+Display 80,30 E64F345489DCDE5EA79C7E87C856A09A 1,6
 Key ":A-0"
-Display 80,30 F3D5D6A5E0A5D5975ECB6E7F00917039 1,6
+Display 80,30 E0C30AC755A622C14348536DFE5C87B4 1,6
 Key ":C-X"
-Display 80,30 2D8E0ECD65429DDDA3F1C8A49A73E1D8 1,6
+Display 80,30 87A5A21917937EBFA25061A650D95EB8 1,6
 Key "-`"
 Display 80,30 1A4BDA70365FA2BE77204B4D3C5A71FD 1,1
 Key "-`"
@@ -160,7 +160,6 @@ Display 80,30 D4C9EF28C1BC7C6B7B65CCDCAF516479 53,13
 Key "-c"
 Display 80,30 319AF12A183FDD7D5B4FC0C6E218D1CA 54,13
 Key ":Enter"
-Display 80,30 D24CF94877A55DB6B922A31361C6AA7A 11,10
 Display 80,30 C1BCF5F3004964015667E6B86738CFD9 11,10
 Key ":C-N"
 Display 80,30 C1BCF5F3004964015667E6B86738CFD9 11,11
@@ -175,61 +174,61 @@ Display 80,30 C1BCF5F3004964015667E6B86738CFD9 11,15
 Key ":C-N"
 Display 80,30 C1BCF5F3004964015667E6B86738CFD9 11,16
 Key "-f"
-Display 80,30 0662203642222B15195944D33E42B0CB 11,12
+Display 80,30 EB33B46161DDC5A9F8426ABCD7978EA8 11,12
 Key ":C-V"
-Display 80,30 7542B2673CB816613E5AFA3EFF7E8680 11,7
+Display 80,30 84FB907CBEEC587399521E805F3120F7 11,7
 Key ":C-V"
-Display 80,30 EF9D9BE6379CA61FFF5700271DCB6BB4 11,7
+Display 80,30 19E8D6850F361BF69FD15E391E7B3024 11,7
 Key ":C-V"
-Display 80,30 61721B5272A51EDF6B45450D660374EB 11,7
+Display 80,30 A2AC85E39B28DB2C07C6370AA0C1057B 11,7
 Key ":A-B"
 Display 80,30 AECF9530714EDA1396E5EE297A285515 1,1
 Key ":C-X"
 Display 80,30 ED0B24C0BE5F7005C9F3E8287F13E4B1 1,1
 Key "-`"
-Display 80,30 8557455273011DFCCAB6707018F20080 1,6
+Display 80,30 579489B82E46EC53B78647FF7CD9AC82 1,6
 Key "-`"
-Display 80,30 9554D9EB1BFDBAB109AD1EB8A52410F0 1,6
+Display 80,30 92D21D194A19E86D71EB2328034DB6E9 1,6
 Key "-`"
-Display 80,30 87AE6B35ED6379123760062801456E69 1,6
+Display 80,30 965951B80460C159F854AF8C8CA5D369 1,6
 Key ":C-X"
-Display 80,30 1B93FE4A0F3F6D0DA9A9A7767239F356 1,6
+Display 80,30 24184DE29BD90EFD76F70D68A5DC8887 1,6
 Key "-o"
-Display 80,30 010E4E8994BB534A4F27DD543E023E74 1,23
+Display 80,30 BE1746D532C5988615F69BA70F7328BC 1,23
 Key ":A->"
-Display 80,30 9A15E3055B548090C98D2000DAFF99D7 1,26
+Display 80,30 A64F6639801C693DA91DAF5F7C843492 1,26
 Key ":C-P"
-Display 80,30 6E9EE5792E5C449FED0928C36D76CEEF 1,25
+Display 80,30 4DD346949A2DFB5B2A7289AAE644A1FD 1,25
 Key ":C-P"
-Display 80,30 139545FE550D60719A018A39D8CA8D6B 1,24
+Display 80,30 AD6DE94C2BE4E57B01EB96CAAA1B79EC 1,24
 Key ":C-P"
-Display 80,30 C6295F2236324A003C13D099545E1A6E 1,22
+Display 80,30 C928A00DFB3153F96D5F7B139335F5CE 1,22
 Key ":C-P"
-Display 80,30 0511BEC973B20E70100A487F75C49940 1,20
+Display 80,30 87C8F092EB42AA7DAB85C5BC60B179D5 1,20
 Key ":C-P"
-Display 80,30 19AAD8F2704882304093F1C1C66B64D8 1,18
+Display 80,30 AAFA2480AB96B8539C2ACCA95B2F389A 1,18
 Key ":Enter"
-Display 80,30 042FDC43469CEB44CEA2FE0BBEF312FC 1,6
+Display 80,30 ED6F4ACF7E4F1D380D05787A22FF0E71 1,6
 Key ":C-X"
-Display 80,30 3B1975D517BE71FA5D8846D4B8ACFD00 1,6
+Display 80,30 26956957B7F94DAC1AF0042BC3BF502C 1,6
 Key "-`"
-Display 80,30 1D0ECC4EEEB7CA4E0A2B6C80CE787EE9 1,7
+Display 80,30 C83C39892998D168F9EC73F0506171F2 1,6
 Key "-`"
-Display 80,30 F5AA3022E69EE65627109416A4153F8C 1,6
+Display 80,30 1DE4B8F55F152356A04BA6C05CECFF5E 1,6
 Key "-`"
-Display 80,30 0038D3EA200706CBE2B8F7E35E0247D6 1,7
+Display 80,30 51CE6EF89B87FD0F4811F700F3C7BAA8 1,6
 Key ":C-X"
-Display 80,30 DD0B850460093327B7F2F877E46EA378 1,7
+Display 80,30 48663F3E5BEDD33BB8256A5E5ABEC4EC 1,6
 Key "-`"
-Display 80,30 9BFCD6FB7DDEEB9FF736EEE48A983DF2 1,6
+Display 80,30 EE46801C68531B915055392CCFC82DB4 1,8
 Key "-`"
-Display 80,30 5BC5B368B3E25A73BE8F8D595D61AEE6 1,6
+Display 80,30 26C59F5A375274F0F241A27884852B9B 1,8
 Key "-`"
-Display 80,30 833C0953C1A07AB120C791119694A956 1,6
+Display 80,30 ED4241080236CCCE97E22BBF878A7775 1,9
 Key ":A-0"
-Display 80,30 D2C4EC51CA2F4603BF5077E49BB9E062 1,6
+Display 80,30 94DF2463FE2438B36DD9E2F3514ABCBD 1,9
 Key ":C-X"
-Display 80,30 F7F97F692331C536CBE72D9B591B3029 1,6
+Display 80,30 B5607D0A0B2B4B309938AE2D541D343C 1,9
 Key "-`"
 Display 80,30 DF026DBC4E8B692B626AB5D9364E8DD1 1,6
 Key "-`"
@@ -242,4 +241,4 @@ Key ":C-X"
 Display 80,30 1B93FE4A0F3F6D0DA9A9A7767239F356 1,6
 Key ":C-C"
 Display 80,30 010E4E8994BB534A4F27DD543E023E74 1,6
-Close 905
+Close 916

diff --git a/tests.d/02-presenter b/tests.d/02-presenter
index c978f4049f0230c08b47ec721d095ae74a9059df..165a5593ad7d69ed3b6975c01e97e97d9f52e03c 100644 (file)
--- a/tests.d/02-presenter
+++ b/tests.d/02-presenter
@@ -80,145 +80,145 @@ Display 80,30 38904519220E482D823ABC7FFCE2FA60 41,16
 Key ":C-E"
 Display 80,30 2750A812B32CB2262D142E6ED4BCC20D 73,16
 Key ":Enter"
-Display 80,30 183251B8F73A0DFDF6AE47B10E37533F 41,0
+Display 80,30 169AF3F85B3D77D5C3966CB0146EEB4E 41,0
 Key ":C-N"
-Display 80,30 F4325A4DC467A4399B17EFB6BBC6EA62 41,2
+Display 80,30 1688989AA324010C8ED76718D54BD4DA 41,2
 Key ":C-N"
-Display 80,30 C20DB640704E8EC26D7FD92571633613 41,3
+Display 80,30 5EADF2265F8A7946837B696EA0CA45CC 41,3
 Key ":A-f"
-Display 80,30 C20DB640704E8EC26D7FD92571633613 52,3
+Display 80,30 5EADF2265F8A7946837B696EA0CA45CC 52,3
 Key "-:"
-Display 80,30 8B2D7176CC606FCA9FB89AD41148A3BF 53,3
+Display 80,30 D2BD81D81B3578F5C0B78C41E294143A 53,3
 Key "-c"
-Display 80,30 2D3153FAF4E9C11E72EBD907D3D75787 54,3
+Display 80,30 DB661C9A10FA672BB4ACEB886A7B2F6F 54,3
 Key "-o"
-Display 80,30 C08ED466644DF8C76127D4F515B02AAB 55,3
+Display 80,30 57568FFC2C8B5F26DD1372F056566308 55,3
 Key "-l"
-Display 80,30 18AD9F5F722FA31AD1F5735DD88AB33B 56,3
+Display 80,30 1E2B4BC23E30EA7D50C22E0DF552FC4A 56,3
 Key "-o"
-Display 80,30 DA952292D2343EA0A6180C7757A7CAF3 57,3
+Display 80,30 7C45ACA2C2C8958CD513CAB00155F349 57,3
 Key "-r"
-Display 80,30 764FD031E33B554BAE8D5AAE8F265555 58,3
+Display 80,30 607C1340FDD1B8887CAC8F5A5A6E0BD6 58,3
 Key "-:"
-Display 80,30 FF8BDB9D33EF8B7A2E1B2A3907FD7212 59,3
+Display 80,30 16AF3BE1D4CAD19DA6A30280490B4B4F 59,3
 Key "-#"
-Display 80,30 300AB5734FAC8AF8809285DD69777B86 60,3
+Display 80,30 50F0E2F35B27741310DDB11BA5512C41 60,3
 Key "-b"
-Display 80,30 204100FD6B739C722D241D4C31801720 61,3
+Display 80,30 A7D3F927F3714CDF5477EA9646C89F6B 61,3
 Key "-8"
-Display 80,30 BE8B1EDA2E205E6E0E30FB3AE5679E7B 62,3
+Display 80,30 61418F649FCCE9AF64785D8A682B96F1 62,3
 Key "-c"
-Display 80,30 42290514377A7B10134F5F4FE3F0B533 63,3
+Display 80,30 BCDD22D6A74795920DFDF7E0ADADE0B5 63,3
 Key "-5"
-Display 80,30 E7E7FB085F41E85C5227FD5B7F3F7F8C 64,3
+Display 80,30 C7B712053EF29A9AA7BD2DC96F2FA949 64,3
 Key "-c"
-Display 80,30 17BB48D1497C272578E57F5919EA07C4 65,3
+Display 80,30 F0CAF37C3641A97B6327A6575F192150 65,3
 Key "-d"
-Display 80,30 A4E1C61D12F2EC8455091DE438A54583 66,3
+Display 80,30 90EEE67DF6485944647E962F20C25320 66,3
 Key "-,"
-Display 80,30 1D18BA20EA3669FE5ABA4E0B78D91F21 67,3
+Display 80,30 ADF628B0AF84FFC8EDC23C8C078EEDAB 67,3
 Key ":C-D"
-Display 80,30 6ACC8D586D35B2467D729469E9F39AA4 67,3
+Display 80,30 729D087C6AFC41B71CEE7FA8AE7A4E86 67,3
 Key ":A-<"
-Display 80,30 89C21EAE04BA302CEBB24E2C6B29DE0E 41,0
+Display 80,30 B8D31642230668A66C0D003BE28AEE7C 41,0
 Key ":C-X"
-Display 80,30 A8F9FE1748773196443483354983CF1D 41,0
+Display 80,30 CCD9D115B338052A87EC792B4A7DF9AA 41,0
 Key ":C-S"
-Display 80,30 E22BC16BF218ADC2140C50BB32B2098F 41,0
+Display 80,30 32AAA2452953CA412B6C501C049F17A9 41,0
 Key ":C-V"
-Display 80,30 B8DA1B8FA6A191D7B1C0E2A2AE2D7936 41,14
+Display 80,30 019D8BF836585CD5398BD937E2CD8191 41,14
 Key ":C-V"
-Display 80,30 E905CE17C4D788B39B9AA7B67D08E749 41,23
+Display 80,30 D61C8424B0925550B189D38784211E3F 41,23
 Key ":C-V"
-Display 80,30 CFCAF6A0188438010264FBA925589B84 41,23
+Display 80,30 DCB63C9A886D9E8D4C16262DDEF4D9B5 41,23
 Key ":C-V"
-Display 80,30 E0A69C1E363A1D8CF0CE1AA05735C481 41,19
+Display 80,30 B7AA296E819EA76D71CF7F53390A2A2E 41,19
 Key ":C-V"
-Display 80,30 E5E5878F3C35BBC0FFA401E21CCA6ABD 41,25
+Display 80,30 044180CC92EE2BE0BC334923A47B60A1 41,25
 Key ":C-V"
-Display 80,30 DF03F982239B244DF7B5FB10905285B4 41,19
+Display 80,30 3A947DFE99802DE31303D714138CCB9A 41,19
 Key ":C-V"
-Display 80,30 55E7EC6F1D0014C43AAB7828596A1BB8 41,25
+Display 80,30 D209BFA807C99C27DD22EACFA230EB61 41,25
 Key ":C-V"
-Display 80,30 9ECA7E35D33B134B88EDAAA3A8338023 41,22
+Display 80,30 8EA6354A53E833E2FC0B0A9719522879 41,22
 Key ":C-V"
-Display 80,30 F8A564286C888DC61BC395F62DB042EB 41,20
+Display 80,30 8D4FD726FC8A4BBF7FAD0397B76D05F9 41,20
 Key ":C-V"
-Display 80,30 FFCA69CDF55210CC65B619E899D1C5BF 41,27
+Display 80,30 BC2D091735C45F3E2FB45E6808629FBC 41,27
 Key ":A-v"
-Display 80,30 9589B1C03AA99BF093F1EDEEEC0D9ABF 41,19
+Display 80,30 ED5FA2B98E6E3BE322454142293FE9A1 41,19
 Key ":A-v"
-Display 80,30 A19BD46360452DC4F76D6AB759BAA183 41,4
+Display 80,30 80997D662EDCAACA56C9AF69C20F48CB 41,4
 Key ":A-v"
-Display 80,30 C799603795FEB053D3ADC12DD1670719 41,2
+Display 80,30 D5FB680529E4DE67D70CB02C3B0440AB 41,2
 Key ":A-v"
-Display 80,30 5E53C13757151F7B0DCCB45C6C65C374 41,5
+Display 80,30 3A0112A98E12D76C49F9B459ED4FBAE9 41,5
 Key ":C-X"
-Display 80,30 60C41C8C1C19F65E250F30793DF7BE17 41,5
+Display 80,30 3651901A240E3BB920270281A82A009D 41,5
 Key "-o"
-Display 80,30 5E53C13757151F7B0DCCB45C6C65C374 41,5
+Display 80,30 3A0112A98E12D76C49F9B459ED4FBAE9 41,5
 Key "- "
-Display 80,30 BE242D1AD3966DCC594BF09FB6C6AC3F 41,5
+Display 80,30 39CF8614D9BFDA2386C9D2E86EEE0BB7 41,5
 Key "- "
-Display 80,30 77E4F3B07E5BF0DE43D08BBC43983FC5 41,5
+Display 80,30 798269E4D2AAF8CC2996BF61B7206388 41,5
 Key ":Backspace"
-Display 80,30 0394E773581B005B412623487DBED1CA 41,5
+Display 80,30 7D8B4D07E2709C799767155BB5F189FF 41,5
 Key ":Backspace"
-Display 80,30 8293453FEEFEC39F2609467FDB1F8A86 41,5
+Display 80,30 A086D32E3AB9E2399BFD97012DB16C64 41,5
 Key ":C-X"
-Display 80,30 241A0290B2D28847D8FD0C4374FB0439 41,5
+Display 80,30 AFFB64D02C7136F9F3728A2AE35F82B9 41,5
 Key "-o"
-Display 80,30 8293453FEEFEC39F2609467FDB1F8A86 41,5
+Display 80,30 A086D32E3AB9E2399BFD97012DB16C64 41,5
 Key ":A-<"
-Display 80,30 4D5BD5CA030420B0C03E4AEB2A087D49 41,0
+Display 80,30 9F3C9AC6499FD19BB195983AC6CA2B4F 41,0
 Key ":C-V"
-Display 80,30 E5494D4195B5E7768B07ABCB4A6B7B2C 41,14
+Display 80,30 2DED91DEFFD61CEE7E46251897907FC5 41,14
 Key ":C-V"
-Display 80,30 4C60D23127D60AFD33E6CCA9AD6C08B4 41,23
+Display 80,30 BB206E588E063AE04E0D70657BF6BE59 41,23
 Key ":C-S"
-Display 80,30 48F7A6982486FED01EB8B03A566885FA 70,0
+Display 80,30 93CA8A379666D4F6F792E1BDD134C4C4 70,0
 Key "-e"
-Display 80,30 CBE435BECE06630204B60CA6896A256F 71,0
-Display 80,30 DA0F9AD3C4CA8617D1808999DA982174 71,0
+Display 80,30 12B94C733C2FA425715413234E25A283 71,0
+Display 80,30 CA1B8E3C4CD1729DB7C76DF3F69AD69B 71,0
 Key "-m"
-Display 80,30 F56E5497DFF9A15BADE63967D3004549 72,0
+Display 80,30 8885ADEACA6C80F1ADBE221161451DED 72,0
 Key "-p"
-Display 80,30 0FA7BBD7AD9066D21A121BF5CA6A8495 73,0
-Display 80,30 F400A462CAFE1F98A71B6DAEE37D5C97 73,0
+Display 80,30 87FECE28B683D9DAADF995B0B19012F4 73,0
+Display 80,30 BDFCEFA26188F9B16767B9437CE776A3 73,0
 Key ":Enter"
-Display 80,30 4CF7DE0DD7953C9AED0FA60AD5DDD452 52,13
+Display 80,30 0C3ED5BC773523DDCF0E465D3C04D4FB 52,13
 Key ":C-L"
-Display 80,30 8C3B213D5E735688954A1D7E892D455B 52,13
+Display 80,30 676A348D70F6D824892DE9D2B7CC07AC 52,13
 Key ":C-S"
-Display 80,30 C0AA797FCBA090AEFE319121E48DC4FF 70,0
+Display 80,30 FB733176BEC6F026B5BCBA70218C09B8 70,0
 Key ":C-S"
-Display 80,30 11BE7B1564B49DB82DEF471A748D8CC3 73,0
-Display 80,30 946A70D1A612F639F60152615E722923 73,0
+Display 80,30 28D3AE8B50C3255C3D39519F8BEF2865 73,0
+Display 80,30 633316645A29F653C59FE6BD61A1C7B6 73,0
 Key ":C-S"
-Display 80,30 89B10899115F16CAFC0D5B8E69B54EB0 72,0
-Display 80,30 C9D6282555D99B0A5D8F0DAA5FE4AA4A 72,0
+Display 80,30 9DD2BDBFDFD3A8FD0789E20DDCC7EF74 72,0
+Display 80,30 E9F80B778A15CB6C731BD8EE487A9E93 72,0
 Key ":Enter"
-Display 80,30 E19B9CF9BCAEA829CFF96E0D3FC9577E 52,21
+Display 80,30 4F5BC341507676A911121A5DBF673CDF 52,21
 Key ":C-V"
-Display 80,30 ED2E295E6E117CABD58C5B4326A43983 41,25
+Display 80,30 159350C231134A892A43CE63F288E9E8 41,25
 Key ":C-V"
-Display 80,30 3D925A69F8AB928F3A25928154812E1A 41,20
+Display 80,30 A7E3B6AABA871694F10193A4598CDD75 41,20
 Key ":A->"
-Display 80,30 2395F82FA62C2F0EA7BACB1CD10EB75A 41,25
+Display 80,30 053694614D5402063B088DFE74620098 41,25
 Key ":C-L"
-Display 80,30 8E9C0BB1F594CB325AE7083ADB09DCF5 41,25
+Display 80,30 F4C8ADF3A0E2035BB83BD15F7D2DE543 41,25
 Key ":A-v"
-Display 80,30 1D01CD6F5882A920FA950B64648868B1 41,2
+Display 80,30 E9825F2F17E0834A2257B4E25CE1A4B5 41,2
 Key ":C-P"
-Display 80,30 0AEE37672B46ACD5B40CF7858A4AC027 41,1
+Display 80,30 3EAA603478A6FBB6CB6570839BEC1AC1 41,1
 Key ":C-P"
-Display 80,30 43AAFD0E7799B8A170552941FCFFC6FA 41,0
+Display 80,30 A0B1F880FFDEFDD87342D98E462BE6BB 41,0
 Key ":C-P"
-Display 80,30 F6421EC5A0230B9D2706E9A9324138E7 41,0
+Display 80,30 579ECEF8E956CDBC514C1FB8C779C8A3 41,0
 Key ":C-L"
-Display 80,30 E06AC9F8F2EA60832BA8836A50F73E38 41,13
+Display 80,30 A5761A2442CE65D96C51996692DB6EEE 41,13
 Key ":C-X"
-Display 80,30 C156F7FC2572C323B0D970CA630466D3 41,13
+Display 80,30 136AE3FD2089F71E23116BE983A85809 41,13
 Key ":C-C"
-Display 80,30 D838FFA6D857EE40B7D77FBEBEC3CE8D 41,13
+Display 80,30 748340AC4DCFE9D3B620E7E1B59586F0 41,13
 Close 1440