* grub-core/normal/charset.c (grub_bidi_logical_to_visual): Add

hook pass-through parameter. All users updated and unnested.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-02 11:47:59 +01:00
parent 74a2742144
commit 19e29ee1a9
4 changed files with 19 additions and 14 deletions

View file

@ -840,6 +840,12 @@ print_backlog (struct grub_term_output *term,
return 0;
}
static grub_ssize_t
getcharwidth (const struct grub_unicode_glyph *c, void *term)
{
return grub_term_getcharwidth (term, c);
}
static int
print_ucs4_real (const grub_uint32_t * str,
const grub_uint32_t * last_position,
@ -881,14 +887,8 @@ print_ucs4_real (const grub_uint32_t * str,
int ret;
struct grub_unicode_glyph *vptr;
auto grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c);
grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c)
{
return grub_term_getcharwidth (term, c);
}
visual_len = grub_bidi_logical_to_visual (str, last_position - str,
&visual, getcharwidth,
&visual, getcharwidth, term,
get_maxwidth (term,
margin_left,
margin_right),