From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz1Je-0000Bj-1O for qemu-devel@nongnu.org; Thu, 11 Dec 2014 05:49:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz1JX-0007R6-OS for qemu-devel@nongnu.org; Thu, 11 Dec 2014 05:49:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz1JX-0007Qu-FA for qemu-devel@nongnu.org; Thu, 11 Dec 2014 05:49:43 -0500 From: Gerd Hoffmann Date: Thu, 11 Dec 2014 11:49:33 +0100 Message-Id: <1418294973-21790-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1418294973-21790-1-git-send-email-kraxel@redhat.com> References: <1418294973-21790-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 10/10] sdl2: move sdl2_2d_refresh to sdl2-2d.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori 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 --- include/ui/sdl2.h | 1 + ui/sdl2-2d.c | 9 +++++++++ ui/sdl2.c | 10 +--------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 27b3132..9e9a92d 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -23,4 +23,5 @@ 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); diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index 40a552c..9c60075 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -103,6 +103,15 @@ 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); + + assert(!scon->opengl); + 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 8d10e0e..a1def81 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, }; -- 1.8.3.1