Fix combining characters messing with width counter

diff --git a/term/serial.c b/term/serial.c
index 666606fcc458825065b7644b31a2afdff0283c25..b1c5accd1b20f042523daec71496c41f6f1107b1 100644 (file)
--- a/term/serial.c
+++ b/term/serial.c
@@ -348,7 +348,7 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
        default:
          if ((c->base & 0xC0) == 0x80)
            break;
-         if (xpos >= TEXT_WIDTH)
+         if (xpos + c->estimated_width >= TEXT_WIDTH + 1)
            {
              xpos = 0;
              if (ypos < TEXT_HEIGHT - 1)