motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

sdl: reorganize -no-frame support

Browse source 
Drop no_frame flag from sdl_display_init argument list, use a global
variable instead.  This is temporary until -no-frame support is dropped
altogether when we remove sdl1 support.

Remove any traces of noframe from sdl2 code.  It is just dead code as
sdl2 doesn't support the SDL_NOFRAME window flag any more.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180115154855.30850-3-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-01-15 16:48:55 +01:00
parent f8d2c9369b
commit 04ff1a398a
5 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ui/sdl.c
View file

@ -50,7 +50,6 @@ static int gui_saved_width;
static int gui_saved_height;
static int gui_saved_grab;
static int gui_fullscreen;
static int gui_noframe;
static int gui_key_modifier_pressed;
static int gui_keysym;
static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
@ -118,8 +117,9 @@ static void do_sdl_resize(int width, int height, int bpp)
} else {
flags |= SDL_RESIZABLE;
}
if (gui_noframe)
if (no_frame) {
flags |= SDL_NOFRAME;
}
tmp_screen = SDL_SetVideoMode(width, height, bpp, flags);
if (!real_screen) {
@ -895,7 +895,7 @@ void sdl_display_early_init(int opengl)
}
}
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
void sdl_display_init(DisplayState *ds, int full_screen)
{
int flags;
uint8_t data = 0;
@ -917,9 +917,6 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
g_printerr("Running QEMU with SDL 1.2 is deprecated, and will be removed\n"
"in a future release. Please switch to SDL 2.0 instead\n");
if (no_frame)
gui_noframe = 1;
if (!full_screen) {
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
}