From patchwork Fri Dec 19 09:17:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 422826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7015E140081 for ; Fri, 19 Dec 2014 20:20:13 +1100 (AEDT) Received: from localhost ([::1]:57481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tjH-0005eH-18 for incoming@patchwork.ozlabs.org; Fri, 19 Dec 2014 04:20:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tga-0000P2-20 for qemu-devel@nongnu.org; Fri, 19 Dec 2014 04:17:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1tgQ-00069a-Iz for qemu-devel@nongnu.org; Fri, 19 Dec 2014 04:17:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1tgQ-00068x-Aq for qemu-devel@nongnu.org; Fri, 19 Dec 2014 04:17:14 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBJ9HDKq032093 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 19 Dec 2014 04:17:13 -0500 Received: from nilsson.home.kraxel.org (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBJ9HBdJ001108; Fri, 19 Dec 2014 04:17:12 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 8F45D817E8; Fri, 19 Dec 2014 10:17:09 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 19 Dec 2014 10:17:04 +0100 Message-Id: <1418980626-22747-11-git-send-email-kraxel@redhat.com> In-Reply-To: <1418980626-22747-1-git-send-email-kraxel@redhat.com> References: <1418980626-22747-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , Anthony Liguori Subject: [Qemu-devel] [PULL 10/12] sdl2: move sdl2_2d_refresh to sdl2-2d.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Max Reitz --- include/ui/sdl2.h | 1 + ui/sdl2-2d.c | 8 ++++++++ ui/sdl2.c | 10 +--------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index bda60f8..f56c596 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 40a552c..9264817 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 2fdf8df..64ce206 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, };