db1771cfbe
* commands/boot.c: New file. * commands/cat.c: Likewise. * commands/cmp.c: Likewise. * commands/ls.c: Likewise. * commands/terminal.c: Likewise. * normal/command.c: Include <pupa/env.h> and <pupa/dl.h>. (pupa_register_command): Changed interface to match the new argument parser. (pupa_command_execute): Changed (almost rewritten) so it uses pupa_split_command. Added support for setting variables using the syntax `foo=bar'. (rescue_command): Changed to work with the new argument parser. (terminal_command): Moved from here to commands/terminal.c. (set_command): New function. (unset_command): New function. (insmod_command): New function. (rmmod_command): New function. (lsmod_command): New function. (pupa_command_init): Don't initialize the command terminal anymore. Initialize the commands set, unset, insmod, rmmod and lsmod. * conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c. (kernel_img_HEADERS): Add arg.h and env.h. (pupa_mkimage_LDFLAGS): Add kern/env.c. (pupa_emu_SOURCES): Add kern/env.c, commands/ls.c, commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c, normal/arg.c. (pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and terminal.mod. (normal_mod_SOURCES): Add normal/arg.c and normal/arg.c. (boot_mod_SOURCES): New variable. (terminal_mod_SOURCES): Likewise. (ls_mod_SOURCES): Likewise. (cmp_mod_SOURCES): Likewise. (cat_mod_SOURCES): Likewise. * normal/arg.c: New file. * kern/env.c: Likewise. * include/pupa/arg.h: Likewise. * include/pupa/env.h: Likewise. * font/manager.c (font_command): Changed to match argument parsing interface changes. (PUPA_MOD_INIT): Likewise. * hello/hello.c (pupa_cmd_hello): Likewise. (PUPA_MOD_INIT): Likewise. * include/pupa/disk.h: Include <pupa/device.h>. (pupa_print_partinfo): New prototype. * include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed. (pupa_dl_get_prefix): Likewise. * include/pupa/misc.h: Include <pupa/err.h>. (pupa_isgraph): New prototype. (pupa_isdigit): Likewise. (pupa_split_cmdline): Likewise. * include/pupa/normal.h: Include <pupa/arg.h>. (pupa_command): Changed the prototype of the member `func' to match the argument parsing interface. Added member `options'. (pupa_register_command): Updated to match function. (pupa_arg_parse): New prototype. (pupa_hello_init) [PUPA_UTIL]: New prototype. (pupa_hello_fini) [PUPA_UTIL]: Likewise. (pupa_ls_init) [PUPA_UTIL]: Likewise. (pupa_ls_fini) [PUPA_UTIL]: Likewise. (pupa_cat_init) [PUPA_UTIL]: Likewise. (pupa_cat_fini) [PUPA_UTIL]: Likewise. (pupa_boot_init) [PUPA_UTIL]: Likewise. (pupa_boot_fini) [PUPA_UTIL]: Likewise. (pupa_cmp_init) [PUPA_UTIL]: Likewise. (pupa_cmp_fini) [PUPA_UTIL]: Likewise. (pupa_terminal_init) [PUPA_UTIL]: Likewise. (pupa_terminal_fini) [PUPA_UTIL]: Likewise. * kern/disk.c: Include <pupa/file.h>. (pupa_print_partinfo): New function. * kern/dl.c: Include <pupa/env.h>. (pupa_dl_dir): Variable removed. (pupa_dl_load): Use the environment variable `prefix' instead of the variable pupa_dl_dir. (pupa_dl_set_prefix): Function removed. (pupa_dl_get_prefix): Likewise. * kern/i386/pc/init.c: Include <pupa/env.h>. (pupa_machine_init): Use the environment variable `prefix' instead of using pupa_dl_set_prefix to set the prefix. * kern/main.c: Include <pupa/env.h>. (pupa_set_root_dev): Use the environment variable `prefix' instead of using pupa_dl_get_prefix to get the prefix. * kern/misc.c: Include <pupa/env.h>. (pupa_isdigit): New function. (pupa_isgraph): Likewise. (pupa_ftoa): Likewise. (pupa_vsprintf): Added support for printing values of the type `double'. Make it possible to format variable output when using formatting like `%1.2%f'. (pupa_split_cmdline): New function. * kern/rescue.c: Include <pupa/env.h>. (next_word): Removed function. (pupa_rescue_cmd_prefix): Likewise. (pupa_rescue_cmd_set): New function. (pupa_rescue_cmd_unset): New function. (pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to split the command line instead of splitting it here. Added support for setting variables using the syntax `foo=bar'. Don't initialize the prefix command anymore. Initialized the set and unset commands. * normal/cmdline.c: Include <pupa/env.h>. (pupa_tab_complete): Added prototypes for print_simple_completion, print_partition_completion, add_completion, iterate_commands, iterate_dev, iterate_part and iterate_dir. Moved code to print partition information from here to kern/disk.c. (pupa_cmdline_run): Don't check if the funtion exists anymore. * normal/main.c: Include <pupa/env.h>. (pupa_rescue_cmd_normal): Use the environment variable `prefix' instead of using pupa_dl_get_prefix to get the prefix. * term/i386/pc/vga.c: Include <pupa/arg.h>. (check_vga_mem): Cast pointers to `void *' to silence a gcc warning. (pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case. (pupa_vga_setcolor): Declare unused variables with `__attribute__ ((unused))' to silence a gcc warning. (pupa_vga_setcolor): Likewise. (debug_command): Changed to match argument parsing interface changes. * util/pupa-emu.c: Include <pupa/env.h>. (options): Added 0's for unused fields to silence a gcc warning. (argp): Likewise. (main): Use the environment variable `prefix' instead of using pupa_dl_set_prefix to set the prefix. Initialize the commands ls, boot, cmp, cat and terminal. Finish the commands boot, cmp, cat and terminal. * util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>. * util/misc.c: Include <malloc.h>. (pupa_malloc): Rewritten so errors are correctly reported. (pupa_realloc): Likewise. (pupa_memalign): Likewise. (pupa_mm_init_region): Declare unused variables with `__attribute__ ((unused))' to silence a gcc warning. * normal/i386/setjmp.S: Remove tab at the end of the file to silence a gcc warning. * loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused variables with `__attribute__ ((unused))' to silence a gcc warning. * loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the local variable i unsigned to silence a gcc warning. * kern/term.c: Include <pupa/misc.h>. (pupa_more_lines): New variable. (pupa_more): Likewise. (pupa_putcode): When the pager is active pause at the end of every screen. (pupa_set_more): New function. * include/pupa/term.h (pupa_set_more): New prototype.
284 lines
5.1 KiB
C
284 lines
5.1 KiB
C
/*
|
|
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
|
* Copyright (C) 2002,2003 Free Software Foundation, Inc.
|
|
*
|
|
* PUPA 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 PUPA; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <pupa/term.h>
|
|
#include <pupa/err.h>
|
|
#include <pupa/mm.h>
|
|
#include <pupa/misc.h>
|
|
|
|
/* The list of terminals. */
|
|
static pupa_term_t pupa_term_list;
|
|
|
|
/* The current terminal. */
|
|
static pupa_term_t pupa_cur_term;
|
|
|
|
/* The amount of lines counted by the pager. */
|
|
static int pupa_more_lines;
|
|
|
|
/* If the more pager is active. */
|
|
static int pupa_more;
|
|
|
|
void
|
|
pupa_term_register (pupa_term_t term)
|
|
{
|
|
term->next = pupa_term_list;
|
|
pupa_term_list = term;
|
|
}
|
|
|
|
void
|
|
pupa_term_unregister (pupa_term_t term)
|
|
{
|
|
pupa_term_t *p, q;
|
|
|
|
for (p = &pupa_term_list, q = *p; q; p = &(q->next), q = q->next)
|
|
if (q == term)
|
|
{
|
|
*p = q->next;
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
pupa_term_iterate (int (*hook) (pupa_term_t term))
|
|
{
|
|
pupa_term_t p;
|
|
|
|
for (p = pupa_term_list; p; p = p->next)
|
|
if (hook (p))
|
|
break;
|
|
}
|
|
|
|
pupa_err_t
|
|
pupa_term_set_current (pupa_term_t term)
|
|
{
|
|
if (pupa_cur_term && pupa_cur_term->fini)
|
|
if ((pupa_cur_term->fini) () != PUPA_ERR_NONE)
|
|
return pupa_errno;
|
|
|
|
if (term->init)
|
|
if ((term->init) () != PUPA_ERR_NONE)
|
|
return pupa_errno;
|
|
|
|
pupa_cur_term = term;
|
|
pupa_cls ();
|
|
return PUPA_ERR_NONE;
|
|
}
|
|
|
|
pupa_term_t
|
|
pupa_term_get_current (void)
|
|
{
|
|
return pupa_cur_term;
|
|
}
|
|
|
|
/* Put a Unicode character. */
|
|
void
|
|
pupa_putcode (pupa_uint32_t code)
|
|
{
|
|
if (code == '\t' && pupa_cur_term->getxy)
|
|
{
|
|
int n;
|
|
|
|
n = 8 - ((pupa_getxy () >> 8) & 7);
|
|
while (n--)
|
|
pupa_putcode (' ');
|
|
|
|
return;
|
|
}
|
|
|
|
(pupa_cur_term->putchar) (code);
|
|
|
|
if (code == '\n')
|
|
{
|
|
pupa_putcode ('\r');
|
|
|
|
pupa_more_lines++;
|
|
/* XXX: Don't use a fixed height! */
|
|
if (pupa_more && pupa_more_lines == 24 - 1)
|
|
{
|
|
char key;
|
|
int pos = pupa_getxy ();
|
|
|
|
/* Show --MORE-- on the lower left side of the screen. */
|
|
pupa_gotoxy (1, 24 - 1);
|
|
pupa_setcolorstate (PUPA_TERM_COLOR_HIGHLIGHT);
|
|
pupa_printf ("--MORE--");
|
|
pupa_setcolorstate (PUPA_TERM_COLOR_STANDARD);
|
|
|
|
key = pupa_getkey ();
|
|
|
|
/* Remove the message. */
|
|
pupa_gotoxy (1, 24 -1);
|
|
pupa_printf (" ");
|
|
pupa_gotoxy (pos >> 8, pos & 0xFF);
|
|
|
|
/* Scroll one lines or an entire page, depending on the key. */
|
|
if (key == '\r' || key =='\n')
|
|
pupa_more_lines--;
|
|
else
|
|
pupa_more_lines = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Put a character. C is one byte of a UTF-8 stream.
|
|
This function gathers bytes until a valid Unicode character is found. */
|
|
void
|
|
pupa_putchar (int c)
|
|
{
|
|
static pupa_uint32_t code = 0;
|
|
static int count = 0;
|
|
|
|
if (count)
|
|
{
|
|
if ((c & 0xc0) != 0x80)
|
|
{
|
|
/* invalid */
|
|
code = '@';
|
|
count = 0;
|
|
}
|
|
else
|
|
{
|
|
code <<= 6;
|
|
code |= (c & 0x3f);
|
|
count--;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if ((c & 0x80) == 0x00)
|
|
code = c;
|
|
else if ((c & 0xe0) == 0xc0)
|
|
{
|
|
count = 1;
|
|
code = c & 0x1f;
|
|
}
|
|
else if ((c & 0xf0) == 0xe0)
|
|
{
|
|
count = 2;
|
|
code = c & 0x0f;
|
|
}
|
|
else if ((c & 0xf8) == 0xf0)
|
|
{
|
|
count = 3;
|
|
code = c & 0x07;
|
|
}
|
|
else if ((c & 0xfc) == 0xf8)
|
|
{
|
|
count = 4;
|
|
code = c & 0x03;
|
|
}
|
|
else if ((c & 0xfe) == 0xfc)
|
|
{
|
|
count = 5;
|
|
code = c & 0x01;
|
|
}
|
|
else
|
|
/* invalid */
|
|
code = '?';
|
|
}
|
|
|
|
if (count)
|
|
/* Not finished yet. */
|
|
return;
|
|
|
|
pupa_putcode (code);
|
|
}
|
|
|
|
int
|
|
pupa_getkey (void)
|
|
{
|
|
return (pupa_cur_term->getkey) ();
|
|
}
|
|
|
|
int
|
|
pupa_checkkey (void)
|
|
{
|
|
return (pupa_cur_term->checkkey) ();
|
|
}
|
|
|
|
pupa_uint16_t
|
|
pupa_getxy (void)
|
|
{
|
|
return (pupa_cur_term->getxy) ();
|
|
}
|
|
|
|
void
|
|
pupa_gotoxy (pupa_uint8_t x, pupa_uint8_t y)
|
|
{
|
|
(pupa_cur_term->gotoxy) (x, y);
|
|
}
|
|
|
|
void
|
|
pupa_cls (void)
|
|
{
|
|
if (pupa_cur_term->flags & PUPA_TERM_DUMB)
|
|
{
|
|
pupa_putchar ('\n');
|
|
pupa_refresh ();
|
|
}
|
|
else
|
|
(pupa_cur_term->cls) ();
|
|
}
|
|
|
|
void
|
|
pupa_setcolorstate (pupa_term_color_state state)
|
|
{
|
|
if (pupa_cur_term->setcolorstate)
|
|
(pupa_cur_term->setcolorstate) (state);
|
|
}
|
|
|
|
void
|
|
pupa_setcolor (pupa_uint8_t normal_color, pupa_uint8_t highlight_color)
|
|
{
|
|
if (pupa_cur_term->setcolor)
|
|
(pupa_cur_term->setcolor) (normal_color, highlight_color);
|
|
}
|
|
|
|
int
|
|
pupa_setcursor (int on)
|
|
{
|
|
static int prev = 1;
|
|
int ret = prev;
|
|
|
|
if (pupa_cur_term->setcursor)
|
|
{
|
|
(pupa_cur_term->setcursor) (on);
|
|
prev = on;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
void
|
|
pupa_refresh (void)
|
|
{
|
|
if (pupa_cur_term->refresh)
|
|
(pupa_cur_term->refresh) ();
|
|
}
|
|
|
|
void
|
|
pupa_set_more (int onoff)
|
|
{
|
|
if (onoff == 1)
|
|
pupa_more++;
|
|
else
|
|
pupa_more--;
|
|
|
|
pupa_more_lines = 0;
|
|
}
|