aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2014-11-12 08:03:34 +0100
committerGerd Hoffmann <kraxel@redhat.com>2014-12-17 12:44:01 +0100
commit62959ffe45bdd7bb069e529686a8c152518812fc (patch)
tree955d166afd4efc1a7502a2fc68de6dfbf74725eb
parent63ed4907cb4cfacf1f875f938037af9c75afa453 (diff)
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: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
-rw-r--r--include/ui/sdl2.h1
-rw-r--r--ui/sdl2-2d.c8
-rw-r--r--ui/sdl2.c10
3 files changed, 10 insertions, 9 deletions
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index bda60f8b93..f56c596e31 100644
--- a/include/ui/sdl2.h
+++ b/include/ui/sdl2.h
@@ -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 */
diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c
index 40a552c7cb..9264817e76 100644
--- a/ui/sdl2-2d.c
+++ b/ui/sdl2-2d.c
@@ -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) {
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 2fdf8df608..64ce2065fc 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -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,
};