[PATCH] gfxterm clear_char

[PATCH] gfxterm clear_char

[Joe Auricchio]

[-- Attachment #1: Type: text/plain, Size: 36 bytes --]

Hi,

Eine kleine gfxterm.c cleanup


[-- Attachment #2: gfxterm_clear_char.diff.txt --]
[-- Type: text/plain, Size: 2722 bytes --]

Index: src/term/gfxterm.c
===================================================================
--- src.orig/term/gfxterm.c	2009-07-22 16:54:01.000000000 -0700
+++ src/term/gfxterm.c	2009-07-24 17:15:15.000000000 -0700
@@ -151,6 +151,16 @@
 }
 
 static void
+clear_char(struct grub_colored_char *c)
+{
+    c->code = ' ';
+    c->fg_color = virtual_screen.fg_color;
+    c->bg_color = virtual_screen.bg_color;
+    c->width = 0;
+    c->index = 0;
+}
+
+static void
 grub_virtual_screen_free (void)
 {
   /* If virtual screen has been allocated, free it.  */
@@ -230,11 +240,7 @@
   /* Clear out text buffer. */
   for(i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
     {
-      virtual_screen.text_buffer[i].code = ' ';
-      virtual_screen.text_buffer[i].fg_color = virtual_screen.fg_color;
-      virtual_screen.text_buffer[i].bg_color = virtual_screen.bg_color;
-      virtual_screen.text_buffer[i].width = 0;
-      virtual_screen.text_buffer[i].index = 0;
+      clear_char (&(virtual_screen.text_buffer[i]));
     }
 
   return grub_errno;
@@ -581,11 +587,7 @@
        i < virtual_screen.columns * virtual_screen.rows;
        i++)
     {
-      virtual_screen.text_buffer[i].code = ' ';
-      virtual_screen.text_buffer[i].fg_color = virtual_screen.fg_color;
-      virtual_screen.text_buffer[i].bg_color = virtual_screen.bg_color;
-      virtual_screen.text_buffer[i].width = 0;
-      virtual_screen.text_buffer[i].index = 0;
+      clear_char (&(virtual_screen.text_buffer[i]));
     }
 
   /* Scroll physical screen.  */
@@ -801,11 +803,7 @@
 
   for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
     {
-      virtual_screen.text_buffer[i].code = ' ';
-      virtual_screen.text_buffer[i].fg_color = virtual_screen.fg_color;
-      virtual_screen.text_buffer[i].bg_color = virtual_screen.bg_color;
-      virtual_screen.text_buffer[i].width = 0;
-      virtual_screen.text_buffer[i].index = 0;
+      clear_char (&(virtual_screen.text_buffer[i]));
     }
 
   virtual_screen.cursor_x = virtual_screen.cursor_y = 0;
Index: src/ChangeLog
===================================================================
--- src.orig/ChangeLog	2009-07-24 17:15:24.000000000 -0700
+++ src/ChangeLog	2009-07-24 17:18:11.000000000 -0700
@@ -1,3 +1,10 @@
+2009-07-24  Joe Auricchio  <jauricchio@gmail.com>
+
+	* term/gfxterm.c (clear_char): New function.
+	(grub_virtual_screen_setup): Use clear_char.
+	(scroll_up): Likewise.
+	(grub_virtual_screen_cls): Likewise.
+
 2009-07-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	UUID support for UFS

[-- Attachment #3: Type: text/plain, Size: 1 bytes --]

Re: [PATCH] gfxterm clear_char

[Pavel Roskin]

On Tue, 2009-07-28 at 22:15 -0700, Joe Auricchio wrote:

> Eine kleine gfxterm.c cleanup

Applied with formatting changes.

>  static void
> +clear_char(struct grub_colored_char *c)

Space is needed before the parenthesis.

> +{
> +    c->code = ' ';

Indentation should be 2 spaces, not 4.

>    for(i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
>      {

This brace is no longer needed.

> Index: src/ChangeLog

It would be more convenient if the ChangeLog entry is posted inline
rather than inside the patch.

-- 
Regards,
Pavel Roskin