nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone
28f7f8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
606ea6
From: William Jon McCann <william.jon.mccann@gmail.com>
606ea6
Date: Wed, 15 May 2013 16:47:33 -0400
28f7f8
Subject: [PATCH] Don't draw a border around the menu
606ea6
606ea6
It looks cleaner without it.
606ea6
---
606ea6
 grub-core/normal/menu_text.c | 43 -------------------------------------------
606ea6
 1 file changed, 43 deletions(-)
606ea6
606ea6
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
28f7f8
index 6202c2a16c9..beddd7f81c1 100644
606ea6
--- a/grub-core/normal/menu_text.c
606ea6
+++ b/grub-core/normal/menu_text.c
606ea6
@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
606ea6
   grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
606ea6
 }
606ea6
 
606ea6
-static void
606ea6
-draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
606ea6
-{
606ea6
-  int i;
606ea6
-
606ea6
-  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
606ea6
-
606ea6
-  grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
606ea6
-	geo->first_entry_y - 1 });
606ea6
-  grub_putcode (GRUB_UNICODE_CORNER_UL, term);
606ea6
-  for (i = 0; i < geo->entry_width + 1; i++)
606ea6
-    grub_putcode (GRUB_UNICODE_HLINE, term);
606ea6
-  grub_putcode (GRUB_UNICODE_CORNER_UR, term);
606ea6
-
606ea6
-  for (i = 0; i < geo->num_entries; i++)
606ea6
-    {
606ea6
-      grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
606ea6
-	    geo->first_entry_y + i });
606ea6
-      grub_putcode (GRUB_UNICODE_VLINE, term);
606ea6
-      grub_term_gotoxy (term,
606ea6
-			(struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
606ea6
-			    geo->first_entry_y + i });
606ea6
-      grub_putcode (GRUB_UNICODE_VLINE, term);
606ea6
-    }
606ea6
-
606ea6
-  grub_term_gotoxy (term,
606ea6
-		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
606ea6
-			geo->first_entry_y - 1 + geo->num_entries + 1 });
606ea6
-  grub_putcode (GRUB_UNICODE_CORNER_LL, term);
606ea6
-  for (i = 0; i < geo->entry_width + 1; i++)
606ea6
-    grub_putcode (GRUB_UNICODE_HLINE, term);
606ea6
-  grub_putcode (GRUB_UNICODE_CORNER_LR, term);
606ea6
-
606ea6
-  grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
606ea6
-
606ea6
-  grub_term_gotoxy (term,
606ea6
-		    (struct grub_term_coordinate) { geo->first_entry_x - 1,
606ea6
-			(geo->first_entry_y - 1 + geo->num_entries
606ea6
-			 + GRUB_TERM_MARGIN + 1) });
606ea6
-}
606ea6
-
606ea6
 static int
606ea6
 print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
606ea6
 {
606ea6
@@ -403,8 +362,6 @@ grub_menu_init_page (int nested, int edit,
606ea6
 
606ea6
   grub_term_normal_color = grub_color_menu_normal;
606ea6
   grub_term_highlight_color = grub_color_menu_highlight;
606ea6
-  if (geo->border)
606ea6
-    draw_border (term, geo);
606ea6
   grub_term_normal_color = old_color_normal;
606ea6
   grub_term_highlight_color = old_color_highlight;
606ea6
   geo->timeout_y = geo->first_entry_y + geo->num_entries