Commit f1ddebd8 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

sdl2: move sdl_update to new sdl2-2d.c 



Create new sdl2-2d file for 2d display rendering.
Move over sdl_update code, and rename to sdl2_2d_update.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 44f017d0

include/ui/sdl2.h

+3 −0
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ void sdl2_reset_keys(struct sdl2_console *scon); 
void sdl2_process_key(struct sdl2_console *scon,

                      SDL_KeyboardEvent *ev);



void sdl2_2d_update(DisplayChangeListener *dcl,

                    int x, int y, int w, int h);



#endif /* SDL2_H */

ui/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ifeq ($(CONFIG_SDLABI),1.2) 
sdl.mo-objs := sdl.o sdl_zoom.o

endif

ifeq ($(CONFIG_SDLABI),2.0)

sdl.mo-objs := sdl2.o sdl2-input.o

sdl.mo-objs := sdl2.o sdl2-input.o sdl2-2d.o

endif

sdl.mo-cflags := $(SDL_CFLAGS)

ui/sdl2-2d.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * QEMU SDL display driver

 *

 * Copyright (c) 2003 Fabrice Bellard

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */

/* Ported SDL 1.2 code to 2.0 by Dave Airlie. */



/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */

#undef WIN32_LEAN_AND_MEAN



#include <SDL.h>

#include <SDL_syswm.h>



#include "qemu-common.h"

#include "ui/console.h"

#include "ui/input.h"

#include "ui/sdl2.h"

#include "sysemu/sysemu.h"



void sdl2_2d_update(DisplayChangeListener *dcl,

                    int x, int y, int w, int h)

{

    struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);

    DisplaySurface *surf = qemu_console_surface(dcl->con);

    SDL_Rect rect;



    if (!surf) {

        return;

    }

    if (!scon->texture) {

        return;

    }



    rect.x = x;

    rect.y = y;

    rect.w = w;

    rect.h = h;



    SDL_UpdateTexture(scon->texture, NULL, surface_data(surf),

                      surface_stride(surf));

    SDL_RenderCopy(scon->real_renderer, scon->texture, &rect, &rect);

    SDL_RenderPresent(scon->real_renderer);

}

ui/sdl2.c

+5 −30
Original line number Diff line number Diff line
@@ -72,31 +72,6 @@ static struct sdl2_console *get_scon_from_window(uint32_t window_id) 
    return NULL;

}



static void sdl_update(DisplayChangeListener *dcl,

                       int x, int y, int w, int h)

{

    struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);

    SDL_Rect rect;

    DisplaySurface *surf = qemu_console_surface(dcl->con);



    if (!surf) {

        return;

    }

    if (!scon->texture) {

        return;

    }



    rect.x = x;

    rect.y = y;

    rect.w = w;

    rect.h = h;



    SDL_UpdateTexture(scon->texture, NULL, surface_data(surf),

                      surface_stride(surf));

    SDL_RenderCopy(scon->real_renderer, scon->texture, &rect, &rect);

    SDL_RenderPresent(scon->real_renderer);

}



static void do_sdl_resize(struct sdl2_console *scon, int width, int height,

                          int bpp)

{
@@ -609,7 +584,7 @@ static void handle_windowevent(DisplayChangeListener *dcl, SDL_Event *ev) 
        break;

    case SDL_WINDOWEVENT_EXPOSED:

        SDL_GetWindowSize(SDL_GetWindowFromID(ev->window.windowID), &w, &h);

        sdl_update(dcl, 0, 0, w, h);

        sdl2_2d_update(dcl, 0, 0, w, h);

        break;

    case SDL_WINDOWEVENT_FOCUS_GAINED:

    case SDL_WINDOWEVENT_ENTER:
@@ -746,9 +721,9 @@ static void sdl_cleanup(void) 
    SDL_QuitSubSystem(SDL_INIT_VIDEO);

}



static const DisplayChangeListenerOps dcl_ops = {

    .dpy_name          = "sdl",

    .dpy_gfx_update    = sdl_update,

static const DisplayChangeListenerOps dcl_2d_ops = {

    .dpy_name          = "sdl2-2d",

    .dpy_gfx_update    = sdl2_2d_update,

    .dpy_gfx_switch    = sdl_switch,

    .dpy_refresh       = sdl_refresh,

    .dpy_mouse_set     = sdl_mouse_warp,
@@ -800,7 +775,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 
        if (!qemu_console_is_graphic(con)) {

            sdl2_console[i].hidden = true;

        }

        sdl2_console[i].dcl.ops = &dcl_ops;

        sdl2_console[i].dcl.ops = &dcl_2d_ops;

        sdl2_console[i].dcl.con = con;

        register_displaychangelistener(&sdl2_console[i].dcl);

        sdl2_console[i].idx = i;