This commit breaks builds for Windows. See below for details. Regards Stefan
Am 09.01.2017 um 14:09 schrieb Gerd Hoffmann: > From: Samuel Thibault <[email protected]> > > This uses the console API to record the window ID of the SDL2 windows. > > Signed-off-by: Samuel Thibault <[email protected]> > Message-id: [email protected] > Signed-off-by: Gerd Hoffmann <[email protected]> > --- > ui/sdl2.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/ui/sdl2.c b/ui/sdl2.c > index 30d2a3c..9a79b17 100644 > --- a/ui/sdl2.c > +++ b/ui/sdl2.c > @@ -761,6 +761,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, > int no_frame) > uint8_t data = 0; > char *filename; > int i; > + SDL_SysWMinfo info; > > if (no_frame) { > gui_noframe = 1; > @@ -786,6 +787,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, > int no_frame) > exit(1); > } > SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1"); > + memset(&info, 0, sizeof(info)); > + SDL_VERSION(&info.version); > > for (i = 0;; i++) { > QemuConsole *con = qemu_console_lookup_by_index(i); > @@ -813,6 +816,10 @@ void sdl_display_init(DisplayState *ds, int full_screen, > int no_frame) > #endif > sdl2_console[i].dcl.con = con; > register_displaychangelistener(&sdl2_console[i].dcl); > + > + if (SDL_GetWindowWMInfo(sdl2_console[i].real_window, &info)) { > + qemu_console_set_window_id(con, info.info.x11.window); Windows does not use X11. gcc fails: CC ui/sdl2.o /qemu/ui/sdl2.c: In function ‘sdl_display_init’: /qemu/ui/sdl2.c:821:54: error: ‘union <anonymous>’ has no member named ‘x11’ qemu_console_set_window_id(con, info.info.x11.window);
