Fix combining characters messing with width counter

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-16 19:56:33 +01:00
parent 50186d826d
commit 8a0b074f39

View file

@ -348,7 +348,7 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
default: default:
if ((c->base & 0xC0) == 0x80) if ((c->base & 0xC0) == 0x80)
break; break;
if (xpos >= TEXT_WIDTH) if (xpos + c->estimated_width >= TEXT_WIDTH + 1)
{ {
xpos = 0; xpos = 0;
if (ypos < TEXT_HEIGHT - 1) if (ypos < TEXT_HEIGHT - 1)