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

* grub-core/commands/videoinfo.c (hook): Replace "Direct"

Browse source 
with "Direct color" and "Packed" with "Packed pixel".
	(grub_cmd_videoinfo): Simplify legend.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-02 15:05:30 +01:00
parent e4b791fabe
commit 49ce9e50eb
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/videoinfo.c (hook): Replace "Direct"
with "Direct color" and "Packed" with "Packed pixel".
(grub_cmd_videoinfo): Simplify legend.
2012-03-02 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (grub_make_system_path_relative_to_its_root): Fix * util/getroot.c (grub_make_system_path_relative_to_its_root): Fix

9
grub-core/commands/videoinfo.c
View file

@ -55,7 +55,7 @@ hook (const struct grub_video_mode_info *info)
grub_xputs (_("Text-only ")); grub_xputs (_("Text-only "));
/* Show mask and position details for direct color modes. */ /* Show mask and position details for direct color modes. */
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB)
grub_printf_ (N_("Direct, mask: %d/%d/%d/%d pos: %d/%d/%d/%d"), grub_printf_ (N_("Direct color, mask: %d/%d/%d/%d pos: %d/%d/%d/%d"),
info->red_mask_size, info->red_mask_size,
info->green_mask_size, info->green_mask_size,
info->blue_mask_size, info->blue_mask_size,
@ -65,7 +65,7 @@ hook (const struct grub_video_mode_info *info)
info->blue_field_pos, info->blue_field_pos,
info->reserved_field_pos); info->reserved_field_pos);
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
grub_xputs (_("Packed ")); grub_xputs (_("Packed pixel "));
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_YUV) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_YUV)
grub_xputs (_("YUV ")); grub_xputs (_("YUV "));
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PLANAR) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PLANAR)
@ -75,6 +75,8 @@ hook (const struct grub_video_mode_info *info)
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_CGA) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_CGA)
grub_xputs (_("CGA ")); grub_xputs (_("CGA "));
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_NONCHAIN4) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_NONCHAIN4)
/* TRANSLATORS: Non-chain 4 is a 256-color planar
(unchained) video memory mode. */
grub_xputs (_("Non-chain 4 ")); grub_xputs (_("Non-chain 4 "));
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP) if (info->mode_type & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP)
grub_xputs (_("Monochrome ")); grub_xputs (_("Monochrome "));
@ -150,8 +152,7 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
id = grub_video_get_driver_id (); id = grub_video_get_driver_id ();
grub_puts_ (N_("List of supported video modes:")); grub_puts_ (N_("List of supported video modes:"));
grub_puts_ (N_("Legend: P=Packed pixel, D=Direct color, " grub_puts_ (N_("Legend: mask/position=red/green/blue/reserved"));
"mask/pos=R/G/B/reserved"));
FOR_VIDEO_ADAPTERS (adapter) FOR_VIDEO_ADAPTERS (adapter)
{ {