merge from in qemu upstream: support no_frame aka gui_noframe

diff --git a/sdl.c b/sdl.c
index 4d5761d3ddddc830f874d337660ab130e13285bb..f2ac7320e046d6f0afc791dff5b118df051bd6c6 100644 (file)
--- a/sdl.c
+++ b/sdl.c
@@ -41,6 +41,7 @@ static int gui_grab; /* if true, all keyboard/mouse events are grabbed */
 static int last_vm_running;
 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_fullscreen_initial_grab;
@@ -206,7 +207,9 @@ static void sdl_resize(DisplayState *ds, int w, int h, int linesize)
         flags |= SDL_FULLSCREEN;
         flags &= ~SDL_RESIZABLE;
     }
-    
+    if (gui_noframe)
+        flags |= SDL_NOFRAME;
+
     width = w;
     height = h;
 
@@ -717,6 +720,9 @@ void sdl_display_init(DisplayState *ds, int full_screen, int opengl)
             exit(1);
     }
 
+    if (no_frame)
+        gui_noframe = 1;
+
     flags = SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE;
     if (SDL_Init (flags)) {
         fprintf(stderr, "Could not initialize SDL - exiting\n");