merge
This commit is contained in:
commit
b672413493
7 changed files with 29 additions and 4 deletions
11
ChangeLog.sdl
Normal file
11
ChangeLog.sdl
Normal file
|
@ -0,0 +1,11 @@
|
|||
2009-11-20 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
SDL support.
|
||||
|
||||
* Makefile.in (LIBSDL): New variable.
|
||||
(enable_grub_emu_sdl): Likewise.
|
||||
* conf/i386-pc.rmk (grub_emu_SOURCES): Add video files.
|
||||
(grub_emu_SOURCES) [enable_grub_emu_sdl]: Add util/sdl.c.
|
||||
(grub_emu_LDFLAGS) [enable_grub_emu_sdl]: Add $(LIBSDL).
|
||||
* configure.ac: Detect SDL availability and add --enable-grub-emu-sdl
|
||||
* util/sdl.c: New file.
|
10
ChangeLog.videomask
Normal file
10
ChangeLog.videomask
Normal file
|
@ -0,0 +1,10 @@
|
|||
2009-11-20 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
Use flag-based instead of hook-based video mode selection and "auto"
|
||||
keyword.
|
||||
|
||||
* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
|
||||
(grub_video_set_mode): Changed prototype. All users updated.
|
||||
(grub_video_check_mode_flag): New inline function.
|
||||
* video/video.c (parse_modespec): New function.
|
||||
(grub_video_set_mode): Parse flags and keywords.
|
|
@ -155,7 +155,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
|
|||
\
|
||||
video/video.c video/fb/video_fb.c video/fb/fbblit.c \
|
||||
video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c \
|
||||
video/bitmap.c video/readers/tga.c video/readers/jpeg.c \
|
||||
video/bitmap.c video/bitmap_scale.c video/readers/tga.c video/readers/jpeg.c \
|
||||
video/readers/png.c font/font_cmd.c font/font.c term/gfxterm.c \
|
||||
io/bufio.c \
|
||||
\
|
||||
|
@ -175,6 +175,11 @@ grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c \
|
|||
grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
|
||||
endif
|
||||
|
||||
ifeq ($(enable_grub_emu_sdl), yes)
|
||||
grub_emu_SOURCES += util/sdl.c
|
||||
grub_emu_LDFLAGS += $(LIBSDL)
|
||||
endif
|
||||
|
||||
sbin_SCRIPTS += grub-install
|
||||
grub_install_SOURCES = util/grub-install.in
|
||||
|
||||
|
|
|
@ -1336,7 +1336,7 @@ grub_xnu_unlock ()
|
|||
locked = 0;
|
||||
}
|
||||
|
||||
static grub_command_t cmd_kernel, cmd_mkext, cmd_kext, ;
|
||||
static grub_command_t cmd_kernel, cmd_mkext, cmd_kext;
|
||||
static grub_command_t cmd_devtree;
|
||||
static grub_command_t cmd_kextdir, cmd_ramdisk, cmd_resume;
|
||||
static grub_extcmd_t cmd_splash;
|
||||
|
|
|
@ -323,6 +323,7 @@ grub_gfxterm_init (void)
|
|||
struct grub_video_mode_info mode_info;
|
||||
char *tmp;
|
||||
grub_err_t err;
|
||||
grub_video_color_t color;
|
||||
|
||||
/* If gfxterm has already been initialized by calling the init_window
|
||||
function, then leave it alone when it is set as the current terminal. */
|
||||
|
@ -702,7 +703,6 @@ scroll_up (void)
|
|||
else
|
||||
{
|
||||
grub_video_rect_t saved_view;
|
||||
int i;
|
||||
|
||||
grub_video_set_active_render_target (render_target);
|
||||
/* Save viewport and set it to our window. */
|
||||
|
|
|
@ -624,7 +624,6 @@ grub_video_set_mode (const char *modestring,
|
|||
/* Loop thru all possible video adapter trying to find requested mode. */
|
||||
for (p = grub_video_adapter_list; p; p = p->next)
|
||||
{
|
||||
grub_err_t err;
|
||||
struct grub_video_mode_info mode_info;
|
||||
|
||||
grub_memset (&mode_info, 0, sizeof (mode_info));
|
||||
|
|
Loading…
Reference in a new issue