[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL v2 05/11] sdl2: set window ID
From: |
Stefan Weil |
Subject: |
Re: [Qemu-devel] [PULL v2 05/11] sdl2: set window ID |
Date: |
Thu, 12 Jan 2017 16:10:22 +0100 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 |
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 <address@hidden>
>
> This uses the console API to record the window ID of the SDL2 windows.
>
> Signed-off-by: Samuel Thibault <address@hidden>
> Message-id: address@hidden
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
> 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);
- [Qemu-devel] [PULL v2 01/11] ui/gtk: fix crash at startup when no console is available, (continued)
- [Qemu-devel] [PULL v2 01/11] ui/gtk: fix crash at startup when no console is available, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 08/11] ui: drop unused MOUSE_EVENT_WHEEL{UP, DN} defines, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 10/11] curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT), Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 02/11] ui: use evdev keymap when running under wayland, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 07/11] gtk: avoid oob array access, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 06/11] egl-helpers: Change file licensing to LGPLv2, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 11/11] ps2: Fix lost scancodes by recent changes, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 04/11] console: move window ID code from baum to sdl, Gerd Hoffmann, 2017/01/09
- [Qemu-devel] [PULL v2 05/11] sdl2: set window ID, Gerd Hoffmann, 2017/01/09
- Re: [Qemu-devel] [PULL v2 05/11] sdl2: set window ID,
Stefan Weil <=
[Qemu-devel] [PULL v2 09/11] ui/vnc: Fix problem with sending too many bytes as server name, Gerd Hoffmann, 2017/01/09
Re: [Qemu-devel] [PULL v2 00/11] ui patch queue, Peter Maydell, 2017/01/09
[Qemu-devel] [PULL v2 00/11] ui patch queue, Gerd Hoffmann, 2017/01/31