18d9c7cd53
I forgot to check in these changes for a long time. This adds incomplete support for VGA console, and this is still very buggy. Also, a lot of consideration is required for I18N, UNICODE, and VGA font issues. Therefore, assume that this is such that "better than nothing". * font/manager.c: New file. * include/pupa/font.h: Likewise. * include/pupa/i386/pc/vga.h: Likewise. * term/i386/pc/vga.c: Likewise. * util/unifont2pff.rb: Likewise. * conf/i386-pc.rmk (kernel_img_HEADERS): Added machine/vga.h. (pkgdata_MODULES): Added vga.mod and font.mod. (vga_mod_SOURCES): New variables. (vga_mod_CFLAGS): Likewise. (font_mod_SOURCES): Likewise. (font_mod_CFLAGS): Likewise. * include/pupa/err.h (PUPA_ERR_BAD_FONT): New constant. * include/pupa/term.h: Include pupa/err.h. (struct pupa_term): Added init and fini. Changed the argument of putchar to pupa_uint32_t. * include/pupa/i386/pc/console.h: Include pupa/symbol.h. (pupa_console_real_putchar): New prototype. (pupa_console_putchar): Removed. (pupa_console_checkkey): Exported. (pupa_console_getkey): Likewise. * kern/misc.c (pupa_vsprintf): Add support for UNICODE characters. * kern/term.c (pupa_term_set_current): Rewritten. (pupa_putchar): Likewise. (pupa_putcode): New function. * kern/i386/pc/startup.S (pupa_console_putchar): Renamed to ... (pupa_console_real_putchar): ... this. (pupa_vga_set_mode): New function. (pupa_vga_get_font): Likewise. * normal/command.c: Include pupa/term.h. (terminal_command): New function. (pupa_command_init): Register the command "terminal". * normal/menu.c (DISP_LEFT): Changed to a UNICODE value. (DISP_UP): Likewise. (DISP_RIGHT): Likewise. (DISP_DOWN): Likewise. (DISP_HLINE): Likewise. (DISP_VLINE): Likewise. (DISP_UL): Likewise. (DISP_UR): Likewise. (DISP_LL): Likewise. (DISP_LR): Likewise. * term/i386/pc/console.c (pupa_console_putchar): New function.
225 lines
4.5 KiB
C
225 lines
4.5 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/misc.h>
|
|
#include <pupa/mm.h>
|
|
#include <pupa/err.h>
|
|
#include <pupa/term.h>
|
|
|
|
static pupa_command_t pupa_command_list;
|
|
|
|
void
|
|
pupa_register_command (const char *name,
|
|
int (*func) (int argc, char *argv[]),
|
|
unsigned flags,
|
|
const char *summary,
|
|
const char *description)
|
|
{
|
|
pupa_command_t cmd, *p;
|
|
|
|
cmd = (pupa_command_t) pupa_malloc (sizeof (*cmd));
|
|
if (! cmd)
|
|
return;
|
|
|
|
cmd->name = name;
|
|
cmd->func = func;
|
|
cmd->flags = flags;
|
|
cmd->summary = summary;
|
|
cmd->description = description;
|
|
|
|
/* Keep the list sorted for simplicity. */
|
|
p = &pupa_command_list;
|
|
while (*p)
|
|
{
|
|
if (pupa_strcmp ((*p)->name, name) > 0)
|
|
break;
|
|
|
|
p = &((*p)->next);
|
|
}
|
|
|
|
cmd->next = *p;
|
|
*p = cmd;
|
|
}
|
|
|
|
void
|
|
pupa_unregister_command (const char *name)
|
|
{
|
|
pupa_command_t *p, q;
|
|
|
|
for (p = &pupa_command_list, q = *p; q; p = &(q->next), q = q->next)
|
|
if (pupa_strcmp (name, q->name) == 0)
|
|
{
|
|
*p = q->next;
|
|
pupa_free (q);
|
|
break;
|
|
}
|
|
}
|
|
|
|
pupa_command_t
|
|
pupa_command_find (char *cmdline)
|
|
{
|
|
char *first_space;
|
|
pupa_command_t cmd;
|
|
|
|
first_space = pupa_strchr (cmdline, ' ');
|
|
if (first_space)
|
|
*first_space = '\0';
|
|
|
|
for (cmd = pupa_command_list; cmd; cmd = cmd->next)
|
|
if (pupa_strcmp (cmdline, cmd->name) == 0)
|
|
break;
|
|
|
|
if (! cmd)
|
|
pupa_error (PUPA_ERR_UNKNOWN_COMMAND, "unknown command `%s'", cmdline);
|
|
|
|
if (first_space)
|
|
*first_space = ' ';
|
|
|
|
return cmd;
|
|
}
|
|
|
|
int
|
|
pupa_command_execute (char *cmdline)
|
|
{
|
|
pupa_command_t cmd;
|
|
char *p;
|
|
char **args;
|
|
int num = 0;
|
|
int i;
|
|
int ret;
|
|
|
|
cmd = pupa_command_find (cmdline);
|
|
if (! cmd)
|
|
return -1;
|
|
|
|
/* Count arguments. */
|
|
p = cmdline;
|
|
while (1)
|
|
{
|
|
while (*p && *p != ' ')
|
|
p++;
|
|
|
|
if (! *p)
|
|
break;
|
|
|
|
while (*p == ' ')
|
|
p++;
|
|
|
|
num++;
|
|
}
|
|
|
|
args = (char **) pupa_malloc (sizeof (char *) * (num + 1));
|
|
if (! args)
|
|
return -1;
|
|
|
|
/* Fill arguments. */
|
|
for (i = 0, p = pupa_strchr (cmdline, ' '); i < num && p; i++)
|
|
{
|
|
if (! p)
|
|
break;
|
|
|
|
while (*p == ' ')
|
|
p++;
|
|
|
|
args[i] = p;
|
|
|
|
while (*p && *p != ' ')
|
|
p++;
|
|
|
|
*p++ = '\0';
|
|
}
|
|
|
|
/* Terminate the array with NULL. */
|
|
args[i] = 0;
|
|
|
|
ret = (cmd->func) (num, args);
|
|
|
|
pupa_free (args);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
rescue_command (int argc __attribute__ ((unused)),
|
|
char *argv[] __attribute__ ((unused)))
|
|
{
|
|
pupa_longjmp (pupa_exit_env, 0);
|
|
|
|
/* Never reach here. */
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
terminal_command (int argc, char *argv[])
|
|
{
|
|
pupa_term_t term = 0;
|
|
|
|
auto int print_terminal (pupa_term_t);
|
|
auto int find_terminal (pupa_term_t);
|
|
|
|
int print_terminal (pupa_term_t t)
|
|
{
|
|
pupa_printf (" %s", t->name);
|
|
return 0;
|
|
}
|
|
|
|
int find_terminal (pupa_term_t t)
|
|
{
|
|
if (pupa_strcmp (t->name, argv[0]) == 0)
|
|
{
|
|
term = t;
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
if (argc == 0)
|
|
{
|
|
pupa_printf ("Available terminal(s):");
|
|
pupa_term_iterate (print_terminal);
|
|
pupa_putchar ('\n');
|
|
|
|
pupa_printf ("Current terminal: %s\n", pupa_term_get_current ()->name);
|
|
}
|
|
else
|
|
{
|
|
pupa_term_iterate (find_terminal);
|
|
if (! term)
|
|
return pupa_error (PUPA_ERR_BAD_ARGUMENT, "no such terminal");
|
|
|
|
pupa_term_set_current (term);
|
|
}
|
|
|
|
return PUPA_ERR_NONE;
|
|
}
|
|
|
|
void
|
|
pupa_command_init (void)
|
|
{
|
|
/* This is a special command, because this never be called actually. */
|
|
pupa_register_command ("title", 0, PUPA_COMMAND_FLAG_TITLE, 0, 0);
|
|
|
|
pupa_register_command ("rescue", rescue_command, PUPA_COMMAND_FLAG_BOTH,
|
|
"rescue",
|
|
"Enter into the rescue mode.");
|
|
pupa_register_command ("terminal", terminal_command, PUPA_COMMAND_FLAG_BOTH,
|
|
"terminal [TERM...]",
|
|
"Select a terminal.");
|
|
}
|