2003-11-17 Marco Gerards <metgerards@student.han.nl>
* conf/i386-pc.rmk (sbin_UTILITIES): Added pupa-emu. (pupa_setup_SOURCES): Added util/i386/pc/getroot.c. (pupa_emu_SOURCES): New variable. (pupa_emu_LDFLAGS): Likewise. * include/pupa/fs.h (pupa_ext2_init) [PUPA_UTIL]: New prototype. (pupa_ext2_fini) [PUPA_UTIL]: Likewise. * include/pupa/normal.h (pupa_normal_init) [PUPA_UTIL]: Likewise. (pupa_normal_fini) [PUPA_UTIL]: Likewise. * include/pupa/setjmp.h [PUPA_UTIL]: Include <setjmp.h>. (pupa_jmp_buf): New typedef. (pupa_setjmp) [PUPA_UTIL]: New macro. (pupa_longjmp) [PUPA_UTIL]: Likewise. * include/pupa/term.h (struct pupa_term): New member `refresh'. (pupa_refresh): New prototype. * include/pupa/util/getroot.h: New file. * kern/misc.c (pupa_vsprintf): Refresh the screen after updating it. * kern/rescue.c (pupa_rescue_get_command_line): Likewise. (pupa_rescue_cmd_cat): Likewise. (pupa_rescue_cmd_ls): Likewise. (pupa_rescue_cmd_testload): Likewise. (pupa_rescue_cmd_lsmod): Likewise. * normal/cmdline.c (pupa_cmdline_get): Likewise. * normal/menu.c (run_menu): Likewise. * kern/term.c (pupa_cls): Likewise. (pupa_refresh): New function. * normal/normal.c (pupa_normal_init) [PUPA_UTIL]: New function. (pupa_normal_fini) [PUPA_UTIL]: Likewise. * util/console.c: New file. * util/i386/pc/getroot.c: New file. * util/i386/pc/pupa-setup.c: Include <pupa/util/getroot.h>. (pupa_putchar): New function. (pupa_refresh): Likewise. (xgetcwd): Function moved to ... (strip_extra_slashes): Likewise. (get_prefix): Likewise. * util/i386/pc/getroot.c: ... here. (find_root_device): Function moved and renamed to... * util/i386/pc/getroot.c (pupa_find_root_device): ... here. Changed all callers. * util/i386/pc/pupa-setup.c (guess_root_device): Function moved and renamed to... * util/i386/pc/getroot.c (pupa_guess_root_device): ... here. Changed all callers. * util/misc.c (pupa_memalign): New function. (pupa_mm_init_region): Likewise. (pupa_register_exported_symbols): Likewise. (pupa_putchar): Function removed. * util/pupa-emu.c: New file.
This commit is contained in:
marco_g
parent
9a5c1adeaa
commit
1f7315a3de
19 changed files with 1027 additions and 233 deletions
204
util/console.c
Normal file
204
util/console.c
Normal file
|
|
@ -0,0 +1,204 @@
|
|||
/* console.c -- Ncurses console for PUPA. */
|
||||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* Copyright (C) 2003 Marco Gerards <metgerards@student.han.nl>
|
||||
*
|
||||
* 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 <curses.h>
|
||||
#include <pupa/machine/console.h>
|
||||
#include <pupa/term.h>
|
||||
#include <pupa/types.h>
|
||||
|
||||
static int pupa_console_attr = A_NORMAL;
|
||||
|
||||
static void
|
||||
pupa_ncurses_putchar (pupa_uint32_t c)
|
||||
{
|
||||
addch (c | pupa_console_attr);
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_ncurses_setcolorstate (pupa_term_color_state state)
|
||||
{
|
||||
switch (state)
|
||||
{
|
||||
case PUPA_TERM_COLOR_STANDARD:
|
||||
pupa_console_attr = A_NORMAL;
|
||||
break;
|
||||
case PUPA_TERM_COLOR_NORMAL:
|
||||
pupa_console_attr = A_NORMAL;
|
||||
break;
|
||||
case PUPA_TERM_COLOR_HIGHLIGHT:
|
||||
pupa_console_attr = A_STANDOUT;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* XXX: This function is never called. */
|
||||
static void
|
||||
pupa_ncurses_setcolor (pupa_uint8_t normal_color, pupa_uint8_t highlight_color)
|
||||
{
|
||||
color_set (normal_color << 8 | highlight_color, 0);
|
||||
}
|
||||
|
||||
static int
|
||||
pupa_ncurses_checkkey (void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
pupa_ncurses_getkey (void)
|
||||
{
|
||||
int c = getch ();
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case KEY_LEFT:
|
||||
c = PUPA_CONSOLE_KEY_LEFT;
|
||||
break;
|
||||
|
||||
case KEY_RIGHT:
|
||||
c = PUPA_CONSOLE_KEY_RIGHT;
|
||||
break;
|
||||
|
||||
case KEY_UP:
|
||||
c = PUPA_CONSOLE_KEY_UP;
|
||||
break;
|
||||
|
||||
case KEY_DOWN:
|
||||
c = PUPA_CONSOLE_KEY_DOWN;
|
||||
break;
|
||||
|
||||
case KEY_IC:
|
||||
c = PUPA_CONSOLE_KEY_IC;
|
||||
break;
|
||||
|
||||
case KEY_DC:
|
||||
c = PUPA_CONSOLE_KEY_DC;
|
||||
break;
|
||||
|
||||
case KEY_BACKSPACE:
|
||||
c = PUPA_CONSOLE_KEY_BACKSPACE;
|
||||
break;
|
||||
|
||||
case KEY_HOME:
|
||||
c = PUPA_CONSOLE_KEY_HOME;
|
||||
break;
|
||||
|
||||
case KEY_END:
|
||||
c = PUPA_CONSOLE_KEY_END;
|
||||
break;
|
||||
|
||||
case KEY_NPAGE:
|
||||
c = PUPA_CONSOLE_KEY_NPAGE;
|
||||
break;
|
||||
|
||||
case KEY_PPAGE:
|
||||
c = PUPA_CONSOLE_KEY_PPAGE;
|
||||
break;
|
||||
}
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
static pupa_uint16_t
|
||||
pupa_ncurses_getxy (void)
|
||||
{
|
||||
int x;
|
||||
int y;
|
||||
|
||||
getyx (stdscr, y, x);
|
||||
|
||||
return (x << 8) | y;
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_ncurses_gotoxy (pupa_uint8_t x, pupa_uint8_t y)
|
||||
{
|
||||
move (y, x);
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_ncurses_cls (void)
|
||||
{
|
||||
clear ();
|
||||
refresh ();
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_ncurses_setcursor (int on)
|
||||
{
|
||||
curs_set (on ? 1 : 0);
|
||||
}
|
||||
|
||||
static void
|
||||
pupa_ncurses_refresh (void)
|
||||
{
|
||||
refresh ();
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ncurses_init (void)
|
||||
{
|
||||
initscr ();
|
||||
cbreak ();
|
||||
noecho ();
|
||||
scrollok (stdscr, TRUE);
|
||||
|
||||
nonl ();
|
||||
intrflush (stdscr, FALSE);
|
||||
keypad (stdscr, TRUE);
|
||||
start_color ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pupa_err_t
|
||||
pupa_ncurses_fini (void)
|
||||
{
|
||||
endwin ();
|
||||
}
|
||||
|
||||
|
||||
static struct pupa_term pupa_ncurses_term =
|
||||
{
|
||||
.name = "console",
|
||||
.init = pupa_ncurses_init,
|
||||
.fini = pupa_ncurses_fini,
|
||||
.putchar = pupa_ncurses_putchar,
|
||||
.checkkey = pupa_ncurses_checkkey,
|
||||
.getkey = pupa_ncurses_getkey,
|
||||
.getxy = pupa_ncurses_getxy,
|
||||
.gotoxy = pupa_ncurses_gotoxy,
|
||||
.cls = pupa_ncurses_cls,
|
||||
.setcolorstate = pupa_ncurses_setcolorstate,
|
||||
.setcolor = pupa_ncurses_setcolor,
|
||||
.setcursor = pupa_ncurses_setcursor,
|
||||
.refresh = pupa_ncurses_refresh,
|
||||
.flags = 0,
|
||||
.next = 0
|
||||
};
|
||||
|
||||
void
|
||||
pupa_console_init (void)
|
||||
{
|
||||
pupa_term_register (&pupa_ncurses_term);
|
||||
pupa_term_set_current (&pupa_ncurses_term);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue