6fa42fa65a
* normal/main.c: Add include to grub/menu_viewer.h. (free_menu_entry_classes): Added. (grub_normal_menu_addentry): Added class property handling. (grub_normal_execute): Changed to use new menu viewer for menu viewing. (GRUB_MOD_INIT(normal)): Added register for text based menu viewer. * normal/menu_viewer.c: New file. * normal/menu.c (run_menu_entry): Renamed to ... (grub_menu_execute_entry): ... this and made it as global. (grub_menu_run): Renamed to ... (show_text_menu): ... this and made it local. (show_text_menu): Adapt to new function names. (grub_normal_terminal_menu_viewer): New global variable. * include/grub/menu.h: New file. * include/grub/menu_viewer.h: New file. * include/grub/normal.h: Added include to grub/menu.h. (grub_menu_entry): Moved to include/grub/menu.h. (grub_menu_entry_t): Likewise. (grub_menu): Likewise. (grub_menu_t): Likewise. (grub_normal_terminal_menu_viewer): Added. (grub_menu_execute_entry): Likewise. (grub_menu_run): Removed. * DISTLIST: Added include/grub/menu.h. Added include/grub/menu_viewer.h. Added normal/menu_viewer.c. 2009-01-31 Vesa Jääskeläinen <chaac@nic.fi> * normal/execute.c (grub_script_execute_menuentry): Changed to use arglist for menutitle arguments. * normal/main.c (grub_normal_menu_addentry): Likewise. * normal/parser.y (menuentry): Likewise. * normal/script.c (grub_script_create_cmdmenu): Likewise. * include/grub/script.h (grub_script_cmd_menuentry): Likewise. (grub_script_create_cmdmenu): Likewise. * include/grub/normal.h (grub_normal_menu_addentry): Likewise. * conf/i386-pc.rmk (normal_mod_SOURCES): Adapt Colin D Bennett's changes. * conf/x86_64-efi.rmk (normal_mod_SOURCES): Likewise. * conf/i386-coreboot.rmk (normal_mod_SOURCES): Likewise. * conf/i386-efi.rmk (normal_mod_SOURCES): Likewise. * conf/i386-ieee1275.rmk (normal_mod_SOURCES): Likewise. * conf/powerpc-ieee1275.rmk (normal_mod_SOURCES): Likewise. * conf/sparc64-ieee1275.rmk (normal_mod_SOURCES): Likewise.
63 lines
1.8 KiB
C
63 lines
1.8 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2009 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <grub/mm.h>
|
|
#include <grub/misc.h>
|
|
#include <grub/env.h>
|
|
#include <grub/menu_viewer.h>
|
|
#include <grub/menu.h>
|
|
|
|
/* The list of menu viewers. */
|
|
static grub_menu_viewer_t menu_viewer_list;
|
|
|
|
void
|
|
grub_menu_viewer_register (grub_menu_viewer_t viewer)
|
|
{
|
|
viewer->next = menu_viewer_list;
|
|
menu_viewer_list = viewer;
|
|
}
|
|
|
|
static grub_menu_viewer_t get_current_menu_viewer (void)
|
|
{
|
|
const char *selected_name = grub_env_get ("menuviewer");
|
|
|
|
/* If none selected, pick the last registered one. */
|
|
if (selected_name == 0)
|
|
return menu_viewer_list;
|
|
|
|
grub_menu_viewer_t cur;
|
|
for (cur = menu_viewer_list; cur; cur = cur->next)
|
|
{
|
|
if (grub_strcmp (cur->name, selected_name) == 0)
|
|
return cur;
|
|
}
|
|
|
|
/* Fall back to the first entry (or null). */
|
|
return menu_viewer_list;
|
|
}
|
|
|
|
grub_err_t
|
|
grub_menu_viewer_show_menu (grub_menu_t menu, int nested)
|
|
{
|
|
grub_menu_viewer_t cur = get_current_menu_viewer ();
|
|
if (!cur)
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, "No menu viewer available.");
|
|
|
|
return cur->show_menu (menu, nested);
|
|
}
|
|
|