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

* grub-core/gfxmenu/view.c (init_terminal): Avoid making terminal

Browse source 
window too small.
This commit is contained in:
Dr. Tilmann Bubeck 2012-12-10 16:14:12 +01:00 committed by Vladimir 'phcoder' Serbinenko
parent 969b804f2a
commit 74b2fe3e4f
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-10 Dr. Tilmann Bubeck <t.bubeck@reinform.de>
* grub-core/gfxmenu/view.c (init_terminal): Avoid making terminal
window too small.
2012-12-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-12-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/gfxterm.c (grub_virtual_screen_setup): Get font as * grub-core/term/gfxterm.c (grub_virtual_screen_setup): Get font as

31
grub-core/gfxmenu/view.c
View file

@ -361,8 +361,14 @@ grub_gfxmenu_draw_terminal_box (void)
static void static void
init_terminal (grub_gfxmenu_view_t view) init_terminal (grub_gfxmenu_view_t view)
{ {
const int border_width = 3;
grub_font_t terminal_font; grub_font_t terminal_font;
unsigned int line_width;
struct grub_font_glyph *glyph;
terminal_font = grub_font_get (view->terminal_font_name); terminal_font = grub_font_get (view->terminal_font_name);
if (!terminal_font) if (!terminal_font)
{ {
@ -370,11 +376,27 @@ init_terminal (grub_gfxmenu_view_t view)
return; return;
} }
term_rect.width = view->screen.width * 7 / 10; glyph = grub_font_get_glyph (terminal_font, 'M');
line_width = ((glyph ? glyph->device_width : 8) * 80 + 2 * border_width);
if (view->screen.width <= line_width)
/* The screen is too small. Use all space, except a small border
to show the user, it is a window and not full screen: */
term_rect.width = view->screen.width - 6 * border_width;
else
{
/* The screen is big enough. Try 70% of the screen width: */
term_rect.width = view->screen.width * 7 / 10;
/* Make sure, that we use at least the line_width: */
if ( term_rect.width < line_width )
term_rect.width = line_width;
}
term_rect.height = view->screen.height * 7 / 10; term_rect.height = view->screen.height * 7 / 10;
term_rect.x = view->screen.x + view->screen.width * (10 - 7) / 10 / 2; term_rect.x = view->screen.x + (view->screen.width - term_rect.width) / 2;
term_rect.y = view->screen.y + view->screen.height * (10 - 7) / 10 / 2; term_rect.y = view->screen.y + (view->screen.height - term_rect.height) / 2;
term_view = view; term_view = view;
@ -384,7 +406,8 @@ init_terminal (grub_gfxmenu_view_t view)
grub_gfxterm_set_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY, term_rect.x, grub_gfxterm_set_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY, term_rect.x,
term_rect.y, term_rect.y,
term_rect.width, term_rect.height, term_rect.width, term_rect.height,
view->double_repaint, terminal_font, 3); view->double_repaint, terminal_font,
border_width);
grub_gfxterm_decorator_hook = grub_gfxmenu_draw_terminal_box; grub_gfxterm_decorator_hook = grub_gfxmenu_draw_terminal_box;
} }