From: Robert Millan <rmh@aybabtu.com>
To: grub-devel@gnu.org
Subject: Re: [PATCH] colored menu
Date: Mon, 24 Dec 2007 02:28:18 +0100 [thread overview]
Message-ID: <20071224012818.GA22510@thorin> (raw)
In-Reply-To: <20071223210936.GA27776@thorin>
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
New patch. Corrects a minor mistake when filling the last colum in the
menu. Also, it doesn't change the colors on gfxterm since some reasjustments
were needed for that, and there's also a bug that makes it impossible to
change colors on the fly with gfxterm/vbe (I'll write more on that later).
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call, if you are unable to speak?
(as seen on /.)
[-- Attachment #2: colored_menu.diff --]
[-- Type: text/x-diff, Size: 9979 bytes --]
* include/grub/term.h (struct grub_term): Add `getcolor' function.
(grub_getcolor): New function.
* kern/term.c (grub_getcolor): New function.
* normal/menu.c (GRUB_COLOR_MENU_NORMAL): New macro.
(GRUB_COLOR_MENU_HIGHLIGHT): New macro.
(print_entry): Set normal and highlight colors to
`GRUB_COLOR_MENU_NORMAL' and `GRUB_COLOR_MENU_HIGHLIGHT',
respectively, before printing and restore them to old
values afterwards.
(grub_menu_init_page): Likewise. Fill an additional colored space
that would otherwise be left blank.
* term/efi/console.c (grub_console_getcolor): New function.
(struct grub_console_term.getcolor): New variable.
* term/i386/pc/console.c (grub_console_getcolor): New function.
(struct grub_console_term.getcolor): New variable.
* term/ieee1275/ofconsole.c (grub_ofconsole_getcolor): New function.
(struct grub_console_term.getcolor): New variable.
* term/i386/pc/serial.c (grub_serial_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
* term/i386/pc/vesafb.c (grub_virtual_screen_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
* term/i386/pc/vga.c (grub_vga_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
* term/gfxterm.c (grub_virtual_screen_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
diff -ur grub2/include/grub/term.h grub2.color/include/grub/term.h
--- grub2/include/grub/term.h 2007-07-22 01:32:22.000000000 +0200
+++ grub2.color/include/grub/term.h 2007-12-24 02:21:30.000000000 +0100
@@ -164,6 +164,10 @@
color is VGA's. */
void (*setcolor) (grub_uint8_t normal_color, grub_uint8_t highlight_color);
+ /* Get the normal color and the highlight color. The format of each
+ color is VGA's. */
+ void (*getcolor) (grub_uint8_t *normal_color, grub_uint8_t *highlight_color);
+
/* Turn on/off the cursor. */
void (*setcursor) (int on);
@@ -197,6 +201,8 @@
void EXPORT_FUNC(grub_setcolorstate) (grub_term_color_state state);
void EXPORT_FUNC(grub_setcolor) (grub_uint8_t normal_color,
grub_uint8_t highlight_color);
+void EXPORT_FUNC(grub_getcolor) (grub_uint8_t *normal_color,
+ grub_uint8_t *highlight_color);
int EXPORT_FUNC(grub_setcursor) (int on);
int EXPORT_FUNC(grub_getcursor) (void);
void EXPORT_FUNC(grub_refresh) (void);
diff -ur grub2/kern/term.c grub2.color/kern/term.c
--- grub2/kern/term.c 2007-07-22 01:32:26.000000000 +0200
+++ grub2.color/kern/term.c 2007-12-24 02:21:30.000000000 +0100
@@ -230,6 +230,13 @@
(grub_cur_term->setcolor) (normal_color, highlight_color);
}
+void
+grub_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+{
+ if (grub_cur_term->getcolor)
+ (grub_cur_term->getcolor) (normal_color, highlight_color);
+}
+
int
grub_setcursor (int on)
{
diff -ur grub2/normal/menu.c grub2.color/normal/menu.c
--- grub2/normal/menu.c 2007-11-10 21:32:32.000000000 +0100
+++ grub2.color/normal/menu.c 2007-12-24 02:21:30.000000000 +0100
@@ -25,6 +25,9 @@
#include <grub/env.h>
#include <grub/script.h>
+#define GRUB_COLOR_MENU_NORMAL 0x13
+#define GRUB_COLOR_MENU_HIGHLIGHT 0x1f
+
static void
draw_border (void)
{
@@ -105,7 +108,8 @@
grub_ssize_t len;
grub_uint32_t *unicode_title;
grub_ssize_t i;
-
+ grub_uint8_t normal_code, highlight_code;
+
title = entry ? entry->title : "";
unicode_title = grub_malloc (grub_strlen (title) * sizeof (*unicode_title));
if (! unicode_title)
@@ -121,6 +125,8 @@
return;
}
+ grub_getcolor (&normal_code, &highlight_code);
+ grub_setcolor (GRUB_COLOR_MENU_NORMAL, GRUB_COLOR_MENU_HIGHLIGHT);
grub_setcolorstate (highlight
? GRUB_TERM_COLOR_HIGHLIGHT
: GRUB_TERM_COLOR_NORMAL);
@@ -153,8 +159,12 @@
x++;
}
}
+ grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
+ grub_putchar (' ');
+
grub_gotoxy (GRUB_TERM_CURSOR_X, y);
+ grub_setcolor (normal_code, highlight_code);
grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
grub_free (unicode_title);
}
@@ -199,9 +209,15 @@
void
grub_menu_init_page (int nested, int edit)
{
+ grub_uint8_t normal_code, highlight_code;
+ grub_getcolor (&normal_code, &highlight_code);
+ grub_setcolor (GRUB_COLOR_MENU_NORMAL, GRUB_COLOR_MENU_HIGHLIGHT);
+
grub_normal_init_page ();
draw_border ();
print_message (nested, edit);
+
+ grub_setcolor (normal_code, highlight_code);
}
/* Return the current timeout. If the variable "timeout" is not set or
diff -ur grub2/term/efi/console.c grub2.color/term/efi/console.c
--- grub2/term/efi/console.c 2007-07-22 01:32:30.000000000 +0200
+++ grub2.color/term/efi/console.c 2007-12-24 02:21:30.000000000 +0100
@@ -260,6 +260,13 @@
}
static void
+grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+{
+ *normal_color = grub_console_normal_color;
+ *highlight_color = grub_console_highlight_color;
+}
+
+static void
grub_console_setcursor (int on)
{
grub_efi_simple_text_output_interface_t *o;
@@ -283,6 +290,7 @@
.cls = grub_console_cls,
.setcolorstate = grub_console_setcolorstate,
.setcolor = grub_console_setcolor,
+ .getcolor = grub_console_getcolor,
.setcursor = grub_console_setcursor,
.flags = 0,
.next = 0
diff -ur grub2/term/gfxterm.c grub2.color/term/gfxterm.c
--- grub2/term/gfxterm.c 2007-07-22 01:32:30.000000000 +0200
+++ grub2.color/term/gfxterm.c 2007-12-24 02:21:30.000000000 +0100
@@ -840,14 +840,6 @@
}
static void
-grub_virtual_screen_setcolor (grub_uint8_t normal_color,
- grub_uint8_t highlight_color)
-{
- virtual_screen.fg_color_setting = grub_video_map_color (normal_color);
- virtual_screen.bg_color_setting = grub_video_map_color (highlight_color);
-}
-
-static void
grub_gfxterm_setcursor (int on)
{
if (virtual_screen.cursor_state != on)
@@ -882,7 +874,6 @@
.gotoxy = grub_gfxterm_gotoxy,
.cls = grub_gfxterm_cls,
.setcolorstate = grub_virtual_screen_setcolorstate,
- .setcolor = grub_virtual_screen_setcolor,
.setcursor = grub_gfxterm_setcursor,
.refresh = grub_gfxterm_refresh,
.flags = 0,
diff -ur grub2/term/i386/pc/console.c grub2.color/term/i386/pc/console.c
--- grub2/term/i386/pc/console.c 2007-07-22 01:32:30.000000000 +0200
+++ grub2.color/term/i386/pc/console.c 2007-12-24 02:21:30.000000000 +0100
@@ -117,6 +117,13 @@
grub_console_highlight_color = highlight_color;
}
+static void
+grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+{
+ *normal_color = grub_console_normal_color;
+ *highlight_color = grub_console_highlight_color;
+}
+
static struct grub_term grub_console_term =
{
.name = "console",
@@ -132,6 +139,7 @@
.cls = grub_console_cls,
.setcolorstate = grub_console_setcolorstate,
.setcolor = grub_console_setcolor,
+ .getcolor = grub_console_getcolor,
.setcursor = grub_console_setcursor,
.flags = 0,
.next = 0
diff -ur grub2/term/i386/pc/serial.c grub2.color/term/i386/pc/serial.c
--- grub2/term/i386/pc/serial.c 2007-11-10 21:23:14.000000000 +0100
+++ grub2.color/term/i386/pc/serial.c 2007-12-24 02:21:30.000000000 +0100
@@ -454,13 +454,6 @@
}
static void
-grub_serial_setcolor (grub_uint8_t normal_color __attribute__ ((unused)),
- grub_uint8_t highlight_color __attribute__ ((unused)))
-{
- /* FIXME */
-}
-
-static void
grub_serial_setcursor (const int on)
{
if (on)
@@ -483,7 +476,6 @@
.gotoxy = grub_serial_gotoxy,
.cls = grub_serial_cls,
.setcolorstate = grub_serial_setcolorstate,
- .setcolor = grub_serial_setcolor,
.setcursor = grub_serial_setcursor,
.flags = 0,
.next = 0
diff -ur grub2/term/i386/pc/vesafb.c grub2.color/term/i386/pc/vesafb.c
--- grub2/term/i386/pc/vesafb.c 2007-07-22 01:32:31.000000000 +0200
+++ grub2.color/term/i386/pc/vesafb.c 2007-12-24 02:21:30.000000000 +0100
@@ -565,13 +565,6 @@
}
static void
-grub_virtual_screen_setcolor (grub_uint8_t normal_color __attribute__ ((unused)),
- grub_uint8_t highlight_color __attribute__ ((unused)))
-{
- /* FIXME */
-}
-
-static void
grub_vesafb_setcursor (int on)
{
if (virtual_screen.cursor_state != on)
@@ -599,7 +592,6 @@
.gotoxy = grub_vesafb_gotoxy,
.cls = grub_vesafb_cls,
.setcolorstate = grub_virtual_screen_setcolorstate,
- .setcolor = grub_virtual_screen_setcolor,
.setcursor = grub_vesafb_setcursor,
.flags = 0,
.next = 0
diff -ur grub2/term/i386/pc/vga.c grub2.color/term/i386/pc/vga.c
--- grub2/term/i386/pc/vga.c 2007-11-10 19:34:48.000000000 +0100
+++ grub2.color/term/i386/pc/vga.c 2007-12-24 02:21:30.000000000 +0100
@@ -460,13 +460,6 @@
}
static void
-grub_vga_setcolor (grub_uint8_t normal_color __attribute__ ((unused)),
- grub_uint8_t highlight_color __attribute__ ((unused)))
-{
- /* FIXME */
-}
-
-static void
grub_vga_setcursor (int on)
{
if (cursor_state != on)
@@ -494,7 +487,6 @@
.gotoxy = grub_vga_gotoxy,
.cls = grub_vga_cls,
.setcolorstate = grub_vga_setcolorstate,
- .setcolor = grub_vga_setcolor,
.setcursor = grub_vga_setcursor,
.flags = 0,
.next = 0
diff -ur grub2/term/ieee1275/ofconsole.c grub2.color/term/ieee1275/ofconsole.c
--- grub2/term/ieee1275/ofconsole.c 2007-07-22 11:05:11.000000000 +0200
+++ grub2.color/term/ieee1275/ofconsole.c 2007-12-24 02:21:30.000000000 +0100
@@ -129,6 +129,13 @@
bgcolor = highlight_color;
}
+static void
+grub_ofconsole_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+{
+ *normal_color = fgcolor;
+ *highlight_color = bgcolor;
+}
+
static int
grub_ofconsole_readkey (int *key)
{
@@ -364,6 +371,7 @@
.cls = grub_ofconsole_cls,
.setcolorstate = grub_ofconsole_setcolorstate,
.setcolor = grub_ofconsole_setcolor,
+ .getcolor = grub_ofconsole_getcolor,
.setcursor = grub_ofconsole_setcursor,
.refresh = grub_ofconsole_refresh,
.flags = 0,
next prev parent reply other threads:[~2007-12-24 1:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-23 21:09 [PATCH] colored menu Robert Millan
2007-12-24 1:28 ` Robert Millan [this message]
2007-12-24 1:35 ` gfxterm / grub_virtual_screen_setcolorstate() Robert Millan
2007-12-29 23:50 ` Vesa Jääskeläinen
2008-01-23 12:23 ` Marco Gerards
2008-01-23 13:07 ` Robert Millan
2007-12-24 19:46 ` [PATCH] colored menu Yoshinori K. Okuji
2007-12-25 9:26 ` Robert Millan
2007-12-25 10:27 ` Yoshinori K. Okuji
2007-12-25 11:16 ` Robert Millan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071224012818.GA22510@thorin \
--to=rmh@aybabtu.com \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.