vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Disable UTF-8 serial by default

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-16 19:16:15 +01:00
parent 7a476ba0a3
commit d6e0e85bf4
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
term/serial.c
View file

@ -49,6 +49,9 @@ static const struct grub_arg_option options[] =
{"word", 'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT}, {"word", 'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT},
{"parity", 'r', 0, N_("Set the serial port parity."), 0, ARG_TYPE_STRING}, {"parity", 'r', 0, N_("Set the serial port parity."), 0, ARG_TYPE_STRING},
{"stop", 't', 0, N_("Set the serial port stop bits."), 0, ARG_TYPE_INT}, {"stop", 't', 0, N_("Set the serial port stop bits."), 0, ARG_TYPE_INT},
{"ascii", 'a', 0, N_("Terminal is ASCII-only."), 0, ARG_TYPE_NONE},
{"utf8", 'l', 0, N_("Terminal is logical-ordered UTF-8."), 0, ARG_TYPE_NONE},
{"visual-utf8", 'v', 0, N_("Terminal is visually-ordered UTF-8."), 0, ARG_TYPE_NONE},
{0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0}
}; };
@ -453,7 +456,7 @@ static struct grub_term_output grub_serial_term_output =
.cls = grub_serial_cls, .cls = grub_serial_cls,
.setcolorstate = grub_serial_setcolorstate, .setcolorstate = grub_serial_setcolorstate,
.setcursor = grub_serial_setcursor, .setcursor = grub_serial_setcursor,
.flags = GRUB_TERM_CODE_TYPE_UTF8_VISUAL, .flags = GRUB_TERM_CODE_TYPE_ASCII,
}; };
@ -538,6 +541,15 @@ grub_cmd_serial (grub_extcmd_t cmd,
} }
} }
grub_serial_term_output.flags &= ~GRUB_TERM_CODE_TYPE_MASK;
if (state[7].set)
grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_UTF8_LOGICAL;
else if (state[8].set)
grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_UTF8_VISUAL;
else
grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_ASCII;
/* Initialize with new settings. */ /* Initialize with new settings. */
hwiniterr = serial_hw_init (); hwiniterr = serial_hw_init ();