1e901a7573
New font engine. Additional changes by Vesa Jääskeläinen <chaac@nic.fi> to adapt to build system and fixed gfxterm.c to work with different sized fonts. * configure.ac: Changed UNIFONT_HEX to UNIFONT_BDF. * configure: Re-generated. * DISTLIST: Removed font/manager.c. Added font/font.c. Added font/font_cmd.c. * Makefile.in: Changed UNIFONT_HEX to UNIFONT_BDF. Added Font tool compilation. * include/grub/misc.h (grub_utf8_to_ucs4): Changed prototype. Changed users. * kern/misc.c (grub_utf8_to_ucs4): Changed prototype. * kern/term.c: Changed users of grub_utf8_to_ucs4. * normal/menu.c: Likewise. * conf/common.rmk (font_mod_SOURCES): Removed font/manager.c. (font_mod_SOURCES): Added font/font_cmd.c, font/font.c. * include/grub/font.h: Replaced with new file. * include/grub/video.h (GRUB_VIDEO_MODE_TYPE_ALPHA): Changed value. (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED): Likewise. (GRUB_VIDEO_MODE_TYPE_COLOR_MASK): Likewise. (GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP): Added. (grub_video_blit_format): Added GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED. (grub_video_mode_info): Added bg_red, bg_green, bg_blue, bg_alpha, fg_red, fg_green, fg_blue, fg_alpha. (grub_video_adapter): Removed blit_glyph. (grub_video_blit_glyph): Removed. * font/manager.c: Removed file. * font/font.c: New file. * font/font_cmd.c: Likewise. * video/video.c (grub_video_blit_glyph): Removed. * video/i386/pc/vbe.c (grub_video_vbe_map_rgb): Added 1-bit support. (grub_video_vbe_map_rgba): Likewise. (grub_video_vbe_unmap_color_int): Likewise. (grub_video_vbe_blit_glyph): Removed. (grub_video_vbe_adapter): Removed blit_glyph. * video/i386/pc/vbeutil.c (get_data_ptr): Added 1-bit support. (get_pixel): Likewise. (set_pixel): Likewise. * commands/videotest.c (grub_cmd_videotest): Added more tests for fonts. * term/gfxterm.c: Adapted to new font engine. * term/i386/pc/vesafb.c: Marked as deprecated. Made it compile. * term/i386/pc/vga.c: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/BDFLoader.java: New file. * util/fonttool/src/org/gnu/grub/fonttool/CharDefs.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/CharacterRange.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/Converter.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/Font.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/Glyph.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/PFF2Sections.java: Likewise. * util/fonttool/src/org/gnu/grub/fonttool/PFF2Writer.java: Likewise. * util/grub.d/00_header.in: Changed to use new loadfont command. * util/grub-mkconfig_lib.in: Changed font extension.
177 lines
4.2 KiB
C
177 lines
4.2 KiB
C
/*
|
|
* GRUB -- GRand Unified Bootloader
|
|
* Copyright (C) 2006,2007,2009 Free Software Foundation, Inc.
|
|
*
|
|
* GRUB 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 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <grub/machine/vbeutil.h>
|
|
#include <grub/types.h>
|
|
#include <grub/video.h>
|
|
|
|
grub_uint8_t *
|
|
get_data_ptr (struct grub_video_i386_vbeblit_info *source,
|
|
unsigned int x, unsigned int y)
|
|
{
|
|
grub_uint8_t *ptr = 0;
|
|
|
|
switch (source->mode_info->bpp)
|
|
{
|
|
case 32:
|
|
ptr = (grub_uint8_t *)source->data
|
|
+ y * source->mode_info->pitch
|
|
+ x * 4;
|
|
break;
|
|
|
|
case 24:
|
|
ptr = (grub_uint8_t *)source->data
|
|
+ y * source->mode_info->pitch
|
|
+ x * 3;
|
|
break;
|
|
|
|
case 16:
|
|
case 15:
|
|
ptr = (grub_uint8_t *)source->data
|
|
+ y * source->mode_info->pitch
|
|
+ x * 2;
|
|
break;
|
|
|
|
case 8:
|
|
ptr = (grub_uint8_t *)source->data
|
|
+ y * source->mode_info->pitch
|
|
+ x;
|
|
break;
|
|
|
|
case 1:
|
|
/* For 1-bit bitmaps, addressing needs to be done at the bit level
|
|
and it doesn't make sense, in general, to ask for a pointer
|
|
to a particular pixel's data. */
|
|
break;
|
|
}
|
|
|
|
return ptr;
|
|
}
|
|
|
|
grub_video_color_t
|
|
get_pixel (struct grub_video_i386_vbeblit_info *source,
|
|
unsigned int x, unsigned int y)
|
|
{
|
|
grub_video_color_t color = 0;
|
|
|
|
switch (source->mode_info->bpp)
|
|
{
|
|
case 32:
|
|
color = *(grub_uint32_t *)get_data_ptr (source, x, y);
|
|
break;
|
|
|
|
case 24:
|
|
{
|
|
grub_uint8_t *ptr;
|
|
ptr = get_data_ptr (source, x, y);
|
|
color = ptr[0] | (ptr[1] << 8) | (ptr[2] << 16);
|
|
}
|
|
break;
|
|
|
|
case 16:
|
|
case 15:
|
|
color = *(grub_uint16_t *)get_data_ptr (source, x, y);
|
|
break;
|
|
|
|
case 8:
|
|
color = *(grub_uint8_t *)get_data_ptr (source, x, y);
|
|
break;
|
|
|
|
case 1:
|
|
if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED)
|
|
{
|
|
int bit_index = y * source->mode_info->width + x;
|
|
grub_uint8_t *ptr = (grub_uint8_t *)source->data
|
|
+ bit_index / 8;
|
|
int bit_pos = 7 - bit_index % 8;
|
|
color = (*ptr >> bit_pos) & 0x01;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return color;
|
|
}
|
|
|
|
void
|
|
set_pixel (struct grub_video_i386_vbeblit_info *source,
|
|
unsigned int x, unsigned int y, grub_video_color_t color)
|
|
{
|
|
switch (source->mode_info->bpp)
|
|
{
|
|
case 32:
|
|
{
|
|
grub_uint32_t *ptr;
|
|
|
|
ptr = (grub_uint32_t *)get_data_ptr (source, x, y);
|
|
|
|
*ptr = color;
|
|
}
|
|
break;
|
|
|
|
case 24:
|
|
{
|
|
grub_uint8_t *ptr;
|
|
grub_uint8_t *colorptr = (grub_uint8_t *)&color;
|
|
|
|
ptr = get_data_ptr (source, x, y);
|
|
|
|
ptr[0] = colorptr[0];
|
|
ptr[1] = colorptr[1];
|
|
ptr[2] = colorptr[2];
|
|
}
|
|
break;
|
|
|
|
case 16:
|
|
case 15:
|
|
{
|
|
grub_uint16_t *ptr;
|
|
|
|
ptr = (grub_uint16_t *)get_data_ptr (source, x, y);
|
|
|
|
*ptr = (grub_uint16_t) (color & 0xFFFF);
|
|
}
|
|
break;
|
|
|
|
case 8:
|
|
{
|
|
grub_uint8_t *ptr;
|
|
|
|
ptr = (grub_uint8_t *)get_data_ptr (source, x, y);
|
|
|
|
*ptr = (grub_uint8_t) (color & 0xFF);
|
|
}
|
|
break;
|
|
|
|
case 1:
|
|
if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED)
|
|
{
|
|
int bit_index = y * source->mode_info->width + x;
|
|
grub_uint8_t *ptr = (grub_uint8_t *)source->data
|
|
+ bit_index / 8;
|
|
int bit_pos = 7 - bit_index % 8;
|
|
*ptr = (*ptr & ~(1 << bit_pos)) | ((color & 0x01) << bit_pos);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|