From 72597a57b526a8df333e77ef8a837b595baa18c7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 18 Jul 2010 15:31:08 +0200 Subject: Added strwidth() and strchars() functions. --- src/gui_mac.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/gui_mac.c') diff --git a/src/gui_mac.c b/src/gui_mac.c index f6aa22b57..2f0f7f865 100644 --- a/src/gui_mac.c +++ b/src/gui_mac.c @@ -3983,13 +3983,8 @@ draw_string_QD(int row, int col, char_u *s, int len, int flags) /* Multibyte computation taken from gui_w32.c */ if (has_mbyte) { - int cell_len = 0; - int n; - /* Compute the length in display cells. */ - for (n = 0; n < len; n += MB_BYTE2LEN(s[n])) - cell_len += (*mb_ptr2cells)(s + n); - rc.right = FILL_X(col + cell_len); + rc.right = FILL_X(col + mb_string2cells(s, len)); } else #endif @@ -4087,13 +4082,8 @@ draw_string_ATSUI(int row, int col, char_u *s, int len, int flags) /* Multibyte computation taken from gui_w32.c */ if (has_mbyte) { - int cell_len = 0; - int n; - /* Compute the length in display cells. */ - for (n = 0; n < len; n += MB_BYTE2LEN(s[n])) - cell_len += (*mb_ptr2cells)(s + n); - rc.right = FILL_X(col + cell_len); + rc.right = FILL_X(col + mb_string2cells(s, len)); } else rc.right = FILL_X(col + len) + (col + len == Columns); -- cgit v1.2.1