From c12aeb860c63ba83190f962e2f0a1c5fe18ad3a6 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 28 Feb 2013 15:03:04 +0100 Subject: console: rework DisplaySurface handling [dcl/ui side] Replace the dpy_gfx_resize and dpy_gfx_setdata DisplayChangeListener callbacks with a dpy_gfx_switch callback which notifies the ui code when the framebuffer backing storage changes. Signed-off-by: Gerd Hoffmann --- ui/sdl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ui/sdl.c') diff --git a/ui/sdl.c b/ui/sdl.c index fc4dc1b..85eefdf 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -117,8 +117,9 @@ static void do_sdl_resize(int width, int height, int bpp) } } -static void sdl_resize(DisplayChangeListener *dcl, - DisplayState *ds) +static void sdl_switch(DisplayChangeListener *dcl, + DisplayState *ds, + DisplaySurface *surface) { if (!scaling_active) { do_sdl_resize(ds_get_width(ds), ds_get_height(ds), 0); @@ -513,7 +514,7 @@ static void handle_keydown(DisplayState *ds, SDL_Event *ev) case 0x16: /* 'u' key on US keyboard */ if (scaling_active) { scaling_active = 0; - sdl_resize(dcl, ds); + sdl_switch(dcl, ds, ds->surface); vga_hw_invalidate(); vga_hw_update(); } @@ -856,9 +857,8 @@ static void sdl_cleanup(void) static const DisplayChangeListenerOps dcl_ops = { .dpy_name = "sdl", .dpy_gfx_update = sdl_update, - .dpy_gfx_resize = sdl_resize, + .dpy_gfx_switch = sdl_switch, .dpy_refresh = sdl_refresh, - .dpy_gfx_setdata = sdl_setdata, .dpy_mouse_set = sdl_mouse_warp, .dpy_cursor_define = sdl_mouse_define, }; -- cgit v1.1