ce5bf700ca
* include/pupa/normal.h: New file. * include/pupa/setjmp.h: Likewise. * include/pupa/i386/setjmp.h: Likewise. * normal/cmdline.c: Likewise. * normal/command.c: Likewise. * normal/main.c: Likewise. * normal/menu.c: Likewise. * normal/i386/setjmp.S: Likewise. * loader/i386/pc/linux.c (pupa_rescue_cmd_linux): Made global. (pupa_rescue_cmd_initrd): Likewise. * loader/i386/pc/chainloader.c (pupa_rescue_cmd_chainloader): Likewise. * kern/i386/pc/startup.S (translation_table): New variable. (translate_keycode): New function. (pupa_console_getkey): Call translate_keycode. * kern/rescue.c (attempt_normal_mode): New function. (pupa_enter_rescue_mode): Attempt to execute the normal mode. If it failed, print a message. * kern/mm.c (pupa_real_malloc): Print more information when a free magic is broken. (pupa_free): If the first free header is not free actually, set it to P. * kern/main.c (pupa_load_normal_mode): Just load the module "normal". (pupa_main): Don't print the message "Entering into rescue mode..." here. * include/pupa/i386/pc/loader.h (pupa_rescue_cmd_initrd): Declared. (pupa_rescue_cmd_initrd): Likewise. (pupa_rescue_cmd_initrd): Likewise. * include/pupa/symbol.h (FUNCTION): Specify the type. (VARIABLE): Likewise. * include/pupa/err.h (pupa_err_t): Added PUPA_ERR_UNKNOWN_COMMAND. * include/pupa/dl.h (pupa_dl_set_prefix): Exported. (pupa_dl_get_prefix): Likewise. * conf/i386-pc.rmk (pkgdata_MODULES): Added normal.mod. Added _chain.mod and _linux.mod instead of chain.mod and linux.mod. (chain_mod_SOURCES): Renamed to ... (_chain_mod_SOURCES): ... this. (chain_mod_CFLAGS): Renamed to ... (_chain_mod_CFLAGS): ... this. (linux_mod_SOURCES): Renamed to ... (_linux_mod_SOURCES): ... this. (linux_mod_CFLAGS): Renamed to ... (_linux_mod_CFLAGS): ... this. (normal_mod_SOURCES): New variable. (normal_mod_CFLAGS): Likewise. (normal_mod_ASFLAGS): Likewise. 2003-01-18 Yoshinori K. Okuji <okuji@enbug.org> * kern/rescue.c (pupa_rescue_cmd_rmmod): Call pupa_dl_unload, if possible. * kern/dl.c (pupa_dl_ref): Refer dependending modules recursively. (pupa_dl_unref): Unrefer depending modules recursively. Don't call pupa_dl_unload implicitly, because PUPA can crash if a module is unloaded before one depending on that module is unloaded. (pupa_dl_unload): Unload depending modules explicitly, if possible.
272 lines
5.1 KiB
C
272 lines
5.1 KiB
C
/*
|
|
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
|
* Copyright (C) 2003 Yoshinori K. Okuji <okuji@enbug.org>
|
|
*
|
|
* This program 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 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <pupa/normal.h>
|
|
#include <pupa/term.h>
|
|
#include <pupa/misc.h>
|
|
|
|
/* FIXME: These below are all runaround. */
|
|
|
|
#define DISP_UP 0x18
|
|
#define DISP_DOWN 0x19
|
|
#define DISP_RIGHT 0x1a
|
|
#define DISP_HLINE 0xc4
|
|
#define DISP_VLINE 0xb3
|
|
#define DISP_UL 0xda
|
|
#define DISP_UR 0xbf
|
|
#define DISP_LL 0xc0
|
|
#define DISP_LR 0xd9
|
|
|
|
static void
|
|
draw_border (void)
|
|
{
|
|
unsigned i;
|
|
|
|
pupa_setcolorstate (PUPA_TERM_COLOR_NORMAL);
|
|
|
|
pupa_gotoxy (1, 3);
|
|
pupa_putchar (DISP_UL);
|
|
for (i = 0; i < 73; i++)
|
|
pupa_putchar (DISP_HLINE);
|
|
pupa_putchar (DISP_UR);
|
|
|
|
i = 1;
|
|
while (1)
|
|
{
|
|
pupa_gotoxy (1, 3 + i);
|
|
|
|
if (i > 12)
|
|
break;
|
|
|
|
pupa_putchar (DISP_VLINE);
|
|
pupa_gotoxy (75, 3 + i);
|
|
pupa_putchar (DISP_VLINE);
|
|
|
|
i++;
|
|
}
|
|
|
|
pupa_putchar (DISP_LL);
|
|
for (i = 0; i < 73; i++)
|
|
pupa_putchar (DISP_HLINE);
|
|
pupa_putchar (DISP_LR);
|
|
|
|
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
|
|
}
|
|
|
|
static void
|
|
print_message (int nested)
|
|
{
|
|
pupa_printf ("\n\
|
|
Use the %c and %c keys to select which entry is highlighted.\n",
|
|
DISP_UP, DISP_DOWN);
|
|
pupa_printf ("\
|
|
Press enter to boot the selected OS, \'e\' to edit the\n\
|
|
commands before booting, or \'c\' for a command-line.");
|
|
if (nested)
|
|
pupa_printf ("\
|
|
ESC to return previous menu.");
|
|
}
|
|
|
|
static pupa_menu_entry_t
|
|
get_entry (pupa_menu_t menu, int no)
|
|
{
|
|
pupa_menu_entry_t e;
|
|
|
|
for (e = menu->entry_list; e && no > 0; e = e->next, no--)
|
|
;
|
|
|
|
return e;
|
|
}
|
|
|
|
static void
|
|
print_entry (int y, int highlight, pupa_menu_entry_t entry)
|
|
{
|
|
int x;
|
|
const char *title;
|
|
|
|
title = entry ? entry->title : "";
|
|
|
|
pupa_setcolorstate (highlight
|
|
? PUPA_TERM_COLOR_HIGHLIGHT
|
|
: PUPA_TERM_COLOR_NORMAL);
|
|
|
|
pupa_gotoxy (2, y);
|
|
pupa_putchar (' ');
|
|
for (x = 3; x < 75; x++)
|
|
{
|
|
if (*title && x <= 72)
|
|
{
|
|
if (x == 72)
|
|
pupa_putchar (DISP_RIGHT);
|
|
else
|
|
pupa_putchar (*title++);
|
|
}
|
|
else
|
|
pupa_putchar (' ');
|
|
}
|
|
pupa_gotoxy (74, y);
|
|
|
|
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
|
|
}
|
|
|
|
static void
|
|
print_entries (pupa_menu_t menu, int first, int offset)
|
|
{
|
|
pupa_menu_entry_t e;
|
|
int i;
|
|
|
|
pupa_gotoxy (77, 4);
|
|
|
|
if (first)
|
|
pupa_putchar (DISP_UP);
|
|
else
|
|
pupa_putchar (' ');
|
|
|
|
e = get_entry (menu, first);
|
|
|
|
for (i = 0; i < 12; i++)
|
|
{
|
|
print_entry (4 + i, offset == i, e);
|
|
if (e)
|
|
e = e->next;
|
|
}
|
|
|
|
pupa_gotoxy (77, 4 + 12);
|
|
|
|
if (e)
|
|
pupa_putchar (DISP_DOWN);
|
|
else
|
|
pupa_putchar (' ');
|
|
|
|
pupa_gotoxy (74, 4 + offset);
|
|
}
|
|
|
|
static void
|
|
init_page (int nested)
|
|
{
|
|
pupa_normal_init_page ();
|
|
draw_border ();
|
|
print_message (nested);
|
|
}
|
|
|
|
static int
|
|
run_menu (pupa_menu_t menu, int nested)
|
|
{
|
|
int first, offset;
|
|
|
|
pupa_setcursor (0);
|
|
|
|
first = 0;
|
|
offset = menu->default_entry;
|
|
if (offset > 11)
|
|
{
|
|
first = offset - 11;
|
|
offset = 11;
|
|
}
|
|
|
|
init_page (nested);
|
|
print_entries (menu, first, offset);
|
|
|
|
while (1)
|
|
{
|
|
int c;
|
|
|
|
c = PUPA_TERM_ASCII_CHAR (pupa_getkey ());
|
|
switch (c)
|
|
{
|
|
case 16:
|
|
case '^':
|
|
if (offset > 0)
|
|
{
|
|
print_entry (4 + offset, 0, get_entry (menu, first + offset));
|
|
offset--;
|
|
print_entry (4 + offset, 1, get_entry (menu, first + offset));
|
|
}
|
|
else if (first > 0)
|
|
{
|
|
first--;
|
|
print_entries (menu, first, offset);
|
|
}
|
|
break;
|
|
|
|
case 14:
|
|
case 'v':
|
|
if (menu->size > first + offset + 1)
|
|
{
|
|
if (offset < 11)
|
|
{
|
|
print_entry (4 + offset, 0,
|
|
get_entry (menu, first + offset));
|
|
offset++;
|
|
print_entry (4 + offset, 1,
|
|
get_entry (menu, first + offset));
|
|
}
|
|
else
|
|
{
|
|
first++;
|
|
print_entries (menu, first, offset);
|
|
}
|
|
}
|
|
break;
|
|
|
|
case '\n':
|
|
case '\r':
|
|
case 6:
|
|
pupa_setcursor (1);
|
|
return first + offset;
|
|
|
|
case '\e':
|
|
if (nested)
|
|
{
|
|
pupa_setcursor (1);
|
|
return -1;
|
|
}
|
|
break;
|
|
|
|
case 'c':
|
|
pupa_setcursor (1);
|
|
pupa_cmdline_run (1);
|
|
pupa_setcursor (0);
|
|
init_page (nested);
|
|
print_entries (menu, first, offset);
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Never reach here. */
|
|
return -1;
|
|
}
|
|
|
|
void
|
|
pupa_menu_run (pupa_menu_t menu, int nested)
|
|
{
|
|
while (1)
|
|
{
|
|
int boot_entry;
|
|
|
|
boot_entry = run_menu (menu, nested);
|
|
if (boot_entry < 0)
|
|
break;
|
|
|
|
/* FIXME: Boot the entry. */
|
|
}
|
|
}
|