From e20c9e2491089e2678a7ce957d3e664c7a550f7d Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 11 Aug 2023 15:51:03 +1000 Subject: [PATCH] renderline - fix margin for tab. For some strange reason, tabs were wrapping before other chars. Signed-off-by: NeilBrown --- lib-renderline.c | 2 +- tests.d/01-c-mode | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib-renderline.c b/lib-renderline.c index 5d76e04c..878147b3 100644 --- a/lib-renderline.c +++ b/lib-renderline.c @@ -987,7 +987,7 @@ DEF_CMD(renderline) in_lws = True; ret = draw_some(p, focus, &rlst, &x, start, &line, buf_final(&attr), in_lws, - wrap ? mwidth*2: 0, + wrap ? mwidth: 0, offset == (start - line_start) ? in_tab : -1, posx, scale); diff --git a/tests.d/01-c-mode b/tests.d/01-c-mode index d8bb4d8a..a0e55dec 100644 --- a/tests.d/01-c-mode +++ b/tests.d/01-c-mode @@ -226,39 +226,39 @@ Display 80,30 8ABA1AF14A90A128D37AB554B681FF8D 64,14 Key ":C-E" Display 80,30 8ABA1AF14A90A128D37AB554B681FF8D 73,14 Key ":C-D" -Display 80,30 6D86A6752BC3494B0DE947473BBC502D 73,14 +Display 80,30 1A570C0C1289AF18529DCD6FB8F07EFE 73,14 Key ":C-P" -Display 80,30 66472F80C89049DC6CD0ADCDC0787E57 33,13 +Display 80,30 A4573DA68CDF0840B8A6C3ADD61F7A62 33,13 Key ":C-N" -Display 80,30 6D86A6752BC3494B0DE947473BBC502D 73,14 +Display 80,30 1A570C0C1289AF18529DCD6FB8F07EFE 73,14 Key "- " -Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 74,14 +Display 80,30 E02A1646D871909B640E46FB261F0360 74,14 Key ":C-F" -Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 4,15 +Display 80,30 E02A1646D871909B640E46FB261F0360 3,15 Key ":C-F" -Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 12,15 +Display 80,30 E02A1646D871909B640E46FB261F0360 11,15 Key ":C-B" -Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 4,15 +Display 80,30 E02A1646D871909B640E46FB261F0360 3,15 Key "- " -Display 80,30 CC5E42A09F80913AE3A2CAAC8E542DD9 5,15 +Display 80,30 E02A1646D871909B640E46FB261F0360 4,15 Key ":C-N" -Display 80,30 28341A08AF53AD3377796BC52E331AA6 1,16 +Display 80,30 AD183CFA711231A2C2F5E7C36396F82B 1,16 Key ":C-X" -Display 80,30 FACAEF1EF75F5D52F48EFD8A5EEFABA7 1,16 +Display 80,30 7C314DBBCD68C1BCC7CDD6975056C58D 1,16 Key ":C-F" -Display 80,30 0A7D70868D2023F9E82FD15EC84564AD 49,13 +Display 80,30 77BA714E34F822AAC75D34CC61A5D81A 49,13 Key "-c" -Display 80,30 7A2D1292C66C3B5E247123C95116420E 50,13 +Display 80,30 B926AE8EB9DAE16E611AF1A8CE72482A 50,13 Key "-o" -Display 80,30 8B529AFA892F47B9D7EE9A572A7D1EB3 51,13 +Display 80,30 CBC1D70071461A4B1CD832D7E389FA8F 51,13 Key "-r" -Display 80,30 D4D9546CAC569BF84827A3A1E35A338C 52,13 +Display 80,30 E735324C5753F7EE37A5ECDA542F5015 52,13 Key "-e" -Display 80,30 32BD8BCDF3303948163A031EB2CFFC46 53,13 +Display 80,30 47C06D9B06A1E57E4B96C8443E7EA82A 53,13 Key "-." -Display 80,30 0C495315E0AC3BCC109E4F1BCC98EC12 54,13 +Display 80,30 D1B729270F9270188E33D3D9C7BD9FF0 54,13 Key "-h" -Display 80,30 86F9C2B5557D639DD2783E9BCF9EB47A 55,13 +Display 80,30 191646646EFD63FB7BD16FD199ED0336 55,13 Key ":Enter" Display 80,30 B51E88824AEAAF338E614368C07F2116 1,0 Key ":A->" -- 2.39.5