forked from pool/grub2
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
|
From 5f7f27d1198ef425f4943cc10132509415bbaf55 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Chang <mchang@suse.com>
|
||
|
|
Date: Thu, 24 Jan 2019 16:41:04 +0800
|
||
|
|
Subject: [PATCH] video: limit the resolution for fixed bimap font
|
||
|
|
|
||
|
|
As grub uses fixed bitmap font and also its size is a fixed property, it is not
|
||
|
|
possible to accommodate to all resolutions, therefore we raise some limit to
|
||
|
|
the preferred resolution as most themes are designed on popular device and the
|
||
|
|
resolution in its prime, which is supposedly Full HD.
|
||
|
|
|
||
|
|
This change also makes grub font readable on hiDPI device without going through
|
||
|
|
the steps in.
|
||
|
|
|
||
|
|
https://wiki.archlinux.org/index.php/HiDPI#GRUB
|
||
|
|
---
|
||
|
|
grub-core/video/efi_gop.c | 7 +++++++
|
||
|
|
grub-core/video/i386/pc/vbe.c | 8 +++++++-
|
||
|
|
2 files changed, 14 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
|
||
|
|
index 1e7b396..1db39e7 100644
|
||
|
|
--- a/grub-core/video/efi_gop.c
|
||
|
|
+++ b/grub-core/video/efi_gop.c
|
||
|
|
@@ -377,6 +377,13 @@ grub_video_gop_setup (unsigned int width, unsigned int height,
|
||
|
|
preferred_height = 600;
|
||
|
|
grub_errno = GRUB_ERR_NONE;
|
||
|
|
}
|
||
|
|
+ else
|
||
|
|
+ {
|
||
|
|
+ /* Limit the range of preferred resolution not exceeding FHD
|
||
|
|
+ to keep the fixed bitmap font readable */
|
||
|
|
+ preferred_width = (preferred_width < 1920) ? preferred_width : 1920;
|
||
|
|
+ preferred_height = (preferred_height < 1080) ? preferred_height : 1080;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
again:
|
||
|
|
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
|
||
|
|
index b0d3190..68700ec 100644
|
||
|
|
--- a/grub-core/video/i386/pc/vbe.c
|
||
|
|
+++ b/grub-core/video/i386/pc/vbe.c
|
||
|
|
@@ -994,7 +994,13 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
|
||
|
|
{
|
||
|
|
grub_vbe_get_preferred_mode (&width, &height);
|
||
|
|
if (grub_errno == GRUB_ERR_NONE)
|
||
|
|
- preferred_mode = 1;
|
||
|
|
+ {
|
||
|
|
+ preferred_mode = 1;
|
||
|
|
+ /* Limit the range of preferred resolution not exceeding FHD
|
||
|
|
+ to keep the fixed bitmap font readable */
|
||
|
|
+ width = (width < 1920) ? width : 1920;
|
||
|
|
+ height = (height < 1080) ? height : 1080;
|
||
|
|
+ }
|
||
|
|
else
|
||
|
|
{
|
||
|
|
/* Fall back to 640x480. This is conservative, but the largest
|
||
|
|
--
|
||
|
|
2.12.3
|
||
|
|
|