Commit 62959ffe authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

sdl2: move sdl2_2d_refresh to sdl2-2d.c 



Now that common event handling code is split off, we can move
over sdl_refresh to sdl2-2d.c, and rename it to sdl2_2d_refresh.

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

include/ui/sdl2.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ void sdl2_2d_update(DisplayChangeListener *dcl, 
                    int x, int y, int w, int h);

void sdl2_2d_switch(DisplayChangeListener *dcl,

                    DisplaySurface *new_surface);

void sdl2_2d_refresh(DisplayChangeListener *dcl);

void sdl2_2d_redraw(struct sdl2_console *scon);



#endif /* SDL2_H */

ui/sdl2-2d.c

+8 −0
Original line number Diff line number Diff line
@@ -103,6 +103,14 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, 
    sdl2_2d_redraw(scon);

}



void sdl2_2d_refresh(DisplayChangeListener *dcl)

{

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



    graphic_hw_update(dcl->con);

    sdl2_poll_events(scon);

}



void sdl2_2d_redraw(struct sdl2_console *scon)

{

    if (!scon->surface) {

ui/sdl2.c

+1 −9
Original line number Diff line number Diff line
@@ -594,14 +594,6 @@ void sdl2_poll_events(struct sdl2_console *scon) 
    }

}



static void sdl_refresh(DisplayChangeListener *dcl)

{

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



    graphic_hw_update(dcl->con);

    sdl2_poll_events(scon);

}



static void sdl_mouse_warp(DisplayChangeListener *dcl,

                           int x, int y, int on)

{
@@ -667,7 +659,7 @@ static const DisplayChangeListenerOps dcl_2d_ops = { 
    .dpy_name          = "sdl2-2d",

    .dpy_gfx_update    = sdl2_2d_update,

    .dpy_gfx_switch    = sdl2_2d_switch,

    .dpy_refresh       = sdl_refresh,

    .dpy_refresh       = sdl2_2d_refresh,

    .dpy_mouse_set     = sdl_mouse_warp,

    .dpy_cursor_define = sdl_mouse_define,

};