Lift 255x255 erminal sie restriction to 65535x65535. Also change from

bitmasks to small structures of size chosen to fit in registers.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-19 23:59:32 +02:00
parent 7abdac8e13
commit e89c2d48a9
24 changed files with 266 additions and 244 deletions

View file

@ -97,8 +97,8 @@ grub_console_dimensions (void)
val[sizeof (val) - 1] = 0;
if (grub_strcmp (val, "serial") == 0)
{
grub_console_terminfo_output.width = 80;
grub_console_terminfo_output.height = 24;
grub_console_terminfo_output.size.x = 80;
grub_console_terminfo_output.size.y = 24;
return;
}
}
@ -111,31 +111,31 @@ grub_console_dimensions (void)
val, sizeof (val) - 1, 0))
{
val[sizeof (val) - 1] = 0;
grub_console_terminfo_output.width
grub_console_terminfo_output.size.x
= (grub_uint8_t) grub_strtoul (val, 0, 10);
}
if (! grub_ieee1275_get_property (options, "screen-#rows",
val, sizeof (val) - 1, 0))
{
val[sizeof (val) - 1] = 0;
grub_console_terminfo_output.height
grub_console_terminfo_output.size.y
= (grub_uint8_t) grub_strtoul (val, 0, 10);
}
}
/* Bogus default value on SLOF in QEMU. */
if (grub_console_terminfo_output.width == 200
&& grub_console_terminfo_output.height == 200)
if (grub_console_terminfo_output.size.x == 200
&& grub_console_terminfo_output.size.y == 200)
{
grub_console_terminfo_output.width = 80;
grub_console_terminfo_output.height = 24;
grub_console_terminfo_output.size.x = 80;
grub_console_terminfo_output.size.y = 24;
}
/* Use a small console by default. */
if (! grub_console_terminfo_output.width)
grub_console_terminfo_output.width = 80;
if (! grub_console_terminfo_output.height)
grub_console_terminfo_output.height = 24;
if (! grub_console_terminfo_output.size.x)
grub_console_terminfo_output.size.x = 80;
if (! grub_console_terminfo_output.size.y)
grub_console_terminfo_output.size.y = 24;
}
static void
@ -212,8 +212,7 @@ struct grub_terminfo_input_state grub_console_terminfo_input =
struct grub_terminfo_output_state grub_console_terminfo_output =
{
.put = put,
.width = 80,
.height = 24
.size = { 80, 24 }
};
static struct grub_term_input grub_console_term_input =