From: Colin Watson <cjwatson@ubuntu.com>
To: grub-devel@gnu.org
Subject: [PATCH] Indicate current video mode in videoinfo
Date: Fri, 14 Jan 2011 20:35:22 +0000 [thread overview]
Message-ID: <20110114203520.GA15515@riva.ucam.org> (raw)
This would make debugging video problems a bit easier.
2011-01-14 Colin Watson <cjwatson@ubuntu.com>
* grub-core/commands/videoinfo.c (hook): Indicate current video
mode with `*'.
(grub_cmd_videoinfo): Fetch current video mode.
=== modified file 'grub-core/commands/videoinfo.c'
--- grub-core/commands/videoinfo.c 2010-09-15 12:37:28 +0000
+++ grub-core/commands/videoinfo.c 2011-01-14 20:34:26 +0000
@@ -26,6 +26,7 @@
#include <grub/i18n.h>
static unsigned height, width, depth;
+static struct grub_video_mode_info *current_mode;
static int
hook (const struct grub_video_mode_info *info)
@@ -39,7 +40,13 @@ hook (const struct grub_video_mode_info
if (info->mode_number == GRUB_VIDEO_MODE_NUMBER_INVALID)
grub_printf (" ");
else
- grub_printf (" 0x%03x ", info->mode_number);
+ {
+ if (current_mode && info->mode_number == current_mode->mode_number)
+ grub_printf ("*");
+ else
+ grub_printf (" ");
+ grub_printf (" 0x%03x ", info->mode_number);
+ }
grub_printf ("%4d x %4d x %2d ", info->width, info->height, info->bpp);
if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PURE_TEXT)
@@ -120,6 +127,8 @@ grub_cmd_videoinfo (grub_command_t cmd _
FOR_VIDEO_ADAPTERS (adapter)
{
+ struct grub_video_mode_info info;
+
grub_printf ("Adapter '%s':\n", adapter->name);
if (!adapter->iterate)
@@ -128,7 +137,17 @@ grub_cmd_videoinfo (grub_command_t cmd _
continue;
}
- if (adapter->id != id)
+ current_mode = NULL;
+
+ if (adapter->id == id)
+ {
+ if (grub_video_get_info (&info) == GRUB_ERR_NONE)
+ current_mode = &info;
+ else
+ /* Don't worry about errors. */
+ grub_errno = GRUB_ERR_NONE;
+ }
+ else
{
if (adapter->init ())
{
@@ -143,6 +162,8 @@ grub_cmd_videoinfo (grub_command_t cmd _
adapter->iterate (hook);
+ current_mode = NULL;
+
if (adapter->id != id)
{
if (adapter->fini ())
Thanks,
--
Colin Watson [cjwatson@ubuntu.com]
next reply other threads:[~2011-01-14 20:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-14 20:35 Colin Watson [this message]
2011-06-24 1:37 ` [PATCH] Indicate current video mode in videoinfo Vladimir 'φ-coder/phcoder' Serbinenko
2011-06-27 9:49 ` Colin Watson
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=20110114203520.GA15515@riva.ucam.org \
--to=cjwatson@ubuntu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).