Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nw64O-0005oj-QY for mharc-grub-devel@gnu.org; Tue, 31 May 2022 13:54:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nw64I-0005ns-Bh for grub-devel@gnu.org; Tue, 31 May 2022 13:54:10 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:42676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nw64F-0001yR-Hh for grub-devel@gnu.org; Tue, 31 May 2022 13:54:10 -0400 Received: by mail-pf1-x42f.google.com with SMTP id 187so2313125pfu.9 for ; Tue, 31 May 2022 10:54:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cj8BabaRh1LFcnRqOIUVj0wCpOXHoeY10f9EX8mqIsc=; b=iBWPkEDAK4cB1L3oHKMIFgGZkZ30Co2ODVRKgvs65eVCurr6kvr2N0XvUwhH60KxjG mqyTzhdalhxwrVFI8NrdZzbquS7pdD4f7geFmIHdu0c2ZECX0QnVbI9D+7HF8IUM3Hb+ GkQ1STyX/uiIArD2+66OmPgrlFlYBelS8pVdc7NUzC9mQvtBLxyTNMnPmJwpOvKd+Ny1 9DdPAmea+22K0Gv2tLb68rfYwY2DttH98gyLQhVgvkWRb3osVoR3BeOvSxYcMDTgimc2 jQc/aI9UCtp0uLC0xi6vzkKSQsvx+llf6/WdHMkCTvH6f3wiiC8lckahIe306dTd0udQ JXrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cj8BabaRh1LFcnRqOIUVj0wCpOXHoeY10f9EX8mqIsc=; b=hlqW95L68epA9ZarLfT2qpt6hVgUfisOOBjGafVDBqhgb+S/LfD6faGrj73U8GQEY1 8Jae/sltgHZPtRMxnKj4GfEwT3MttHm9E/U4rSVsMjV96qpgew3MBtVmMspZnwI3YUCR OAfxwiWlvpeTiI+HDFrNtPL7/NwGvh0yXIb6YTYJvU5iRTKkELDgSovU7E9m9PF3TOBj lhxYnvyxKZElPBCdul08VUCloGhfAqpsPgqdaqeTWmEJ30m7ARQWNH3mA6vHvjFZrmNH n5xR9VtZtC9F4fcTJOFBozSD/35j7scDCOudMbr17AAfjjH/LearGOi76yoom4c5Le9i d6PQ== X-Gm-Message-State: AOAM530xj+xkIYWGD9lot10Al879NVkLEJFZ3tdtFchQX8LOJr7C3l9m IZ84KDVmpx38BwSMz3ulSRkcgxSYv1Q= X-Google-Smtp-Source: ABdhPJwL5LPC/gd5EcQIRC30Z2a99ZwUaIwS+U28WCIKiSmQWGrzlX88gU44g8bWrvH/yElXZAJI0w== X-Received: by 2002:a63:6384:0:b0:3fc:68a8:b1ca with SMTP id x126-20020a636384000000b003fc68a8b1camr2960150pgb.597.1654019644953; Tue, 31 May 2022 10:54:04 -0700 (PDT) Received: from localhost.localdomain (ec2-13-113-80-70.ap-northeast-1.compute.amazonaws.com. [13.113.80.70]) by smtp.gmail.com with ESMTPSA id r19-20020a170903021300b001636c0b98a7sm11412367plh.226.2022.05.31.10.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 May 2022 10:54:04 -0700 (PDT) From: Zhang Boyang To: grub-devel@gnu.org Cc: Zhang Boyang Subject: [PATCH v2 2/2] term/gfxterm: Preliminary HiDPI support Date: Wed, 1 Jun 2022 01:53:47 +0800 Message-Id: <20220531175347.55042-2-zhangboyang.id@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220531175347.55042-1-zhangboyang.id@gmail.com> References: <20220531175347.55042-1-zhangboyang.id@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=zhangboyang.id@gmail.com; helo=mail-pf1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2022 17:54:12 -0000 Currently GRUB's default font is too small to see on a HiDPI monitor. This patch adds preliminary HiDPI support to gfxterm. If default font and a HiDPI monitor are both detected, it will scale the font size on the fly. Signed-off-by: Zhang Boyang --- grub-core/term/gfxterm.c | 55 +++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c index 4512dee6f..8c6bb8e83 100644 --- a/grub-core/term/gfxterm.c +++ b/grub-core/term/gfxterm.c @@ -82,6 +82,7 @@ struct grub_virtual_screen /* Font settings. */ grub_font_t font; + unsigned int scale; /* Terminal color settings. */ grub_uint8_t standard_color_setting; @@ -204,7 +205,7 @@ grub_virtual_screen_free (void) static grub_err_t grub_virtual_screen_setup (unsigned int x, unsigned int y, unsigned int width, unsigned int height, - grub_font_t font) + grub_font_t font, unsigned int scale) { unsigned int i; @@ -213,6 +214,7 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y, /* Initialize with default data. */ virtual_screen.font = font; + virtual_screen.scale = scale; virtual_screen.width = width; virtual_screen.height = height; virtual_screen.offset_x = x; @@ -220,9 +222,9 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y, virtual_screen.normal_char_width = calculate_normal_character_width (virtual_screen.font); virtual_screen.normal_char_height = - grub_font_get_max_char_height (virtual_screen.font); + grub_font_get_max_char_height (virtual_screen.font) * virtual_screen.scale; if (virtual_screen.normal_char_height == 0) - virtual_screen.normal_char_height = 16; + virtual_screen.normal_char_height = 16 * virtual_screen.scale; virtual_screen.cursor_x = 0; virtual_screen.cursor_y = 0; virtual_screen.cursor_state = 1; @@ -299,17 +301,29 @@ grub_gfxterm_set_window (struct grub_video_render_target *target, int double_repaint, grub_font_t font, int border_width) { + int scale; + /* Clean up any prior instance. */ destroy_window (); /* Set the render target. */ render_target = target; + /* Decide font scale factor. */ + scale = 1; + if (font->max_char_height == 16) /* FIXME: Better logic */ + { + if (width > 3840 && height > 2160) + scale = 4; + else if (width > 1920 && height > 1080) + scale = 2; + } + /* Create virtual screen. */ - if (grub_virtual_screen_setup (border_width, border_width, - width - 2 * border_width, - height - 2 * border_width, - font) + if (grub_virtual_screen_setup (border_width * scale, border_width * scale, + width - 2 * border_width * scale, + height - 2 * border_width * scale, + font, scale) != GRUB_ERR_NONE) { return grub_errno; @@ -642,7 +656,7 @@ paint_char (unsigned cx, unsigned cy) grub_errno = GRUB_ERR_NONE; return; } - ascent = grub_font_get_ascent (virtual_screen.font); + ascent = grub_font_get_ascent (virtual_screen.font) * virtual_screen.scale; width = virtual_screen.normal_char_width * calculate_character_width(glyph); height = virtual_screen.normal_char_height; @@ -656,7 +670,7 @@ paint_char (unsigned cx, unsigned cy) /* Render glyph to text layer. */ grub_video_set_active_render_target (text_layer); grub_video_fill_rect (bgcolor, x, y, width, height); - grub_font_draw_glyph (glyph, color, x, y + ascent, 1); + grub_font_draw_glyph (glyph, color, x, y + ascent, virtual_screen.scale); grub_video_set_active_render_target (render_target); /* Mark character to be drawn. */ @@ -690,9 +704,9 @@ draw_cursor (int show) return; /* Ensure that cursor doesn't go outside of character box. */ - ascent = grub_font_get_ascent(virtual_screen.font); - if (ascent > virtual_screen.normal_char_height - 2) - ascent = virtual_screen.normal_char_height - 2; + ascent = grub_font_get_ascent(virtual_screen.font) * virtual_screen.scale; + if (ascent > virtual_screen.normal_char_height - 2 * virtual_screen.scale) + ascent = virtual_screen.normal_char_height - 2 * virtual_screen.scale; /* Determine cursor properties and position on text layer. */ x = virtual_screen.cursor_x * virtual_screen.normal_char_width; @@ -701,7 +715,7 @@ draw_cursor (int show) y = ((virtual_screen.cursor_y + virtual_screen.total_scroll) * virtual_screen.normal_char_height + ascent); - height = 2; + height = 2 * virtual_screen.scale; /* Render cursor to text layer. */ grub_video_set_active_render_target (text_layer); @@ -957,18 +971,18 @@ calculate_normal_character_width (grub_font_t font) width = glyph->device_width; } if (!width) - return 8; + return 8 * virtual_screen.scale; - return width; + return width * virtual_screen.scale; } static unsigned char calculate_character_width (struct grub_font_glyph *glyph) { if (! glyph || glyph->device_width == 0) - return 1; + return 1 * virtual_screen.scale; - return (glyph->device_width + return (glyph->device_width * virtual_screen.scale + (virtual_screen.normal_char_width - 1)) / virtual_screen.normal_char_width; } @@ -981,10 +995,11 @@ grub_gfxterm_getcharwidth (struct grub_term_output *term __attribute__ ((unused) dev_width = grub_font_get_constructed_device_width (virtual_screen.font, c); if (dev_width == 0) - return 1; + return 1 * virtual_screen.scale; - return (dev_width + (virtual_screen.normal_char_width - 1)) - / virtual_screen.normal_char_width; + return (dev_width * virtual_screen.scale + + (virtual_screen.normal_char_width - 1)) + / virtual_screen.normal_char_width; } static struct grub_term_coordinate -- 2.30.2