| Message ID | 1484295285-8809-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 13.01.2017 um 09:14 schrieb Gerd Hoffmann: > Cc: Stefan Weil <sw@weilnetz.de> > Cc: Samuel Thibault <samuel.thibault@gnu.org> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > ui/sdl2.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/ui/sdl2.c b/ui/sdl2.c > index 9a79b17..91fb111 100644 > --- a/ui/sdl2.c > +++ b/ui/sdl2.c > @@ -817,9 +817,15 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) > sdl2_console[i].dcl.con = con; > register_displaychangelistener(&sdl2_console[i].dcl); > > +#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_X11) > if (SDL_GetWindowWMInfo(sdl2_console[i].real_window, &info)) { > +#if defined(SDL_VIDEO_DRIVER_WINDOWS) > + qemu_console_set_window_id(con, (uintptr_t)info.info.win.window); > +#elif defined(SDL_VIDEO_DRIVER_X11) > qemu_console_set_window_id(con, info.info.x11.window); > +#endif > } > +#endif > } > > /* Load a 32x32x4 image. White pixels are transparent. */ Thanks. Reviewed-by: Stefan Weil <sw@weilnetz.de>
On 13 January 2017 at 08:27, Stefan Weil <sw@weilnetz.de> wrote: > Am 13.01.2017 um 09:14 schrieb Gerd Hoffmann: >> Cc: Stefan Weil <sw@weilnetz.de> >> Cc: Samuel Thibault <samuel.thibault@gnu.org> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> >> --- >> ui/sdl2.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/ui/sdl2.c b/ui/sdl2.c >> index 9a79b17..91fb111 100644 >> --- a/ui/sdl2.c >> +++ b/ui/sdl2.c >> @@ -817,9 +817,15 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) >> sdl2_console[i].dcl.con = con; >> register_displaychangelistener(&sdl2_console[i].dcl); >> >> +#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_X11) >> if (SDL_GetWindowWMInfo(sdl2_console[i].real_window, &info)) { >> +#if defined(SDL_VIDEO_DRIVER_WINDOWS) >> + qemu_console_set_window_id(con, (uintptr_t)info.info.win.window); >> +#elif defined(SDL_VIDEO_DRIVER_X11) >> qemu_console_set_window_id(con, info.info.x11.window); >> +#endif >> } >> +#endif >> } >> >> /* Load a 32x32x4 image. White pixels are transparent. */ > > > Thanks. > > Reviewed-by: Stefan Weil <sw@weilnetz.de> Thanks; applied to master as a buildfix. -- PMM
diff --git a/ui/sdl2.c b/ui/sdl2.c index 9a79b17..91fb111 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -817,9 +817,15 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) sdl2_console[i].dcl.con = con; register_displaychangelistener(&sdl2_console[i].dcl); +#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_X11) if (SDL_GetWindowWMInfo(sdl2_console[i].real_window, &info)) { +#if defined(SDL_VIDEO_DRIVER_WINDOWS) + qemu_console_set_window_id(con, (uintptr_t)info.info.win.window); +#elif defined(SDL_VIDEO_DRIVER_X11) qemu_console_set_window_id(con, info.info.x11.window); +#endif } +#endif } /* Load a 32x32x4 image. White pixels are transparent. */
Cc: Stefan Weil <sw@weilnetz.de> Cc: Samuel Thibault <samuel.thibault@gnu.org> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- ui/sdl2.c | 6 ++++++ 1 file changed, 6 insertions(+)