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.
229 lines
4.1 KiB
C
229 lines
4.1 KiB
C
/*
|
|
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
|
* Copyright (C) 2002 Free Software Foundation, Inc.
|
|
* Copyright (C) 2002,2003 Yoshinori K. Okuji <okuji@enbug.org>
|
|
*
|
|
* 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>
|
|
|
|
/* The list of terminals. */
|
|
static pupa_term_t pupa_term_list;
|
|
|
|
/* The current terminal. */
|
|
static pupa_term_t pupa_cur_term;
|
|
|
|
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');
|
|
}
|
|
|
|
/* 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');
|
|
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;
|
|
}
|
|
|