sdl: reorganize -no-frame support
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:
parent
f8d2c9369b
commit
04ff1a398a
|
@ -112,6 +112,7 @@ extern const char *keyboard_layout;
|
||||||
extern int win2k_install_hack;
|
extern int win2k_install_hack;
|
||||||
extern int alt_grab;
|
extern int alt_grab;
|
||||||
extern int ctrl_grab;
|
extern int ctrl_grab;
|
||||||
|
extern int no_frame;
|
||||||
extern int smp_cpus;
|
extern int smp_cpus;
|
||||||
extern unsigned int max_cpus;
|
extern unsigned int max_cpus;
|
||||||
extern int cursor_hide;
|
extern int cursor_hide;
|
||||||
|
|
|
@ -436,7 +436,7 @@ void surface_gl_setup_viewport(QemuGLShader *gls,
|
||||||
/* sdl.c */
|
/* sdl.c */
|
||||||
#ifdef CONFIG_SDL
|
#ifdef CONFIG_SDL
|
||||||
void sdl_display_early_init(int opengl);
|
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);
|
||||||
#else
|
#else
|
||||||
static inline void sdl_display_early_init(int opengl)
|
static inline void sdl_display_early_init(int opengl)
|
||||||
{
|
{
|
||||||
|
@ -444,8 +444,7 @@ static inline void sdl_display_early_init(int opengl)
|
||||||
error_report("SDL support is disabled");
|
error_report("SDL support is disabled");
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
static inline void sdl_display_init(DisplayState *ds, int full_screen,
|
static inline void sdl_display_init(DisplayState *ds, int full_screen)
|
||||||
int no_frame)
|
|
||||||
{
|
{
|
||||||
/* This must never be called if CONFIG_SDL is disabled */
|
/* This must never be called if CONFIG_SDL is disabled */
|
||||||
error_report("SDL support is disabled");
|
error_report("SDL support is disabled");
|
||||||
|
|
9
ui/sdl.c
9
ui/sdl.c
|
@ -50,7 +50,6 @@ static int gui_saved_width;
|
||||||
static int gui_saved_height;
|
static int gui_saved_height;
|
||||||
static int gui_saved_grab;
|
static int gui_saved_grab;
|
||||||
static int gui_fullscreen;
|
static int gui_fullscreen;
|
||||||
static int gui_noframe;
|
|
||||||
static int gui_key_modifier_pressed;
|
static int gui_key_modifier_pressed;
|
||||||
static int gui_keysym;
|
static int gui_keysym;
|
||||||
static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
|
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 {
|
} else {
|
||||||
flags |= SDL_RESIZABLE;
|
flags |= SDL_RESIZABLE;
|
||||||
}
|
}
|
||||||
if (gui_noframe)
|
if (no_frame) {
|
||||||
flags |= SDL_NOFRAME;
|
flags |= SDL_NOFRAME;
|
||||||
|
}
|
||||||
|
|
||||||
tmp_screen = SDL_SetVideoMode(width, height, bpp, flags);
|
tmp_screen = SDL_SetVideoMode(width, height, bpp, flags);
|
||||||
if (!real_screen) {
|
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;
|
int flags;
|
||||||
uint8_t data = 0;
|
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"
|
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");
|
"in a future release. Please switch to SDL 2.0 instead\n");
|
||||||
|
|
||||||
if (no_frame)
|
|
||||||
gui_noframe = 1;
|
|
||||||
|
|
||||||
if (!full_screen) {
|
if (!full_screen) {
|
||||||
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
|
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,6 @@ static int gui_grab; /* if true, all keyboard/mouse events are grabbed */
|
||||||
|
|
||||||
static int gui_saved_grab;
|
static int gui_saved_grab;
|
||||||
static int gui_fullscreen;
|
static int gui_fullscreen;
|
||||||
static int gui_noframe;
|
|
||||||
static int gui_key_modifier_pressed;
|
static int gui_key_modifier_pressed;
|
||||||
static int gui_keysym;
|
static int gui_keysym;
|
||||||
static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
|
static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
|
||||||
|
@ -767,7 +766,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;
|
int flags;
|
||||||
uint8_t data = 0;
|
uint8_t data = 0;
|
||||||
|
@ -775,10 +774,6 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
|
||||||
int i;
|
int i;
|
||||||
SDL_SysWMinfo info;
|
SDL_SysWMinfo info;
|
||||||
|
|
||||||
if (no_frame) {
|
|
||||||
gui_noframe = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
/* on Linux, SDL may use fbcon|directfb|svgalib when run without
|
/* on Linux, SDL may use fbcon|directfb|svgalib when run without
|
||||||
* accessible $DISPLAY to open X11 window. This is often the case
|
* accessible $DISPLAY to open X11 window. This is often the case
|
||||||
|
|
4
vl.c
4
vl.c
|
@ -150,7 +150,7 @@ static int rtc_date_offset = -1; /* -1 means no change */
|
||||||
QEMUClockType rtc_clock;
|
QEMUClockType rtc_clock;
|
||||||
int vga_interface_type = VGA_NONE;
|
int vga_interface_type = VGA_NONE;
|
||||||
static int full_screen = 0;
|
static int full_screen = 0;
|
||||||
static int no_frame = 0;
|
int no_frame;
|
||||||
int no_quit = 0;
|
int no_quit = 0;
|
||||||
static bool grab_on_hover;
|
static bool grab_on_hover;
|
||||||
Chardev *serial_hds[MAX_SERIAL_PORTS];
|
Chardev *serial_hds[MAX_SERIAL_PORTS];
|
||||||
|
@ -4694,7 +4694,7 @@ int main(int argc, char **argv, char **envp)
|
||||||
curses_display_init(ds, full_screen);
|
curses_display_init(ds, full_screen);
|
||||||
break;
|
break;
|
||||||
case DT_SDL:
|
case DT_SDL:
|
||||||
sdl_display_init(ds, full_screen, no_frame);
|
sdl_display_init(ds, full_screen);
|
||||||
break;
|
break;
|
||||||
case DT_COCOA:
|
case DT_COCOA:
|
||||||
cocoa_display_init(ds, full_screen);
|
cocoa_display_init(ds, full_screen);
|
||||||
|
|
Loading…
Reference in New Issue