Vladimir 'phcoder' Serbinenko
17d1956f5c
Fix cursor drawing and whole screen scrolling
2009-12-02 21:03:41 +01:00
Vladimir 'phcoder' Serbinenko
af20edb21d
2009-11-30 Vladimir Serbinenko <phcoder@gmail.com>
...
Agglomerate scrolling in gfxterm.
* term/gfxterm.c (grub_virtual_screen): New member 'total_screen'.
(grub_virtual_screen_setup): Initialise 'total_screen'.
(write_char): Split to ...
(paint_char): ... this ...
(write_char): ... and this.
(paint_char): Handle delayed scrolling.
(draw_cursor): Likewise.
(scroll_up): Split to ...
(real_scroll): ... this ...
(scroll_up): ... and this.
(real_scroll): Handle multi-line scroll and draw below-the-bottom
characters.
(grub_gfxterm_refresh): Call real_scroll.
2009-11-30 12:51:20 +01:00
Vladimir 'phcoder' Serbinenko
b4dae692eb
Fixed variable declarations
2009-11-20 14:30:58 +01:00
Colin D Bennet
c51a5caeab
2009-11-14 Colin D Bennet <colin@gibibit.com>
...
2009-11-14 Vladimir Serbinenko <phcoder@gmail.com>
Support for gfxterm in a window.
* include/grub/gfxterm.h: New file.
* include/grub/video.h (struct grub_video_rect): New declaration.
(grub_video_rect_t): Likewise.
* term/gfxterm.c (struct grub_gfxterm_window): New type.
(refcount): New variable.
(render_target): Likewise.
(window): Likewise.
(repaint_callback): Likewise.
(grub_virtual_screen_setup): Use 'render_target'.
(init_window): New function.
(grub_gfxterm_init_window): Likewise.
(grub_gfxterm_init): Check reference counter.
Use init_window.
(destroy_window): New function.
(grub_gfxterm_destroy_window): Likewise.
(grub_gfxterm_fini): Check reference counter.
Use destroy_window.
(redraw_screen_rect): Restore viewport.
Use 'render_target' and 'window'.
Call 'repaint_callback'.
(write_char): Use 'render_target'.
(draw_cursor): Likewise.
(scroll_up): Restore viewport.
Use 'render_target' and 'window'.
Call 'repaint_callback'.
(grub_gfxterm_cls): Likewise.
(grub_gfxterm_refresh): Use 'window'.
(grub_gfxterm_set_repaint_callback): New function.
(grub_gfxterm_background_image_cmd): Use 'window'.
(grub_gfxterm_get_term): New function.
(GRUB_MOD_INIT(term_gfxterm)): Set 'refcount' to 0.
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2009-11-15 00:03:03 +01:00
Vladimir 'phcoder' Serbinenko
a9d407a81e
Reimported scaling
2009-11-20 10:46:30 +01:00
Vladimir 'phcoder' Serbinenko
bbe73b0995
Improved performance by not requiring updating swap in gfxterm
2009-11-14 17:59:11 +01:00
Vladimir 'phcoder' Serbinenko
1f56d83788
Initial reimport of double buffering
2009-11-14 17:00:39 +01:00
Vladimir 'phcoder' Serbinenko
df48e9e18d
REimport of videomask patch
2009-11-14 16:25:50 +01:00
proski
56c5a47f43
2009-07-29 Joe Auricchio <jauricchio@gmail.com>
...
* term/gfxterm.c (clear_char): New function.
(grub_virtual_screen_setup): Use clear_char.
(scroll_up): Likewise.
(grub_virtual_screen_cls): Likewise.
2009-07-29 22:12:00 +00:00
phcoder
04c7c42969
2009-07-20 Joe Auricchio <jauricchio@gmail.com>
...
* term/gfxterm.c (grub_virtual_screen_setup): Clear virtual_screen.
2009-07-20 16:46:36 +00:00
fzielcke
b39f9d20a9
remove all trailing whitespace
2009-06-10 21:04:23 +00:00
phcoder
3eb5ed4ec0
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
gfxpayload support
* commands/videotest.c (grub_cmd_videotest): use grub_video_set_mode
* include/grub/video.h (GRUB_VIDEO_MODE_TYPE_PURE_TEXT): new definition
(grub_video_setup): remove
(grub_video_set_mode): new prototype
* loader/i386/linux.c (DEFAULT_VIDEO_MODE): new definition
(vid_mode): remove
(linux_vesafb_res): compile only on PCBIOS
(grub_linux_boot): support gfxpayload
* loader/i386/pc/xnu.c (video_hook): new function
(grub_xnu_set_video): support gfxpayload
* term/gfxterm.c (DEFAULT_VIDEO_WIDTH): removed
(DEFAULT_VIDEO_HEIGHT): likewise
(DEFAULT_VIDEO_FLAGS): likewise
(DEFAULT_VIDEO_MODE): new definition
(video_hook): new function
(grub_gfxterm_init): use grub_video_set_mode
* util/grub.d/30_os-prober.in: remove explicit modesetting before
loading xnu
* video/video.c (grub_video_setup): removed
(grub_video_set_mode): new function based on grub_gfxterm_init and
grub_video_setup
2009-06-04 18:22:45 +00:00
proski
de5fd76e95
2009-05-04 Pavel Roskin <proski@gnu.org>
...
* commands/acpi.c: Remove unused variable my_mod.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/gpt.c: Likewise.
* partmap/pc.c: Likewise.
* partmap/sun.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/vesafb.c: Likewise.
* term/i386/pc/vga.c: Likewise.
2009-05-04 23:33:34 +00:00
bean
d05f0df3eb
2009-04-14 Bean <bean123ch@gmail.com>
...
* Makefile.in (pkglib_DATA): Add handler.lst.
(handler.lst): New rule.
* conf/i386-pc.rmk (normal_mod_SOURCES): Add normal/handler.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* genhandlerlist.sh: New file.
* genmk.rb: Add rules to generate handler.lst.
* include/grub/normal.h (grub_file_getline): New function definition.
(read_handler_list): Likewise.
(free_handler_list): Likewise.
* include/grub/term.h (grub_term_register_input): Add name parameter
for auto generation of handler.lst.
(grub_term_register_output): Likewise.
* normal/handler.c: New file.
* normal/main.c (get_line): Renamed to grub_file_getline.
(read_config_file): Use the newly renamed grub_file_getline.
(read_command_list): Likewise.
(read_fs_list): Likewise.
(grub_normal_execute): Call read_handler_list to parse handler.lst.
(GRUB_MOD_FINI): Call free_handler_list to free handler list.
* term/efi/console.c (grub_console_init): Add name parameter for auto
generation of handler.lst.
* term/gfxterm.c: Likewise.
* term/i386/pc/at_keyboard.c: Likewise.
* term/i386/pc/console.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/i386/pc/vesafb.c: Likewise.
* term/i386/pc/vga.c: Likewise.
* term/i386/pc/vga_text.c: Likewise.
* term/ieee1275/ofconsole.c: Likewise.
* term/usb_keyboard.c: Likewise.
2009-04-14 18:12:14 +00:00
bean
b1b797cb1b
2009-03-21 Bean <bean123ch@gmail.com>
...
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
cbennett
40164e7552
2009-03-12 Vladimir Serbinenko <phcoder@gmail.com>
...
* term/gfxterm.c (GRUB_MOD_FINI(term_gfxterm)): Correct name of
background image command.
2009-03-12 18:57:42 +00:00
cbennett
c58bc32a67
2009-03-12 Colin D Bennett <colin@gibibit.com>
...
* term/gfxterm.c (draw_cursor): Ensure character is redrawn.
(grub_gfxterm_putchar): Extract pairs of identical calls to
draw_cursor out of conditional blocks.
2009-03-12 18:30:44 +00:00
chaac
bee5fe5d09
2009-01-19 Vesa Jääskeläinen <chaac@nic.fi>
...
* font/font.c (grub_font_loader_init): Re-position unknown glyph.
* term/gfxterm.c (write_char): Fix background rendering for wide
width glyphs.
2009-01-19 17:09:53 +00:00
chaac
7f02114b79
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
...
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
chaac
1e901a7573
2009-01-02 Colin D Bennett <colin@gibibit.com>
...
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.
2009-01-02 15:26:06 +00:00
robertmh
651c29b79e
2008-11-07 Robert Millan <rmh@aybabtu.com>
...
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
robertmh
f9dbfc961e
2008-08-19 Robert Millan <rmh@aybabtu.com>
...
* term/gfxterm.c (DEFAULT_CURSOR_COLOR): Remove.
(struct grub_virtual_screen): Remove `cursor_color'.
(grub_virtual_screen_setup): Remove `virtual_screen.cursor_color'
initialization.
(write_cursor): Use `virtual_screen.fg_color' to draw cursor.
2008-08-19 19:20:33 +00:00
chaac
dbfdce36f1
2008-01-01 Vesa Jaaskelainen <chaac@nic.fi>
...
* include/grub/video.h: Added grub_video_unmap_color and
grub_video_get_active_render_target.
(grub_video_adapter): Added unmap_color and get_active_render_target.
* video/video.c: Added grub_video_unmap_color and
grub_video_get_active_render_target.
(grub_video_get_info): Changed method to accept NULL pointer as an
argument to allow detection of active video adapter.
* video/i386/pc/vbe.c: Renamed grub_video_vbe_unmap_color as
grub_video_vbe_unmap_color_int.
Added grub_video_vbe_unmap_color and
grub_video_vbe_get_active_render_target.
(grub_video_vbe_adapter): Added unmap_color and
get_active_render_target.
* video/i386/pc/vbeblit.c: Replaced grub_video_vbe_unmap_color usage
with grub_video_vbe_unmap_color_int.
* term/gfxterm.c (DEFAULT_STANDARD_COLOR): Added.
(DEFAULT_NORMAL_COLOR): Likewise.
(DEFAULT_HIGHLIGHT_COLOR) Likewise.
(DEFAULT_FG_COLOR): Removed.
(DEFAULT_BG_COLOR): Likewise.
(DEFAULT_CURSOR_COLOR): Changed value.
(grub_virtual_screen): Added standard_color_setting,
normal_color_setting, highlight_color_setting and term_color.
(grub_virtual_screen): Removed fg_color_setting and bg_color_setting.
(bitmap_width): Added.
(bitmap_height): Likewise.
(bitmap): Likewise.
(set_term_color): Likewise.
(grub_virtual_screen_setup): Changed to use new terminal coloring
settings.
(grub_gfxterm_init): Added init for bitmap.
(grub_gfxterm_fini): Added destroy for bitmap.
(redraw_screen_rect): Updated to use background bitmap and new
terminal coloring.
(scroll_up): Added optimization for case when there is no bitmap.
(grub_gfxterm_cls): Fixed to use correct background color.
(grub_virtual_screen_setcolorstate): Changed to use new terminal
coloring.
(grub_virtual_screen_setcolor): Likewise.
(grub_virtual_screen_getcolor): Added.
(grub_gfxterm_background_image_cmd): Likewise.
(grub_video_term): Added setcolor and getcolor.
(MOD_INIT): Added registration of background_image command.
(MOD_TERM): Added unregistration for background_image command.
2008-01-01 12:02:07 +00:00
proski
cc85c3c340
Typo fixes in comments and variable names.
2007-12-30 08:52:06 +00:00
robertmh
533110ada7
2007-12-25 Robert Millan <rmh@aybabtu.com>
...
* include/grub/term.h (struct grub_term): Add `getcolor' function.
(grub_getcolor): New function.
* kern/term.c (grub_getcolor): New function.
* normal/menu.c (GRUB_COLOR_MENU_NORMAL): New macro.
(GRUB_COLOR_MENU_HIGHLIGHT): New macro.
(print_entry): Set normal and highlight colors to
`GRUB_COLOR_MENU_NORMAL' and `GRUB_COLOR_MENU_HIGHLIGHT',
respectively, before printing and restore them to old
values afterwards.
(grub_menu_init_page): Likewise. Fill an additional colored space
that would otherwise be left blank.
* term/efi/console.c (grub_console_getcolor): New function.
(struct grub_console_term.getcolor): New variable.
* term/i386/pc/console.c (grub_console_getcolor): New function.
(struct grub_console_term.getcolor): New variable.
* term/ieee1275/ofconsole.c (grub_ofconsole_getcolor): New function.
(struct grub_console_term.getcolor): New variable.
* term/i386/pc/serial.c (grub_serial_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
* term/i386/pc/vesafb.c (grub_virtual_screen_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
* term/i386/pc/vga.c (grub_vga_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
* term/gfxterm.c (grub_virtual_screen_setcolor): Remove function.
(struct grub_console_term.setcolor): Remove variable.
2007-12-25 11:10:47 +00:00
okuji
5a79f472c7
2007-07-22 Yoshinori K. Okuji <okuji@enbug.org>
...
Migrate to GNU General Public License Version 3.
* COPYING: Replaced with the plain text version of GPLv3.
* config.guess: Updated from gnulib.
* config.sub: Likewise.
* geninit.sh: Output a GPLv3 copyright notice.
* geninitheader.sh: Likewise.
* genmodsrc.sh: Likewise.
* gensymlist.sh.in: Likewise.
* boot/i386/pc/boot.S: Upgraded to GPLv3.
* boot/i386/pc/diskboot.S: Likewise.
* boot/i386/pc/pxeboot.S: Likewise.
* commands/blocklist.c: Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/echo.c: Likewise.
* commands/help.c: Likewise.
* commands/ls.c: Likewise.
* commands/search.c: Likewise.
* commands/terminal.c: Likewise.
* commands/test.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/reboot.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/halt.c: Likewise.
* commands/ieee1275/reboot.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* disk/lvm.c: Likewise.
* disk/raid.c: Likewise.
* disk/efi/efidisk.c: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* font/manager.c: Likewise.
* fs/affs.c: Likewise.
* fs/ext2.c: Likewise.
* fs/fat.c: Likewise.
* fs/fshelp.c: Likewise.
* fs/hfs.c: Likewise.
* fs/hfsplus.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/jfs.c: Likewise.
* fs/minix.c: Likewise.
* fs/sfs.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* hello/hello.c: Likewise.
* include/grub/acorn_filecore.h: Likewise.
* include/grub/arg.h: Likewise.
* include/grub/bitmap.h: Likewise.
* include/grub/boot.h: Likewise.
* include/grub/cache.h: Likewise.
* include/grub/device.h: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/dl.h: Likewise.
* include/grub/elfload.h: Likewise.
* include/grub/env.h: Likewise.
* include/grub/err.h: Likewise.
* include/grub/file.h: Likewise.
* include/grub/font.h: Likewise.
* include/grub/fs.h: Likewise.
* include/grub/fshelp.h: Likewise.
* include/grub/gzio.h: Likewise.
* include/grub/hfs.h: Likewise.
* include/grub/kernel.h: Likewise.
* include/grub/loader.h: Likewise.
* include/grub/lvm.h: Likewise.
* include/grub/misc.h: Likewise.
* include/grub/mm.h: Likewise.
* include/grub/net.h: Likewise.
* include/grub/normal.h: Likewise.
* include/grub/parser.h: Likewise.
* include/grub/partition.h: Likewise.
* include/grub/pc_partition.h: Likewise.
* include/grub/raid.h: Likewise.
* include/grub/rescue.h: Likewise.
* include/grub/script.h: Likewise.
* include/grub/setjmp.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/term.h: Likewise.
* include/grub/terminfo.h: Likewise.
* include/grub/tparm.h: Likewise.
* include/grub/types.h: Likewise.
* include/grub/video.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/chainloader.h: Likewise.
* include/grub/efi/console.h: Likewise.
* include/grub/efi/console_control.h: Likewise.
* include/grub/efi/disk.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/efi/time.h: Likewise.
* include/grub/i386/linux.h: Likewise.
* include/grub/i386/setjmp.h: Likewise.
* include/grub/i386/types.h: Likewise.
* include/grub/i386/efi/kernel.h: Likewise.
* include/grub/i386/efi/loader.h: Likewise.
* include/grub/i386/efi/time.h: Likewise.
* include/grub/i386/pc/biosdisk.h: Likewise.
* include/grub/i386/pc/boot.h: Likewise.
* include/grub/i386/pc/chainloader.h: Likewise.
* include/grub/i386/pc/console.h: Likewise.
* include/grub/i386/pc/init.h: Likewise.
* include/grub/i386/pc/kernel.h: Likewise.
* include/grub/i386/pc/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* include/grub/i386/pc/multiboot.h: Likewise.
* include/grub/i386/pc/serial.h: Likewise.
* include/grub/i386/pc/time.h: Likewise.
* include/grub/i386/pc/vbe.h: Likewise.
* include/grub/i386/pc/vbeblit.h: Likewise.
* include/grub/i386/pc/vbefill.h: Likewise.
* include/grub/i386/pc/vbeutil.h: Likewise.
* include/grub/i386/pc/vga.h: Likewise.
* include/grub/ieee1275/ieee1275.h: Likewise.
* include/grub/ieee1275/ofdisk.h: Likewise.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/powerpc/setjmp.h: Likewise.
* include/grub/powerpc/types.h: Likewise.
* include/grub/powerpc/ieee1275/biosdisk.h: Likewise.
* include/grub/powerpc/ieee1275/console.h: Likewise.
* include/grub/powerpc/ieee1275/ieee1275.h: Likewise.
* include/grub/powerpc/ieee1275/kernel.h: Likewise.
* include/grub/powerpc/ieee1275/loader.h: Likewise.
* include/grub/powerpc/ieee1275/multiboot.h: Likewise.
* include/grub/powerpc/ieee1275/time.h: Likewise.
* include/grub/powerpc/ieee1275/util/biosdisk.h: Likewise.
* include/grub/sparc64/libgcc.h: Likewise.
* include/grub/sparc64/setjmp.h: Likewise.
* include/grub/sparc64/types.h: Likewise.
* include/grub/sparc64/ieee1275/console.h: Likewise.
* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
* include/grub/sparc64/ieee1275/kernel.h: Likewise.
* include/grub/sparc64/ieee1275/time.h: Likewise.
* include/grub/util/biosdisk.h: Likewise.
* include/grub/util/getroot.h: Likewise.
* include/grub/util/lvm.h: Likewise.
* include/grub/util/misc.h: Likewise.
* include/grub/util/raid.h: Likewise.
* include/grub/util/resolve.h: Likewise.
* io/gzio.c: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/dl.c: Likewise.
* kern/elf.c: Likewise.
* kern/env.c: Likewise.
* kern/err.c: Likewise.
* kern/file.c: Likewise.
* kern/fs.c: Likewise.
* kern/loader.c: Likewise.
* kern/main.c: Likewise.
* kern/misc.c: Likewise.
* kern/mm.c: Likewise.
* kern/parser.c: Likewise.
* kern/partition.c: Likewise.
* kern/rescue.c: Likewise.
* kern/term.c: Likewise.
* kern/efi/efi.c: Likewise.
* kern/efi/init.c: Likewise.
* kern/efi/mm.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/efi/init.c: Likewise.
* kern/i386/efi/startup.S: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/lzo1x.S: Likewise.
* kern/i386/pc/startup.S: Likewise.
* kern/ieee1275/ieee1275.c: Likewise.
* kern/powerpc/cache.S: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/powerpc/ieee1275/cmain.c: Likewise.
* kern/powerpc/ieee1275/crt0.S: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
* kern/powerpc/ieee1275/openfw.c: Likewise.
* kern/sparc64/cache.S: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/sparc64/ieee1275/init.c: Likewise.
* kern/sparc64/ieee1275/openfw.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/efi/linux_normal.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/linux_normal.c: Likewise.
* loader/i386/pc/multiboot.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* normal/arg.c: Likewise.
* normal/cmdline.c: Likewise.
* normal/command.c: Likewise.
* normal/completion.c: Likewise.
* normal/execute.c: Likewise.
* normal/function.c: Likewise.
* normal/lexer.c: Likewise.
* normal/main.c: Likewise.
* normal/menu.c: Likewise.
* normal/menu_entry.c: Likewise.
* normal/misc.c: Likewise.
* normal/parser.y: Likewise.
* normal/script.c: Likewise.
* normal/i386/setjmp.S: Likewise.
* normal/powerpc/setjmp.S: Likewise.
* normal/sparc64/setjmp.S: Likewise.
* partmap/acorn.c: Likewise.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/gpt.c: Likewise.
* partmap/pc.c: Likewise.
* partmap/sun.c: Likewise.
* term/gfxterm.c: Likewise.
* term/terminfo.c: Likewise.
* term/efi/console.c: Likewise.
* term/i386/pc/console.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/i386/pc/vesafb.c: Likewise.
* term/i386/pc/vga.c: Likewise.
* term/ieee1275/ofconsole.c: Likewise.
* util/biosdisk.c: Likewise.
* util/console.c: Likewise.
* util/genmoddep.c: Likewise.
* util/getroot.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-probe.c: Likewise.
* util/lvm.c: Likewise.
* util/misc.c: Likewise.
* util/raid.c: Likewise.
* util/resolve.c: Likewise.
* util/update-grub.in: Likewise.
* util/update-grub_lib.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/i386/efi/grub-install.in: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/i386/pc/grub-install.in: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/i386/pc/grub-mkrescue.in: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/misc.c: Likewise.
* util/powerpc/ieee1275/grub-install.in: Likewise.
* util/powerpc/ieee1275/grub-mkimage.c: Likewise.
* util/powerpc/ieee1275/misc.c: Likewise.
* video/bitmap.c: Likewise.
* video/video.c: Likewise.
* video/i386/pc/vbe.c: Likewise.
* video/i386/pc/vbeblit.c: Likewise.
* video/i386/pc/vbefill.c: Likewise.
* video/i386/pc/vbeutil.c: Likewise.
* video/readers/tga.c: Likewise.
2007-07-21 23:32:33 +00:00
chaac
d6b392bdf5
Fixed formatting problems and copyright year on last commit.
2007-06-10 17:34:27 +00:00
chaac
29b0ed4617
2007-06-10 Vesa Jaaskelainen <chaac@nic.fi>
...
* term/gfxterm.c (grub_gfxterm_init): Added support for specifying
list of video modes.
2007-06-10 17:31:03 +00:00
chaac
ad2a06edba
2006-07-29 Vesa Jaaskelainen <chaac@nic.fi>
...
* include/grub/bitmap.h: New file.
* include/grub/i386/pc/vbeutil.h: Likewise.
* video/bitmap.c: Likewise.
* video/readers/tga.c: Likewise.
* video/i386/pc/vbeutil.c: Likewise.
* commands/videotest.c: Code cleanup and updated to reflect to new
video API.
* term/gfxterm.c: Likewise.
* video/video.c: Likewise.
* conf/i386-pc.rmk (pkgdata_MODULES): Added tga.mod and bitmap.mod.
(vbe_mod_SOURCES): Added video/i386/pc/vbeutil.c.
(bitmap_mod_SOURCES): New entry.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
* include/grub/video.h (grub_video_blit_operators): New enum type.
(grub_video_render_target): Changed as forward declaration and moved
actual definition to be video driver specific.
(grub_video_adapter.blit_bitmap): Added blitting operator.
(grub_video_adapter.blit_render_target): Likewise.
(grub_video_blit_bitmap): Likewise.
(grub_video_blit_render_target): Likewise.
* include/grub/i386/pc/vbe.h (grub_video_render_target): Added
driver specific render target definition.
(grub_video_vbe_map_rgba): Added driver internal helper.
(grub_video_vbe_unmap_color): Updated to use
grub_video_i386_vbeblit_info.
(grub_video_vbe_get_video_ptr): Likewise.
* include/grub/i386/pc/vbeblit.h
(grub_video_i386_vbeblit_R8G8B8A8_R8G8B8A8): Updated to use
grub_video_i386_vbeblit_info.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8A8): Likewise.
(grub_video_i386_vbeblit_index_R8G8B8A8): Likewise.
(grub_video_i386_vbeblit_R8G8B8A8_R8G8B8): Likewise.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8): Likewise.
(grub_video_i386_vbeblit_index_R8G8B8): Likewise.
(grub_video_i386_vbeblit_index_index): Likewise.
(grub_video_i386_vbeblit_R8G8B8X8_R8G8B8X8): New blitter function.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8X8): Likewise.
(grub_video_i386_vbeblit_index_R8G8B8X8): Likewise.
(grub_video_i386_vbeblit_blend): Added generic blitter for blend
operator.
(grub_video_i386_vbeblit_replace): Added generic blitter for replace
operator.
* video/i386/pc/vbeblit.c: Updated to reflect changes on
include/grub/i386/pc/vbeblit.h.
* include/grub/i386/pc/vbefill.h (grub_video_i386_vbefill_R8G8B8A8):
Updated to use grub_video_i386_vbeblit_info.
(grub_video_i386_vbefill_R8G8B8): Likewise.
(grub_video_i386_vbefill_index): Likewise.
(grub_video_i386_vbefill): Added generic filler.
* video/i386/pc/vbefill.c: Updated to reflect changes on
include/grub/i386/pc/vbefill.h.
* video/i386/pc/vbe.c (grub_video_vbe_get_video_ptr): Updated to use
grub_video_i386_vbeblit_info.
(grub_video_vbe_unmap_color): Likewise.
(grub_video_vbe_blit_glyph): Likewise.
(grub_video_vbe_scroll): Likewise.
(grub_video_vbe_draw_pixel): Removed function.
(grub_video_vbe_get_pixel): Likewise.
(grub_video_vbe_fill_rect): Moved all blitters to vbefill.c and
updated code to use it.
(common_blitter): Added common blitter for render target and bitmap.
(grub_video_vbe_blit_bitmap): Updated to use common_blitter.
(grub_video_vbe_blit_render_target): Likewise.
2006-07-31 14:21:36 +00:00
chaac
37e5e1a4da
2006-04-20 Vesa Jaaskelainen <chaac@nic.fi>
...
* term/gfxterm.c (grub_gfxterm_getcharwidth): Fixed character
length for unknown glyph.
2006-04-20 15:19:01 +00:00
chaac
bd0d7896cf
2006-03-14 Vesa Jaaskelainen <chaac@nic.fi>
...
* DISTLIST: Added include/grub/video.h, term/gfxterm.c,
video/video.c, commands/videotest.c. Removed term/i386/pc/vesafb.c.
* conf/i386-pc.rmk (pkgdata_MODULES): Added video.mod,
gfxterm.mod, videotest.mod. Removed vga.mod, vesafb.mod.
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(vesafb_mod_SOURCES): Removed.
(vesafb_mod_CFLAGS): Likewise.
(vesafb_mod_LDFLAGS): Likewise.
(vga_mod_SOURCES): Likewise.
(vga_mod_CFLAGS): Likewise.
(vga_mod_LDFLAGS): Likewise.
* commands/videotest.c: New file.
* font/manager.c (fill_with_default_glyph): Modified to use
grub_font_glyph.
(grub_font_get_glyph): Likewise.
(fontmanager): Renamed from this...
(font_manager): ... to this.
* include/grub/font.h (grub_font_glyph): Added new structure.
(grub_font_get_glyph): Modified to use grub_font_glyph.
* include/grub/misc.h (grub_abs): Added as inline function.
* include/grub/video.h: New file.
* include/grub/i386/pc/vbe.h (GRUB_VBE_STATUS_OK): New macro.
(GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL): Likewise.
(GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR): Likewise.
(grub_vbe_get_controller_info): Renamed from this...
(grub_vbe_bios_get_controller_info): ... to this.
(grub_vbe_get_mode_info): Renamed from this...
(grub_vbe_bios_get_mode_info): ... to this.
(grub_vbe_set_mode): Renamed from this...
(grub_vbe_bios_set_mode): ... to this.
(grub_vbe_get_mode): Renamed from this...
(grub_vbe_bios_get_mode): ... to this.
(grub_vbe_set_memory_window): Renamed from this...
(grub_vbe_bios_set_memory_window): ... to this.
(grub_vbe_get_memory_window): Renamed from this...
(grub_vbe_bios_get_memory_window): ... to this.
(grub_vbe_set_scanline_length): Renamed from this...
(grub_vbe_set_scanline_length): ... to this.
(grub_vbe_get_scanline_length): Renamed from this...
(grub_vbe_bios_get_scanline_length): ... to this.
(grub_vbe_set_display_start): Renamed from this...
(grub_vbe_bios_set_display_start): ... to this.
(grub_vbe_get_display_start): Renamed from this...
(grub_vbe_bios_get_display_start): ... to this.
(grub_vbe_set_palette_data): Renamed from this...
(grub_vbe_bios_set_palette_data): ... to this.
(grub_vbe_set_pixel_rgb): Removed.
(grub_vbe_set_pixel_index): Likewise.
* kern/i386/pc/startup.S (grub_vbe_get_controller_info): Renamed
from this...
(grub_vbe_bios_get_controller_info): ... to this.
(grub_vbe_get_mode_info): Renamed from this...
(grub_vbe_bios_get_mode_info): ... to this.
(grub_vbe_set_mode): Renamed from this...
(grub_vbe_bios_set_mode): ... to this.
(grub_vbe_get_mode): Renamed from this...
(grub_vbe_bios_get_mode): ... to this.
(grub_vbe_set_memory_window): Renamed from this...
(grub_vbe_bios_set_memory_window): ... to this.
(grub_vbe_get_memory_window): Renamed from this...
(grub_vbe_bios_get_memory_window): ... to this.
(grub_vbe_set_scanline_length): Renamed from this...
(grub_vbe_set_scanline_length): ... to this.
(grub_vbe_get_scanline_length): Renamed from this...
(grub_vbe_bios_get_scanline_length): ... to this.
(grub_vbe_set_display_start): Renamed from this...
(grub_vbe_bios_set_display_start): ... to this.
(grub_vbe_get_display_start): Renamed from this...
(grub_vbe_bios_get_display_start): ... to this.
(grub_vbe_set_palette_data): Renamed from this...
(grub_vbe_bios_set_palette_data): ... to this.
(grub_vbe_bios_get_controller_info): Fixed problem with registers
getting corrupted after calling it. Added more pushes and pops.
(grub_vbe_bios_set_mode): Likewise.
(grub_vbe_bios_get_mode): Likewise.
(grub_vbe_bios_get_memory_window): Likewise.
(grub_vbe_bios_set_scanline_length): Likewise.
(grub_vbe_bios_get_scanline_length): Likewise.
(grub_vbe_bios_get_display_start): Likewise.
(grub_vbe_bios_set_palette_data): Likewise.
* normal/cmdline.c (cl_set_pos): Refresh the screen.
(cl_insert): Likewise.
(cl_delete): Likewise.
* term/gfxterm.c: New file.
* term/i386/pc/vesafb.c: Removed file.
* video/video.c: New file.
* video/i386/pc/vbe.c (real2pm): Added new function.
(grub_video_vbe_draw_pixel): Likewise.
(grub_video_vbe_get_video_ptr): Likewise.
(grub_video_vbe_get_pixel): Likewise
(grub_video_vbe_init): Likewise.
(grub_video_vbe_fini): Likewise.
(grub_video_vbe_setup): Likewise.
(grub_video_vbe_get_info): Likewise.
(grub_video_vbe_set_palette): Likewise.
(grub_video_vbe_get_palette): Likewise.
(grub_video_vbe_set_viewport): Likewise.
(grub_video_vbe_get_viewport): Likewise.
(grub_video_vbe_map_color): Likewise.
(grub_video_vbe_map_rgb): Likewise.
(grub_video_vbe_map_rgba): Likewise.
(grub_video_vbe_unmap_color): Likewise.
(grub_video_vbe_fill_rect): Likewise.
(grub_video_vbe_blit_glyph): Likewise.
(grub_video_vbe_blit_bitmap): Likewise.
(grub_video_vbe_blit_render_target): Likewise.
(grub_video_vbe_scroll): Likewise.
(grub_video_vbe_swap_buffers): Likewise.
(grub_video_vbe_create_render_target): Likewise.
(grub_video_vbe_delete_render_target): Likewise.
(grub_video_vbe_set_active_render_target): Likewise.
(grub_vbe_set_pixel_rgb): Remove function.
(grub_vbe_set_pixel_index): Likewise.
(index_color_mode): Remove static variable.
(active_mode): Likewise.
(framebuffer): Likewise.
(bytes_per_scan_line): Likewise.
(grub_video_vbe_adapter): Added new static variable.
(framebuffer): Likewise.
(render_target): Likewise.
(initial_mode): Likewise.
(mode_in_use): Likewise.
(mode_list): Likewise.
2006-03-14 19:08:34 +00:00
