* grub-core/term/terminfo.c: Rename ANSI_C0 to ANSI_CSI to avoid

misnomer.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-10 14:07:41 +02:00
parent 091945b239
commit 8200fa1597
2 changed files with 14 additions and 9 deletions

View file

@ -1,3 +1,8 @@
2013-05-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/terminfo.c: Rename ANSI_C0 to ANSI_CSI to avoid
misnomer.
2013-05-08 Andrey Borzenkov <arvidjaar@gmail.com> 2013-05-08 Andrey Borzenkov <arvidjaar@gmail.com>
* docs/grub.texi (Network): Add description of net_default_interface, * docs/grub.texi (Network): Add description of net_default_interface,

View file

@ -39,8 +39,8 @@
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
#define ANSI_C0 0x9b #define ANSI_CSI 0x9b
#define ANSI_C0_STR "\x9b" #define ANSI_CSI_STR "\x9b"
static struct grub_term_output *terminfo_outputs; static struct grub_term_output *terminfo_outputs;
@ -132,14 +132,14 @@ grub_terminfo_set_current (struct grub_term_output *term,
if (grub_strcmp ("arc", str) == 0) if (grub_strcmp ("arc", str) == 0)
{ {
data->name = grub_strdup ("arc"); data->name = grub_strdup ("arc");
data->gotoxy = grub_strdup (ANSI_C0_STR "%i%p1%d;%p2%dH"); data->gotoxy = grub_strdup (ANSI_CSI_STR "%i%p1%d;%p2%dH");
data->cls = grub_strdup (ANSI_C0_STR "2J"); data->cls = grub_strdup (ANSI_CSI_STR "2J");
data->reverse_video_on = grub_strdup (ANSI_C0_STR "7m"); data->reverse_video_on = grub_strdup (ANSI_CSI_STR "7m");
data->reverse_video_off = grub_strdup (ANSI_C0_STR "0m"); data->reverse_video_off = grub_strdup (ANSI_CSI_STR "0m");
data->cursor_on = 0; data->cursor_on = 0;
data->cursor_off = 0; data->cursor_off = 0;
data->setcolor = grub_strdup (ANSI_C0_STR "3%p1%dm" data->setcolor = grub_strdup (ANSI_CSI_STR "3%p1%dm"
ANSI_C0_STR "4%p2%dm"); ANSI_CSI_STR "4%p2%dm");
return grub_errno; return grub_errno;
} }
@ -427,7 +427,7 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
} }
*len = 1; *len = 1;
keys[0] = c; keys[0] = c;
if (c != ANSI_C0 && c != '\e') if (c != ANSI_CSI && c != '\e')
{ {
/* Backspace: Ctrl-h. */ /* Backspace: Ctrl-h. */
if (c == 0x7f) if (c == 0x7f)